diff options
author | evitayan <evitayan@google.com> | 2019-10-17 12:27:02 -0700 |
---|---|---|
committer | evitayan <evitayan@google.com> | 2019-10-18 15:33:23 -0700 |
commit | 183ea916e1a1b1d9a9ab0377ec91e40e5ab608f0 (patch) | |
tree | 33211ccd0e1d93070a52f81a0bee5bd658213716 /tests/iketests/src | |
parent | bc660e56b593354f6a8995c64cb55527b303bfe2 (diff) | |
download | ike-183ea916e1a1b1d9a9ab0377ec91e40e5ab608f0.tar.gz |
Refactor IkeIdentification
This commit moves all subclasses of IkeIdentification to separate
files.
Bug: 142139930
Test: atest FrameworksIkeTests(all tests passed)
Change-Id: Ic89a432df601f851345371c8dda4df6ebd24addf
Diffstat (limited to 'tests/iketests/src')
4 files changed, 5 insertions, 9 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 32325084..392084f7 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionOptionsTest.java +++ b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionOptionsTest.java @@ -74,9 +74,8 @@ public final class IkeSessionOptionsTest { .addPseudorandomFunction(SaProposal.PSEUDORANDOM_FUNCTION_AES128_XCBC) .addDhGroup(SaProposal.DH_GROUP_1024_BIT_MODP) .build(); - mLocalIdentification = new IkeIdentification.IkeIpv4AddrIdentification(LOCAL_IPV4_ADDRESS); - mRemoteIdentification = - new IkeIdentification.IkeIpv4AddrIdentification(REMOTE_IPV4_ADDRESS); + mLocalIdentification = new IkeIpv4AddrIdentification(LOCAL_IPV4_ADDRESS); + mRemoteIdentification = new IkeIpv4AddrIdentification(REMOTE_IPV4_ADDRESS); } @After 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 f25a0179..a9bff9e4 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java +++ b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java @@ -77,7 +77,6 @@ import com.android.ike.eap.IEapCallback; import com.android.ike.ikev2.ChildSessionStateMachine.IChildSessionSmCallback; import com.android.ike.ikev2.ChildSessionStateMachineFactory.ChildSessionFactoryHelper; import com.android.ike.ikev2.ChildSessionStateMachineFactory.IChildSessionFactoryHelper; -import com.android.ike.ikev2.IkeIdentification.IkeIpv4AddrIdentification; import com.android.ike.ikev2.IkeLocalRequestScheduler.ChildLocalRequest; import com.android.ike.ikev2.IkeLocalRequestScheduler.LocalRequest; import com.android.ike.ikev2.IkeSessionStateMachine.IkeSecurityParameterIndex; 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 be32e3fa..60e99b02 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionTest.java +++ b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionTest.java @@ -16,8 +16,6 @@ package com.android.ike.ikev2; -import static com.android.ike.ikev2.IkeIdentification.IkeIpv4AddrIdentification; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeIdPayloadTest.java b/tests/iketests/src/java/com/android/ike/ikev2/message/IkeIdPayloadTest.java index cdd51d87..f6ef41e1 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeIdPayloadTest.java +++ b/tests/iketests/src/java/com/android/ike/ikev2/message/IkeIdPayloadTest.java @@ -21,10 +21,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import com.android.ike.TestUtils; +import com.android.ike.ikev2.IkeFqdnIdentification; import com.android.ike.ikev2.IkeIdentification; -import com.android.ike.ikev2.IkeIdentification.IkeFqdnIdentification; -import com.android.ike.ikev2.IkeIdentification.IkeIpv4AddrIdentification; -import com.android.ike.ikev2.IkeIdentification.IkeIpv6AddrIdentification; +import com.android.ike.ikev2.IkeIpv4AddrIdentification; +import com.android.ike.ikev2.IkeIpv6AddrIdentification; import com.android.ike.ikev2.exceptions.AuthenticationFailedException; import org.junit.Test; |