From 7ceef950a02b22bdf90609bdab8119b4bcd88edf Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Fri, 28 Oct 2016 12:48:36 +0900 Subject: [PATCH] DO NOT MERGE: Move the connectivity tests to frameworks/base/tests/net. This will give us a good place to put all the networking tests. Fix: 31479480 Test: adb shell am instrument -w -e notClass com.android.server.connectivity.tethering.TetherInterfaceStateMachineTest 'com.android.frameworks.tests.net/android.support.test.runner.AndroidJUnitRunner' # PASS (cherry picked from commit ecc986d430f4b8158f177ed97d2edb741f11ff71) Change-Id: I993eeaa5dec001c39389023f355f506129b356e7 --- tests/net/Android.mk | 80 ++++++++++++++++++ tests/net/AndroidManifest.xml | 57 +++++++++++++ .../net/ConnectivityMetricsLoggerTest.java | 0 .../net/java}/android/net/UidRangeTest.java | 2 +- .../net/java}/android/net/apf/ApfTest.java | 4 +- .../net/java}/android/net/apf/Bpf2Apf.java | 0 .../android/net/dhcp/DhcpPacketTest.java | 0 .../net/netlink/NetlinkErrorMessageTest.java | 0 .../net/netlink/NetlinkSocketTest.java | 0 .../netlink/RtNetlinkNeighborMessageTest.java | 0 .../java}/android/net/util/IpUtilsTest.java | 0 .../server/ConnectivityServiceTest.java | 0 .../IpConnectivityEventBuilderTest.java | 0 .../IpConnectivityMetricsTest.java | 0 .../connectivity/LingerMonitorTest.java | 0 .../MetricsLoggerServiceTest.java | 0 .../server/connectivity/MetricsTestUtil.java | 0 .../NetdEventListenerServiceTest.java | 0 .../server/connectivity/TetheringTest.java | 0 .../android/server/connectivity/VpnTest.java | 0 .../TetherInterfaceStateMachineTest.java | 0 .../net}/jni/UidRangeTest.cpp | 0 .../net}/jni/UidRangeTest.h | 0 .../net}/jni/apf_jni.cpp | 0 .../net}/res/raw/apf.pcap | Bin 25 files changed, 140 insertions(+), 3 deletions(-) create mode 100644 tests/net/Android.mk create mode 100644 tests/net/AndroidManifest.xml rename {services/tests/servicestests/src => tests/net/java}/android/net/ConnectivityMetricsLoggerTest.java (100%) rename {services/tests/servicestests/src => tests/net/java}/android/net/UidRangeTest.java (98%) rename {services/tests/servicestests/src => tests/net/java}/android/net/apf/ApfTest.java (99%) rename {services/tests/servicestests/src => tests/net/java}/android/net/apf/Bpf2Apf.java (100%) rename {services/tests/servicestests/src => tests/net/java}/android/net/dhcp/DhcpPacketTest.java (100%) rename {services/tests/servicestests/src => tests/net/java}/android/net/netlink/NetlinkErrorMessageTest.java (100%) rename {services/tests/servicestests/src => tests/net/java}/android/net/netlink/NetlinkSocketTest.java (100%) rename {services/tests/servicestests/src => tests/net/java}/android/net/netlink/RtNetlinkNeighborMessageTest.java (100%) rename {services/tests/servicestests/src => tests/net/java}/android/net/util/IpUtilsTest.java (100%) rename {services/tests/servicestests/src => tests/net/java}/com/android/server/ConnectivityServiceTest.java (100%) rename {services/tests/servicestests/src => tests/net/java}/com/android/server/connectivity/IpConnectivityEventBuilderTest.java (100%) rename {services/tests/servicestests/src => tests/net/java}/com/android/server/connectivity/IpConnectivityMetricsTest.java (100%) rename {services/tests/servicestests/src => tests/net/java}/com/android/server/connectivity/LingerMonitorTest.java (100%) rename {services/tests/servicestests/src => tests/net/java}/com/android/server/connectivity/MetricsLoggerServiceTest.java (100%) rename {services/tests/servicestests/src => tests/net/java}/com/android/server/connectivity/MetricsTestUtil.java (100%) rename {services/tests/servicestests/src => tests/net/java}/com/android/server/connectivity/NetdEventListenerServiceTest.java (100%) rename {services/tests/servicestests/src => tests/net/java}/com/android/server/connectivity/TetheringTest.java (100%) rename {services/tests/servicestests/src => tests/net/java}/com/android/server/connectivity/VpnTest.java (100%) rename {services/tests/servicestests/src => tests/net/java}/com/android/server/connectivity/tethering/TetherInterfaceStateMachineTest.java (100%) rename {services/tests/servicestests => tests/net}/jni/UidRangeTest.cpp (100%) rename {services/tests/servicestests => tests/net}/jni/UidRangeTest.h (100%) rename {services/tests/servicestests => tests/net}/jni/apf_jni.cpp (100%) rename {services/tests/servicestests => tests/net}/res/raw/apf.pcap (100%) diff --git a/tests/net/Android.mk b/tests/net/Android.mk new file mode 100644 index 0000000000000..8aa27a9559b88 --- /dev/null +++ b/tests/net/Android.mk @@ -0,0 +1,80 @@ +######################################################################### +# Build FrameworksNetTests package +######################################################################### + +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +# We only want this apk build for tests. +LOCAL_MODULE_TAGS := tests + +# Include all test java files. +LOCAL_SRC_FILES := $(call all-java-files-under, java) + +LOCAL_STATIC_JAVA_LIBRARIES := \ + frameworks-base-testutils \ + framework-protos \ + android-support-test \ + mockito-target-minus-junit4 \ + platform-test-annotations \ + services.core \ + services.net + +LOCAL_JAVA_LIBRARIES := \ + android.test.runner + +LOCAL_PACKAGE_NAME := FrameworksNetTests + +LOCAL_CERTIFICATE := platform + +# These are not normally accessible from apps so they must be explicitly included. +LOCAL_JNI_SHARED_LIBRARIES := libframeworksnettestsjni \ + libbacktrace \ + libbase \ + libbinder \ + libc++ \ + libcutils \ + liblog \ + liblzma \ + libnativehelper \ + libnetdaidl \ + libui \ + libunwind \ + libutils + +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk + +include $(BUILD_PACKAGE) + +######################################################################### +# Build JNI Shared Library +######################################################################### + +LOCAL_PATH:= $(LOCAL_PATH)/jni + +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := tests + +LOCAL_CFLAGS := -Wall -Wextra -Werror + +LOCAL_C_INCLUDES := \ + libpcap \ + hardware/google/apf + +LOCAL_SRC_FILES := $(call all-cpp-files-under) + +LOCAL_SHARED_LIBRARIES := \ + libbinder \ + liblog \ + libcutils \ + libnativehelper \ + libnetdaidl + +LOCAL_STATIC_LIBRARIES := \ + libpcap \ + libapf + +LOCAL_MODULE := libframeworksnettestsjni + +include $(BUILD_SHARED_LIBRARY) diff --git a/tests/net/AndroidManifest.xml b/tests/net/AndroidManifest.xml new file mode 100644 index 0000000000000..e069dd052d82c --- /dev/null +++ b/tests/net/AndroidManifest.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/services/tests/servicestests/src/android/net/ConnectivityMetricsLoggerTest.java b/tests/net/java/android/net/ConnectivityMetricsLoggerTest.java similarity index 100% rename from services/tests/servicestests/src/android/net/ConnectivityMetricsLoggerTest.java rename to tests/net/java/android/net/ConnectivityMetricsLoggerTest.java diff --git a/services/tests/servicestests/src/android/net/UidRangeTest.java b/tests/net/java/android/net/UidRangeTest.java similarity index 98% rename from services/tests/servicestests/src/android/net/UidRangeTest.java rename to tests/net/java/android/net/UidRangeTest.java index 221fe0f99f0bc..0a56e1be6cae5 100644 --- a/services/tests/servicestests/src/android/net/UidRangeTest.java +++ b/tests/net/java/android/net/UidRangeTest.java @@ -26,7 +26,7 @@ import static org.junit.Assert.assertArrayEquals; public class UidRangeTest extends TestCase { static { - System.loadLibrary("servicestestsjni"); + System.loadLibrary("frameworksnettestsjni"); } private static native byte[] readAndWriteNative(byte[] inParcel); diff --git a/services/tests/servicestests/src/android/net/apf/ApfTest.java b/tests/net/java/android/net/apf/ApfTest.java similarity index 99% rename from services/tests/servicestests/src/android/net/apf/ApfTest.java rename to tests/net/java/android/net/apf/ApfTest.java index 37807b22264a6..b7ec00460ae63 100644 --- a/services/tests/servicestests/src/android/net/apf/ApfTest.java +++ b/tests/net/java/android/net/apf/ApfTest.java @@ -35,7 +35,7 @@ import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.LargeTest; import static android.system.OsConstants.*; -import com.android.frameworks.servicestests.R; +import com.android.frameworks.tests.net.R; import com.android.internal.util.HexDump; import org.mockito.ArgumentCaptor; @@ -75,7 +75,7 @@ public class ApfTest extends AndroidTestCase { super.setUp(); MockitoAnnotations.initMocks(this); // Load up native shared library containing APF interpreter exposed via JNI. - System.loadLibrary("servicestestsjni"); + System.loadLibrary("frameworksnettestsjni"); } // Expected return codes from APF interpreter. diff --git a/services/tests/servicestests/src/android/net/apf/Bpf2Apf.java b/tests/net/java/android/net/apf/Bpf2Apf.java similarity index 100% rename from services/tests/servicestests/src/android/net/apf/Bpf2Apf.java rename to tests/net/java/android/net/apf/Bpf2Apf.java diff --git a/services/tests/servicestests/src/android/net/dhcp/DhcpPacketTest.java b/tests/net/java/android/net/dhcp/DhcpPacketTest.java similarity index 100% rename from services/tests/servicestests/src/android/net/dhcp/DhcpPacketTest.java rename to tests/net/java/android/net/dhcp/DhcpPacketTest.java diff --git a/services/tests/servicestests/src/android/net/netlink/NetlinkErrorMessageTest.java b/tests/net/java/android/net/netlink/NetlinkErrorMessageTest.java similarity index 100% rename from services/tests/servicestests/src/android/net/netlink/NetlinkErrorMessageTest.java rename to tests/net/java/android/net/netlink/NetlinkErrorMessageTest.java diff --git a/services/tests/servicestests/src/android/net/netlink/NetlinkSocketTest.java b/tests/net/java/android/net/netlink/NetlinkSocketTest.java similarity index 100% rename from services/tests/servicestests/src/android/net/netlink/NetlinkSocketTest.java rename to tests/net/java/android/net/netlink/NetlinkSocketTest.java diff --git a/services/tests/servicestests/src/android/net/netlink/RtNetlinkNeighborMessageTest.java b/tests/net/java/android/net/netlink/RtNetlinkNeighborMessageTest.java similarity index 100% rename from services/tests/servicestests/src/android/net/netlink/RtNetlinkNeighborMessageTest.java rename to tests/net/java/android/net/netlink/RtNetlinkNeighborMessageTest.java diff --git a/services/tests/servicestests/src/android/net/util/IpUtilsTest.java b/tests/net/java/android/net/util/IpUtilsTest.java similarity index 100% rename from services/tests/servicestests/src/android/net/util/IpUtilsTest.java rename to tests/net/java/android/net/util/IpUtilsTest.java diff --git a/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java rename to tests/net/java/com/android/server/ConnectivityServiceTest.java diff --git a/services/tests/servicestests/src/com/android/server/connectivity/IpConnectivityEventBuilderTest.java b/tests/net/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/connectivity/IpConnectivityEventBuilderTest.java rename to tests/net/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java diff --git a/services/tests/servicestests/src/com/android/server/connectivity/IpConnectivityMetricsTest.java b/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/connectivity/IpConnectivityMetricsTest.java rename to tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java diff --git a/services/tests/servicestests/src/com/android/server/connectivity/LingerMonitorTest.java b/tests/net/java/com/android/server/connectivity/LingerMonitorTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/connectivity/LingerMonitorTest.java rename to tests/net/java/com/android/server/connectivity/LingerMonitorTest.java diff --git a/services/tests/servicestests/src/com/android/server/connectivity/MetricsLoggerServiceTest.java b/tests/net/java/com/android/server/connectivity/MetricsLoggerServiceTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/connectivity/MetricsLoggerServiceTest.java rename to tests/net/java/com/android/server/connectivity/MetricsLoggerServiceTest.java diff --git a/services/tests/servicestests/src/com/android/server/connectivity/MetricsTestUtil.java b/tests/net/java/com/android/server/connectivity/MetricsTestUtil.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/connectivity/MetricsTestUtil.java rename to tests/net/java/com/android/server/connectivity/MetricsTestUtil.java diff --git a/services/tests/servicestests/src/com/android/server/connectivity/NetdEventListenerServiceTest.java b/tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/connectivity/NetdEventListenerServiceTest.java rename to tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java diff --git a/services/tests/servicestests/src/com/android/server/connectivity/TetheringTest.java b/tests/net/java/com/android/server/connectivity/TetheringTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/connectivity/TetheringTest.java rename to tests/net/java/com/android/server/connectivity/TetheringTest.java diff --git a/services/tests/servicestests/src/com/android/server/connectivity/VpnTest.java b/tests/net/java/com/android/server/connectivity/VpnTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/connectivity/VpnTest.java rename to tests/net/java/com/android/server/connectivity/VpnTest.java diff --git a/services/tests/servicestests/src/com/android/server/connectivity/tethering/TetherInterfaceStateMachineTest.java b/tests/net/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachineTest.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/connectivity/tethering/TetherInterfaceStateMachineTest.java rename to tests/net/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachineTest.java diff --git a/services/tests/servicestests/jni/UidRangeTest.cpp b/tests/net/jni/UidRangeTest.cpp similarity index 100% rename from services/tests/servicestests/jni/UidRangeTest.cpp rename to tests/net/jni/UidRangeTest.cpp diff --git a/services/tests/servicestests/jni/UidRangeTest.h b/tests/net/jni/UidRangeTest.h similarity index 100% rename from services/tests/servicestests/jni/UidRangeTest.h rename to tests/net/jni/UidRangeTest.h diff --git a/services/tests/servicestests/jni/apf_jni.cpp b/tests/net/jni/apf_jni.cpp similarity index 100% rename from services/tests/servicestests/jni/apf_jni.cpp rename to tests/net/jni/apf_jni.cpp diff --git a/services/tests/servicestests/res/raw/apf.pcap b/tests/net/res/raw/apf.pcap similarity index 100% rename from services/tests/servicestests/res/raw/apf.pcap rename to tests/net/res/raw/apf.pcap