From 328b217e5823e47e54b077c43bc8fab91763cb06 Mon Sep 17 00:00:00 2001 From: Madan Ankapura Date: Thu, 11 Nov 2010 18:31:24 -0800 Subject: [PATCH] DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices Device can still have a valid networkId even after disconnection if it was associated with AP, getWifiState is a better check to get valid state. Change-Id: I31a8ca38f304fbf639e1f3111be4b5ed406e3b3c --- tests/cts/net/src/android/net/wifi/cts/WifiInfoTest.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/cts/net/src/android/net/wifi/cts/WifiInfoTest.java b/tests/cts/net/src/android/net/wifi/cts/WifiInfoTest.java index 42243c890d..d6d7d8e47c 100644 --- a/tests/cts/net/src/android/net/wifi/cts/WifiInfoTest.java +++ b/tests/cts/net/src/android/net/wifi/cts/WifiInfoTest.java @@ -20,7 +20,6 @@ import dalvik.annotation.TestLevel; import dalvik.annotation.TestTargetClass; import dalvik.annotation.TestTargetNew; import dalvik.annotation.TestTargets; -import dalvik.annotation.ToBeFixed; import android.content.BroadcastReceiver; import android.content.Context; @@ -168,8 +167,6 @@ public class WifiInfoTest extends AndroidTestCase { args = {} ) }) - @ToBeFixed(bug="1871573", explanation="android.net.wifi.WifiInfo#getNetworkId() return -1 when" - + " there is wifi connection") public void testWifiInfoProperties() throws Exception { // this test case should in Wifi environment WifiInfo wifiInfo = mWifiManager.getConnectionInfo(); @@ -187,8 +184,7 @@ public class WifiInfoTest extends AndroidTestCase { wifiInfo.getMacAddress(); setWifiEnabled(false); Thread.sleep(DURATION); - wifiInfo = mWifiManager.getConnectionInfo(); - assertEquals(-1, wifiInfo.getNetworkId()); + assertEquals(WifiManager.WIFI_STATE_DISABLED, mWifiManager.getWifiState()); } }