Skip to content

Commit bc96784

Browse files
committed
Rename and polish ComposedRetryListenerTests
1 parent b668042 commit bc96784

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

spring-core/src/test/java/org/springframework/core/retry/support/ComposedRetryListenerTests.java renamed to spring-core/src/test/java/org/springframework/core/retry/support/CompositeRetryListenerTests.java

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.core.retry.support;
1818

19-
import java.util.Arrays;
19+
import java.util.List;
2020

2121
import org.junit.jupiter.api.Test;
2222

@@ -30,51 +30,51 @@
3030
* Tests for {@link CompositeRetryListener}.
3131
*
3232
* @author Mahmoud Ben Hassine
33+
* @since 7.0
3334
*/
34-
class ComposedRetryListenerTests {
35+
class CompositeRetryListenerTests {
3536

3637
private final RetryListener listener1 = mock();
3738
private final RetryListener listener2 = mock();
39+
private final RetryExecution retryExecution = mock();
40+
41+
private final CompositeRetryListener compositeRetryListener =
42+
new CompositeRetryListener(List.of(listener1, listener2));
3843

39-
private final CompositeRetryListener composedRetryListener = new CompositeRetryListener(Arrays.asList(listener1, listener2));
4044

4145
@Test
4246
void beforeRetry() {
43-
RetryExecution retryExecution = mock();
44-
this.composedRetryListener.beforeRetry(retryExecution);
47+
compositeRetryListener.beforeRetry(retryExecution);
4548

46-
verify(this.listener1).beforeRetry(retryExecution);
47-
verify(this.listener2).beforeRetry(retryExecution);
49+
verify(listener1).beforeRetry(retryExecution);
50+
verify(listener2).beforeRetry(retryExecution);
4851
}
4952

5053
@Test
51-
void onSuccess() {
54+
void onRetrySuccess() {
5255
Object result = new Object();
53-
RetryExecution retryExecution = mock();
54-
this.composedRetryListener.onRetrySuccess(retryExecution, result);
56+
compositeRetryListener.onRetrySuccess(retryExecution, result);
5557

56-
verify(this.listener1).onRetrySuccess(retryExecution, result);
57-
verify(this.listener2).onRetrySuccess(retryExecution, result);
58+
verify(listener1).onRetrySuccess(retryExecution, result);
59+
verify(listener2).onRetrySuccess(retryExecution, result);
5860
}
5961

6062
@Test
61-
void onFailure() {
63+
void onRetryFailure() {
6264
Exception exception = new Exception();
63-
RetryExecution retryExecution = mock();
64-
this.composedRetryListener.onRetryFailure(retryExecution, exception);
65+
compositeRetryListener.onRetryFailure(retryExecution, exception);
6566

66-
verify(this.listener1).onRetryFailure(retryExecution, exception);
67-
verify(this.listener2).onRetryFailure(retryExecution, exception);
67+
verify(listener1).onRetryFailure(retryExecution, exception);
68+
verify(listener2).onRetryFailure(retryExecution, exception);
6869
}
6970

7071
@Test
71-
void onMaxAttempts() {
72+
void onRetryPolicyExhaustion() {
7273
Exception exception = new Exception();
73-
RetryExecution retryExecution = mock();
74-
this.composedRetryListener.onRetryPolicyExhaustion(retryExecution, exception);
74+
compositeRetryListener.onRetryPolicyExhaustion(retryExecution, exception);
7575

76-
verify(this.listener1).onRetryPolicyExhaustion(retryExecution, exception);
77-
verify(this.listener2).onRetryPolicyExhaustion(retryExecution, exception);
76+
verify(listener1).onRetryPolicyExhaustion(retryExecution, exception);
77+
verify(listener2).onRetryPolicyExhaustion(retryExecution, exception);
7878
}
7979

8080
}

0 commit comments

Comments
 (0)