Skip to content

Commit 04a0a29

Browse files
akarnokdakarnokd
authored
4.x: Unit test lambdaification 5 of N (ReactiveX#8141)
1 parent af4988e commit 04a0a29

25 files changed

Lines changed: 135 additions & 223 deletions

‎src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableCollectWithCollectorTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void error() {
5858
@Test
5959
public void collectorSupplierCrash() {
6060
Flowable.range(1, 5)
61-
.collect(new Collector<Integer, Integer, Integer>() {
61+
.collect(new Collector<Integer, Integer, Integer>() /* NFI */ {
6262

6363
@Override
6464
public Supplier<Integer> supplier() {
@@ -94,7 +94,7 @@ public void collectorAccumulatorCrash() {
9494
BehaviorProcessor<Integer> source = BehaviorProcessor.createDefault(1);
9595

9696
source
97-
.collect(new Collector<Integer, Integer, Integer>() {
97+
.collect(new Collector<Integer, Integer, Integer>() /* NFI */ {
9898

9999
@Override
100100
public Supplier<Integer> supplier() {
@@ -130,7 +130,7 @@ public Set<Characteristics> characteristics() {
130130
@Test
131131
public void collectorFinisherCrash() {
132132
Flowable.range(1, 5)
133-
.collect(new Collector<Integer, Integer, Integer>() {
133+
.collect(new Collector<Integer, Integer, Integer>() /* NFI */ {
134134

135135
@Override
136136
public Supplier<Integer> supplier() {
@@ -164,7 +164,7 @@ public Set<Characteristics> characteristics() {
164164
@Test
165165
public void collectorAccumulatorDropSignals() throws Throwable {
166166
TestHelper.withErrorTracking(errors -> {
167-
Flowable<Integer> source = new Flowable<Integer>() {
167+
Flowable<Integer> source = new Flowable<Integer>() /* NFI */ {
168168
@Override
169169
protected void subscribeActual(Subscriber<? super Integer> s) {
170170
s.onSubscribe(new BooleanSubscription());
@@ -176,7 +176,7 @@ protected void subscribeActual(Subscriber<? super Integer> s) {
176176
};
177177

178178
source
179-
.collect(new Collector<Integer, Integer, Integer>() {
179+
.collect(new Collector<Integer, Integer, Integer>() /* NFI */ {
180180

181181
@Override
182182
public Supplier<Integer> supplier() {
@@ -251,7 +251,7 @@ public void errorToFlowable() {
251251
@Test
252252
public void collectorSupplierCrashToFlowable() {
253253
Flowable.range(1, 5)
254-
.collect(new Collector<Integer, Integer, Integer>() {
254+
.collect(new Collector<Integer, Integer, Integer>() /* NFI */ {
255255

256256
@Override
257257
public Supplier<Integer> supplier() {
@@ -288,7 +288,7 @@ public void collectorAccumulatorCrashToFlowable() {
288288
BehaviorProcessor<Integer> source = BehaviorProcessor.createDefault(1);
289289

290290
source
291-
.collect(new Collector<Integer, Integer, Integer>() {
291+
.collect(new Collector<Integer, Integer, Integer>() /* NFI */ {
292292

293293
@Override
294294
public Supplier<Integer> supplier() {
@@ -325,7 +325,7 @@ public Set<Characteristics> characteristics() {
325325
@Test
326326
public void collectorFinisherCrashToFlowable() {
327327
Flowable.range(1, 5)
328-
.collect(new Collector<Integer, Integer, Integer>() {
328+
.collect(new Collector<Integer, Integer, Integer>() /* NFI */ {
329329

330330
@Override
331331
public Supplier<Integer> supplier() {
@@ -360,7 +360,7 @@ public Set<Characteristics> characteristics() {
360360
@Test
361361
public void collectorAccumulatorDropSignalsToFlowable() throws Throwable {
362362
TestHelper.withErrorTracking(errors -> {
363-
Flowable<Integer> source = new Flowable<Integer>() {
363+
Flowable<Integer> source = new Flowable<Integer>() /* NFI */ {
364364
@Override
365365
protected void subscribeActual(Subscriber<? super Integer> s) {
366366
s.onSubscribe(new BooleanSubscription());
@@ -372,7 +372,7 @@ protected void subscribeActual(Subscriber<? super Integer> s) {
372372
};
373373

374374
source
375-
.collect(new Collector<Integer, Integer, Integer>() {
375+
.collect(new Collector<Integer, Integer, Integer>() /* NFI */ {
376376

377377
@Override
378378
public Supplier<Integer> supplier() {

‎src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableFlatMapStreamTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ public void badRequest() {
262262
@Test
263263
public void queueOverflow() throws Throwable {
264264
TestHelper.withErrorTracking(errors -> {
265-
new Flowable<Integer>() {
265+
new Flowable<Integer>() /* NFI */ {
266266
@Override
267267
protected void subscribeActual(Subscriber<? super Integer> s) {
268268
s.onSubscribe(new BooleanSubscription());
@@ -370,7 +370,7 @@ public void cancelAfterIteratorNext() throws Exception {
370370

371371
@SuppressWarnings("unchecked")
372372
Stream<Integer> stream = mock(Stream.class);
373-
when(stream.iterator()).thenReturn(new Iterator<Integer>() {
373+
when(stream.iterator()).thenReturn(new Iterator<Integer>() /* NFI */ {
374374

375375
@Override
376376
public boolean hasNext() {

‎src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableFromStreamTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public void noOfferNoCrashAfterClear() throws Throwable {
149149
AtomicReference<SimpleQueue<?>> queue = new AtomicReference<>();
150150

151151
Flowable.fromStream(IntStream.rangeClosed(1, 10).boxed())
152-
.subscribe(new FlowableSubscriber<Integer>() {
152+
.subscribe(new FlowableSubscriber<Integer>() /* NFI */ {
153153
@Override
154154
public void onSubscribe(@NonNull Subscription s) {
155155
queue.set((SimpleQueue<?>)s);
@@ -192,7 +192,7 @@ public void fusedPoll() throws Throwable {
192192
AtomicInteger calls = new AtomicInteger();
193193

194194
Flowable.fromStream(Stream.of(1).onClose(() -> calls.getAndIncrement()))
195-
.subscribe(new FlowableSubscriber<Integer>() {
195+
.subscribe(new FlowableSubscriber<Integer>() /* NFI */ {
196196
@Override
197197
public void onSubscribe(@NonNull Subscription s) {
198198
queue.set((SimpleQueue<?>)s);
@@ -340,7 +340,7 @@ void requestOneByOneBase(boolean conditional) {
340340
source = source.filter(_ -> true);
341341
}
342342

343-
source.subscribe(new FlowableSubscriber<Integer>() {
343+
source.subscribe(new FlowableSubscriber<Integer>() /* NFI */ {
344344

345345
@NonNull Subscription upstream;
346346

@@ -397,7 +397,7 @@ void requestRaceBase(boolean conditional) throws Exception {
397397
CountDownLatch cdl = new CountDownLatch(1);
398398

399399
source
400-
.subscribe(new FlowableSubscriber<Integer>() {
400+
.subscribe(new FlowableSubscriber<Integer>() /* NFI */ {
401401

402402
@NonNull Subscription upstream;
403403

‎src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableMapOptionalTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void mapperNull() {
8383

8484
@Test
8585
public void crashDropsOnNexts() {
86-
Flowable<Integer> source = new Flowable<Integer>() {
86+
Flowable<Integer> source = new Flowable<Integer>() /* NFI */ {
8787
@Override
8888
protected void subscribeActual(Subscriber<? super Integer> s) {
8989
s.onSubscribe(new BooleanSubscription());
@@ -297,7 +297,7 @@ public void mapperNullConditional() {
297297

298298
@Test
299299
public void crashDropsOnNextsConditional() {
300-
Flowable<Integer> source = new Flowable<Integer>() {
300+
Flowable<Integer> source = new Flowable<Integer>() /* NFI */ {
301301
@Override
302302
protected void subscribeActual(Subscriber<? super Integer> s) {
303303
s.onSubscribe(new BooleanSubscription());

‎src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableStageSubscriberOrDefaultTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public void firstError() throws Exception {
137137
@Test
138138
public void firstSourceIgnoresCancel() throws Throwable {
139139
TestHelper.withErrorTracking(errors -> {
140-
Integer v = new Flowable<Integer>() {
140+
Integer v = new Flowable<Integer>() /* NFI */ {
141141
@Override
142142
protected void subscribeActual(Subscriber<? super Integer> s) {
143143
s.onSubscribe(new BooleanSubscription());
@@ -159,7 +159,7 @@ protected void subscribeActual(Subscriber<? super Integer> s) {
159159
@Test
160160
public void firstDoubleOnSubscribe() throws Throwable {
161161
TestHelper.withErrorTracking(errors -> {
162-
Integer v = new Flowable<Integer>() {
162+
Integer v = new Flowable<Integer>() /* NFI */ {
163163
@Override
164164
protected void subscribeActual(Subscriber<? super Integer> s) {
165165
s.onSubscribe(new BooleanSubscription());
@@ -285,7 +285,7 @@ public void singleError() throws Exception {
285285
@Test
286286
public void singleSourceIgnoresCancel() throws Throwable {
287287
TestHelper.withErrorTracking(errors -> {
288-
Integer v = new Flowable<Integer>() {
288+
Integer v = new Flowable<Integer>() /* NFI */ {
289289
@Override
290290
protected void subscribeActual(Subscriber<? super Integer> s) {
291291
s.onSubscribe(new BooleanSubscription());
@@ -308,7 +308,7 @@ protected void subscribeActual(Subscriber<? super Integer> s) {
308308
@Test
309309
public void singleDoubleOnSubscribe() throws Throwable {
310310
TestHelper.withErrorTracking(errors -> {
311-
Integer v = new Flowable<Integer>() {
311+
Integer v = new Flowable<Integer>() /* NFI */ {
312312
@Override
313313
protected void subscribeActual(Subscriber<? super Integer> s) {
314314
s.onSubscribe(new BooleanSubscription());
@@ -432,7 +432,7 @@ public void lastError() throws Exception {
432432
@Test
433433
public void lastSourceIgnoresCancel() throws Throwable {
434434
TestHelper.withErrorTracking(errors -> {
435-
Integer v = new Flowable<Integer>() {
435+
Integer v = new Flowable<Integer>() /* NFI */ {
436436
@Override
437437
protected void subscribeActual(Subscriber<? super Integer> s) {
438438
s.onSubscribe(new BooleanSubscription());
@@ -455,7 +455,7 @@ protected void subscribeActual(Subscriber<? super Integer> s) {
455455
@Test
456456
public void lastDoubleOnSubscribe() throws Throwable {
457457
TestHelper.withErrorTracking(errors -> {
458-
Integer v = new Flowable<Integer>() {
458+
Integer v = new Flowable<Integer>() /* NFI */ {
459459
@Override
460460
protected void subscribeActual(Subscriber<? super Integer> s) {
461461
s.onSubscribe(new BooleanSubscription());

‎src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableStageSubscriberOrErrorTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public void firstError() throws Exception {
136136
@Test
137137
public void firstSourceIgnoresCancel() throws Throwable {
138138
TestHelper.withErrorTracking(errors -> {
139-
Integer v = new Flowable<Integer>() {
139+
Integer v = new Flowable<Integer>() /* NFI */ {
140140
@Override
141141
protected void subscribeActual(Subscriber<? super Integer> s) {
142142
s.onSubscribe(new BooleanSubscription());
@@ -158,7 +158,7 @@ protected void subscribeActual(Subscriber<? super Integer> s) {
158158
@Test
159159
public void firstDoubleOnSubscribe() throws Throwable {
160160
TestHelper.withErrorTracking(errors -> {
161-
Integer v = new Flowable<Integer>() {
161+
Integer v = new Flowable<Integer>() /* NFI */ {
162162
@Override
163163
protected void subscribeActual(Subscriber<? super Integer> s) {
164164
s.onSubscribe(new BooleanSubscription());
@@ -282,7 +282,7 @@ public void singleError() throws Exception {
282282
@Test
283283
public void singleSourceIgnoresCancel() throws Throwable {
284284
TestHelper.withErrorTracking(errors -> {
285-
Integer v = new Flowable<Integer>() {
285+
Integer v = new Flowable<Integer>() /* NFI */ {
286286
@Override
287287
protected void subscribeActual(Subscriber<? super Integer> s) {
288288
s.onSubscribe(new BooleanSubscription());
@@ -305,7 +305,7 @@ protected void subscribeActual(Subscriber<? super Integer> s) {
305305
@Test
306306
public void singleDoubleOnSubscribe() throws Throwable {
307307
TestHelper.withErrorTracking(errors -> {
308-
Integer v = new Flowable<Integer>() {
308+
Integer v = new Flowable<Integer>() /* NFI */ {
309309
@Override
310310
protected void subscribeActual(Subscriber<? super Integer> s) {
311311
s.onSubscribe(new BooleanSubscription());
@@ -426,7 +426,7 @@ public void lastError() throws Exception {
426426
@Test
427427
public void lastSourceIgnoresCancel() throws Throwable {
428428
TestHelper.withErrorTracking(errors -> {
429-
Integer v = new Flowable<Integer>() {
429+
Integer v = new Flowable<Integer>() /* NFI */ {
430430
@Override
431431
protected void subscribeActual(Subscriber<? super Integer> s) {
432432
s.onSubscribe(new BooleanSubscription());
@@ -449,7 +449,7 @@ protected void subscribeActual(Subscriber<? super Integer> s) {
449449
@Test
450450
public void lastDoubleOnSubscribe() throws Throwable {
451451
TestHelper.withErrorTracking(errors -> {
452-
Integer v = new Flowable<Integer>() {
452+
Integer v = new Flowable<Integer>() /* NFI */ {
453453
@Override
454454
protected void subscribeActual(Subscriber<? super Integer> s) {
455455
s.onSubscribe(new BooleanSubscription());

‎src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeFlattenStreamAsFlowableTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public void fused() throws Throwable {
233233

234234
ms
235235
.flattenStreamAsFlowable(Stream::of)
236-
.subscribe(new FlowableSubscriber<Integer>() {
236+
.subscribe(new FlowableSubscriber<Integer>() /* NFI */ {
237237

238238
@Override
239239
public void onNext(Integer t) {
@@ -281,7 +281,7 @@ public void requestOneByOne() {
281281

282282
Maybe.just(1)
283283
.flattenStreamAsFlowable(_ -> Stream.of(1, 2, 3, 4, 5))
284-
.subscribe(new FlowableSubscriber<Integer>() {
284+
.subscribe(new FlowableSubscriber<Integer>() /* NFI */ {
285285

286286
Subscription upstream;
287287

@@ -328,7 +328,7 @@ public void streamCloseCrash() throws Throwable {
328328
public void hasNextThrowsInDrain() {
329329
@SuppressWarnings("unchecked")
330330
Stream<Integer> stream = mock(Stream.class);
331-
when(stream.iterator()).thenReturn(new Iterator<Integer>() {
331+
when(stream.iterator()).thenReturn(new Iterator<Integer>() /* NFI */ {
332332

333333
int count;
334334

@@ -356,7 +356,7 @@ public Integer next() {
356356
public void nextThrowsInDrain() {
357357
@SuppressWarnings("unchecked")
358358
Stream<Integer> stream = mock(Stream.class);
359-
when(stream.iterator()).thenReturn(new Iterator<Integer>() {
359+
when(stream.iterator()).thenReturn(new Iterator<Integer>() /* NFI */ {
360360

361361
@Override
362362
public boolean hasNext() {
@@ -382,7 +382,7 @@ public void cancelAfterHasNextInDrain() {
382382

383383
TestSubscriber<Integer> ts = new TestSubscriber<>();
384384

385-
when(stream.iterator()).thenReturn(new Iterator<Integer>() {
385+
when(stream.iterator()).thenReturn(new Iterator<Integer>() /* NFI */ {
386386

387387
int count;
388388

@@ -413,7 +413,7 @@ public void cancelAfterNextInDrain() {
413413

414414
TestSubscriber<Integer> ts = new TestSubscriber<>();
415415

416-
when(stream.iterator()).thenReturn(new Iterator<Integer>() {
416+
when(stream.iterator()).thenReturn(new Iterator<Integer>() /* NFI */ {
417417

418418
@Override
419419
public boolean hasNext() {

‎src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeFlattenStreamAsObservableTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public void fused() throws Throwable {
197197

198198
ms
199199
.flattenStreamAsObservable(Stream::of)
200-
.subscribe(new Observer<Integer>() {
200+
.subscribe(new Observer<Integer>() /* NFI */ {
201201

202202
@Override
203203
public void onNext(Integer t) {
@@ -247,7 +247,7 @@ public void fused2() throws Throwable {
247247

248248
ms
249249
.flattenStreamAsObservable(v -> Stream.of(v, v + 1))
250-
.subscribe(new Observer<Integer>() {
250+
.subscribe(new Observer<Integer>() /* NFI */ {
251251

252252
@Override
253253
public void onNext(Integer t) {
@@ -308,7 +308,7 @@ public void streamCloseCrash() throws Throwable {
308308
public void hasNextThrowsInDrain() {
309309
@SuppressWarnings("unchecked")
310310
Stream<Integer> stream = mock(Stream.class);
311-
when(stream.iterator()).thenReturn(new Iterator<Integer>() {
311+
when(stream.iterator()).thenReturn(new Iterator<Integer>() /* NFI */ {
312312

313313
int count;
314314

@@ -336,7 +336,7 @@ public Integer next() {
336336
public void nextThrowsInDrain() {
337337
@SuppressWarnings("unchecked")
338338
Stream<Integer> stream = mock(Stream.class);
339-
when(stream.iterator()).thenReturn(new Iterator<Integer>() {
339+
when(stream.iterator()).thenReturn(new Iterator<Integer>() /* NFI */ {
340340

341341
@Override
342342
public boolean hasNext() {
@@ -362,7 +362,7 @@ public void cancelAfterHasNextInDrain() {
362362

363363
TestObserver<Integer> to = new TestObserver<>();
364364

365-
when(stream.iterator()).thenReturn(new Iterator<Integer>() {
365+
when(stream.iterator()).thenReturn(new Iterator<Integer>() /* NFI */ {
366366

367367
int count;
368368

@@ -393,7 +393,7 @@ public void cancelAfterNextInDrain() {
393393

394394
TestObserver<Integer> to = new TestObserver<>();
395395

396-
when(stream.iterator()).thenReturn(new Iterator<Integer>() {
396+
when(stream.iterator()).thenReturn(new Iterator<Integer>() /* NFI */ {
397397

398398
@Override
399399
public boolean hasNext() {

‎src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeToCompletionStageTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public void error() throws Exception {
132132
@Test
133133
public void sourceIgnoresCancel() throws Throwable {
134134
TestHelper.withErrorTracking(errors -> {
135-
Integer v = new Maybe<Integer>() {
135+
Integer v = new Maybe<Integer>() /* NFI */ {
136136
@Override
137137
protected void subscribeActual(MaybeObserver<? super Integer> observer) {
138138
observer.onSubscribe(Disposable.empty());
@@ -154,7 +154,7 @@ protected void subscribeActual(MaybeObserver<? super Integer> observer) {
154154
@Test
155155
public void doubleOnSubscribe() throws Throwable {
156156
TestHelper.withErrorTracking(errors -> {
157-
Integer v = new Maybe<Integer>() {
157+
Integer v = new Maybe<Integer>() /* NFI */ {
158158
@Override
159159
protected void subscribeActual(MaybeObserver<? super Integer> observer) {
160160
observer.onSubscribe(Disposable.empty());

0 commit comments

Comments
 (0)