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

ConnectivityServiceTest: remove remaining poll loops.

Browse Source 
All the tests are now asynchronous. The only remaining uses of
Thread.sleep() are in the tests that check for NetworkRequest
timeouts.

Test: ConnectivityServiceTest passes 100 times in a row
Bug: 32561414
Change-Id: If420bd66c692a90d5031ee06a888a8cc3b4398a8
This commit is contained in:
Lorenzo Colitti
2017-01-30 17:45:49 +09:00
parent 4b07a883ca
commit aebc0598b9
1 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -683,22 +683,6 @@ public class ConnectivityServiceTest extends AndroidTestCase {
} }
} }
private interface Criteria {
public boolean get();
}
/**
* Wait up to 500ms for {@code criteria.get()} to become true, polling.
* Fails if 500ms goes by before {@code criteria.get()} to become true.
*/
static private void waitFor(Criteria criteria) {
int delays = 0;
while (!criteria.get()) {
sleepFor(50);
if (++delays == 10) fail();
}
}
/** /**
* Wait up to TIMEOUT_MS for {@code conditionVariable} to open. * Wait up to TIMEOUT_MS for {@code conditionVariable} to open.
* Fails if TIMEOUT_MS goes by before {@code conditionVariable} opens. * Fails if TIMEOUT_MS goes by before {@code conditionVariable} opens.
@@ -834,8 +818,9 @@ public class ConnectivityServiceTest extends AndroidTestCase {
assertTrue(mCm.getAllNetworks()[0].equals(mCellNetworkAgent.getNetwork()) || assertTrue(mCm.getAllNetworks()[0].equals(mCellNetworkAgent.getNetwork()) ||
mCm.getAllNetworks()[1].equals(mCellNetworkAgent.getNetwork())); mCm.getAllNetworks()[1].equals(mCellNetworkAgent.getNetwork()));
// Test cellular linger timeout. // Test cellular linger timeout.
waitFor(new Criteria() { waitFor(mCellNetworkAgent.getDisconnectedCV());
public boolean get() { return mCm.getAllNetworks().length == 1; } }); mService.waitForIdle();
assertEquals(1, mCm.getAllNetworks().length);
verifyActiveNetwork(TRANSPORT_WIFI); verifyActiveNetwork(TRANSPORT_WIFI);
assertEquals(1, mCm.getAllNetworks().length); assertEquals(1, mCm.getAllNetworks().length);
assertEquals(mCm.getAllNetworks()[0], mCm.getActiveNetwork()); assertEquals(mCm.getAllNetworks()[0], mCm.getActiveNetwork());
@@ -1610,8 +1595,8 @@ public class ConnectivityServiceTest extends AndroidTestCase {
ConditionVariable cv = mCellNetworkAgent.getDisconnectedCV(); ConditionVariable cv = mCellNetworkAgent.getDisconnectedCV();
mCellNetworkAgent.connectWithoutInternet(); mCellNetworkAgent.connectWithoutInternet();
waitFor(cv); waitFor(cv);
waitFor(new Criteria() { mService.waitForIdle();
public boolean get() { return mCm.getAllNetworks().length == 0; } }); assertEquals(0, mCm.getAllNetworks().length);
verifyNoNetwork(); verifyNoNetwork();
// Test bringing up validated WiFi. // Test bringing up validated WiFi.
mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI); mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);