commit 22bfde676f75bf8e25734d638e738e51a9aab909
author Aaron Huang <huangaaron@google.com> Tue May 03 07:33:42 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue May 03 07:33:42 2022 +0000
tree 96cd79372010e15417ae13cacb66574773ad4975
parent d5c78371729b776d571ee191a92cbbc124253bc9
parent c7975ff3bf39ca428d69f6bf3016b505f6f4a054

Merge "Add test for NetworkTemplate.Builder#setRoaming(int)" am: c7975ff3bf

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2020578

Change-Id: I89eca100f8547a595a38f787ee086b673cbf6821
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/tests/common/java/android/net/netstats/NetworkTemplateTest.kt b/tests/common/java/android/net/netstats/NetworkTemplateTest.kt
index eb2df0d..192694b 100644
--- a/tests/common/java/android/net/netstats/NetworkTemplateTest.kt
+++ b/tests/common/java/android/net/netstats/NetworkTemplateTest.kt
@@ -19,6 +19,7 @@
 import android.net.NetworkStats.DEFAULT_NETWORK_ALL
 import android.net.NetworkStats.METERED_ALL
 import android.net.NetworkStats.METERED_YES
+import android.net.NetworkStats.ROAMING_YES
 import android.net.NetworkStats.ROAMING_ALL
 import android.net.NetworkTemplate
 import android.net.NetworkTemplate.MATCH_BLUETOOTH
@@ -84,6 +85,19 @@
                     }
         }
 
+        // Verify template which matches roaming cellular and carrier networks with
+        // the given IMSI.
+        listOf(MATCH_MOBILE, MATCH_CARRIER).forEach { matchRule ->
+            NetworkTemplate.Builder(matchRule).setSubscriberIds(setOf(TEST_IMSI1))
+                    .setRoaming(ROAMING_YES).setMeteredness(METERED_YES).build().let {
+                        val expectedTemplate = NetworkTemplate(matchRule, TEST_IMSI1,
+                                arrayOf(TEST_IMSI1), arrayOf<String>(), METERED_YES,
+                                ROAMING_YES, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL,
+                                OEM_MANAGED_ALL, SUBSCRIBER_ID_MATCH_RULE_EXACT)
+                        assertEquals(expectedTemplate, it)
+                    }
+        }
+
         // Verify carrier template cannot be created without IMSI.
         assertFailsWith<IllegalArgumentException> {
             NetworkTemplate.Builder(MATCH_CARRIER).build()