Merge "Update tests for PANS network usage metrics"
This commit is contained in:
Chris Weir
54
tests/net/java/android/net/NetworkIdentityTest.kt
Normal file
54
tests/net/java/android/net/NetworkIdentityTest.kt
Normal file
@@ -0,0 +1,54 @@
|
||||
/*
|
||||
* Copyright (C) 2021 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package android.net
|
||||
|
||||
import android.net.NetworkIdentity.OEM_NONE
|
||||
import android.net.NetworkIdentity.OEM_PAID
|
||||
import android.net.NetworkIdentity.OEM_PRIVATE
|
||||
import android.net.NetworkIdentity.getOemBitfield
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import kotlin.test.assertEquals
|
||||
|
||||
@RunWith(JUnit4::class)
|
||||
class NetworkIdentityTest {
|
||||
@Test
|
||||
fun testGetOemBitfield() {
|
||||
val oemNone = NetworkCapabilities().apply {
|
||||
setCapability(NetworkCapabilities.NET_CAPABILITY_OEM_PAID, false)
|
||||
setCapability(NetworkCapabilities.NET_CAPABILITY_OEM_PRIVATE, false)
|
||||
}
|
||||
val oemPaid = NetworkCapabilities().apply {
|
||||
setCapability(NetworkCapabilities.NET_CAPABILITY_OEM_PAID, true)
|
||||
setCapability(NetworkCapabilities.NET_CAPABILITY_OEM_PRIVATE, false)
|
||||
}
|
||||
val oemPrivate = NetworkCapabilities().apply {
|
||||
setCapability(NetworkCapabilities.NET_CAPABILITY_OEM_PAID, false)
|
||||
setCapability(NetworkCapabilities.NET_CAPABILITY_OEM_PRIVATE, true)
|
||||
}
|
||||
val oemAll = NetworkCapabilities().apply {
|
||||
setCapability(NetworkCapabilities.NET_CAPABILITY_OEM_PAID, true)
|
||||
setCapability(NetworkCapabilities.NET_CAPABILITY_OEM_PRIVATE, true)
|
||||
}
|
||||
|
||||
assertEquals(getOemBitfield(oemNone), OEM_NONE)
|
||||
assertEquals(getOemBitfield(oemPaid), OEM_PAID)
|
||||
assertEquals(getOemBitfield(oemPrivate), OEM_PRIVATE)
|
||||
assertEquals(getOemBitfield(oemAll), OEM_PAID or OEM_PRIVATE)
|
||||
}
|
||||
}
|
||||
@@ -20,14 +20,23 @@ import android.content.Context
|
||||
import android.net.ConnectivityManager.TYPE_MOBILE
|
||||
import android.net.ConnectivityManager.TYPE_WIFI
|
||||
import android.net.NetworkIdentity.SUBTYPE_COMBINED
|
||||
import android.net.NetworkIdentity.OEM_NONE;
|
||||
import android.net.NetworkIdentity.OEM_PAID;
|
||||
import android.net.NetworkIdentity.OEM_PRIVATE;
|
||||
import android.net.NetworkIdentity.buildNetworkIdentity
|
||||
import android.net.NetworkStats.DEFAULT_NETWORK_ALL
|
||||
import android.net.NetworkStats.METERED_ALL
|
||||
import android.net.NetworkStats.ROAMING_ALL
|
||||
import android.net.NetworkTemplate.MATCH_ETHERNET
|
||||
import android.net.NetworkTemplate.MATCH_MOBILE
|
||||
import android.net.NetworkTemplate.MATCH_MOBILE_WILDCARD
|
||||
import android.net.NetworkTemplate.MATCH_WIFI
|
||||
import android.net.NetworkTemplate.MATCH_WIFI_WILDCARD
|
||||
import android.net.NetworkTemplate.NETWORK_TYPE_5G_NSA
|
||||
import android.net.NetworkTemplate.NETWORK_TYPE_ALL
|
||||
import android.net.NetworkTemplate.OEM_MANAGED_ALL
|
||||
import android.net.NetworkTemplate.OEM_MANAGED_NO
|
||||
import android.net.NetworkTemplate.OEM_MANAGED_YES
|
||||
import android.net.NetworkTemplate.buildTemplateMobileWithRatType
|
||||
import android.telephony.TelephonyManager
|
||||
import com.android.testutils.assertParcelSane
|
||||
@@ -37,9 +46,11 @@ import org.junit.runner.RunWith
|
||||
import org.junit.runners.JUnit4
|
||||
import org.mockito.Mockito.mock
|
||||
import org.mockito.MockitoAnnotations
|
||||
import kotlin.test.assertEquals
|
||||
import kotlin.test.assertFalse
|
||||
import kotlin.test.assertNotEquals
|
||||
import kotlin.test.assertTrue
|
||||
import kotlin.test.fail
|
||||
|
||||
private const val TEST_IMSI1 = "imsi1"
|
||||
private const val TEST_IMSI2 = "imsi2"
|
||||
@@ -57,13 +68,18 @@ class NetworkTemplateTest {
|
||||
private fun buildNetworkState(
|
||||
type: Int,
|
||||
subscriberId: String? = null,
|
||||
ssid: String? = null
|
||||
ssid: String? = null,
|
||||
oemManaged: Int = OEM_NONE,
|
||||
): NetworkState {
|
||||
val lp = LinkProperties()
|
||||
val caps = NetworkCapabilities().apply {
|
||||
setCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED, false)
|
||||
setCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING, true)
|
||||
setSSID(ssid)
|
||||
setCapability(NetworkCapabilities.NET_CAPABILITY_OEM_PAID,
|
||||
(oemManaged and OEM_PAID) == OEM_PAID)
|
||||
setCapability(NetworkCapabilities.NET_CAPABILITY_OEM_PRIVATE,
|
||||
(oemManaged and OEM_PRIVATE) == OEM_PRIVATE)
|
||||
}
|
||||
return NetworkState(type, lp, caps, mock(Network::class.java), subscriberId)
|
||||
}
|
||||
@@ -136,11 +152,15 @@ class NetworkTemplateTest {
|
||||
@Test
|
||||
fun testParcelUnparcel() {
|
||||
val templateMobile = NetworkTemplate(MATCH_MOBILE, TEST_IMSI1, null, null, METERED_ALL,
|
||||
ROAMING_ALL, DEFAULT_NETWORK_ALL, TelephonyManager.NETWORK_TYPE_LTE)
|
||||
ROAMING_ALL, DEFAULT_NETWORK_ALL, TelephonyManager.NETWORK_TYPE_LTE,
|
||||
OEM_MANAGED_ALL)
|
||||
val templateWifi = NetworkTemplate(MATCH_WIFI, null, null, TEST_SSID1, METERED_ALL,
|
||||
ROAMING_ALL, DEFAULT_NETWORK_ALL, 0)
|
||||
assertParcelSane(templateMobile, 8)
|
||||
assertParcelSane(templateWifi, 8)
|
||||
ROAMING_ALL, DEFAULT_NETWORK_ALL, 0, OEM_MANAGED_ALL)
|
||||
val templateOem = NetworkTemplate(MATCH_MOBILE, null, null, null, METERED_ALL,
|
||||
ROAMING_ALL, DEFAULT_NETWORK_ALL, 0, OEM_MANAGED_YES)
|
||||
assertParcelSane(templateMobile, 9)
|
||||
assertParcelSane(templateWifi, 9)
|
||||
assertParcelSane(templateOem, 9)
|
||||
}
|
||||
|
||||
// Verify NETWORK_TYPE_* constants in NetworkTemplate do not conflict with
|
||||
@@ -152,4 +172,81 @@ class NetworkTemplateTest {
|
||||
assertNotEquals(NETWORK_TYPE_5G_NSA, ratType)
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testOemNetworkConstants() {
|
||||
val constantValues = arrayOf(OEM_MANAGED_YES, OEM_MANAGED_ALL, OEM_MANAGED_NO,
|
||||
OEM_PAID, OEM_PRIVATE, OEM_PAID or OEM_PRIVATE)
|
||||
|
||||
// Verify that "not OEM managed network" constants are equal.
|
||||
assertEquals(OEM_MANAGED_NO, OEM_NONE);
|
||||
|
||||
// Verify the constants don't conflict.
|
||||
assertEquals(constantValues.size, constantValues.distinct().count())
|
||||
}
|
||||
|
||||
/**
|
||||
* Helper to enumerate and assert OEM managed wifi and mobile {@code NetworkTemplate}s match
|
||||
* their the appropriate OEM managed {@code NetworkIdentity}s.
|
||||
*
|
||||
* @param networkType {@code TYPE_MOBILE} or {@code TYPE_WIFI}
|
||||
* @param matchType A match rule from {@code NetworkTemplate.MATCH_*} corresponding to the
|
||||
* networkType.
|
||||
* @param subscriberId To be populated with {@code TEST_IMSI*} only if networkType is
|
||||
* {@code TYPE_MOBILE}. May be left as null when matchType is
|
||||
* {@link NetworkTemplate.MATCH_MOBILE_WILDCARD}.
|
||||
* @param templateSsid Top be populated with {@code TEST_SSID*} only if networkType is
|
||||
* {@code TYPE_WIFI}. May be left as null when matchType is
|
||||
* {@link NetworkTemplate.MATCH_WIFI_WILDCARD}.
|
||||
* @param identSsid If networkType is {@code TYPE_WIFI}, this value must *NOT* be null. Provide
|
||||
* one of {@code TEST_SSID*}.
|
||||
*/
|
||||
private fun matchOemManagedIdent(networkType: Int, matchType:Int, subscriberId: String? = null,
|
||||
templateSsid: String? = null, identSsid: String? = null) {
|
||||
val oemManagedStates = arrayOf(OEM_NONE, OEM_PAID, OEM_PRIVATE, OEM_PAID or OEM_PRIVATE)
|
||||
// A null subscriberId needs a null matchSubscriberIds argument as well.
|
||||
val matchSubscriberIds = if (subscriberId == null) null else arrayOf(subscriberId)
|
||||
|
||||
val templateOemYes = NetworkTemplate(matchType, subscriberId, matchSubscriberIds,
|
||||
templateSsid, METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL,
|
||||
OEM_MANAGED_YES)
|
||||
val templateOemAll = NetworkTemplate(matchType, subscriberId, matchSubscriberIds,
|
||||
templateSsid, METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL,
|
||||
OEM_MANAGED_ALL)
|
||||
|
||||
for (identityOemManagedState in oemManagedStates) {
|
||||
val ident = buildNetworkIdentity(mockContext, buildNetworkState(networkType,
|
||||
subscriberId, identSsid, identityOemManagedState), /*defaultNetwork=*/false,
|
||||
/*subType=*/0)
|
||||
|
||||
// Create a template with each OEM managed type and match it against the NetworkIdentity
|
||||
for (templateOemManagedState in oemManagedStates) {
|
||||
val template = NetworkTemplate(matchType, subscriberId, matchSubscriberIds,
|
||||
templateSsid, METERED_ALL, ROAMING_ALL, DEFAULT_NETWORK_ALL,
|
||||
NETWORK_TYPE_ALL, templateOemManagedState)
|
||||
if (identityOemManagedState == templateOemManagedState) {
|
||||
template.assertMatches(ident)
|
||||
} else {
|
||||
template.assertDoesNotMatch(ident)
|
||||
}
|
||||
}
|
||||
// OEM_MANAGED_ALL ignores OEM state.
|
||||
templateOemAll.assertMatches(ident)
|
||||
if (identityOemManagedState == OEM_NONE) {
|
||||
// OEM_MANAGED_YES matches everything except OEM_NONE.
|
||||
templateOemYes.assertDoesNotMatch(ident)
|
||||
} else {
|
||||
templateOemYes.assertMatches(ident)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testOemManagedMatchesIdent() {
|
||||
matchOemManagedIdent(TYPE_MOBILE, MATCH_MOBILE, subscriberId = TEST_IMSI1)
|
||||
matchOemManagedIdent(TYPE_MOBILE, MATCH_MOBILE_WILDCARD)
|
||||
matchOemManagedIdent(TYPE_WIFI, MATCH_WIFI, templateSsid = TEST_SSID1,
|
||||
identSsid = TEST_SSID1)
|
||||
matchOemManagedIdent(TYPE_WIFI, MATCH_WIFI_WILDCARD, identSsid = TEST_SSID1)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user