From 035bed35bb24f2c6d44e25cd62371ae7c19c4a0c Mon Sep 17 00:00:00 2001 From: KH Shi Date: Mon, 20 Nov 2023 08:09:07 +0000 Subject: [PATCH] Clean up BpfCoordinatorTest 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 --- .../tethering/BpfCoordinatorTest.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Tethering/tests/unit/src/com/android/networkstack/tethering/BpfCoordinatorTest.java b/Tethering/tests/unit/src/com/android/networkstack/tethering/BpfCoordinatorTest.java index 01600b88bb..47ecf585a8 100644 --- a/Tethering/tests/unit/src/com/android/networkstack/tethering/BpfCoordinatorTest.java +++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/BpfCoordinatorTest.java @@ -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); }