commit ad4f132c29d99c3cdb3d476c7885c4ea2660624b
author Patrick Rohr <prohr@google.com> Mon Apr 01 20:36:37 2024 -0700
committer Patrick Rohr <prohr@google.com> Tue Apr 02 14:53:30 2024 -0700
tree 8d365c64b25778589fdc2d58b85f0fd86e472651
parent ac9b287b2c2c0d6682bc65894dc06a65c06eb2aa

Call getCapabilities in setUp

Every test starts by fetching the capabilities, so it makes sense to
move it to setup.

Test: TH
Change-Id: I232355aafd91acc00079bd4efb0abd5d206d5a07

tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt

diff --git a/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt b/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt
index aab4de4..a2e4ab6 100644
--- a/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt
+++ b/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt
@@ -76,6 +76,13 @@
     private val pm by lazy { context.packageManager }
     private lateinit var ifname: String
     private lateinit var networkCallback: TestableNetworkCallback
+    private lateinit var caps: ApfCapabilities
+
+    fun getApfCapabilities(): ApfCapabilities {
+        val caps = runShellCommandOrThrow("cmd network_stack apf $ifname capabilities").trim()
+        val (version, maxLen, packetFormat) = caps.split(",").map { it.toInt() }
+        return ApfCapabilities(version, maxLen, packetFormat)
+    }
 
     @Before
     fun setUp() {
@@ -94,6 +101,7 @@
             true
         }
         runShellCommandOrThrow("cmd network_stack apf $ifname pause")
+        caps = getApfCapabilities()
     }
 
     @After
@@ -106,15 +114,8 @@
         }
     }
 
-    fun getApfCapabilities(): ApfCapabilities {
-        val caps = runShellCommandOrThrow("cmd network_stack apf $ifname capabilities").trim()
-        val (version, maxLen, packetFormat) = caps.split(",").map { it.toInt() }
-        return ApfCapabilities(version, maxLen, packetFormat)
-    }
-
     @Test
     fun testGetApfCapabilities() {
-        val caps = getApfCapabilities()
         assertThat(caps.apfVersionSupported).isEqualTo(4)
         assertThat(caps.maximumApfProgramSize).isAtLeast(1024)
         if (isVendorApiLevelNewerThan(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)) {