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

Commit 4534d457 authored by Aaron Huang's avatar Aaron Huang
Browse files

Add network agent to enhance NetworkProvider test 

Add network agent to test more situation that could get the
onNetworkRequested callback.

Bug: 153614605
Bug: 153613690
Bug: 153612373
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkProviderTest
Change-Id: I7f827710b47546bd4419cc1ff06f03ec4635583d
Merged-In: Id494a1697cc1b73e8e56ae585a69faec31c59f52
(cherry picked from commit 9e92e57f)
parent 448b3603

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

+33 −4
Original line number Diff line number Diff line
@@ -105,14 +105,43 @@ class NetworkProviderTest { 
                .build()

        val cb = ConnectivityManager.NetworkCallback()

        mCm.requestNetwork(nr, cb)

        provider.expectCallback<OnNetworkRequested>() {

            callback -> callback.request.getNetworkSpecifier() == specifier &&

        provider.expectCallback<OnNetworkRequested>() { callback ->

            callback.request.getNetworkSpecifier() == specifier &&

            callback.request.hasTransport(TRANSPORT_TEST)

        }



        val initialScore = 40

        val updatedScore = 60

        val nc = NetworkCapabilities().apply {

                addTransportType(NetworkCapabilities.TRANSPORT_TEST)

                removeCapability(NetworkCapabilities.NET_CAPABILITY_TRUSTED)

                removeCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)

                addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED)

                addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING)

                addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)

                setNetworkSpecifier(specifier)

        }

        val lp = LinkProperties()

        val config = NetworkAgentConfig.Builder().build()

        val agent = object : NetworkAgent(context, mHandlerThread.looper, "TestAgent", nc, lp,

                initialScore, config, provider) {}



        provider.expectCallback<OnNetworkRequested>() { callback ->

            callback.request.getNetworkSpecifier() == specifier &&

            callback.score == initialScore &&

            callback.id == agent.providerId

        }



        agent.sendNetworkScore(updatedScore)

        provider.expectCallback<OnNetworkRequested>() { callback ->

            callback.request.getNetworkSpecifier() == specifier &&

            callback.score == updatedScore &&

            callback.id == agent.providerId

        }



        mCm.unregisterNetworkCallback(cb)

        provider.expectCallback<OnNetworkRequestWithdrawn>() {

            callback -> callback.request.getNetworkSpecifier() == specifier &&

        provider.expectCallback<OnNetworkRequestWithdrawn>() { callback ->

            callback.request.getNetworkSpecifier() == specifier &&

            callback.request.hasTransport(TRANSPORT_TEST)

        }

        mCm.unregisterNetworkProvider(provider)