From a8ccfdd543e611a7a41d1bde410d254ad8d5be0a Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Wed, 9 Dec 2020 11:34:08 +0900 Subject: [PATCH] Fix testDeclareNetworkRequestUnfulfillable on R NetworkProvider does not require ConnectivityService to be started at creation time after R, but on R it is queried in the constructor. Fixes: 175164957 Test: atest FrameworksNetTests Change-Id: I435ace581668970a7d88e68f11cb37814edb79ea --- tests/net/common/java/android/net/NetworkProviderTest.kt | 9 ++++++--- 1 file 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 77e9f12c71..bcc907285e 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)