Skip to content

Commit fc0fca7

Browse files
test: simplify SingleRetryTest callables (#8120)
Co-authored-by: Puneet Dixit <236133619+puneetdixit200@users.noreply.github.com>
1 parent 3bda03c commit fc0fca7

1 file changed

Lines changed: 25 additions & 39 deletions

File tree

src/test/java/io/reactivex/rxjava4/single/SingleRetryTest.java

Lines changed: 25 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,12 @@
1515

1616
import static org.junit.Assert.assertEquals;
1717

18-
import java.util.concurrent.Callable;
1918
import java.util.concurrent.atomic.AtomicInteger;
2019

2120
import org.junit.Test;
2221

2322
import io.reactivex.rxjava4.core.*;
2423
import io.reactivex.rxjava4.exceptions.TestException;
25-
import io.reactivex.rxjava4.functions.Predicate;
2624
import io.reactivex.rxjava4.internal.functions.Functions;
2725

2826
public class SingleRetryTest extends RxJavaTest {
@@ -31,22 +29,16 @@ public void retryTimesPredicateWithMatchingPredicate() {
3129
final AtomicInteger atomicInteger = new AtomicInteger(3);
3230
final AtomicInteger numberOfSubscribeCalls = new AtomicInteger(0);
3331

34-
Single.fromCallable(new Callable<Boolean>() {
35-
@Override public Boolean call() throws Exception {
36-
numberOfSubscribeCalls.incrementAndGet();
32+
Single.fromCallable(() -> {
33+
numberOfSubscribeCalls.incrementAndGet();
3734

38-
if (atomicInteger.decrementAndGet() != 0) {
39-
throw new RuntimeException();
40-
}
41-
42-
throw new IllegalArgumentException();
35+
if (atomicInteger.decrementAndGet() != 0) {
36+
throw new RuntimeException();
4337
}
38+
39+
throw new IllegalArgumentException();
4440
})
45-
.retry(Integer.MAX_VALUE, new Predicate<Throwable>() {
46-
@Override public boolean test(final Throwable throwable) throws Exception {
47-
return !(throwable instanceof IllegalArgumentException);
48-
}
49-
})
41+
.retry(Integer.MAX_VALUE, throwable -> !(throwable instanceof IllegalArgumentException))
5042
.test()
5143
.assertFailure(IllegalArgumentException.class);
5244

@@ -58,16 +50,14 @@ public void retryTimesPredicateWithMatchingRetryAmount() {
5850
final AtomicInteger atomicInteger = new AtomicInteger(3);
5951
final AtomicInteger numberOfSubscribeCalls = new AtomicInteger(0);
6052

61-
Single.fromCallable(new Callable<Boolean>() {
62-
@Override public Boolean call() throws Exception {
63-
numberOfSubscribeCalls.incrementAndGet();
53+
Single.fromCallable(() -> {
54+
numberOfSubscribeCalls.incrementAndGet();
6455

65-
if (atomicInteger.decrementAndGet() != 0) {
66-
throw new RuntimeException();
67-
}
68-
69-
return true;
56+
if (atomicInteger.decrementAndGet() != 0) {
57+
throw new RuntimeException();
7058
}
59+
60+
return true;
7161
})
7262
.retry(2, Functions.alwaysTrue())
7363
.test()
@@ -81,16 +71,14 @@ public void retryTimesPredicateWithNotMatchingRetryAmount() {
8171
final AtomicInteger atomicInteger = new AtomicInteger(3);
8272
final AtomicInteger numberOfSubscribeCalls = new AtomicInteger(0);
8373

84-
Single.fromCallable(new Callable<Boolean>() {
85-
@Override public Boolean call() throws Exception {
86-
numberOfSubscribeCalls.incrementAndGet();
74+
Single.fromCallable(() -> {
75+
numberOfSubscribeCalls.incrementAndGet();
8776

88-
if (atomicInteger.decrementAndGet() != 0) {
89-
throw new RuntimeException();
90-
}
91-
92-
return true;
77+
if (atomicInteger.decrementAndGet() != 0) {
78+
throw new RuntimeException();
9379
}
80+
81+
return true;
9482
})
9583
.retry(1, Functions.alwaysTrue())
9684
.test()
@@ -104,16 +92,14 @@ public void retryTimesPredicateWithZeroRetries() {
10492
final AtomicInteger atomicInteger = new AtomicInteger(2);
10593
final AtomicInteger numberOfSubscribeCalls = new AtomicInteger(0);
10694

107-
Single.fromCallable(new Callable<Boolean>() {
108-
@Override public Boolean call() throws Exception {
109-
numberOfSubscribeCalls.incrementAndGet();
95+
Single.fromCallable(() -> {
96+
numberOfSubscribeCalls.incrementAndGet();
11097

111-
if (atomicInteger.decrementAndGet() != 0) {
112-
throw new RuntimeException();
113-
}
114-
115-
return true;
98+
if (atomicInteger.decrementAndGet() != 0) {
99+
throw new RuntimeException();
116100
}
101+
102+
return true;
117103
})
118104
.retry(0, Functions.alwaysTrue())
119105
.test()

0 commit comments

Comments
 (0)