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

Commit 4d90f237 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Gerrit Code Review
Browse files

Merge "Fix testDeclareNetworkRequestUnfulfillable on R"

parents 3ed4fd3a 16b9e6e6

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)