From f23f6ae45be4844cd4e4d77439a2645c4b3e61cc Mon Sep 17 00:00:00 2001 From: Patrick Rohr Date: Tue, 25 Mar 2025 15:00:23 -0700 Subject: [PATCH] Move EthernetTestInterface to testutils To make it usable for integration tests not in CTS. Test: TH Change-Id: If243997f086c442d4f0ef8f3c77760fada769448 --- .../com/android/testutils}/EthernetTestInterface.kt | 7 ++----- .../android/net/cts/NsdManagerDownstreamTetheringTest.kt | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) rename {tests/cts/net/util/java/android/net/cts/util => staticlibs/testutils/devicetests/com/android/testutils}/EthernetTestInterface.kt (94%) diff --git a/tests/cts/net/util/java/android/net/cts/util/EthernetTestInterface.kt b/staticlibs/testutils/devicetests/com/android/testutils/EthernetTestInterface.kt similarity index 94% rename from tests/cts/net/util/java/android/net/cts/util/EthernetTestInterface.kt rename to staticlibs/testutils/devicetests/com/android/testutils/EthernetTestInterface.kt index 20cfa1d3f0..2dc51a3b3d 100644 --- a/tests/cts/net/util/java/android/net/cts/util/EthernetTestInterface.kt +++ b/staticlibs/testutils/devicetests/com/android/testutils/EthernetTestInterface.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.net.cts.util +package com.android.testutils import android.Manifest.permission.NETWORK_SETTINGS import android.content.Context @@ -24,13 +24,10 @@ import android.net.EthernetManager.STATE_ABSENT import android.net.EthernetManager.STATE_LINK_UP import android.net.IpConfiguration import android.net.TestNetworkInterface -import android.net.cts.util.EthernetTestInterface.EthernetStateListener.CallbackEntry.InterfaceStateChanged import android.os.Handler import android.util.Log import com.android.net.module.util.ArrayTrackRecord -import com.android.testutils.PollPacketReader -import com.android.testutils.runAsShell -import com.android.testutils.waitForIdle +import com.android.testutils.EthernetTestInterface.EthernetStateListener.CallbackEntry.InterfaceStateChanged import java.net.NetworkInterface import kotlin.concurrent.Volatile import kotlin.test.assertNotNull diff --git a/tests/cts/net/src/android/net/cts/NsdManagerDownstreamTetheringTest.kt b/tests/cts/net/src/android/net/cts/NsdManagerDownstreamTetheringTest.kt index 19738994c7..19a40f9502 100644 --- a/tests/cts/net/src/android/net/cts/NsdManagerDownstreamTetheringTest.kt +++ b/tests/cts/net/src/android/net/cts/NsdManagerDownstreamTetheringTest.kt @@ -20,7 +20,6 @@ import android.net.LinkAddress import android.net.TetheringManager.CONNECTIVITY_SCOPE_LOCAL import android.net.TetheringManager.TETHERING_ETHERNET import android.net.TetheringManager.TetheringRequest -import android.net.cts.util.EthernetTestInterface import android.net.nsd.NsdManager import android.os.Build import android.os.Handler @@ -31,6 +30,7 @@ import com.android.testutils.AutoCloseTestInterfaceRule import com.android.testutils.ConnectivityModuleTest import com.android.testutils.DevSdkIgnoreRule import com.android.testutils.DevSdkIgnoreRunner +import com.android.testutils.EthernetTestInterface import com.android.testutils.NsdDiscoveryRecord import com.android.testutils.pollForQuery import com.android.testutils.tryTest