From 05dd1ba54005b15d92daf6f26329acf91fb3debb Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Thu, 17 Jun 2021 15:34:25 +0900 Subject: [PATCH] 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. Bug: 187935317 Test: atest ConnectivityCoverageTests on R Change-Id: I10da45ae023e7f1e8cd11ec857b84346892a3fa8 --- .../java/android/app/usage/NetworkStatsManagerTest.java | 3 +++ tests/unit/java/android/net/ConnectivityManagerTest.java | 3 +++ tests/unit/java/android/net/Ikev2VpnProfileTest.java | 3 +++ tests/unit/java/android/net/IpMemoryStoreTest.java | 3 +++ tests/unit/java/android/net/IpSecAlgorithmTest.java | 2 ++ tests/unit/java/android/net/IpSecConfigTest.java | 4 ++++ tests/unit/java/android/net/IpSecManagerTest.java | 3 +++ tests/unit/java/android/net/IpSecTransformTest.java | 4 ++++ .../java/android/net/KeepalivePacketDataUtilTest.java | 4 ++++ tests/unit/java/android/net/MacAddressTest.java | 4 ++++ tests/unit/java/android/net/NetworkIdentityTest.kt | 3 +++ tests/unit/java/android/net/NetworkStatsHistoryTest.java | 3 +++ tests/unit/java/android/net/NetworkStatsTest.java | 3 +++ tests/unit/java/android/net/NetworkTemplateTest.kt | 3 +++ tests/unit/java/android/net/NetworkUtilsTest.java | 4 ++++ tests/unit/java/android/net/QosSocketFilterTest.java | 4 ++++ .../java/android/net/TelephonyNetworkSpecifierTest.java | 3 +++ tests/unit/java/android/net/VpnManagerTest.java | 3 +++ tests/unit/java/android/net/VpnTransportInfoTest.java | 4 ++++ .../java/android/net/ipmemorystore/ParcelableTests.java | 3 +++ tests/unit/java/android/net/nsd/NsdManagerTest.java | 3 +++ tests/unit/java/android/net/nsd/NsdServiceInfoTest.java | 3 +++ tests/unit/java/android/net/util/DnsUtilsTest.java | 3 +++ tests/unit/java/android/net/util/KeepaliveUtilsTest.kt | 3 +++ .../android/net/util/MultinetworkPolicyTrackerTest.kt | 3 +++ .../android/internal/net/NetworkUtilsInternalTest.java | 3 +++ .../java/com/android/internal/net/VpnProfileTest.java | 3 +++ .../unit/java/com/android/internal/util/BitUtilsTest.java | 4 ++++ .../java/com/android/internal/util/RingBufferTest.java | 4 ++++ .../java/com/android/server/ConnectivityServiceTest.java | 2 ++ .../com/android/server/IpSecServiceParameterizedTest.java | 3 +++ .../server/IpSecServiceRefcountedResourceTest.java | 3 +++ tests/unit/java/com/android/server/IpSecServiceTest.java | 3 +++ .../unit/java/com/android/server/LegacyTypeTrackerTest.kt | 3 +++ tests/unit/java/com/android/server/NetIdManagerTest.kt | 3 +++ .../com/android/server/NetworkManagementServiceTest.java | 3 +++ tests/unit/java/com/android/server/NsdServiceTest.java | 3 +++ .../com/android/server/connectivity/DnsManagerTest.java | 3 +++ .../java/com/android/server/connectivity/FullScoreTest.kt | 3 +++ .../connectivity/IpConnectivityEventBuilderTest.java | 3 +++ .../server/connectivity/IpConnectivityMetricsTest.java | 3 +++ .../android/server/connectivity/LingerMonitorTest.java | 3 +++ .../server/connectivity/MultipathPolicyTrackerTest.java | 3 +++ .../com/android/server/connectivity/Nat464XlatTest.java | 3 +++ .../server/connectivity/NetdEventListenerServiceTest.java | 3 +++ .../connectivity/NetworkNotificationManagerTest.java | 5 +++-- .../com/android/server/connectivity/NetworkOfferTest.kt | 3 +++ .../com/android/server/connectivity/NetworkRankerTest.kt | 8 ++++---- .../server/connectivity/PermissionMonitorTest.java | 2 ++ .../java/com/android/server/connectivity/VpnTest.java | 3 +++ .../com/android/server/net/NetworkStatsAccessTest.java | 3 +++ .../android/server/net/NetworkStatsCollectionTest.java | 3 +++ .../com/android/server/net/NetworkStatsFactoryTest.java | 3 +++ .../com/android/server/net/NetworkStatsObserversTest.java | 3 +++ .../com/android/server/net/NetworkStatsServiceTest.java | 3 +++ .../server/net/NetworkStatsSubscriptionsMonitorTest.java | 4 ++++ .../server/net/ipmemorystore/NetworkAttributesTest.java | 3 +++ 57 files changed, 179 insertions(+), 6 deletions(-) diff --git a/tests/unit/java/android/app/usage/NetworkStatsManagerTest.java b/tests/unit/java/android/app/usage/NetworkStatsManagerTest.java index 6bd2bd569f..be95b6ce9e 100644 --- a/tests/unit/java/android/app/usage/NetworkStatsManagerTest.java +++ b/tests/unit/java/android/app/usage/NetworkStatsManagerTest.java @@ -36,9 +36,11 @@ 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.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -51,6 +53,7 @@ import org.mockito.invocation.InvocationOnMock; @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..b36e3799c8 100644 --- a/tests/unit/java/android/net/ConnectivityManagerTest.java +++ b/tests/unit/java/android/net/ConnectivityManagerTest.java @@ -59,6 +59,7 @@ import android.app.PendingIntent; import android.content.Context; import android.content.pm.ApplicationInfo; import android.net.ConnectivityManager.NetworkCallback; +import android.os.Build; import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.os.Handler; @@ -67,6 +68,7 @@ import android.os.Message; import android.os.Messenger; import android.os.Process; +import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -79,6 +81,7 @@ import org.mockito.MockitoAnnotations; @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..afd85e86a7 100644 --- a/tests/unit/java/android/net/Ikev2VpnProfileTest.java +++ b/tests/unit/java/android/net/Ikev2VpnProfileTest.java @@ -23,8 +23,10 @@ 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.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -52,6 +54,7 @@ import javax.security.auth.x500.X500Principal; /** Unit tests for {@link Ikev2VpnProfile.Builder}. */ @SmallTest @RunWith(AndroidJUnit4.class) +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..6be5396425 100644 --- a/tests/unit/java/android/net/IpMemoryStoreTest.java +++ b/tests/unit/java/android/net/IpMemoryStoreTest.java @@ -36,8 +36,10 @@ 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.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -55,6 +57,7 @@ import java.util.Arrays; @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..fc08408af2 100644 --- a/tests/unit/java/android/net/IpSecAlgorithmTest.java +++ b/tests/unit/java/android/net/IpSecAlgorithmTest.java @@ -28,6 +28,7 @@ import android.content.res.Resources; import android.os.Build; import android.os.Parcel; +import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -46,6 +47,7 @@ import java.util.Set; /** Unit tests for {@link IpSecAlgorithm}. */ @SmallTest @RunWith(AndroidJUnit4.class) +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..457c92372c 100644 --- a/tests/unit/java/android/net/IpSecConfigTest.java +++ b/tests/unit/java/android/net/IpSecConfigTest.java @@ -23,6 +23,9 @@ 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.SdkSuppress; import androidx.test.filters.SmallTest; import org.junit.Test; @@ -32,6 +35,7 @@ import org.junit.runners.JUnit4; /** Unit tests for {@link IpSecConfig}. */ @SmallTest @RunWith(JUnit4.class) +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class IpSecConfigTest { @Test diff --git a/tests/unit/java/android/net/IpSecManagerTest.java b/tests/unit/java/android/net/IpSecManagerTest.java index 730e2d56bd..3fd0064460 100644 --- a/tests/unit/java/android/net/IpSecManagerTest.java +++ b/tests/unit/java/android/net/IpSecManagerTest.java @@ -31,9 +31,11 @@ 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.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -50,6 +52,7 @@ import java.net.UnknownHostException; /** Unit tests for {@link IpSecManager}. */ @SmallTest @RunWith(AndroidJUnit4.class) +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..96b09c31da 100644 --- a/tests/unit/java/android/net/IpSecTransformTest.java +++ b/tests/unit/java/android/net/IpSecTransformTest.java @@ -19,6 +19,9 @@ package android.net; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; +import android.os.Build; + +import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import org.junit.Test; @@ -28,6 +31,7 @@ import org.junit.runners.JUnit4; /** Unit tests for {@link IpSecTransform}. */ @SmallTest @RunWith(JUnit4.class) +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class IpSecTransformTest { @Test diff --git a/tests/unit/java/android/net/KeepalivePacketDataUtilTest.java b/tests/unit/java/android/net/KeepalivePacketDataUtilTest.java index bc6dbf21d5..3fcb515d97 100644 --- a/tests/unit/java/android/net/KeepalivePacketDataUtilTest.java +++ b/tests/unit/java/android/net/KeepalivePacketDataUtilTest.java @@ -24,8 +24,11 @@ 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 androidx.test.filters.SdkSuppress; + import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -36,6 +39,7 @@ import java.net.InetAddress; import java.nio.ByteBuffer; @RunWith(JUnit4.class) +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..0039e44fa5 100644 --- a/tests/unit/java/android/net/MacAddressTest.java +++ b/tests/unit/java/android/net/MacAddressTest.java @@ -22,6 +22,9 @@ 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.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -36,6 +39,7 @@ import java.util.Random; @SmallTest @RunWith(AndroidJUnit4.class) +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..4d04b19e4d 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 androidx.test.filters.SdkSuppress import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 import kotlin.test.assertEquals @RunWith(JUnit4::class) +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..3ecce505ef 100644 --- a/tests/unit/java/android/net/NetworkStatsHistoryTest.java +++ b/tests/unit/java/android/net/NetworkStatsHistoryTest.java @@ -38,9 +38,11 @@ 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.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -58,6 +60,7 @@ import java.util.Random; @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..9a3f4c2111 100644 --- a/tests/unit/java/android/net/NetworkStatsTest.java +++ b/tests/unit/java/android/net/NetworkStatsTest.java @@ -39,9 +39,11 @@ 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.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -55,6 +57,7 @@ import java.util.HashSet; @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..437f96160e 100644 --- a/tests/unit/java/android/net/NetworkTemplateTest.kt +++ b/tests/unit/java/android/net/NetworkTemplateTest.kt @@ -42,7 +42,9 @@ import android.net.NetworkTemplate.buildTemplateWifi import android.net.NetworkTemplate.buildTemplateWifiWildcard import android.net.NetworkTemplate.buildTemplateCarrierMetered import android.net.NetworkTemplate.buildTemplateMobileWithRatType +import android.os.Build import android.telephony.TelephonyManager +import androidx.test.filters.SdkSuppress import com.android.testutils.assertParcelSane import org.junit.Before import org.junit.Test @@ -61,6 +63,7 @@ private const val TEST_SSID1 = "ssid1" private const val TEST_SSID2 = "ssid2" @RunWith(JUnit4::class) +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..b2929987ec 100644 --- a/tests/unit/java/android/net/NetworkUtilsTest.java +++ b/tests/unit/java/android/net/NetworkUtilsTest.java @@ -18,6 +18,9 @@ package android.net; import static junit.framework.Assert.assertEquals; +import android.os.Build; + +import androidx.test.filters.SdkSuppress; import androidx.test.runner.AndroidJUnit4; import org.junit.Test; @@ -28,6 +31,7 @@ import java.util.TreeSet; @RunWith(AndroidJUnit4.class) @androidx.test.filters.SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..1635c34935 100644 --- a/tests/unit/java/android/net/QosSocketFilterTest.java +++ b/tests/unit/java/android/net/QosSocketFilterTest.java @@ -19,6 +19,9 @@ package android.net; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; +import android.os.Build; + +import androidx.test.filters.SdkSuppress; import androidx.test.runner.AndroidJUnit4; import org.junit.Test; @@ -29,6 +32,7 @@ import java.net.InetSocketAddress; @RunWith(AndroidJUnit4.class) @androidx.test.filters.SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class QosSocketFilterTest { @Test diff --git a/tests/unit/java/android/net/TelephonyNetworkSpecifierTest.java b/tests/unit/java/android/net/TelephonyNetworkSpecifierTest.java index 6714bb1abb..e198c8b6ad 100644 --- a/tests/unit/java/android/net/TelephonyNetworkSpecifierTest.java +++ b/tests/unit/java/android/net/TelephonyNetworkSpecifierTest.java @@ -23,8 +23,10 @@ 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.SdkSuppress; import androidx.test.filters.SmallTest; import org.junit.Test; @@ -33,6 +35,7 @@ import org.junit.Test; * Unit test for {@link android.net.TelephonyNetworkSpecifier}. */ @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..b4d850ac3c 100644 --- a/tests/unit/java/android/net/VpnManagerTest.java +++ b/tests/unit/java/android/net/VpnManagerTest.java @@ -27,9 +27,11 @@ 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.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -43,6 +45,7 @@ import org.junit.runner.RunWith; /** Unit tests for {@link VpnManager}. */ @SmallTest @RunWith(AndroidJUnit4.class) +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..ae2ac046c3 100644 --- a/tests/unit/java/android/net/VpnTransportInfoTest.java +++ b/tests/unit/java/android/net/VpnTransportInfoTest.java @@ -24,6 +24,9 @@ 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.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -32,6 +35,7 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..219cfffa44 100644 --- a/tests/unit/java/android/net/ipmemorystore/ParcelableTests.java +++ b/tests/unit/java/android/net/ipmemorystore/ParcelableTests.java @@ -21,9 +21,11 @@ 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.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -38,6 +40,7 @@ import java.util.Collections; @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..59a9316e5d 100644 --- a/tests/unit/java/android/net/nsd/NsdManagerTest.java +++ b/tests/unit/java/android/net/nsd/NsdManagerTest.java @@ -28,12 +28,14 @@ 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; import android.os.Message; import android.os.Messenger; +import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -49,6 +51,7 @@ import org.mockito.MockitoAnnotations; @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..afe54d1133 100644 --- a/tests/unit/java/android/net/nsd/NsdServiceInfoTest.java +++ b/tests/unit/java/android/net/nsd/NsdServiceInfoTest.java @@ -21,10 +21,12 @@ 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.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -38,6 +40,7 @@ import java.util.Map; @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..0bac75e238 100644 --- a/tests/unit/java/android/net/util/DnsUtilsTest.java +++ b/tests/unit/java/android/net/util/DnsUtilsTest.java @@ -25,7 +25,9 @@ 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.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -39,6 +41,7 @@ import java.util.List; @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..65fb4ed1cc 100644 --- a/tests/unit/java/android/net/util/KeepaliveUtilsTest.kt +++ b/tests/unit/java/android/net/util/KeepaliveUtilsTest.kt @@ -25,6 +25,8 @@ 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.SdkSuppress import androidx.test.filters.SmallTest import com.android.internal.R import org.junit.After @@ -47,6 +49,7 @@ import org.mockito.Mockito.mock */ @RunWith(JUnit4::class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..7d602ab819 100644 --- a/tests/unit/java/android/net/util/MultinetworkPolicyTrackerTest.kt +++ b/tests/unit/java/android/net/util/MultinetworkPolicyTrackerTest.kt @@ -25,11 +25,13 @@ 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.SdkSuppress import androidx.test.filters.SmallTest import androidx.test.runner.AndroidJUnit4 import com.android.connectivity.resources.R @@ -59,6 +61,7 @@ import org.mockito.Mockito.verify */ @RunWith(AndroidJUnit4::class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..a4d8ea9e46 100644 --- a/tests/unit/java/com/android/internal/net/NetworkUtilsInternalTest.java +++ b/tests/unit/java/com/android/internal/net/NetworkUtilsInternalTest.java @@ -27,9 +27,11 @@ 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.filters.SdkSuppress; import androidx.test.runner.AndroidJUnit4; import libcore.io.IoUtils; @@ -39,6 +41,7 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) @androidx.test.filters.SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..64cbc4e13b 100644 --- a/tests/unit/java/com/android/internal/net/VpnProfileTest.java +++ b/tests/unit/java/com/android/internal/net/VpnProfileTest.java @@ -25,7 +25,9 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import android.net.IpSecAlgorithm; +import android.os.Build; +import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import org.junit.Test; @@ -39,6 +41,7 @@ import java.util.List; /** Unit tests for {@link VpnProfile}. */ @SmallTest @RunWith(JUnit4.class) +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..9c6ac9b807 100644 --- a/tests/unit/java/com/android/internal/util/BitUtilsTest.java +++ b/tests/unit/java/com/android/internal/util/BitUtilsTest.java @@ -30,6 +30,9 @@ 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.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -42,6 +45,7 @@ import java.util.Random; @SmallTest @RunWith(AndroidJUnit4.class) +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..81a65135ce 100644 --- a/tests/unit/java/com/android/internal/util/RingBufferTest.java +++ b/tests/unit/java/com/android/internal/util/RingBufferTest.java @@ -20,6 +20,9 @@ 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.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -28,6 +31,7 @@ import org.junit.runner.RunWith; @SmallTest @RunWith(AndroidJUnit4.class) +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..0e6758355b 100644 --- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java @@ -300,6 +300,7 @@ import android.util.Range; import android.util.SparseArray; import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -390,6 +391,7 @@ import kotlin.reflect.KClass; */ @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..2b5bfacf50 100644 --- a/tests/unit/java/com/android/server/IpSecServiceParameterizedTest.java +++ b/tests/unit/java/com/android/server/IpSecServiceParameterizedTest.java @@ -58,11 +58,13 @@ 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; import android.util.ArraySet; +import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import com.android.server.IpSecService.TunnelInterfaceRecord; @@ -82,6 +84,7 @@ import java.util.Set; /** Unit tests for {@link IpSecService}. */ @SmallTest @RunWith(Parameterized.class) +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class IpSecServiceParameterizedTest { 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..0e3b03c97a 100644 --- a/tests/unit/java/com/android/server/IpSecServiceRefcountedResourceTest.java +++ b/tests/unit/java/com/android/server/IpSecServiceRefcountedResourceTest.java @@ -30,9 +30,11 @@ 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.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -52,6 +54,7 @@ import java.util.concurrent.ThreadLocalRandom; /** Unit tests for {@link IpSecService.RefcountedResource}. */ @SmallTest @RunWith(AndroidJUnit4.class) +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..2dc21c0634 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; @@ -50,6 +51,7 @@ import android.system.Os; import android.system.StructStat; import android.util.Range; +import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -71,6 +73,7 @@ import java.util.List; /** Unit tests for {@link IpSecService}. */ @SmallTest @RunWith(AndroidJUnit4.class) +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..750703cc70 100644 --- a/tests/unit/java/com/android/server/LegacyTypeTrackerTest.kt +++ b/tests/unit/java/com/android/server/LegacyTypeTrackerTest.kt @@ -43,7 +43,9 @@ 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.SdkSuppress import androidx.test.filters.SmallTest import androidx.test.runner.AndroidJUnit4 import com.android.server.ConnectivityService.LegacyTypeTracker @@ -66,6 +68,7 @@ const val UNSUPPORTED_TYPE = TYPE_WIMAX @RunWith(AndroidJUnit4::class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..5c43197696 100644 --- a/tests/unit/java/com/android/server/NetIdManagerTest.kt +++ b/tests/unit/java/com/android/server/NetIdManagerTest.kt @@ -16,6 +16,8 @@ package com.android.server +import android.os.Build +import androidx.test.filters.SdkSuppress import androidx.test.filters.SmallTest import androidx.test.runner.AndroidJUnit4 import com.android.server.NetIdManager.MIN_NET_ID @@ -27,6 +29,7 @@ import kotlin.test.assertEquals @RunWith(AndroidJUnit4::class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..32a8f3bec7 100644 --- a/tests/unit/java/com/android/server/NetworkManagementServiceTest.java +++ b/tests/unit/java/com/android/server/NetworkManagementServiceTest.java @@ -38,12 +38,14 @@ 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.filters.SdkSuppress; import androidx.test.runner.AndroidJUnit4; import com.android.internal.app.IBatteryStats; @@ -66,6 +68,7 @@ import java.util.function.BiFunction; */ @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..5ea0e8ea6a 100644 --- a/tests/unit/java/com/android/server/NsdServiceTest.java +++ b/tests/unit/java/com/android/server/NsdServiceTest.java @@ -31,11 +31,13 @@ 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.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -58,6 +60,7 @@ import org.mockito.Spy; // - test NSD_ON ENABLE/DISABLED listening @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..9f0c9d6a4f 100644 --- a/tests/unit/java/com/android/server/connectivity/DnsManagerTest.java +++ b/tests/unit/java/com/android/server/connectivity/DnsManagerTest.java @@ -55,10 +55,12 @@ 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.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -85,6 +87,7 @@ import java.util.Arrays; */ @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..02f3da78de 100644 --- a/tests/unit/java/com/android/server/connectivity/FullScoreTest.kt +++ b/tests/unit/java/com/android/server/connectivity/FullScoreTest.kt @@ -19,8 +19,10 @@ 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.SdkSuppress import androidx.test.filters.SmallTest import androidx.test.runner.AndroidJUnit4 import com.android.server.connectivity.FullScore.MAX_CS_MANAGED_POLICY @@ -40,6 +42,7 @@ import kotlin.test.assertTrue @RunWith(AndroidJUnit4::class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..d6acea1dc2 100644 --- a/tests/unit/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java +++ b/tests/unit/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java @@ -42,8 +42,10 @@ 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.filters.SdkSuppress; import androidx.test.runner.AndroidJUnit4; import com.android.server.connectivity.metrics.nano.IpConnectivityLogClass.IpConnectivityEvent; @@ -57,6 +59,7 @@ import java.util.List; // TODO: instead of comparing textpb to textpb, parse textpb and compare proto to proto. @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..d0038a4855 100644 --- a/tests/unit/java/com/android/server/connectivity/IpConnectivityMetricsTest.java +++ b/tests/unit/java/com/android/server/connectivity/IpConnectivityMetricsTest.java @@ -45,11 +45,13 @@ 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.filters.SdkSuppress; import androidx.test.runner.AndroidJUnit4; import com.android.internal.util.BitUtils; @@ -67,6 +69,7 @@ import java.io.StringWriter; @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..3f3bfddd22 100644 --- a/tests/unit/java/com/android/server/connectivity/LingerMonitorTest.java +++ b/tests/unit/java/com/android/server/connectivity/LingerMonitorTest.java @@ -43,8 +43,10 @@ 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.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -61,6 +63,7 @@ import org.mockito.MockitoAnnotations; @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..f8ef31ceb3 100644 --- a/tests/unit/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java +++ b/tests/unit/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java @@ -54,6 +54,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; @@ -62,6 +63,7 @@ import android.test.mock.MockContentResolver; import android.util.DataUnit; import android.util.RecurrenceRule; +import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -89,6 +91,7 @@ import java.time.temporal.ChronoUnit; @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..9204d14dbb 100644 --- a/tests/unit/java/com/android/server/connectivity/Nat464XlatTest.java +++ b/tests/unit/java/com/android/server/connectivity/Nat464XlatTest.java @@ -40,9 +40,11 @@ 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.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -58,6 +60,7 @@ import org.mockito.MockitoAnnotations; @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..8aad1a2564 100644 --- a/tests/unit/java/com/android/server/connectivity/NetdEventListenerServiceTest.java +++ b/tests/unit/java/com/android/server/connectivity/NetdEventListenerServiceTest.java @@ -31,10 +31,12 @@ 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.filters.SdkSuppress; import androidx.test.runner.AndroidJUnit4; import com.android.server.connectivity.metrics.nano.IpConnectivityLogClass.IpConnectivityEvent; @@ -54,6 +56,7 @@ import java.util.List; @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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 3adf08c199..160068f70c 100644 --- a/tests/unit/java/com/android/server/connectivity/NetworkNotificationManagerTest.java +++ b/tests/unit/java/com/android/server/connectivity/NetworkNotificationManagerTest.java @@ -39,9 +39,11 @@ 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.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -49,9 +51,7 @@ import com.android.connectivity.resources.R; import com.android.server.connectivity.NetworkNotificationManager.NotificationType; 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; @@ -67,6 +67,7 @@ import java.util.List; @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..d12f1c0b24 100644 --- a/tests/unit/java/com/android/server/connectivity/NetworkOfferTest.kt +++ b/tests/unit/java/com/android/server/connectivity/NetworkOfferTest.kt @@ -20,6 +20,8 @@ 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.SdkSuppress import androidx.test.filters.SmallTest import androidx.test.runner.AndroidJUnit4 import org.junit.Test @@ -34,6 +36,7 @@ const val POLICY_NONE = 0L @RunWith(AndroidJUnit4::class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") class NetworkOfferTest { val mockCallback = mock(INetworkOfferCallback::class.java) diff --git a/tests/unit/java/com/android/server/connectivity/NetworkRankerTest.kt b/tests/unit/java/com/android/server/connectivity/NetworkRankerTest.kt index 4408958734..c35b60e94e 100644 --- a/tests/unit/java/com/android/server/connectivity/NetworkRankerTest.kt +++ b/tests/unit/java/com/android/server/connectivity/NetworkRankerTest.kt @@ -24,11 +24,11 @@ import android.net.NetworkScore.POLICY_EXITING import android.net.NetworkScore.POLICY_TRANSPORT_PRIMARY import android.net.NetworkScore.POLICY_YIELD_TO_BAD_WIFI import android.os.Build +import androidx.test.filters.SdkSuppress import androidx.test.filters.SmallTest +import androidx.test.runner.AndroidJUnit4 import com.android.server.connectivity.FullScore.POLICY_EVER_VALIDATED_NOT_AVOIDED_WHEN_BAD import com.android.server.connectivity.FullScore.POLICY_IS_VALIDATED -import com.android.testutils.DevSdkIgnoreRule -import com.android.testutils.DevSdkIgnoreRunner import org.junit.Test import org.junit.runner.RunWith import kotlin.test.assertEquals @@ -38,8 +38,8 @@ private fun score(vararg policies: Int) = FullScore(0, private fun caps(transport: Int) = NetworkCapabilities.Builder().addTransportType(transport).build() @SmallTest -@RunWith(DevSdkIgnoreRunner::class) -@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) +@RunWith(AndroidJUnit4::class) +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") class NetworkRankerTest { private val mRanker = NetworkRanker() diff --git a/tests/unit/java/com/android/server/connectivity/PermissionMonitorTest.java b/tests/unit/java/com/android/server/connectivity/PermissionMonitorTest.java index 8b457556f0..7c733da4bd 100644 --- a/tests/unit/java/com/android/server/connectivity/PermissionMonitorTest.java +++ b/tests/unit/java/com/android/server/connectivity/PermissionMonitorTest.java @@ -79,6 +79,7 @@ import android.util.ArraySet; import android.util.SparseIntArray; import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -100,6 +101,7 @@ import java.util.Set; @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..6971b3ca89 100644 --- a/tests/unit/java/com/android/server/connectivity/VpnTest.java +++ b/tests/unit/java/com/android/server/connectivity/VpnTest.java @@ -82,6 +82,7 @@ import android.net.VpnService; import android.net.VpnTransportInfo; import android.net.ipsec.ike.IkeSessionCallback; import android.net.ipsec.ike.exceptions.IkeProtocolException; +import android.os.Build; import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.os.ConditionVariable; @@ -96,6 +97,7 @@ import android.util.ArrayMap; import android.util.ArraySet; import android.util.Range; +import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -140,6 +142,7 @@ import java.util.stream.Stream; */ @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..84a1a8fadb 100644 --- a/tests/unit/java/com/android/server/net/NetworkStatsAccessTest.java +++ b/tests/unit/java/com/android/server/net/NetworkStatsAccessTest.java @@ -25,8 +25,10 @@ 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.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -41,6 +43,7 @@ import org.mockito.MockitoAnnotations; @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..57f48f508c 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; @@ -50,6 +51,7 @@ import android.text.format.DateUtils; import android.util.RecurrenceRule; import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -81,6 +83,7 @@ import java.util.List; */ @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..4c80678b71 100644 --- a/tests/unit/java/com/android/server/net/NetworkStatsFactoryTest.java +++ b/tests/unit/java/com/android/server/net/NetworkStatsFactoryTest.java @@ -37,8 +37,10 @@ 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.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -62,6 +64,7 @@ import java.io.OutputStream; /** Tests for {@link NetworkStatsFactory}. */ @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..7e8081b6d6 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; @@ -50,6 +51,7 @@ import android.os.UserHandle; import android.telephony.TelephonyManager; import android.util.ArrayMap; +import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -70,6 +72,7 @@ import java.util.Objects; */ @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..9b2c278ecf 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; @@ -113,6 +114,7 @@ import android.telephony.TelephonyManager; import androidx.annotation.Nullable; import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -148,6 +150,7 @@ import java.util.concurrent.Executor; */ @RunWith(AndroidJUnit4.class) @SmallTest +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..f30a9c5e1a 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; @@ -41,6 +42,8 @@ import android.telephony.ServiceState; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; +import androidx.test.filters.SdkSuppress; + import com.android.internal.util.CollectionUtils; import com.android.server.net.NetworkStatsSubscriptionsMonitor.RatTypeListener; @@ -58,6 +61,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.Executors; @RunWith(JUnit4.class) +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") 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..406fdd856b 100644 --- a/tests/unit/java/com/android/server/net/ipmemorystore/NetworkAttributesTest.java +++ b/tests/unit/java/com/android/server/net/ipmemorystore/NetworkAttributesTest.java @@ -20,7 +20,9 @@ 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.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -35,6 +37,7 @@ import java.util.Arrays; /** Unit tests for {@link NetworkAttributes}. */ @SmallTest @RunWith(AndroidJUnit4.class) +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class NetworkAttributesTest { private static final String WEIGHT_FIELD_NAME_PREFIX = "WEIGHT_"; private static final float EPSILON = 0.0001f;