chore: remove usages of internal Mockito APIs (#1578)

googleapis · Dec 10, 2021 · 762bdc7 · 762bdc7
1 parent 65aed62
commit 762bdc7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/gax/src/test/java/com/google/api/gax/rpc/ApiResultRetryAlgorithmTest.java b/gax/src/test/java/com/google/api/gax/rpc/ApiResultRetryAlgorithmTest.java
@@ -36,11 +36,11 @@
 
 import com.google.api.gax.rpc.StatusCode.Code;
 import com.google.api.gax.rpc.testing.FakeStatusCode;
+import com.google.common.collect.Sets;
 import java.util.Collections;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
-import org.mockito.internal.util.collections.Sets;
 
 @RunWith(JUnit4.class)
 public class ApiResultRetryAlgorithmTest {
@@ -78,7 +78,8 @@ public void testShouldRetryWithContextWithoutRetryableCodes() {
   public void testShouldRetryWithContextWithRetryableCodes() {
     ApiCallContext context = mock(ApiCallContext.class);
     when(context.getRetryableCodes())
-        .thenReturn(Sets.newSet(StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE));
+        .thenReturn(
+            Sets.newHashSet(StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE));
 
     StatusCode unavailable = mock(StatusCode.class);
     when(unavailable.getCode()).thenReturn(Code.UNAVAILABLE);

diff --git a/gax/src/test/java/com/google/api/gax/rpc/RetryingTest.java b/gax/src/test/java/com/google/api/gax/rpc/RetryingTest.java
@@ -44,6 +44,7 @@
 import com.google.api.gax.rpc.testing.FakeStatusCode;
 import com.google.api.gax.rpc.testing.FakeTransportChannel;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
 import com.google.common.truth.Truth;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.UncheckedExecutionException;
@@ -54,7 +55,6 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.mockito.Mockito;
-import org.mockito.internal.util.collections.Sets;
 import org.threeten.bp.Duration;
 
 @RunWith(JUnit4.class)
@@ -138,7 +138,7 @@ public void retryUsingContext() {
         FAILING_RETRY_SETTINGS,
         FakeCallContext.createDefault()
             .withRetrySettings(FAST_RETRY_SETTINGS)
-            .withRetryableCodes(Sets.newSet(StatusCode.Code.INTERNAL)));
+            .withRetryableCodes(Sets.newHashSet(StatusCode.Code.INTERNAL)));
   }
 
   @Test(expected = ApiException.class)
@@ -179,7 +179,7 @@ public void retryUsingContextTotalTimeoutExceeded() {
           FAILING_RETRY_SETTINGS,
           FakeCallContext.createDefault()
               .withRetrySettings(retrySettings)
-              .withRetryableCodes(Sets.newSet(StatusCode.Code.INTERNAL)));
+              .withRetryableCodes(Sets.newHashSet(StatusCode.Code.INTERNAL)));
       fail("missing expected exception");
     } catch (ApiException e) {
       assertEquals(Code.INTERNAL, e.getStatusCode().getCode());
@@ -212,7 +212,7 @@ public void retryUsingContextMaxAttemptsExceeded() {
           FAILING_RETRY_SETTINGS,
           FakeCallContext.createDefault()
               .withRetrySettings(FAST_RETRY_SETTINGS.toBuilder().setMaxAttempts(2).build())
-              .withRetryableCodes(Sets.newSet(StatusCode.Code.INTERNAL)));
+              .withRetryableCodes(Sets.newHashSet(StatusCode.Code.INTERNAL)));
       fail("missing expected exception");
     } catch (ApiException e) {
       assertEquals(Code.INTERNAL, e.getStatusCode().getCode());
@@ -244,7 +244,7 @@ public void retryUsingContextWithinMaxAttempts() {
         FAILING_RETRY_SETTINGS,
         FakeCallContext.createDefault()
             .withRetrySettings(FAST_RETRY_SETTINGS.toBuilder().setMaxAttempts(3).build())
-            .withRetryableCodes(Sets.newSet(StatusCode.Code.INTERNAL)));
+            .withRetryableCodes(Sets.newHashSet(StatusCode.Code.INTERNAL)));
   }
 
   @Test
@@ -278,7 +278,7 @@ public void retryUsingContextWithOnlyMaxAttempts() {
         FAILING_RETRY_SETTINGS,
         FakeCallContext.createDefault()
             .withRetrySettings(retrySettings)
-            .withRetryableCodes(Sets.newSet(StatusCode.Code.INTERNAL)));
+            .withRetryableCodes(Sets.newHashSet(StatusCode.Code.INTERNAL)));
     Mockito.verify(callInt, Mockito.times(3))
         .futureCall(Mockito.<Integer>any(), Mockito.<ApiCallContext>any());
   }
@@ -363,7 +363,7 @@ public void retryUsingContextNoRecover() {
           FakeCallContext.createDefault()
               .withRetrySettings(FAST_RETRY_SETTINGS)
               .withRetryableCodes(
-                  Sets.newSet(Code.UNAVAILABLE, Code.DEADLINE_EXCEEDED, Code.UNKNOWN)));
+                  Sets.newHashSet(Code.UNAVAILABLE, Code.DEADLINE_EXCEEDED, Code.UNKNOWN)));
       Assert.fail("Callable should have thrown an exception");
     } catch (ApiException expected) {
       Truth.assertThat(expected).isSameInstanceAs(throwable);