Skip to content

4.x: Unit test lambdaification 20 of N #8162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akarnokd merged 2 commits into from
Jun 22, 2026
Merged

4.x: Unit test lambdaification 20 of N #8162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed81f4b
4.x: Unit test lambdaification 20 of N
akarnokd Jun 22, 2026
e4050c6
Use method references where possible
akarnokd Jun 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions src/jmh/java/io/reactivex/rxjava4/core/XMapYPerf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,75 +104,75 @@ public void setup() {

flowFlatMapFlowable1 = fsource.flatMap((Function<Integer, Publisher<Integer>>) Flowable::just);

flowFlatMapFlowable0 = fsource.flatMap((Function<Integer, Publisher<Integer>>) v -> Flowable.empty());
flowFlatMapFlowable0 = fsource.flatMap((Function<Integer, Publisher<Integer>>) _ -> Flowable.empty());

flowFlatMapSingle1 = fsource.flatMapSingle((Function<Integer, SingleSource<Integer>>) Single::just);

flowFlatMapMaybe1 = fsource.flatMapMaybe((Function<Integer, MaybeSource<Integer>>) Maybe::just);

flowFlatMapMaybe0 = fsource.flatMapMaybe((Function<Integer, MaybeSource<Integer>>) v -> Maybe.empty());
flowFlatMapMaybe0 = fsource.flatMapMaybe((Function<Integer, MaybeSource<Integer>>) _ -> Maybe.empty());

flowFlatMapCompletable0 = fsource.flatMapCompletable(v -> Completable.complete());
flowFlatMapCompletable0 = fsource.flatMapCompletable(_ -> Completable.complete());

flowFlatMapIterable1 = fsource.flatMapIterable((Function<Integer, Iterable<Integer>>) Collections::singletonList);

flowFlatMapIterable0 = fsource.flatMapIterable((Function<Integer, Iterable<Integer>>) v -> Collections.emptyList());
flowFlatMapIterable0 = fsource.flatMapIterable((Function<Integer, Iterable<Integer>>) _ -> Collections.emptyList());

flowFlatMapSingle1 = fsource.flatMapSingle((Function<Integer, SingleSource<Integer>>) Single::just);

flowFlatMapMaybe1 = fsource.flatMapMaybe((Function<Integer, MaybeSource<Integer>>) Maybe::just);

flowFlatMapMaybe0 = fsource.flatMapMaybe((Function<Integer, MaybeSource<Integer>>) v -> Maybe.empty());
flowFlatMapMaybe0 = fsource.flatMapMaybe((Function<Integer, MaybeSource<Integer>>) _ -> Maybe.empty());

flowFlatMapCompletable0 = fsource.flatMapCompletable(v -> Completable.complete());
flowFlatMapCompletable0 = fsource.flatMapCompletable(_ -> Completable.complete());

// ooooooooooooooooooooooooo

flowFlatMapSingleAsFlow1 = fsource.flatMap((Function<Integer, Publisher<Integer>>) v -> Single.just(v).toFlowable());

flowFlatMapMaybeAsFlow1 = fsource.flatMap((Function<Integer, Publisher<Integer>>) v -> Maybe.just(v).toFlowable());

flowFlatMapMaybeAsFlow0 = fsource.flatMap((Function<Integer, Publisher<Integer>>) v -> Maybe.<Integer>empty().toFlowable());
flowFlatMapMaybeAsFlow0 = fsource.flatMap((Function<Integer, Publisher<Integer>>) _ -> Maybe.<Integer>empty().toFlowable());

flowFlatMapCompletableAsFlow0 = fsource.flatMap((Function<Integer, Publisher<Integer>>) v -> Completable.complete().toFlowable());
flowFlatMapCompletableAsFlow0 = fsource.flatMap((Function<Integer, Publisher<Integer>>) _ -> Completable.complete().toFlowable());

flowFlatMapIterableAsFlow1 = fsource.flatMap((Function<Integer, Publisher<Integer>>) v -> Flowable.fromIterable(Collections.singletonList(v)));

flowFlatMapIterableAsFlow0 = fsource.flatMap((Function<Integer, Publisher<Integer>>) v -> Flowable.fromIterable(Collections.emptyList()));
flowFlatMapIterableAsFlow0 = fsource.flatMap((Function<Integer, Publisher<Integer>>) _ -> Flowable.fromIterable(Collections.emptyList()));

// -------------------------------------------------------------------

Observable<Integer> osource = Observable.fromArray(values);

obsFlatMapObservable1 = osource.flatMap((Function<Integer, Observable<Integer>>) Observable::just);

obsFlatMapObservable0 = osource.flatMap((Function<Integer, Observable<Integer>>) v -> Observable.empty());
obsFlatMapObservable0 = osource.flatMap((Function<Integer, Observable<Integer>>) _ -> Observable.empty());

obsFlatMapSingle1 = osource.flatMapSingle((Function<Integer, SingleSource<Integer>>) Single::just);

obsFlatMapMaybe1 = osource.flatMapMaybe((Function<Integer, MaybeSource<Integer>>) Maybe::just);

obsFlatMapMaybe0 = osource.flatMapMaybe((Function<Integer, MaybeSource<Integer>>) v -> Maybe.empty());
obsFlatMapMaybe0 = osource.flatMapMaybe((Function<Integer, MaybeSource<Integer>>) _ -> Maybe.empty());

obsFlatMapCompletable0 = osource.flatMapCompletable(v -> Completable.complete());
obsFlatMapCompletable0 = osource.flatMapCompletable(_ -> Completable.complete());

obsFlatMapIterable1 = osource.flatMapIterable((Function<Integer, Iterable<Integer>>) Collections::singletonList);

obsFlatMapIterable0 = osource.flatMapIterable((Function<Integer, Iterable<Integer>>) v -> Collections.emptyList());
obsFlatMapIterable0 = osource.flatMapIterable((Function<Integer, Iterable<Integer>>) _ -> Collections.emptyList());

// ooooooooooooooooooooooooo

obsFlatMapSingleAsObs1 = osource.flatMap((Function<Integer, Observable<Integer>>) v -> Single.just(v).toObservable());

obsFlatMapMaybeAsObs1 = osource.flatMap((Function<Integer, Observable<Integer>>) v -> Maybe.just(v).toObservable());

obsFlatMapMaybeAsObs0 = osource.flatMap((Function<Integer, Observable<Integer>>) v -> Maybe.<Integer>empty().toObservable());
obsFlatMapMaybeAsObs0 = osource.flatMap((Function<Integer, Observable<Integer>>) _ -> Maybe.<Integer>empty().toObservable());

obsFlatMapCompletableAsObs0 = osource.flatMap((Function<Integer, Observable<Integer>>) v -> Completable.complete().toObservable());
obsFlatMapCompletableAsObs0 = osource.flatMap((Function<Integer, Observable<Integer>>) _ -> Completable.complete().toObservable());

obsFlatMapIterableAsObs1 = osource.flatMap((Function<Integer, Observable<Integer>>) v -> Observable.fromIterable(Collections.singletonList(v)));

obsFlatMapIterableAsObs0 = osource.flatMap((Function<Integer, Observable<Integer>>) v -> Observable.fromIterable(Collections.emptyList()));
obsFlatMapIterableAsObs0 = osource.flatMap((Function<Integer, Observable<Integer>>) _ -> Observable.fromIterable(Collections.emptyList()));
}

