| commit | f7ffa460e4658f79f1bd65f2d232ac0ee7e6ff0b | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Apr 13 01:18:05 2017 +0900 |
| committer | Hugo Benichi <hugobenichi@google.com> | Mon May 08 08:38:08 2017 +0000 |
| tree | 6e9acc52ff984be64a1c535b00b3f0ba2f8cf27a | |
| parent | 500dbae1b5a9b2f3fc0c8406f5628f060eced079 [diff] |
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)
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 9a08f41..e7b91b5 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.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 7f13abc..978e5f5 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.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 0000000..de79491 --- /dev/null +++ b/tests/net/res/raw/history_v1 Binary files differ
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