diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2021-06-29 17:16:28 +0900 |
|---|---|---|
| committer | Remi NGUYEN VAN <reminv@google.com> | 2021-06-30 12:00:28 +0900 |
| commit | 154cf1da20a77176ac42faed117a48afcf840bf4 (patch) | |
| tree | 813bf2c44e560ab548d1b718f8b80cb77f3f7bfd /tests/unit/java/android/net/util/MultinetworkPolicyTrackerTest.kt | |
| parent | 57c0380135b928377113b1fe12d41f6da370a56f (diff) | |
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
Diffstat (limited to 'tests/unit/java/android/net/util/MultinetworkPolicyTrackerTest.kt')
| -rw-r--r-- | tests/unit/java/android/net/util/MultinetworkPolicyTrackerTest.kt | 7 |
1 files changed, 5 insertions, 2 deletions
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( |