xds: replace verifyNoMoreInteractions with verifyNoInteractions (grpc…

…#7320)
dfawley · Jan 15, 2021 · 410f4c9 · 410f4c9
1 parent 463fdb5
commit 410f4c9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/xds/src/test/java/io/grpc/xds/XdsClientImplTest.java b/xds/src/test/java/io/grpc/xds/XdsClientImplTest.java
@@ -38,6 +38,7 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
@@ -1864,8 +1865,7 @@ public void addRemoveClusterWatcherWhileInitialResourceFetchInProgress() {
     assertThat(fakeClock.getPendingTasks(CDS_RESOURCE_FETCH_TIMEOUT_TASK_FILTER)).isEmpty();
     assertThat(timeoutTask.isCancelled()).isTrue();
 
-    // TODO(chengyuanzhang): migrate to verifyNoInteractions.
-    verifyNoMoreInteractions(watcher3, watcher4);
+    verifyNoInteractions(watcher3, watcher4);
   }
 
   @Test
@@ -2132,8 +2132,7 @@ public void multipleEndpointWatchers() {
                     new LbEndpoint("192.168.0.1", 8080,
                         2, true)), 1, 0));
 
-    // TODO(chengyuanzhang): migrate to verifyNoInteractions.
-    verifyNoMoreInteractions(watcher3);
+    verifyNoInteractions(watcher3);
 
     // Management server sends back another EDS response contains ClusterLoadAssignment for the
     // other requested cluster.
@@ -2517,8 +2516,7 @@ public void addRemoveEndpointWatcherWhileInitialResourceFetchInProgress() {
     assertThat(fakeClock.getPendingTasks(EDS_RESOURCE_FETCH_TIMEOUT_TASK_FILTER)).isEmpty();
     assertThat(timeoutTask.isCancelled()).isTrue();
 
-    // TODO(chengyuanzhang): migrate to verifyNoInteractions.
-    verifyNoMoreInteractions(watcher3, watcher4);
+    verifyNoInteractions(watcher3, watcher4);
   }
 
   @Test

diff --git a/xds/src/test/java/io/grpc/xds/XdsClientImplTestV2.java b/xds/src/test/java/io/grpc/xds/XdsClientImplTestV2.java
@@ -38,6 +38,7 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
@@ -1873,8 +1874,7 @@ public void addRemoveClusterWatcherWhileInitialResourceFetchInProgress() {
     assertThat(fakeClock.getPendingTasks(CDS_RESOURCE_FETCH_TIMEOUT_TASK_FILTER)).isEmpty();
     assertThat(timeoutTask.isCancelled()).isTrue();
 
-    // TODO(chengyuanzhang): migrate to verifyNoInteractions.
-    verifyNoMoreInteractions(watcher3, watcher4);
+    verifyNoInteractions(watcher3, watcher4);
   }
 
   @Test
@@ -2141,8 +2141,7 @@ public void multipleEndpointWatchers() {
                     new LbEndpoint("192.168.0.1", 8080,
                         2, true)), 1, 0));
 
-    // TODO(chengyuanzhang): migrate to verifyNoInteractions.
-    verifyNoMoreInteractions(watcher3);
+    verifyNoInteractions(watcher3);
 
     // Management server sends back another EDS response contains ClusterLoadAssignment for the
     // other requested cluster.
@@ -2526,8 +2525,7 @@ public void addRemoveEndpointWatcherWhileInitialResourceFetchInProgress() {
     assertThat(fakeClock.getPendingTasks(EDS_RESOURCE_FETCH_TIMEOUT_TASK_FILTER)).isEmpty();
     assertThat(timeoutTask.isCancelled()).isTrue();
 
-    // TODO(chengyuanzhang): migrate to verifyNoInteractions.
-    verifyNoMoreInteractions(watcher3, watcher4);
+    verifyNoInteractions(watcher3, watcher4);
   }
 
   @Test