diff --git a/gax-java/gax-httpjson/src/test/java/com/google/api/gax/httpjson/RetryingTest.java b/gax-java/gax-httpjson/src/test/java/com/google/api/gax/httpjson/RetryingTest.java index 238fc97b63..7c35ef72fa 100644 --- a/gax-java/gax-httpjson/src/test/java/com/google/api/gax/httpjson/RetryingTest.java +++ b/gax-java/gax-httpjson/src/test/java/com/google/api/gax/httpjson/RetryingTest.java @@ -152,7 +152,6 @@ void retry() { assertThat(tracerFactory.getInstance().getAttemptsFailed().get()).isEqualTo(3); assertThat(tracerFactory.getInstance().getAttemptsStarted().get()).isEqualTo(4); assertThat(tracerFactory.getInstance().getOperationFailed().get()).isFalse(); - assertThat(tracerFactory.getInstance().getRetriesExhausted().get()).isFalse(); // Capture the argument passed to futureCall ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(Integer.class); @@ -192,7 +191,6 @@ void retryTotalTimeoutExceeded() { assertThrows(ApiException.class, () -> callable.call(initialRequest)); assertThat(tracerFactory.getInstance().getAttemptsStarted().get()).isEqualTo(1); assertThat(tracerFactory.getInstance().getAttemptsFailed().get()).isEqualTo(0); - assertThat(tracerFactory.getInstance().getRetriesExhausted().get()).isFalse(); assertThat(tracerFactory.getInstance().getOperationFailed().get()).isTrue(); // Capture the argument passed to futureCall ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(Integer.class); @@ -216,7 +214,6 @@ void retryMaxAttemptsExceeded() { assertThrows(ApiException.class, () -> callable.call(initialRequest)); assertThat(tracerFactory.getInstance().getAttemptsStarted().get()).isEqualTo(2); assertThat(tracerFactory.getInstance().getAttemptsFailed().get()).isEqualTo(1); - assertThat(tracerFactory.getInstance().getRetriesExhausted().get()).isTrue(); assertThat(tracerFactory.getInstance().getOperationFailed().get()).isTrue(); // Capture the argument passed to futureCall ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(Integer.class); @@ -240,7 +237,6 @@ void retryWithinMaxAttempts() { assertThat(callable.call(initialRequest)).isEqualTo(2); assertThat(tracerFactory.getInstance().getAttemptsStarted().get()).isEqualTo(3); assertThat(tracerFactory.getInstance().getAttemptsFailed().get()).isEqualTo(2); - assertThat(tracerFactory.getInstance().getRetriesExhausted().get()).isFalse(); assertThat(tracerFactory.getInstance().getOperationFailed().get()).isFalse(); // Capture the argument passed to futureCall ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(Integer.class); @@ -270,7 +266,6 @@ void retryOnStatusUnknown() { assertThat(callable.call(initialRequest)).isEqualTo(2); assertThat(tracerFactory.getInstance().getAttemptsStarted().get()).isEqualTo(4); assertThat(tracerFactory.getInstance().getAttemptsFailed().get()).isEqualTo(3); - assertThat(tracerFactory.getInstance().getRetriesExhausted().get()).isFalse(); assertThat(tracerFactory.getInstance().getOperationFailed().get()).isFalse(); // Capture the argument passed to futureCall ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(Integer.class); @@ -292,7 +287,6 @@ void retryOnUnexpectedException() { ApiException exception = assertThrows(ApiException.class, () -> callable.call(initialRequest)); assertThat(tracerFactory.getInstance().getAttemptsStarted().get()).isEqualTo(1); assertThat(tracerFactory.getInstance().getAttemptsFailed().get()).isEqualTo(0); - assertThat(tracerFactory.getInstance().getRetriesExhausted().get()).isFalse(); assertThat(tracerFactory.getInstance().getOperationFailed().get()).isTrue(); assertThat(exception).hasCauseThat().isSameInstanceAs(throwable); // Capture the argument passed to futureCall @@ -325,7 +319,6 @@ void retryNoRecover() { ApiException exception = assertThrows(ApiException.class, () -> callable.call(initialRequest)); assertThat(tracerFactory.getInstance().getAttemptsStarted().get()).isEqualTo(1); assertThat(tracerFactory.getInstance().getAttemptsFailed().get()).isEqualTo(0); - assertThat(tracerFactory.getInstance().getRetriesExhausted().get()).isFalse(); assertThat(tracerFactory.getInstance().getOperationFailed().get()).isTrue(); assertThat(exception).isSameInstanceAs(apiException); // Capture the argument passed to futureCall @@ -359,7 +352,6 @@ void retryKeepFailing() { assertThat(tracerFactory.getInstance().getAttemptsFailed().get()).isGreaterThan(0); assertThat(tracerFactory.getInstance().getAttemptsFailed().get()) .isEqualTo(tracerFactory.getInstance().getAttemptsStarted().get() - 1); - assertThat(tracerFactory.getInstance().getRetriesExhausted().get()).isTrue(); assertThat(tracerFactory.getInstance().getOperationFailed().get()).isTrue(); assertThat(exception).hasCauseThat().isInstanceOf(ApiException.class); assertThat(exception).hasCauseThat().hasMessageThat().contains("Unavailable"); @@ -403,7 +395,6 @@ void testKnownStatusCode() { assertThrows(FailedPreconditionException.class, () -> callable.call(initialRequest)); assertThat(tracerFactory.getInstance().getAttemptsStarted().get()).isEqualTo(1); assertThat(tracerFactory.getInstance().getAttemptsFailed().get()).isEqualTo(0); - assertThat(tracerFactory.getInstance().getRetriesExhausted().get()).isFalse(); assertThat(tracerFactory.getInstance().getOperationFailed().get()).isTrue(); assertThat(exception.getStatusCode().getTransportCode()) .isEqualTo(HTTP_CODE_PRECONDITION_FAILED); @@ -431,7 +422,6 @@ void testUnknownStatusCode() { assertThat(exception).hasMessageThat().isEqualTo("java.lang.RuntimeException: unknown"); assertThat(tracerFactory.getInstance().getAttemptsStarted().get()).isEqualTo(1); assertThat(tracerFactory.getInstance().getAttemptsFailed().get()).isEqualTo(0); - assertThat(tracerFactory.getInstance().getRetriesExhausted().get()).isFalse(); assertThat(tracerFactory.getInstance().getOperationFailed().get()).isTrue(); // Capture the argument passed to futureCall ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(Integer.class); diff --git a/gax-java/gax-httpjson/src/test/java/com/google/api/gax/httpjson/testing/TestApiTracer.java b/gax-java/gax-httpjson/src/test/java/com/google/api/gax/httpjson/testing/TestApiTracer.java index 71a68d570c..c1d07d94ec 100644 --- a/gax-java/gax-httpjson/src/test/java/com/google/api/gax/httpjson/testing/TestApiTracer.java +++ b/gax-java/gax-httpjson/src/test/java/com/google/api/gax/httpjson/testing/TestApiTracer.java @@ -59,10 +59,6 @@ public AtomicBoolean getOperationFailed() { return operationFailed; } - public AtomicBoolean getRetriesExhausted() { - return retriesExhausted; - } - @Override public void attemptStarted(int attemptNumber) { attemptsStarted.incrementAndGet(); @@ -82,9 +78,4 @@ public void attemptFailed(Throwable error, Duration delay) { public void operationFailed(Throwable error) { operationFailed.set(true); } - - @Override - public void attemptFailedRetriesExhausted(Throwable error) { - retriesExhausted.set(true); - } };