diff options
| author | evitayan <evitayan@google.com> | 2019-10-18 17:56:05 -0700 |
|---|---|---|
| committer | evitayan <evitayan@google.com> | 2019-10-23 17:12:02 -0700 |
| commit | 6b1bb4ddbd7ba769efbdd6a94bf29108950f3d55 (patch) | |
| tree | 0508ff3a54f0170aeaa030db17a5a380f2b6daca /tests/iketests/src | |
| parent | 7b0ea194cef75cad479da4a1752a04d517dc0bd8 (diff) | |
| download | ike-6b1bb4ddbd7ba769efbdd6a94bf29108950f3d55.tar.gz | |
Set server address and UDP encap socket via setters
This commit passes server address and UDP encap socket to
IkeSessionOptions.Builder via setters instead of constructor
Bug: 142139930
Test: atest FrameworksIkeTests(all tests passed)
Change-Id: I60b30eef022e01ae010eb2f9cfe67e09aa01ac04
Diffstat (limited to 'tests/iketests/src')
3 files changed, 22 insertions, 8 deletions
diff --git a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionOptionsTest.java b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionOptionsTest.java index 392084f7..7abcc581 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionOptionsTest.java +++ b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionOptionsTest.java @@ -97,7 +97,9 @@ public final class IkeSessionOptionsTest { @Test public void testBuildWithPsk() throws Exception { IkeSessionOptions sessionOptions = - new IkeSessionOptions.Builder(REMOTE_IPV4_ADDRESS, mUdpEncapSocket) + new IkeSessionOptions.Builder() + .setServerAddress(REMOTE_IPV4_ADDRESS) + .setUdpEncapsulationSocket(mUdpEncapSocket) .addSaProposal(mIkeSaProposal) .setLocalIdentification(mLocalIdentification) .setRemoteIdentification(mRemoteIdentification) @@ -123,7 +125,9 @@ public final class IkeSessionOptionsTest { EapSessionConfig eapConfig = mock(EapSessionConfig.class); IkeSessionOptions sessionOptions = - new IkeSessionOptions.Builder(REMOTE_IPV4_ADDRESS, mUdpEncapSocket) + new IkeSessionOptions.Builder() + .setServerAddress(REMOTE_IPV4_ADDRESS) + .setUdpEncapsulationSocket(mUdpEncapSocket) .addSaProposal(mIkeSaProposal) .setLocalIdentification(mLocalIdentification) .setRemoteIdentification(mRemoteIdentification) @@ -148,7 +152,10 @@ public final class IkeSessionOptionsTest { @Test public void testBuildWithoutSaProposal() throws Exception { try { - new IkeSessionOptions.Builder(REMOTE_IPV4_ADDRESS, mUdpEncapSocket).build(); + new IkeSessionOptions.Builder() + .setServerAddress(REMOTE_IPV4_ADDRESS) + .setUdpEncapsulationSocket(mUdpEncapSocket) + .build(); fail("Expected to fail due to absence of SA proposal."); } catch (IllegalArgumentException expected) { } @@ -157,7 +164,9 @@ public final class IkeSessionOptionsTest { @Test public void testBuildWithoutLocalId() throws Exception { try { - new IkeSessionOptions.Builder(REMOTE_IPV4_ADDRESS, mUdpEncapSocket) + new IkeSessionOptions.Builder() + .setServerAddress(REMOTE_IPV4_ADDRESS) + .setUdpEncapsulationSocket(mUdpEncapSocket) .addSaProposal(mIkeSaProposal) .setRemoteIdentification(mRemoteIdentification) .setAuthPsk(PSK) @@ -170,7 +179,9 @@ public final class IkeSessionOptionsTest { @Test public void testBuildWithoutSetAuth() throws Exception { try { - new IkeSessionOptions.Builder(REMOTE_IPV4_ADDRESS, mUdpEncapSocket) + new IkeSessionOptions.Builder() + .setServerAddress(REMOTE_IPV4_ADDRESS) + .setUdpEncapsulationSocket(mUdpEncapSocket) .addSaProposal(mIkeSaProposal) .setLocalIdentification(mLocalIdentification) .setRemoteIdentification(mRemoteIdentification) diff --git a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java index 9821d742..93bcf2cd 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java +++ b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java @@ -724,7 +724,9 @@ public final class IkeSessionStateMachineTest { } private IkeSessionOptions.Builder buildIkeSessionOptionsCommon() throws Exception { - return new IkeSessionOptions.Builder(REMOTE_ADDRESS, mUdpEncapSocket) + return new IkeSessionOptions.Builder() + .setServerAddress(REMOTE_ADDRESS) + .setUdpEncapsulationSocket(mUdpEncapSocket) .addSaProposal(buildSaProposal()) .setLocalIdentification(new IkeIpv4AddrIdentification((Inet4Address) LOCAL_ADDRESS)) .setRemoteIdentification( diff --git a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionTest.java b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionTest.java index 60e99b02..43881d1d 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionTest.java +++ b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionTest.java @@ -73,8 +73,9 @@ public final class IkeSessionTest { } private IkeSessionOptions buildIkeSessionOptions() throws Exception { - return new IkeSessionOptions.Builder( - REMOTE_ADDRESS, mIpSecManager.openUdpEncapsulationSocket()) + return new IkeSessionOptions.Builder() + .setServerAddress(REMOTE_ADDRESS) + .setUdpEncapsulationSocket(mIpSecManager.openUdpEncapsulationSocket()) .addSaProposal(IkeSessionStateMachineTest.buildSaProposal()) .setLocalIdentification(new IkeIpv4AddrIdentification((Inet4Address) LOCAL_ADDRESS)) .setRemoteIdentification( |