From e20f90769f09d94488e14aa1c20afcd84520c088 Mon Sep 17 00:00:00 2001 From: jimi-21 Date: Tue, 17 Nov 2026 16:00:23 +0800 Subject: [PATCH] 4.x: Isolate DisposableHelper race tests --- .../DisposableHelperIsolatedTest.java | 60 +++++++++++++++++++ .../disposables/DisposableHelperTest.java | 33 ---------- 2 files changed, 60 insertions(+), 33 deletions(-) create mode 100644 src/test/java/io/reactivex/rxjava4/internal/disposables/DisposableHelperIsolatedTest.java diff --git a/src/test/java/io/reactivex/rxjava4/internal/disposables/DisposableHelperIsolatedTest.java b/src/test/java/io/reactivex/rxjava4/internal/disposables/DisposableHelperIsolatedTest.java new file mode 100644 index 0000000000..6ed2038b36 --- /dev/null +++ b/src/test/java/io/reactivex/rxjava4/internal/disposables/DisposableHelperIsolatedTest.java @@ -0,0 +1,60 @@ +/* + * 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 java.util.concurrent.atomic.AtomicReference; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Isolated; + +import io.reactivex.rxjava4.core.RxJavaTest; +import io.reactivex.rxjava4.disposables.Disposable; +import io.reactivex.rxjava4.testsupport.TestHelper; + +@Isolated +public class DisposableHelperIsolatedTest extends RxJavaTest { + + @Test + public void disposeRace() { + for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { + final AtomicReference d = new AtomicReference<>(); + + Runnable r = () -> DisposableHelper.dispose(d); + + TestHelper.race(r, r); + } + } + + @Test + public void setReplace() { + for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { + final AtomicReference d = new AtomicReference<>(); + + Runnable r = () -> DisposableHelper.replace(d, Disposable.empty()); + + TestHelper.race(r, r); + } + } + + @Test + public void setRace() { + for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { + final AtomicReference d = new AtomicReference<>(); + + Runnable r = () -> DisposableHelper.set(d, Disposable.empty()); + + TestHelper.race(r, r); + } + } +} diff --git a/src/test/java/io/reactivex/rxjava4/internal/disposables/DisposableHelperTest.java b/src/test/java/io/reactivex/rxjava4/internal/disposables/DisposableHelperTest.java index 784ec7a1f0..6a1f29ccd8 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/disposables/DisposableHelperTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/disposables/DisposableHelperTest.java @@ -51,39 +51,6 @@ public void validationNull() { } } - @Test - public void disposeRace() { - for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { - final AtomicReference d = new AtomicReference<>(); - - Runnable r = () -> DisposableHelper.dispose(d); - - TestHelper.race(r, r); - } - } - - @Test - public void setReplace() { - for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { - final AtomicReference d = new AtomicReference<>(); - - Runnable r = () -> DisposableHelper.replace(d, Disposable.empty()); - - TestHelper.race(r, r); - } - } - - @Test - public void setRace() { - for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { - final AtomicReference d = new AtomicReference<>(); - - Runnable r = () -> DisposableHelper.set(d, Disposable.empty()); - - TestHelper.race(r, r); - } - } - @Test public void setReplaceNull() { final AtomicReference d = new AtomicReference<>();