Skip to content

Commit e7bc1c3

Browse files
diegomarquezpdiegomarquezp
committed
formalize tests
1 parent 2df2e9f commit e7bc1c3

File tree

1 file changed

+20
-11
lines changed

1 file changed

+20
-11
lines changed

‎gax-java/gax-httpjson/src/test/java/com/google/api/gax/httpjson/RetryingTest.java

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ void retry() {
151151
assertThat(callable.call(initialRequest)).isEqualTo(2);
152152
assertThat(tracerFactory.getTracerAttemptsFailed().get()).isEqualTo(3);
153153
assertThat(tracerFactory.getTracerAttempts().get()).isEqualTo(4);
154-
assertThat(tracerFactory.getTracerOperationFailed().get()).isEqualTo(false);
155-
assertThat(tracerFactory.getTracerFailedRetriesExhausted().get()).isEqualTo(false);
154+
assertThat(tracerFactory.getTracerOperationFailed().get()).isFalse();
155+
assertThat(tracerFactory.getTracerFailedRetriesExhausted().get()).isFalse();
156156

157157
// Capture the argument passed to futureCall
158158
ArgumentCaptor<Integer> argumentCaptor = ArgumentCaptor.forClass(Integer.class);
@@ -192,7 +192,8 @@ void retryTotalTimeoutExceeded() {
192192
assertThrows(ApiException.class, () -> callable.call(initialRequest));
193193
assertThat(tracerFactory.getTracerAttempts().get()).isEqualTo(1);
194194
assertThat(tracerFactory.getTracerAttemptsFailed().get()).isEqualTo(0);
195-
assertThat(tracerFactory.getTracerOperationFailed().get()).isEqualTo(true);
195+
assertThat(tracerFactory.getTracerFailedRetriesExhausted().get()).isFalse();
196+
assertThat(tracerFactory.getTracerOperationFailed().get()).isTrue();
196197
// Capture the argument passed to futureCall
197198
ArgumentCaptor<Integer> argumentCaptor = ArgumentCaptor.forClass(Integer.class);
198199
verify(callInt, atLeastOnce()).futureCall(argumentCaptor.capture(), any(ApiCallContext.class));
@@ -215,7 +216,8 @@ void retryMaxAttemptsExceeded() {
215216
assertThrows(ApiException.class, () -> callable.call(initialRequest));
216217
assertThat(tracerFactory.getTracerAttempts().get()).isEqualTo(2);
217218
assertThat(tracerFactory.getTracerAttemptsFailed().get()).isEqualTo(1);
218-
assertThat(tracerFactory.getTracerFailedRetriesExhausted().get()).isEqualTo(true);
219+
assertThat(tracerFactory.getTracerFailedRetriesExhausted().get()).isTrue();
220+
assertThat(tracerFactory.getTracerOperationFailed().get()).isTrue();
219221
// Capture the argument passed to futureCall
220222
ArgumentCaptor<Integer> argumentCaptor = ArgumentCaptor.forClass(Integer.class);
221223
verify(callInt, atLeastOnce()).futureCall(argumentCaptor.capture(), any(ApiCallContext.class));
@@ -238,7 +240,8 @@ void retryWithinMaxAttempts() {
238240
assertThat(callable.call(initialRequest)).isEqualTo(2);
239241
assertThat(tracerFactory.getTracerAttempts().get()).isEqualTo(3);
240242
assertThat(tracerFactory.getTracerAttemptsFailed().get()).isEqualTo(2);
241-
assertThat(tracerFactory.getTracerOperationFailed().get()).isEqualTo(false);
243+
assertThat(tracerFactory.getTracerFailedRetriesExhausted().get()).isFalse();
244+
assertThat(tracerFactory.getTracerOperationFailed().get()).isFalse();
242245
// Capture the argument passed to futureCall
243246
ArgumentCaptor<Integer> argumentCaptor = ArgumentCaptor.forClass(Integer.class);
244247
verify(callInt, atLeastOnce()).futureCall(argumentCaptor.capture(), any(ApiCallContext.class));
@@ -267,7 +270,8 @@ void retryOnStatusUnknown() {
267270
assertThat(callable.call(initialRequest)).isEqualTo(2);
268271
assertThat(tracerFactory.getTracerAttempts().get()).isEqualTo(4);
269272
assertThat(tracerFactory.getTracerAttemptsFailed().get()).isEqualTo(3);
270-
assertThat(tracerFactory.getTracerOperationFailed().get()).isEqualTo(false);
273+
assertThat(tracerFactory.getTracerFailedRetriesExhausted().get()).isFalse();
274+
assertThat(tracerFactory.getTracerOperationFailed().get()).isFalse();
271275
// Capture the argument passed to futureCall
272276
ArgumentCaptor<Integer> argumentCaptor = ArgumentCaptor.forClass(Integer.class);
273277
verify(callInt, atLeastOnce()).futureCall(argumentCaptor.capture(), any(ApiCallContext.class));
@@ -288,7 +292,8 @@ void retryOnUnexpectedException() {
288292
ApiException exception = assertThrows(ApiException.class, () -> callable.call(initialRequest));
289293
assertThat(tracerFactory.getTracerAttempts().get()).isEqualTo(1);
290294
assertThat(tracerFactory.getTracerAttemptsFailed().get()).isEqualTo(0);
291-
assertThat(tracerFactory.getTracerOperationFailed().get()).isEqualTo(true);
295+
assertThat(tracerFactory.getTracerFailedRetriesExhausted().get()).isFalse();
296+
assertThat(tracerFactory.getTracerOperationFailed().get()).isTrue();
292297
assertThat(exception).hasCauseThat().isSameInstanceAs(throwable);
293298
// Capture the argument passed to futureCall
294299
ArgumentCaptor<Integer> argumentCaptor = ArgumentCaptor.forClass(Integer.class);
@@ -320,7 +325,8 @@ void retryNoRecover() {
320325
ApiException exception = assertThrows(ApiException.class, () -> callable.call(initialRequest));
321326
assertThat(tracerFactory.getTracerAttempts().get()).isEqualTo(1);
322327
assertThat(tracerFactory.getTracerAttemptsFailed().get()).isEqualTo(0);
323-
assertThat(tracerFactory.getTracerOperationFailed().get()).isEqualTo(true);
328+
assertThat(tracerFactory.getTracerFailedRetriesExhausted().get()).isFalse();
329+
assertThat(tracerFactory.getTracerOperationFailed().get()).isTrue();
324330
assertThat(exception).isSameInstanceAs(apiException);
325331
// Capture the argument passed to futureCall
326332
ArgumentCaptor<Integer> argumentCaptor = ArgumentCaptor.forClass(Integer.class);
@@ -353,7 +359,8 @@ void retryKeepFailing() {
353359
assertThat(tracerFactory.getTracerAttemptsFailed().get()).isGreaterThan(0);
354360
assertThat(tracerFactory.getTracerAttemptsFailed().get())
355361
.isEqualTo(tracerFactory.getTracerAttempts().get() - 1);
356-
assertThat(tracerFactory.getTracerFailedRetriesExhausted().get()).isEqualTo(true);
362+
assertThat(tracerFactory.getTracerFailedRetriesExhausted().get()).isTrue();
363+
assertThat(tracerFactory.getTracerOperationFailed().get()).isTrue();
357364
assertThat(exception).hasCauseThat().isInstanceOf(ApiException.class);
358365
assertThat(exception).hasCauseThat().hasMessageThat().contains("Unavailable");
359366
// Capture the argument passed to futureCall
@@ -396,7 +403,8 @@ void testKnownStatusCode() {
396403
assertThrows(FailedPreconditionException.class, () -> callable.call(initialRequest));
397404
assertThat(tracerFactory.getTracerAttempts().get()).isEqualTo(1);
398405
assertThat(tracerFactory.getTracerAttemptsFailed().get()).isEqualTo(0);
399-
assertThat(tracerFactory.getTracerOperationFailed().get()).isEqualTo(true);
406+
assertThat(tracerFactory.getTracerFailedRetriesExhausted().get()).isFalse();
407+
assertThat(tracerFactory.getTracerOperationFailed().get()).isTrue();
400408
assertThat(exception.getStatusCode().getTransportCode())
401409
.isEqualTo(HTTP_CODE_PRECONDITION_FAILED);
402410
assertThat(exception).hasMessageThat().contains("precondition failed");
@@ -423,7 +431,8 @@ void testUnknownStatusCode() {
423431
assertThat(exception).hasMessageThat().isEqualTo("java.lang.RuntimeException: unknown");
424432
assertThat(tracerFactory.getTracerAttempts().get()).isEqualTo(1);
425433
assertThat(tracerFactory.getTracerAttemptsFailed().get()).isEqualTo(0);
426-
assertThat(tracerFactory.getTracerOperationFailed().get()).isEqualTo(true);
434+
assertThat(tracerFactory.getTracerFailedRetriesExhausted().get()).isFalse();
435+
assertThat(tracerFactory.getTracerOperationFailed().get()).isTrue();
427436
// Capture the argument passed to futureCall
428437
ArgumentCaptor<Integer> argumentCaptor = ArgumentCaptor.forClass(Integer.class);
429438
verify(callInt, atLeastOnce()).futureCall(argumentCaptor.capture(), any(ApiCallContext.class));

0 commit comments

Comments
 (0)