From 9373e3442e8a0f231e6e41a43e3eff27e3a3b4ce Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Fri, 9 May 2025 14:18:12 +0900 Subject: [PATCH] Remove deprecated SC_V2 constant Test: TH Flag: EXEMPT test-only Change-Id: I3444fad305f49294ed8c3a850b631f385678c117 --- .../tethering/EntitlementManagerTest.java | 14 +++++----- .../android/net/module/util/NetUtilsTest.java | 6 ++--- .../com/android/testutils/DevSdkIgnoreRule.kt | 4 +-- ...thernetNetworkManagementExceptionTest.java | 5 ++-- .../android/net/NetworkCapabilitiesTest.java | 9 +++---- .../netstats/NetworkStatsCollectionTest.kt | 4 +-- .../net/netstats/NetworkStatsHistoryTest.kt | 4 +-- .../net/netstats/NetworkTemplateTest.kt | 3 +-- ...ctivityFrameworkInitializerTiramisuTest.kt | 4 +-- .../net/cts/ConnectivityManagerTest.java | 23 ++++++++-------- .../net/src/android/net/cts/DhcpOptionTest.kt | 4 +-- .../src/android/net/cts/DnsResolverTest.java | 4 +-- .../net/src/android/net/cts/DscpPolicyTest.kt | 3 ++- .../cts/EthernetNetworkUpdateRequestTest.java | 5 ++-- .../net/src/android/net/cts/Ikev2VpnTest.java | 23 ++++++++-------- .../net/cts/NetworkStatsManagerTest.java | 4 +-- .../src/android/net/cts/RateLimitTest.java | 4 +-- .../net/EthernetNetworkUpdateRequestTest.java | 5 ++-- .../android/net/NetworkStatsAccessTest.java | 5 ++-- .../net/NetworkStatsCollectionTest.java | 4 +-- .../android/net/NetworkStatsRecorderTest.java | 4 +-- .../NetworkStatsDataMigrationUtilsTest.kt | 4 +-- .../server/ConnectivityServiceTest.java | 27 +++++++++---------- .../MultipathPolicyTrackerTest.java | 3 +-- ...tyMonitorWithConnectivityManagerTests.java | 5 ++-- .../mdns/MdnsDiscoveryManagerTests.java | 5 ++-- .../mdns/MdnsPacketReaderTests.java | 6 ++--- .../connectivity/mdns/MdnsRecordTests.java | 4 +-- .../mdns/MdnsResponseDecoderTests.java | 4 +-- .../connectivity/mdns/MdnsResponseTests.java | 5 ++-- .../mdns/MdnsServiceInfoTest.java | 4 +-- .../mdns/MdnsServiceTypeClientTests.java | 4 +-- .../mdns/MdnsSocketClientTests.java | 4 +-- .../connectivity/mdns/MdnsSocketTests.java | 6 ++--- ...ulticastNetworkInterfaceProviderTests.java | 5 ++-- .../server/net/NetworkStatsFactoryTest.java | 4 +-- .../server/net/NetworkStatsObserversTest.java | 5 ++-- .../server/net/NetworkStatsServiceTest.java | 3 +-- .../NetworkStatsSubscriptionsMonitorTest.java | 5 ++-- .../android/server/net/PersistentIntTest.kt | 4 +-- 40 files changed, 115 insertions(+), 133 deletions(-) diff --git a/Tethering/tests/unit/src/com/android/networkstack/tethering/EntitlementManagerTest.java b/Tethering/tests/unit/src/com/android/networkstack/tethering/EntitlementManagerTest.java index 7bfdb22cfc..de39665ca3 100644 --- a/Tethering/tests/unit/src/com/android/networkstack/tethering/EntitlementManagerTest.java +++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/EntitlementManagerTest.java @@ -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); diff --git a/staticlibs/tests/unit/src/com/android/net/module/util/NetUtilsTest.java b/staticlibs/tests/unit/src/com/android/net/module/util/NetUtilsTest.java index 9e635c2124..c12dfe0497 100644 --- a/staticlibs/tests/unit/src/com/android/net/module/util/NetUtilsTest.java +++ b/staticlibs/tests/unit/src/com/android/net/module/util/NetUtilsTest.java @@ -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 routes = new ArrayList<>(); @@ -140,4 +139,3 @@ public final class NetUtilsTest { assertNull(route); } } - diff --git a/staticlibs/testutils/devicetests/com/android/testutils/DevSdkIgnoreRule.kt b/staticlibs/testutils/devicetests/com/android/testutils/DevSdkIgnoreRule.kt index 46229b0cd2..ebeb590922 100644 --- a/staticlibs/testutils/devicetests/com/android/testutils/DevSdkIgnoreRule.kt +++ b/staticlibs/testutils/devicetests/com/android/testutils/DevSdkIgnoreRule.kt @@ -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 diff --git a/tests/common/java/android/net/EthernetNetworkManagementExceptionTest.java b/tests/common/java/android/net/EthernetNetworkManagementExceptionTest.java index 84b6e54daa..c7dfb7d037 100644 --- a/tests/common/java/android/net/EthernetNetworkManagementExceptionTest.java +++ b/tests/common/java/android/net/EthernetNetworkManagementExceptionTest.java @@ -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 { diff --git a/tests/common/java/android/net/NetworkCapabilitiesTest.java b/tests/common/java/android/net/NetworkCapabilitiesTest.java index 3fc2af0fb0..499b52d3be 100644 --- a/tests/common/java/android/net/NetworkCapabilitiesTest.java +++ b/tests/common/java/android/net/NetworkCapabilitiesTest.java @@ -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); diff --git a/tests/common/java/android/net/netstats/NetworkStatsCollectionTest.kt b/tests/common/java/android/net/netstats/NetworkStatsCollectionTest.kt index 368a519552..2b7e52fa9d 100644 --- a/tests/common/java/android/net/netstats/NetworkStatsCollectionTest.kt +++ b/tests/common/java/android/net/netstats/NetworkStatsCollectionTest.kt @@ -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() { diff --git a/tests/common/java/android/net/netstats/NetworkStatsHistoryTest.kt b/tests/common/java/android/net/netstats/NetworkStatsHistoryTest.kt index a6c9f3cebd..a001dfcac2 100644 --- a/tests/common/java/android/net/netstats/NetworkStatsHistoryTest.kt +++ b/tests/common/java/android/net/netstats/NetworkStatsHistoryTest.kt @@ -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() { diff --git a/tests/common/java/android/net/netstats/NetworkTemplateTest.kt b/tests/common/java/android/net/netstats/NetworkTemplateTest.kt index 1b55be9725..f6b655586d 100644 --- a/tests/common/java/android/net/netstats/NetworkTemplateTest.kt +++ b/tests/common/java/android/net/netstats/NetworkTemplateTest.kt @@ -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() { diff --git a/tests/cts/net/src/android/net/cts/ConnectivityFrameworkInitializerTiramisuTest.kt b/tests/cts/net/src/android/net/cts/ConnectivityFrameworkInitializerTiramisuTest.kt index 049372f576..61139330c3 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityFrameworkInitializerTiramisuTest.kt +++ b/tests/cts/net/src/android/net/cts/ConnectivityFrameworkInitializerTiramisuTest.kt @@ -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() { diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java index bdb5283df8..e86259e075 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java @@ -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); diff --git a/tests/cts/net/src/android/net/cts/DhcpOptionTest.kt b/tests/cts/net/src/android/net/cts/DhcpOptionTest.kt index 555dd87bc8..a6b4c2e091 100644 --- a/tests/cts/net/src/android/net/cts/DhcpOptionTest.kt +++ b/tests/cts/net/src/android/net/cts/DhcpOptionTest.kt @@ -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 diff --git a/tests/cts/net/src/android/net/cts/DnsResolverTest.java b/tests/cts/net/src/android/net/cts/DnsResolverTest.java index 396f043c1a..28c25c0583 100644 --- a/tests/cts/net/src/android/net/cts/DnsResolverTest.java +++ b/tests/cts/net/src/android/net/cts/DnsResolverTest.java @@ -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) { diff --git a/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt b/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt index 631fdd25ef..3409ecc1a8 100644 --- a/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt +++ b/tests/cts/net/src/android/net/cts/DscpPolicyTest.kt @@ -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 = diff --git a/tests/cts/net/src/android/net/cts/EthernetNetworkUpdateRequestTest.java b/tests/cts/net/src/android/net/cts/EthernetNetworkUpdateRequestTest.java index c8ee0c7202..11ac24b2da 100644 --- a/tests/cts/net/src/android/net/cts/EthernetNetworkUpdateRequestTest.java +++ b/tests/cts/net/src/android/net/cts/EthernetNetworkUpdateRequestTest.java @@ -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 = diff --git a/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java b/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java index 3289385b5d..493cb078c7 100644 --- a/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java +++ b/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java @@ -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 */, diff --git a/tests/cts/net/src/android/net/cts/NetworkStatsManagerTest.java b/tests/cts/net/src/android/net/cts/NetworkStatsManagerTest.java index eb2dbf7a98..ff43aa072c 100644 --- a/tests/cts/net/src/android/net/cts/NetworkStatsManagerTest.java +++ b/tests/cts/net/src/android/net/cts/NetworkStatsManagerTest.java @@ -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 prefixes = List.of(PREFIX_UID, PREFIX_XT, PREFIX_UID_TAG); diff --git a/tests/cts/net/src/android/net/cts/RateLimitTest.java b/tests/cts/net/src/android/net/cts/RateLimitTest.java index 36b98fc570..bd1698bd8a 100644 --- a/tests/cts/net/src/android/net/cts/RateLimitTest.java +++ b/tests/cts/net/src/android/net/cts/RateLimitTest.java @@ -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 sKernelConfig; diff --git a/tests/unit/java/android/net/EthernetNetworkUpdateRequestTest.java b/tests/unit/java/android/net/EthernetNetworkUpdateRequestTest.java index ca9558b7f7..718ca0a73d 100644 --- a/tests/unit/java/android/net/EthernetNetworkUpdateRequestTest.java +++ b/tests/unit/java/android/net/EthernetNetworkUpdateRequestTest.java @@ -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( diff --git a/tests/unit/java/android/net/NetworkStatsAccessTest.java b/tests/unit/java/android/net/NetworkStatsAccessTest.java index 8b86211112..616faeae44 100644 --- a/tests/unit/java/android/net/NetworkStatsAccessTest.java +++ b/tests/unit/java/android/net/NetworkStatsAccessTest.java @@ -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; diff --git a/tests/unit/java/android/net/NetworkStatsCollectionTest.java b/tests/unit/java/android/net/NetworkStatsCollectionTest.java index 81557f85c5..1af89adde9 100644 --- a/tests/unit/java/android/net/NetworkStatsCollectionTest.java +++ b/tests/unit/java/android/net/NetworkStatsCollectionTest.java @@ -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(); diff --git a/tests/unit/java/android/net/NetworkStatsRecorderTest.java b/tests/unit/java/android/net/NetworkStatsRecorderTest.java index 7d039b6e02..a0b36bb0e9 100644 --- a/tests/unit/java/android/net/NetworkStatsRecorderTest.java +++ b/tests/unit/java/android/net/NetworkStatsRecorderTest.java @@ -27,7 +27,6 @@ import static android.text.format.DateUtils.HOUR_IN_MILLIS; import static com.android.server.ConnectivityStatsLog.NETWORK_STATS_RECORDER_FILE_OPERATED__RECORDER_PREFIX__PREFIX_UID; import static com.android.server.ConnectivityStatsLog.NETWORK_STATS_RECORDER_FILE_OPERATED__RECORDER_PREFIX__PREFIX_UIDTAG; import static com.android.server.ConnectivityStatsLog.NETWORK_STATS_RECORDER_FILE_OPERATED__RECORDER_PREFIX__PREFIX_XT; -import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyLong; @@ -43,6 +42,7 @@ import android.net.NetworkIdentity; import android.net.NetworkIdentitySet; import android.net.NetworkStats; import android.net.NetworkStatsCollection; +import android.os.Build; import android.os.DropBoxManager; import androidx.test.filters.SmallTest; @@ -67,7 +67,7 @@ import java.io.IOException; @RunWith(DevSdkIgnoreRunner.class) @SmallTest -@DevSdkIgnoreRule.IgnoreUpTo(SC_V2) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2) public final class NetworkStatsRecorderTest { private static final String TAG = NetworkStatsRecorderTest.class.getSimpleName(); diff --git a/tests/unit/java/android/net/netstats/NetworkStatsDataMigrationUtilsTest.kt b/tests/unit/java/android/net/netstats/NetworkStatsDataMigrationUtilsTest.kt index aa5a246aba..8da680a77c 100644 --- a/tests/unit/java/android/net/netstats/NetworkStatsDataMigrationUtilsTest.kt +++ b/tests/unit/java/android/net/netstats/NetworkStatsDataMigrationUtilsTest.kt @@ -17,12 +17,12 @@ package android.net.netstats import android.net.NetworkStatsCollection +import android.os.Build import androidx.test.InstrumentationRegistry import androidx.test.filters.SmallTest import com.android.frameworks.tests.net.R import com.android.testutils.DevSdkIgnoreRule import com.android.testutils.DevSdkIgnoreRunner -import com.android.testutils.SC_V2 import org.junit.Before import org.junit.Test import org.junit.runner.RunWith @@ -37,7 +37,7 @@ private const val BUCKET_DURATION_MS = 2 * 60 * 60 * 1000L @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) class NetworkStatsDataMigrationUtilsTest { @Before fun setup() { diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java index b144cd17a3..c519f714f5 100755 --- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java @@ -179,7 +179,6 @@ import static com.android.testutils.ConcurrentUtils.await; import static com.android.testutils.ConcurrentUtils.durationOf; import static com.android.testutils.DevSdkIgnoreRule.IgnoreAfter; import static com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo; -import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2; import static com.android.testutils.FunctionalUtils.ignoreExceptions; import static com.android.testutils.HandlerUtils.visibleOnHandlerThread; import static com.android.testutils.HandlerUtils.waitForIdleSerialExecutor; @@ -10606,7 +10605,7 @@ public class ConnectivityServiceTest { reset(mBpfNetMaps); } - @Test @IgnoreUpTo(SC_V2) + @Test @IgnoreUpTo(Build.VERSION_CODES.S_V2) public void testSetUidFirewallRule() throws Exception { doTestSetUidFirewallRule(FIREWALL_CHAIN_DOZABLE, FIREWALL_RULE_DENY); doTestSetUidFirewallRule(FIREWALL_CHAIN_STANDBY, FIREWALL_RULE_ALLOW); @@ -10625,7 +10624,7 @@ public class ConnectivityServiceTest { doTestSetUidFirewallRule(FIREWALL_CHAIN_METERED_DENY_ADMIN, FIREWALL_RULE_ALLOW); } - @Test @IgnoreUpTo(SC_V2) + @Test @IgnoreUpTo(Build.VERSION_CODES.S_V2) public void testSetFirewallChainEnabled() throws Exception { final List firewallChains = new ArrayList<>(Arrays.asList( FIREWALL_CHAIN_DOZABLE, @@ -10704,7 +10703,7 @@ public class ConnectivityServiceTest { reset(mBpfNetMaps); } - @Test @IgnoreUpTo(SC_V2) + @Test @IgnoreUpTo(Build.VERSION_CODES.S_V2) public void testReplaceFirewallChain() { doTestReplaceFirewallChain(FIREWALL_CHAIN_DOZABLE); doTestReplaceFirewallChain(FIREWALL_CHAIN_STANDBY); @@ -10720,7 +10719,7 @@ public class ConnectivityServiceTest { doTestReplaceFirewallChain(FIREWALL_CHAIN_OEM_DENY_3); } - @Test @IgnoreUpTo(SC_V2) + @Test @IgnoreUpTo(Build.VERSION_CODES.S_V2) public void testInvalidFirewallChain() throws Exception { final int uid = 1001; final Class expected = IllegalArgumentException.class; @@ -10730,7 +10729,7 @@ public class ConnectivityServiceTest { () -> mCm.setUidFirewallRule(100 /* chain */, uid, FIREWALL_RULE_ALLOW)); } - @Test @IgnoreUpTo(SC_V2) + @Test @IgnoreUpTo(Build.VERSION_CODES.S_V2) public void testInvalidFirewallRule() throws Exception { final Class expected = IllegalArgumentException.class; assertThrows(expected, @@ -13956,7 +13955,7 @@ public class ConnectivityServiceTest { && session.getSessionType() == QosSession.TYPE_NR_BEARER)); } - @Test @IgnoreUpTo(SC_V2) + @Test @IgnoreUpTo(Build.VERSION_CODES.S_V2) public void testQosCallbackAvailableOnValidationError() throws Exception { mQosCallbackMockHelper = new QosCallbackMockHelper(); final NetworkAgentWrapper wrapper = mQosCallbackMockHelper.mAgentWrapper; @@ -13992,7 +13991,7 @@ public class ConnectivityServiceTest { .onError(eq(QosCallbackException.EX_TYPE_FILTER_SOCKET_REMOTE_ADDRESS_CHANGED)); } - @Test @IgnoreUpTo(SC_V2) + @Test @IgnoreUpTo(Build.VERSION_CODES.S_V2) public void testQosCallbackLostOnValidationError() throws Exception { mQosCallbackMockHelper = new QosCallbackMockHelper(); final int sessionId = 10; @@ -18485,7 +18484,7 @@ public class ConnectivityServiceTest { null /* callingAttributionTag */)); } - @Test @IgnoreUpTo(SC_V2) + @Test @IgnoreUpTo(Build.VERSION_CODES.S_V2) public void testUpdateRateLimit_EnableDisable() throws Exception { final LinkProperties wifiLp = new LinkProperties(); wifiLp.setInterfaceName(WIFI_IFNAME); @@ -18524,7 +18523,7 @@ public class ConnectivityServiceTest { it -> it.first == cellLp.getInterfaceName() && it.second == -1)); } - @Test @IgnoreUpTo(SC_V2) + @Test @IgnoreUpTo(Build.VERSION_CODES.S_V2) public void testUpdateRateLimit_WhenNewNetworkIsAdded() throws Exception { final LinkProperties wifiLp = new LinkProperties(); wifiLp.setInterfaceName(WIFI_IFNAME); @@ -18550,7 +18549,7 @@ public class ConnectivityServiceTest { && it.second == rateLimitInBytesPerSec)); } - @Test @IgnoreUpTo(SC_V2) + @Test @IgnoreUpTo(Build.VERSION_CODES.S_V2) public void testUpdateRateLimit_OnlyAffectsInternetCapableNetworks() throws Exception { final LinkProperties wifiLp = new LinkProperties(); wifiLp.setInterfaceName(WIFI_IFNAME); @@ -18568,7 +18567,7 @@ public class ConnectivityServiceTest { assertNull(readHeadWifi.poll(TIMEOUT_MS, it -> it.first == wifiLp.getInterfaceName())); } - @Test @IgnoreUpTo(SC_V2) + @Test @IgnoreUpTo(Build.VERSION_CODES.S_V2) public void testUpdateRateLimit_DisconnectingResetsRateLimit() throws Exception { // Steps: @@ -18604,7 +18603,7 @@ public class ConnectivityServiceTest { assertNull(readHeadWifi.poll(TIMEOUT_MS, it -> it.first == wifiLp.getInterfaceName())); } - @Test @IgnoreUpTo(SC_V2) + @Test @IgnoreUpTo(Build.VERSION_CODES.S_V2) public void testUpdateRateLimit_UpdateExistingRateLimit() throws Exception { final LinkProperties wifiLp = new LinkProperties(); wifiLp.setInterfaceName(WIFI_IFNAME); @@ -18634,7 +18633,7 @@ public class ConnectivityServiceTest { && it.second == 2000)); } - @Test @IgnoreAfter(SC_V2) + @Test @IgnoreAfter(Build.VERSION_CODES.S_V2) public void testUpdateRateLimit_DoesNothingBeforeT() throws Exception { final LinkProperties wifiLp = new LinkProperties(); wifiLp.setInterfaceName(WIFI_IFNAME); diff --git a/tests/unit/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java b/tests/unit/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java index d1bf40ed56..dd4e606028 100644 --- a/tests/unit/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java +++ b/tests/unit/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java @@ -27,7 +27,6 @@ import static android.provider.Settings.Global.NETWORK_DEFAULT_DAILY_MULTIPATH_Q import static com.android.server.net.NetworkPolicyManagerInternal.QUOTA_TYPE_MULTIPATH; import static com.android.server.net.NetworkPolicyManagerService.OPPORTUNISTIC_QUOTA_UNKNOWN; -import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2; import static org.junit.Assert.assertNotNull; import static org.mockito.ArgumentMatchers.any; @@ -406,7 +405,7 @@ public class MultipathPolicyTrackerTest { any(), eq(DataUnit.MEGABYTES.toBytes(14)), any(), any()); } - @DevSdkIgnoreRule.IgnoreUpTo(SC_V2) + @DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2) @Test public void testOnThresholdReached() { prepareGetMultipathPreferenceTest( diff --git a/tests/unit/java/com/android/server/connectivity/mdns/ConnectivityMonitorWithConnectivityManagerTests.java b/tests/unit/java/com/android/server/connectivity/mdns/ConnectivityMonitorWithConnectivityManagerTests.java index fa175b58d4..96951e7bf0 100644 --- a/tests/unit/java/com/android/server/connectivity/mdns/ConnectivityMonitorWithConnectivityManagerTests.java +++ b/tests/unit/java/com/android/server/connectivity/mdns/ConnectivityMonitorWithConnectivityManagerTests.java @@ -19,8 +19,6 @@ package com.android.server.connectivity.mdns; import static android.net.InetAddresses.parseNumericAddress; import static android.net.RouteInfo.RTN_UNICAST; -import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2; - import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; @@ -37,6 +35,7 @@ import android.net.LinkProperties; import android.net.Network; import android.net.NetworkRequest; import android.net.RouteInfo; +import android.os.Build; import com.android.net.module.util.SharedLog; import com.android.testutils.DevSdkIgnoreRule; @@ -55,7 +54,7 @@ import java.util.List; /** Tests for {@link ConnectivityMonitor}. */ @RunWith(DevSdkIgnoreRunner.class) -@DevSdkIgnoreRule.IgnoreUpTo(SC_V2) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2) public class ConnectivityMonitorWithConnectivityManagerTests { @Mock private Context mContext; @Mock private ConnectivityMonitor.Listener mockListener; diff --git a/tests/unit/java/com/android/server/connectivity/mdns/MdnsDiscoveryManagerTests.java b/tests/unit/java/com/android/server/connectivity/mdns/MdnsDiscoveryManagerTests.java index 758b8222f0..6cf5e84fb2 100644 --- a/tests/unit/java/com/android/server/connectivity/mdns/MdnsDiscoveryManagerTests.java +++ b/tests/unit/java/com/android/server/connectivity/mdns/MdnsDiscoveryManagerTests.java @@ -16,8 +16,6 @@ package com.android.server.connectivity.mdns; -import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; @@ -31,6 +29,7 @@ import static org.mockito.Mockito.when; import android.annotation.NonNull; import android.net.Network; +import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.text.TextUtils; @@ -61,7 +60,7 @@ import java.util.concurrent.ScheduledExecutorService; /** Tests for {@link MdnsDiscoveryManager}. */ @DevSdkIgnoreRunner.MonitorThreadLeak @RunWith(DevSdkIgnoreRunner.class) -@DevSdkIgnoreRule.IgnoreUpTo(SC_V2) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2) public class MdnsDiscoveryManagerTests { private static final long DEFAULT_TIMEOUT = 2000L; private static final String SERVICE_TYPE_1 = "_googlecast._tcp.local"; diff --git a/tests/unit/java/com/android/server/connectivity/mdns/MdnsPacketReaderTests.java b/tests/unit/java/com/android/server/connectivity/mdns/MdnsPacketReaderTests.java index 0168b61009..ee141d30ca 100644 --- a/tests/unit/java/com/android/server/connectivity/mdns/MdnsPacketReaderTests.java +++ b/tests/unit/java/com/android/server/connectivity/mdns/MdnsPacketReaderTests.java @@ -16,12 +16,12 @@ package com.android.server.connectivity.mdns; -import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThrows; import static org.junit.Assert.fail; +import android.os.Build; + import com.android.net.module.util.HexDump; import com.android.testutils.DevSdkIgnoreRule; import com.android.testutils.DevSdkIgnoreRunner; @@ -34,7 +34,7 @@ import java.net.DatagramPacket; import java.util.Locale; @RunWith(DevSdkIgnoreRunner.class) -@DevSdkIgnoreRule.IgnoreUpTo(SC_V2) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2) public class MdnsPacketReaderTests { @Test diff --git a/tests/unit/java/com/android/server/connectivity/mdns/MdnsRecordTests.java b/tests/unit/java/com/android/server/connectivity/mdns/MdnsRecordTests.java index aeb1966a3a..789a9bd3ab 100644 --- a/tests/unit/java/com/android/server/connectivity/mdns/MdnsRecordTests.java +++ b/tests/unit/java/com/android/server/connectivity/mdns/MdnsRecordTests.java @@ -17,7 +17,6 @@ package com.android.server.connectivity.mdns; import static com.android.server.connectivity.mdns.MdnsConstants.QCLASS_INTERNET; -import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -30,6 +29,7 @@ import static org.junit.Assert.assertTrue; import static java.util.Collections.emptyList; +import android.os.Build; import android.util.Log; import com.android.net.module.util.HexDump; @@ -51,7 +51,7 @@ import java.util.List; // The record test data does not use compressed names (label pointers), since that would require // additional data to populate the label dictionary accordingly. @RunWith(DevSdkIgnoreRunner.class) -@DevSdkIgnoreRule.IgnoreUpTo(SC_V2) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2) public class MdnsRecordTests { private static final String TAG = "MdnsRecordTests"; private static final int MAX_PACKET_SIZE = 4096; diff --git a/tests/unit/java/com/android/server/connectivity/mdns/MdnsResponseDecoderTests.java b/tests/unit/java/com/android/server/connectivity/mdns/MdnsResponseDecoderTests.java index ad0f7efc8d..0c288bcad9 100644 --- a/tests/unit/java/com/android/server/connectivity/mdns/MdnsResponseDecoderTests.java +++ b/tests/unit/java/com/android/server/connectivity/mdns/MdnsResponseDecoderTests.java @@ -19,7 +19,6 @@ package com.android.server.connectivity.mdns; import static android.net.InetAddresses.parseNumericAddress; import static com.android.server.connectivity.mdns.util.MdnsUtils.Clock; -import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -32,6 +31,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import android.net.Network; +import android.os.Build; import android.util.ArraySet; import com.android.net.module.util.HexDump; @@ -57,7 +57,7 @@ import java.util.List; import java.util.stream.Collectors; @RunWith(DevSdkIgnoreRunner.class) -@DevSdkIgnoreRule.IgnoreUpTo(SC_V2) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2) public class MdnsResponseDecoderTests { private static final byte[] data = HexDump.hexStringToByteArray( "0000840000000004" diff --git a/tests/unit/java/com/android/server/connectivity/mdns/MdnsResponseTests.java b/tests/unit/java/com/android/server/connectivity/mdns/MdnsResponseTests.java index 3e189f12fc..0b5fe91e61 100644 --- a/tests/unit/java/com/android/server/connectivity/mdns/MdnsResponseTests.java +++ b/tests/unit/java/com/android/server/connectivity/mdns/MdnsResponseTests.java @@ -18,8 +18,6 @@ package com.android.server.connectivity.mdns; import static android.net.InetAddresses.parseNumericAddress; -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; @@ -30,6 +28,7 @@ import static org.mockito.Mockito.mock; import static java.util.Collections.emptyList; import android.net.Network; +import android.os.Build; import com.android.net.module.util.HexDump; import com.android.testutils.DevSdkIgnoreRule; @@ -45,7 +44,7 @@ import java.util.List; // The record test data does not use compressed names (label pointers), since that would require // additional data to populate the label dictionary accordingly. @RunWith(DevSdkIgnoreRunner.class) -@DevSdkIgnoreRule.IgnoreUpTo(SC_V2) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2) public class MdnsResponseTests { private static final String TAG = "MdnsResponseTests"; // MDNS response packet for name "test" with an IPv4 address of 10.1.2.3 diff --git a/tests/unit/java/com/android/server/connectivity/mdns/MdnsServiceInfoTest.java b/tests/unit/java/com/android/server/connectivity/mdns/MdnsServiceInfoTest.java index d3989e3123..23553829d4 100644 --- a/tests/unit/java/com/android/server/connectivity/mdns/MdnsServiceInfoTest.java +++ b/tests/unit/java/com/android/server/connectivity/mdns/MdnsServiceInfoTest.java @@ -17,7 +17,6 @@ package com.android.server.connectivity.mdns; import static com.android.server.connectivity.mdns.MdnsSocket.INTERFACE_INDEX_UNSPECIFIED; -import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -26,6 +25,7 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import android.net.Network; +import android.os.Build; import android.os.Parcel; import com.android.server.connectivity.mdns.MdnsServiceInfo.TextEntry; @@ -39,7 +39,7 @@ import java.time.Instant; import java.util.List; @RunWith(DevSdkIgnoreRunner.class) -@DevSdkIgnoreRule.IgnoreUpTo(SC_V2) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2) public class MdnsServiceInfoTest { @Test public void constructor_createWithTextEntries_correctAttributes() { diff --git a/tests/unit/java/com/android/server/connectivity/mdns/MdnsServiceTypeClientTests.java b/tests/unit/java/com/android/server/connectivity/mdns/MdnsServiceTypeClientTests.java index 39e08d06da..27ea3fcb14 100644 --- a/tests/unit/java/com/android/server/connectivity/mdns/MdnsServiceTypeClientTests.java +++ b/tests/unit/java/com/android/server/connectivity/mdns/MdnsServiceTypeClientTests.java @@ -26,7 +26,6 @@ import static com.android.server.connectivity.mdns.MdnsServiceTypeClient.EVENT_Q import static com.android.server.connectivity.mdns.MdnsServiceTypeClient.EVENT_REMOVE_EXPIRED_SERVICES; import static com.android.server.connectivity.mdns.MdnsServiceTypeClient.EVENT_START_QUERYTASK; import static com.android.server.connectivity.mdns.MdnsServiceTypeClient.REMOVE_SERVICE_AFTER_QUERY_SENT_TIME; -import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -57,6 +56,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.net.InetAddresses; import android.net.Network; +import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.Message; @@ -101,7 +101,7 @@ import java.util.stream.Stream; /** Tests for {@link MdnsServiceTypeClient}. */ @DevSdkIgnoreRunner.MonitorThreadLeak @RunWith(DevSdkIgnoreRunner.class) -@DevSdkIgnoreRule.IgnoreUpTo(SC_V2) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2) public class MdnsServiceTypeClientTests { private static final int INTERFACE_INDEX = 999; private static final long DEFAULT_TIMEOUT = 2000L; diff --git a/tests/unit/java/com/android/server/connectivity/mdns/MdnsSocketClientTests.java b/tests/unit/java/com/android/server/connectivity/mdns/MdnsSocketClientTests.java index 6c128804e8..3d48302265 100644 --- a/tests/unit/java/com/android/server/connectivity/mdns/MdnsSocketClientTests.java +++ b/tests/unit/java/com/android/server/connectivity/mdns/MdnsSocketClientTests.java @@ -17,7 +17,6 @@ package com.android.server.connectivity.mdns; import static com.android.testutils.Cleanup.testAndCleanup; -import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; @@ -44,6 +43,7 @@ import android.net.ConnectivityManager; import android.net.InetAddresses; import android.net.wifi.WifiManager; import android.net.wifi.WifiManager.MulticastLock; +import android.os.Build; import android.text.format.DateUtils; import android.util.Log; @@ -75,7 +75,7 @@ import java.util.concurrent.atomic.AtomicBoolean; /** Tests for {@link MdnsSocketClient} */ @RunWith(DevSdkIgnoreRunner.class) -@DevSdkIgnoreRule.IgnoreUpTo(SC_V2) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2) public class MdnsSocketClientTests { private static final long TIMEOUT = 500; private final byte[] buf = new byte[10]; diff --git a/tests/unit/java/com/android/server/connectivity/mdns/MdnsSocketTests.java b/tests/unit/java/com/android/server/connectivity/mdns/MdnsSocketTests.java index 58096844cc..71779afe29 100644 --- a/tests/unit/java/com/android/server/connectivity/mdns/MdnsSocketTests.java +++ b/tests/unit/java/com/android/server/connectivity/mdns/MdnsSocketTests.java @@ -16,11 +16,11 @@ package com.android.server.connectivity.mdns; -import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2; - import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.os.Build; + import com.android.net.module.util.SharedLog; import com.android.testutils.DevSdkIgnoreRule; import com.android.testutils.DevSdkIgnoreRunner; @@ -45,7 +45,7 @@ import java.util.Collections; /** Tests for {@link MdnsSocket}. */ @RunWith(DevSdkIgnoreRunner.class) -@DevSdkIgnoreRule.IgnoreUpTo(SC_V2) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2) public class MdnsSocketTests { @Mock private NetworkInterfaceWrapper mockNetworkInterfaceWrapper; diff --git a/tests/unit/java/com/android/server/connectivity/mdns/MulticastNetworkInterfaceProviderTests.java b/tests/unit/java/com/android/server/connectivity/mdns/MulticastNetworkInterfaceProviderTests.java index d36ab6cb57..86fbf6b517 100644 --- a/tests/unit/java/com/android/server/connectivity/mdns/MulticastNetworkInterfaceProviderTests.java +++ b/tests/unit/java/com/android/server/connectivity/mdns/MulticastNetworkInterfaceProviderTests.java @@ -16,8 +16,6 @@ package com.android.server.connectivity.mdns; -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.assertTrue; @@ -27,6 +25,7 @@ import static org.mockito.Mockito.when; import android.annotation.NonNull; import android.content.Context; +import android.os.Build; import androidx.test.InstrumentationRegistry; @@ -53,7 +52,7 @@ import java.util.List; /** Tests for {@link MulticastNetworkInterfaceProvider}. */ @RunWith(DevSdkIgnoreRunner.class) -@DevSdkIgnoreRule.IgnoreUpTo(SC_V2) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2) public class MulticastNetworkInterfaceProviderTests { @Mock private NetworkInterfaceWrapper loopbackInterface; diff --git a/tests/unit/java/com/android/server/net/NetworkStatsFactoryTest.java b/tests/unit/java/com/android/server/net/NetworkStatsFactoryTest.java index 89acf69c4f..5099d19914 100644 --- a/tests/unit/java/com/android/server/net/NetworkStatsFactoryTest.java +++ b/tests/unit/java/com/android/server/net/NetworkStatsFactoryTest.java @@ -33,7 +33,6 @@ import static android.net.NetworkStats.UID_ALL; import static com.android.server.net.NetworkStatsFactory.CONFIG_PER_UID_TAG_THROTTLING; import static com.android.server.net.NetworkStatsFactory.CONFIG_PER_UID_TAG_THROTTLING_THRESHOLD; import static com.android.server.net.NetworkStatsFactory.kernelToTag; -import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -48,6 +47,7 @@ import android.content.Context; import android.net.NetworkStats; import android.net.TrafficStats; import android.net.UnderlyingNetworkInfo; +import android.os.Build; import android.os.SystemClock; import androidx.test.InstrumentationRegistry; @@ -80,7 +80,7 @@ import java.util.HashMap; /** Tests for {@link NetworkStatsFactory}. */ @RunWith(DevSdkIgnoreRunner.class) @SmallTest -@DevSdkIgnoreRule.IgnoreUpTo(SC_V2) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2) public class NetworkStatsFactoryTest extends NetworkStatsBaseTest { private static final String CLAT_PREFIX = "v4-"; private static final int TEST_TAGS_PER_UID_THRESHOLD = 10; diff --git a/tests/unit/java/com/android/server/net/NetworkStatsObserversTest.java b/tests/unit/java/com/android/server/net/NetworkStatsObserversTest.java index a534c22410..10b1396071 100644 --- a/tests/unit/java/com/android/server/net/NetworkStatsObserversTest.java +++ b/tests/unit/java/com/android/server/net/NetworkStatsObserversTest.java @@ -30,8 +30,6 @@ import static android.net.NetworkTemplate.MATCH_WIFI; import static android.net.TrafficStats.MB_IN_BYTES; import static android.text.format.DateUtils.MINUTE_IN_MILLIS; -import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; @@ -45,6 +43,7 @@ import android.net.NetworkIdentitySet; import android.net.NetworkStats; import android.net.NetworkStatsAccess; import android.net.NetworkTemplate; +import android.os.Build; import android.os.HandlerThread; import android.os.IBinder; import android.os.Looper; @@ -76,7 +75,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 NetworkStatsObserversTest { private static final String TEST_IFACE = "test0"; private static final String TEST_IFACE2 = "test1"; diff --git a/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java b/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java index 1ce8ffcce5..de54e8d145 100644 --- a/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java +++ b/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java @@ -79,7 +79,6 @@ import static com.android.server.net.NetworkStatsService.NETSTATS_IMPORT_FALLBAC import static com.android.server.net.NetworkStatsService.NETSTATS_IMPORT_SUCCESSES_COUNTER_NAME; import static com.android.server.net.NetworkStatsService.TRAFFICSTATS_CLIENT_RATE_LIMIT_CACHE_ENABLED_FLAG; import static com.android.server.net.NetworkStatsService.TRAFFICSTATS_SERVICE_RATE_LIMIT_CACHE_ENABLED_FLAG; -import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -224,7 +223,7 @@ import java.util.function.Consumer; @RunWith(DevSdkIgnoreRunner.class) @SmallTest // NetworkStatsService is not updatable before T, so tests do not need to be backwards compatible -@DevSdkIgnoreRule.IgnoreUpTo(SC_V2) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2) public class NetworkStatsServiceTest extends NetworkStatsBaseTest { @Rule public final DevSdkIgnoreRule ignoreRule = new DevSdkIgnoreRule(); diff --git a/tests/unit/java/com/android/server/net/NetworkStatsSubscriptionsMonitorTest.java b/tests/unit/java/com/android/server/net/NetworkStatsSubscriptionsMonitorTest.java index 622f2be4be..9c432ae3fe 100644 --- a/tests/unit/java/com/android/server/net/NetworkStatsSubscriptionsMonitorTest.java +++ b/tests/unit/java/com/android/server/net/NetworkStatsSubscriptionsMonitorTest.java @@ -19,8 +19,6 @@ package com.android.server.net; import static android.telephony.TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE; import static android.telephony.TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA; -import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; @@ -39,6 +37,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.app.usage.NetworkStatsManager; import android.content.Context; +import android.os.Build; import android.os.Looper; import android.os.Parcel; import android.telephony.SubscriptionManager; @@ -64,7 +63,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.Executors; @RunWith(DevSdkIgnoreRunner.class) -@DevSdkIgnoreRule.IgnoreUpTo(SC_V2) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.S_V2) public final class NetworkStatsSubscriptionsMonitorTest { private static final int TEST_SUBID1 = 3; private static final int TEST_SUBID2 = 5; diff --git a/tests/unit/java/com/android/server/net/PersistentIntTest.kt b/tests/unit/java/com/android/server/net/PersistentIntTest.kt index 92683525ed..5f07e5b6df 100644 --- a/tests/unit/java/com/android/server/net/PersistentIntTest.kt +++ b/tests/unit/java/com/android/server/net/PersistentIntTest.kt @@ -16,10 +16,10 @@ package com.android.server.net +import android.os.Build import android.util.SystemConfigFileCommitEventLogger import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo import com.android.testutils.DevSdkIgnoreRunner -import com.android.testutils.SC_V2 import com.android.testutils.assertThrows import org.junit.After import org.junit.Before @@ -37,7 +37,7 @@ import java.util.Random import kotlin.test.assertEquals @RunWith(DevSdkIgnoreRunner::class) -@IgnoreUpTo(SC_V2) +@IgnoreUpTo(Build.VERSION_CODES.S_V2) class PersistentIntTest { val tempFilesCreated = mutableSetOf() lateinit var tempDir: Path