diff --git a/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt b/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt index 706f3e88b4e0e1aa5a5789f9a3c84eaad83fbd1b..3146b4190c29dde5d48c03f4c2bfd7bbf96421ff 100644 --- a/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt +++ b/tests/cts/net/src/android/net/cts/EthernetManagerTest.kt @@ -92,7 +92,6 @@ import kotlin.test.assertFalse import kotlin.test.assertNotNull import kotlin.test.assertNull import kotlin.test.assertTrue -import kotlin.test.fail import org.junit.After import org.junit.Assume.assumeFalse import org.junit.Assume.assumeTrue @@ -254,7 +253,7 @@ class EthernetManagerTest { } fun <T : CallbackEntry> expectCallback(expected: T): T { - val event = pollOrThrow() + val event = events.poll(TIMEOUT_MS) assertEquals(expected, event) return event as T } @@ -267,14 +266,10 @@ class EthernetManagerTest { expectCallback(EthernetStateChanged(state)) } - fun createChangeEvent(iface: String, state: Int, role: Int) = + private fun createChangeEvent(iface: String, state: Int, role: Int) = InterfaceStateChanged(iface, state, role, if (state != STATE_ABSENT) DEFAULT_IP_CONFIGURATION else null) - fun pollOrThrow(): CallbackEntry { - return events.poll(TIMEOUT_MS) ?: fail("Did not receive callback after ${TIMEOUT_MS}ms") - } - fun eventuallyExpect(expected: CallbackEntry) { val cb = events.poll(TIMEOUT_MS) { it == expected } assertNotNull(cb, "Never received expected $expected. Received: ${events.backtrace()}")