diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2020-04-27 10:15:29 +0900 |
|---|---|---|
| committer | Lorenzo Colitti <lorenzo@google.com> | 2020-05-10 14:28:40 +0900 |
| commit | a8a73c53199cc1bd01d59d022c1b235f964c0565 (patch) | |
| tree | 28f7ce7365db9eaa903d9dc7d8dcd5305a35f346 | |
| parent | 962312ad93ae1bf764202d81781fd3eb2e63e909 (diff) | |
Use doIpv6Provisioning in testPref64Option.
This is a simple refactoring to reduce code duplication, and it
shows that it's possible to use doIpv6Provisioning in tests that
also need to place their own expectations on LinkProperties
around provisioning time.
Bug: 152723363
Bug: 153694684
Test: atest NetworkStackNextIntegrationTests:IpClientIntegrationTest#testPref64Option --iterations 100
Change-Id: Iaa3e297e2417d4cdf9393baf27d61657e5743888
| -rw-r--r-- | tests/integration/src/android/net/ip/IpClientIntegrationTest.java | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/tests/integration/src/android/net/ip/IpClientIntegrationTest.java b/tests/integration/src/android/net/ip/IpClientIntegrationTest.java index d8ca520..d883433 100644 --- a/tests/integration/src/android/net/ip/IpClientIntegrationTest.java +++ b/tests/integration/src/android/net/ip/IpClientIntegrationTest.java @@ -1503,20 +1503,13 @@ public class IpClientIntegrationTest { ByteBuffer pref64 = new StructNdOptPref64(prefix, 600).toByteBuffer(); ByteBuffer ra = buildRaPacket(pio, rdnss, pref64); - waitForRouterSolicitation(); - mPacketReader.sendResponse(ra); - // The NAT64 prefix might be detected before or after provisioning success. // Don't test order between these two events. - ArgumentCaptor<LinkProperties> captor = ArgumentCaptor.forClass(LinkProperties.class); - verifyWithTimeout(null /*inOrder*/, mCb).onProvisioningSuccess(captor.capture()); + LinkProperties lp = doIpv6OnlyProvisioning(null /*inOrder*/, ra); expectAlarmSet(null /*inOrder*/, "PREF64", 600); - reset(mCb, mAlarm); // From now on expect events in order. InOrder inOrder = inOrder(mCb, mAlarm); - - LinkProperties lp = captor.getValue(); if (lp.getNat64Prefix() != null) { assertEquals(prefix, lp.getNat64Prefix()); } else { |