From cf8c8d55f8c017474010c1da2ee01f042da4d410 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 5a7c486d70cd6a540a3f87ab51bd243ea0225cf1) Change-Id: I993eeaa5dec001c39389023f355f506129b356e7 --- .../net/java}/com/android/server/ConnectivityServiceTest.java | 0 .../server/connectivity/IpConnectivityEventBuilderTest.java | 0 .../android/server/connectivity/IpConnectivityMetricsTest.java | 0 .../java}/com/android/server/connectivity/LingerMonitorTest.java | 0 .../java}/com/android/server/connectivity/MetricsTestUtil.java | 0 .../android/server/connectivity/NetdEventListenerServiceTest.java | 0 .../net/java}/com/android/server/connectivity/VpnTest.java | 0 7 files changed, 0 insertions(+), 0 deletions(-) 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/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/VpnTest.java (100%) 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/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/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