Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16b9e6e6 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

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
parent 294dd8f1

tests/net/common/java/android/net/NetworkProviderTest.kt

+6 −3
Original line number Diff line number Diff line
@@ -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)

        doReturn(mCm).`when`(mockContext).getSystemService(Context.CONNECTIVITY_SERVICE)

        val provider = createNetworkProvider(mockContext)

        // ConnectivityManager not required at creation time

        // ConnectivityManager not required at creation time after R

        if (!isDevSdkInRange(0, Build.VERSION_CODES.R)) {

            verifyNoMoreInteractions(mockContext)

        doReturn(mCm).`when`(mockContext).getSystemService(Context.CONNECTIVITY_SERVICE)

        }



        mCm.registerNetworkProvider(provider)