Merge "Create testutils folder"

6 files changed, 7 insertions, 2 deletions

diff --git a/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionStateMachineTest.java b/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionStateMachineTest.java
index 0614a807..23331286 100644
--- a/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionStateMachineTest.java
+++ b/tests/iketests/src/java/com/android/ike/ikev2/ChildSessionStateMachineTest.java
@@ -97,6 +97,7 @@ import com.android.ike.ikev2.message.IkeSaPayload.IntegrityTransform;
 import com.android.ike.ikev2.message.IkeSaPayload.PrfTransform;
 import com.android.ike.ikev2.message.IkeTestUtils;
 import com.android.ike.ikev2.message.IkeTsPayload;
+import com.android.ike.ikev2.testutils.MockIpSecTestUtils;
 import com.android.ike.utils.Log;
 import com.android.server.IpSecService;
 
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 f241b787..e34b12b8 100644
--- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java
+++ b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java
@@ -125,6 +125,7 @@ import com.android.ike.ikev2.message.IkeSaPayload.PrfTransform;
 import com.android.ike.ikev2.message.IkeSkfPayload;
 import com.android.ike.ikev2.message.IkeTestUtils;
 import com.android.ike.ikev2.message.IkeTsPayload;
+import com.android.ike.ikev2.testutils.MockIpSecTestUtils;
 import com.android.ike.ikev2.utils.Retransmitter;
 import com.android.ike.ikev2.utils.Retransmitter.IBackoffTimeoutCalculator;
 import com.android.ike.utils.Log;
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 7dd4096a..be32e3fa 100644
--- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionTest.java
+++ b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionTest.java
@@ -29,6 +29,8 @@ import android.os.Looper;
 import android.os.test.TestLooper;
 import android.util.Log;
 
+import com.android.ike.ikev2.testutils.MockIpSecTestUtils;
+
 import libcore.net.InetAddressUtils;
 
 import org.junit.Before;
diff --git a/tests/iketests/src/java/com/android/ike/ikev2/SaRecordTest.java b/tests/iketests/src/java/com/android/ike/ikev2/SaRecordTest.java
index d66a864d..e3a69554 100644
--- a/tests/iketests/src/java/com/android/ike/ikev2/SaRecordTest.java
+++ b/tests/iketests/src/java/com/android/ike/ikev2/SaRecordTest.java
@@ -51,6 +51,7 @@ import com.android.ike.ikev2.message.IkeMessage;
 import com.android.ike.ikev2.message.IkeSaPayload.EncryptionTransform;
 import com.android.ike.ikev2.message.IkeSaPayload.IntegrityTransform;
 import com.android.ike.ikev2.message.IkeSaPayload.PrfTransform;
+import com.android.ike.ikev2.testutils.MockIpSecTestUtils;
 import com.android.server.IpSecService;
 
 import libcore.net.InetAddressUtils;
diff --git a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeSaPayloadTest.java b/tests/iketests/src/java/com/android/ike/ikev2/message/IkeSaPayloadTest.java
index b40fd02b..e389ec02 100644
--- a/tests/iketests/src/java/com/android/ike/ikev2/message/IkeSaPayloadTest.java
+++ b/tests/iketests/src/java/com/android/ike/ikev2/message/IkeSaPayloadTest.java
@@ -36,7 +36,6 @@ import android.net.IpSecSpiResponse;
 import android.util.Pair;
 
 import com.android.ike.TestUtils;
-import com.android.ike.ikev2.MockIpSecTestUtils;
 import com.android.ike.ikev2.SaProposal;
 import com.android.ike.ikev2.exceptions.IkeProtocolException;
 import com.android.ike.ikev2.exceptions.InvalidSyntaxException;
@@ -56,6 +55,7 @@ import com.android.ike.ikev2.message.IkeSaPayload.Transform;
 import com.android.ike.ikev2.message.IkeSaPayload.TransformDecoder;
 import com.android.ike.ikev2.message.IkeSaPayload.UnrecognizedAttribute;
 import com.android.ike.ikev2.message.IkeSaPayload.UnrecognizedTransform;
+import com.android.ike.ikev2.testutils.MockIpSecTestUtils;
 import com.android.server.IpSecService;
 
 import libcore.net.InetAddressUtils;
diff --git a/tests/iketests/src/java/com/android/ike/ikev2/MockIpSecTestUtils.java b/tests/iketests/src/java/com/android/ike/ikev2/testutils/MockIpSecTestUtils.java
index fed1524f..9659f5e4 100644
--- a/tests/iketests/src/java/com/android/ike/ikev2/MockIpSecTestUtils.java
+++ b/tests/iketests/src/java/com/android/ike/ikev2/testutils/MockIpSecTestUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.ike.ikev2;
+package com.android.ike.ikev2.testutils;
 
 import static android.system.OsConstants.AF_INET;
 import static android.system.OsConstants.IPPROTO_UDP;