commit 91c6730d36e80acbe04b725e59a9f550e3a6a60e
author Patrick Rohr <prohr@google.com> Tue Sep 12 15:44:31 2023 -0700
committer Patrick Rohr <prohr@google.com> Wed Sep 13 09:59:10 2023 -0700
tree 04f7d33bba786c4aedfc083d4108c1dfd3a9e0e9
parent 07fcf7d2bd3079f7f0e45d0ee6f3bf5fe494c981

ApfTest: remove usage of makeBaseRaPacket from testApfFilterRa

Test: atest ApfTest
Change-Id: I8328b56d07fb8e35f3c2bdd0985775d95b68025c

tests/unit/src/android/net/apf/ApfTest.java

diff --git a/tests/unit/src/android/net/apf/ApfTest.java b/tests/unit/src/android/net/apf/ApfTest.java
index ad4ddf8..22c7073 100644
--- a/tests/unit/src/android/net/apf/ApfTest.java
+++ b/tests/unit/src/android/net/apf/ApfTest.java
@@ -2621,13 +2621,14 @@
         final int DNSSL_LIFETIME  = 2000;
 
         // Verify RA is passed the first time
-        ByteBuffer basePacket = makeBaseRaPacket();
+        RaPacketBuilder ra = new RaPacketBuilder(ROUTER_LIFETIME);
+        ByteBuffer basePacket = ByteBuffer.wrap(ra.build());
         assertPass(program, basePacket.array());
 
         verifyRaLifetime(apfFilter, ipClientCallback, basePacket, ROUTER_LIFETIME);
         verifyRaEvent(new RaEvent(ROUTER_LIFETIME, -1, -1, -1, -1, -1));
 
-        RaPacketBuilder ra = new RaPacketBuilder(ROUTER_LIFETIME);
+        ra = new RaPacketBuilder(ROUTER_LIFETIME);
         // Check that changes are ignored in every byte of the flow label.
         ra.setFlowLabel(0x56789);
         ByteBuffer newFlowLabelPacket = ByteBuffer.wrap(ra.build());
@@ -2690,8 +2691,7 @@
         // Verify that current program filters all the RAs (note: ApfFilter.MAX_RAS == 10).
         program = ipClientCallback.getApfProgram();
         verifyRaLifetime(program, basePacket, ROUTER_LIFETIME);
-        // TODO: reenable assertion once basePacket is based on RaPacketBuilder.
-        //verifyRaLifetime(program, newFlowLabelPacket, ROUTER_LIFETIME);
+        verifyRaLifetime(program, newFlowLabelPacket, ROUTER_LIFETIME);
         verifyRaLifetime(program, prefixOptionPacket, PREFIX_PREFERRED_LIFETIME);
         verifyRaLifetime(program, rdnssOptionPacket, RDNSS_LIFETIME);
         verifyRaLifetime(program, lowLifetimeRdnssOptionPacket, ROUTER_LIFETIME);