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

Merge "Changing EthernetNetworkFactoryTest assert order" am: c34c21c624 am: 07ec1ed8fb am: b4f2617478

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2163529

Change-Id: Ife70a7ce14dc470ceeba90987d2e8cbfd02b4106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-07-25 23:51:12 +00:00
committed by Automerger Merge Worker
parent 27bc6cad1f b4f2617478
commit b2e2471dc7
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/unit/java/com/android/server/ethernet/EthernetNetworkFactoryTest.java
View File

@@ -313,7 +313,7 @@ public class EthernetNetworkFactoryTest {
assertTrue(ret);
verify(mIpClient).shutdown();
assertEquals(listener.expectOnResult(), TEST_IFACE);
assertEquals(TEST_IFACE, listener.expectOnResult());
}
@Test
@@ -328,13 +328,13 @@ public class EthernetNetworkFactoryTest {
assertTrue(retDown);
verifyStop();
assertEquals(listenerDown.expectOnResult(), TEST_IFACE);
assertEquals(TEST_IFACE, listenerDown.expectOnResult());
final boolean retUp =
mNetFactory.updateInterfaceLinkState(TEST_IFACE, true /* up */, listenerUp);
assertTrue(retUp);
assertEquals(listenerUp.expectOnResult(), TEST_IFACE);
assertEquals(TEST_IFACE, listenerUp.expectOnResult());
}
@Test
@@ -351,7 +351,7 @@ public class EthernetNetworkFactoryTest {
verify(mDeps, never()).makeIpClient(any(), any(), any());
verify(mDeps, never())
.makeEthernetNetworkAgent(any(), any(), any(), any(), any(), any(), any());
assertEquals(listener.expectOnResult(), TEST_IFACE);
assertEquals(TEST_IFACE, listener.expectOnResult());
}
@Test
@@ -616,7 +616,7 @@ public class EthernetNetworkFactoryTest {
mNetFactory.updateInterface(TEST_IFACE, ipConfiguration, capabilities, listener);
triggerOnProvisioningSuccess();
assertEquals(listener.expectOnResult(), TEST_IFACE);
assertEquals(TEST_IFACE, listener.expectOnResult());
}
@Test
@@ -662,6 +662,7 @@ public class EthernetNetworkFactoryTest {
});
assertEquals(successfulListener.expectOnResult(), TEST_IFACE);
assertEquals(TEST_IFACE, successfulListener.expectOnResult());
}
private void verifyNetworkManagementCallIsAbortedWhenInterrupted(
@@ -690,7 +691,7 @@ public class EthernetNetworkFactoryTest {
mNetFactory.updateInterface(TEST_IFACE, ipConfiguration, capabilities, listener);
triggerOnProvisioningSuccess();
assertEquals(listener.expectOnResult(), TEST_IFACE);
assertEquals(TEST_IFACE, listener.expectOnResult());
verify(mDeps).makeEthernetNetworkAgent(any(), any(),
eq(capabilities), any(), any(), any(), any());
verifyRestart(ipConfiguration);