Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6db57bb authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Gerrit Code Review
Browse files

Merge "Use doIpv6Provisioning in testPref64Option."

parents 4a8513ce c84530f2
Loading
Loading
Loading
Loading
+1 −8
Original line number Original line Diff line number Diff line
@@ -1528,20 +1528,13 @@ public class IpClientIntegrationTest {
        ByteBuffer pref64 = new StructNdOptPref64(prefix, 600).toByteBuffer();
        ByteBuffer pref64 = new StructNdOptPref64(prefix, 600).toByteBuffer();
        ByteBuffer ra = buildRaPacket(pio, rdnss, pref64);
        ByteBuffer ra = buildRaPacket(pio, rdnss, pref64);


        waitForRouterSolicitation();
        mPacketReader.sendResponse(ra);

        // The NAT64 prefix might be detected before or after provisioning success.
        // The NAT64 prefix might be detected before or after provisioning success.
        // Don't test order between these two events.
        // Don't test order between these two events.
        ArgumentCaptor<LinkProperties> captor = ArgumentCaptor.forClass(LinkProperties.class);
        LinkProperties lp = doIpv6OnlyProvisioning(null /*inOrder*/, ra);
        verifyWithTimeout(null /*inOrder*/, mCb).onProvisioningSuccess(captor.capture());
        expectAlarmSet(null /*inOrder*/, "PREF64", 600);
        expectAlarmSet(null /*inOrder*/, "PREF64", 600);
        reset(mCb, mAlarm);


        // From now on expect events in order.
        // From now on expect events in order.
        InOrder inOrder = inOrder(mCb, mAlarm);
        InOrder inOrder = inOrder(mCb, mAlarm);

        LinkProperties lp = captor.getValue();
        if (lp.getNat64Prefix() != null) {
        if (lp.getNat64Prefix() != null) {
            assertEquals(prefix, lp.getNat64Prefix());
            assertEquals(prefix, lp.getNat64Prefix());
        } else {
        } else {