joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Clean up BpfCoordinatorTest

Browse source 
1. assertEquals syntax is (expected, actual) and not the other way
   around
2. use assertArrayEquals to compare arrays

Test: atest TetheringTests
Bug: 312072637
Change-Id: I5eb0c270323253f648d3a8fd488506b9ad1ca6a1
This commit is contained in:
KH Shi 2023-11-20 08:09:07 +00:00
commit 035bed35bb
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Tethering/tests/unit/src/com/android/networkstack/tethering/BpfCoordinatorTest.java
View file

@ -1280,9 +1280,9 @@ public class BpfCoordinatorTest {
final Ipv6DownstreamRule rule = buildTestDownstreamRule(mobileIfIndex, NEIGH_A, MAC_A);
final TetherDownstream6Key key = rule.makeTetherDownstream6Key();
assertEquals(key.iif, mobileIfIndex);
assertEquals(key.dstMac, MacAddress.ALL_ZEROS_ADDRESS); // rawip upstream
assertTrue(Arrays.equals(key.neigh6, NEIGH_A.getAddress()));
assertEquals(mobileIfIndex, key.iif);
assertEquals(MacAddress.ALL_ZEROS_ADDRESS, key.dstMac); // rawip upstream
assertArrayEquals(NEIGH_A.getAddress(), key.neigh6);
// iif (4) + dstMac(6) + padding(2) + neigh6 (16) = 28.
assertEquals(28, key.writeToBytes().length);
}
@ -1293,12 +1293,12 @@ public class BpfCoordinatorTest {
final Ipv6DownstreamRule rule = buildTestDownstreamRule(mobileIfIndex, NEIGH_A, MAC_A);
final Tether6Value value = rule.makeTether6Value();
assertEquals(value.oif, DOWNSTREAM_IFINDEX);
assertEquals(value.ethDstMac, MAC_A);
assertEquals(value.ethSrcMac, DOWNSTREAM_MAC);
assertEquals(value.ethProto, ETH_P_IPV6);
assertEquals(value.pmtu, NetworkStackConstants.ETHER_MTU);
// oif (4) + ethDstMac (6) + ethSrcMac (6) + ethProto (2) + pmtu (2) = 20.
assertEquals(DOWNSTREAM_IFINDEX, value.oif);
assertEquals(MAC_A, value.ethDstMac);
assertEquals(DOWNSTREAM_MAC, value.ethSrcMac);
assertEquals(ETH_P_IPV6, value.ethProto);
assertEquals(NetworkStackConstants.ETHER_MTU, value.pmtu);
// oif (4) + ethDstMac (6) + ethSrcMac (6) + ethProto (2) + pmtu (2) = 20
assertEquals(20, value.writeToBytes().length);
}