diff options
author | Vinit Deshpande <vinitd@google.com> | 2014-10-23 17:02:19 -0700 |
---|---|---|
committer | The Android Automerger <android-build@google.com> | 2014-10-24 16:05:15 -0700 |
commit | 861bd311d2a90b2dd17fb6e35fd665ca823125c9 (patch) | |
tree | 0841fc7d7c4c700f784d63897a1d448e9ffc57fe | |
parent | 6349e41cca5d9134c0215208d48b54ebc897a20b (diff) | |
download | platform_cts-861bd311d2a90b2dd17fb6e35fd665ca823125c9.tar.gz platform_cts-861bd311d2a90b2dd17fb6e35fd665ca823125c9.tar.bz2 platform_cts-861bd311d2a90b2dd17fb6e35fd665ca823125c9.zip |
Remove enableNetwork(netId, disableOthers) check from CTS
We don't really disable any networks anymore; so there's not much to be
verified.
Bug: 17937171
Change-Id: I57e16953bdc0a698f3bc5fba555b39bc450c13ab
-rw-r--r-- | tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java b/tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java index d8df0643112..152789cafbf 100644 --- a/tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java +++ b/tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java @@ -213,8 +213,9 @@ public class WifiManagerTest extends AndroidTestCase { private void assertDisableOthers(WifiConfiguration wifiConfiguration, boolean disableOthers) { for (WifiConfiguration w : mWifiManager.getConfiguredNetworks()) { if ((!w.SSID.equals(wifiConfiguration.SSID)) && w.status != Status.CURRENT) { - if (disableOthers) + if (disableOthers) { assertEquals(Status.DISABLED, w.status); + } } } } @@ -321,6 +322,7 @@ public class WifiManagerTest extends AndroidTestCase { // skip the test if WiFi is not supported return; } + // store the list of enabled networks, so they can be re-enabled after test completes Set<String> enabledSsids = getEnabledNetworks(mWifiManager.getConfiguredNetworks()); try { @@ -353,11 +355,6 @@ public class WifiManagerTest extends AndroidTestCase { wifiConfiguration = mWifiManager.getConfiguredNetworks().get(pos); assertDisableOthers(wifiConfiguration, disableOthers); assertEquals(Status.ENABLED, wifiConfiguration.status); - disableOthers = true; - - assertTrue(mWifiManager.enableNetwork(netId, disableOthers)); - wifiConfiguration = mWifiManager.getConfiguredNetworks().get(pos); - assertDisableOthers(wifiConfiguration, disableOthers); assertTrue(mWifiManager.disableNetwork(netId)); wifiConfiguration = mWifiManager.getConfiguredNetworks().get(pos); |