From 5564d5a8f6bec14c1c77e2a36061af909a59bfe0 Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Mon, 8 Apr 2019 17:05:56 +0900
Subject: [PATCH] Move more network unit tests to common tests

This adds the moved tests to CTS as well.
The moved unit tests are appropriate for CTS as they test data holder
classes that need to function properly for apps to work.

Test: atest FrameworksNetTests
Test: atest CtsNetTestCases: added tests pass
Bug: 129199900
Change-Id: I4c3d31ed595024af84093ca9110ed43633c383f4
---
 tests/net/Android.bp                                           | 1 +
 tests/net/common/Android.bp                                    | 1 +
 tests/net/{ => common}/java/android/net/LinkAddressTest.java   | 0
 .../net/{ => common}/java/android/net/LinkPropertiesTest.java  | 0
 .../{ => common}/java/android/net/NetworkCapabilitiesTest.java | 0
 tests/net/{ => common}/java/android/net/NetworkTest.java       | 0
 tests/net/{ => common}/java/android/net/RouteInfoTest.java     | 0
 .../java/android/net/StaticIpConfigurationTest.java            | 0
 .../{ => common}/java/android/net/apf/ApfCapabilitiesTest.java | 3 +--
 9 files changed, 3 insertions(+), 2 deletions(-)
 rename tests/net/{ => common}/java/android/net/LinkAddressTest.java (100%)
 rename tests/net/{ => common}/java/android/net/LinkPropertiesTest.java (100%)
 rename tests/net/{ => common}/java/android/net/NetworkCapabilitiesTest.java (100%)
 rename tests/net/{ => common}/java/android/net/NetworkTest.java (100%)
 rename tests/net/{ => common}/java/android/net/RouteInfoTest.java (100%)
 rename tests/net/{ => common}/java/android/net/StaticIpConfigurationTest.java (100%)
 rename tests/net/{ => common}/java/android/net/apf/ApfCapabilitiesTest.java (96%)

diff --git a/tests/net/Android.bp b/tests/net/Android.bp
index 9098f90fd7..11f0ff6d7e 100644
--- a/tests/net/Android.bp
+++ b/tests/net/Android.bp
@@ -6,6 +6,7 @@ java_defaults {
     static_libs: [
         "FrameworksNetCommonTests",
         "frameworks-base-testutils",
+        "frameworks-net-testutils",
         "framework-protos",
         "androidx.test.rules",
         "mockito-target-minus-junit4",
diff --git a/tests/net/common/Android.bp b/tests/net/common/Android.bp
index 0a1ac75aac..9ee5858377 100644
--- a/tests/net/common/Android.bp
+++ b/tests/net/common/Android.bp
@@ -21,6 +21,7 @@ java_library {
     srcs: ["java/**/*.java"],
     static_libs: [
         "androidx.test.rules",
+        "frameworks-net-testutils",
         "junit",
     ],
     libs: [
diff --git a/tests/net/java/android/net/LinkAddressTest.java b/tests/net/common/java/android/net/LinkAddressTest.java
similarity index 100%
rename from tests/net/java/android/net/LinkAddressTest.java
rename to tests/net/common/java/android/net/LinkAddressTest.java
diff --git a/tests/net/java/android/net/LinkPropertiesTest.java b/tests/net/common/java/android/net/LinkPropertiesTest.java
similarity index 100%
rename from tests/net/java/android/net/LinkPropertiesTest.java
rename to tests/net/common/java/android/net/LinkPropertiesTest.java
diff --git a/tests/net/java/android/net/NetworkCapabilitiesTest.java b/tests/net/common/java/android/net/NetworkCapabilitiesTest.java
similarity index 100%
rename from tests/net/java/android/net/NetworkCapabilitiesTest.java
rename to tests/net/common/java/android/net/NetworkCapabilitiesTest.java
diff --git a/tests/net/java/android/net/NetworkTest.java b/tests/net/common/java/android/net/NetworkTest.java
similarity index 100%
rename from tests/net/java/android/net/NetworkTest.java
rename to tests/net/common/java/android/net/NetworkTest.java
diff --git a/tests/net/java/android/net/RouteInfoTest.java b/tests/net/common/java/android/net/RouteInfoTest.java
similarity index 100%
rename from tests/net/java/android/net/RouteInfoTest.java
rename to tests/net/common/java/android/net/RouteInfoTest.java
diff --git a/tests/net/java/android/net/StaticIpConfigurationTest.java b/tests/net/common/java/android/net/StaticIpConfigurationTest.java
similarity index 100%
rename from tests/net/java/android/net/StaticIpConfigurationTest.java
rename to tests/net/common/java/android/net/StaticIpConfigurationTest.java
diff --git a/tests/net/java/android/net/apf/ApfCapabilitiesTest.java b/tests/net/common/java/android/net/apf/ApfCapabilitiesTest.java
similarity index 96%
rename from tests/net/java/android/net/apf/ApfCapabilitiesTest.java
rename to tests/net/common/java/android/net/apf/ApfCapabilitiesTest.java
index 75752c33da..7238895b36 100644
--- a/tests/net/java/android/net/apf/ApfCapabilitiesTest.java
+++ b/tests/net/common/java/android/net/apf/ApfCapabilitiesTest.java
@@ -19,11 +19,10 @@ package android.net.apf;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 
-import android.net.shared.ParcelableTestUtil;
-
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.android.internal.util.ParcelableTestUtil;
 import com.android.internal.util.TestUtils;
 
 import org.junit.Test;