diff --git a/tests/common/java/android/net/CaptivePortalDataTest.kt b/tests/common/java/android/net/CaptivePortalDataTest.kt index f9273802f7..67a523c14f 100644 --- a/tests/common/java/android/net/CaptivePortalDataTest.kt +++ b/tests/common/java/android/net/CaptivePortalDataTest.kt @@ -19,21 +19,20 @@ package android.net import android.os.Build import androidx.test.filters.SmallTest import com.android.modules.utils.build.SdkLevel -import com.android.testutils.assertParcelingIsLossless import com.android.testutils.DevSdkIgnoreRule import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo import com.android.testutils.DevSdkIgnoreRunner +import com.android.testutils.assertParcelingIsLossless +import kotlin.test.assertEquals +import kotlin.test.assertNotEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import kotlin.test.assertEquals -import kotlin.test.assertNotEquals @SmallTest @RunWith(DevSdkIgnoreRunner::class) -@IgnoreUpTo(Build.VERSION_CODES.Q) class CaptivePortalDataTest { @Rule @JvmField val ignoreRule = DevSdkIgnoreRule() diff --git a/tests/common/java/android/net/KeepalivePacketDataTest.kt b/tests/common/java/android/net/KeepalivePacketDataTest.kt index 403d6b5759..97a45fcc4f 100644 --- a/tests/common/java/android/net/KeepalivePacketDataTest.kt +++ b/tests/common/java/android/net/KeepalivePacketDataTest.kt @@ -17,27 +17,20 @@ package android.net import android.net.InvalidPacketException.ERROR_INVALID_IP_ADDRESS import android.net.InvalidPacketException.ERROR_INVALID_PORT -import android.os.Build import androidx.test.filters.SmallTest import androidx.test.runner.AndroidJUnit4 -import com.android.testutils.DevSdkIgnoreRule -import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo import com.android.testutils.NonNullTestUtils import java.net.InetAddress import java.util.Arrays import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue import org.junit.Assert.fail -import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @RunWith(AndroidJUnit4::class) @SmallTest class KeepalivePacketDataTest { - @Rule @JvmField - val ignoreRule: DevSdkIgnoreRule = DevSdkIgnoreRule() - private val INVALID_PORT = 65537 private val TEST_DST_PORT = 4244 private val TEST_SRC_PORT = 4243 @@ -60,7 +53,6 @@ class KeepalivePacketDataTest { NonNullTestUtils.nullUnsafe(dstAddress), dstPort, data) @Test - @IgnoreUpTo(Build.VERSION_CODES.Q) fun testConstructor() { try { TestKeepalivePacketData(srcAddress = null) @@ -99,22 +91,17 @@ class KeepalivePacketDataTest { } @Test - @IgnoreUpTo(Build.VERSION_CODES.Q) fun testSrcAddress() = assertEquals(TEST_SRC_ADDRV4, TestKeepalivePacketData().srcAddress) @Test - @IgnoreUpTo(Build.VERSION_CODES.Q) fun testDstAddress() = assertEquals(TEST_DST_ADDRV4, TestKeepalivePacketData().dstAddress) @Test - @IgnoreUpTo(Build.VERSION_CODES.Q) fun testSrcPort() = assertEquals(TEST_SRC_PORT, TestKeepalivePacketData().srcPort) @Test - @IgnoreUpTo(Build.VERSION_CODES.Q) fun testDstPort() = assertEquals(TEST_DST_PORT, TestKeepalivePacketData().dstPort) @Test - @IgnoreUpTo(Build.VERSION_CODES.Q) fun testPacket() = assertTrue(Arrays.equals(TESTBYTES, TestKeepalivePacketData().packet)) } diff --git a/tests/common/java/android/net/LinkPropertiesTest.java b/tests/common/java/android/net/LinkPropertiesTest.java index d2e7c996d8..8f145723a0 100644 --- a/tests/common/java/android/net/LinkPropertiesTest.java +++ b/tests/common/java/android/net/LinkPropertiesTest.java @@ -134,13 +134,10 @@ public class LinkPropertiesTest { assertFalse(lp.isIpv4Provisioned()); assertFalse(lp.isIpv6Provisioned()); assertFalse(lp.isPrivateDnsActive()); - - if (SdkLevel.isAtLeastR()) { - assertNull(lp.getDhcpServerAddress()); - assertFalse(lp.isWakeOnLanSupported()); - assertNull(lp.getCaptivePortalApiUrl()); - assertNull(lp.getCaptivePortalData()); - } + assertNull(lp.getDhcpServerAddress()); + assertFalse(lp.isWakeOnLanSupported()); + assertNull(lp.getCaptivePortalApiUrl()); + assertNull(lp.getCaptivePortalData()); } private LinkProperties makeTestObject() { @@ -162,12 +159,10 @@ public class LinkPropertiesTest { lp.setMtu(MTU); lp.setTcpBufferSizes(TCP_BUFFER_SIZES); lp.setNat64Prefix(new IpPrefix("2001:db8:0:64::/96")); - if (SdkLevel.isAtLeastR()) { - lp.setDhcpServerAddress(DHCPSERVER); - lp.setWakeOnLanSupported(true); - lp.setCaptivePortalApiUrl(CAPPORT_API_URL); - lp.setCaptivePortalData((CaptivePortalData) getCaptivePortalData()); - } + lp.setDhcpServerAddress(DHCPSERVER); + lp.setWakeOnLanSupported(true); + lp.setCaptivePortalApiUrl(CAPPORT_API_URL); + lp.setCaptivePortalData((CaptivePortalData) getCaptivePortalData()); return lp; } @@ -206,19 +201,17 @@ public class LinkPropertiesTest { assertTrue(source.isIdenticalTcpBufferSizes(target)); assertTrue(target.isIdenticalTcpBufferSizes(source)); - if (SdkLevel.isAtLeastR()) { - assertTrue(source.isIdenticalDhcpServerAddress(target)); - assertTrue(source.isIdenticalDhcpServerAddress(source)); + assertTrue(source.isIdenticalDhcpServerAddress(target)); + assertTrue(source.isIdenticalDhcpServerAddress(source)); - assertTrue(source.isIdenticalWakeOnLan(target)); - assertTrue(target.isIdenticalWakeOnLan(source)); + assertTrue(source.isIdenticalWakeOnLan(target)); + assertTrue(target.isIdenticalWakeOnLan(source)); - assertTrue(source.isIdenticalCaptivePortalApiUrl(target)); - assertTrue(target.isIdenticalCaptivePortalApiUrl(source)); + assertTrue(source.isIdenticalCaptivePortalApiUrl(target)); + assertTrue(target.isIdenticalCaptivePortalApiUrl(source)); - assertTrue(source.isIdenticalCaptivePortalData(target)); - assertTrue(target.isIdenticalCaptivePortalData(source)); - } + assertTrue(source.isIdenticalCaptivePortalData(target)); + assertTrue(target.isIdenticalCaptivePortalData(source)); // Check result of equals(). assertTrue(source.equals(target)); @@ -1017,7 +1010,7 @@ public class LinkPropertiesTest { assertParcelingIsLossless(source); } - @Test @IgnoreUpTo(Build.VERSION_CODES.Q) + @Test public void testLinkPropertiesParcelable() throws Exception { final LinkProperties source = makeLinkPropertiesForParceling(); @@ -1035,7 +1028,7 @@ public class LinkPropertiesTest { } // Parceling of the scope was broken until Q-QPR2 - @Test @IgnoreUpTo(Build.VERSION_CODES.Q) + @Test public void testLinkLocalDnsServerParceling() throws Exception { final String strAddress = "fe80::1%lo"; final LinkProperties lp = new LinkProperties(); @@ -1158,7 +1151,7 @@ public class LinkPropertiesTest { assertFalse(lp.isPrivateDnsActive()); } - @Test @IgnoreUpTo(Build.VERSION_CODES.Q) + @Test public void testDhcpServerAddress() { final LinkProperties lp = makeTestObject(); assertEquals(DHCPSERVER, lp.getDhcpServerAddress()); @@ -1167,7 +1160,7 @@ public class LinkPropertiesTest { assertNull(lp.getDhcpServerAddress()); } - @Test @IgnoreUpTo(Build.VERSION_CODES.Q) + @Test public void testWakeOnLanSupported() { final LinkProperties lp = makeTestObject(); assertTrue(lp.isWakeOnLanSupported()); @@ -1176,7 +1169,7 @@ public class LinkPropertiesTest { assertFalse(lp.isWakeOnLanSupported()); } - @Test @IgnoreUpTo(Build.VERSION_CODES.Q) + @Test public void testCaptivePortalApiUrl() { final LinkProperties lp = makeTestObject(); assertEquals(CAPPORT_API_URL, lp.getCaptivePortalApiUrl()); @@ -1185,7 +1178,7 @@ public class LinkPropertiesTest { assertNull(lp.getCaptivePortalApiUrl()); } - @Test @IgnoreUpTo(Build.VERSION_CODES.Q) + @Test public void testCaptivePortalData() { final LinkProperties lp = makeTestObject(); assertEquals(getCaptivePortalData(), lp.getCaptivePortalData()); @@ -1238,7 +1231,7 @@ public class LinkPropertiesTest { assertTrue(Ipv6.hasIpv6DnsServer()); } - @Test @IgnoreUpTo(Build.VERSION_CODES.Q) + @Test public void testHasIpv4UnreachableDefaultRoute() { final LinkProperties lp = makeTestObject(); assertFalse(lp.hasIpv4UnreachableDefaultRoute()); @@ -1249,7 +1242,7 @@ public class LinkPropertiesTest { assertFalse(lp.hasIpv6UnreachableDefaultRoute()); } - @Test @IgnoreUpTo(Build.VERSION_CODES.Q) + @Test public void testHasIpv6UnreachableDefaultRoute() { final LinkProperties lp = makeTestObject(); assertFalse(lp.hasIpv6UnreachableDefaultRoute()); diff --git a/tests/common/java/android/net/MatchAllNetworkSpecifierTest.kt b/tests/common/java/android/net/MatchAllNetworkSpecifierTest.kt index 4a4859d53b..70adbd7fb5 100644 --- a/tests/common/java/android/net/MatchAllNetworkSpecifierTest.kt +++ b/tests/common/java/android/net/MatchAllNetworkSpecifierTest.kt @@ -52,7 +52,6 @@ class MatchAllNetworkSpecifierTest { } @Test - @IgnoreUpTo(Build.VERSION_CODES.Q) @IgnoreAfter(Build.VERSION_CODES.R) // Only run this test on Android R. // The method - satisfiedBy() has changed to canBeSatisfiedBy() starting from Android R, so the diff --git a/tests/common/java/android/net/NattKeepalivePacketDataTest.kt b/tests/common/java/android/net/NattKeepalivePacketDataTest.kt index e5806a6cb5..1148eff29d 100644 --- a/tests/common/java/android/net/NattKeepalivePacketDataTest.kt +++ b/tests/common/java/android/net/NattKeepalivePacketDataTest.kt @@ -82,7 +82,7 @@ class NattKeepalivePacketDataTest { dstPort: Int = NATT_PORT ) = NattKeepalivePacketData.nattKeepalivePacket(srcAddress, srcPort, dstAddress, dstPort) - @Test @IgnoreUpTo(Build.VERSION_CODES.Q) + @Test fun testConstructor() { assertFailsWith( "Dst port is not NATT port should cause exception") { @@ -132,12 +132,12 @@ class NattKeepalivePacketDataTest { assertEquals(TEST_ADDRV6, packet2.dstAddress) } - @Test @IgnoreUpTo(Build.VERSION_CODES.Q) + @Test fun testParcel() { assertParcelingIsLossless(nattKeepalivePacket()) } - @Test @IgnoreUpTo(Build.VERSION_CODES.Q) + @Test fun testEquals() { assertEqualBothWays(nattKeepalivePacket(), nattKeepalivePacket()) assertNotEquals(nattKeepalivePacket(dstAddress = TEST_SRC_ADDRV4), nattKeepalivePacket()) @@ -146,7 +146,7 @@ class NattKeepalivePacketDataTest { assertNotEquals(nattKeepalivePacket(srcPort = TEST_PORT2), nattKeepalivePacket()) } - @Test @IgnoreUpTo(Build.VERSION_CODES.Q) + @Test fun testHashCode() { assertEquals(nattKeepalivePacket().hashCode(), nattKeepalivePacket().hashCode()) } diff --git a/tests/common/java/android/net/NetworkAgentConfigTest.kt b/tests/common/java/android/net/NetworkAgentConfigTest.kt index c05cdbdc6f..d640a730ee 100644 --- a/tests/common/java/android/net/NetworkAgentConfigTest.kt +++ b/tests/common/java/android/net/NetworkAgentConfigTest.kt @@ -16,19 +16,15 @@ package android.net -import android.os.Build import androidx.test.filters.SmallTest import androidx.test.runner.AndroidJUnit4 import com.android.modules.utils.build.SdkLevel.isAtLeastS import com.android.modules.utils.build.SdkLevel.isAtLeastT import com.android.testutils.ConnectivityModuleTest -import com.android.testutils.DevSdkIgnoreRule -import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo import com.android.testutils.assertParcelingIsLossless import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue -import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -36,10 +32,7 @@ import org.junit.runner.RunWith @SmallTest @ConnectivityModuleTest class NetworkAgentConfigTest { - @Rule @JvmField - val ignoreRule = DevSdkIgnoreRule() - - @Test @IgnoreUpTo(Build.VERSION_CODES.Q) + @Test fun testParcelNetworkAgentConfig() { val config = NetworkAgentConfig.Builder().apply { setExplicitlySelected(true) @@ -58,7 +51,7 @@ class NetworkAgentConfigTest { assertParcelingIsLossless(config) } - @Test @IgnoreUpTo(Build.VERSION_CODES.Q) + @Test fun testBuilder() { val testExtraInfo = "mylegacyExtraInfo" val config = NetworkAgentConfig.Builder().apply { diff --git a/tests/common/java/android/net/NetworkCapabilitiesTest.java b/tests/common/java/android/net/NetworkCapabilitiesTest.java index bec9a4a616..3a3459bd99 100644 --- a/tests/common/java/android/net/NetworkCapabilitiesTest.java +++ b/tests/common/java/android/net/NetworkCapabilitiesTest.java @@ -61,7 +61,6 @@ import static android.net.NetworkCapabilities.TRANSPORT_WIFI; import static android.net.NetworkCapabilities.TRANSPORT_WIFI_AWARE; import static android.os.Process.INVALID_UID; -import static com.android.modules.utils.build.SdkLevel.isAtLeastR; 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; @@ -382,10 +381,9 @@ public class NetworkCapabilitiesTest { netCap.setSubscriptionIds(Set.of(TEST_SUBID1, TEST_SUBID2)); netCap.setUids(uids); } - if (isAtLeastR()) { - netCap.setOwnerUid(123); - netCap.setAdministratorUids(new int[] {5, 11}); - } + + netCap.setOwnerUid(123); + netCap.setAdministratorUids(new int[] {5, 11}); assertParcelingIsLossless(netCap); netCap.setSSID(TEST_SSID); testParcelSane(netCap); @@ -397,10 +395,8 @@ public class NetworkCapabilitiesTest { .addCapability(NET_CAPABILITY_INTERNET) .addCapability(NET_CAPABILITY_EIMS) .addCapability(NET_CAPABILITY_NOT_METERED); - if (isAtLeastR()) { - netCap.setRequestorPackageName("com.android.test"); - netCap.setRequestorUid(9304); - } + netCap.setRequestorPackageName("com.android.test"); + netCap.setRequestorUid(9304); assertParcelingIsLossless(netCap); netCap.setSSID(TEST_SSID); testParcelSane(netCap); @@ -820,16 +816,12 @@ public class NetworkCapabilitiesTest { assertTrue(nc2.hasForbiddenCapability(NET_CAPABILITY_NOT_ROAMING)); } - if (isAtLeastR()) { - assertTrue(TEST_SSID.equals(nc2.getSsid())); - } - + assertTrue(TEST_SSID.equals(nc2.getSsid())); nc1.setSSID(DIFFERENT_TEST_SSID); nc2.set(nc1); assertEquals(nc1, nc2); - if (isAtLeastR()) { - assertTrue(DIFFERENT_TEST_SSID.equals(nc2.getSsid())); - } + assertTrue(DIFFERENT_TEST_SSID.equals(nc2.getSsid())); + if (isAtLeastS()) { nc1.setUids(uidRanges(10, 13)); } else { diff --git a/tests/common/java/android/net/NetworkProviderTest.kt b/tests/common/java/android/net/NetworkProviderTest.kt index c6a734655e..0d35960057 100644 --- a/tests/common/java/android/net/NetworkProviderTest.kt +++ b/tests/common/java/android/net/NetworkProviderTest.kt @@ -39,6 +39,12 @@ import com.android.testutils.DevSdkIgnoreRule.IgnoreAfter import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo import com.android.testutils.DevSdkIgnoreRunner import com.android.testutils.TestableNetworkOfferCallback +import java.util.UUID +import java.util.concurrent.Executor +import java.util.concurrent.RejectedExecutionException +import kotlin.test.assertEquals +import kotlin.test.assertNotEquals +import kotlin.test.fail import org.junit.After import org.junit.Before import org.junit.Rule @@ -47,12 +53,6 @@ import org.junit.runner.RunWith import org.mockito.Mockito.doReturn import org.mockito.Mockito.mock import org.mockito.Mockito.verifyNoMoreInteractions -import java.util.UUID -import java.util.concurrent.Executor -import java.util.concurrent.RejectedExecutionException -import kotlin.test.assertEquals -import kotlin.test.assertNotEquals -import kotlin.test.fail private const val DEFAULT_TIMEOUT_MS = 5000L private const val DEFAULT_NO_CALLBACK_TIMEOUT_MS = 200L @@ -62,7 +62,6 @@ private val context: Context get() = InstrumentationRegistry.getContext() private val PROVIDER_NAME = "NetworkProviderTest" @RunWith(DevSdkIgnoreRunner::class) -@IgnoreUpTo(Build.VERSION_CODES.Q) @ConnectivityModuleTest class NetworkProviderTest { @Rule @JvmField diff --git a/tests/common/java/android/net/NetworkSpecifierTest.kt b/tests/common/java/android/net/NetworkSpecifierTest.kt index b96041769b..7edb4743d0 100644 --- a/tests/common/java/android/net/NetworkSpecifierTest.kt +++ b/tests/common/java/android/net/NetworkSpecifierTest.kt @@ -15,21 +15,18 @@ */ package android.net -import android.os.Build import androidx.test.filters.SmallTest import com.android.testutils.ConnectivityModuleTest -import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo import com.android.testutils.DevSdkIgnoreRunner -import org.junit.Test -import org.junit.runner.RunWith import kotlin.test.assertEquals import kotlin.test.assertFalse import kotlin.test.assertNotEquals import kotlin.test.assertTrue +import org.junit.Test +import org.junit.runner.RunWith @SmallTest @RunWith(DevSdkIgnoreRunner::class) -@IgnoreUpTo(Build.VERSION_CODES.Q) @ConnectivityModuleTest class NetworkSpecifierTest { private class TestNetworkSpecifier( diff --git a/tests/common/java/android/net/NetworkStackTest.java b/tests/common/java/android/net/NetworkStackTest.java index f8f9c72374..13550f9e58 100644 --- a/tests/common/java/android/net/NetworkStackTest.java +++ b/tests/common/java/android/net/NetworkStackTest.java @@ -17,16 +17,11 @@ package android.net; import static org.junit.Assert.assertEquals; -import android.os.Build; import android.os.IBinder; import androidx.test.runner.AndroidJUnit4; -import com.android.testutils.DevSdkIgnoreRule; -import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo; - import org.junit.Before; -import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -34,16 +29,13 @@ import org.mockito.MockitoAnnotations; @RunWith(AndroidJUnit4.class) public class NetworkStackTest { - @Rule - public DevSdkIgnoreRule mDevSdkIgnoreRule = new DevSdkIgnoreRule(); - @Mock private IBinder mConnectorBinder; @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); } - @Test @IgnoreUpTo(Build.VERSION_CODES.Q) + @Test public void testGetService() { NetworkStack.setServiceForTest(mConnectorBinder); assertEquals(NetworkStack.getService(), mConnectorBinder); diff --git a/tests/common/java/android/net/NetworkTest.java b/tests/common/java/android/net/NetworkTest.java index c102cb3229..86d2463ce2 100644 --- a/tests/common/java/android/net/NetworkTest.java +++ b/tests/common/java/android/net/NetworkTest.java @@ -161,8 +161,7 @@ public class NetworkTest { assertEquals(16290598925L, three.getNetworkHandle()); } - // getNetId() did not exist in Q - @Test @IgnoreUpTo(Build.VERSION_CODES.Q) + @Test public void testGetNetId() { assertEquals(1234, new Network(1234).getNetId()); assertEquals(2345, new Network(2345, true).getNetId()); diff --git a/tests/common/java/android/net/RouteInfoTest.java b/tests/common/java/android/net/RouteInfoTest.java index 5b28b841fb..154dc4c8a8 100644 --- a/tests/common/java/android/net/RouteInfoTest.java +++ b/tests/common/java/android/net/RouteInfoTest.java @@ -31,17 +31,11 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import android.os.Build; - -import androidx.core.os.BuildCompat; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; import com.android.testutils.ConnectivityModuleTest; -import com.android.testutils.DevSdkIgnoreRule; -import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo; -import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -53,9 +47,6 @@ import java.net.InetAddress; @SmallTest @ConnectivityModuleTest public class RouteInfoTest { - @Rule - public final DevSdkIgnoreRule ignoreRule = new DevSdkIgnoreRule(); - private static final int INVALID_ROUTE_TYPE = -1; private InetAddress Address(String addr) { @@ -66,11 +57,6 @@ public class RouteInfoTest { return new IpPrefix(prefix); } - private static boolean isAtLeastR() { - // BuildCompat.isAtLeastR is documented to return false on release SDKs (including R) - return Build.VERSION.SDK_INT > Build.VERSION_CODES.Q || BuildCompat.isAtLeastR(); - } - @Test public void testConstructor() { RouteInfo r; @@ -204,130 +190,108 @@ public class RouteInfoTest { assertTrue(r.isDefaultRoute()); assertTrue(r.isIPv4Default()); assertFalse(r.isIPv6Default()); - if (isAtLeastR()) { - assertFalse(r.isIPv4UnreachableDefault()); - assertFalse(r.isIPv6UnreachableDefault()); - } + + assertFalse(r.isIPv4UnreachableDefault()); + assertFalse(r.isIPv6UnreachableDefault()); + r = new RouteInfo(Prefix("::/0"), Address("::"), "wlan0"); assertFalse(r.isHostRoute()); assertTrue(r.isDefaultRoute()); assertFalse(r.isIPv4Default()); assertTrue(r.isIPv6Default()); - if (isAtLeastR()) { - assertFalse(r.isIPv4UnreachableDefault()); - assertFalse(r.isIPv6UnreachableDefault()); - } + assertFalse(r.isIPv4UnreachableDefault()); + assertFalse(r.isIPv6UnreachableDefault()); r = new RouteInfo(Prefix("192.0.2.0/24"), null, "wlan0"); assertFalse(r.isHostRoute()); assertFalse(r.isDefaultRoute()); assertFalse(r.isIPv4Default()); assertFalse(r.isIPv6Default()); - if (isAtLeastR()) { - assertFalse(r.isIPv4UnreachableDefault()); - assertFalse(r.isIPv6UnreachableDefault()); - } + assertFalse(r.isIPv4UnreachableDefault()); + assertFalse(r.isIPv6UnreachableDefault()); r = new RouteInfo(Prefix("2001:db8::/48"), null, "wlan0"); assertFalse(r.isHostRoute()); assertFalse(r.isDefaultRoute()); assertFalse(r.isIPv4Default()); assertFalse(r.isIPv6Default()); - if (isAtLeastR()) { - assertFalse(r.isIPv4UnreachableDefault()); - assertFalse(r.isIPv6UnreachableDefault()); - } + + assertFalse(r.isIPv4UnreachableDefault()); + assertFalse(r.isIPv6UnreachableDefault()); r = new RouteInfo(Prefix("192.0.2.0/32"), Address("0.0.0.0"), "wlan0"); assertTrue(r.isHostRoute()); assertFalse(r.isDefaultRoute()); assertFalse(r.isIPv4Default()); assertFalse(r.isIPv6Default()); - if (isAtLeastR()) { - assertFalse(r.isIPv4UnreachableDefault()); - assertFalse(r.isIPv6UnreachableDefault()); - } + + assertFalse(r.isIPv4UnreachableDefault()); + assertFalse(r.isIPv6UnreachableDefault()); r = new RouteInfo(Prefix("2001:db8::/128"), Address("::"), "wlan0"); assertTrue(r.isHostRoute()); assertFalse(r.isDefaultRoute()); assertFalse(r.isIPv4Default()); assertFalse(r.isIPv6Default()); - if (isAtLeastR()) { - assertFalse(r.isIPv4UnreachableDefault()); - assertFalse(r.isIPv6UnreachableDefault()); - } + assertFalse(r.isIPv4UnreachableDefault()); + assertFalse(r.isIPv6UnreachableDefault()); r = new RouteInfo(Prefix("192.0.2.0/32"), null, "wlan0"); assertTrue(r.isHostRoute()); assertFalse(r.isDefaultRoute()); assertFalse(r.isIPv4Default()); assertFalse(r.isIPv6Default()); - if (isAtLeastR()) { - assertFalse(r.isIPv4UnreachableDefault()); - assertFalse(r.isIPv6UnreachableDefault()); - } + assertFalse(r.isIPv4UnreachableDefault()); + assertFalse(r.isIPv6UnreachableDefault()); r = new RouteInfo(Prefix("2001:db8::/128"), null, "wlan0"); assertTrue(r.isHostRoute()); assertFalse(r.isDefaultRoute()); assertFalse(r.isIPv4Default()); assertFalse(r.isIPv6Default()); - if (isAtLeastR()) { - assertFalse(r.isIPv4UnreachableDefault()); - assertFalse(r.isIPv6UnreachableDefault()); - } + assertFalse(r.isIPv4UnreachableDefault()); + assertFalse(r.isIPv6UnreachableDefault()); r = new RouteInfo(Prefix("::/128"), Address("fe80::"), "wlan0"); assertTrue(r.isHostRoute()); assertFalse(r.isDefaultRoute()); assertFalse(r.isIPv4Default()); assertFalse(r.isIPv6Default()); - if (isAtLeastR()) { - assertFalse(r.isIPv4UnreachableDefault()); - assertFalse(r.isIPv6UnreachableDefault()); - } + assertFalse(r.isIPv4UnreachableDefault()); + assertFalse(r.isIPv6UnreachableDefault()); r = new RouteInfo(Prefix("0.0.0.0/32"), Address("192.0.2.1"), "wlan0"); assertTrue(r.isHostRoute()); assertFalse(r.isDefaultRoute()); assertFalse(r.isIPv4Default()); assertFalse(r.isIPv6Default()); - if (isAtLeastR()) { - assertFalse(r.isIPv4UnreachableDefault()); - assertFalse(r.isIPv6UnreachableDefault()); - } + assertFalse(r.isIPv4UnreachableDefault()); + assertFalse(r.isIPv6UnreachableDefault()); r = new RouteInfo(Prefix("0.0.0.0/32"), Address("192.0.2.1"), "wlan0"); assertTrue(r.isHostRoute()); assertFalse(r.isDefaultRoute()); assertFalse(r.isIPv4Default()); assertFalse(r.isIPv6Default()); - if (isAtLeastR()) { - assertFalse(r.isIPv4UnreachableDefault()); - assertFalse(r.isIPv6UnreachableDefault()); - } + assertFalse(r.isIPv4UnreachableDefault()); + assertFalse(r.isIPv6UnreachableDefault()); r = new RouteInfo(new IpPrefix(Inet4Address.ANY, 0), RTN_UNREACHABLE); assertFalse(r.isHostRoute()); assertFalse(r.isDefaultRoute()); assertFalse(r.isIPv4Default()); assertFalse(r.isIPv6Default()); - if (isAtLeastR()) { - assertTrue(r.isIPv4UnreachableDefault()); - assertFalse(r.isIPv6UnreachableDefault()); - } + assertTrue(r.isIPv4UnreachableDefault()); + assertFalse(r.isIPv6UnreachableDefault()); r = new RouteInfo(new IpPrefix(Inet6Address.ANY, 0), RTN_UNREACHABLE); assertFalse(r.isHostRoute()); assertFalse(r.isDefaultRoute()); assertFalse(r.isIPv4Default()); assertFalse(r.isIPv6Default()); - if (isAtLeastR()) { - assertFalse(r.isIPv4UnreachableDefault()); - assertTrue(r.isIPv6UnreachableDefault()); - } + assertFalse(r.isIPv4UnreachableDefault()); + assertTrue(r.isIPv6UnreachableDefault()); } @Test @@ -376,14 +340,14 @@ public class RouteInfoTest { assertParcelingIsLossless(r); } - @Test @IgnoreUpTo(Build.VERSION_CODES.Q) + @Test public void testMtuParceling() { final RouteInfo r = new RouteInfo(Prefix("ff02::1/128"), Address("2001:db8::"), "testiface", RTN_UNREACHABLE, 1450 /* mtu */); assertParcelingIsLossless(r); } - @Test @IgnoreUpTo(Build.VERSION_CODES.Q) + @Test public void testMtu() { RouteInfo r; r = new RouteInfo(Prefix("0.0.0.0/0"), Address("0.0.0.0"), "wlan0", @@ -394,7 +358,7 @@ public class RouteInfoTest { assertEquals(0, r.getMtu()); } - @Test @IgnoreUpTo(Build.VERSION_CODES.Q) + @Test public void testRouteKey() { RouteInfo.RouteKey k1, k2; // Only prefix, null gateway and null interface diff --git a/tests/common/java/android/net/netstats/NetworkStatsApiTest.kt b/tests/common/java/android/net/netstats/NetworkStatsApiTest.kt index c90b1aa411..8cef6aa774 100644 --- a/tests/common/java/android/net/netstats/NetworkStatsApiTest.kt +++ b/tests/common/java/android/net/netstats/NetworkStatsApiTest.kt @@ -28,25 +28,18 @@ import android.net.NetworkStats.ROAMING_YES import android.net.NetworkStats.SET_DEFAULT import android.net.NetworkStats.SET_FOREGROUND import android.net.NetworkStats.TAG_NONE -import android.os.Build import androidx.test.filters.SmallTest -import com.android.testutils.DevSdkIgnoreRule import com.android.testutils.assertNetworkStatsEquals import com.android.testutils.assertParcelingIsLossless +import kotlin.test.assertEquals import org.junit.Before -import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 -import kotlin.test.assertEquals @RunWith(JUnit4::class) @SmallTest class NetworkStatsApiTest { - @Rule - @JvmField - val ignoreRule = DevSdkIgnoreRule(ignoreClassUpTo = Build.VERSION_CODES.Q) - private val testStatsEmpty = NetworkStats(0L, 0) // Note that these variables need to be initialized outside of constructor, initialize diff --git a/tests/common/java/android/net/util/SocketUtilsTest.kt b/tests/common/java/android/net/util/SocketUtilsTest.kt index aaf97f3688..520cf0753a 100644 --- a/tests/common/java/android/net/util/SocketUtilsTest.kt +++ b/tests/common/java/android/net/util/SocketUtilsTest.kt @@ -16,7 +16,6 @@ package android.net.util -import android.os.Build import android.system.NetlinkSocketAddress import android.system.Os import android.system.OsConstants.AF_INET @@ -27,13 +26,10 @@ import android.system.OsConstants.SOCK_DGRAM import android.system.PacketSocketAddress import androidx.test.filters.SmallTest import androidx.test.runner.AndroidJUnit4 -import com.android.testutils.DevSdkIgnoreRule -import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Assert.fail -import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -44,9 +40,6 @@ private const val FF_BYTE = 0xff.toByte() @RunWith(AndroidJUnit4::class) @SmallTest class SocketUtilsTest { - @Rule @JvmField - val ignoreRule = DevSdkIgnoreRule() - @Test fun testMakeNetlinkSocketAddress() { val nlAddress = SocketUtils.makeNetlinkSocketAddress(TEST_PORT, RTMGRP_NEIGH) @@ -67,7 +60,7 @@ class SocketUtilsTest { assertTrue("Not PacketSocketAddress object", pkAddress2 is PacketSocketAddress) } - @Test @IgnoreUpTo(Build.VERSION_CODES.Q) + @Test fun testMakePacketSocketAddress() { val pkAddress = SocketUtils.makePacketSocketAddress( ETH_P_ALL, TEST_INDEX, ByteArray(6) { FF_BYTE })