diff options
| author | evitayan <evitayan@google.com> | 2019-10-03 13:16:31 -0700 |
|---|---|---|
| committer | evitayan <evitayan@google.com> | 2019-10-07 15:13:57 -0700 |
| commit | dad274987229a29cf6078b7240418a74b67e8e5a (patch) | |
| tree | ff2a66c0bfb11afb01240c1d198a30b442c6f887 /tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java | |
| parent | 8da4b86e0310297f05776b8423e0dc1779f85889 (diff) | |
| download | ike-dad274987229a29cf6078b7240418a74b67e8e5a.tar.gz | |
Refactor SaProposal
Make SaProposal abstract and create subclasses IkeSaProposal and
ChildProposal for IKE and Child negotiation separately.
Bug: 142139930
Test: atest FrameworksIkeTests(all passed)
Change-Id: I3bb7ad679228ff6f88e42b18a80ecc9db0576e3e
Diffstat (limited to 'tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java')
| -rw-r--r-- | tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java | 12 |
1 files changed, 5 insertions, 7 deletions
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 e34b12b8..e2c0c1c2 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java +++ b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java @@ -119,7 +119,6 @@ import com.android.ike.ikev2.message.IkePayload; import com.android.ike.ikev2.message.IkeSaPayload; import com.android.ike.ikev2.message.IkeSaPayload.DhGroupTransform; import com.android.ike.ikev2.message.IkeSaPayload.EncryptionTransform; -import com.android.ike.ikev2.message.IkeSaPayload.EsnTransform; import com.android.ike.ikev2.message.IkeSaPayload.IntegrityTransform; import com.android.ike.ikev2.message.IkeSaPayload.PrfTransform; import com.android.ike.ikev2.message.IkeSkfPayload; @@ -707,8 +706,8 @@ public final class IkeSessionStateMachineTest { return ikeSession; } - static SaProposal buildSaProposal() throws Exception { - return SaProposal.Builder.newIkeSaProposalBuilder() + static IkeSaProposal buildSaProposal() throws Exception { + return new IkeSaProposal.Builder() .addEncryptionAlgorithm( SaProposal.ENCRYPTION_ALGORITHM_AES_CBC, SaProposal.KEY_LEN_AES_128) .addIntegrityAlgorithm(SaProposal.INTEGRITY_ALGORITHM_HMAC_SHA1_96) @@ -736,8 +735,8 @@ public final class IkeSessionStateMachineTest { } private ChildSessionOptions buildChildSessionOptions() throws Exception { - SaProposal saProposal = - SaProposal.Builder.newChildSaProposalBuilder() + ChildSaProposal saProposal = + new ChildSaProposal.Builder() .addEncryptionAlgorithm( SaProposal.ENCRYPTION_ALGORITHM_AES_CBC, SaProposal.KEY_LEN_AES_128) .addIntegrityAlgorithm(SaProposal.INTEGRITY_ALGORITHM_HMAC_SHA1_96) @@ -1192,7 +1191,7 @@ public final class IkeSessionStateMachineTest { verifyRetransmissionStarted(); // Validate negotiated SA proposal. - SaProposal negotiatedProposal = mIkeSessionStateMachine.mSaProposal; + IkeSaProposal negotiatedProposal = mIkeSessionStateMachine.mSaProposal; assertNotNull(negotiatedProposal); assertEquals( @@ -1202,7 +1201,6 @@ public final class IkeSessionStateMachineTest { new IntegrityTransform[] {mIkeIntegrityTransform}, negotiatedProposal.getIntegrityTransforms()); assertEquals(new PrfTransform[] {mIkePrfTransform}, negotiatedProposal.getPrfTransforms()); - assertEquals(new EsnTransform[0], negotiatedProposal.getEsnTransforms()); // Validate current IkeSaRecord. verify(mMockSaRecordHelper) |