diff options
Diffstat (limited to 'tests/common/java/android/net')
13 files changed, 30 insertions, 7 deletions
diff --git a/tests/common/java/android/net/IpPrefixTest.java b/tests/common/java/android/net/IpPrefixTest.java index 9f3897f19f..fef6416c37 100644 --- a/tests/common/java/android/net/IpPrefixTest.java +++ b/tests/common/java/android/net/IpPrefixTest.java @@ -30,6 +30,8 @@ import static org.junit.Assert.fail; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; +import com.android.testutils.ConnectivityModuleTest; + import org.junit.Test; import org.junit.runner.RunWith; @@ -38,6 +40,7 @@ import java.util.Random; @RunWith(AndroidJUnit4.class) @SmallTest +@ConnectivityModuleTest public class IpPrefixTest { private static InetAddress address(String addr) { diff --git a/tests/common/java/android/net/LinkAddressTest.java b/tests/common/java/android/net/LinkAddressTest.java index 053a90305c..6b04fee4ef 100644 --- a/tests/common/java/android/net/LinkAddressTest.java +++ b/tests/common/java/android/net/LinkAddressTest.java @@ -43,6 +43,7 @@ import android.os.SystemClock; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; +import com.android.testutils.ConnectivityModuleTest; import com.android.testutils.DevSdkIgnoreRule; import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo; @@ -61,6 +62,7 @@ import java.util.List; @RunWith(AndroidJUnit4.class) @SmallTest +@ConnectivityModuleTest public class LinkAddressTest { @Rule public final DevSdkIgnoreRule ignoreRule = new DevSdkIgnoreRule(); diff --git a/tests/common/java/android/net/LinkPropertiesTest.java b/tests/common/java/android/net/LinkPropertiesTest.java index 23c187e1ad..4d85a57e57 100644 --- a/tests/common/java/android/net/LinkPropertiesTest.java +++ b/tests/common/java/android/net/LinkPropertiesTest.java @@ -40,6 +40,7 @@ import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; import com.android.net.module.util.LinkPropertiesUtils.CompareResult; +import com.android.testutils.ConnectivityModuleTest; import com.android.testutils.DevSdkIgnoreRule; import com.android.testutils.DevSdkIgnoreRule.IgnoreAfter; import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo; @@ -59,6 +60,7 @@ import java.util.Set; @RunWith(AndroidJUnit4.class) @SmallTest +@ConnectivityModuleTest public class LinkPropertiesTest { @Rule public final DevSdkIgnoreRule ignoreRule = new DevSdkIgnoreRule(); diff --git a/tests/common/java/android/net/MatchAllNetworkSpecifierTest.kt b/tests/common/java/android/net/MatchAllNetworkSpecifierTest.kt index 4a5eae4062..4a4859d53b 100644 --- a/tests/common/java/android/net/MatchAllNetworkSpecifierTest.kt +++ b/tests/common/java/android/net/MatchAllNetworkSpecifierTest.kt @@ -22,14 +22,11 @@ import android.net.wifi.aware.WifiAwareNetworkSpecifier import android.os.Build import androidx.test.filters.SmallTest import androidx.test.runner.AndroidJUnit4 - +import com.android.testutils.ConnectivityModuleTest import com.android.testutils.DevSdkIgnoreRule import com.android.testutils.DevSdkIgnoreRule.IgnoreAfter import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo import com.android.testutils.assertParcelingIsLossless - -import java.lang.IllegalStateException - import org.junit.Assert.assertFalse import org.junit.Rule import org.junit.Test @@ -38,6 +35,7 @@ import org.mockito.Mockito @RunWith(AndroidJUnit4::class) @SmallTest +@ConnectivityModuleTest class MatchAllNetworkSpecifierTest { @Rule @JvmField val ignoreRule: DevSdkIgnoreRule = DevSdkIgnoreRule() diff --git a/tests/common/java/android/net/NetworkAgentConfigTest.kt b/tests/common/java/android/net/NetworkAgentConfigTest.kt index 63c0a09521..b339a271ef 100644 --- a/tests/common/java/android/net/NetworkAgentConfigTest.kt +++ b/tests/common/java/android/net/NetworkAgentConfigTest.kt @@ -20,6 +20,7 @@ import android.os.Build import androidx.test.filters.SmallTest import androidx.test.runner.AndroidJUnit4 import com.android.modules.utils.build.SdkLevel.isAtLeastS +import com.android.testutils.ConnectivityModuleTest import com.android.testutils.DevSdkIgnoreRule import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo import com.android.testutils.assertParcelingIsLossless @@ -32,6 +33,7 @@ import org.junit.runner.RunWith @RunWith(AndroidJUnit4::class) @SmallTest +@ConnectivityModuleTest class NetworkAgentConfigTest { @Rule @JvmField val ignoreRule = DevSdkIgnoreRule() diff --git a/tests/common/java/android/net/NetworkProviderTest.kt b/tests/common/java/android/net/NetworkProviderTest.kt index ff5de1df33..3ceacf8ad6 100644 --- a/tests/common/java/android/net/NetworkProviderTest.kt +++ b/tests/common/java/android/net/NetworkProviderTest.kt @@ -32,6 +32,7 @@ import android.util.Log import androidx.test.InstrumentationRegistry import com.android.net.module.util.ArrayTrackRecord import com.android.testutils.CompatUtil +import com.android.testutils.ConnectivityModuleTest import com.android.testutils.DevSdkIgnoreRule import com.android.testutils.DevSdkIgnoreRule.IgnoreAfter import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo @@ -62,6 +63,7 @@ private val PROVIDER_NAME = "NetworkProviderTest" @RunWith(DevSdkIgnoreRunner::class) @IgnoreUpTo(Build.VERSION_CODES.Q) +@ConnectivityModuleTest class NetworkProviderTest { @Rule @JvmField val mIgnoreRule = DevSdkIgnoreRule() diff --git a/tests/common/java/android/net/NetworkSpecifierTest.kt b/tests/common/java/android/net/NetworkSpecifierTest.kt index f3409f5359..b96041769b 100644 --- a/tests/common/java/android/net/NetworkSpecifierTest.kt +++ b/tests/common/java/android/net/NetworkSpecifierTest.kt @@ -17,18 +17,20 @@ package android.net import android.os.Build import androidx.test.filters.SmallTest +import com.android.testutils.ConnectivityModuleTest import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo import com.android.testutils.DevSdkIgnoreRunner -import kotlin.test.assertTrue +import org.junit.Test +import org.junit.runner.RunWith import kotlin.test.assertEquals import kotlin.test.assertFalse import kotlin.test.assertNotEquals -import org.junit.Test -import org.junit.runner.RunWith +import kotlin.test.assertTrue @SmallTest @RunWith(DevSdkIgnoreRunner::class) @IgnoreUpTo(Build.VERSION_CODES.Q) +@ConnectivityModuleTest class NetworkSpecifierTest { private class TestNetworkSpecifier( val intData: Int = 123, diff --git a/tests/common/java/android/net/NetworkStateSnapshotTest.kt b/tests/common/java/android/net/NetworkStateSnapshotTest.kt index 99f99c9c78..0dad6a8793 100644 --- a/tests/common/java/android/net/NetworkStateSnapshotTest.kt +++ b/tests/common/java/android/net/NetworkStateSnapshotTest.kt @@ -22,6 +22,7 @@ import android.net.InetAddresses.parseNumericAddress import android.net.NetworkCapabilities.TRANSPORT_WIFI import android.os.Build import androidx.test.filters.SmallTest +import com.android.testutils.ConnectivityModuleTest import com.android.testutils.DevSdkIgnoreRule import com.android.testutils.DevSdkIgnoreRunner import com.android.testutils.assertParcelingIsLossless @@ -59,6 +60,7 @@ private val TEST_CAPABILITIES = NetworkCapabilities().apply { @SmallTest @RunWith(DevSdkIgnoreRunner::class) @DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) +@ConnectivityModuleTest class NetworkStateSnapshotTest { @Test diff --git a/tests/common/java/android/net/NetworkTest.java b/tests/common/java/android/net/NetworkTest.java index 7423c733c6..c102cb3229 100644 --- a/tests/common/java/android/net/NetworkTest.java +++ b/tests/common/java/android/net/NetworkTest.java @@ -28,6 +28,7 @@ import android.platform.test.annotations.AppModeFull; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; +import com.android.testutils.ConnectivityModuleTest; import com.android.testutils.DevSdkIgnoreRule; import com.android.testutils.DevSdkIgnoreRule.IgnoreAfter; import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo; @@ -46,6 +47,7 @@ import java.net.SocketException; @RunWith(AndroidJUnit4.class) @SmallTest +@ConnectivityModuleTest public class NetworkTest { final Network mNetwork = new Network(99); diff --git a/tests/common/java/android/net/OemNetworkPreferencesTest.java b/tests/common/java/android/net/OemNetworkPreferencesTest.java index 9ecb2edf5e..d96f80c60b 100644 --- a/tests/common/java/android/net/OemNetworkPreferencesTest.java +++ b/tests/common/java/android/net/OemNetworkPreferencesTest.java @@ -27,6 +27,7 @@ import android.os.Build; import androidx.test.filters.SmallTest; +import com.android.testutils.ConnectivityModuleTest; import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo; import com.android.testutils.DevSdkIgnoreRunner; @@ -38,6 +39,7 @@ import java.util.Map; @IgnoreUpTo(Build.VERSION_CODES.R) @RunWith(DevSdkIgnoreRunner.class) @SmallTest +@ConnectivityModuleTest public class OemNetworkPreferencesTest { private static final int TEST_PREF = OemNetworkPreferences.OEM_NETWORK_PREFERENCE_UNINITIALIZED; diff --git a/tests/common/java/android/net/RouteInfoTest.java b/tests/common/java/android/net/RouteInfoTest.java index 2fe3156ad4..5b28b841fb 100644 --- a/tests/common/java/android/net/RouteInfoTest.java +++ b/tests/common/java/android/net/RouteInfoTest.java @@ -37,6 +37,7 @@ import androidx.core.os.BuildCompat; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; +import com.android.testutils.ConnectivityModuleTest; import com.android.testutils.DevSdkIgnoreRule; import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo; @@ -50,6 +51,7 @@ import java.net.InetAddress; @RunWith(AndroidJUnit4.class) @SmallTest +@ConnectivityModuleTest public class RouteInfoTest { @Rule public final DevSdkIgnoreRule ignoreRule = new DevSdkIgnoreRule(); diff --git a/tests/common/java/android/net/UidRangeTest.java b/tests/common/java/android/net/UidRangeTest.java index a43511994f..d46fdc9ff3 100644 --- a/tests/common/java/android/net/UidRangeTest.java +++ b/tests/common/java/android/net/UidRangeTest.java @@ -35,6 +35,7 @@ import android.util.ArraySet; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; +import com.android.testutils.ConnectivityModuleTest; import com.android.testutils.DevSdkIgnoreRule; import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo; @@ -46,6 +47,7 @@ import java.util.Set; @RunWith(AndroidJUnit4.class) @SmallTest +@ConnectivityModuleTest public class UidRangeTest { /* diff --git a/tests/common/java/android/net/UnderlyingNetworkInfoTest.kt b/tests/common/java/android/net/UnderlyingNetworkInfoTest.kt index c405d8ed4a..a041c4e4aa 100644 --- a/tests/common/java/android/net/UnderlyingNetworkInfoTest.kt +++ b/tests/common/java/android/net/UnderlyingNetworkInfoTest.kt @@ -18,6 +18,7 @@ package android.net import android.os.Build import androidx.test.filters.SmallTest +import com.android.testutils.ConnectivityModuleTest import com.android.testutils.DevSdkIgnoreRule import com.android.testutils.DevSdkIgnoreRunner import com.android.testutils.assertParcelingIsLossless @@ -32,6 +33,7 @@ private val TEST_IFACE_LIST = listOf("wlan0", "rmnet_data0", "eth0") @SmallTest @RunWith(DevSdkIgnoreRunner::class) @DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) +@ConnectivityModuleTest class UnderlyingNetworkInfoTest { @Test fun testParcelUnparcel() { |