diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapIterableFlowableIsolatedTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapIterableFlowableIsolatedTest.java new file mode 100644 index 0000000000..71c67be242 --- /dev/null +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapIterableFlowableIsolatedTest.java @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2016-present, RxJava Contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is + * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See + * the License for the specific language governing permissions and limitations under the License. + */ + +package io.reactivex.rxjava4.internal.operators.maybe; + +import java.util.*; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; + +import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.subjects.*; +import io.reactivex.rxjava4.subscribers.TestSubscriber; +import io.reactivex.rxjava4.testsupport.TestHelper; + +@Isolated +public class MaybeFlatMapIterableFlowableIsolatedTest extends RxJavaTest { + + @Test + public void requestCreateInnerRace() { + final Integer[] a = new Integer[1000]; + Arrays.fill(a, 1); + + for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { + final PublishSubject ps = PublishSubject.create(); + + ps.onNext(1); + + final TestSubscriber ts = ps.singleElement().flattenAsFlowable( + _ -> Arrays.asList(a)) + .test(0L); + + Runnable r1 = () -> { + ps.onComplete(); + for (int i1 = 0; i1 < 500; i1++) { + ts.request(1); + } + }; + + Runnable r2 = () -> { + for (int i2 = 0; i2 < 500; i2++) { + ts.request(1); + } + }; + + TestHelper.race(r1, r2); + } + } + + @Test + public void cancelCreateInnerRace() { + for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { + final PublishSubject ps = PublishSubject.create(); + + ps.onNext(1); + + final TestSubscriber ts = ps.singleElement().flattenAsFlowable( + _ -> Arrays.asList(1, 2, 3)) + .test(0L); + + Runnable r1 = ps::onComplete; + + Runnable r2 = ts::cancel; + + TestHelper.race(r1, r2); + } + } + + @Test + public void onSuccessRequestRace() { + List list = List.of(1); + for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { + + MaybeSubject ms = MaybeSubject.create(); + + TestSubscriber ts = ms.flattenAsFlowable(_ -> list) + .test(0L); + + TestHelper.race( + () -> ms.onSuccess(1), + () -> ts.request(1) + ); + + ts.assertResult(1); + } + } +} diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java index cdcc373278..9e5f3f45a9 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java @@ -304,56 +304,6 @@ public void requestBefore() { } } - @Test - public void requestCreateInnerRace() { - final Integer[] a = new Integer[1000]; - Arrays.fill(a, 1); - - for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { - final PublishSubject ps = PublishSubject.create(); - - ps.onNext(1); - - final TestSubscriber ts = ps.singleElement().flattenAsFlowable( - _ -> Arrays.asList(a)) - .test(0L); - - Runnable r1 = () -> { - ps.onComplete(); - for (int i1 = 0; i1 < 500; i1++) { - ts.request(1); - } - }; - - Runnable r2 = () -> { - for (int i2 = 0; i2 < 500; i2++) { - ts.request(1); - } - }; - - TestHelper.race(r1, r2); - } - } - - @Test - public void cancelCreateInnerRace() { - for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { - final PublishSubject ps = PublishSubject.create(); - - ps.onNext(1); - - final TestSubscriber ts = ps.singleElement().flattenAsFlowable( - _ -> Arrays.asList(1, 2, 3)) - .test(0L); - - Runnable r1 = ps::onComplete; - - Runnable r2 = ts::cancel; - - TestHelper.race(r1, r2); - } - } - @Test public void slowPathCancelAfterHasNext() { final Integer[] a = new Integer[1000]; @@ -432,22 +382,4 @@ public void doubleOnSubscribe() { TestHelper.checkDoubleOnSubscribeMaybeToFlowable(m -> m.flattenAsFlowable(Collections::singletonList)); } - @Test - public void onSuccessRequestRace() { - List list = List.of(1); - for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { - - MaybeSubject ms = MaybeSubject.create(); - - TestSubscriber ts = ms.flattenAsFlowable(_ -> list) - .test(0L); - - TestHelper.race( - () -> ms.onSuccess(1), - () -> ts.request(1) - ); - - ts.assertResult(1); - } - } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeMergeArrayIsolatedTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeMergeArrayIsolatedTest.java new file mode 100644 index 0000000000..27579e40fa --- /dev/null +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeMergeArrayIsolatedTest.java @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2016-present, RxJava Contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is + * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See + * the License for the specific language governing permissions and limitations under the License. + */ + +package io.reactivex.rxjava4.internal.operators.maybe; + +import java.util.*; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; + +import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.exceptions.TestException; +import io.reactivex.rxjava4.plugins.RxJavaPlugins; +import io.reactivex.rxjava4.subjects.*; +import io.reactivex.rxjava4.subscribers.TestSubscriber; +import io.reactivex.rxjava4.testsupport.TestHelper; + +@Isolated +public class MaybeMergeArrayIsolatedTest extends RxJavaTest { + + @Test + public void errorRace() { + for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { + List errors = TestHelper.trackPluginErrors(); + + try { + final PublishSubject ps1 = PublishSubject.create(); + final PublishSubject ps2 = PublishSubject.create(); + + TestSubscriber ts = Maybe.mergeArray(ps1.singleElement(), ps2.singleElement()) + .test(); + + final TestException ex = new TestException(); + + Runnable r1 = () -> ps1.onError(ex); + + Runnable r2 = () -> ps2.onError(ex); + + TestHelper.race(r1, r2); + + ts.assertFailure(Throwable.class); + + if (!errors.isEmpty()) { + TestHelper.assertUndeliverable(errors, 0, TestException.class); + } + } finally { + RxJavaPlugins.reset(); + } + } + } +} diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeMergeArrayTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeMergeArrayTest.java index f54feed290..8f082a7217 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeMergeArrayTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeMergeArrayTest.java @@ -126,37 +126,6 @@ public void errorFused() { .assertFailure(TestException.class); } - @Test - public void errorRace() { - for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { - List errors = TestHelper.trackPluginErrors(); - - try { - final PublishSubject ps1 = PublishSubject.create(); - final PublishSubject ps2 = PublishSubject.create(); - - TestSubscriber ts = Maybe.mergeArray(ps1.singleElement(), ps2.singleElement()) - .test(); - - final TestException ex = new TestException(); - - Runnable r1 = () -> ps1.onError(ex); - - Runnable r2 = () -> ps2.onError(ex); - - TestHelper.race(r1, r2); - - ts.assertFailure(Throwable.class); - - if (!errors.isEmpty()) { - TestHelper.assertUndeliverable(errors, 0, TestException.class); - } - } finally { - RxJavaPlugins.reset(); - } - } - } - @Test public void mergeBadSource() { Maybe.mergeArray(new Maybe() /* NFI */ {