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

Changing EthernetNetworkFactoryTest assert order

Browse Source 
Changing multiple instances where the assert order for an assert.equals
was (actual, expected) to the more widely (and suggested) ordering of
(expected, actual).

Bug: 235605892
Test: atest FrameworksNetTests
:com.android.server.ethernet.EthernetNetworkFactoryTest

Change-Id: I6e9459d34d6cc7f43a2bfe346d2c2ca9551d46da
This commit is contained in:
James Mattis
2022-07-24 20:46:24 -07:00
parent ad3eab1c8b
commit fce2777a9b
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); assertTrue(ret);
verify(mIpClient).shutdown(); verify(mIpClient).shutdown();
assertEquals(listener.expectOnResult(), TEST_IFACE); assertEquals(TEST_IFACE, listener.expectOnResult());
} }
@Test @Test
@@ -328,13 +328,13 @@ public class EthernetNetworkFactoryTest {
assertTrue(retDown); assertTrue(retDown);
verifyStop(); verifyStop();
assertEquals(listenerDown.expectOnResult(), TEST_IFACE); assertEquals(TEST_IFACE, listenerDown.expectOnResult());
final boolean retUp = final boolean retUp =
mNetFactory.updateInterfaceLinkState(TEST_IFACE, true /* up */, listenerUp); mNetFactory.updateInterfaceLinkState(TEST_IFACE, true /* up */, listenerUp);
assertTrue(retUp); assertTrue(retUp);
assertEquals(listenerUp.expectOnResult(), TEST_IFACE); assertEquals(TEST_IFACE, listenerUp.expectOnResult());
} }
@Test @Test
@@ -351,7 +351,7 @@ public class EthernetNetworkFactoryTest {
verify(mDeps, never()).makeIpClient(any(), any(), any()); verify(mDeps, never()).makeIpClient(any(), any(), any());
verify(mDeps, never()) verify(mDeps, never())
.makeEthernetNetworkAgent(any(), any(), any(), any(), any(), any(), any()); .makeEthernetNetworkAgent(any(), any(), any(), any(), any(), any(), any());
assertEquals(listener.expectOnResult(), TEST_IFACE); assertEquals(TEST_IFACE, listener.expectOnResult());
} }
@Test @Test
@@ -616,7 +616,7 @@ public class EthernetNetworkFactoryTest {
mNetFactory.updateInterface(TEST_IFACE, ipConfiguration, capabilities, listener); mNetFactory.updateInterface(TEST_IFACE, ipConfiguration, capabilities, listener);
triggerOnProvisioningSuccess(); triggerOnProvisioningSuccess();
assertEquals(listener.expectOnResult(), TEST_IFACE); assertEquals(TEST_IFACE, listener.expectOnResult());
} }
@Test @Test
@@ -662,6 +662,7 @@ public class EthernetNetworkFactoryTest {
}); });
assertEquals(successfulListener.expectOnResult(), TEST_IFACE); assertEquals(successfulListener.expectOnResult(), TEST_IFACE);
assertEquals(TEST_IFACE, successfulListener.expectOnResult());
} }
private void verifyNetworkManagementCallIsAbortedWhenInterrupted( private void verifyNetworkManagementCallIsAbortedWhenInterrupted(
@@ -690,7 +691,7 @@ public class EthernetNetworkFactoryTest {
mNetFactory.updateInterface(TEST_IFACE, ipConfiguration, capabilities, listener); mNetFactory.updateInterface(TEST_IFACE, ipConfiguration, capabilities, listener);
triggerOnProvisioningSuccess(); triggerOnProvisioningSuccess();
assertEquals(listener.expectOnResult(), TEST_IFACE); assertEquals(TEST_IFACE, listener.expectOnResult());
verify(mDeps).makeEthernetNetworkAgent(any(), any(), verify(mDeps).makeEthernetNetworkAgent(any(), any(),
eq(capabilities), any(), any(), any(), any()); eq(capabilities), any(), any(), any(), any());
verifyRestart(ipConfiguration); verifyRestart(ipConfiguration);