diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-03-31 23:04:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-03-31 23:04:33 +0000 |
| commit | 63a874bf77ec9b59ae6113e17fd90221c64125fb (patch) | |
| tree | f6ba88b6acc106d2efa83c30cf72a993aff88602 /tests | |
| parent | 40eaab440de6210a857dac19d89bee244db9ced6 (diff) | |
| parent | d6ba42b153a41a19c9ce4fb8e63abbe859ad67e9 (diff) | |
Merge "hotspot2: set WifiConfiguration#isHomeProviderNetwork for Passpoint networks" into oc-dev
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java | 2 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkEvaluatorTest.java | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java index 8008bf68e..5ac94ec78 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java @@ -691,6 +691,7 @@ public class PasspointManagerTest { when(provider.getWifiConfig()).thenReturn(new WifiConfiguration()); WifiConfiguration config = mManager.getMatchingWifiConfig(createTestScanResult()); assertEquals(ScanResultUtil.createQuotedSSID(TEST_SSID), config.SSID); + assertTrue(config.isHomeProviderNetwork); } /** @@ -709,6 +710,7 @@ public class PasspointManagerTest { when(provider.getWifiConfig()).thenReturn(new WifiConfiguration()); WifiConfiguration config = mManager.getMatchingWifiConfig(createTestScanResult()); assertEquals(ScanResultUtil.createQuotedSSID(TEST_SSID), config.SSID); + assertFalse(config.isHomeProviderNetwork); } /** 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 cb20d0ccd..2224486ba 100644 --- a/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkEvaluatorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointNetworkEvaluatorTest.java @@ -17,6 +17,7 @@ package com.android.server.wifi.hotspot2; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.any; @@ -201,6 +202,7 @@ public class PasspointNetworkEvaluatorTest { verify(mWifiConfigManager).addOrUpdateNetwork(addedConfig.capture(), anyInt()); assertEquals(ScanResultUtil.createQuotedSSID(TEST_SSID1), addedConfig.getValue().SSID); assertEquals(TEST_FQDN1, addedConfig.getValue().FQDN); + assertTrue(addedConfig.getValue().isHomeProviderNetwork); verify(mWifiConfigManager).enableNetwork(eq(TEST_NETWORK_ID), eq(false), anyInt()); verify(mWifiConfigManager).setNetworkCandidateScanResult( eq(TEST_NETWORK_ID), any(ScanResult.class), anyInt()); @@ -242,6 +244,7 @@ public class PasspointNetworkEvaluatorTest { verify(mWifiConfigManager).addOrUpdateNetwork(addedConfig.capture(), anyInt()); assertEquals(ScanResultUtil.createQuotedSSID(TEST_SSID1), addedConfig.getValue().SSID); assertEquals(TEST_FQDN1, addedConfig.getValue().FQDN); + assertFalse(addedConfig.getValue().isHomeProviderNetwork); verify(mWifiConfigManager).enableNetwork(eq(TEST_NETWORK_ID), eq(false), anyInt()); verify(mWifiConfigManager).setNetworkCandidateScanResult( eq(TEST_NETWORK_ID), any(ScanResult.class), anyInt()); @@ -285,6 +288,7 @@ public class PasspointNetworkEvaluatorTest { verify(mWifiConfigManager).addOrUpdateNetwork(addedConfig.capture(), anyInt()); assertEquals(ScanResultUtil.createQuotedSSID(TEST_SSID1), addedConfig.getValue().SSID); assertEquals(TEST_FQDN1, addedConfig.getValue().FQDN); + assertTrue(addedConfig.getValue().isHomeProviderNetwork); verify(mWifiConfigManager).enableNetwork(eq(TEST_NETWORK_ID), eq(false), anyInt()); verify(mWifiConfigManager).setNetworkCandidateScanResult( eq(TEST_NETWORK_ID), any(ScanResult.class), anyInt()); |