@Benchmark
Expand Down
8 changes: 2 additions & 6 deletions src/test/java/io/reactivex/rxjava4/internal/operators/mixed/SingleFlatMapObservableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

import io.reactivex.rxjava4.core.*;
import io.reactivex.rxjava4.exceptions.TestException;
import io.reactivex.rxjava4.functions.Function;
import io.reactivex.rxjava4.internal.functions.Functions;
import io.reactivex.rxjava4.observers.TestObserver;
import io.reactivex.rxjava4.subjects.*;
Expand Down Expand Up @@ -111,11 +110,8 @@ public void errorOther() {

@Test
public void mapperCrash() {
Single.just(1).flatMapObservable(new Function<Integer, ObservableSource<? extends Object>>() {
@Override
public ObservableSource<? extends Object> apply(Integer v) throws Exception {
throw new TestException();
}
Single.just(1).flatMapObservable(_ -> {
throw new TestException();
})
.test()
.assertFailure(TestException.class);
Expand Down
77 changes: 19 additions & 58 deletions src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleAmbTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,19 +143,9 @@ public void nullSourceSuccessRace() {

final Single<Integer> source = Single.ambArray(ps.singleOrError(), Single.<Integer>never(), Single.<Integer>never(), null);

Runnable r1 = new Runnable() {
@Override
public void run() {
source.test();
}
};
Runnable r1 = source::test;

Runnable r2 = new Runnable() {
@Override
public void run() {
ps.onComplete();
}
};
Runnable r2 = ps::onComplete;

TestHelper.race(r1, r2);

Expand All @@ -182,19 +172,9 @@ public void multipleErrorRace() {

final TestException ex = new TestException();

Runnable r1 = new Runnable() {
@Override
public void run() {
ps1.onError(ex);
}
};
Runnable r1 = () -> ps1.onError(ex);

Runnable r2 = new Runnable() {
@Override
public void run() {
ps2.onError(ex);
}
};
Runnable r2 = () -> ps2.onError(ex);

TestHelper.race(r1, r2);

Expand All @@ -221,20 +201,12 @@ public void successErrorRace() {

final TestException ex = new TestException();

Runnable r1 = new Runnable() {
@Override
public void run() {
ps1.onNext(1);
ps1.onComplete();
}
Runnable r1 = () -> {
ps1.onNext(1);
ps1.onComplete();
};

Runnable r2 = new Runnable() {
@Override
public void run() {
ps2.onError(ex);
}
};
Runnable r2 = () -> ps2.onError(ex);

TestHelper.race(r1, r2);

Expand Down Expand Up @@ -289,14 +261,11 @@ public void noWinnerSuccessDispose() throws Exception {
.observeOn(Schedulers.computation()),
Single.never()
)
.subscribe(new BiConsumer<Object, Throwable>() {
@Override
public void accept(Object v, Throwable e) throws Exception {
assertNotNull(v);
assertNull(e);
interrupted.set(Thread.currentThread().isInterrupted());
cdl.countDown();
}
.subscribe((BiConsumer<Object, Throwable>) (v, e) -> {
assertNotNull(v);
assertNull(e);
interrupted.set(Thread.currentThread().isInterrupted());
cdl.countDown();
});

assertTrue(cdl.await(500, TimeUnit.SECONDS));
Expand All @@ -317,14 +286,11 @@ public void noWinnerErrorDispose() throws Exception {
.observeOn(Schedulers.computation()),
Single.never()
)
.subscribe(new BiConsumer<Object, Throwable>() {
@Override
public void accept(Object v, Throwable e) throws Exception {
assertNull(v);
assertNotNull(e);
interrupted.set(Thread.currentThread().isInterrupted());
cdl.countDown();
}
.subscribe((v, e) -> {
assertNull(v);
assertNotNull(e);
interrupted.set(Thread.currentThread().isInterrupted());
cdl.countDown();
});

assertTrue(cdl.await(500, TimeUnit.SECONDS));
Expand All @@ -334,12 +300,7 @@ public void accept(Object v, Throwable e) throws Exception {

@Test
public void singleSourcesInIterable() {
SingleSource<Integer> source = new SingleSource<Integer>() {
@Override
public void subscribe(SingleObserver<? super Integer> observer) {
Single.just(1).subscribe(observer);
}
};
SingleSource<Integer> source = observer -> Single.just(1).subscribe(observer);

Single.amb(Arrays.asList(source, source))
.test()
Expand Down
16 changes: 3 additions & 13 deletions src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleCacheTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,9 @@ public void addRemoveRace() {

final TestObserver<Integer> to1 = cached.test();

Runnable r1 = new Runnable() {
@Override
public void run() {
to1.dispose();
}
};

Runnable r2 = new Runnable() {
@Override
public void run() {
cached.test();
}
};
Runnable r1 = to1::dispose;

Runnable r2 = cached::test;

TestHelper.race(r1, r2);
}
Expand Down
45 changes: 6 additions & 39 deletions ...t/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatMapCompletableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,30 +26,15 @@ public class SingleConcatMapCompletableTest extends RxJavaTest {

@Test
public void dispose() {
TestHelper.checkDisposed(Single.just(1).concatMapCompletable(new Function<Integer, Completable>() {
@Override
public Completable apply(Integer v) throws Exception {
return Completable.complete();
}
}));
TestHelper.checkDisposed(Single.just(1).concatMapCompletable((Function<Integer, Completable>) _ -> Completable.complete()));
}

@Test
public void normal() {
final boolean[] b = { false };

Single.just(1)
.concatMapCompletable(new Function<Integer, Completable>() {
@Override
public Completable apply(Integer t) throws Exception {
return Completable.complete().doOnComplete(new Action() {
@Override
public void run() throws Exception {
b[0] = true;
}
});
}
})
.concatMapCompletable((Function<Integer, Completable>) _ -> Completable.complete().doOnComplete(() -> b[0] = true))
.test()
.assertResult();

Expand All @@ -61,17 +46,7 @@ public void error() {
final boolean[] b = { false };

Single.<Integer>error(new TestException())
.concatMapCompletable(new Function<Integer, Completable>() {
@Override
public Completable apply(Integer t) throws Exception {
return Completable.complete().doOnComplete(new Action() {
@Override
public void run() throws Exception {
b[0] = true;
}
});
}
})
.concatMapCompletable((Function<Integer, Completable>) _ -> Completable.complete().doOnComplete(() -> b[0] = true))
.test()
.assertFailure(TestException.class);

Expand All @@ -83,11 +58,8 @@ public void mapperThrows() {
final boolean[] b = { false };

Single.just(1)
.concatMapCompletable(new Function<Integer, Completable>() {
@Override
public Completable apply(Integer t) throws Exception {
throw new TestException();
}
.concatMapCompletable((Function<Integer, Completable>) _ -> {
throw new TestException();
})
.test()
.assertFailure(TestException.class);
Expand All @@ -100,12 +72,7 @@ public void mapperReturnsNull() {
final boolean[] b = { false };

Single.just(1)
.concatMapCompletable(new Function<Integer, Completable>() {
@Override
public Completable apply(Integer t) throws Exception {
return null;
}
})
.concatMapCompletable((Function<Integer, Completable>) _ -> null)
.test()
.assertFailure(NullPointerException.class);

Expand Down
Loading