Skip to content

Commit 54cd5d4

Browse files
akarnokdakarnokd
authored
4.x: Unit test lambdaification 7 of N (ReactiveX#8143)
1 parent c277517 commit 54cd5d4

35 files changed

Lines changed: 400 additions & 1253 deletions

‎src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableConcatTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@
2020

2121
import io.reactivex.rxjava4.disposables.Disposable;
2222
import org.junit.Test;
23-
import static java.util.concurrent.Flow.*;
2423

2524
import io.reactivex.rxjava4.core.*;
2625
import io.reactivex.rxjava4.exceptions.*;
27-
import io.reactivex.rxjava4.functions.*;
2826
import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription;
2927
import io.reactivex.rxjava4.observers.TestObserver;
3028
import io.reactivex.rxjava4.plugins.RxJavaPlugins;

‎src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDelayTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
import io.reactivex.rxjava4.core.*;
2424
import io.reactivex.rxjava4.exceptions.TestException;
25-
import io.reactivex.rxjava4.functions.*;
2625
import io.reactivex.rxjava4.observers.TestObserver;
2726
import io.reactivex.rxjava4.schedulers.*;
2827
import io.reactivex.rxjava4.testsupport.TestHelper;

‎src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDoOnTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import io.reactivex.rxjava4.core.*;
2424
import io.reactivex.rxjava4.disposables.*;
2525
import io.reactivex.rxjava4.exceptions.*;
26-
import io.reactivex.rxjava4.functions.*;
2726
import io.reactivex.rxjava4.plugins.RxJavaPlugins;
2827
import io.reactivex.rxjava4.testsupport.*;
2928

‎src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromActionTest.java‎

Lines changed: 9 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,7 @@ public class CompletableFromActionTest extends RxJavaTest {
3131
public void fromAction() {
3232
final AtomicInteger atomicInteger = new AtomicInteger();
3333

34-
Completable.fromAction(new Action() {
35-
@Override
36-
public void run() throws Exception {
37-
atomicInteger.incrementAndGet();
38-
}
39-
})
34+
Completable.fromAction(() -> atomicInteger.incrementAndGet())
4035
.test()
4136
.assertResult();
4237

@@ -47,12 +42,7 @@ public void run() throws Exception {
4742
public void fromActionTwice() {
4843
final AtomicInteger atomicInteger = new AtomicInteger();
4944

50-
Action run = new Action() {
51-
@Override
52-
public void run() throws Exception {
53-
atomicInteger.incrementAndGet();
54-
}
55-
};
45+
Action run = () -> atomicInteger.incrementAndGet();
5646

5747
Completable.fromAction(run)
5848
.test()
@@ -71,12 +61,7 @@ public void run() throws Exception {
7161
public void fromActionInvokesLazy() {
7262
final AtomicInteger atomicInteger = new AtomicInteger();
7363

74-
Completable completable = Completable.fromAction(new Action() {
75-
@Override
76-
public void run() throws Exception {
77-
atomicInteger.incrementAndGet();
78-
}
79-
});
64+
Completable completable = Completable.fromAction(() -> atomicInteger.incrementAndGet());
8065

8166
assertEquals(0, atomicInteger.get());
8267

@@ -89,11 +74,8 @@ public void run() throws Exception {
8974

9075
@Test
9176
public void fromActionThrows() {
92-
Completable.fromAction(new Action() {
93-
@Override
94-
public void run() throws Exception {
95-
throw new UnsupportedOperationException();
96-
}
77+
Completable.fromAction(() -> {
78+
throw new UnsupportedOperationException();
9779
})
9880
.test()
9981
.assertFailure(UnsupportedOperationException.class);
@@ -102,12 +84,7 @@ public void run() throws Exception {
10284
@Test
10385
public void fromActionDisposed() {
10486
final AtomicInteger calls = new AtomicInteger();
105-
Completable.fromAction(new Action() {
106-
@Override
107-
public void run() throws Exception {
108-
calls.incrementAndGet();
109-
}
110-
})
87+
Completable.fromAction(() -> calls.incrementAndGet())
11188
.test(true)
11289
.assertEmpty();
11390

@@ -117,12 +94,9 @@ public void run() throws Exception {
11794
@Test
11895
public void fromActionErrorsDisposed() {
11996
final AtomicInteger calls = new AtomicInteger();
120-
Completable.fromAction(new Action() {
121-
@Override
122-
public void run() throws Exception {
123-
calls.incrementAndGet();
124-
throw new TestException();
125-
}
97+
Completable.fromAction(() -> {
98+
calls.incrementAndGet();
99+
throw new TestException();
126100
})
127101
.test(true)
128102
.assertEmpty();

‎src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromCallableTest.java‎

Lines changed: 24 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.util.concurrent.atomic.AtomicInteger;
2222

2323
import org.junit.Test;
24-
import org.mockito.invocation.InvocationOnMock;
2524
import org.mockito.stubbing.Answer;
2625

2726
import io.reactivex.rxjava4.core.*;
@@ -37,12 +36,9 @@ public class CompletableFromCallableTest extends RxJavaTest {
3736
public void fromCallable() {
3837
final AtomicInteger atomicInteger = new AtomicInteger();
3938

40-
Completable.fromCallable(new Callable<Object>() {
41-
@Override
42-
public Object call() throws Exception {
43-
atomicInteger.incrementAndGet();
44-
return null;
45-
}
39+
Completable.fromCallable(() -> {
40+
atomicInteger.incrementAndGet();
41+
return null;
4642
})
4743
.test()
4844
.assertResult();
@@ -54,12 +50,9 @@ public Object call() throws Exception {
5450
public void fromCallableTwice() {
5551
final AtomicInteger atomicInteger = new AtomicInteger();
5652

57-
Callable<Object> callable = new Callable<Object>() {
58-
@Override
59-
public Object call() throws Exception {
60-
atomicInteger.incrementAndGet();
61-
return null;
62-
}
53+
Callable<Object> callable = () -> {
54+
atomicInteger.incrementAndGet();
55+
return null;
6356
};
6457

6558
Completable.fromCallable(callable)
@@ -79,12 +72,9 @@ public Object call() throws Exception {
7972
public void fromCallableInvokesLazy() {
8073
final AtomicInteger atomicInteger = new AtomicInteger();
8174

82-
Completable completable = Completable.fromCallable(new Callable<Object>() {
83-
@Override
84-
public Object call() throws Exception {
85-
atomicInteger.incrementAndGet();
86-
return null;
87-
}
75+
Completable completable = Completable.fromCallable(() -> {
76+
atomicInteger.incrementAndGet();
77+
return null;
8878
});
8979

9080
assertEquals(0, atomicInteger.get());
@@ -98,11 +88,8 @@ public Object call() throws Exception {
9888

9989
@Test
10090
public void fromCallableThrows() {
101-
Completable.fromCallable(new Callable<Object>() {
102-
@Override
103-
public Object call() throws Exception {
104-
throw new UnsupportedOperationException();
105-
}
91+
Completable.fromCallable(() -> {
92+
throw new UnsupportedOperationException();
10693
})
10794
.test()
10895
.assertFailure(UnsupportedOperationException.class);
@@ -116,22 +103,19 @@ public void shouldNotDeliverResultIfSubscriberUnsubscribedBeforeEmission() throw
116103
final CountDownLatch funcLatch = new CountDownLatch(1);
117104
final CountDownLatch observerLatch = new CountDownLatch(1);
118105

119-
when(func.call()).thenAnswer(new Answer<String>() {
120-
@Override
121-
public String answer(InvocationOnMock invocation) throws Throwable {
122-
observerLatch.countDown();
106+
when(func.call()).thenAnswer((Answer<String>) _ -> {
107+
observerLatch.countDown();
123108

124-
try {
125-
funcLatch.await();
126-
} catch (InterruptedException e) {
127-
// It's okay, unsubscription causes Thread interruption
109+
try {
110+
funcLatch.await();
111+
} catch (InterruptedException e) {
112+
// It's okay, unsubscription causes Thread interruption
128113

129-
// Restoring interruption status of the Thread
130-
Thread.currentThread().interrupt();
131-
}
132-
133-
return "should_not_be_delivered";
114+
// Restoring interruption status of the Thread
115+
Thread.currentThread().interrupt();
134116
}
117+
118+
return "should_not_be_delivered";
135119
});
136120

137121
Completable fromCallableObservable = Completable.fromCallable(func);
@@ -165,12 +149,9 @@ public String answer(InvocationOnMock invocation) throws Throwable {
165149
@SuppressUndeliverable
166150
public void fromActionErrorsDisposed() {
167151
final AtomicInteger calls = new AtomicInteger();
168-
Completable.fromCallable(new Callable<Object>() {
169-
@Override
170-
public Object call() throws Exception {
171-
calls.incrementAndGet();
172-
throw new TestException();
173-
}
152+
Completable.fromCallable(() -> {
153+
calls.incrementAndGet();
154+
throw new TestException();
174155
})
175156
.test(true)
176157
.assertEmpty();

‎src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromPublisherTest.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,7 @@ public void dispose() {
4848

4949
@Test
5050
public void doubleOnSubscribe() {
51-
TestHelper.checkDoubleOnSubscribeFlowableToCompletable(new Function<Flowable<Object>, Completable>() {
52-
@Override
53-
public Completable apply(Flowable<Object> f) throws Exception {
54-
return Completable.fromPublisher(f);
55-
}
56-
});
51+
TestHelper.checkDoubleOnSubscribeFlowableToCompletable(
52+
(Function<Flowable<Object>, Completable>) Completable::fromPublisher);
5753
}
5854
}

‎src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromRunnableTest.java‎

Lines changed: 9 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,7 @@ public class CompletableFromRunnableTest extends RxJavaTest {
3030
public void fromRunnable() {
3131
final AtomicInteger atomicInteger = new AtomicInteger();
3232

33-
Completable.fromRunnable(new Runnable() {
34-
@Override
35-
public void run() {
36-
atomicInteger.incrementAndGet();
37-
}
38-
})
33+
Completable.fromRunnable(() -> atomicInteger.incrementAndGet())
3934
.test()
4035
.assertResult();
4136

@@ -46,12 +41,7 @@ public void run() {
4641
public void fromRunnableTwice() {
4742
final AtomicInteger atomicInteger = new AtomicInteger();
4843

49-
Runnable run = new Runnable() {
50-
@Override
51-
public void run() {
52-
atomicInteger.incrementAndGet();
53-
}
54-
};
44+
Runnable run = () -> atomicInteger.incrementAndGet();
5545

5646
Completable.fromRunnable(run)
5747
.test()
@@ -70,12 +60,7 @@ public void run() {
7060
public void fromRunnableInvokesLazy() {
7161
final AtomicInteger atomicInteger = new AtomicInteger();
7262

73-
Completable completable = Completable.fromRunnable(new Runnable() {
74-
@Override
75-
public void run() {
76-
atomicInteger.incrementAndGet();
77-
}
78-
});
63+
Completable completable = Completable.fromRunnable(() -> atomicInteger.incrementAndGet());
7964

8065
assertEquals(0, atomicInteger.get());
8166

@@ -88,11 +73,8 @@ public void run() {
8873

8974
@Test
9075
public void fromRunnableThrows() {
91-
Completable.fromRunnable(new Runnable() {
92-
@Override
93-
public void run() {
94-
throw new UnsupportedOperationException();
95-
}
76+
Completable.fromRunnable(() -> {
77+
throw new UnsupportedOperationException();
9678
})
9779
.test()
9880
.assertFailure(UnsupportedOperationException.class);
@@ -101,12 +83,7 @@ public void run() {
10183
@Test
10284
public void fromRunnableDisposed() {
10385
final AtomicInteger calls = new AtomicInteger();
104-
Completable.fromRunnable(new Runnable() {
105-
@Override
106-
public void run() {
107-
calls.incrementAndGet();
108-
}
109-
})
86+
Completable.fromRunnable(() -> calls.incrementAndGet())
11087
.test(true)
11188
.assertEmpty();
11289

@@ -116,12 +93,9 @@ public void run() {
11693
@Test
11794
public void fromRunnableErrorsDisposed() {
11895
final AtomicInteger calls = new AtomicInteger();
119-
Completable.fromRunnable(new Runnable() {
120-
@Override
121-
public void run() {
122-
calls.incrementAndGet();
123-
throw new TestException();
124-
}
96+
Completable.fromRunnable(() -> {
97+
calls.incrementAndGet();
98+
throw new TestException();
12599
})
126100
.test(true)
127101
.assertEmpty();

0 commit comments

Comments
 (0)