Skip to content

Commit 8dad743

Browse files
authored
4.x: Unit test lambdaification 3 of N (ReactiveX#8139)
* 4.x: Unit test lambdaification 3 of N * Fix mockito crash
1 parent 6f3a8be commit 8dad743

12 files changed

Lines changed: 411 additions & 1078 deletions

src/test/java/io/reactivex/rxjava4/completable/CompletableTest.java

Lines changed: 107 additions & 382 deletions
Large diffs are not rendered by default.

src/test/java/io/reactivex/rxjava4/core/TransformerTest.java

Lines changed: 16 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import static org.junit.Assert.*;
1717

1818
import org.junit.Test;
19-
import static java.util.concurrent.Flow.*;
2019

2120
import io.reactivex.rxjava4.core.ConverterTest.*;
2221
import io.reactivex.rxjava4.exceptions.TestException;
@@ -26,11 +25,8 @@ public class TransformerTest extends RxJavaTest {
2625
@Test
2726
public void flowableTransformerThrows() {
2827
try {
29-
Flowable.just(1).compose(new FlowableTransformer<Integer, Integer>() {
30-
@Override
31-
public Publisher<Integer> apply(Flowable<Integer> v) {
32-
throw new TestException("Forced failure");
33-
}
28+
Flowable.just(1).compose(_ -> {
29+
throw new TestException("Forced failure");
3430
});
3531
fail("Should have thrown!");
3632
} catch (TestException ex) {
@@ -41,11 +37,8 @@ public Publisher<Integer> apply(Flowable<Integer> v) {
4137
@Test
4238
public void observableTransformerThrows() {
4339
try {
44-
Observable.just(1).compose(new ObservableTransformer<Integer, Integer>() {
45-
@Override
46-
public Observable<Integer> apply(Observable<Integer> v) {
47-
throw new TestException("Forced failure");
48-
}
40+
Observable.just(1).compose(_ -> {
41+
throw new TestException("Forced failure");
4942
});
5043
fail("Should have thrown!");
5144
} catch (TestException ex) {
@@ -56,11 +49,8 @@ public Observable<Integer> apply(Observable<Integer> v) {
5649
@Test
5750
public void singleTransformerThrows() {
5851
try {
59-
Single.just(1).compose(new SingleTransformer<Integer, Integer>() {
60-
@Override
61-
public Single<Integer> apply(Single<Integer> v) {
62-
throw new TestException("Forced failure");
63-
}
52+
Single.just(1).compose(_ -> {
53+
throw new TestException("Forced failure");
6454
});
6555
fail("Should have thrown!");
6656
} catch (TestException ex) {
@@ -71,11 +61,8 @@ public Single<Integer> apply(Single<Integer> v) {
7161
@Test
7262
public void maybeTransformerThrows() {
7363
try {
74-
Maybe.just(1).compose(new MaybeTransformer<Integer, Integer>() {
75-
@Override
76-
public Maybe<Integer> apply(Maybe<Integer> v) {
77-
throw new TestException("Forced failure");
78-
}
64+
Maybe.just(1).compose(_ -> {
65+
throw new TestException("Forced failure");
7966
});
8067
fail("Should have thrown!");
8168
} catch (TestException ex) {
@@ -99,65 +86,45 @@ public void completableTransformerThrows() {
9986

10087
@Test
10188
public void observableGenericsSignatureTest() {
102-
A<String, Integer> a = new A<String, Integer>() { };
89+
A<String, Integer> a = new A<String, Integer>() /* NFI */ { };
10390

10491
Observable.just(a).compose(TransformerTest.<String>testObservableTransformerCreator());
10592
}
10693

10794
@Test
10895
public void singleGenericsSignatureTest() {
109-
A<String, Integer> a = new A<String, Integer>() { };
96+
A<String, Integer> a = new A<String, Integer>() /* NFI */ { };
11097

11198
Single.just(a).compose(TransformerTest.<String>testSingleTransformerCreator());
11299
}
113100

114101
@Test
115102
public void maybeGenericsSignatureTest() {
116-
A<String, Integer> a = new A<String, Integer>() { };
103+
A<String, Integer> a = new A<String, Integer>() /* NFI */ { };
117104

118105
Maybe.just(a).compose(TransformerTest.<String>testMaybeTransformerCreator());
119106
}
120107

121108
@Test
122109
public void flowableGenericsSignatureTest() {
123-
A<String, Integer> a = new A<String, Integer>() { };
110+
A<String, Integer> a = new A<String, Integer>() /* NFI */ { };
124111

125112
Flowable.just(a).compose(TransformerTest.<String>testFlowableTransformerCreator());
126113
}
127114

128115
private static <T> ObservableTransformer<A<T, ?>, B<T>> testObservableTransformerCreator() {
129-
return new ObservableTransformer<A<T, ?>, B<T>>() {
130-
@Override
131-
public ObservableSource<B<T>> apply(Observable<A<T, ?>> a) {
132-
return Observable.empty();
133-
}
134-
};
116+
return _ -> Observable.empty();
135117
}
136118

137119
private static <T> SingleTransformer<A<T, ?>, B<T>> testSingleTransformerCreator() {
138-
return new SingleTransformer<A<T, ?>, B<T>>() {
139-
@Override
140-
public SingleSource<B<T>> apply(Single<A<T, ?>> a) {
141-
return Single.never();
142-
}
143-
};
120+
return _ -> Single.never();
144121
}
145122

146123
private static <T> MaybeTransformer<A<T, ?>, B<T>> testMaybeTransformerCreator() {
147-
return new MaybeTransformer<A<T, ?>, B<T>>() {
148-
@Override
149-
public MaybeSource<B<T>> apply(Maybe<A<T, ?>> a) {
150-
return Maybe.empty();
151-
}
152-
};
124+
return _ -> Maybe.empty();
153125
}
154126

155127
private static <T> FlowableTransformer<A<T, ?>, B<T>> testFlowableTransformerCreator() {
156-
return new FlowableTransformer<A<T, ?>, B<T>>() {
157-
@Override
158-
public Publisher<B<T>> apply(Flowable<A<T, ?>> a) {
159-
return Flowable.empty();
160-
}
161-
};
128+
return _ -> Flowable.empty();
162129
}
163130
}

0 commit comments

Comments
 (0)