From 40efe685ee08000c4c42fa8a7799daddf574f8ae Mon Sep 17 00:00:00 2001 From: jimi-21 Date: Tue, 17 Nov 2026 15:34:38 +0800 Subject: [PATCH] 4.x: Isolate Disposable race tests --- .../disposables/DisposableIsolatedTest.java | 35 ++++++++++++++ .../rxjava4/disposables/DisposableTest.java | 11 ----- .../CancellableDisposableIsolatedTest.java | 47 +++++++++++++++++++ .../CancellableDisposableTest.java | 18 ------- 4 files changed, 82 insertions(+), 29 deletions(-) create mode 100644 src/test/java/io/reactivex/rxjava4/disposables/DisposableIsolatedTest.java create mode 100644 src/test/java/io/reactivex/rxjava4/internal/disposables/CancellableDisposableIsolatedTest.java diff --git a/src/test/java/io/reactivex/rxjava4/disposables/DisposableIsolatedTest.java b/src/test/java/io/reactivex/rxjava4/disposables/DisposableIsolatedTest.java new file mode 100644 index 0000000000..cfb68d52fa --- /dev/null +++ b/src/test/java/io/reactivex/rxjava4/disposables/DisposableIsolatedTest.java @@ -0,0 +1,35 @@ +/* + * 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.disposables; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; + +import io.reactivex.rxjava4.core.RxJavaTest; +import io.reactivex.rxjava4.testsupport.TestHelper; + +@Isolated +public class DisposableIsolatedTest extends RxJavaTest { + + @Test + public void disposeRace() { + for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { + final Disposable d = Disposable.empty(); + + Runnable r = d::dispose; + + TestHelper.race(r, r); + } + } +} diff --git a/src/test/java/io/reactivex/rxjava4/disposables/DisposableTest.java b/src/test/java/io/reactivex/rxjava4/disposables/DisposableTest.java index 865fc1fd08..ea12bbea38 100644 --- a/src/test/java/io/reactivex/rxjava4/disposables/DisposableTest.java +++ b/src/test/java/io/reactivex/rxjava4/disposables/DisposableTest.java @@ -115,17 +115,6 @@ public void fromActionThrows() { } - @Test - public void disposeRace() { - for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { - final Disposable d = Disposable.empty(); - - Runnable r = d::dispose; - - TestHelper.race(r, r); - } - } - @Test public void fromSubscriptionNull() { assertThrows(NullPointerException.class, () -> { diff --git a/src/test/java/io/reactivex/rxjava4/internal/disposables/CancellableDisposableIsolatedTest.java b/src/test/java/io/reactivex/rxjava4/internal/disposables/CancellableDisposableIsolatedTest.java new file mode 100644 index 0000000000..73b4d6bef4 --- /dev/null +++ b/src/test/java/io/reactivex/rxjava4/internal/disposables/CancellableDisposableIsolatedTest.java @@ -0,0 +1,47 @@ +/* + * 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.disposables; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.concurrent.atomic.AtomicInteger; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; + +import io.reactivex.rxjava4.core.RxJavaTest; +import io.reactivex.rxjava4.functions.Cancellable; +import io.reactivex.rxjava4.testsupport.TestHelper; + +@Isolated +public class CancellableDisposableIsolatedTest extends RxJavaTest { + + @Test + public void disposeRace() { + + for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { + final AtomicInteger count = new AtomicInteger(); + + Cancellable c = count::getAndIncrement; + + final CancellableDisposable cd = new CancellableDisposable(c); + + Runnable r = cd::dispose; + + TestHelper.race(r, r); + + assertEquals(1, count.get()); + } + } +} diff --git a/src/test/java/io/reactivex/rxjava4/internal/disposables/CancellableDisposableTest.java b/src/test/java/io/reactivex/rxjava4/internal/disposables/CancellableDisposableTest.java index b6c31cb8c5..5eef2b196c 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/disposables/CancellableDisposableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/disposables/CancellableDisposableTest.java @@ -73,22 +73,4 @@ public void cancelThrows() { assertEquals(1, count.get()); } - @Test - public void disposeRace() { - - for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { - final AtomicInteger count = new AtomicInteger(); - - Cancellable c = count::getAndIncrement; - - final CancellableDisposable cd = new CancellableDisposable(c); - - Runnable r = cd::dispose; - - TestHelper.race(r, r); - - assertEquals(1, count.get()); - } - } - }