Create Traffic Selector Payload

This commit:
- Create IkeTsPayload
- Fix bug in IkeMessageTest that sDecoderInstance is not reset

Bug: 124528083
Test: FrameworksIkeTests IkeTsPayloadTest
Change-Id: I4f610dae5ba63b544224bf0061eba58bd5ec5690

2 files changed, 52 insertions, 1 deletions

diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeMessageTest.java b/tests/iketests/src/java/com/android/ike/ikev2/message/IkeMessageTest.java
index 75f2ca20..8584f78a 100644
--- a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeMessageTest.java
+++ b/tests/iketests/src/java/com/android/ike/ikev2/message/IkeMessageTest.java
@@ -24,6 +24,7 @@ import com.android.ike.ikev2.exceptions.IkeException;
 import com.android.ike.ikev2.exceptions.InvalidSyntaxException;
 import com.android.ike.ikev2.exceptions.UnsupportedCriticalPayloadException;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -93,7 +94,7 @@ public final class IkeMessageTest {
     @Before
     public void setUp() {
         IkePayloadFactory.sDecoderInstance =
-                new IkePayloadFactory.IkePayloadDecoder() {
+                new IkePayloadFactory.IIkePayloadDecoder() {
 
                     @Override
                     public IkePayload decodeIkePayload(
@@ -108,6 +109,11 @@ public final class IkeMessageTest {
                 };
     }
 
+    @After
+    public void tearDown() {
+        IkePayloadFactory.sDecoderInstance = new IkePayloadFactory.IkePayloadDecoder();
+    }
+
     @Test
     public void testDecodeIkeMessage() throws Exception {
         byte[] inputPacket = TestUtils.hexStringToByteArray(IKE_SA_INIT_RAW_PACKET);
diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeTsPayloadTest.java b/tests/iketests/src/java/com/android/ike/ikev2/message/IkeTsPayloadTest.java
new file mode 100644
index 00000000..f1c8b6e6
--- /dev/null
+++ b/tests/iketests/src/java/com/android/ike/ikev2/message/IkeTsPayloadTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.ike.ikev2.message;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import java.nio.ByteBuffer;
+
+public final class IkeTsPayloadTest {
+    private static final String TS_INITIATOR_PAYLOAD_HEX_STRING =
+            "2d00001801000000070000100000ffff00000000ffffffff";
+    private static final int NUMBER_OF_TS = 1;
+
+    @Test
+    public void testDecodeTsInitiatorPayload() throws Exception {
+        ByteBuffer inputBuffer =
+                ByteBuffer.wrap(TestUtils.hexStringToByteArray(TS_INITIATOR_PAYLOAD_HEX_STRING));
+
+        IkePayload payload =
+                IkePayloadFactory.getIkePayload(IkePayload.PAYLOAD_TYPE_TS_INITIATOR, inputBuffer)
+                        .first;
+        assertTrue(payload instanceof IkeTsPayload);
+
+        IkeTsPayload tsPayload = (IkeTsPayload) payload;
+        assertEquals(IkePayload.PAYLOAD_TYPE_TS_INITIATOR, tsPayload.payloadType);
+        assertEquals(NUMBER_OF_TS, tsPayload.numTs);
+    }
+}