From f7ffa460e4658f79f1bd65f2d232ac0ee7e6ff0b Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Thu, 13 Apr 2017 01:18:05 +0900 Subject: [PATCH] Move some NetworkStats tests to tests/net. This groups them together with the rest of the networking unit tests. It also speeds up compile/test cycles ("runtest -x" of one file goes from 1m15s to 30s). Bug: 33681750 Test: runtest frameworks-net passes on internal tree Merged-In: I53cb0c51355fe4b4b30e451fa09fbbf58da39efd Change-Id: I5ae5dbf74c94feb0fe3759681e5e6d6fba62fa32 (cherry picked from commit c86013be936f36c61fa0cdfad95141f6de3c6ef7) --- .../android/net/NetworkStatsHistoryTest.java | 2 +- .../net/java}/android/net/NetworkStatsTest.java | 0 .../internal/net/NetworkStatsFactoryTest.java | 2 +- tests/net/res/raw/history_v1 | Bin 0 -> 144 bytes .../net}/res/raw/xt_qtaguid_iface_fmt_typical | 0 .../net}/res/raw/xt_qtaguid_iface_typical | 0 .../net}/res/raw/xt_qtaguid_typical | 0 7 files changed, 2 insertions(+), 2 deletions(-) rename {core/tests/coretests/src => tests/net/java}/android/net/NetworkStatsHistoryTest.java (99%) rename {core/tests/coretests/src => tests/net/java}/android/net/NetworkStatsTest.java (100%) rename {core/tests/coretests/src => tests/net/java}/com/android/internal/net/NetworkStatsFactoryTest.java (99%) create mode 100644 tests/net/res/raw/history_v1 rename {core/tests/coretests => tests/net}/res/raw/xt_qtaguid_iface_fmt_typical (100%) rename {core/tests/coretests => tests/net}/res/raw/xt_qtaguid_iface_typical (100%) rename {core/tests/coretests => tests/net}/res/raw/xt_qtaguid_typical (100%) diff --git a/core/tests/coretests/src/android/net/NetworkStatsHistoryTest.java b/tests/net/java/android/net/NetworkStatsHistoryTest.java similarity index 99% rename from core/tests/coretests/src/android/net/NetworkStatsHistoryTest.java rename to tests/net/java/android/net/NetworkStatsHistoryTest.java index 9a08f4147e..e7b91b568d 100644 --- a/core/tests/coretests/src/android/net/NetworkStatsHistoryTest.java +++ b/tests/net/java/android/net/NetworkStatsHistoryTest.java @@ -38,7 +38,7 @@ import android.test.suitebuilder.annotation.SmallTest; import android.test.suitebuilder.annotation.Suppress; import android.util.Log; -import com.android.frameworks.coretests.R; +import com.android.frameworks.tests.net.R; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/core/tests/coretests/src/android/net/NetworkStatsTest.java b/tests/net/java/android/net/NetworkStatsTest.java similarity index 100% rename from core/tests/coretests/src/android/net/NetworkStatsTest.java rename to tests/net/java/android/net/NetworkStatsTest.java diff --git a/core/tests/coretests/src/com/android/internal/net/NetworkStatsFactoryTest.java b/tests/net/java/com/android/internal/net/NetworkStatsFactoryTest.java similarity index 99% rename from core/tests/coretests/src/com/android/internal/net/NetworkStatsFactoryTest.java rename to tests/net/java/com/android/internal/net/NetworkStatsFactoryTest.java index 7f13abc6d2..978e5f548c 100644 --- a/core/tests/coretests/src/com/android/internal/net/NetworkStatsFactoryTest.java +++ b/tests/net/java/com/android/internal/net/NetworkStatsFactoryTest.java @@ -30,7 +30,7 @@ import android.net.NetworkStats; import android.net.TrafficStats; import android.test.AndroidTestCase; -import com.android.frameworks.coretests.R; +import com.android.frameworks.tests.net.R; import java.io.File; import java.io.FileOutputStream; diff --git a/tests/net/res/raw/history_v1 b/tests/net/res/raw/history_v1 new file mode 100644 index 0000000000000000000000000000000000000000..de79491c032e13c800c647e165cc2523db015197 GIT binary patch literal 144 zcmZQzU|?hb1FIQ8iWSH;bko}Y0YZQ30MpvK3J^Md2ZUY}08tClSa=;oGBAW+0aGm6 jPGFir`~ZYzJp!bG=7NBPKZMqv51}{gg3!!9P}&Uuc@hyu literal 0 HcmV?d00001 diff --git a/core/tests/coretests/res/raw/xt_qtaguid_iface_fmt_typical b/tests/net/res/raw/xt_qtaguid_iface_fmt_typical similarity index 100% rename from core/tests/coretests/res/raw/xt_qtaguid_iface_fmt_typical rename to tests/net/res/raw/xt_qtaguid_iface_fmt_typical diff --git a/core/tests/coretests/res/raw/xt_qtaguid_iface_typical b/tests/net/res/raw/xt_qtaguid_iface_typical similarity index 100% rename from core/tests/coretests/res/raw/xt_qtaguid_iface_typical rename to tests/net/res/raw/xt_qtaguid_iface_typical diff --git a/core/tests/coretests/res/raw/xt_qtaguid_typical b/tests/net/res/raw/xt_qtaguid_typical similarity index 100% rename from core/tests/coretests/res/raw/xt_qtaguid_typical rename to tests/net/res/raw/xt_qtaguid_typical