From b9693f313b65590f58500a90e28d50de0d35c33c Mon Sep 17 00:00:00 2001 From: Hugo Benichi Date: Mon, 15 May 2017 09:53:44 +0900 Subject: [PATCH] Finish moving NetworkStats tests to tests/net Follow-up of commit 4ff3a778abdc16a0a9cc1ee20372afa8bb7f52b0. Also add @SmallTest annotation to classes moved to tests/net. Test: no functional change Bug: 32561414 Change-Id: I0a0e8865d37ba7bae06ce352d3fc385989adc300 --- .../android/server/net/NetworkStatsAccessTest.java | 2 ++ .../server/net/NetworkStatsCollectionTest.java | 6 +++--- .../server/net/NetworkStatsObserversTest.java | 9 +++++---- .../android/server/net/NetworkStatsServiceTest.java | 2 ++ .../net}/res/raw/netstats_uid_v4 | Bin .../servicestests => tests/net}/res/raw/netstats_v1 | Bin 6 files changed, 12 insertions(+), 7 deletions(-) rename {services/tests/servicestests/src => tests/net/java}/com/android/server/net/NetworkStatsAccessTest.java (99%) rename {services/tests/servicestests/src => tests/net/java}/com/android/server/net/NetworkStatsCollectionTest.java (99%) rename {services/tests/servicestests/src => tests/net/java}/com/android/server/net/NetworkStatsObserversTest.java (99%) rename {services/tests/servicestests/src => tests/net/java}/com/android/server/net/NetworkStatsServiceTest.java (99%) rename {services/tests/servicestests => tests/net}/res/raw/netstats_uid_v4 (100%) rename {services/tests/servicestests => tests/net}/res/raw/netstats_v1 (100%) diff --git a/services/tests/servicestests/src/com/android/server/net/NetworkStatsAccessTest.java b/tests/net/java/com/android/server/net/NetworkStatsAccessTest.java similarity index 99% rename from services/tests/servicestests/src/com/android/server/net/NetworkStatsAccessTest.java rename to tests/net/java/com/android/server/net/NetworkStatsAccessTest.java index bb8f9d1a7b..e6b1c6d0fc 100644 --- a/services/tests/servicestests/src/com/android/server/net/NetworkStatsAccessTest.java +++ b/tests/net/java/com/android/server/net/NetworkStatsAccessTest.java @@ -25,6 +25,7 @@ import android.app.admin.DeviceAdminInfo; import android.app.admin.DevicePolicyManagerInternal; import android.content.Context; import android.content.pm.PackageManager; +import android.support.test.filters.SmallTest; import android.telephony.TelephonyManager; import com.android.server.LocalServices; @@ -34,6 +35,7 @@ import junit.framework.TestCase; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +@SmallTest public class NetworkStatsAccessTest extends TestCase { private static final String TEST_PKG = "com.example.test"; private static final int TEST_UID = 12345; diff --git a/services/tests/servicestests/src/com/android/server/net/NetworkStatsCollectionTest.java b/tests/net/java/com/android/server/net/NetworkStatsCollectionTest.java similarity index 99% rename from services/tests/servicestests/src/com/android/server/net/NetworkStatsCollectionTest.java rename to tests/net/java/com/android/server/net/NetworkStatsCollectionTest.java index 9f53c87834..2a32b73d56 100644 --- a/services/tests/servicestests/src/com/android/server/net/NetworkStatsCollectionTest.java +++ b/tests/net/java/com/android/server/net/NetworkStatsCollectionTest.java @@ -31,11 +31,11 @@ import android.net.NetworkTemplate; import android.os.Process; import android.os.UserHandle; import android.telephony.TelephonyManager; +import android.support.test.filters.SmallTest; import android.test.AndroidTestCase; import android.test.MoreAsserts; -import android.test.suitebuilder.annotation.MediumTest; -import com.android.frameworks.servicestests.R; +import com.android.frameworks.tests.net.R; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -51,7 +51,7 @@ import libcore.io.Streams; /** * Tests for {@link NetworkStatsCollection}. */ -@MediumTest +@SmallTest public class NetworkStatsCollectionTest extends AndroidTestCase { private static final String TEST_FILE = "test.bin"; diff --git a/services/tests/servicestests/src/com/android/server/net/NetworkStatsObserversTest.java b/tests/net/java/com/android/server/net/NetworkStatsObserversTest.java similarity index 99% rename from services/tests/servicestests/src/com/android/server/net/NetworkStatsObserversTest.java rename to tests/net/java/com/android/server/net/NetworkStatsObserversTest.java index 5eee7b948c..fe7840d096 100644 --- a/services/tests/servicestests/src/com/android/server/net/NetworkStatsObserversTest.java +++ b/tests/net/java/com/android/server/net/NetworkStatsObserversTest.java @@ -38,16 +38,16 @@ import android.net.DataUsageRequest; import android.net.NetworkIdentity; import android.net.NetworkStats; import android.net.NetworkTemplate; +import android.os.ConditionVariable; import android.os.Handler; import android.os.HandlerThread; import android.os.IBinder; -import android.os.Process; - -import android.os.ConditionVariable; import android.os.Looper; -import android.os.Messenger; import android.os.Message; +import android.os.Messenger; +import android.os.Process; import android.os.UserHandle; +import android.support.test.filters.SmallTest; import android.telephony.TelephonyManager; import android.util.ArrayMap; @@ -69,6 +69,7 @@ import org.mockito.MockitoAnnotations; /** * Tests for {@link NetworkStatsObservers}. */ +@SmallTest public class NetworkStatsObserversTest extends TestCase { private static final String TEST_IFACE = "test0"; private static final String TEST_IFACE2 = "test1"; diff --git a/services/tests/servicestests/src/com/android/server/net/NetworkStatsServiceTest.java b/tests/net/java/com/android/server/net/NetworkStatsServiceTest.java similarity index 99% rename from services/tests/servicestests/src/com/android/server/net/NetworkStatsServiceTest.java rename to tests/net/java/com/android/server/net/NetworkStatsServiceTest.java index 728eb734c5..029693f190 100644 --- a/services/tests/servicestests/src/com/android/server/net/NetworkStatsServiceTest.java +++ b/tests/net/java/com/android/server/net/NetworkStatsServiceTest.java @@ -85,6 +85,7 @@ import android.os.MessageQueue.IdleHandler; import android.os.Message; import android.os.PowerManager; import android.support.test.InstrumentationRegistry; +import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; import android.telephony.TelephonyManager; import android.test.AndroidTestCase; @@ -119,6 +120,7 @@ import java.util.List; * still uses the Easymock structure, which could be simplified. */ @RunWith(AndroidJUnit4.class) +@SmallTest public class NetworkStatsServiceTest { private static final String TAG = "NetworkStatsServiceTest"; diff --git a/services/tests/servicestests/res/raw/netstats_uid_v4 b/tests/net/res/raw/netstats_uid_v4 similarity index 100% rename from services/tests/servicestests/res/raw/netstats_uid_v4 rename to tests/net/res/raw/netstats_uid_v4 diff --git a/services/tests/servicestests/res/raw/netstats_v1 b/tests/net/res/raw/netstats_v1 similarity index 100% rename from services/tests/servicestests/res/raw/netstats_v1 rename to tests/net/res/raw/netstats_v1