From 154cf1da20a77176ac42faed117a48afcf840bf4 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Tue, 29 Jun 2021 17:16:28 +0900 Subject: [PATCH] Re-skip connectivity unit tests before S The tests are packaged together with other tests in a common coverage suite, so need to be individually annotated so that they are skipped before S. They do not need to pass on platforms older than S, because such platforms will not updated with the code that is tested. This applies a previous change, this time using DevSdkIgnoreRunner, as SdkSuppress does not work as expected in branches that have a codename 2 versions above the SDK version, as is the case in AOSP. Bug: 187935317 Test: atest ConnectivityCoverageTests on R atest FrameworksNetTests on S Change-Id: I5808d34459a4c19238baf8873afa7cf942828460 --- .../app/usage/NetworkStatsManagerTest.java | 8 ++++++-- .../java/android/net/ConnectivityManagerTest.java | 7 +++++-- .../java/android/net/Ikev2VpnProfileTest.java | 7 +++++-- .../unit/java/android/net/IpMemoryStoreTest.java | 8 ++++++-- .../unit/java/android/net/IpSecAlgorithmTest.java | 6 ++++-- tests/unit/java/android/net/IpSecConfigTest.java | 9 +++++++-- tests/unit/java/android/net/IpSecManagerTest.java | 7 +++++-- .../unit/java/android/net/IpSecTransformTest.java | 9 +++++++-- .../android/net/KeepalivePacketDataUtilTest.java | 8 ++++++-- tests/unit/java/android/net/MacAddressTest.java | 8 ++++++-- .../unit/java/android/net/NetworkIdentityTest.kt | 7 +++++-- .../java/android/net/NetworkStatsHistoryTest.java | 7 +++++-- tests/unit/java/android/net/NetworkStatsTest.java | 8 ++++++-- .../unit/java/android/net/NetworkTemplateTest.kt | 15 +++++++++------ tests/unit/java/android/net/NetworkUtilsTest.java | 12 +++++++++--- .../java/android/net/QosSocketFilterTest.java | 12 +++++++++--- .../net/TelephonyNetworkSpecifierTest.java | 4 ++++ tests/unit/java/android/net/VpnManagerTest.java | 7 +++++-- .../java/android/net/VpnTransportInfoTest.java | 9 +++++++-- .../net/ipmemorystore/ParcelableTests.java | 8 ++++++-- .../unit/java/android/net/nsd/NsdManagerTest.java | 7 +++++-- .../java/android/net/nsd/NsdServiceInfoTest.java | 8 ++++++-- .../unit/java/android/net/util/DnsUtilsTest.java | 8 ++++++-- .../java/android/net/util/KeepaliveUtilsTest.kt | 7 +++++-- .../net/util/MultinetworkPolicyTrackerTest.kt | 7 +++++-- .../internal/net/NetworkUtilsInternalTest.java | 11 ++++++++--- .../com/android/internal/net/VpnProfileTest.java | 8 ++++++-- .../com/android/internal/util/BitUtilsTest.java | 9 +++++++-- .../com/android/internal/util/RingBufferTest.java | 9 +++++++-- .../android/server/ConnectivityServiceTest.java | 6 ++++-- .../server/IpSecServiceParameterizedTest.java | 6 ++++++ .../IpSecServiceRefcountedResourceTest.java | 7 +++++-- .../java/com/android/server/IpSecServiceTest.java | 8 ++++++-- .../com/android/server/LegacyTypeTrackerTest.kt | 7 +++++-- .../java/com/android/server/NetIdManagerTest.kt | 9 ++++++--- .../server/NetworkManagementServiceTest.java | 8 +++++--- .../java/com/android/server/NsdServiceTest.java | 7 +++++-- .../server/connectivity/DnsManagerTest.java | 7 +++++-- .../android/server/connectivity/FullScoreTest.kt | 9 +++++---- .../IpConnectivityEventBuilderTest.java | 8 +++++--- .../connectivity/IpConnectivityMetricsTest.java | 8 +++++--- .../server/connectivity/LingerMonitorTest.java | 7 +++++-- .../connectivity/MultipathPolicyTrackerTest.java | 10 ++++++---- .../server/connectivity/Nat464XlatTest.java | 7 +++++-- .../NetdEventListenerServiceTest.java | 8 +++++--- .../NetworkNotificationManagerTest.java | 9 +++++---- .../server/connectivity/NetworkOfferTest.kt | 7 +++++-- .../connectivity/PermissionMonitorTest.java | 7 +++++-- .../com/android/server/connectivity/VpnTest.java | 6 ++++-- .../server/net/NetworkStatsAccessTest.java | 7 +++++-- .../server/net/NetworkStatsCollectionTest.java | 7 +++++-- .../server/net/NetworkStatsFactoryTest.java | 7 +++++-- .../server/net/NetworkStatsObserversTest.java | 7 +++++-- .../server/net/NetworkStatsServiceTest.java | 7 +++++-- .../net/NetworkStatsSubscriptionsMonitorTest.java | 7 +++++-- .../net/ipmemorystore/NetworkAttributesTest.java | 8 ++++++-- 56 files changed, 315 insertions(+), 126 deletions(-) diff --git a/tests/unit/java/android/app/usage/NetworkStatsManagerTest.java b/tests/unit/java/android/app/usage/NetworkStatsManagerTest.java index 6bd2bd569f..08a3007fbf 100644 --- a/tests/unit/java/android/app/usage/NetworkStatsManagerTest.java +++ b/tests/unit/java/android/app/usage/NetworkStatsManagerTest.java @@ -36,11 +36,14 @@ import android.net.INetworkStatsSession; import android.net.NetworkStats.Entry; import android.net.NetworkStatsHistory; import android.net.NetworkTemplate; +import android.os.Build; import android.os.RemoteException; import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; + +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Before; import org.junit.Test; @@ -49,8 +52,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class NetworkStatsManagerTest { private static final String TEST_SUBSCRIBER_ID = "subid"; diff --git a/tests/unit/java/android/net/ConnectivityManagerTest.java b/tests/unit/java/android/net/ConnectivityManagerTest.java index b8cd3f68d0..e7873af64b 100644 --- a/tests/unit/java/android/net/ConnectivityManagerTest.java +++ b/tests/unit/java/android/net/ConnectivityManagerTest.java @@ -68,7 +68,9 @@ import android.os.Messenger; import android.os.Process; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; + +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Before; import org.junit.Test; @@ -77,8 +79,9 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(VERSION_CODES.R) public class ConnectivityManagerTest { @Mock Context mCtx; diff --git a/tests/unit/java/android/net/Ikev2VpnProfileTest.java b/tests/unit/java/android/net/Ikev2VpnProfileTest.java index 0707ef3ed1..56e5c62179 100644 --- a/tests/unit/java/android/net/Ikev2VpnProfileTest.java +++ b/tests/unit/java/android/net/Ikev2VpnProfileTest.java @@ -23,14 +23,16 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import android.os.Build; import android.test.mock.MockContext; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; import com.android.internal.net.VpnProfile; import com.android.internal.org.bouncycastle.x509.X509V1CertificateGenerator; import com.android.net.module.util.ProxyUtils; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Before; import org.junit.Test; @@ -51,7 +53,8 @@ import javax.security.auth.x500.X500Principal; /** Unit tests for {@link Ikev2VpnProfile.Builder}. */ @SmallTest -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class Ikev2VpnProfileTest { private static final String SERVER_ADDR_STRING = "1.2.3.4"; private static final String IDENTITY_STRING = "Identity"; diff --git a/tests/unit/java/android/net/IpMemoryStoreTest.java b/tests/unit/java/android/net/IpMemoryStoreTest.java index 0b13800bc5..0b82759a91 100644 --- a/tests/unit/java/android/net/IpMemoryStoreTest.java +++ b/tests/unit/java/android/net/IpMemoryStoreTest.java @@ -36,10 +36,13 @@ import android.net.ipmemorystore.NetworkAttributes; import android.net.ipmemorystore.NetworkAttributesParcelable; import android.net.ipmemorystore.Status; import android.net.networkstack.ModuleNetworkStackClient; +import android.os.Build; import android.os.RemoteException; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; + +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Before; import org.junit.Test; @@ -53,8 +56,9 @@ import org.mockito.MockitoAnnotations; import java.net.UnknownHostException; import java.util.Arrays; -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class IpMemoryStoreTest { private static final String TAG = IpMemoryStoreTest.class.getSimpleName(); private static final String TEST_CLIENT_ID = "testClientId"; diff --git a/tests/unit/java/android/net/IpSecAlgorithmTest.java b/tests/unit/java/android/net/IpSecAlgorithmTest.java index 3a8d6004f6..cac8c2d941 100644 --- a/tests/unit/java/android/net/IpSecAlgorithmTest.java +++ b/tests/unit/java/android/net/IpSecAlgorithmTest.java @@ -29,9 +29,10 @@ import android.os.Build; import android.os.Parcel; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; import com.android.internal.util.CollectionUtils; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Test; import org.junit.runner.RunWith; @@ -45,7 +46,8 @@ import java.util.Set; /** Unit tests for {@link IpSecAlgorithm}. */ @SmallTest -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class IpSecAlgorithmTest { private static final byte[] KEY_MATERIAL; diff --git a/tests/unit/java/android/net/IpSecConfigTest.java b/tests/unit/java/android/net/IpSecConfigTest.java index 25e225ef30..b87cb48a3a 100644 --- a/tests/unit/java/android/net/IpSecConfigTest.java +++ b/tests/unit/java/android/net/IpSecConfigTest.java @@ -23,15 +23,20 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertNull; +import android.os.Build; + import androidx.test.filters.SmallTest; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; + import org.junit.Test; import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; /** Unit tests for {@link IpSecConfig}. */ @SmallTest -@RunWith(JUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class IpSecConfigTest { @Test diff --git a/tests/unit/java/android/net/IpSecManagerTest.java b/tests/unit/java/android/net/IpSecManagerTest.java index 730e2d56bd..cda8eb76a7 100644 --- a/tests/unit/java/android/net/IpSecManagerTest.java +++ b/tests/unit/java/android/net/IpSecManagerTest.java @@ -31,13 +31,15 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.os.Build; import android.system.Os; import android.test.mock.MockContext; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; import com.android.server.IpSecService; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Before; import org.junit.Test; @@ -49,7 +51,8 @@ import java.net.UnknownHostException; /** Unit tests for {@link IpSecManager}. */ @SmallTest -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class IpSecManagerTest { private static final int TEST_UDP_ENCAP_PORT = 34567; diff --git a/tests/unit/java/android/net/IpSecTransformTest.java b/tests/unit/java/android/net/IpSecTransformTest.java index 424f23dbba..81375f1e38 100644 --- a/tests/unit/java/android/net/IpSecTransformTest.java +++ b/tests/unit/java/android/net/IpSecTransformTest.java @@ -19,15 +19,20 @@ package android.net; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; +import android.os.Build; + import androidx.test.filters.SmallTest; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; + import org.junit.Test; import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; /** Unit tests for {@link IpSecTransform}. */ @SmallTest -@RunWith(JUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class IpSecTransformTest { @Test diff --git a/tests/unit/java/android/net/KeepalivePacketDataUtilTest.java b/tests/unit/java/android/net/KeepalivePacketDataUtilTest.java index bc6dbf21d5..ed4f61d5fe 100644 --- a/tests/unit/java/android/net/KeepalivePacketDataUtilTest.java +++ b/tests/unit/java/android/net/KeepalivePacketDataUtilTest.java @@ -24,18 +24,22 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import android.net.util.KeepalivePacketDataUtil; +import android.os.Build; import android.util.Log; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; + import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; import java.net.InetAddress; import java.nio.ByteBuffer; -@RunWith(JUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public final class KeepalivePacketDataUtilTest { private static final byte[] IPV4_KEEPALIVE_SRC_ADDR = {10, 0, 0, 1}; private static final byte[] IPV4_KEEPALIVE_DST_ADDR = {10, 0, 0, 5}; diff --git a/tests/unit/java/android/net/MacAddressTest.java b/tests/unit/java/android/net/MacAddressTest.java index 6de31f6b4b..ae7deaa50a 100644 --- a/tests/unit/java/android/net/MacAddressTest.java +++ b/tests/unit/java/android/net/MacAddressTest.java @@ -22,10 +22,13 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import android.os.Build; + import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; import com.android.net.module.util.MacAddressUtils; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Test; import org.junit.runner.RunWith; @@ -35,7 +38,8 @@ import java.util.Arrays; import java.util.Random; @SmallTest -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class MacAddressTest { static class AddrTypeTestCase { diff --git a/tests/unit/java/android/net/NetworkIdentityTest.kt b/tests/unit/java/android/net/NetworkIdentityTest.kt index eb2b85c145..f96359300e 100644 --- a/tests/unit/java/android/net/NetworkIdentityTest.kt +++ b/tests/unit/java/android/net/NetworkIdentityTest.kt @@ -20,12 +20,15 @@ import android.net.NetworkIdentity.OEM_NONE import android.net.NetworkIdentity.OEM_PAID import android.net.NetworkIdentity.OEM_PRIVATE import android.net.NetworkIdentity.getOemBitfield +import android.os.Build +import com.android.testutils.DevSdkIgnoreRule +import com.android.testutils.DevSdkIgnoreRunner import org.junit.Test import org.junit.runner.RunWith -import org.junit.runners.JUnit4 import kotlin.test.assertEquals -@RunWith(JUnit4::class) +@RunWith(DevSdkIgnoreRunner::class) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) class NetworkIdentityTest { @Test fun testGetOemBitfield() { diff --git a/tests/unit/java/android/net/NetworkStatsHistoryTest.java b/tests/unit/java/android/net/NetworkStatsHistoryTest.java index 13558cd51c..c5f8c00459 100644 --- a/tests/unit/java/android/net/NetworkStatsHistoryTest.java +++ b/tests/unit/java/android/net/NetworkStatsHistoryTest.java @@ -38,13 +38,15 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import android.content.Context; +import android.os.Build; import android.util.Log; import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; import com.android.frameworks.tests.net.R; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.After; import org.junit.Test; @@ -56,8 +58,9 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.util.Random; -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class NetworkStatsHistoryTest { private static final String TAG = "NetworkStatsHistoryTest"; diff --git a/tests/unit/java/android/net/NetworkStatsTest.java b/tests/unit/java/android/net/NetworkStatsTest.java index 23d5a7e5d5..1cdc6cb760 100644 --- a/tests/unit/java/android/net/NetworkStatsTest.java +++ b/tests/unit/java/android/net/NetworkStatsTest.java @@ -39,11 +39,14 @@ import static android.net.NetworkStats.UID_ALL; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import android.os.Build; import android.os.Process; import android.util.ArrayMap; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; + +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import com.google.android.collect.Sets; @@ -53,8 +56,9 @@ import org.junit.runner.RunWith; import java.util.Arrays; import java.util.HashSet; -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class NetworkStatsTest { private static final String TEST_IFACE = "test0"; diff --git a/tests/unit/java/android/net/NetworkTemplateTest.kt b/tests/unit/java/android/net/NetworkTemplateTest.kt index cb39a0c819..49c7271c56 100644 --- a/tests/unit/java/android/net/NetworkTemplateTest.kt +++ b/tests/unit/java/android/net/NetworkTemplateTest.kt @@ -19,10 +19,10 @@ package android.net import android.content.Context import android.net.ConnectivityManager.TYPE_MOBILE import android.net.ConnectivityManager.TYPE_WIFI -import android.net.NetworkIdentity.SUBTYPE_COMBINED import android.net.NetworkIdentity.OEM_NONE import android.net.NetworkIdentity.OEM_PAID import android.net.NetworkIdentity.OEM_PRIVATE +import android.net.NetworkIdentity.SUBTYPE_COMBINED import android.net.NetworkIdentity.buildNetworkIdentity import android.net.NetworkStats.DEFAULT_NETWORK_ALL import android.net.NetworkStats.METERED_ALL @@ -31,23 +31,25 @@ import android.net.NetworkTemplate.MATCH_MOBILE import android.net.NetworkTemplate.MATCH_MOBILE_WILDCARD import android.net.NetworkTemplate.MATCH_WIFI import android.net.NetworkTemplate.MATCH_WIFI_WILDCARD -import android.net.NetworkTemplate.WIFI_NETWORKID_ALL import android.net.NetworkTemplate.NETWORK_TYPE_5G_NSA import android.net.NetworkTemplate.NETWORK_TYPE_ALL import android.net.NetworkTemplate.OEM_MANAGED_ALL import android.net.NetworkTemplate.OEM_MANAGED_NO import android.net.NetworkTemplate.OEM_MANAGED_YES import android.net.NetworkTemplate.SUBSCRIBER_ID_MATCH_RULE_EXACT -import android.net.NetworkTemplate.buildTemplateWifi -import android.net.NetworkTemplate.buildTemplateWifiWildcard +import android.net.NetworkTemplate.WIFI_NETWORKID_ALL import android.net.NetworkTemplate.buildTemplateCarrierMetered import android.net.NetworkTemplate.buildTemplateMobileWithRatType +import android.net.NetworkTemplate.buildTemplateWifi +import android.net.NetworkTemplate.buildTemplateWifiWildcard +import android.os.Build import android.telephony.TelephonyManager +import com.android.testutils.DevSdkIgnoreRule +import com.android.testutils.DevSdkIgnoreRunner import com.android.testutils.assertParcelSane import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.junit.runners.JUnit4 import org.mockito.Mockito.mock import org.mockito.MockitoAnnotations import kotlin.test.assertEquals @@ -60,7 +62,8 @@ private const val TEST_IMSI2 = "imsi2" private const val TEST_SSID1 = "ssid1" private const val TEST_SSID2 = "ssid2" -@RunWith(JUnit4::class) +@RunWith(DevSdkIgnoreRunner::class) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) class NetworkTemplateTest { private val mockContext = mock(Context::class.java) diff --git a/tests/unit/java/android/net/NetworkUtilsTest.java b/tests/unit/java/android/net/NetworkUtilsTest.java index 7748288aeb..a28245d4b0 100644 --- a/tests/unit/java/android/net/NetworkUtilsTest.java +++ b/tests/unit/java/android/net/NetworkUtilsTest.java @@ -18,7 +18,12 @@ package android.net; import static junit.framework.Assert.assertEquals; -import androidx.test.runner.AndroidJUnit4; +import android.os.Build; + +import androidx.test.filters.SmallTest; + +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Test; import org.junit.runner.RunWith; @@ -26,8 +31,9 @@ import org.junit.runner.RunWith; import java.math.BigInteger; import java.util.TreeSet; -@RunWith(AndroidJUnit4.class) -@androidx.test.filters.SmallTest +@RunWith(DevSdkIgnoreRunner.class) +@SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class NetworkUtilsTest { @Test public void testRoutedIPv4AddressCount() { diff --git a/tests/unit/java/android/net/QosSocketFilterTest.java b/tests/unit/java/android/net/QosSocketFilterTest.java index 40f8f1b8d0..91f2cddc91 100644 --- a/tests/unit/java/android/net/QosSocketFilterTest.java +++ b/tests/unit/java/android/net/QosSocketFilterTest.java @@ -19,7 +19,12 @@ package android.net; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; -import androidx.test.runner.AndroidJUnit4; +import android.os.Build; + +import androidx.test.filters.SmallTest; + +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Test; import org.junit.runner.RunWith; @@ -27,8 +32,9 @@ import org.junit.runner.RunWith; import java.net.InetAddress; import java.net.InetSocketAddress; -@RunWith(AndroidJUnit4.class) -@androidx.test.filters.SmallTest +@RunWith(DevSdkIgnoreRunner.class) +@SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class QosSocketFilterTest { @Test diff --git a/tests/unit/java/android/net/TelephonyNetworkSpecifierTest.java b/tests/unit/java/android/net/TelephonyNetworkSpecifierTest.java index 6714bb1abb..ead964e030 100644 --- a/tests/unit/java/android/net/TelephonyNetworkSpecifierTest.java +++ b/tests/unit/java/android/net/TelephonyNetworkSpecifierTest.java @@ -23,16 +23,20 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import android.net.wifi.WifiNetworkSpecifier; +import android.os.Build; import android.telephony.SubscriptionManager; import androidx.test.filters.SmallTest; +import com.android.testutils.DevSdkIgnoreRule; + import org.junit.Test; /** * Unit test for {@link android.net.TelephonyNetworkSpecifier}. */ @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class TelephonyNetworkSpecifierTest { private static final int TEST_SUBID = 5; private static final String TEST_SSID = "Test123"; diff --git a/tests/unit/java/android/net/VpnManagerTest.java b/tests/unit/java/android/net/VpnManagerTest.java index 3135062138..532081a946 100644 --- a/tests/unit/java/android/net/VpnManagerTest.java +++ b/tests/unit/java/android/net/VpnManagerTest.java @@ -27,14 +27,16 @@ import static org.mockito.Mockito.when; import android.content.ComponentName; import android.content.Intent; +import android.os.Build; import android.test.mock.MockContext; import android.util.SparseArray; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; import com.android.internal.net.VpnProfile; import com.android.internal.util.MessageUtils; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Before; import org.junit.Test; @@ -42,7 +44,8 @@ import org.junit.runner.RunWith; /** Unit tests for {@link VpnManager}. */ @SmallTest -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class VpnManagerTest { private static final String PKG_NAME = "fooPackage"; diff --git a/tests/unit/java/android/net/VpnTransportInfoTest.java b/tests/unit/java/android/net/VpnTransportInfoTest.java index ccaa5cf7e9..b4c7ac4aa6 100644 --- a/tests/unit/java/android/net/VpnTransportInfoTest.java +++ b/tests/unit/java/android/net/VpnTransportInfoTest.java @@ -24,14 +24,19 @@ import static com.android.testutils.ParcelUtils.assertParcelSane; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; +import android.os.Build; + import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; + +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Test; import org.junit.runner.RunWith; -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class VpnTransportInfoTest { @Test diff --git a/tests/unit/java/android/net/ipmemorystore/ParcelableTests.java b/tests/unit/java/android/net/ipmemorystore/ParcelableTests.java index 603c875195..5d0b78371a 100644 --- a/tests/unit/java/android/net/ipmemorystore/ParcelableTests.java +++ b/tests/unit/java/android/net/ipmemorystore/ParcelableTests.java @@ -21,11 +21,14 @@ import static org.junit.Assert.assertTrue; import android.net.networkstack.aidl.quirks.IPv6ProvisioningLossQuirk; import android.net.networkstack.aidl.quirks.IPv6ProvisioningLossQuirkParcelable; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; + +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Test; import org.junit.runner.RunWith; @@ -36,8 +39,9 @@ import java.net.InetAddress; import java.util.Arrays; import java.util.Collections; -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class ParcelableTests { @Test public void testNetworkAttributesParceling() throws Exception { diff --git a/tests/unit/java/android/net/nsd/NsdManagerTest.java b/tests/unit/java/android/net/nsd/NsdManagerTest.java index 370179c2b1..31c89274ca 100644 --- a/tests/unit/java/android/net/nsd/NsdManagerTest.java +++ b/tests/unit/java/android/net/nsd/NsdManagerTest.java @@ -28,6 +28,7 @@ import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; import android.content.Context; +import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; @@ -35,9 +36,10 @@ import android.os.Message; import android.os.Messenger; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; import com.android.internal.util.AsyncChannel; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import com.android.testutils.HandlerUtils; import org.junit.After; @@ -47,8 +49,9 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class NsdManagerTest { static final int PROTOCOL = NsdManager.PROTOCOL_DNS_SD; diff --git a/tests/unit/java/android/net/nsd/NsdServiceInfoTest.java b/tests/unit/java/android/net/nsd/NsdServiceInfoTest.java index 94dfc7515c..ca8cf07fd2 100644 --- a/tests/unit/java/android/net/nsd/NsdServiceInfoTest.java +++ b/tests/unit/java/android/net/nsd/NsdServiceInfoTest.java @@ -21,12 +21,15 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import android.os.Build; import android.os.Bundle; import android.os.Parcel; import android.os.StrictMode; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; + +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Test; import org.junit.runner.RunWith; @@ -36,8 +39,9 @@ import java.net.UnknownHostException; import java.util.Arrays; import java.util.Map; -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class NsdServiceInfoTest { public final static InetAddress LOCALHOST; diff --git a/tests/unit/java/android/net/util/DnsUtilsTest.java b/tests/unit/java/android/net/util/DnsUtilsTest.java index b626db8d89..660d516885 100644 --- a/tests/unit/java/android/net/util/DnsUtilsTest.java +++ b/tests/unit/java/android/net/util/DnsUtilsTest.java @@ -25,9 +25,12 @@ import static org.junit.Assert.assertEquals; import android.annotation.NonNull; import android.annotation.Nullable; import android.net.InetAddresses; +import android.os.Build; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; + +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Test; import org.junit.runner.RunWith; @@ -37,8 +40,9 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class DnsUtilsTest { private InetAddress stringToAddress(@NonNull String addr) { return InetAddresses.parseNumericAddress(addr); diff --git a/tests/unit/java/android/net/util/KeepaliveUtilsTest.kt b/tests/unit/java/android/net/util/KeepaliveUtilsTest.kt index b62bdbcfb5..40f39a4549 100644 --- a/tests/unit/java/android/net/util/KeepaliveUtilsTest.kt +++ b/tests/unit/java/android/net/util/KeepaliveUtilsTest.kt @@ -25,15 +25,17 @@ import android.net.NetworkCapabilities.TRANSPORT_CELLULAR import android.net.NetworkCapabilities.TRANSPORT_ETHERNET import android.net.NetworkCapabilities.TRANSPORT_VPN import android.net.NetworkCapabilities.TRANSPORT_WIFI +import android.os.Build import androidx.test.filters.SmallTest import com.android.internal.R +import com.android.testutils.DevSdkIgnoreRule +import com.android.testutils.DevSdkIgnoreRunner import org.junit.After import org.junit.Assert.assertArrayEquals import org.junit.Assert.assertEquals import org.junit.Assert.fail import org.junit.Test import org.junit.runner.RunWith -import org.junit.runners.JUnit4 import org.mockito.ArgumentMatchers.eq import org.mockito.Mockito.any import org.mockito.Mockito.doReturn @@ -45,8 +47,9 @@ import org.mockito.Mockito.mock * Build, install and run with: * atest android.net.util.KeepaliveUtilsTest */ -@RunWith(JUnit4::class) +@RunWith(DevSdkIgnoreRunner::class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) class KeepaliveUtilsTest { // Prepare mocked context with given resource strings. diff --git a/tests/unit/java/android/net/util/MultinetworkPolicyTrackerTest.kt b/tests/unit/java/android/net/util/MultinetworkPolicyTrackerTest.kt index 78c8fa408c..576b8d348e 100644 --- a/tests/unit/java/android/net/util/MultinetworkPolicyTrackerTest.kt +++ b/tests/unit/java/android/net/util/MultinetworkPolicyTrackerTest.kt @@ -25,15 +25,17 @@ import android.net.ConnectivityResources import android.net.ConnectivitySettingsManager.NETWORK_AVOID_BAD_WIFI import android.net.ConnectivitySettingsManager.NETWORK_METERED_MULTIPATH_PREFERENCE import android.net.util.MultinetworkPolicyTracker.ActiveDataSubscriptionIdListener +import android.os.Build import android.provider.Settings import android.telephony.SubscriptionInfo import android.telephony.SubscriptionManager import android.telephony.TelephonyManager import android.test.mock.MockContentResolver import androidx.test.filters.SmallTest -import androidx.test.runner.AndroidJUnit4 import com.android.connectivity.resources.R import com.android.internal.util.test.FakeSettingsProvider +import com.android.testutils.DevSdkIgnoreRule +import com.android.testutils.DevSdkIgnoreRunner import org.junit.After import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse @@ -57,8 +59,9 @@ import org.mockito.Mockito.verify * Build, install and run with: * atest android.net.util.MultinetworkPolicyTrackerTest */ -@RunWith(AndroidJUnit4::class) +@RunWith(DevSdkIgnoreRunner::class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) class MultinetworkPolicyTrackerTest { private val resources = mock(Resources::class.java).also { doReturn(R.integer.config_networkAvoidBadWifi).`when`(it).getIdentifier( diff --git a/tests/unit/java/com/android/internal/net/NetworkUtilsInternalTest.java b/tests/unit/java/com/android/internal/net/NetworkUtilsInternalTest.java index 3cfecd5529..51388d49dd 100644 --- a/tests/unit/java/com/android/internal/net/NetworkUtilsInternalTest.java +++ b/tests/unit/java/com/android/internal/net/NetworkUtilsInternalTest.java @@ -27,18 +27,23 @@ import static junit.framework.Assert.assertEquals; import static org.junit.Assert.fail; +import android.os.Build; import android.system.ErrnoException; import android.system.Os; -import androidx.test.runner.AndroidJUnit4; +import androidx.test.filters.SmallTest; + +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import libcore.io.IoUtils; import org.junit.Test; import org.junit.runner.RunWith; -@RunWith(AndroidJUnit4.class) -@androidx.test.filters.SmallTest +@RunWith(DevSdkIgnoreRunner.class) +@SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class NetworkUtilsInternalTest { private static void expectSocketSuccess(String msg, int domain, int type) { diff --git a/tests/unit/java/com/android/internal/net/VpnProfileTest.java b/tests/unit/java/com/android/internal/net/VpnProfileTest.java index cb0f0710d6..a945a1f2cd 100644 --- a/tests/unit/java/com/android/internal/net/VpnProfileTest.java +++ b/tests/unit/java/com/android/internal/net/VpnProfileTest.java @@ -25,12 +25,15 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import android.net.IpSecAlgorithm; +import android.os.Build; import androidx.test.filters.SmallTest; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; + import org.junit.Test; import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; import java.util.ArrayList; import java.util.Arrays; @@ -38,7 +41,8 @@ import java.util.List; /** Unit tests for {@link VpnProfile}. */ @SmallTest -@RunWith(JUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class VpnProfileTest { private static final String DUMMY_PROFILE_KEY = "Test"; diff --git a/tests/unit/java/com/android/internal/util/BitUtilsTest.java b/tests/unit/java/com/android/internal/util/BitUtilsTest.java index d2fbdce977..aab1268755 100644 --- a/tests/unit/java/com/android/internal/util/BitUtilsTest.java +++ b/tests/unit/java/com/android/internal/util/BitUtilsTest.java @@ -30,8 +30,12 @@ import static com.android.internal.util.BitUtils.unpackBits; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import android.os.Build; + import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; + +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Test; import org.junit.runner.RunWith; @@ -41,7 +45,8 @@ import java.util.Arrays; import java.util.Random; @SmallTest -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class BitUtilsTest { @Test diff --git a/tests/unit/java/com/android/internal/util/RingBufferTest.java b/tests/unit/java/com/android/internal/util/RingBufferTest.java index d06095a690..13cf8402d2 100644 --- a/tests/unit/java/com/android/internal/util/RingBufferTest.java +++ b/tests/unit/java/com/android/internal/util/RingBufferTest.java @@ -20,14 +20,19 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; +import android.os.Build; + import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; + +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Test; import org.junit.runner.RunWith; @SmallTest -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class RingBufferTest { @Test diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java index 6c484cca06..134078dcf0 100644 --- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java @@ -301,7 +301,6 @@ import android.util.SparseArray; import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; import com.android.connectivity.resources.R; import com.android.internal.app.IBatteryStats; @@ -325,6 +324,8 @@ import com.android.server.connectivity.QosCallbackTracker; import com.android.server.connectivity.Vpn; import com.android.server.connectivity.VpnProfileStore; import com.android.server.net.NetworkPinner; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import com.android.testutils.ExceptionUtils; import com.android.testutils.HandlerUtils; import com.android.testutils.RecorderCallback.CallbackEntry; @@ -388,8 +389,9 @@ import kotlin.reflect.KClass; * Build, install and run with: * runtest frameworks-net -c com.android.server.ConnectivityServiceTest */ -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class ConnectivityServiceTest { private static final String TAG = "ConnectivityServiceTest"; diff --git a/tests/unit/java/com/android/server/IpSecServiceParameterizedTest.java b/tests/unit/java/com/android/server/IpSecServiceParameterizedTest.java index cf2c9c783a..5bbbe407ec 100644 --- a/tests/unit/java/com/android/server/IpSecServiceParameterizedTest.java +++ b/tests/unit/java/com/android/server/IpSecServiceParameterizedTest.java @@ -58,6 +58,7 @@ import android.net.LinkAddress; import android.net.LinkProperties; import android.net.Network; import android.os.Binder; +import android.os.Build; import android.os.ParcelFileDescriptor; import android.system.Os; import android.test.mock.MockContext; @@ -66,9 +67,11 @@ import android.util.ArraySet; import androidx.test.filters.SmallTest; import com.android.server.IpSecService.TunnelInterfaceRecord; +import com.android.testutils.DevSdkIgnoreRule; import org.junit.Before; import org.junit.Ignore; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -83,6 +86,9 @@ import java.util.Set; @SmallTest @RunWith(Parameterized.class) public class IpSecServiceParameterizedTest { + @Rule + public final DevSdkIgnoreRule mIgnoreRule = new DevSdkIgnoreRule( + Build.VERSION_CODES.R /* ignoreClassUpTo */); private static final int TEST_SPI = 0xD1201D; diff --git a/tests/unit/java/com/android/server/IpSecServiceRefcountedResourceTest.java b/tests/unit/java/com/android/server/IpSecServiceRefcountedResourceTest.java index 22a2c94fc1..6957d51fe3 100644 --- a/tests/unit/java/com/android/server/IpSecServiceRefcountedResourceTest.java +++ b/tests/unit/java/com/android/server/IpSecServiceRefcountedResourceTest.java @@ -30,14 +30,16 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.RemoteException; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; import com.android.server.IpSecService.IResource; import com.android.server.IpSecService.RefcountedResource; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Before; import org.junit.Test; @@ -51,7 +53,8 @@ import java.util.concurrent.ThreadLocalRandom; /** Unit tests for {@link IpSecService.RefcountedResource}. */ @SmallTest -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class IpSecServiceRefcountedResourceTest { Context mMockContext; IpSecService.IpSecServiceConfiguration mMockIpSecSrvConfig; diff --git a/tests/unit/java/com/android/server/IpSecServiceTest.java b/tests/unit/java/com/android/server/IpSecServiceTest.java index 6232423b4f..fabd6f1fe9 100644 --- a/tests/unit/java/com/android/server/IpSecServiceTest.java +++ b/tests/unit/java/com/android/server/IpSecServiceTest.java @@ -43,6 +43,7 @@ import android.net.IpSecManager; import android.net.IpSecSpiResponse; import android.net.IpSecUdpEncapResponse; import android.os.Binder; +import android.os.Build; import android.os.ParcelFileDescriptor; import android.os.Process; import android.system.ErrnoException; @@ -51,7 +52,9 @@ import android.system.StructStat; import android.util.Range; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; + +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import dalvik.system.SocketTagger; @@ -70,7 +73,8 @@ import java.util.List; /** Unit tests for {@link IpSecService}. */ @SmallTest -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class IpSecServiceTest { private static final int DROID_SPI = 0xD1201D; diff --git a/tests/unit/java/com/android/server/LegacyTypeTrackerTest.kt b/tests/unit/java/com/android/server/LegacyTypeTrackerTest.kt index 5ec111954f..64736f244d 100644 --- a/tests/unit/java/com/android/server/LegacyTypeTrackerTest.kt +++ b/tests/unit/java/com/android/server/LegacyTypeTrackerTest.kt @@ -43,11 +43,13 @@ import android.net.ConnectivityManager.TYPE_WIMAX import android.net.EthernetManager import android.net.NetworkInfo.DetailedState.CONNECTED import android.net.NetworkInfo.DetailedState.DISCONNECTED +import android.os.Build import android.telephony.TelephonyManager import androidx.test.filters.SmallTest -import androidx.test.runner.AndroidJUnit4 import com.android.server.ConnectivityService.LegacyTypeTracker import com.android.server.connectivity.NetworkAgentInfo +import com.android.testutils.DevSdkIgnoreRule +import com.android.testutils.DevSdkIgnoreRunner import org.junit.Assert.assertFalse import org.junit.Assert.assertNull import org.junit.Assert.assertSame @@ -64,8 +66,9 @@ import org.mockito.Mockito.verify const val UNSUPPORTED_TYPE = TYPE_WIMAX -@RunWith(AndroidJUnit4::class) +@RunWith(DevSdkIgnoreRunner::class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) class LegacyTypeTrackerTest { private val supportedTypes = arrayOf(TYPE_WIFI, TYPE_WIFI_P2P, TYPE_ETHERNET, TYPE_MOBILE, TYPE_MOBILE_SUPL, TYPE_MOBILE_MMS, TYPE_MOBILE_SUPL, TYPE_MOBILE_DUN, TYPE_MOBILE_HIPRI, diff --git a/tests/unit/java/com/android/server/NetIdManagerTest.kt b/tests/unit/java/com/android/server/NetIdManagerTest.kt index 6f5e740d34..811134eaae 100644 --- a/tests/unit/java/com/android/server/NetIdManagerTest.kt +++ b/tests/unit/java/com/android/server/NetIdManagerTest.kt @@ -16,17 +16,20 @@ package com.android.server +import android.os.Build import androidx.test.filters.SmallTest -import androidx.test.runner.AndroidJUnit4 import com.android.server.NetIdManager.MIN_NET_ID -import com.android.testutils.assertThrows +import com.android.testutils.DevSdkIgnoreRule +import com.android.testutils.DevSdkIgnoreRunner import com.android.testutils.ExceptionUtils.ThrowingRunnable +import com.android.testutils.assertThrows import org.junit.Test import org.junit.runner.RunWith import kotlin.test.assertEquals -@RunWith(AndroidJUnit4::class) +@RunWith(DevSdkIgnoreRunner::class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) class NetIdManagerTest { @Test fun testReserveReleaseNetId() { diff --git a/tests/unit/java/com/android/server/NetworkManagementServiceTest.java b/tests/unit/java/com/android/server/NetworkManagementServiceTest.java index 13516d75a5..ea29da0f39 100644 --- a/tests/unit/java/com/android/server/NetworkManagementServiceTest.java +++ b/tests/unit/java/com/android/server/NetworkManagementServiceTest.java @@ -38,17 +38,18 @@ import android.net.LinkAddress; import android.net.NetworkPolicyManager; import android.os.BatteryStats; import android.os.Binder; +import android.os.Build; import android.os.IBinder; import android.os.Process; import android.os.RemoteException; import android.test.suitebuilder.annotation.SmallTest; import android.util.ArrayMap; -import androidx.test.runner.AndroidJUnit4; - import com.android.internal.app.IBatteryStats; import com.android.server.NetworkManagementService.Dependencies; import com.android.server.net.BaseNetworkObserver; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.After; import org.junit.Before; @@ -64,8 +65,9 @@ import java.util.function.BiFunction; /** * Tests for {@link NetworkManagementService}. */ -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class NetworkManagementServiceTest { private NetworkManagementService mNMService; @Mock private Context mContext; diff --git a/tests/unit/java/com/android/server/NsdServiceTest.java b/tests/unit/java/com/android/server/NsdServiceTest.java index 1eac4ea280..e80a9380f6 100644 --- a/tests/unit/java/com/android/server/NsdServiceTest.java +++ b/tests/unit/java/com/android/server/NsdServiceTest.java @@ -31,17 +31,19 @@ import android.content.ContentResolver; import android.content.Context; import android.net.nsd.NsdManager; import android.net.nsd.NsdServiceInfo; +import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; import android.os.Message; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; import com.android.server.NsdService.DaemonConnection; import com.android.server.NsdService.DaemonConnectionSupplier; import com.android.server.NsdService.NativeCallbackReceiver; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import com.android.testutils.HandlerUtils; import org.junit.After; @@ -56,8 +58,9 @@ import org.mockito.Spy; // TODOs: // - test client can send requests and receive replies // - test NSD_ON ENABLE/DISABLED listening -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class NsdServiceTest { static final int PROTOCOL = NsdManager.PROTOCOL_DNS_SD; diff --git a/tests/unit/java/com/android/server/connectivity/DnsManagerTest.java b/tests/unit/java/com/android/server/connectivity/DnsManagerTest.java index 0ffeec98cf..9ef558fcea 100644 --- a/tests/unit/java/com/android/server/connectivity/DnsManagerTest.java +++ b/tests/unit/java/com/android/server/connectivity/DnsManagerTest.java @@ -55,15 +55,17 @@ import android.net.ResolverOptionsParcel; import android.net.ResolverParamsParcel; import android.net.RouteInfo; import android.net.shared.PrivateDnsConfig; +import android.os.Build; import android.provider.Settings; import android.test.mock.MockContentResolver; import android.util.SparseArray; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; import com.android.internal.util.MessageUtils; import com.android.internal.util.test.FakeSettingsProvider; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import libcore.net.InetAddressUtils; @@ -83,8 +85,9 @@ import java.util.Arrays; * Build, install and run with: * runtest frameworks-net -c com.android.server.connectivity.DnsManagerTest */ -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class DnsManagerTest { static final String TEST_IFACENAME = "test_wlan0"; static final int TEST_NETID = 100; diff --git a/tests/unit/java/com/android/server/connectivity/FullScoreTest.kt b/tests/unit/java/com/android/server/connectivity/FullScoreTest.kt index 45b575a436..785153a0e4 100644 --- a/tests/unit/java/com/android/server/connectivity/FullScoreTest.kt +++ b/tests/unit/java/com/android/server/connectivity/FullScoreTest.kt @@ -19,27 +19,28 @@ package com.android.server.connectivity import android.net.NetworkAgentConfig import android.net.NetworkCapabilities import android.net.NetworkScore.KEEP_CONNECTED_NONE +import android.os.Build import android.text.TextUtils import android.util.ArraySet import androidx.test.filters.SmallTest -import androidx.test.runner.AndroidJUnit4 import com.android.server.connectivity.FullScore.MAX_CS_MANAGED_POLICY import com.android.server.connectivity.FullScore.POLICY_ACCEPT_UNVALIDATED import com.android.server.connectivity.FullScore.POLICY_EVER_USER_SELECTED import com.android.server.connectivity.FullScore.POLICY_IS_VALIDATED import com.android.server.connectivity.FullScore.POLICY_IS_VPN +import com.android.testutils.DevSdkIgnoreRule +import com.android.testutils.DevSdkIgnoreRunner import org.junit.Test import org.junit.runner.RunWith -import kotlin.collections.minOfOrNull -import kotlin.collections.maxOfOrNull import kotlin.reflect.full.staticProperties import kotlin.test.assertEquals import kotlin.test.assertFailsWith import kotlin.test.assertFalse import kotlin.test.assertTrue -@RunWith(AndroidJUnit4::class) +@RunWith(DevSdkIgnoreRunner::class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) class FullScoreTest { // Convenience methods fun FullScore.withPolicies( diff --git a/tests/unit/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java b/tests/unit/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java index 70495cced5..52b05aafbe 100644 --- a/tests/unit/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java +++ b/tests/unit/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java @@ -42,11 +42,12 @@ import android.net.metrics.NetworkEvent; import android.net.metrics.RaEvent; import android.net.metrics.ValidationProbeEvent; import android.net.metrics.WakeupStats; +import android.os.Build; import android.test.suitebuilder.annotation.SmallTest; -import androidx.test.runner.AndroidJUnit4; - import com.android.server.connectivity.metrics.nano.IpConnectivityLogClass.IpConnectivityEvent; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Test; import org.junit.runner.RunWith; @@ -55,8 +56,9 @@ import java.util.Arrays; import java.util.List; // TODO: instead of comparing textpb to textpb, parse textpb and compare proto to proto. -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class IpConnectivityEventBuilderTest { @Test diff --git a/tests/unit/java/com/android/server/connectivity/IpConnectivityMetricsTest.java b/tests/unit/java/com/android/server/connectivity/IpConnectivityMetricsTest.java index 8b072c49de..063ccd3ba2 100644 --- a/tests/unit/java/com/android/server/connectivity/IpConnectivityMetricsTest.java +++ b/tests/unit/java/com/android/server/connectivity/IpConnectivityMetricsTest.java @@ -45,15 +45,16 @@ import android.net.metrics.IpManagerEvent; import android.net.metrics.IpReachabilityEvent; import android.net.metrics.RaEvent; import android.net.metrics.ValidationProbeEvent; +import android.os.Build; import android.os.Parcelable; import android.system.OsConstants; import android.test.suitebuilder.annotation.SmallTest; import android.util.Base64; -import androidx.test.runner.AndroidJUnit4; - import com.android.internal.util.BitUtils; import com.android.server.connectivity.metrics.nano.IpConnectivityLogClass; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Before; import org.junit.Test; @@ -65,8 +66,9 @@ import org.mockito.MockitoAnnotations; import java.io.PrintWriter; import java.io.StringWriter; -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class IpConnectivityMetricsTest { static final IpReachabilityEvent FAKE_EV = new IpReachabilityEvent(IpReachabilityEvent.NUD_FAILED); diff --git a/tests/unit/java/com/android/server/connectivity/LingerMonitorTest.java b/tests/unit/java/com/android/server/connectivity/LingerMonitorTest.java index 36e229d8aa..58a7c89d77 100644 --- a/tests/unit/java/com/android/server/connectivity/LingerMonitorTest.java +++ b/tests/unit/java/com/android/server/connectivity/LingerMonitorTest.java @@ -43,14 +43,16 @@ import android.net.NetworkInfo; import android.net.NetworkProvider; import android.net.NetworkScore; import android.os.Binder; +import android.os.Build; import android.text.format.DateUtils; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; import com.android.connectivity.resources.R; import com.android.server.ConnectivityService; import com.android.server.connectivity.NetworkNotificationManager.NotificationType; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.After; import org.junit.Before; @@ -59,8 +61,9 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class LingerMonitorTest { static final String CELLULAR = "CELLULAR"; static final String WIFI = "WIFI"; diff --git a/tests/unit/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java b/tests/unit/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java index 4c80f6a21d..e2ad00df49 100644 --- a/tests/unit/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java +++ b/tests/unit/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java @@ -28,8 +28,7 @@ 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 junit.framework.TestCase.assertNotNull; - +import static org.junit.Assert.assertNotNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.argThat; @@ -54,6 +53,7 @@ import android.net.NetworkPolicy; import android.net.NetworkPolicyManager; import android.net.NetworkTemplate; import android.net.TelephonyNetworkSpecifier; +import android.os.Build; import android.os.Handler; import android.os.UserHandle; import android.provider.Settings; @@ -63,13 +63,14 @@ import android.util.DataUnit; import android.util.RecurrenceRule; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; import com.android.internal.R; import com.android.internal.util.test.FakeSettingsProvider; import com.android.server.LocalServices; import com.android.server.net.NetworkPolicyManagerInternal; import com.android.server.net.NetworkStatsManagerInternal; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.After; import org.junit.Before; @@ -87,8 +88,9 @@ import java.time.ZoneId; import java.time.ZonedDateTime; import java.time.temporal.ChronoUnit; -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class MultipathPolicyTrackerTest { private static final Network TEST_NETWORK = new Network(123); private static final int POLICY_SNOOZED = -100; diff --git a/tests/unit/java/com/android/server/connectivity/Nat464XlatTest.java b/tests/unit/java/com/android/server/connectivity/Nat464XlatTest.java index 9b2a638f8b..f358726f69 100644 --- a/tests/unit/java/com/android/server/connectivity/Nat464XlatTest.java +++ b/tests/unit/java/com/android/server/connectivity/Nat464XlatTest.java @@ -40,13 +40,15 @@ import android.net.LinkProperties; import android.net.NetworkAgentConfig; import android.net.NetworkCapabilities; import android.net.NetworkInfo; +import android.os.Build; import android.os.Handler; import android.os.test.TestLooper; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; import com.android.server.ConnectivityService; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Before; import org.junit.Test; @@ -56,8 +58,9 @@ import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class Nat464XlatTest { static final String BASE_IFACE = "test0"; diff --git a/tests/unit/java/com/android/server/connectivity/NetdEventListenerServiceTest.java b/tests/unit/java/com/android/server/connectivity/NetdEventListenerServiceTest.java index 50aaaee244..7d6c3ae4b5 100644 --- a/tests/unit/java/com/android/server/connectivity/NetdEventListenerServiceTest.java +++ b/tests/unit/java/com/android/server/connectivity/NetdEventListenerServiceTest.java @@ -31,14 +31,15 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.Network; import android.net.NetworkCapabilities; +import android.os.Build; import android.system.OsConstants; import android.test.suitebuilder.annotation.SmallTest; import android.util.Base64; -import androidx.test.runner.AndroidJUnit4; - import com.android.server.connectivity.metrics.nano.IpConnectivityLogClass.IpConnectivityEvent; import com.android.server.connectivity.metrics.nano.IpConnectivityLogClass.IpConnectivityLog; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Before; import org.junit.Test; @@ -52,8 +53,9 @@ import java.util.Arrays; import java.util.Comparator; import java.util.List; -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class NetdEventListenerServiceTest { private static final String EXAMPLE_IPV4 = "192.0.2.1"; private static final String EXAMPLE_IPV6 = "2001:db8:1200::2:1"; diff --git a/tests/unit/java/com/android/server/connectivity/NetworkNotificationManagerTest.java b/tests/unit/java/com/android/server/connectivity/NetworkNotificationManagerTest.java index 1e8d8087b2..c9245359dc 100644 --- a/tests/unit/java/com/android/server/connectivity/NetworkNotificationManagerTest.java +++ b/tests/unit/java/com/android/server/connectivity/NetworkNotificationManagerTest.java @@ -47,19 +47,19 @@ import android.content.res.Resources; import android.net.ConnectivityResources; import android.net.NetworkCapabilities; import android.net.NetworkInfo; +import android.os.Build; import android.os.UserHandle; import android.telephony.TelephonyManager; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; import com.android.connectivity.resources.R; import com.android.server.connectivity.NetworkNotificationManager.NotificationType; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.After; -import org.junit.AfterClass; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -73,8 +73,9 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class NetworkNotificationManagerTest { private static final String TEST_SSID = "Test SSID"; diff --git a/tests/unit/java/com/android/server/connectivity/NetworkOfferTest.kt b/tests/unit/java/com/android/server/connectivity/NetworkOfferTest.kt index 409f8c3099..d03c567047 100644 --- a/tests/unit/java/com/android/server/connectivity/NetworkOfferTest.kt +++ b/tests/unit/java/com/android/server/connectivity/NetworkOfferTest.kt @@ -20,8 +20,10 @@ import android.net.INetworkOfferCallback import android.net.NetworkCapabilities import android.net.NetworkRequest import android.net.NetworkScore.KEEP_CONNECTED_NONE +import android.os.Build import androidx.test.filters.SmallTest -import androidx.test.runner.AndroidJUnit4 +import com.android.testutils.DevSdkIgnoreRule +import com.android.testutils.DevSdkIgnoreRunner import org.junit.Test import org.junit.runner.RunWith import org.mockito.ArgumentMatchers.eq @@ -32,8 +34,9 @@ import kotlin.test.assertTrue const val POLICY_NONE = 0L -@RunWith(AndroidJUnit4::class) +@RunWith(DevSdkIgnoreRunner::class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) class NetworkOfferTest { val mockCallback = mock(INetworkOfferCallback::class.java) diff --git a/tests/unit/java/com/android/server/connectivity/PermissionMonitorTest.java b/tests/unit/java/com/android/server/connectivity/PermissionMonitorTest.java index 8b457556f0..56e230f7e8 100644 --- a/tests/unit/java/com/android/server/connectivity/PermissionMonitorTest.java +++ b/tests/unit/java/com/android/server/connectivity/PermissionMonitorTest.java @@ -80,7 +80,9 @@ import android.util.SparseIntArray; import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; + +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Before; import org.junit.Test; @@ -98,8 +100,9 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Set; -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class PermissionMonitorTest { private static final UserHandle MOCK_USER1 = UserHandle.of(0); private static final UserHandle MOCK_USER2 = UserHandle.of(1); diff --git a/tests/unit/java/com/android/server/connectivity/VpnTest.java b/tests/unit/java/com/android/server/connectivity/VpnTest.java index 6ff47aea34..b706090635 100644 --- a/tests/unit/java/com/android/server/connectivity/VpnTest.java +++ b/tests/unit/java/com/android/server/connectivity/VpnTest.java @@ -97,13 +97,14 @@ import android.util.ArraySet; import android.util.Range; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; import com.android.internal.R; import com.android.internal.net.LegacyVpnInfo; import com.android.internal.net.VpnConfig; import com.android.internal.net.VpnProfile; import com.android.server.IpSecService; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Before; import org.junit.Test; @@ -138,8 +139,9 @@ import java.util.stream.Stream; * Build, install and run with: * runtest frameworks-net -c com.android.server.connectivity.VpnTest */ -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(VERSION_CODES.R) public class VpnTest { private static final String TAG = "VpnTest"; diff --git a/tests/unit/java/com/android/server/net/NetworkStatsAccessTest.java b/tests/unit/java/com/android/server/net/NetworkStatsAccessTest.java index 8b730af769..03d9404659 100644 --- a/tests/unit/java/com/android/server/net/NetworkStatsAccessTest.java +++ b/tests/unit/java/com/android/server/net/NetworkStatsAccessTest.java @@ -25,12 +25,14 @@ import android.app.AppOpsManager; import android.app.admin.DevicePolicyManagerInternal; import android.content.Context; import android.content.pm.PackageManager; +import android.os.Build; import android.telephony.TelephonyManager; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; import com.android.server.LocalServices; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.After; import org.junit.Before; @@ -39,8 +41,9 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class NetworkStatsAccessTest { private static final String TEST_PKG = "com.example.test"; private static final int TEST_UID = 12345; diff --git a/tests/unit/java/com/android/server/net/NetworkStatsCollectionTest.java b/tests/unit/java/com/android/server/net/NetworkStatsCollectionTest.java index 505ff9b6a3..e771558a20 100644 --- a/tests/unit/java/com/android/server/net/NetworkStatsCollectionTest.java +++ b/tests/unit/java/com/android/server/net/NetworkStatsCollectionTest.java @@ -42,6 +42,7 @@ import android.net.NetworkIdentity; import android.net.NetworkStats; import android.net.NetworkStatsHistory; import android.net.NetworkTemplate; +import android.os.Build; import android.os.Process; import android.os.UserHandle; import android.telephony.SubscriptionPlan; @@ -51,9 +52,10 @@ import android.util.RecurrenceRule; import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; import com.android.frameworks.tests.net.R; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import libcore.io.IoUtils; import libcore.io.Streams; @@ -79,8 +81,9 @@ import java.util.List; /** * Tests for {@link NetworkStatsCollection}. */ -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class NetworkStatsCollectionTest { private static final String TEST_FILE = "test.bin"; diff --git a/tests/unit/java/com/android/server/net/NetworkStatsFactoryTest.java b/tests/unit/java/com/android/server/net/NetworkStatsFactoryTest.java index 40d44468a6..8d7aa4e589 100644 --- a/tests/unit/java/com/android/server/net/NetworkStatsFactoryTest.java +++ b/tests/unit/java/com/android/server/net/NetworkStatsFactoryTest.java @@ -37,12 +37,14 @@ import android.content.res.Resources; import android.net.NetworkStats; import android.net.TrafficStats; import android.net.UnderlyingNetworkInfo; +import android.os.Build; import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; import com.android.frameworks.tests.net.R; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import libcore.io.IoUtils; import libcore.io.Streams; @@ -60,8 +62,9 @@ import java.io.InputStream; import java.io.OutputStream; /** Tests for {@link NetworkStatsFactory}. */ -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class NetworkStatsFactoryTest extends NetworkStatsBaseTest { private static final String CLAT_PREFIX = "v4-"; diff --git a/tests/unit/java/com/android/server/net/NetworkStatsObserversTest.java b/tests/unit/java/com/android/server/net/NetworkStatsObserversTest.java index 9fa1c50423..e35104ec7a 100644 --- a/tests/unit/java/com/android/server/net/NetworkStatsObserversTest.java +++ b/tests/unit/java/com/android/server/net/NetworkStatsObserversTest.java @@ -39,6 +39,7 @@ import android.net.DataUsageRequest; import android.net.NetworkIdentity; import android.net.NetworkStats; import android.net.NetworkTemplate; +import android.os.Build; import android.os.ConditionVariable; import android.os.Handler; import android.os.HandlerThread; @@ -51,9 +52,10 @@ import android.telephony.TelephonyManager; import android.util.ArrayMap; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; import com.android.server.net.NetworkStatsServiceTest.LatchedHandler; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import com.android.testutils.HandlerUtils; import org.junit.Before; @@ -68,8 +70,9 @@ import java.util.Objects; /** * Tests for {@link NetworkStatsObservers}. */ -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) 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 ee94ae9301..ab764601e6 100644 --- a/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java +++ b/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java @@ -98,6 +98,7 @@ import android.net.NetworkTemplate; import android.net.TelephonyNetworkSpecifier; import android.net.UnderlyingNetworkInfo; import android.net.netstats.provider.INetworkStatsProviderCallback; +import android.os.Build; import android.os.ConditionVariable; import android.os.Handler; import android.os.HandlerThread; @@ -114,12 +115,13 @@ import android.telephony.TelephonyManager; import androidx.annotation.Nullable; import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; import com.android.internal.util.ArrayUtils; import com.android.internal.util.test.BroadcastInterceptingContext; import com.android.server.net.NetworkStatsService.NetworkStatsSettings; import com.android.server.net.NetworkStatsService.NetworkStatsSettings.Config; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import com.android.testutils.HandlerUtils; import com.android.testutils.TestableNetworkStatsProviderBinder; @@ -146,8 +148,9 @@ import java.util.concurrent.Executor; * TODO: This test used to be really brittle because it used Easymock - it uses Mockito now, but * still uses the Easymock structure, which could be simplified. */ -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) @SmallTest +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class NetworkStatsServiceTest extends NetworkStatsBaseTest { private static final String TAG = "NetworkStatsServiceTest"; diff --git a/tests/unit/java/com/android/server/net/NetworkStatsSubscriptionsMonitorTest.java b/tests/unit/java/com/android/server/net/NetworkStatsSubscriptionsMonitorTest.java index 6d2c7dc39f..2bc385c9b8 100644 --- a/tests/unit/java/com/android/server/net/NetworkStatsSubscriptionsMonitorTest.java +++ b/tests/unit/java/com/android/server/net/NetworkStatsSubscriptionsMonitorTest.java @@ -34,6 +34,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.content.Context; import android.net.NetworkTemplate; +import android.os.Build; import android.os.test.TestLooper; import android.telephony.NetworkRegistrationInfo; import android.telephony.PhoneStateListener; @@ -43,11 +44,12 @@ import android.telephony.TelephonyManager; import com.android.internal.util.CollectionUtils; import com.android.server.net.NetworkStatsSubscriptionsMonitor.RatTypeListener; +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -57,7 +59,8 @@ import java.util.List; import java.util.concurrent.Executor; import java.util.concurrent.Executors; -@RunWith(JUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) 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/ipmemorystore/NetworkAttributesTest.java b/tests/unit/java/com/android/server/net/ipmemorystore/NetworkAttributesTest.java index ebbc0ef625..5f3efeda2b 100644 --- a/tests/unit/java/com/android/server/net/ipmemorystore/NetworkAttributesTest.java +++ b/tests/unit/java/com/android/server/net/ipmemorystore/NetworkAttributesTest.java @@ -20,9 +20,12 @@ import static org.junit.Assert.assertEquals; import android.net.ipmemorystore.NetworkAttributes; import android.net.networkstack.aidl.quirks.IPv6ProvisioningLossQuirk; +import android.os.Build; import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; + +import com.android.testutils.DevSdkIgnoreRule; +import com.android.testutils.DevSdkIgnoreRunner; import org.junit.Test; import org.junit.runner.RunWith; @@ -34,7 +37,8 @@ import java.util.Arrays; /** Unit tests for {@link NetworkAttributes}. */ @SmallTest -@RunWith(AndroidJUnit4.class) +@RunWith(DevSdkIgnoreRunner.class) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) public class NetworkAttributesTest { private static final String WEIGHT_FIELD_NAME_PREFIX = "WEIGHT_"; private static final float EPSILON = 0.0001f;