commit 4eb7a669e5ec377de87edcf48b7f7cdb63575a5b
author Xiao Ma <xiaom@google.com> Thu Apr 17 14:52:34 2025 +0900
committer Xiao Ma <xiaom@google.com> Thu Apr 17 15:56:43 2025 +0900
tree fc54d1a710a4581cc3789ef7c757221eefc0c44a
parent 3f8792c694006ed0368530b7c745233f8726bb8b

CSTest: move nc function helper to CSTestHelpers.

Flag: EXEMPT test-only change
Bug: 368416967
Test: atest ConnectivityCoverageTests
Change-Id: I022bb5ab026fefec82a4b2a260b9167ef7891e96

tests/unit/java/com/android/server/connectivityservice/base/CSTest.kt

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 c236ea5..11128b6 100644
--- a/tests/unit/java/com/android/server/connectivityservice/base/CSTest.kt
+++ b/tests/unit/java/com/android/server/connectivityservice/base/CSTest.kt
@@ -605,13 +605,6 @@
         NetworkScore.Builder().setKeepConnectedReason(KEEP_CONNECTED_FOR_TEST).build()
     )
 
-    fun nc(transport: Int, vararg caps: Int) = defaultNc().apply {
-        addTransportType(transport)
-        caps.forEach {
-            addCapability(it)
-        }
-    }
-
     // Create a network agent with the given parameters.
     fun createAgent(interfaceName: String, transport: Int, vararg caps: Int): CSAgentWrapper {
         return Agent(

tests/unit/java/com/android/server/connectivityservice/base/CSTestHelpers.kt

diff --git a/tests/unit/java/com/android/server/connectivityservice/base/CSTestHelpers.kt b/tests/unit/java/com/android/server/connectivityservice/base/CSTestHelpers.kt
index 9e5ca68..827d737 100644
--- a/tests/unit/java/com/android/server/connectivityservice/base/CSTestHelpers.kt
+++ b/tests/unit/java/com/android/server/connectivityservice/base/CSTestHelpers.kt
@@ -84,6 +84,13 @@
         .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED)
         .build()
 
+internal fun nc(transport: Int, vararg caps: Int) = defaultNc().apply {
+    addTransportType(transport)
+    caps.forEach {
+        addCapability(it)
+    }
+}
+
 internal fun defaultScore() = FromS(NetworkScore.Builder().build())
 
 internal fun keepConnectedScore() = FromS(NetworkScore.Builder()