summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Qiu <zqiu@google.com>2017-03-24 00:30:45 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-03-24 00:30:45 +0000
commitb8d9814a3706cf5c4daba829e9b5dd2430078c04 (patch)
treeaa9dc3ff2ba9155dbfb33a9b48077fc1a9b06680
parent600cf5594ee20348f3642cbf77a4946dc52e9a6d (diff)
parentf780e22e29a613b60320b3f5cc2c9bf089f97c5e (diff)
downloadandroid_frameworks_opt_net_wifi-b8d9814a3706cf5c4daba829e9b5dd2430078c04.tar.gz
android_frameworks_opt_net_wifi-b8d9814a3706cf5c4daba829e9b5dd2430078c04.tar.bz2
android_frameworks_opt_net_wifi-b8d9814a3706cf5c4daba829e9b5dd2430078c04.zip
Merge "hotspot2: fix failures in PasspointNetworkEvaulatorTest" am: ac6d9af4c5 am: de8c942e61
am: f780e22e29 Change-Id: Id29ba0807ad3388a6073e19a71c59a3ddf237484
-rw-r--r--tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkEvaluatorTest.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkEvaluatorTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkEvaluatorTest.java
index c4527adc4..27e7c3da7 100644
--- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkEvaluatorTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkEvaluatorTest.java
@@ -30,6 +30,8 @@ import static org.mockito.MockitoAnnotations.initMocks;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiConfiguration;
+import android.net.wifi.hotspot2.PasspointConfiguration;
+import android.net.wifi.hotspot2.pps.HomeSp;
import android.test.suitebuilder.annotation.SmallTest;
import android.util.Pair;
@@ -86,6 +88,11 @@ public class PasspointNetworkEvaluatorTest {
*/
private static PasspointProvider generateProvider(WifiConfiguration config) {
PasspointProvider provider = mock(PasspointProvider.class);
+ PasspointConfiguration passpointConfig = new PasspointConfiguration();
+ HomeSp homeSp = new HomeSp();
+ homeSp.setFqdn(config.FQDN);
+ passpointConfig.setHomeSp(homeSp);
+ when(provider.getConfig()).thenReturn(passpointConfig);
when(provider.getWifiConfig()).thenReturn(config);
return provider;
}