Merge "This bug was fixed in S, don't test for it in R" am: d639d12161 am: a56ea8445c

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1505171

Change-Id: I235388b4828f7fc99c9e0776cac210dce7ba425a
This commit is contained in:
Chalard Jean
2020-11-24 10:05:45 +00:00
committed by Automerger Merge Worker

View File

@@ -62,6 +62,7 @@ import androidx.test.runner.AndroidJUnit4
import com.android.internal.util.AsyncChannel import com.android.internal.util.AsyncChannel
import com.android.net.module.util.ArrayTrackRecord import com.android.net.module.util.ArrayTrackRecord
import com.android.testutils.DevSdkIgnoreRule import com.android.testutils.DevSdkIgnoreRule
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo
import com.android.testutils.RecorderCallback.CallbackEntry.Available import com.android.testutils.RecorderCallback.CallbackEntry.Available
import com.android.testutils.RecorderCallback.CallbackEntry.Lost import com.android.testutils.RecorderCallback.CallbackEntry.Lost
import com.android.testutils.TestableNetworkCallback import com.android.testutils.TestableNetworkCallback
@@ -541,6 +542,7 @@ class NetworkAgentTest {
} }
@Test @Test
@IgnoreUpTo(android.os.Build.VERSION_CODES.R)
fun testAgentStartsInConnecting() { fun testAgentStartsInConnecting() {
val mockContext = mock(Context::class.java) val mockContext = mock(Context::class.java)
val mockCm = mock(ConnectivityManager::class.java) val mockCm = mock(ConnectivityManager::class.java)