| commit | ab3901dc8b1a8e77b83be362415920b955fdcbae | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Apr 13 05:18:46 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Apr 13 05:18:47 2017 +0000 |
| tree | c5c7b6a9319fe72d51509383283f2944816e923c | |
| parent | d0f476bdaef85ac178c97b76f0589604f11fd109 [diff] | |
| parent | c86013be936f36c61fa0cdfad95141f6de3c6ef7 [diff] |
Merge "Move some NetworkStats tests to tests/net."
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/core/tests/coretests/res/raw/history_v1 b/tests/net/res/raw/history_v1 similarity index 100% rename from core/tests/coretests/res/raw/history_v1 rename to 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