diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableCacheIsolatedTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableCacheIsolatedTest.java new file mode 100644 index 0000000000..3b4407fba1 --- /dev/null +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableCacheIsolatedTest.java @@ -0,0 +1,71 @@ +/* + * 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.flowable; + +import java.util.concurrent.TimeUnit; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; + +import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.subscribers.TestSubscriber; +import io.reactivex.rxjava4.testsupport.*; + +@Isolated +public class FlowableCacheIsolatedTest extends RxJavaTest { + + @Test + public void subscribeSubscribeRace() { + for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { + final Flowable cache = Flowable.range(1, 500).cache(); + + final TestSubscriberEx ts1 = new TestSubscriberEx<>(); + final TestSubscriberEx ts2 = new TestSubscriberEx<>(); + + Runnable r1 = () -> cache.subscribe(ts1); + + Runnable r2 = () -> cache.subscribe(ts2); + + TestHelper.race(r1, r2); + + ts1 + .awaitDone(5, TimeUnit.SECONDS) + .assertSubscribed() + .assertValueCount(500) + .assertComplete() + .assertNoErrors(); + + ts2 + .awaitDone(5, TimeUnit.SECONDS) + .assertSubscribed() + .assertValueCount(500) + .assertComplete() + .assertNoErrors(); + } + } + + @Test + public void addRemoveRace() { + for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { + Flowable f = Flowable.never().cache(); + + TestSubscriber ts = f.test(); + + TestHelper.race( + ts::cancel, + f::test + ); + } + } +} diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableCacheTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableCacheTest.java index 7f291b854c..2348812e09 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableCacheTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableCacheTest.java @@ -388,36 +388,6 @@ public void cancelledUpFront() { assertEquals(1, call.get()); } - @Test - public void subscribeSubscribeRace() { - for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { - final Flowable cache = Flowable.range(1, 500).cache(); - - final TestSubscriberEx ts1 = new TestSubscriberEx<>(); - final TestSubscriberEx ts2 = new TestSubscriberEx<>(); - - Runnable r1 = () -> cache.subscribe(ts1); - - Runnable r2 = () -> cache.subscribe(ts2); - - TestHelper.race(r1, r2); - - ts1 - .awaitDone(5, TimeUnit.SECONDS) - .assertSubscribed() - .assertValueCount(500) - .assertComplete() - .assertNoErrors(); - - ts2 - .awaitDone(5, TimeUnit.SECONDS) - .assertSubscribed() - .assertValueCount(500) - .assertComplete() - .assertNoErrors(); - } - } - @Test public void subscribeCompleteRace() { for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { @@ -453,20 +423,6 @@ public void backpressure() { .assertResult(1, 2, 3, 4, 5); } - @Test - public void addRemoveRace() { - for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { - Flowable f = Flowable.never().cache(); - - TestSubscriber ts = f.test(); - - TestHelper.race( - ts::cancel, - f::test - ); - } - } - @Test public void valuesAreReclaimable() throws Exception { ConnectableFlowable source =