commit ffe595431274cf65b101b78937a1930b7b3a5d4f
author Junyu Lai <junyulai@google.com> Tue May 31 01:58:10 2022 +0000
committer Junyu Lai <junyulai@google.com> Wed Jun 15 06:08:46 2022 +0000
tree 08c3630cd4e0e43357af779023944e855980ff99
parent cb2e7764e3acb6855e58860ccff9e642c96ce53d

Revert "Disable NetworkStatsHistory builder test in tm-dev"

This CL reverts ag/18615112 and ag/18660036 by pointing
the merged-in tag to an unrelated CL that only exists on
aosp and its downstreams, to make this CL doesn't
get merged in aosp downstreams.

Ignore-AOSP-First: tm-dev only change.
Bug: 234099453
Test: atest android.net.netstats.NetworkStatsHistoryTest
Change-Id: Iefe38f7a671900f45475d1daf2f7d1f781aed540
Merged-In: I47fb59334d00ae7fee91c5694548b3cf89b09b2d
Reason: Prebuilt is merged.

tests/common/java/android/net/netstats/NetworkStatsHistoryTest.kt

diff --git a/tests/common/java/android/net/netstats/NetworkStatsHistoryTest.kt b/tests/common/java/android/net/netstats/NetworkStatsHistoryTest.kt
index 9343ea1..a6c9f3c 100644
--- a/tests/common/java/android/net/netstats/NetworkStatsHistoryTest.kt
+++ b/tests/common/java/android/net/netstats/NetworkStatsHistoryTest.kt
@@ -22,7 +22,6 @@
 import com.android.testutils.ConnectivityModuleTest
 import com.android.testutils.DevSdkIgnoreRule
 import com.android.testutils.SC_V2
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -37,7 +36,6 @@
     @JvmField
     val ignoreRule = DevSdkIgnoreRule(ignoreClassUpTo = SC_V2)
 
-    @Ignore
     @Test
     fun testBuilder() {
         val entry1 = NetworkStatsHistory.Entry(10, 30, 40, 4, 50, 5, 60)
@@ -63,7 +61,6 @@
         statsMultiple.assertEntriesEqual(entry3, entry1, entry2)
     }
 
-    @Ignore
     @Test
     fun testBuilderSortAndDeduplicate() {
         val entry1 = NetworkStatsHistory.Entry(10, 30, 40, 4, 50, 5, 60)