From f41687cae13d6b424e6c1603784b7f9b745839d5 Mon Sep 17 00:00:00 2001 From: Xiao Ma Date: Mon, 31 Mar 2025 18:40:42 +0900 Subject: [PATCH] De-duplicate the lp func with the default lp. Flag: EXEMPT test-only change Bug: 368416967 Test: atest ConnectivityCoverageTests Change-Id: I59436a257bea3b0e50b2b532b64f21ca5102f610 --- .../connectivityservice/CSCaptivePortalAppTest.kt | 14 ++------------ .../connectivityservice/CSLocalAgentTests.kt | 10 +--------- .../connectivityservice/CSSatelliteNetworkTest.kt | 12 +----------- 3 files changed, 4 insertions(+), 32 deletions(-) diff --git a/tests/unit/java/com/android/server/connectivityservice/CSCaptivePortalAppTest.kt b/tests/unit/java/com/android/server/connectivityservice/CSCaptivePortalAppTest.kt index ae544d5ee1..a75803fc3f 100644 --- a/tests/unit/java/com/android/server/connectivityservice/CSCaptivePortalAppTest.kt +++ b/tests/unit/java/com/android/server/connectivityservice/CSCaptivePortalAppTest.kt @@ -23,9 +23,6 @@ import android.content.pm.PackageManager.PERMISSION_GRANTED import android.net.CaptivePortal import android.net.ConnectivityManager.ACTION_CAPTIVE_PORTAL_SIGN_IN import android.net.ConnectivityManager.EXTRA_CAPTIVE_PORTAL -import android.net.IpPrefix -import android.net.LinkAddress -import android.net.LinkProperties import android.net.NetworkCapabilities import android.net.NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL import android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET @@ -36,7 +33,6 @@ import android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED import android.net.NetworkCapabilities.TRANSPORT_WIFI import android.net.NetworkRequest import android.net.NetworkStack -import android.net.RouteInfo import android.os.Build import android.os.Bundle import androidx.test.filters.SmallTest @@ -62,12 +58,6 @@ private fun nc(transport: Int, vararg caps: Int) = NetworkCapabilities.Builder() addCapability(NET_CAPABILITY_NOT_VCN_MANAGED) }.build() -private fun lp(iface: String) = LinkProperties().apply { - interfaceName = iface - addLinkAddress(LinkAddress(LOCAL_IPV4_ADDRESS, 32)) - addRoute(RouteInfo(IpPrefix("0.0.0.0/0"), null, null)) -} - @DevSdkIgnoreRunner.MonitorThreadLeak @RunWith(DevSdkIgnoreRunner::class) @SmallTest @@ -101,8 +91,8 @@ class CSCaptivePortalAppTest : CSTest() { private fun createWifiAgent(): CSAgentWrapper { return Agent( score = keepScore(), - lp = lp(WIFI_IFACE), - nc = nc(TRANSPORT_WIFI, NET_CAPABILITY_INTERNET) + lp = defaultLp().apply { interfaceName = WIFI_IFACE }, + nc = nc(TRANSPORT_WIFI, NET_CAPABILITY_INTERNET) ) } diff --git a/tests/unit/java/com/android/server/connectivityservice/CSLocalAgentTests.kt b/tests/unit/java/com/android/server/connectivityservice/CSLocalAgentTests.kt index 5a7eda8459..6fd40e8864 100644 --- a/tests/unit/java/com/android/server/connectivityservice/CSLocalAgentTests.kt +++ b/tests/unit/java/com/android/server/connectivityservice/CSLocalAgentTests.kt @@ -16,9 +16,6 @@ package com.android.server -import android.net.IpPrefix -import android.net.LinkAddress -import android.net.LinkProperties import android.net.LocalNetworkConfig import android.net.MulticastRoutingConfig import android.net.MulticastRoutingConfig.CONFIG_FORWARD_NONE @@ -36,7 +33,6 @@ import android.net.NetworkCapabilities.TRANSPORT_WIFI import android.net.NetworkRequest import android.net.NetworkScore import android.net.NetworkScore.KEEP_CONNECTED_LOCAL_NETWORK -import android.net.RouteInfo import android.net.connectivity.ConnectivityCompatChanges.ENABLE_MATCH_LOCAL_NETWORK import android.net.connectivity.ConnectivityCompatChanges.ENABLE_MATCH_NON_THREAD_LOCAL_NETWORKS import android.os.Build @@ -72,11 +68,7 @@ private fun nc(transport: Int, vararg caps: Int) = NetworkCapabilities.Builder() addCapability(NET_CAPABILITY_NOT_VCN_MANAGED) }.build() -private fun lp(iface: String) = LinkProperties().apply { - interfaceName = iface - addLinkAddress(LinkAddress(LOCAL_IPV4_ADDRESS, 32)) - addRoute(RouteInfo(IpPrefix("0.0.0.0/0"), null, null)) -} +private fun lp(iface: String) = defaultLp().apply { interfaceName = iface } @DevSdkIgnoreRunner.MonitorThreadLeak @RunWith(DevSdkIgnoreRunner::class) diff --git a/tests/unit/java/com/android/server/connectivityservice/CSSatelliteNetworkTest.kt b/tests/unit/java/com/android/server/connectivityservice/CSSatelliteNetworkTest.kt index a6181d9caf..92dd45eb59 100644 --- a/tests/unit/java/com/android/server/connectivityservice/CSSatelliteNetworkTest.kt +++ b/tests/unit/java/com/android/server/connectivityservice/CSSatelliteNetworkTest.kt @@ -17,9 +17,6 @@ package com.android.server import android.net.INetd -import android.net.IpPrefix -import android.net.LinkAddress -import android.net.LinkProperties import android.net.NativeNetworkConfig import android.net.NativeNetworkType import android.net.NetworkCapabilities @@ -30,7 +27,6 @@ import android.net.NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING import android.net.NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED import android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED import android.net.NetworkCapabilities.TRANSPORT_SATELLITE -import android.net.RouteInfo import android.net.UidRange import android.net.UidRangeParcel import android.net.VpnManager @@ -255,7 +251,7 @@ class CSSatelliteNetworkTest : CSTest() { private fun createSatelliteAgent(name: String, restricted: Boolean = true): CSAgentWrapper { return Agent( score = keepScore(), - lp = lp(name), + lp = defaultLp().apply { interfaceName = name }, nc = satelliteNc(restricted) ) } @@ -293,10 +289,4 @@ class CSSatelliteNetworkTest : CSTest() { } removeCapability(NET_CAPABILITY_NOT_BANDWIDTH_CONSTRAINED) }.build() - - private fun lp(iface: String) = LinkProperties().apply { - interfaceName = iface - addLinkAddress(LinkAddress(LOCAL_IPV4_ADDRESS, 32)) - addRoute(RouteInfo(IpPrefix("0.0.0.0/0"), null, null)) - } }