diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCacheIsolatedTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCacheIsolatedTest.java new file mode 100644 index 0000000000..d0f0c374c5 --- /dev/null +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCacheIsolatedTest.java @@ -0,0 +1,70 @@ +/* + * 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.observable; + +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.observers.TestObserver; +import io.reactivex.rxjava4.subjects.PublishSubject; +import io.reactivex.rxjava4.testsupport.*; + +@Isolated +public class ObservableCacheIsolatedTest extends RxJavaTest { + + @Test + public void subscribeEmitRace() { + for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { + final PublishSubject ps = PublishSubject.create(); + + final Observable cache = ps.cache(); + + cache.test(); + + final TestObserverEx to = new TestObserverEx<>(); + + Runnable r1 = () -> cache.subscribe(to); + + Runnable r2 = () -> { + for (int j = 0; j < 500; j++) { + ps.onNext(j); + } + ps.onComplete(); + }; + + TestHelper.race(r1, r2); + + to + .awaitDone(5, TimeUnit.SECONDS) + .assertSubscribed().assertValueCount(500).assertComplete().assertNoErrors(); + } + } + + @Test + public void addRemoveRace() { + for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { + Observable o = Observable.never().cache(); + + TestObserver to = o.test(); + + TestHelper.race( + to::dispose, + o::test + ); + } + } +} diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCacheTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCacheTest.java index 11f8d5eccb..1fbd19d8f9 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCacheTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCacheTest.java @@ -270,34 +270,6 @@ public void take2() { cache.take(3).test().assertResult(1, 2, 3); } - @Test - public void subscribeEmitRace() { - for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { - final PublishSubject ps = PublishSubject.create(); - - final Observable cache = ps.cache(); - - cache.test(); - - final TestObserverEx to = new TestObserverEx<>(); - - Runnable r1 = () -> cache.subscribe(to); - - Runnable r2 = () -> { - for (int j = 0; j < 500; j++) { - ps.onNext(j); - } - ps.onComplete(); - }; - - TestHelper.race(r1, r2); - - to - .awaitDone(5, TimeUnit.SECONDS) - .assertSubscribed().assertValueCount(500).assertComplete().assertNoErrors(); - } - } - @Test public void cancelledUpFront() { final AtomicInteger call = new AtomicInteger(); @@ -312,20 +284,6 @@ public void cancelledUpFront() { assertEquals(1, call.get()); } - @Test - public void addRemoveRace() { - for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { - Observable o = Observable.never().cache(); - - TestObserver to = o.test(); - - TestHelper.race( - to::dispose, - o::test - ); - } - } - @Test public void valuesAreReclaimable() throws Exception { ConnectableObservable source =