From b86a574fe951668c1460ccf98c0daadec0893808 Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Tue, 14 Nov 2023 22:21:28 +0900 Subject: [PATCH] Use FromS() on LocalNetworkConfig Like NetworkScore, this object is not available on R because of the absence of the tethering module. Therefore it needs to be wrapped to be protected against introspection by the test libraries. Change-Id: Ia5f84d2926433398cef33d89819a8c6588024ea0 Test: FrameworkNetTests --- .../CSKeepConnectedTest.kt | 5 +-- .../CSLocalAgentCreationTests.kt | 5 ++- .../connectivityservice/CSLocalAgentTests.kt | 32 +++++++++---------- .../base/CSAgentWrapper.kt | 4 +-- .../server/connectivityservice/base/CSTest.kt | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/tests/unit/java/com/android/server/connectivityservice/CSKeepConnectedTest.kt b/tests/unit/java/com/android/server/connectivityservice/CSKeepConnectedTest.kt index 2126a0946a..a753922379 100644 --- a/tests/unit/java/com/android/server/connectivityservice/CSKeepConnectedTest.kt +++ b/tests/unit/java/com/android/server/connectivityservice/CSKeepConnectedTest.kt @@ -47,8 +47,9 @@ class CSKeepConnectedTest : CSTest() { val keepConnectedAgent = Agent(nc = nc, score = FromS(NetworkScore.Builder() .setKeepConnectedReason(KEEP_CONNECTED_LOCAL_NETWORK) .build()), - lnc = LocalNetworkConfig.Builder().build()) - val dontKeepConnectedAgent = Agent(nc = nc, lnc = LocalNetworkConfig.Builder().build()) + lnc = FromS(LocalNetworkConfig.Builder().build())) + val dontKeepConnectedAgent = Agent(nc = nc, + lnc = FromS(LocalNetworkConfig.Builder().build())) doTestKeepConnected(keepConnectedAgent, dontKeepConnectedAgent) } diff --git a/tests/unit/java/com/android/server/connectivityservice/CSLocalAgentCreationTests.kt b/tests/unit/java/com/android/server/connectivityservice/CSLocalAgentCreationTests.kt index cfc3a3d8e0..6add6b9e55 100644 --- a/tests/unit/java/com/android/server/connectivityservice/CSLocalAgentCreationTests.kt +++ b/tests/unit/java/com/android/server/connectivityservice/CSLocalAgentCreationTests.kt @@ -49,7 +49,7 @@ private const val NO_CALLBACK_TIMEOUT_MS = 200L private fun keepConnectedScore() = FromS(NetworkScore.Builder().setKeepConnectedReason(KEEP_CONNECTED_FOR_TEST).build()) -private fun defaultLnc() = LocalNetworkConfig.Builder().build() +private fun defaultLnc() = FromS(LocalNetworkConfig.Builder().build()) @RunWith(DevSdkIgnoreRunner::class) @SmallTest @@ -124,8 +124,7 @@ class CSLocalAgentCreationTests( lnc = null) } assertFailsWith { - Agent(nc = NetworkCapabilities.Builder().build(), - lnc = LocalNetworkConfig.Builder().build()) + Agent(nc = NetworkCapabilities.Builder().build(), lnc = defaultLnc()) } } } diff --git a/tests/unit/java/com/android/server/connectivityservice/CSLocalAgentTests.kt b/tests/unit/java/com/android/server/connectivityservice/CSLocalAgentTests.kt index 1dab548890..ad21bf5149 100644 --- a/tests/unit/java/com/android/server/connectivityservice/CSLocalAgentTests.kt +++ b/tests/unit/java/com/android/server/connectivityservice/CSLocalAgentTests.kt @@ -94,7 +94,7 @@ class CSLocalAgentTests : CSTest() { } assertFailsWith { Agent(nc = NetworkCapabilities.Builder().build(), - lnc = LocalNetworkConfig.Builder().build()) + lnc = FromS(LocalNetworkConfig.Builder().build())) } } @@ -110,7 +110,7 @@ class CSLocalAgentTests : CSTest() { val agent = Agent(nc = NetworkCapabilities.Builder() .addCapability(NET_CAPABILITY_LOCAL_NETWORK) .build(), - lnc = LocalNetworkConfig.Builder().build()) + lnc = FromS(LocalNetworkConfig.Builder().build())) agent.connect() cb.expectAvailableCallbacks(agent.network, validated = false) agent.sendNetworkCapabilities(NetworkCapabilities.Builder().build()) @@ -141,7 +141,7 @@ class CSLocalAgentTests : CSTest() { val localAgent = Agent( nc = nc(TRANSPORT_WIFI, NET_CAPABILITY_LOCAL_NETWORK), lp = lp("local0"), - lnc = LocalNetworkConfig.Builder().build(), + lnc = FromS(LocalNetworkConfig.Builder().build()), ) localAgent.connect() @@ -194,11 +194,11 @@ class CSLocalAgentTests : CSTest() { // Set up a local agent that should forward its traffic to the best wifi upstream. val localAgent = Agent(nc = nc(TRANSPORT_WIFI, NET_CAPABILITY_LOCAL_NETWORK), lp = lp("local0"), - lnc = LocalNetworkConfig.Builder() + lnc = FromS(LocalNetworkConfig.Builder() .setUpstreamSelector(NetworkRequest.Builder() .addTransportType(TRANSPORT_WIFI) .build()) - .build(), + .build()), score = FromS(NetworkScore.Builder() .setKeepConnectedReason(KEEP_CONNECTED_LOCAL_NETWORK) .build()) @@ -247,11 +247,11 @@ class CSLocalAgentTests : CSTest() { // Set up a local agent that should forward its traffic to the best wifi upstream. val localAgent = Agent(nc = nc(TRANSPORT_WIFI, NET_CAPABILITY_LOCAL_NETWORK), lp = lp("local0"), - lnc = LocalNetworkConfig.Builder() + lnc = FromS(LocalNetworkConfig.Builder() .setUpstreamSelector(NetworkRequest.Builder() .addTransportType(TRANSPORT_WIFI) .build()) - .build(), + .build()), score = FromS(NetworkScore.Builder() .setKeepConnectedReason(KEEP_CONNECTED_LOCAL_NETWORK) .build()) @@ -293,11 +293,11 @@ class CSLocalAgentTests : CSTest() { cm.registerNetworkCallback(NetworkRequest.Builder().clearCapabilities().build(), cb) val localNc = nc(TRANSPORT_WIFI, NET_CAPABILITY_LOCAL_NETWORK) - val lnc = LocalNetworkConfig.Builder() + val lnc = FromS(LocalNetworkConfig.Builder() .setUpstreamSelector(NetworkRequest.Builder() .addTransportType(TRANSPORT_WIFI) .build()) - .build() + .build()) val localScore = FromS(NetworkScore.Builder().build()) // Set up a local agent that should forward its traffic to the best wifi upstream. @@ -346,11 +346,11 @@ class CSLocalAgentTests : CSTest() { wifiAgent.unregisterAfterReplacement(LONG_TIMEOUT_MS) val localAgent = Agent(nc = nc(TRANSPORT_WIFI, NET_CAPABILITY_LOCAL_NETWORK), lp = lp("local0"), - lnc = LocalNetworkConfig.Builder() + lnc = FromS(LocalNetworkConfig.Builder() .setUpstreamSelector(NetworkRequest.Builder() .addTransportType(TRANSPORT_WIFI) .build()) - .build(), + .build()), score = FromS(NetworkScore.Builder() .setKeepConnectedReason(KEEP_CONNECTED_LOCAL_NETWORK) .build()) @@ -374,11 +374,11 @@ class CSLocalAgentTests : CSTest() { fun testForwardingRules() { deps.setBuildSdk(VERSION_V) // Set up a local agent that should forward its traffic to the best DUN upstream. - val lnc = LocalNetworkConfig.Builder() + val lnc = FromS(LocalNetworkConfig.Builder() .setUpstreamSelector(NetworkRequest.Builder() .addCapability(NET_CAPABILITY_DUN) .build()) - .build() + .build()) val localAgent = Agent(nc = nc(TRANSPORT_WIFI, NET_CAPABILITY_LOCAL_NETWORK), lp = lp("local0"), lnc = lnc, @@ -426,7 +426,7 @@ class CSLocalAgentTests : CSTest() { // Make sure sending the same config again doesn't do anything repeat(5) { - localAgent.sendLocalNetworkConfig(lnc) + localAgent.sendLocalNetworkConfig(lnc.value) } inOrder.verifyNoMoreInteractions() @@ -501,13 +501,13 @@ class CSLocalAgentTests : CSTest() { } // Set up a local agent. - val lnc = LocalNetworkConfig.Builder().apply { + val lnc = FromS(LocalNetworkConfig.Builder().apply { if (haveUpstream) { setUpstreamSelector(NetworkRequest.Builder() .addTransportType(TRANSPORT_WIFI) .build()) } - }.build() + }.build()) val localAgent = Agent(nc = nc(TRANSPORT_THREAD, NET_CAPABILITY_LOCAL_NETWORK), lp = lp("local0"), lnc = lnc, diff --git a/tests/unit/java/com/android/server/connectivityservice/base/CSAgentWrapper.kt b/tests/unit/java/com/android/server/connectivityservice/base/CSAgentWrapper.kt index 013a749c7f..d41c7428d6 100644 --- a/tests/unit/java/com/android/server/connectivityservice/base/CSAgentWrapper.kt +++ b/tests/unit/java/com/android/server/connectivityservice/base/CSAgentWrapper.kt @@ -69,7 +69,7 @@ class CSAgentWrapper( nac: NetworkAgentConfig, val nc: NetworkCapabilities, val lp: LinkProperties, - val lnc: LocalNetworkConfig?, + val lnc: FromS?, val score: FromS, val provider: NetworkProvider? ) : TestableNetworkCallback.HasNetwork { @@ -101,7 +101,7 @@ class CSAgentWrapper( // Create the actual agent. NetworkAgent is abstract, so make an anonymous subclass. if (deps.isAtLeastS()) { agent = object : NetworkAgent(context, csHandlerThread.looper, TAG, - nc, lp, lnc, score.value, nac, provider) {} + nc, lp, lnc?.value, score.value, nac, provider) {} } else { agent = object : NetworkAgent(context, csHandlerThread.looper, TAG, nc, lp, 50 /* score */, nac, provider) {} diff --git a/tests/unit/java/com/android/server/connectivityservice/base/CSTest.kt b/tests/unit/java/com/android/server/connectivityservice/base/CSTest.kt index 0ccbfc3e80..103e959b45 100644 --- a/tests/unit/java/com/android/server/connectivityservice/base/CSTest.kt +++ b/tests/unit/java/com/android/server/connectivityservice/base/CSTest.kt @@ -293,7 +293,7 @@ open class CSTest { nc: NetworkCapabilities = defaultNc(), nac: NetworkAgentConfig = emptyAgentConfig(nc.getLegacyType()), lp: LinkProperties = defaultLp(), - lnc: LocalNetworkConfig? = null, + lnc: FromS? = null, score: FromS = defaultScore(), provider: NetworkProvider? = null ) = CSAgentWrapper(context, deps, csHandlerThread, networkStack,