diff options
| author | evitayan <evitayan@google.com> | 2019-08-27 17:11:45 -0700 |
|---|---|---|
| committer | evitayan <evitayan@google.com> | 2019-09-04 14:25:16 -0700 |
| commit | 1080a5ec3f1fa41c45b39cc1c07a4b90a8679db8 (patch) | |
| tree | fb89b61f93a5bde3dcdbf718228c6e5b33d73d81 /tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java | |
| parent | abf1adb1340bdc9bab08ddc527576cfa15b41a3b (diff) | |
| download | ike-1080a5ec3f1fa41c45b39cc1c07a4b90a8679db8.tar.gz | |
Create DecodeResultPartial for decoding fragment
Bug: 122677075
Test: atest frameworksIkeTests
Change-Id: If308add9a0ab95dd3865bc74bc86ae80252aff1a
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 | 13 |
1 files changed, 6 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 b08def66..f3941fb4 100644 --- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java +++ b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java @@ -31,8 +31,7 @@ import static com.android.ike.ikev2.exceptions.IkeProtocolException.ERROR_TYPE_T import static com.android.ike.ikev2.exceptions.IkeProtocolException.ERROR_TYPE_UNSUPPORTED_CRITICAL_PAYLOAD; import static com.android.ike.ikev2.message.IkeHeader.EXCHANGE_TYPE_CREATE_CHILD_SA; import static com.android.ike.ikev2.message.IkeHeader.EXCHANGE_TYPE_INFORMATIONAL; -import static com.android.ike.ikev2.message.IkeMessage.DECODE_STATUS_OK; -import static com.android.ike.ikev2.message.IkeMessage.DECODE_STATUS_PROTECTED_ERROR_MESSAGE; +import static com.android.ike.ikev2.message.IkeMessage.DECODE_STATUS_PROTECTED_ERROR; import static com.android.ike.ikev2.message.IkeNotifyPayload.NOTIFY_TYPE_NAT_DETECTION_DESTINATION_IP; import static com.android.ike.ikev2.message.IkeNotifyPayload.NOTIFY_TYPE_NAT_DETECTION_SOURCE_IP; import static com.android.ike.ikev2.message.IkePayload.PAYLOAD_TYPE_NOTIFY; @@ -103,7 +102,8 @@ import com.android.ike.ikev2.message.IkeIdPayload; import com.android.ike.ikev2.message.IkeInformationalPayload; import com.android.ike.ikev2.message.IkeKePayload; import com.android.ike.ikev2.message.IkeMessage; -import com.android.ike.ikev2.message.IkeMessage.DecodeResult; +import com.android.ike.ikev2.message.IkeMessage.DecodeResultError; +import com.android.ike.ikev2.message.IkeMessage.DecodeResultOk; import com.android.ike.ikev2.message.IkeMessage.IIkeMessageHelper; import com.android.ike.ikev2.message.IkeMessage.IkeMessageHelper; import com.android.ike.ikev2.message.IkeNoncePayload; @@ -328,7 +328,7 @@ public final class IkeSessionStateMachineTest { byte[] dummyIkePacketBytes = new byte[0]; when(mMockIkeMessageHelper.decode(0, dummyIkeMessage.ikeHeader, dummyIkePacketBytes)) - .thenReturn(new DecodeResult(DECODE_STATUS_OK, dummyIkeMessage, null)); + .thenReturn(new DecodeResultOk(dummyIkeMessage)); return new ReceivedIkePacket(dummyIkeMessage.ikeHeader, dummyIkePacketBytes); } @@ -390,7 +390,7 @@ public final class IkeSessionStateMachineTest { eq(ikeSaRecord), eq(dummyIkeMessage.ikeHeader), eq(dummyIkePacketBytes))) - .thenReturn(new DecodeResult(DECODE_STATUS_OK, dummyIkeMessage, null)); + .thenReturn(new DecodeResultOk(dummyIkeMessage)); return new ReceivedIkePacket(dummyIkeMessage.ikeHeader, dummyIkePacketBytes); } @@ -416,8 +416,7 @@ public final class IkeSessionStateMachineTest { : ikeSaRecord.getRemoteRequestMessageId()); when(mMockIkeMessageHelper.decode( anyInt(), any(), any(), eq(ikeSaRecord), eq(header), any())) - .thenReturn( - new DecodeResult(DECODE_STATUS_PROTECTED_ERROR_MESSAGE, null, exception)); + .thenReturn(new DecodeResultError(DECODE_STATUS_PROTECTED_ERROR, exception)); return new ReceivedIkePacket(header, new byte[0]); } |