joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove deprecated SC_V2 constant

Browse source 
Test: TH
Flag: EXEMPT test-only
Change-Id: I3444fad305f49294ed8c3a850b631f385678c117
This commit is contained in:
Chalard Jean 2025-05-09 14:18:12 +09:00
commit 9373e3442e
40 changed files with 115 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Tethering/tests/unit/src/com/android/networkstack/tethering/EntitlementManagerTest.java
View file

@ -40,7 +40,6 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSess
import static com.android.networkstack.apishim.ConstantsShim.KEY_CARRIER_SUPPORTS_TETHERING_BOOL;
import static com.android.testutils.DevSdkIgnoreRule.IgnoreAfter;
import static com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@ -67,6 +66,7 @@ import android.content.pm.ModuleInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.PersistableBundle;
@ -603,7 +603,7 @@ public final class EntitlementManagerTest {
.onTetherProvisioningFailed(TETHERING_WIFI, FAILED_TETHERING_REASON);
}
@IgnoreUpTo(SC_V2)
@IgnoreUpTo(Build.VERSION_CODES.S_V2)
@Test
public void testUiProvisioningMultiUser_aboveT_createContextAsUserThrows() {
mMockContext.setCreateContextAsUserException(new IllegalStateException());
@ -611,14 +611,14 @@ public final class EntitlementManagerTest {
doTestUiProvisioningMultiUser(false, 1);
}
@IgnoreUpTo(SC_V2)
@IgnoreUpTo(Build.VERSION_CODES.S_V2)
@Test
public void testUiProvisioningMultiUser_aboveT() {
doTestUiProvisioningMultiUser(true, 1);
doTestUiProvisioningMultiUser(false, 0);
}
@IgnoreAfter(SC_V2)
@IgnoreAfter(Build.VERSION_CODES.S_V2)
@Test
public void testUiProvisioningMultiUser_belowT() {
doTestUiProvisioningMultiUser(true, 1);
@ -734,7 +734,7 @@ public final class EntitlementManagerTest {
}
@Test
@IgnoreUpTo(SC_V2)
@IgnoreUpTo(Build.VERSION_CODES.S_V2)
public void requestLatestTetheringEntitlementResult_carrierDoesNotSupport_noProvisionCount()
throws Exception {
setupCarrierConfig(false);
@ -746,7 +746,7 @@ public final class EntitlementManagerTest {
}
@Test
@IgnoreUpTo(SC_V2)
@IgnoreUpTo(Build.VERSION_CODES.S_V2)
public void reevaluateSimCardProvisioning_carrierUnsupportAndSimswitch() {
setupForRequiredProvisioning();
@ -771,7 +771,7 @@ public final class EntitlementManagerTest {
}
@Test
@IgnoreUpTo(SC_V2)
@IgnoreUpTo(Build.VERSION_CODES.S_V2)
public void startProvisioningIfNeeded_carrierUnsupport()
throws Exception {
setupCarrierConfig(false);

6
staticlibs/tests/unit/src/com/android/net/module/util/NetUtilsTest.java
View file

@ -16,8 +16,6 @@
package com.android.net.module.util;
import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
@ -27,6 +25,7 @@ import static org.junit.Assert.assertTrue;
import android.net.InetAddresses;
import android.net.IpPrefix;
import android.net.RouteInfo;
import android.os.Build;
import androidx.test.runner.AndroidJUnit4;
@ -115,7 +114,7 @@ public final class NetUtilsTest {
assertNotEquals(V6_EXPECTED, route);
}
@Test @IgnoreUpTo(SC_V2)
@Test @IgnoreUpTo(Build.VERSION_CODES.S_V2)
public void testSelectBestRouteWithExcludedRoutes() {
final List<RouteInfo> routes = new ArrayList<>();
@ -140,4 +139,3 @@ public final class NetUtilsTest {
assertNull(route);
}
}

4
staticlibs/testutils/devicetests/com/android/testutils/DevSdkIgnoreRule.kt
View file

@ -25,11 +25,9 @@ import org.junit.rules.TestRule
import org.junit.runner.Description
import org.junit.runners.model.Statement
// TODO : remove uses in /cts/ and remove
@Deprecated("Use Build.VERSION_CODES", ReplaceWith("Build.VERSION_CODES.S_V2"))
const val SC_V2 = Build.VERSION_CODES.S_V2
// TODO: Remove this when Build.VERSION_CODES.VANILLA_ICE_CREAM is available in all branches
// where this code builds
const val VANILLA_ICE_CREAM = 35 // Bui1ld.VERSION_CODES.VANILLA_ICE_CREAM
private val MAX_TARGET_SDK_ANNOTATION_RE = Pattern.compile("MaxTargetSdk([0-9]+)$")
private val targetSdk = InstrumentationRegistry.getContext().applicationInfo.targetSdkVersion

5
tests/common/java/android/net/EthernetNetworkManagementExceptionTest.java
View file

@ -16,11 +16,12 @@
package android.net;
import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2;
import static com.android.testutils.ParcelUtils.assertParcelingIsLossless;
import static org.junit.Assert.assertEquals;
import android.os.Build;
import androidx.test.filters.SmallTest;
import com.android.testutils.DevSdkIgnoreRule;
@ -29,7 +30,7 @@ import com.android.testutils.DevSdkIgnoreRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
@DevSdkIgnoreRule.IgnoreUpTo(SC_V2) // TODO: Use to Build.VERSION_CODES.SC_V2 when available
@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2)
@RunWith(DevSdkIgnoreRunner.class)
@SmallTest
public class EthernetNetworkManagementExceptionTest {

9
tests/common/java/android/net/NetworkCapabilitiesTest.java
View file

@ -66,7 +66,6 @@ import static android.os.Process.INVALID_UID;
import static com.android.modules.utils.build.SdkLevel.isAtLeastS;
import static com.android.modules.utils.build.SdkLevel.isAtLeastT;
import static com.android.modules.utils.build.SdkLevel.isAtLeastV;
import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2;
import static com.android.testutils.MiscAsserts.assertEmpty;
import static com.android.testutils.MiscAsserts.assertThrows;
import static com.android.testutils.ParcelUtils.assertParcelingIsLossless;
@ -322,7 +321,7 @@ public class NetworkCapabilitiesTest {
}
}
@Test @IgnoreUpTo(SC_V2)
@Test @IgnoreUpTo(Build.VERSION_CODES.S_V2)
public void testSetAllowedUids() {
final NetworkCapabilities nc = new NetworkCapabilities();
assertThrows(NullPointerException.class, () -> nc.setAllowedUids(null));
@ -478,7 +477,7 @@ public class NetworkCapabilitiesTest {
assertFalse(nr.satisfiedByNetworkCapabilities(new NetworkCapabilities()));
}
@Test @IgnoreUpTo(SC_V2) // TODO: Use to Build.VERSION_CODES.SC_V2 when available
@Test @IgnoreUpTo(Build.VERSION_CODES.S_V2)
public void testPrioritizeLatencyAndBandwidth() {
NetworkCapabilities netCap = new NetworkCapabilities();
netCap.addCapability(NET_CAPABILITY_PRIORITIZE_LATENCY);
@ -927,7 +926,7 @@ public class NetworkCapabilitiesTest {
} catch (IllegalStateException expected) { }
}
@Test @IgnoreUpTo(SC_V2) // TODO: Use to Build.VERSION_CODES.SC_V2 when available
@Test @IgnoreUpTo(Build.VERSION_CODES.S_V2)
public void testEnterpriseId() {
final NetworkCapabilities nc1 = new NetworkCapabilities.Builder()
.addCapability(NET_CAPABILITY_ENTERPRISE)
@ -1522,7 +1521,7 @@ public class NetworkCapabilitiesTest {
assertTrue(reservationNc.satisfiedByNetworkCapabilities(offerNc));
}
@Test @IgnoreUpTo(SC_V2)
@Test @IgnoreUpTo(Build.VERSION_CODES.S_V2)
public void testReservationIdEquals() {
final NetworkCapabilities nc = new NetworkCapabilities();
nc.setReservationId(42);

4
tests/common/java/android/net/netstats/NetworkStatsCollectionTest.kt
View file

@ -19,10 +19,10 @@ package android.net.netstats
import android.net.NetworkIdentity
import android.net.NetworkStatsCollection
import android.net.NetworkStatsHistory
import android.os.Build
import androidx.test.filters.SmallTest
import com.android.testutils.ConnectivityModuleTest
import com.android.testutils.DevSdkIgnoreRule
import com.android.testutils.SC_V2
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
@ -36,7 +36,7 @@ import kotlin.test.fail
class NetworkStatsCollectionTest {
@Rule
@JvmField
val ignoreRule = DevSdkIgnoreRule(ignoreClassUpTo = SC_V2)
val ignoreRule = DevSdkIgnoreRule(ignoreClassUpTo = Build.VERSION_CODES.S_V2)
@Test
fun testBuilder() {

4
tests/common/java/android/net/netstats/NetworkStatsHistoryTest.kt
View file

@ -17,11 +17,11 @@
package android.net.netstats
import android.net.NetworkStatsHistory
import android.os.Build
import android.text.format.DateUtils
import androidx.test.filters.SmallTest
import com.android.testutils.ConnectivityModuleTest
import com.android.testutils.DevSdkIgnoreRule
import com.android.testutils.SC_V2
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
@ -34,7 +34,7 @@ import kotlin.test.assertEquals
class NetworkStatsHistoryTest {
@Rule
@JvmField
val ignoreRule = DevSdkIgnoreRule(ignoreClassUpTo = SC_V2)
val ignoreRule = DevSdkIgnoreRule(ignoreClassUpTo = Build.VERSION_CODES.S_V2)
@Test
fun testBuilder() {

3
tests/common/java/android/net/netstats/NetworkTemplateTest.kt
View file

@ -34,7 +34,6 @@ import android.os.Build
import android.telephony.TelephonyManager
import com.android.testutils.ConnectivityModuleTest
import com.android.testutils.DevSdkIgnoreRule
import com.android.testutils.SC_V2
import kotlin.test.assertEquals
import kotlin.test.assertFailsWith
import org.junit.Rule
@ -51,7 +50,7 @@ private const val TEST_WIFI_KEY2 = "wifiKey2"
class NetworkTemplateTest {
@Rule
@JvmField
val ignoreRule = DevSdkIgnoreRule(ignoreClassUpTo = SC_V2)
val ignoreRule = DevSdkIgnoreRule(ignoreClassUpTo = Build.VERSION_CODES.S_V2)
@Test
fun testBuilderMatchRules() {

4
tests/cts/net/src/android/net/cts/ConnectivityFrameworkInitializerTiramisuTest.kt
View file

@ -17,11 +17,11 @@
package android.net.cts
import android.net.nsd.NsdManager
import android.os.Build
import androidx.test.platform.app.InstrumentationRegistry
import com.android.networkstack.apishim.ConnectivityFrameworkInitShimImpl
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo
import com.android.testutils.DevSdkIgnoreRunner
import com.android.testutils.SC_V2
import org.junit.Test
import org.junit.runner.RunWith
import kotlin.test.assertNotNull
@ -30,7 +30,7 @@ private val cfiShim = ConnectivityFrameworkInitShimImpl.newInstance()
@RunWith(DevSdkIgnoreRunner::class)
// ConnectivityFrameworkInitializerTiramisu was added in T
@IgnoreUpTo(SC_V2) // TODO: Use to Build.VERSION_CODES.SC_V2 when available
@IgnoreUpTo(Build.VERSION_CODES.S_V2)
class ConnectivityFrameworkInitializerTiramisuTest {
@Test
fun testServicesRegistered() {

23
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View file

@ -118,7 +118,6 @@ import static com.android.networkstack.apishim.ConstantsShim.BLOCKED_REASON_NONE
import static com.android.networkstack.apishim.ConstantsShim.RECEIVER_EXPORTED;
import static com.android.networkstack.apishim.ConstantsShim.RECEIVER_NOT_EXPORTED;
import static com.android.testutils.Cleanup.testAndCleanup;
import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2;
import static com.android.testutils.MiscAsserts.assertEventuallyTrue;
import static com.android.testutils.MiscAsserts.assertThrows;
import static com.android.testutils.TestNetworkTrackerKt.initTestNetwork;
@ -692,7 +691,7 @@ public class ConnectivityManagerTest {
return null;
}
@DevSdkIgnoreRule.IgnoreUpTo(SC_V2)
@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2)
@AppModeFull(reason = "Cannot get installed packages in instant app mode")
@Test
public void testGetRedactedLinkPropertiesForPackage() throws Exception {
@ -781,7 +780,7 @@ public class ConnectivityManagerTest {
}
@ConnectivityModuleTest
@DevSdkIgnoreRule.IgnoreUpTo(SC_V2)
@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2)
@AppModeFull(reason = "Cannot get installed packages in instant app mode")
@Test
public void testGetRedactedNetworkCapabilitiesForPackage() throws Exception {
@ -3619,7 +3618,7 @@ public class ConnectivityManagerTest {
assertTrue(dumpOutput, dumpOutput.contains("Active default network"));
}
@Test @IgnoreUpTo(SC_V2)
@Test @IgnoreUpTo(Build.VERSION_CODES.S_V2)
public void testDumpBpfNetMaps() throws Exception {
final String[] args = new String[] {"--short", "trafficcontroller"};
String dumpOutput = DumpTestUtils.dumpServiceWithShellPermission(
@ -3734,7 +3733,7 @@ public class ConnectivityManagerTest {
}, NETWORK_SETTINGS);
}
@Test @IgnoreUpTo(SC_V2) @ConnectivityModuleTest
@Test @IgnoreUpTo(Build.VERSION_CODES.S_V2) @ConnectivityModuleTest
@AppModeFull(reason = "Socket cannot bind in instant app mode")
public void testFirewallBlockingDozable() {
doTestFirewallBlocking(FIREWALL_CHAIN_DOZABLE, ALLOWLIST);
@ -3748,43 +3747,43 @@ public class ConnectivityManagerTest {
doTestFirewallBlocking(FIREWALL_CHAIN_BACKGROUND, ALLOWLIST);
}
@Test @IgnoreUpTo(SC_V2) @ConnectivityModuleTest
@Test @IgnoreUpTo(Build.VERSION_CODES.S_V2) @ConnectivityModuleTest
@AppModeFull(reason = "Socket cannot bind in instant app mode")
public void testFirewallBlockingPowersave() {
doTestFirewallBlocking(FIREWALL_CHAIN_POWERSAVE, ALLOWLIST);
}
@Test @IgnoreUpTo(SC_V2) @ConnectivityModuleTest
@Test @IgnoreUpTo(Build.VERSION_CODES.S_V2) @ConnectivityModuleTest
@AppModeFull(reason = "Socket cannot bind in instant app mode")
public void testFirewallBlockingRestricted() {
doTestFirewallBlocking(FIREWALL_CHAIN_RESTRICTED, ALLOWLIST);
}
@Test @IgnoreUpTo(SC_V2) @ConnectivityModuleTest
@Test @IgnoreUpTo(Build.VERSION_CODES.S_V2) @ConnectivityModuleTest
@AppModeFull(reason = "Socket cannot bind in instant app mode")
public void testFirewallBlockingLowPowerStandby() {
doTestFirewallBlocking(FIREWALL_CHAIN_LOW_POWER_STANDBY, ALLOWLIST);
}
@Test @IgnoreUpTo(SC_V2) @ConnectivityModuleTest
@Test @IgnoreUpTo(Build.VERSION_CODES.S_V2) @ConnectivityModuleTest
@AppModeFull(reason = "Socket cannot bind in instant app mode")
public void testFirewallBlockingStandby() {
doTestFirewallBlocking(FIREWALL_CHAIN_STANDBY, DENYLIST);
}
@Test @IgnoreUpTo(SC_V2) @ConnectivityModuleTest
@Test @IgnoreUpTo(Build.VERSION_CODES.S_V2) @ConnectivityModuleTest
@AppModeFull(reason = "Socket cannot bind in instant app mode")
public void testFirewallBlockingOemDeny1() {
doTestFirewallBlocking(FIREWALL_CHAIN_OEM_DENY_1, DENYLIST);
}
@Test @IgnoreUpTo(SC_V2) @ConnectivityModuleTest
@Test @IgnoreUpTo(Build.VERSION_CODES.S_V2) @ConnectivityModuleTest
@AppModeFull(reason = "Socket cannot bind in instant app mode")
public void testFirewallBlockingOemDeny2() {
doTestFirewallBlocking(FIREWALL_CHAIN_OEM_DENY_2, DENYLIST);
}
@Test @IgnoreUpTo(SC_V2) @ConnectivityModuleTest
@Test @IgnoreUpTo(Build.VERSION_CODES.S_V2) @ConnectivityModuleTest
@AppModeFull(reason = "Socket cannot bind in instant app mode")
public void testFirewallBlockingOemDeny3() {
doTestFirewallBlocking(FIREWALL_CHAIN_OEM_DENY_3, DENYLIST);

4
tests/cts/net/src/android/net/cts/DhcpOptionTest.kt
View file

@ -17,10 +17,10 @@
package android.net.cts
import android.net.DhcpOption
import android.os.Build
import androidx.test.filters.SmallTest
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo
import com.android.testutils.DevSdkIgnoreRunner
import com.android.testutils.SC_V2
import org.junit.Assert.assertArrayEquals
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNull
@ -28,7 +28,7 @@ import org.junit.runner.RunWith
import org.junit.Test
@SmallTest
@IgnoreUpTo(SC_V2) // TODO: Use to Build.VERSION_CODES.SC_V2 when available
@IgnoreUpTo(Build.VERSION_CODES.S_V2)
@RunWith(DevSdkIgnoreRunner::class)
class DhcpOptionTest {
private val DHCP_OPTION_TYPE: Byte = 2

4
tests/cts/net/src/android/net/cts/DnsResolverTest.java
View file

@ -26,7 +26,6 @@ import static android.provider.DeviceConfig.NAMESPACE_CONNECTIVITY;
import static android.system.OsConstants.ETIMEDOUT;
import static com.android.testutils.Cleanup.testAndCleanup;
import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@ -44,6 +43,7 @@ import android.net.Network;
import android.net.NetworkCapabilities;
import android.net.ParseException;
import android.net.cts.util.CtsNetUtils;
import android.os.Build;
import android.os.CancellationSignal;
import android.os.Handler;
import android.os.Looper;
@ -878,7 +878,7 @@ public class DnsResolverTest {
}
/** Verifies that DnsResolver.DnsException can be subclassed and its constructor re-used. */
@Test @IgnoreUpTo(SC_V2) // TODO: Use to Build.VERSION_CODES.SC_V2 when available
@Test @IgnoreUpTo(Build.VERSION_CODES.S_V2)
public void testDnsExceptionConstructor() throws InterruptedException {
class TestDnsException extends DnsResolver.DnsException {
TestDnsException(int code, @Nullable Throwable cause) {

3
tests/cts/net/src/android/net/cts/DscpPolicyTest.kt
View file

@ -46,6 +46,7 @@ import android.net.TestNetworkInterface
import android.net.TestNetworkManager
import android.net.TestNetworkManager.TestInterfaceRequest
import android.net.cts.util.CtsNetUtils.TestNetworkCallback
import android.os.Build
import android.os.Handler
import android.os.HandlerThread
import android.os.SystemClock
@ -115,7 +116,7 @@ private const val IPV6_ADDRESS_WAIT_TIME_MS = 10_000L
class DscpPolicyTest {
@JvmField
@Rule
val ignoreRule = DevSdkIgnoreRule(ignoreClassUpTo = SC_V2)
val ignoreRule = DevSdkIgnoreRule(ignoreClassUpTo = Build.VERSION_CODES.S_V2)
private val LOCAL_IPV4_ADDRESS = InetAddresses.parseNumericAddress("192.0.2.1")
private val TEST_TARGET_IPV4_ADDR =

5
tests/cts/net/src/android/net/cts/EthernetNetworkUpdateRequestTest.java
View file

@ -18,8 +18,6 @@ package android.net.cts;
import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED;
import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertThrows;
@ -29,6 +27,7 @@ import android.net.EthernetNetworkUpdateRequest;
import android.net.IpConfiguration;
import android.net.NetworkCapabilities;
import android.net.StaticIpConfiguration;
import android.os.Build;
import androidx.test.filters.SmallTest;
@ -39,7 +38,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
@SmallTest
@DevSdkIgnoreRule.IgnoreUpTo(SC_V2) // TODO: Use to Build.VERSION_CODES.SC_V2 when available
@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2)
@RunWith(DevSdkIgnoreRunner.class)
public class EthernetNetworkUpdateRequestTest {
private static final NetworkCapabilities DEFAULT_CAPS =

23
tests/cts/net/src/android/net/cts/Ikev2VpnTest.java
View file

@ -24,7 +24,6 @@ import static android.net.cts.util.CtsNetUtils.TestNetworkCallback;
import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity;
import static com.android.modules.utils.build.SdkLevel.isAtLeastT;
import static com.android.modules.utils.build.SdkLevel.isAtLeastU;
import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
@ -369,7 +368,7 @@ public class Ikev2VpnTest {
}
}
@IgnoreUpTo(SC_V2)
@IgnoreUpTo(Build.VERSION_CODES.S_V2)
@Test
public void testBuildIkev2VpnProfileWithIkeTunnelConnectionParams() throws Exception {
assumeTrue(mCtsNetUtils.hasIpsecTunnelsFeature());
@ -664,62 +663,62 @@ public class Ikev2VpnTest {
testIpv6Only, requiresValidation, testSessionKey , testIkeTunConnParams)));
}
@Test @IgnoreUpTo(SC_V2)
@Test @IgnoreUpTo(Build.VERSION_CODES.S_V2)
public void testStartStopVpnProfileV4() throws Exception {
doTestStartStopVpnProfile(false /* testIpv6Only */, false /* requiresValidation */,
false /* testSessionKey */, false /* testIkeTunConnParams */);
}
@Test @IgnoreUpTo(SC_V2)
@Test @IgnoreUpTo(Build.VERSION_CODES.S_V2)
public void testStartStopVpnProfileV4WithValidation() throws Exception {
doTestStartStopVpnProfile(false /* testIpv6Only */, true /* requiresValidation */,
false /* testSessionKey */, false /* testIkeTunConnParams */);
}
@Test @IgnoreUpTo(SC_V2)
@Test @IgnoreUpTo(Build.VERSION_CODES.S_V2)
public void testStartStopVpnProfileV6() throws Exception {
doTestStartStopVpnProfile(true /* testIpv6Only */, false /* requiresValidation */,
false /* testSessionKey */, false /* testIkeTunConnParams */);
}
@Test @IgnoreUpTo(SC_V2)
@Test @IgnoreUpTo(Build.VERSION_CODES.S_V2)
public void testStartStopVpnProfileV6WithValidation() throws Exception {
doTestStartStopVpnProfile(true /* testIpv6Only */, true /* requiresValidation */,
false /* testSessionKey */, false /* testIkeTunConnParams */);
}
@Test @IgnoreUpTo(SC_V2)
@Test @IgnoreUpTo(Build.VERSION_CODES.S_V2)
public void testStartStopVpnProfileIkeTunConnParamsV4() throws Exception {
doTestStartStopVpnProfile(false /* testIpv6Only */, false /* requiresValidation */,
false /* testSessionKey */, true /* testIkeTunConnParams */);
}
@Test @IgnoreUpTo(SC_V2)
@Test @IgnoreUpTo(Build.VERSION_CODES.S_V2)
public void testStartStopVpnProfileIkeTunConnParamsV4WithValidation() throws Exception {
doTestStartStopVpnProfile(false /* testIpv6Only */, true /* requiresValidation */,
false /* testSessionKey */, true /* testIkeTunConnParams */);
}
@Test @IgnoreUpTo(SC_V2)
@Test @IgnoreUpTo(Build.VERSION_CODES.S_V2)
public void testStartStopVpnProfileIkeTunConnParamsV6() throws Exception {
doTestStartStopVpnProfile(true /* testIpv6Only */, false /* requiresValidation */,
false /* testSessionKey */, true /* testIkeTunConnParams */);
}
@Test @IgnoreUpTo(SC_V2)
@Test @IgnoreUpTo(Build.VERSION_CODES.S_V2)
public void testStartStopVpnProfileIkeTunConnParamsV6WithValidation() throws Exception {
doTestStartStopVpnProfile(true /* testIpv6Only */, true /* requiresValidation */,
false /* testSessionKey */, true /* testIkeTunConnParams */);
}
@IgnoreUpTo(SC_V2)
@IgnoreUpTo(Build.VERSION_CODES.S_V2)
@Test
public void testStartProvisionedVpnV4ProfileSession() throws Exception {
doTestStartStopVpnProfile(false /* testIpv6Only */, false /* requiresValidation */,
true /* testSessionKey */, false /* testIkeTunConnParams */);
}
@IgnoreUpTo(SC_V2)
@IgnoreUpTo(Build.VERSION_CODES.S_V2)
@Test
public void testStartProvisionedVpnV6ProfileSession() throws Exception {
doTestStartStopVpnProfile(true /* testIpv6Only */, false /* requiresValidation */,

4
tests/cts/net/src/android/net/cts/NetworkStatsManagerTest.java
View file

@ -33,8 +33,6 @@ import static android.net.netstats.NetworkStatsDataMigrationUtils.PREFIX_UID;
import static android.net.netstats.NetworkStatsDataMigrationUtils.PREFIX_UID_TAG;
import static android.net.netstats.NetworkStatsDataMigrationUtils.PREFIX_XT;
import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@ -915,7 +913,7 @@ public class NetworkStatsManagerTest {
}
}
@DevSdkIgnoreRule.IgnoreUpTo(SC_V2)
@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2)
@Test
public void testDataMigrationUtils() throws Exception {
final List<String> prefixes = List.of(PREFIX_UID, PREFIX_XT, PREFIX_UID_TAG);

4
tests/cts/net/src/android/net/cts/RateLimitTest.java
View file

@ -24,7 +24,6 @@ import static androidx.test.InstrumentationRegistry.getContext;
import static com.android.net.module.util.NetworkStackConstants.ETHER_MTU;
import static com.android.net.module.util.NetworkStackConstants.IPV4_ADDR_ANY;
import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2;
import static com.android.testutils.TestPermissionUtil.runAsShell;
import static org.junit.Assert.assertEquals;
@ -48,6 +47,7 @@ import android.net.RouteInfo;
import android.net.TestNetworkInterface;
import android.net.TestNetworkManager;
import android.net.TestNetworkSpecifier;
import android.os.Build;
import android.os.Handler;
import android.os.Looper;
import android.os.SystemClock;
@ -81,7 +81,7 @@ import java.util.stream.Collectors;
@AppModeFull(reason = "Instant apps cannot access /dev/tun, so createTunInterface fails")
@RunWith(DevSdkIgnoreRunner.class)
@DevSdkIgnoreRule.IgnoreUpTo(SC_V2)
@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2)
public class RateLimitTest {
// cannot be final as it gets initialized inside ensureKernelConfigLoaded().
private static HashSet<String> sKernelConfig;

5
tests/unit/java/android/net/EthernetNetworkUpdateRequestTest.java
View file

@ -16,11 +16,12 @@
package android.net;
import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2;
import static com.android.testutils.ParcelUtils.assertParcelingIsLossless;
import static org.junit.Assert.assertThrows;
import android.os.Build;
import com.android.testutils.DevSdkIgnoreRule;
import com.android.testutils.DevSdkIgnoreRunner;
@ -28,7 +29,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
@RunWith(DevSdkIgnoreRunner.class)
@DevSdkIgnoreRule.IgnoreUpTo(SC_V2)
@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2)
public class EthernetNetworkUpdateRequestTest {
private IpConfiguration buildIpConfiguration() {
return new IpConfiguration.Builder().setHttpProxy(

5
tests/unit/java/android/net/NetworkStatsAccessTest.java
View file

@ -16,8 +16,6 @@
package android.net;
import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.doCallRealMethod;
import static org.mockito.Mockito.when;
@ -28,6 +26,7 @@ import android.app.AppOpsManager;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.Build;
import android.telephony.TelephonyManager;
import androidx.test.filters.SmallTest;
@ -44,7 +43,7 @@ import org.mockito.MockitoAnnotations;
@RunWith(DevSdkIgnoreRunner.class)
@SmallTest
@DevSdkIgnoreRule.IgnoreUpTo(SC_V2) // TODO: Use to Build.VERSION_CODES.SC_V2 when available
@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2)
public class NetworkStatsAccessTest {
private static final String TEST_PKG = "com.example.test";
private static final int TEST_PID = 1234;

4
tests/unit/java/android/net/NetworkStatsCollectionTest.java
View file

@ -33,7 +33,6 @@ import static android.text.format.DateUtils.HOUR_IN_MILLIS;
import static android.text.format.DateUtils.MINUTE_IN_MILLIS;
import static com.android.net.module.util.NetworkStatsUtils.multiplySafeByRational;
import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2;
import static com.android.testutils.MiscAsserts.assertThrows;
import static org.junit.Assert.assertArrayEquals;
@ -44,6 +43,7 @@ import static org.junit.Assert.fail;
import android.annotation.NonNull;
import android.content.res.Resources;
import android.net.NetworkStatsCollection.Key;
import android.os.Build;
import android.os.Process;
import android.os.UserHandle;
import android.telephony.SubscriptionPlan;
@ -89,7 +89,7 @@ import java.util.Set;
*/
@RunWith(DevSdkIgnoreRunner.class)
@SmallTest
@DevSdkIgnoreRule.IgnoreUpTo(SC_V2) // TODO: Use to Build.VERSION_CODES.SC_V2 when available
@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2)
public class NetworkStatsCollectionTest {
@Rule
public final DevSdkIgnoreRule ignoreRule = new DevSdkIgnoreRule();

Some files were not shown because too many files have changed in this diff Show more