LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add debug logging.

Browse Source 
Also fix timing issue with setNetworkPreference
bug:8658717

Change-Id: Ifc6de4758a3d800a52f4e53cb4c6d2a4c6109390
This commit is contained in:
Robert Greenwalt
2013-04-25 17:08:18 -07:00
committed by The Android Automerger
parent bc404f17a6
commit e2b2f9f390
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View File

@@ -113,25 +113,30 @@ public class ConnectivityManagerTest extends AndroidTestCase {
public void testSetNetworkPreference() {
// verify swtiching between two default networks - need to connectable networks though
// could use test and whatever the current active network is
NetworkInfo active = mCm.getActiveNetworkInfo();
int originalPref = mCm.getNetworkPreference();
int currentPref = originalPref;
for (int type = -1; type <= ConnectivityManager.MAX_NETWORK_TYPE+1; type++) {
mCm.setNetworkPreference(type);
NetworkConfig c = mNetworks.get(type);
boolean expectWorked = (c != null && c.isDefault());
try {
Thread.currentThread().sleep(100);
} catch (InterruptedException e) {}
int foundType = mCm.getNetworkPreference();
int totalSleep = 0;
int foundType = ConnectivityManager.TYPE_NONE;
while (totalSleep < 1000) {
try {
Thread.currentThread().sleep(100);
} catch (InterruptedException e) {}
totalSleep += 100;
foundType = mCm.getNetworkPreference();
if (currentPref != foundType) break;
}
if (expectWorked) {
assertTrue("We should have been able to switch prefered type " + type,
foundType == type);
currentPref = foundType;
} else {
assertTrue("We should not have been able to switch type " + type,
foundType == currentPref);
foundType != type);
}
currentPref = foundType;
}
mCm.setNetworkPreference(originalPref);
}
@@ -171,6 +176,10 @@ public class ConnectivityManagerTest extends AndroidTestCase {
for (NetworkInfo i : ni) {
if (i.getType() == type) foundCount++;
}
if (foundCount != desiredFoundCount) {
Log.e(TAG, "failure in testGetAllNetworkInfo. Dump of returned NetworkInfos:");
for (NetworkInfo networkInfo : ni) Log.e(TAG, " " + networkInfo);
}
assertTrue("Unexpected foundCount of " + foundCount + " for type " + type,
foundCount == desiredFoundCount);
}