commit 122353616cc2ef1d7b2ffe38774ccbe0f8cf9db4
author Paul Hu <paulhu@google.com> Mon Apr 25 17:29:03 2022 +0800
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Tue May 17 02:31:58 2022 +0000
tree e72ebfb648d39f1b4577457f85f8a55ae0a5b639
parent 07f9657b5a3cbe831861c2f36c5edcc0380774d1

Fix running CtsNetTestCasesLatestSdk errors on NsdManagerTest

- All tests in NsdManagerTest would be ignored when running
  CtsNetTestCasesLatestSdk on android S devices. But
  NsdManagerTest#testNsdManager is existed before android T, it
  should not be ignored on android S devices. Besides, those
  tests can only run after android T have guarded by
  ConstantsShim check. Thus, remove DevSdkIgnoreRule on
  NsdManagerTest.
- In the legacy NsdManagerTest that covers older APIs, do not use
  newer APIs that use executors, and use only older APIs instead.

Bug: 228286975
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.\
      NsdManagerTest
Change-Id: I2b4ca568e9819dc0f476f66e43072ddbcfd75a02
(cherry picked from commit 9e2c6a4564529aa690fd78fcca0a4806c7d62064)
Merged-In: I2b4ca568e9819dc0f476f66e43072ddbcfd75a02

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

diff --git a/tests/cts/net/src/android/net/cts/NsdManagerTest.kt b/tests/cts/net/src/android/net/cts/NsdManagerTest.kt
index 7b0451f..6c5b792 100644
--- a/tests/cts/net/src/android/net/cts/NsdManagerTest.kt
+++ b/tests/cts/net/src/android/net/cts/NsdManagerTest.kt
@@ -54,7 +54,6 @@
 import com.android.net.module.util.TrackRecord
 import com.android.networkstack.apishim.ConstantsShim
 import com.android.networkstack.apishim.NsdShimImpl
-import com.android.testutils.DevSdkIgnoreRule
 import com.android.testutils.SC_V2
 import com.android.testutils.TestableNetworkAgent
 import com.android.testutils.TestableNetworkCallback
@@ -65,7 +64,6 @@
 import org.junit.Assert.assertTrue
 import org.junit.Assume.assumeTrue
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import java.net.ServerSocket
@@ -90,10 +88,6 @@
 @AppModeFull(reason = "Socket cannot bind in instant app mode")
 @RunWith(AndroidJUnit4::class)
 class NsdManagerTest {
-    // NsdManager is not updatable before S, so tests do not need to be backwards compatible
-    @get:Rule
-    val ignoreRule = DevSdkIgnoreRule(ignoreClassUpTo = SC_V2)
-
     private val context by lazy { InstrumentationRegistry.getInstrumentation().context }
     private val nsdManager by lazy { context.getSystemService(NsdManager::class.java) }
 
@@ -399,14 +393,17 @@
         si2.serviceName = serviceName
         si2.port = localPort
         val registrationRecord2 = NsdRegistrationRecord()
-        val registeredInfo2 = registerService(registrationRecord2, si2)
+        nsdManager.registerService(si2, NsdManager.PROTOCOL_DNS_SD, registrationRecord2)
+        val registeredInfo2 = registrationRecord2.expectCallback<ServiceRegistered>().serviceInfo
 
         // Expect a service record to be discovered (and filter the ones
         // that are unrelated to this test)
         val foundInfo2 = discoveryRecord.waitForServiceDiscovered(registeredInfo2.serviceName)
 
         // Resolve the service
-        val resolvedService2 = resolveService(foundInfo2)
+        val resolveRecord2 = NsdResolveRecord()
+        nsdManager.resolveService(foundInfo2, resolveRecord2)
+        val resolvedService2 = resolveRecord2.expectCallback<ServiceResolved>().serviceInfo
 
         // Check that the resolved service doesn't have any TXT records
         assertEquals(0, resolvedService2.attributes.size)