commit 9a726855f2f1beb9f0853484d8be5bd062b36165
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 28 08:25:08 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 28 08:25:08 2022 +0000
tree e7e3e8ec9e16adfc6f95474de7dbab0cc53f7dc7
parent 601bc3689f481402a00dd9faf03b8d14eadd190c
parent cd04d83e68f562f984c52ced0733b8638f2c4314

Merge "[Feature sync] Fix flaky test in MdnsSocketClientTests"

tests/unit/java/com/android/server/connectivity/mdns/MdnsSocketClientTests.java

diff --git a/tests/unit/java/com/android/server/connectivity/mdns/MdnsSocketClientTests.java b/tests/unit/java/com/android/server/connectivity/mdns/MdnsSocketClientTests.java
index f84ebfb..b4442a5 100644
--- a/tests/unit/java/com/android/server/connectivity/mdns/MdnsSocketClientTests.java
+++ b/tests/unit/java/com/android/server/connectivity/mdns/MdnsSocketClientTests.java
@@ -24,6 +24,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.never;
@@ -513,11 +514,8 @@
         mdnsClient.setCallback(mockCallback);
         mdnsClient.startDiscovery();
 
-        ArgumentCaptor<MdnsResponse> mdnsResponseCaptor =
-                ArgumentCaptor.forClass(MdnsResponse.class);
-        verify(mockCallback, timeout(TIMEOUT).atLeast(1))
-                .onResponseReceived(mdnsResponseCaptor.capture());
-        assertEquals(21, mdnsResponseCaptor.getValue().getInterfaceIndex());
+        verify(mockCallback, timeout(TIMEOUT).atLeastOnce())
+                .onResponseReceived(argThat(response -> response.getInterfaceIndex() == 21));
     }
 
     @Test