am 9780f18f: (-s ours) Merge "DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices" into froyo
* commit '9780f18fc4b464deade657a4ebc2c797f4c11713':
DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices
diff --git a/tests/tests/net/src/android/net/wifi/cts/WifiInfoTest.java b/tests/tests/net/src/android/net/wifi/cts/WifiInfoTest.java
index d6d7d8e..42243c8 100644
--- a/tests/tests/net/src/android/net/wifi/cts/WifiInfoTest.java
+++ b/tests/tests/net/src/android/net/wifi/cts/WifiInfoTest.java
@@ -20,6 +20,7 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
+import dalvik.annotation.ToBeFixed;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -167,6 +168,8 @@
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();
@@ -184,7 +187,8 @@
wifiInfo.getMacAddress();
setWifiEnabled(false);
Thread.sleep(DURATION);
- assertEquals(WifiManager.WIFI_STATE_DISABLED, mWifiManager.getWifiState());
+ wifiInfo = mWifiManager.getConnectionInfo();
+ assertEquals(-1, wifiInfo.getNetworkId());
}
}