diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2020-12-23 03:25:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-12-23 03:25:54 +0000 |
| commit | 4d90f237f2fb535852588f10ddec5da6f23f1aa2 (patch) | |
| tree | 15f5c8e64f810825a2f1cfcc642f51226b22708e | |
| parent | 3ed4fd3a893412639d658abd3ea15463d697fd38 (diff) | |
| parent | 16b9e6e66cfc5229002a99be874b625a051c5ba8 (diff) | |
Merge "Fix testDeclareNetworkRequestUnfulfillable on R"
| -rw-r--r-- | tests/net/common/java/android/net/NetworkProviderTest.kt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/net/common/java/android/net/NetworkProviderTest.kt b/tests/net/common/java/android/net/NetworkProviderTest.kt index 77e9f12c7152..bcc907285e35 100644 --- a/tests/net/common/java/android/net/NetworkProviderTest.kt +++ b/tests/net/common/java/android/net/NetworkProviderTest.kt @@ -29,6 +29,7 @@ import androidx.test.InstrumentationRegistry import com.android.net.module.util.ArrayTrackRecord import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo import com.android.testutils.DevSdkIgnoreRunner +import com.android.testutils.isDevSdkInRange import org.junit.After import org.junit.Before import org.junit.Test @@ -173,10 +174,12 @@ class NetworkProviderTest { @Test fun testDeclareNetworkRequestUnfulfillable() { val mockContext = mock(Context::class.java) - val provider = createNetworkProvider(mockContext) - // ConnectivityManager not required at creation time - verifyNoMoreInteractions(mockContext) doReturn(mCm).`when`(mockContext).getSystemService(Context.CONNECTIVITY_SERVICE) + val provider = createNetworkProvider(mockContext) + // ConnectivityManager not required at creation time after R + if (!isDevSdkInRange(0, Build.VERSION_CODES.R)) { + verifyNoMoreInteractions(mockContext) + } mCm.registerNetworkProvider(provider) |