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

Merge "Revert "ConnectivityServiceTest: more informative assert failures""

Browse Source 
am: 959e3f9ac9

Change-Id: Ie61051984a1b6efbb0b19754ce0fb99024ab296a
This commit is contained in:
Roland Levillain
2017-07-04 11:24:25 +00:00
committed by android-build-merger
parent 2e99b8e7d2 959e3f9ac9
commit a17d7171d9
1 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -891,7 +891,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
assertNull(mCm.getActiveNetwork()); assertNull(mCm.getActiveNetwork());
assertNull(mCm.getActiveNetworkForUid(Process.myUid())); assertNull(mCm.getActiveNetworkForUid(Process.myUid()));
// Test getAllNetworks() // Test getAllNetworks()
assertEmpty(mCm.getAllNetworks()); assertEquals(0, mCm.getAllNetworks().length);
} }
/** /**
@@ -932,7 +932,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
mCellNetworkAgent.connect(true); mCellNetworkAgent.connect(true);
waitFor(cv); waitFor(cv);
verifyActiveNetwork(TRANSPORT_CELLULAR); verifyActiveNetwork(TRANSPORT_CELLULAR);
assertLength(2, mCm.getAllNetworks()); assertEquals(2, mCm.getAllNetworks().length);
assertTrue(mCm.getAllNetworks()[0].equals(mCm.getActiveNetwork()) || assertTrue(mCm.getAllNetworks()[0].equals(mCm.getActiveNetwork()) ||
mCm.getAllNetworks()[1].equals(mCm.getActiveNetwork())); mCm.getAllNetworks()[1].equals(mCm.getActiveNetwork()));
assertTrue(mCm.getAllNetworks()[0].equals(mWiFiNetworkAgent.getNetwork()) || assertTrue(mCm.getAllNetworks()[0].equals(mWiFiNetworkAgent.getNetwork()) ||
@@ -942,7 +942,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
mWiFiNetworkAgent.connect(true); mWiFiNetworkAgent.connect(true);
waitFor(cv); waitFor(cv);
verifyActiveNetwork(TRANSPORT_WIFI); verifyActiveNetwork(TRANSPORT_WIFI);
assertLength(2, mCm.getAllNetworks()); assertEquals(2, mCm.getAllNetworks().length);
assertTrue(mCm.getAllNetworks()[0].equals(mCm.getActiveNetwork()) || assertTrue(mCm.getAllNetworks()[0].equals(mCm.getActiveNetwork()) ||
mCm.getAllNetworks()[1].equals(mCm.getActiveNetwork())); mCm.getAllNetworks()[1].equals(mCm.getActiveNetwork()));
assertTrue(mCm.getAllNetworks()[0].equals(mCellNetworkAgent.getNetwork()) || assertTrue(mCm.getAllNetworks()[0].equals(mCellNetworkAgent.getNetwork()) ||
@@ -950,9 +950,9 @@ public class ConnectivityServiceTest extends AndroidTestCase {
// Test cellular linger timeout. // Test cellular linger timeout.
waitFor(mCellNetworkAgent.getDisconnectedCV()); waitFor(mCellNetworkAgent.getDisconnectedCV());
waitForIdle(); waitForIdle();
assertLength(1, mCm.getAllNetworks()); assertEquals(1, mCm.getAllNetworks().length);
verifyActiveNetwork(TRANSPORT_WIFI); verifyActiveNetwork(TRANSPORT_WIFI);
assertLength(1, mCm.getAllNetworks()); assertEquals(1, mCm.getAllNetworks().length);
assertEquals(mCm.getAllNetworks()[0], mCm.getActiveNetwork()); assertEquals(mCm.getAllNetworks()[0], mCm.getActiveNetwork());
// Test WiFi disconnect. // Test WiFi disconnect.
cv = waitForConnectivityBroadcasts(1); cv = waitForConnectivityBroadcasts(1);
@@ -1892,7 +1892,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
mCellNetworkAgent.connectWithoutInternet(); mCellNetworkAgent.connectWithoutInternet();
waitFor(cv); waitFor(cv);
waitForIdle(); waitForIdle();
assertEmpty(mCm.getAllNetworks()); assertEquals(0, mCm.getAllNetworks().length);
verifyNoNetwork(); verifyNoNetwork();
// Test bringing up validated WiFi. // Test bringing up validated WiFi.
@@ -2566,7 +2566,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
assertTrue(testFactory.getMyStartRequested()); assertTrue(testFactory.getMyStartRequested());
// Bring up cell data and check that the factory stops looking. // Bring up cell data and check that the factory stops looking.
assertLength(1, mCm.getAllNetworks()); assertEquals(1, mCm.getAllNetworks().length);
mCellNetworkAgent = new MockNetworkAgent(TRANSPORT_CELLULAR); mCellNetworkAgent = new MockNetworkAgent(TRANSPORT_CELLULAR);
testFactory.expectAddRequests(2); // Because the cell request changes score twice. testFactory.expectAddRequests(2); // Because the cell request changes score twice.
mCellNetworkAgent.connect(true); mCellNetworkAgent.connect(true);
@@ -2577,7 +2577,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
// Check that cell data stays up. // Check that cell data stays up.
waitForIdle(); waitForIdle();
verifyActiveNetwork(TRANSPORT_WIFI); verifyActiveNetwork(TRANSPORT_WIFI);
assertLength(2, mCm.getAllNetworks()); assertEquals(2, mCm.getAllNetworks().length);
// Turn off mobile data always on and expect the request to disappear... // Turn off mobile data always on and expect the request to disappear...
testFactory.expectRemoveRequests(1); testFactory.expectRemoveRequests(1);
@@ -2586,7 +2586,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
// ... and cell data to be torn down. // ... and cell data to be torn down.
cellNetworkCallback.expectCallback(CallbackState.LOST, mCellNetworkAgent); cellNetworkCallback.expectCallback(CallbackState.LOST, mCellNetworkAgent);
assertLength(1, mCm.getAllNetworks()); assertEquals(1, mCm.getAllNetworks().length);
testFactory.unregister(); testFactory.unregister();
mCm.unregisterNetworkCallback(cellNetworkCallback); mCm.unregisterNetworkCallback(cellNetworkCallback);
@@ -3291,7 +3291,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
assertNull(mCm.getActiveNetworkInfo()); assertNull(mCm.getActiveNetworkInfo());
Network[] allNetworks = mCm.getAllNetworks(); Network[] allNetworks = mCm.getAllNetworks();
assertLength(1, allNetworks); assertEquals(1, allNetworks.length);
Network network = allNetworks[0]; Network network = allNetworks[0];
NetworkCapabilities capabilities = mCm.getNetworkCapabilities(network); NetworkCapabilities capabilities = mCm.getNetworkCapabilities(network);
assertTrue(capabilities.hasTransport(TRANSPORT_LOWPAN)); assertTrue(capabilities.hasTransport(TRANSPORT_LOWPAN));
@@ -3309,7 +3309,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
assertNull(mCm.getActiveNetwork()); assertNull(mCm.getActiveNetwork());
// TODO: getAllNetworkInfo is dirty and returns a non-empty array rght from the start // TODO: getAllNetworkInfo is dirty and returns a non-empty array rght from the start
// of this test. Fix it and uncomment the assert below. // of this test. Fix it and uncomment the assert below.
//assertEmpty(mCm.getAllNetworkInfo()); //assertEquals(0, mCm.getAllNetworkInfo().length);
// Disconnect lowpan. // Disconnect lowpan.
lowpanNetwork.disconnect(); lowpanNetwork.disconnect();
@@ -3355,17 +3355,6 @@ public class ConnectivityServiceTest extends AndroidTestCase {
} }
} }
private static <T> void assertEmpty(T[] ts) {
int length = ts.length;
assertEquals("expected empty array, but length was " + length, 0, length);
}
private static <T> void assertLength(int expected, T[] got) {
int length = got.length;
assertEquals(String.format("expected array of length %s, but length was %s for %s",
expected, length, Arrays.toString(got)), expected, length);
}
/* test utilities */ /* test utilities */
// TODO: eliminate all usages of sleepFor and replace by proper timeouts/waitForIdle. // TODO: eliminate all usages of sleepFor and replace by proper timeouts/waitForIdle.
static private void sleepFor(int ms) { static private void sleepFor(int ms) {