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
5 changed files with 115 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

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() {