diff --git a/build.gradle b/build.gradle index 015f8c8eb1..4906896d57 100644 --- a/build.gradle +++ b/build.gradle @@ -16,11 +16,13 @@ ext { reactiveStreamsVersion = "1.0.4" junitVersion = "4.13.2" testNgVersion = "7.12.0" - mockitoVersion = "4.11.0" + mockitoVersion = "5.23.0" + mockitoJUnitVersion = "5.23.0" jmhLibVersion = "1.37" guavaVersion = "33.6.0-jre" jupiterVersion = "6.1.1" jupiterLauncherVersion = "6.1.1" + junitPioneerVersion = "2.3.0" } def releaseTag = System.getenv("BUILD_TAG") @@ -38,8 +40,8 @@ repositories { } dependencies { - testImplementation "junit:junit:$junitVersion" testImplementation "org.mockito:mockito-core:$mockitoVersion" + testImplementation "org.mockito:mockito-junit-jupiter:$mockitoJUnitVersion" testImplementation "org.reactivestreams:reactive-streams-tck:$reactiveStreamsVersion" testImplementation "org.testng:testng:$testNgVersion" @@ -52,8 +54,9 @@ dependencies { testImplementation "org.junit.platform:junit-platform-commons:$jupiterLauncherVersion" testImplementation "org.junit.platform:junit-platform-launcher:$jupiterLauncherVersion" - testRuntimeOnly "org.junit.vintage:junit-vintage-engine:$jupiterVersion" testRuntimeOnly "org.junit.platform:junit-platform-launcher:$jupiterLauncherVersion" // already have this + + testImplementation "org.junit-pioneer:junit-pioneer:$junitPioneerVersion" } // === Experimental JDK handling for Outreach Program === diff --git a/src/main/java/io/reactivex/rxjava4/core/Scheduler.java b/src/main/java/io/reactivex/rxjava4/core/Scheduler.java index 9e70884b4a..042a3fcb00 100644 --- a/src/main/java/io/reactivex/rxjava4/core/Scheduler.java +++ b/src/main/java/io/reactivex/rxjava4/core/Scheduler.java @@ -451,15 +451,17 @@ public Disposable schedulePeriodically(@NonNull Runnable run, final long initial final long firstNowNanoseconds = now(TimeUnit.NANOSECONDS); final long firstStartInNanoseconds = firstNowNanoseconds + unit.toNanos(initialDelay); - Disposable d = schedule(new PeriodicTask(firstStartInNanoseconds, decoratedRun, firstNowNanoseconds, sd, - periodInNanoseconds), initialDelay, unit); + var task = new PeriodicTask(firstStartInNanoseconds, decoratedRun, firstNowNanoseconds, sd, + periodInNanoseconds); + + Disposable d = schedule(task, initialDelay, unit); if (d == EmptyDisposable.INSTANCE) { return d; } first.replace(d); - return sd; + return task; } /** @@ -495,7 +497,7 @@ public Scheduler share() { * Holds state and logic to calculate when the next delayed invocation * of this task has to happen (accounting for clock drifts). */ - final class PeriodicTask implements Runnable, SchedulerRunnableIntrospection { + final class PeriodicTask implements Runnable, SchedulerRunnableIntrospection, Disposable { @NonNull final Runnable decoratedRun; @NonNull @@ -546,6 +548,16 @@ public void run() { public Runnable getWrappedRunnable() { return this.decoratedRun; } + + @Override + public void dispose() { + sd.dispose(); + } + + @Override + public boolean isDisposed() { + return sd.isDisposed(); + } } /** diff --git a/src/main/java/io/reactivex/rxjava4/internal/schedulers/ParallelScheduler.java b/src/main/java/io/reactivex/rxjava4/internal/schedulers/ParallelScheduler.java index 69c4f0f3e2..cace6f6d0a 100644 --- a/src/main/java/io/reactivex/rxjava4/internal/schedulers/ParallelScheduler.java +++ b/src/main/java/io/reactivex/rxjava4/internal/schedulers/ParallelScheduler.java @@ -17,17 +17,19 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; +import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.Scheduler; import io.reactivex.rxjava4.disposables.*; import io.reactivex.rxjava4.exceptions.Exceptions; -import io.reactivex.rxjava4.internal.functions.Functions; +import io.reactivex.rxjava4.internal.functions.*; import io.reactivex.rxjava4.plugins.RxJavaPlugins; +import io.reactivex.rxjava4.schedulers.SchedulerRunnableIntrospection; /** * Scheduler with a configurable fixed amount of thread-pools. * @since 4.0.0 */ -public final class ParallelScheduler extends Scheduler { +public final class ParallelScheduler extends Scheduler implements SchedulerMultiWorkerSupport { static final ScheduledExecutorService[] SHUTDOWN; @@ -41,6 +43,10 @@ public final class ParallelScheduler extends Scheduler { final AtomicReference pool; + static final TrackingParallelWorker SHUTDOWN_TRACKING_WORKER; + + static final NonTrackingParallelWorker SHUTDOWN_NON_TRACKING_WORKER; + int n; /** @@ -53,6 +59,9 @@ public final class ParallelScheduler extends Scheduler { REJECTING = Executors.newSingleThreadScheduledExecutor(); REJECTING.shutdownNow(); + + SHUTDOWN_TRACKING_WORKER = new TrackingParallelWorker(REJECTING); + SHUTDOWN_NON_TRACKING_WORKER = new NonTrackingParallelWorker(REJECTING); } public ParallelScheduler(int parallelism, boolean tracking, ThreadFactory factory) { @@ -128,6 +137,35 @@ public Worker createWorker() { return new NonTrackingParallelWorker(pick()); } + @Override + public void createWorkers(int number, WorkerCallback callback) { + ObjectHelper.verifyPositive(number, "number > 0 required"); + ScheduledExecutorService[] current = pool.get(); + int c = current.length; + if (c == 0) { + for (int i = 0; i < number; i++) { + if (tracking) { + callback.onWorker(i, SHUTDOWN_TRACKING_WORKER); + } else { + callback.onWorker(i, SHUTDOWN_NON_TRACKING_WORKER); + } + } + } else { + int index = n % c; + for (int i = 0; i < number; i++) { + if (tracking) { + callback.onWorker(i, new TrackingParallelWorker(current[index])); + } else { + callback.onWorker(i, new NonTrackingParallelWorker(current[index])); + } + if (++index == c) { + index = 0; + } + } + n = index; + } + } + @Override public Disposable scheduleDirect(Runnable run) { ScheduledExecutorService exec = pick(); @@ -135,7 +173,8 @@ public Disposable scheduleDirect(Runnable run) { return Disposable.disposed(); } try { - return Disposable.fromFuture(exec.submit(RxJavaPlugins.onSchedule(run))); + var decoratedRun = RxJavaPlugins.onSchedule(run); + return createWrapper(exec.submit(decoratedRun), decoratedRun); } catch (RejectedExecutionException ex) { return Disposable.disposed(); } @@ -148,7 +187,8 @@ public Disposable scheduleDirect(Runnable run, long delay, TimeUnit unit) { return Disposable.disposed(); } try { - return Disposable.fromFuture(exec.schedule(RxJavaPlugins.onSchedule(run), delay, unit)); + var decoratedRun = RxJavaPlugins.onSchedule(run); + return createWrapper(exec.schedule(decoratedRun, delay, unit), decoratedRun); } catch (RejectedExecutionException ex) { return Disposable.disposed(); } @@ -160,8 +200,12 @@ public Disposable schedulePeriodicallyDirect(Runnable run, long initialDelay, lo if (exec == REJECTING) { return Disposable.disposed(); } + if (period <= 0) { + return super.schedulePeriodicallyDirect(run, initialDelay, period, unit); + } try { - return Disposable.fromFuture(exec.scheduleAtFixedRate(RxJavaPlugins.onSchedule(run), initialDelay, period, unit)); + var decoratedRun = RxJavaPlugins.onSchedule(run); + return createWrapper(exec.scheduleAtFixedRate(decoratedRun, initialDelay, period, unit), decoratedRun); } catch (RejectedExecutionException ex) { return Disposable.disposed(); } @@ -217,7 +261,7 @@ public Disposable schedule(Runnable run, long delay, TimeUnit unit) { // Not implementing a custom schedulePeriodically as it would require tracking the Future. - final class NonTrackingTask implements Callable, Disposable { + final class NonTrackingTask implements Callable, Disposable, SchedulerRunnableIntrospection { final Runnable actual; @@ -249,6 +293,41 @@ public void dispose() { public boolean isDisposed() { return disposed; } + + @Override + public @NonNull Runnable getWrappedRunnable() { + return actual; + } + } + } + + static DirectTaskWrapper createWrapper(Future future, Runnable run) { + return new DirectTaskWrapper(run, future); + } + + static final class DirectTaskWrapper implements Disposable, SchedulerRunnableIntrospection { + final Runnable actual; + final Future future; + volatile boolean disposed; + DirectTaskWrapper(Runnable actual, Future future) { + this.actual = actual; + this.future = future; + } + + @Override + public void dispose() { + disposed = true; + future.cancel(true); + } + + @Override + public boolean isDisposed() { + return disposed; + } + + @Override + public @NonNull Runnable getWrappedRunnable() { + return actual; } } @@ -309,7 +388,7 @@ public Disposable schedule(Runnable run, long delay, TimeUnit unit) { static final class TrackedAction extends AtomicReference - implements Callable, Disposable { + implements Callable, Disposable, SchedulerRunnableIntrospection { static final Future FINISHED; @@ -394,6 +473,11 @@ void setFuture(Future d) { } } } + + @Override + public @NonNull Runnable getWrappedRunnable() { + return actual; + } } } } diff --git a/src/main/java/io/reactivex/rxjava4/internal/schedulers/ScheduledRunnable.java b/src/main/java/io/reactivex/rxjava4/internal/schedulers/ScheduledRunnable.java index 08f4da71a5..e8d03e3a90 100644 --- a/src/main/java/io/reactivex/rxjava4/internal/schedulers/ScheduledRunnable.java +++ b/src/main/java/io/reactivex/rxjava4/internal/schedulers/ScheduledRunnable.java @@ -17,11 +17,13 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReferenceArray; +import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.disposables.*; import io.reactivex.rxjava4.plugins.RxJavaPlugins; +import io.reactivex.rxjava4.schedulers.SchedulerRunnableIntrospection; public final class ScheduledRunnable extends AtomicReferenceArray -implements Runnable, Callable, Disposable { +implements Runnable, Callable, Disposable, SchedulerRunnableIntrospection { @Serial private static final long serialVersionUID = -6120223772001106981L; @@ -176,4 +178,9 @@ public String toString() { return getClass().getSimpleName() + "[" + state + "]"; } + + @Override + public @NonNull Runnable getWrappedRunnable() { + return actual; + } } diff --git a/src/main/java/io/reactivex/rxjava4/internal/schedulers/SharedScheduler.java b/src/main/java/io/reactivex/rxjava4/internal/schedulers/SharedScheduler.java index 1bb8beeba6..abf833ff2e 100644 --- a/src/main/java/io/reactivex/rxjava4/internal/schedulers/SharedScheduler.java +++ b/src/main/java/io/reactivex/rxjava4/internal/schedulers/SharedScheduler.java @@ -17,9 +17,11 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.Scheduler; import io.reactivex.rxjava4.disposables.*; import io.reactivex.rxjava4.internal.disposables.DisposableHelper; +import io.reactivex.rxjava4.schedulers.SchedulerRunnableIntrospection; /** * A Scheduler implementation that uses one of the Workers from another Scheduler @@ -122,7 +124,7 @@ public long now(TimeUnit unit) { static final class SharedAction extends AtomicReference - implements Runnable, Disposable { + implements Runnable, Disposable, SchedulerRunnableIntrospection { @Serial private static final long serialVersionUID = 4949851341419870956L; @@ -186,6 +188,11 @@ void setFuture(Disposable d) { } } } + + @Override + public @NonNull Runnable getWrappedRunnable() { + return actual; + } } } } diff --git a/src/test/java/io/reactivex/rxjava4/completable/CompletableIsolatedTest.java b/src/test/java/io/reactivex/rxjava4/completable/CompletableIsolatedTest.java index acdaa53d46..22208fd654 100644 --- a/src/test/java/io/reactivex/rxjava4/completable/CompletableIsolatedTest.java +++ b/src/test/java/io/reactivex/rxjava4/completable/CompletableIsolatedTest.java @@ -13,10 +13,11 @@ package io.reactivex.rxjava4.completable; -import java.util.concurrent.*; +import static org.junit.jupiter.api.Assertions.*; + +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; -import org.junit.Assert; import org.junit.jupiter.api.parallel.Isolated; import io.reactivex.rxjava4.core.*; @@ -57,7 +58,7 @@ public void onComplete() { } }); - Assert.assertEquals("calls count mismatch", 6, calls.get()); - Assert.assertNull("error present", err.get()); + assertEquals(6, calls.get(), "calls count mismatch"); + assertNull(err.get(), "error present"); } } diff --git a/src/test/java/io/reactivex/rxjava4/completable/CompletableRetryTest.java b/src/test/java/io/reactivex/rxjava4/completable/CompletableRetryTest.java index 6f83319122..2867038338 100644 --- a/src/test/java/io/reactivex/rxjava4/completable/CompletableRetryTest.java +++ b/src/test/java/io/reactivex/rxjava4/completable/CompletableRetryTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.completable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/completable/CompletableTest.java b/src/test/java/io/reactivex/rxjava4/completable/CompletableTest.java index 2f409c6d4e..344888f9ab 100644 --- a/src/test/java/io/reactivex/rxjava4/completable/CompletableTest.java +++ b/src/test/java/io/reactivex/rxjava4/completable/CompletableTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.completable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -23,7 +23,7 @@ import java.util.concurrent.Flow.Publisher; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.*; import org.junit.jupiter.api.parallel.Isolated; import io.reactivex.rxjava4.annotations.NonNull; @@ -116,7 +116,7 @@ static final class NormalCompletable extends AtomicInteger { * @param n the expected number of subscriptions */ public void assertSubscriptions(int n) { - Assert.assertEquals(n, get()); + assertEquals(n, get()); } } @@ -139,7 +139,7 @@ static final class ErrorCompletable extends AtomicInteger { * @param n the expected number of subscriptions */ public void assertSubscriptions(int n) { - Assert.assertEquals(n, get()); + assertEquals(n, get()); } } @@ -172,11 +172,13 @@ public void concatSingleSource() { normal.assertSubscriptions(1); } - @Test(expected = TestException.class) + @Test public void concatSingleSourceThrows() { - Completable c = Completable.concatArray(error.completable); + assertThrows(TestException.class, () -> { + Completable c = Completable.concatArray(error.completable); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -188,18 +190,22 @@ public void concatMultipleSources() { normal.assertSubscriptions(3); } - @Test(expected = TestException.class) + @Test public void concatMultipleOneThrows() { - Completable c = Completable.concatArray(normal.completable, error.completable, normal.completable); + assertThrows(TestException.class, () -> { + Completable c = Completable.concatArray(normal.completable, error.completable, normal.completable); - c.blockingAwait(); + c.blockingAwait(); + }); } - @Test(expected = NullPointerException.class) + @Test public void concatMultipleOneIsNull() { - Completable c = Completable.concatArray(normal.completable, null); + assertThrows(NullPointerException.class, () -> { + Completable c = Completable.concatArray(normal.completable, null); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -209,11 +215,13 @@ public void concatIterableEmpty() { c.blockingAwait(); } - @Test(expected = NullPointerException.class) + @Test public void concatIterableIteratorNull() { - Completable c = Completable.concat((Iterable) () -> null); + assertThrows(NullPointerException.class, () -> { + Completable c = Completable.concat((Iterable) () -> null); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -234,41 +242,51 @@ public void concatIterableMany() { normal.assertSubscriptions(3); } - @Test(expected = TestException.class) + @Test public void concatIterableOneThrows() { - Completable c = Completable.concat(Collections.singleton(error.completable)); + assertThrows(TestException.class, () -> { + Completable c = Completable.concat(Collections.singleton(error.completable)); - c.blockingAwait(); + c.blockingAwait(); + }); } - @Test(expected = TestException.class) + @Test public void concatIterableManyOneThrows() { - Completable c = Completable.concat(Arrays.asList(normal.completable, error.completable)); + assertThrows(TestException.class, () -> { + Completable c = Completable.concat(Arrays.asList(normal.completable, error.completable)); - c.blockingAwait(); + c.blockingAwait(); + }); } - @Test(expected = TestException.class) + @Test public void concatIterableIterableThrows() { - Completable c = Completable.concat((Iterable) () -> { - throw new TestException(); - }); + assertThrows(TestException.class, () -> { + Completable c = Completable.concat((Iterable) () -> { + throw new TestException(); + }); - c.blockingAwait(); + c.blockingAwait(); + }); } - @Test(expected = TestException.class) + @Test public void concatIterableIteratorHasNextThrows() { - Completable c = Completable.concat(new IterableIteratorHasNextThrows()); + assertThrows(TestException.class, () -> { + Completable c = Completable.concat(new IterableIteratorHasNextThrows()); - c.blockingAwait(); + c.blockingAwait(); + }); } - @Test(expected = TestException.class) + @Test public void concatIterableIteratorNextThrows() { - Completable c = Completable.concat(new IterableIteratorNextThrows()); + assertThrows(TestException.class, () -> { + Completable c = Completable.concat(new IterableIteratorNextThrows()); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -278,11 +296,13 @@ public void concatObservableEmpty() { c.blockingAwait(); } - @Test(expected = TestException.class) + @Test public void concatObservableError() { - Completable c = Completable.concat(Flowable.error(TestException::new)); + assertThrows(TestException.class, () -> { + Completable c = Completable.concat(Flowable.error(TestException::new)); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -294,11 +314,13 @@ public void concatObservableSingle() { normal.assertSubscriptions(1); } - @Test(expected = TestException.class) + @Test public void concatObservableSingleThrows() { - Completable c = Completable.concat(Flowable.just(error.completable)); + assertThrows(TestException.class, () -> { + Completable c = Completable.concat(Flowable.just(error.completable)); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -310,11 +332,13 @@ public void concatObservableMany() { normal.assertSubscriptions(3); } - @Test(expected = TestException.class) + @Test public void concatObservableManyOneThrows() { - Completable c = Completable.concat(Flowable.just(normal.completable, error.completable)); + assertThrows(TestException.class, () -> { + Completable c = Completable.concat(Flowable.just(normal.completable, error.completable)); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -329,14 +353,16 @@ public void concatObservablePrefetch() { c.blockingAwait(); - Assert.assertEquals(Arrays.asList(5L, 4L, 4L), requested); + assertEquals(Arrays.asList(5L, 4L, 4L), requested); } - @Test(expected = NullPointerException.class) + @Test public void createOnSubscribeThrowsNPE() { - Completable c = Completable.unsafeCreate(_ -> { throw new NullPointerException(); }); + assertThrows(NullPointerException.class, () -> { + Completable c = Completable.unsafeCreate(_ -> { throw new NullPointerException(); }); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -349,11 +375,11 @@ public void createOnSubscribeThrowsRuntimeException() { c.blockingAwait(); - Assert.fail("Did not throw exception"); + fail("Did not throw exception"); } catch (NullPointerException ex) { if (!(ex.getCause() instanceof TestException)) { ex.printStackTrace(); - Assert.fail("Did not wrap the TestException but it returned: " + ex); + fail("Did not wrap the TestException but it returned: " + ex); } TestHelper.assertUndeliverable(errors, 0, TestException.class); @@ -373,53 +399,67 @@ public void defer() { normal.assertSubscriptions(1); } - @Test(expected = NullPointerException.class) + @Test public void deferReturnsNull() { - Completable c = Completable.defer(() -> null); + assertThrows(NullPointerException.class, () -> { + Completable c = Completable.defer(() -> null); - c.blockingAwait(); + c.blockingAwait(); + }); } - @Test(expected = TestException.class) + @Test public void deferFunctionThrows() { - Completable c = Completable.defer(() -> { throw new TestException(); }); + assertThrows(TestException.class, () -> { + Completable c = Completable.defer(() -> { throw new TestException(); }); - c.blockingAwait(); + c.blockingAwait(); + }); } - @Test(expected = TestException.class) + @Test public void deferErrorSource() { - Completable c = Completable.defer(() -> error.completable); + assertThrows(TestException.class, () -> { + Completable c = Completable.defer(() -> error.completable); - c.blockingAwait(); + c.blockingAwait(); + }); } - @Test(expected = TestException.class) + @Test public void errorSupplierNormal() { - Completable c = Completable.error(TestException::new); + assertThrows(TestException.class, () -> { + Completable c = Completable.error(TestException::new); - c.blockingAwait(); + c.blockingAwait(); + }); } - @Test(expected = NullPointerException.class) + @Test public void errorSupplierReturnsNull() { - Completable c = Completable.error(() -> null); + assertThrows(NullPointerException.class, () -> { + Completable c = Completable.error(() -> null); - c.blockingAwait(); + c.blockingAwait(); + }); } - @Test(expected = TestException.class) + @Test public void errorSupplierThrows() { - Completable c = Completable.error(() -> { throw new TestException(); }); + assertThrows(TestException.class, () -> { + Completable c = Completable.error(() -> { throw new TestException(); }); - c.blockingAwait(); + c.blockingAwait(); + }); } - @Test(expected = TestException.class) + @Test public void errorNormal() { - Completable c = Completable.error(new TestException()); + assertThrows(TestException.class, () -> { + Completable c = Completable.error(new TestException()); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -430,14 +470,16 @@ public void fromCallableNormal() { c.blockingAwait(); - Assert.assertEquals(1, calls.get()); + assertEquals(1, calls.get()); } - @Test(expected = TestException.class) + @Test public void fromCallableThrows() { - Completable c = Completable.fromCallable(() -> { throw new TestException(); }); + assertThrows(TestException.class, () -> { + Completable c = Completable.fromCallable(() -> { throw new TestException(); }); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -456,11 +498,13 @@ public void fromFlowableSome() { } } - @Test(expected = TestException.class) + @Test public void fromFlowableError() { - Completable c = Completable.fromPublisher(Flowable.error(TestException::new)); + assertThrows(TestException.class, () -> { + Completable c = Completable.fromPublisher(Flowable.error(TestException::new)); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -479,11 +523,13 @@ public void fromObservableSome() { } } - @Test(expected = TestException.class) + @Test public void fromObservableError() { - Completable c = Completable.fromObservable(Observable.error(TestException::new)); + assertThrows(TestException.class, () -> { + Completable c = Completable.fromObservable(Observable.error(TestException::new)); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -494,14 +540,16 @@ public void fromActionNormal() { c.blockingAwait(); - Assert.assertEquals(1, calls.get()); + assertEquals(1, calls.get()); } - @Test(expected = TestException.class) + @Test public void fromActionThrows() { - Completable c = Completable.fromAction(() -> { throw new TestException(); }); + assertThrows(TestException.class, () -> { + Completable c = Completable.fromAction(() -> { throw new TestException(); }); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -511,11 +559,13 @@ public void fromSingleNormal() { c.blockingAwait(); } - @Test(expected = TestException.class) + @Test public void fromSingleThrows() { - Completable c = Completable.fromSingle(Single.error(TestException::new)); + assertThrows(TestException.class, () -> { + Completable c = Completable.fromSingle(Single.error(TestException::new)); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -534,11 +584,13 @@ public void mergeSingleSource() { normal.assertSubscriptions(1); } - @Test(expected = TestException.class) + @Test public void mergeSingleSourceThrows() { - Completable c = Completable.mergeArray(error.completable); + assertThrows(TestException.class, () -> { + Completable c = Completable.mergeArray(error.completable); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -550,18 +602,22 @@ public void mergeMultipleSources() { normal.assertSubscriptions(3); } - @Test(expected = TestException.class) + @Test public void mergeMultipleOneThrows() { - Completable c = Completable.mergeArray(normal.completable, error.completable, normal.completable); + assertThrows(TestException.class, () -> { + Completable c = Completable.mergeArray(normal.completable, error.completable, normal.completable); - c.blockingAwait(); + c.blockingAwait(); + }); } - @Test(expected = NullPointerException.class) + @Test public void mergeMultipleOneIsNull() { - Completable c = Completable.mergeArray(normal.completable, null); + assertThrows(NullPointerException.class, () -> { + Completable c = Completable.mergeArray(normal.completable, null); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -571,11 +627,13 @@ public void mergeIterableEmpty() { c.blockingAwait(); } - @Test(expected = NullPointerException.class) + @Test public void mergeIterableIteratorNull() { - Completable c = Completable.merge((Iterable) () -> null); + assertThrows(NullPointerException.class, () -> { + Completable c = Completable.merge((Iterable) () -> null); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -596,41 +654,51 @@ public void mergeIterableMany() { normal.assertSubscriptions(3); } - @Test(expected = TestException.class) + @Test public void mergeIterableOneThrows() { - Completable c = Completable.merge(Collections.singleton(error.completable)); + assertThrows(TestException.class, () -> { + Completable c = Completable.merge(Collections.singleton(error.completable)); - c.blockingAwait(); + c.blockingAwait(); + }); } - @Test(expected = TestException.class) + @Test public void mergeIterableManyOneThrows() { - Completable c = Completable.merge(Arrays.asList(normal.completable, error.completable)); + assertThrows(TestException.class, () -> { + Completable c = Completable.merge(Arrays.asList(normal.completable, error.completable)); - c.blockingAwait(); + c.blockingAwait(); + }); } - @Test(expected = TestException.class) + @Test public void mergeIterableIterableThrows() { - Completable c = Completable.merge((Iterable) () -> { - throw new TestException(); - }); + assertThrows(TestException.class, () -> { + Completable c = Completable.merge((Iterable) () -> { + throw new TestException(); + }); - c.blockingAwait(); + c.blockingAwait(); + }); } - @Test(expected = TestException.class) + @Test public void mergeIterableIteratorHasNextThrows() { - Completable c = Completable.merge(new IterableIteratorHasNextThrows()); + assertThrows(TestException.class, () -> { + Completable c = Completable.merge(new IterableIteratorHasNextThrows()); - c.blockingAwait(); + c.blockingAwait(); + }); } - @Test(expected = TestException.class) + @Test public void mergeIterableIteratorNextThrows() { - Completable c = Completable.merge(new IterableIteratorNextThrows()); + assertThrows(TestException.class, () -> { + Completable c = Completable.merge(new IterableIteratorNextThrows()); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -640,11 +708,13 @@ public void mergeObservableEmpty() { c.blockingAwait(); } - @Test(expected = TestException.class) + @Test public void mergeObservableError() { - Completable c = Completable.merge(Flowable.error(TestException::new)); + assertThrows(TestException.class, () -> { + Completable c = Completable.merge(Flowable.error(TestException::new)); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -656,11 +726,13 @@ public void mergeObservableSingle() { normal.assertSubscriptions(1); } - @Test(expected = TestException.class) + @Test public void mergeObservableSingleThrows() { - Completable c = Completable.merge(Flowable.just(error.completable)); + assertThrows(TestException.class, () -> { + Completable c = Completable.merge(Flowable.just(error.completable)); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -672,11 +744,13 @@ public void mergeObservableMany() { normal.assertSubscriptions(3); } - @Test(expected = TestException.class) + @Test public void mergeObservableManyOneThrows() { - Completable c = Completable.merge(Flowable.just(normal.completable, error.completable)); + assertThrows(TestException.class, () -> { + Completable c = Completable.merge(Flowable.just(normal.completable, error.completable)); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -692,7 +766,7 @@ public void mergeObservableMaxConcurrent() { c.blockingAwait(); // FIXME this request pattern looks odd because all 10 completions trigger 1 requests - Assert.assertEquals(Arrays.asList(5L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L), requested); + assertEquals(Arrays.asList(5L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L), requested); } @Test @@ -711,11 +785,13 @@ public void mergeDelayErrorSingleSource() { normal.assertSubscriptions(1); } - @Test(expected = TestException.class) + @Test public void mergeDelayErrorSingleSourceThrows() { - Completable c = Completable.mergeArray(StandardConcurrentConfig.MAX_DELAY_ERRORS, error.completable); + assertThrows(TestException.class, () -> { + Completable c = Completable.mergeArray(StandardConcurrentConfig.MAX_DELAY_ERRORS, error.completable); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -738,11 +814,13 @@ public void mergeDelayErrorMultipleOneThrows() { } } - @Test(expected = NullPointerException.class) + @Test public void mergeDelayErrorMultipleOneIsNull() { - Completable c = Completable.mergeArray(StandardConcurrentConfig.MAX_DELAY_ERRORS, normal.completable, null); + assertThrows(NullPointerException.class, () -> { + Completable c = Completable.mergeArray(StandardConcurrentConfig.MAX_DELAY_ERRORS, normal.completable, null); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -752,11 +830,13 @@ public void mergeDelayErrorIterableEmpty() { c.blockingAwait(); } - @Test(expected = NullPointerException.class) + @Test public void mergeDelayErrorIterableIteratorNull() { - Completable c = Completable.merge((Iterable) () -> null, StandardConcurrentConfig.MAX_DELAY_ERRORS); + assertThrows(NullPointerException.class, () -> { + Completable c = Completable.merge((Iterable) () -> null, StandardConcurrentConfig.MAX_DELAY_ERRORS); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -778,11 +858,13 @@ public void mergeDelayErrorIterableMany() { normal.assertSubscriptions(3); } - @Test(expected = TestException.class) + @Test public void mergeDelayErrorIterableOneThrows() { - Completable c = Completable.merge(Collections.singleton(error.completable), StandardConcurrentConfig.MAX_DELAY_ERRORS); + assertThrows(TestException.class, () -> { + Completable c = Completable.merge(Collections.singleton(error.completable), StandardConcurrentConfig.MAX_DELAY_ERRORS); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -797,27 +879,33 @@ public void mergeDelayErrorIterableManyOneThrows() { } } - @Test(expected = TestException.class) + @Test public void mergeDelayErrorIterableIterableThrows() { - Completable c = Completable.merge((Iterable) () -> { - throw new TestException(); - }, StandardConcurrentConfig.MAX_DELAY_ERRORS); + assertThrows(TestException.class, () -> { + Completable c = Completable.merge((Iterable) () -> { + throw new TestException(); + }, StandardConcurrentConfig.MAX_DELAY_ERRORS); - c.blockingAwait(); + c.blockingAwait(); + }); } - @Test(expected = TestException.class) + @Test public void mergeDelayErrorIterableIteratorHasNextThrows() { - Completable c = Completable.merge(new IterableIteratorHasNextThrows(), StandardConcurrentConfig.MAX_DELAY_ERRORS); + assertThrows(TestException.class, () -> { + Completable c = Completable.merge(new IterableIteratorHasNextThrows(), StandardConcurrentConfig.MAX_DELAY_ERRORS); - c.blockingAwait(); + c.blockingAwait(); + }); } - @Test(expected = TestException.class) + @Test public void mergeDelayErrorIterableIteratorNextThrows() { - Completable c = Completable.merge(new IterableIteratorNextThrows(), StandardConcurrentConfig.MAX_DELAY_ERRORS); + assertThrows(TestException.class, () -> { + Completable c = Completable.merge(new IterableIteratorNextThrows(), StandardConcurrentConfig.MAX_DELAY_ERRORS); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -827,11 +915,13 @@ public void mergeDelayErrorObservableEmpty() { c.blockingAwait(); } - @Test(expected = TestException.class) + @Test public void mergeDelayErrorObservableError() { - Completable c = Completable.merge(Flowable.error(TestException::new), StandardConcurrentConfig.MAX_DELAY_ERRORS); + assertThrows(TestException.class, () -> { + Completable c = Completable.merge(Flowable.error(TestException::new), StandardConcurrentConfig.MAX_DELAY_ERRORS); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -843,11 +933,13 @@ public void mergeDelayErrorObservableSingle() { normal.assertSubscriptions(1); } - @Test(expected = TestException.class) + @Test public void mergeDelayErrorObservableSingleThrows() { - Completable c = Completable.merge(Flowable.just(error.completable), StandardConcurrentConfig.MAX_DELAY_ERRORS); + assertThrows(TestException.class, () -> { + Completable c = Completable.merge(Flowable.just(error.completable), StandardConcurrentConfig.MAX_DELAY_ERRORS); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -859,11 +951,13 @@ public void mergeDelayErrorObservableMany() { normal.assertSubscriptions(3); } - @Test(expected = TestException.class) + @Test public void mergeDelayErrorObservableManyOneThrows() { - Completable c = Completable.merge(Flowable.just(normal.completable, error.completable), StandardConcurrentConfig.MAX_DELAY_ERRORS); + assertThrows(TestException.class, () -> { + Completable c = Completable.merge(Flowable.just(normal.completable, error.completable), StandardConcurrentConfig.MAX_DELAY_ERRORS); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -879,7 +973,7 @@ public void mergeDelayErrorObservableMaxConcurrent() { c.blockingAwait(); // FIXME this request pattern looks odd because all 10 completions trigger 1 requests - Assert.assertEquals(Arrays.asList(5L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L), requested); + assertEquals(Arrays.asList(5L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L), requested); } @Test @@ -906,8 +1000,8 @@ public void onComplete() { Completable.never().subscribe(new CompletableTracer()); - Assert.assertTrue("onSubscribe not called", onSubscribeCalled.get()); - Assert.assertEquals("There were calls to onXXX methods", 0, calls.get()); + assertTrue(onSubscribeCalled.get(), "onSubscribe not called"); + assertEquals(0, calls.get(), "There were calls to onXXX methods"); } @Test @@ -951,11 +1045,11 @@ public void onError(Throwable e) { scheduler.advanceTimeBy(100, TimeUnit.MILLISECONDS); - Assert.assertEquals(0, calls.get()); + assertEquals(0, calls.get()); scheduler.advanceTimeBy(200, TimeUnit.MILLISECONDS); - Assert.assertEquals(1, calls.get()); + assertEquals(1, calls.get()); } @Test @@ -988,7 +1082,7 @@ public void onComplete() { Thread.sleep(200); - Assert.assertEquals(0, calls.get()); + assertEquals(0, calls.get()); } @Test @@ -1020,9 +1114,9 @@ public void onComplete() { } }); - Assert.assertEquals(1, dispose.get()); - Assert.assertTrue("Not disposed first", disposedFirst.get()); - Assert.assertNull(error.get()); + assertEquals(1, dispose.get()); + assertTrue(disposedFirst.get(), "Not disposed first"); + assertNull(error.get()); } @Test @@ -1053,9 +1147,9 @@ public void onComplete() { } }); - Assert.assertEquals(1, dispose.get()); - Assert.assertFalse("Disposed first", disposedFirst.get()); - Assert.assertNull(error.get()); + assertEquals(1, dispose.get()); + assertFalse(disposedFirst.get(), "Disposed first"); + assertNull(error.get()); } @Test @@ -1086,9 +1180,9 @@ public void onComplete() { } }); - Assert.assertEquals(1, dispose.get()); - Assert.assertTrue("Not disposed first", disposedFirst.get()); - Assert.assertFalse(complete.get()); + assertEquals(1, dispose.get()); + assertTrue(disposedFirst.get(), "Not disposed first"); + assertFalse(complete.get()); } @Test @@ -1119,46 +1213,54 @@ public void onComplete() { } }); - Assert.assertEquals(1, dispose.get()); - Assert.assertFalse("Disposed first", disposedFirst.get()); - Assert.assertFalse(complete.get()); + assertEquals(1, dispose.get()); + assertFalse(disposedFirst.get(), "Disposed first"); + assertFalse(complete.get()); } - @Test(expected = NullPointerException.class) + @Test public void usingMapperReturnsNull() { - Completable c = Completable.using( - () -> 1, - (Function) _ -> null, - _ -> { }); + assertThrows(NullPointerException.class, () -> { + Completable c = Completable.using( + () -> 1, + (Function) _ -> null, + _ -> { }); - c.blockingAwait(); + c.blockingAwait(); + }); } - @Test(expected = TestException.class) + @Test public void usingResourceThrows() { - Completable c = Completable.using(() -> { throw new TestException(); }, - (Function) _ -> normal.completable, - _ -> { }); + assertThrows(TestException.class, () -> { + Completable c = Completable.using(() -> { throw new TestException(); }, + (Function) _ -> normal.completable, + _ -> { }); - c.blockingAwait(); + c.blockingAwait(); + }); } - @Test(expected = TestException.class) + @Test public void usingMapperThrows() { - Completable c = Completable.using(() -> 1, - (Function) _ -> { throw new TestException(); }, - _ -> { }); + assertThrows(TestException.class, () -> { + Completable c = Completable.using(() -> 1, + (Function) _ -> { throw new TestException(); }, + _ -> { }); - c.blockingAwait(); + c.blockingAwait(); + }); } - @Test(expected = TestException.class) + @Test public void usingDisposerThrows() { - Completable c = Completable.using(() -> 1, - (Function) _ -> normal.completable, - _ -> { throw new TestException(); }); + assertThrows(TestException.class, () -> { + Completable c = Completable.using(() -> 1, + (Function) _ -> normal.completable, + _ -> { throw new TestException(); }); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -1177,11 +1279,13 @@ public void concatWithNormal() { normal.assertSubscriptions(2); } - @Test(expected = TestException.class) + @Test public void concatWithError() { - Completable c = normal.completable.concatWith(error.completable); + assertThrows(TestException.class, () -> { + Completable c = normal.completable.concatWith(error.completable); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -1210,7 +1314,7 @@ public void onComplete() { Thread.sleep(100); - Assert.assertFalse("Already done", done.get()); + assertFalse(done.get(), "Already done"); int timeout = 10; @@ -1218,9 +1322,9 @@ public void onComplete() { Thread.sleep(100); } - Assert.assertTrue("Not done", done.get()); + assertTrue(done.get(), "Not done"); - Assert.assertNull(error.get()); + assertNull(error.get()); } @Test @@ -1250,12 +1354,12 @@ public void onComplete() { scheduler.advanceTimeBy(100, TimeUnit.MILLISECONDS); - Assert.assertTrue(error.get().toString(), error.get() instanceof TestException); - Assert.assertFalse("Already done", done.get()); + assertTrue(error.get() instanceof TestException, error.get().toString()); + assertFalse(done.get(), "Already done"); scheduler.advanceTimeBy(100, TimeUnit.MILLISECONDS); - Assert.assertFalse("Already done", done.get()); + assertFalse(done.get(), "Already done"); } @Test @@ -1284,13 +1388,13 @@ public void onComplete() { Thread.sleep(100); - Assert.assertFalse("Already done", done.get()); - Assert.assertNull(error.get()); + assertFalse(done.get(), "Already done"); + assertNull(error.get()); Thread.sleep(200); - Assert.assertFalse("Already done", done.get()); - Assert.assertTrue(error.get() instanceof TestException); + assertFalse(done.get(), "Already done"); + assertTrue(error.get() instanceof TestException); } @Test @@ -1301,7 +1405,7 @@ public void doOnCompleteNormal() { c.blockingAwait(); - Assert.assertEquals(1, calls.get()); + assertEquals(1, calls.get()); } @Test @@ -1312,19 +1416,21 @@ public void doOnCompleteError() { try { c.blockingAwait(); - Assert.fail("Failed to throw TestException"); + fail("Failed to throw TestException"); } catch (TestException ex) { // expected } - Assert.assertEquals(0, calls.get()); + assertEquals(0, calls.get()); } - @Test(expected = TestException.class) + @Test public void doOnCompleteThrows() { - Completable c = normal.completable.doOnComplete(() -> { throw new TestException(); }); + assertThrows(TestException.class, () -> { + Completable c = normal.completable.doOnComplete(() -> { throw new TestException(); }); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -1335,7 +1441,7 @@ public void doOnDisposeNormalDoesntCall() { c.blockingAwait(); - Assert.assertEquals(0, calls.get()); + assertEquals(0, calls.get()); } @Test @@ -1346,11 +1452,11 @@ public void doOnDisposeErrorDoesntCall() { try { c.blockingAwait(); - Assert.fail("No exception thrown"); + fail("No exception thrown"); } catch (TestException ex) { // expected } - Assert.assertEquals(0, calls.get()); + assertEquals(0, calls.get()); } @Test @@ -1376,7 +1482,7 @@ public void onComplete() { } }); - Assert.assertEquals(1, calls.get()); + assertEquals(1, calls.get()); } @Test @@ -1416,7 +1522,7 @@ public void doOnErrorNoError() { c.blockingAwait(); - Assert.assertNull(error.get()); + assertNull(error.get()); } @Test @@ -1427,12 +1533,12 @@ public void doOnErrorHasError() { try { c.blockingAwait(); - Assert.fail("Did not throw exception"); + fail("Did not throw exception"); } catch (Throwable e) { // expected } - Assert.assertTrue(err.get() instanceof TestException); + assertTrue(err.get() instanceof TestException); } @Test @@ -1445,9 +1551,9 @@ public void doOnErrorThrows() { c.blockingAwait(); } catch (CompositeException ex) { List a = ex.getExceptions(); - Assert.assertEquals(2, a.size()); - Assert.assertTrue(a.get(0) instanceof TestException); - Assert.assertTrue(a.get(1) instanceof IllegalStateException); + assertEquals(2, a.size()); + assertTrue(a.get(0) instanceof TestException); + assertTrue(a.get(1) instanceof IllegalStateException); } } @@ -1461,14 +1567,16 @@ public void doOnSubscribeNormal() { c.blockingAwait(); } - Assert.assertEquals(10, calls.get()); + assertEquals(10, calls.get()); } - @Test(expected = TestException.class) + @Test public void doOnSubscribeThrows() { - Completable c = normal.completable.doOnSubscribe(_ -> { throw new TestException(); }); + assertThrows(TestException.class, () -> { + Completable c = normal.completable.doOnSubscribe(_ -> { throw new TestException(); }); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -1479,7 +1587,7 @@ public void doOnTerminateNormal() { c.blockingAwait(); - Assert.assertEquals(1, calls.get()); + assertEquals(1, calls.get()); } @Test @@ -1490,19 +1598,21 @@ public void doOnTerminateError() { try { c.blockingAwait(); - Assert.fail("Did dot throw exception"); + fail("Did dot throw exception"); } catch (TestException ex) { // expected } - Assert.assertEquals(1, calls.get()); + assertEquals(1, calls.get()); } - @Test(expected = NullPointerException.class) + @Test public void liftReturnsNull() { - Completable c = normal.completable.lift(_ -> null); + assertThrows(NullPointerException.class, () -> { + Completable c = normal.completable.lift(_ -> null); - c.blockingAwait(); + c.blockingAwait(); + }); } static final class CompletableOperatorSwap implements CompletableOperator { @@ -1529,11 +1639,13 @@ public void onSubscribe(Disposable d) { } } - @Test(expected = TestException.class) + @Test public void liftOnCompleteError() { - Completable c = normal.completable.lift(new CompletableOperatorSwap()); + assertThrows(TestException.class, () -> { + Completable c = normal.completable.lift(new CompletableOperatorSwap()); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -1581,8 +1693,8 @@ public void onError(Throwable e) { cdl.await(); - Assert.assertNull(err.get()); - Assert.assertTrue(name.get().startsWith("RxComputation")); + assertNull(err.get()); + assertTrue(name.get().startsWith("RxComputation")); } @Test @@ -1615,8 +1727,8 @@ public void onError(Throwable e) { cdl.await(); - Assert.assertTrue(err.get() instanceof TestException); - Assert.assertTrue(name.get().startsWith("RxComputation")); + assertTrue(err.get() instanceof TestException); + assertTrue(name.get().startsWith("RxComputation")); } @Test @@ -1626,11 +1738,13 @@ public void onErrorComplete() { c.blockingAwait(); } - @Test(expected = TestException.class) + @Test public void onErrorCompleteFalse() { - Completable c = error.completable.onErrorComplete(IllegalStateException.class::isInstance); + assertThrows(TestException.class, () -> { + Completable c = error.completable.onErrorComplete(IllegalStateException.class::isInstance); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -1639,7 +1753,7 @@ public void onErrorResumeNextFunctionReturnsNull() { try { c.blockingAwait(); - Assert.fail("Did not throw an exception"); + fail("Did not throw an exception"); } catch (CompositeException ex) { List errors = ex.getExceptions(); TestHelper.assertError(errors, 0, TestException.class); @@ -1655,13 +1769,13 @@ public void onErrorResumeNextFunctionThrows() { try { c.blockingAwait(); - Assert.fail("Did not throw an exception"); + fail("Did not throw an exception"); } catch (CompositeException ex) { List a = ex.getExceptions(); - Assert.assertEquals(2, a.size()); - Assert.assertTrue(a.get(0) instanceof TestException); - Assert.assertTrue(a.get(1) instanceof TestException); + assertEquals(2, a.size()); + assertTrue(a.get(0) instanceof TestException); + assertTrue(a.get(1) instanceof TestException); } } @@ -1672,18 +1786,22 @@ public void onErrorResumeNextNormal() { c.blockingAwait(); } - @Test(expected = TestException.class) + @Test public void onErrorResumeNextError() { - Completable c = error.completable.onErrorResumeNext((Function) _ -> error.completable); + assertThrows(TestException.class, () -> { + Completable c = error.completable.onErrorResumeNext((Function) _ -> error.completable); - c.blockingAwait(); + c.blockingAwait(); + }); } - @Test(expected = TestException.class) + @Test public void repeatError() { - Completable c = error.completable.repeat(); + assertThrows(TestException.class, () -> { + Completable c = error.completable.repeat(); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -1697,7 +1815,7 @@ public void repeat5Times() { c.blockingAwait(); - Assert.assertEquals(5, calls.get()); + assertEquals(5, calls.get()); } @Test @@ -1711,7 +1829,7 @@ public void repeat1Time() { c.blockingAwait(); - Assert.assertEquals(1, calls.get()); + assertEquals(1, calls.get()); } @Test @@ -1725,7 +1843,7 @@ public void repeat0Time() { c.blockingAwait(); - Assert.assertEquals(0, calls.get()); + assertEquals(0, calls.get()); } @Test @@ -1740,7 +1858,7 @@ public void repeatUntilNormal() { c.blockingAwait(); - Assert.assertEquals(5, calls.get()); + assertEquals(5, calls.get()); } @Test @@ -1764,18 +1882,22 @@ public void retry5Times() { c.blockingAwait(); } - @Test(expected = TestException.class) + @Test public void retryBiPredicate5Times() { - Completable c = error.completable.retry((n, _) -> n < 5); + assertThrows(TestException.class, () -> { + Completable c = error.completable.retry((n, _) -> n < 5); - c.blockingAwait(); + c.blockingAwait(); + }); } - @Test(expected = TestException.class) + @Test public void retryTimes5Error() { - Completable c = error.completable.retry(5); + assertThrows(TestException.class, () -> { + Completable c = error.completable.retry(5); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -1793,16 +1915,20 @@ public void retryTimes5Normal() { assertEquals(6, calls.get()); } - @Test(expected = IllegalArgumentException.class) + @Test public void retryNegativeTimes() { - normal.completable.retry(-1); + assertThrows(IllegalArgumentException.class, () -> { + normal.completable.retry(-1); + }); } - @Test(expected = TestException.class) + @Test public void retryPredicateError() { - Completable c = error.completable.retry(_ -> false); + assertThrows(TestException.class, () -> { + Completable c = error.completable.retry(_ -> false); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -1846,7 +1972,7 @@ public void subscribe() throws InterruptedException { Thread.sleep(150); - Assert.assertTrue("Not completed", complete.get()); + assertTrue(complete.get(), "Not completed"); assertTrue(d.isDisposed()); } @@ -1867,7 +1993,7 @@ public void subscribeDispose() throws InterruptedException { Thread.sleep(150); - Assert.assertFalse("Completed", complete.get()); + assertFalse(complete.get(), "Completed"); } @Test @@ -1876,8 +2002,8 @@ public void subscribeTwoCallbacksNormal() { final AtomicBoolean complete = new AtomicBoolean(); normal.completable.subscribe(() -> complete.set(true), err::set); - Assert.assertNull(err.get()); - Assert.assertTrue("Not completed", complete.get()); + assertNull(err.get()); + assertTrue(complete.get(), "Not completed"); } @Test @@ -1886,8 +2012,8 @@ public void subscribeTwoCallbacksError() { final AtomicBoolean complete = new AtomicBoolean(); error.completable.subscribe(() -> complete.set(true), err::set); - Assert.assertTrue(err.get() instanceof TestException); - Assert.assertFalse("Not completed", complete.get()); + assertTrue(err.get() instanceof TestException); + assertFalse(complete.get(), "Not completed"); } @Test @@ -1897,7 +2023,7 @@ public void subscribeTwoCallbacksCompleteThrows() { final AtomicReference err = new AtomicReference<>(); normal.completable.subscribe(() -> { throw new TestException(); }, err::set); - Assert.assertNull(err.get()); + assertNull(err.get()); TestHelper.assertUndeliverable(errors, 0, TestException.class); } finally { RxJavaPlugins.reset(); @@ -1944,7 +2070,7 @@ public void subscribeActionNormal() { normal.completable.subscribe(() -> run.set(true)); - Assert.assertTrue("Not completed", run.get()); + assertTrue(run.get(), "Not completed"); } @Test @@ -1955,7 +2081,7 @@ public void subscribeActionError() { error.completable.subscribe(() -> run.set(true)); - Assert.assertFalse("Completed", run.get()); + assertFalse(run.get(), "Completed"); TestHelper.assertError(errors, 0, OnErrorNotImplementedException.class); } finally { @@ -1996,7 +2122,7 @@ public void subscribeOnNormal() { c.blockingAwait(); - Assert.assertTrue(name.get().startsWith("RxComputation")); + assertTrue(name.get().startsWith("RxComputation")); } @Test @@ -2010,12 +2136,12 @@ public void subscribeOnError() { try { c.blockingAwait(); - Assert.fail("No exception thrown"); + fail("No exception thrown"); } catch (TestException ex) { // expected } - Assert.assertTrue(name.get().startsWith("RxComputation")); + assertTrue(name.get().startsWith("RxComputation")); } @Test @@ -2071,9 +2197,11 @@ public void toFlowableNormal() { normal.completable.toFlowable().blockingForEach(Functions.emptyConsumer()); } - @Test(expected = TestException.class) + @Test public void toFlowableError() { - error.completable.toFlowable().blockingForEach(Functions.emptyConsumer()); + assertThrows(TestException.class, () -> { + error.completable.toFlowable().blockingForEach(Functions.emptyConsumer()); + }); } @Test @@ -2081,39 +2209,49 @@ public void toObservableNormal() { normal.completable.toObservable().blockingForEach(Functions.emptyConsumer()); } - @Test(expected = TestException.class) + @Test public void toObservableError() { - error.completable.toObservable().blockingForEach(Functions.emptyConsumer()); + assertThrows(TestException.class, () -> { + error.completable.toObservable().blockingForEach(Functions.emptyConsumer()); + }); } @Test public void toSingleSupplierNormal() { - Assert.assertEquals((Object)1, normal.completable.toSingle(() -> 1).blockingGet()); + assertEquals((Object)1, normal.completable.toSingle(() -> 1).blockingGet()); } - @Test(expected = TestException.class) + @Test public void toSingleSupplierError() { - error.completable.toSingle(() -> 1).blockingGet(); + assertThrows(TestException.class, () -> { + error.completable.toSingle(() -> 1).blockingGet(); + }); } - @Test(expected = NullPointerException.class) + @Test public void toSingleSupplierReturnsNull() { - normal.completable.toSingle(() -> null).blockingGet(); + assertThrows(NullPointerException.class, () -> { + normal.completable.toSingle(() -> null).blockingGet(); + }); } - @Test(expected = TestException.class) + @Test public void toSingleSupplierThrows() { - normal.completable.toSingle(() -> { throw new TestException(); }).blockingGet(); + assertThrows(TestException.class, () -> { + normal.completable.toSingle(() -> { throw new TestException(); }).blockingGet(); + }); } - @Test(expected = TestException.class) + @Test public void toSingleDefaultError() { - error.completable.toSingleDefault(1).blockingGet(); + assertThrows(TestException.class, () -> { + error.completable.toSingleDefault(1).blockingGet(); + }); } @Test public void toSingleDefaultNormal() { - Assert.assertEquals((Integer)1, normal.completable.toSingleDefault(1).blockingGet()); + assertEquals((Integer)1, normal.completable.toSingleDefault(1).blockingGet()); } @Test @@ -2146,7 +2284,7 @@ public void onComplete() { cdl.await(); - Assert.assertTrue(name.get().startsWith("RxComputation")); + assertTrue(name.get().startsWith("RxComputation")); } @Test @@ -2185,15 +2323,15 @@ public void ambArrayOneFires() { c.subscribe(() -> complete.set(true)); - Assert.assertTrue("First subject no subscribers", pp1.hasSubscribers()); - Assert.assertTrue("Second subject no subscribers", pp2.hasSubscribers()); + assertTrue(pp1.hasSubscribers(), "First subject no subscribers"); + assertTrue(pp2.hasSubscribers(), "Second subject no subscribers"); pp1.onComplete(); - Assert.assertFalse("First subject has subscribers", pp1.hasSubscribers()); - Assert.assertFalse("Second subject has subscribers", pp2.hasSubscribers()); + assertFalse(pp1.hasSubscribers(), "First subject has subscribers"); + assertFalse(pp2.hasSubscribers(), "Second subject has subscribers"); - Assert.assertTrue("Not completed", complete.get()); + assertTrue(complete.get(), "Not completed"); } @Test @@ -2211,15 +2349,15 @@ public void ambArrayOneFiresError() { c.subscribe(Functions.EMPTY_ACTION, complete::set); - Assert.assertTrue("First subject no subscribers", pp1.hasSubscribers()); - Assert.assertTrue("Second subject no subscribers", pp2.hasSubscribers()); + assertTrue(pp1.hasSubscribers(), "First subject no subscribers"); + assertTrue(pp2.hasSubscribers(), "Second subject no subscribers"); pp1.onError(new TestException()); - Assert.assertFalse("First subject has subscribers", pp1.hasSubscribers()); - Assert.assertFalse("Second subject has subscribers", pp2.hasSubscribers()); + assertFalse(pp1.hasSubscribers(), "First subject has subscribers"); + assertFalse(pp2.hasSubscribers(), "Second subject has subscribers"); - Assert.assertTrue("Not completed", complete.get() instanceof TestException); + assertTrue(complete.get() instanceof TestException, "Not completed"); } @Test @@ -2237,15 +2375,15 @@ public void ambArraySecondFires() { c.subscribe(() -> complete.set(true)); - Assert.assertTrue("First subject no subscribers", pp1.hasSubscribers()); - Assert.assertTrue("Second subject no subscribers", pp2.hasSubscribers()); + assertTrue(pp1.hasSubscribers(), "First subject no subscribers"); + assertTrue(pp2.hasSubscribers(), "Second subject no subscribers"); pp2.onComplete(); - Assert.assertFalse("First subject has subscribers", pp1.hasSubscribers()); - Assert.assertFalse("Second subject has subscribers", pp2.hasSubscribers()); + assertFalse(pp1.hasSubscribers(), "First subject has subscribers"); + assertFalse(pp2.hasSubscribers(), "Second subject has subscribers"); - Assert.assertTrue("Not completed", complete.get()); + assertTrue(complete.get(), "Not completed"); } @Test @@ -2263,15 +2401,15 @@ public void ambArraySecondFiresError() { c.subscribe(Functions.EMPTY_ACTION, complete::set); - Assert.assertTrue("First subject no subscribers", pp1.hasSubscribers()); - Assert.assertTrue("Second subject no subscribers", pp2.hasSubscribers()); + assertTrue(pp1.hasSubscribers(), "First subject no subscribers"); + assertTrue(pp2.hasSubscribers(), "Second subject no subscribers"); pp2.onError(new TestException()); - Assert.assertFalse("First subject has subscribers", pp1.hasSubscribers()); - Assert.assertFalse("Second subject has subscribers", pp2.hasSubscribers()); + assertFalse(pp1.hasSubscribers(), "First subject has subscribers"); + assertFalse(pp2.hasSubscribers(), "Second subject has subscribers"); - Assert.assertTrue("Not completed", complete.get() instanceof TestException); + assertTrue(complete.get() instanceof TestException, "Not completed"); } @Test @@ -2368,15 +2506,15 @@ public void ambWithArrayOneFires() { c.subscribe(() -> complete.set(true)); - Assert.assertTrue("First subject no subscribers", pp1.hasSubscribers()); - Assert.assertTrue("Second subject no subscribers", pp2.hasSubscribers()); + assertTrue(pp1.hasSubscribers(), "First subject no subscribers"); + assertTrue(pp2.hasSubscribers(), "Second subject no subscribers"); pp1.onComplete(); - Assert.assertFalse("First subject has subscribers", pp1.hasSubscribers()); - Assert.assertFalse("Second subject has subscribers", pp2.hasSubscribers()); + assertFalse(pp1.hasSubscribers(), "First subject has subscribers"); + assertFalse(pp2.hasSubscribers(), "Second subject has subscribers"); - Assert.assertTrue("Not completed", complete.get()); + assertTrue(complete.get(), "Not completed"); } @Test @@ -2394,15 +2532,15 @@ public void ambWithArrayOneFiresError() { c.subscribe(Functions.EMPTY_ACTION, complete::set); - Assert.assertTrue("First subject no subscribers", pp1.hasSubscribers()); - Assert.assertTrue("Second subject no subscribers", pp2.hasSubscribers()); + assertTrue(pp1.hasSubscribers(), "First subject no subscribers"); + assertTrue(pp2.hasSubscribers(), "Second subject no subscribers"); pp1.onError(new TestException()); - Assert.assertFalse("First subject has subscribers", pp1.hasSubscribers()); - Assert.assertFalse("Second subject has subscribers", pp2.hasSubscribers()); + assertFalse(pp1.hasSubscribers(), "First subject has subscribers"); + assertFalse(pp2.hasSubscribers(), "Second subject has subscribers"); - Assert.assertTrue("Not completed", complete.get() instanceof TestException); + assertTrue(complete.get() instanceof TestException, "Not completed"); } @Test @@ -2420,15 +2558,15 @@ public void ambWithArraySecondFires() { c.subscribe(() -> complete.set(true)); - Assert.assertTrue("First subject no subscribers", pp1.hasSubscribers()); - Assert.assertTrue("Second subject no subscribers", pp2.hasSubscribers()); + assertTrue(pp1.hasSubscribers(), "First subject no subscribers"); + assertTrue(pp2.hasSubscribers(), "Second subject no subscribers"); pp2.onComplete(); - Assert.assertFalse("First subject has subscribers", pp1.hasSubscribers()); - Assert.assertFalse("Second subject has subscribers", pp2.hasSubscribers()); + assertFalse(pp1.hasSubscribers(), "First subject has subscribers"); + assertFalse(pp2.hasSubscribers(), "Second subject has subscribers"); - Assert.assertTrue("Not completed", complete.get()); + assertTrue(complete.get(), "Not completed"); } @Test @@ -2446,15 +2584,15 @@ public void ambWithArraySecondFiresError() { c.subscribe(Functions.EMPTY_ACTION, complete::set); - Assert.assertTrue("First subject no subscribers", pp1.hasSubscribers()); - Assert.assertTrue("Second subject no subscribers", pp2.hasSubscribers()); + assertTrue(pp1.hasSubscribers(), "First subject no subscribers"); + assertTrue(pp2.hasSubscribers(), "Second subject no subscribers"); pp2.onError(new TestException()); - Assert.assertFalse("First subject has subscribers", pp1.hasSubscribers()); - Assert.assertFalse("Second subject has subscribers", pp2.hasSubscribers()); + assertFalse(pp1.hasSubscribers(), "First subject has subscribers"); + assertFalse(pp2.hasSubscribers(), "Second subject has subscribers"); - Assert.assertTrue("Not completed", complete.get() instanceof TestException); + assertTrue(complete.get() instanceof TestException, "Not completed"); } @Test @@ -2468,7 +2606,7 @@ public void startWithCompletableNormal() { c.blockingAwait(); - Assert.assertTrue("Did not start with other", run.get()); + assertTrue(run.get(), "Did not start with other"); normal.assertSubscriptions(1); } @@ -2478,7 +2616,7 @@ public void startWithCompletableError() { try { c.blockingAwait(); - Assert.fail("Did not throw TestException"); + fail("Did not throw TestException"); } catch (TestException ex) { normal.assertSubscriptions(0); error.assertSubscriptions(1); @@ -2498,7 +2636,7 @@ public void startWithFlowableNormal() { c.subscribe(ts); - Assert.assertTrue("Did not start with other", run.get()); + assertTrue(run.get(), "Did not start with other"); normal.assertSubscriptions(1); ts.assertValue(1); @@ -2535,7 +2673,7 @@ public void startWithObservableNormal() { o.subscribe(to); - Assert.assertTrue("Did not start with other", run.get()); + assertTrue(run.get(), "Did not start with other"); normal.assertSubscriptions(1); to.assertValue(1); @@ -2583,15 +2721,14 @@ private static void expectUncaughtTestException(Action action) { Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), error)); try { action.run(); - assertEquals("Should have received exactly 1 exception", 1, handler.count); + assertEquals(1, handler.count, "Should have received exactly 1 exception"); Throwable caught = handler.caught; while (caught != null) { if (caught instanceof TestException) { break; } if (caught == caught.getCause()) { break; } caught = caught.getCause(); } - assertTrue("A TestException should have been delivered to the handler", - caught instanceof TestException); + assertTrue( caught instanceof TestException, "A TestException should have been delivered to the handler"); } catch (Throwable ex) { throw ExceptionHelper.wrapOrThrow(ex); } finally { @@ -2644,8 +2781,8 @@ public void usingFactoryReturnsNullAndDisposerThrows() { assertEquals(2, listEx.size()); - assertTrue(listEx.get(0).toString(), listEx.get(0) instanceof NullPointerException); - assertTrue(listEx.get(1).toString(), listEx.get(1) instanceof TestException); + assertTrue(listEx.get(0) instanceof NullPointerException, listEx.get(0).toString()); + assertTrue(listEx.get(1) instanceof TestException, listEx.get(1).toString()); } @Test @@ -2659,7 +2796,7 @@ public void subscribeReportsUnsubscribedOnError() { stringSubject.onError(new TestException()); - assertTrue("Not unsubscribed?", completableSubscription.isDisposed()); + assertTrue(completableSubscription.isDisposed(), "Not unsubscribed?"); TestHelper.assertError(errors, 0, OnErrorNotImplementedException.class); } finally { @@ -2676,7 +2813,7 @@ public void subscribeActionReportsUnsubscribed() { stringSubject.onComplete(); - assertTrue("Not unsubscribed?", completableSubscription.isDisposed()); + assertTrue(completableSubscription.isDisposed(), "Not unsubscribed?"); } @Test @@ -2694,8 +2831,8 @@ public void subscribeActionReportsUnsubscribedAfter() { stringSubject.onComplete(); - assertTrue("Not unsubscribed?", completableSubscription.isDisposed()); - assertNotNull("Unsubscribed before the call to onComplete", disposableRef.get()); + assertTrue(completableSubscription.isDisposed(), "Not unsubscribed?"); + assertNotNull(disposableRef.get(), "Unsubscribed before the call to onComplete"); } @Test @@ -2709,7 +2846,7 @@ public void subscribeActionReportsUnsubscribedOnError() { stringSubject.onError(new TestException()); - assertTrue("Not unsubscribed?", completableSubscription.isDisposed()); + assertTrue(completableSubscription.isDisposed(), "Not unsubscribed?"); TestHelper.assertError(errors, 0, OnErrorNotImplementedException.class); } finally { @@ -2726,7 +2863,7 @@ public void subscribeAction2ReportsUnsubscribed() { stringSubject.onComplete(); - assertTrue("Not unsubscribed?", completableSubscription.isDisposed()); + assertTrue(completableSubscription.isDisposed(), "Not unsubscribed?"); } @Test @@ -2738,7 +2875,7 @@ public void subscribeAction2ReportsUnsubscribedOnError() { stringSubject.onError(new TestException()); - assertTrue("Not unsubscribed?", completableSubscription.isDisposed()); + assertTrue(completableSubscription.isDisposed(), "Not unsubscribed?"); } @Test @@ -2786,7 +2923,7 @@ public void subscribeActual(SingleObserver observer) { .toFlowable().subscribe(ts); ts.assertNoValues(); ts.assertError(e); - Assert.assertFalse("Should not have subscribed to single when completable errors", hasRun.get()); + assertFalse(hasRun.get(), "Should not have subscribed to single when completable errors"); } @Test @@ -2810,7 +2947,7 @@ public void andThenSingleSubscribeOn() { private BiFunction onStart; - @Before + @BeforeEach public void setUp() throws Exception { onCreate = spy(new Function() /* Mockito */ { @Override @@ -2832,7 +2969,7 @@ public void setUp() throws Exception { RxJavaPlugins.setOnCompletableSubscribe(onStart); } - @After + @AfterEach public void after() { RxJavaPlugins.reset(); } @@ -2853,7 +2990,7 @@ public void doOnCompletedNormal() { c.blockingAwait(); - Assert.assertEquals(1, calls.get()); + assertEquals(1, calls.get()); } @Test @@ -2864,19 +3001,21 @@ public void doOnCompletedError() { try { c.blockingAwait(); - Assert.fail("Failed to throw TestException"); + fail("Failed to throw TestException"); } catch (TestException ex) { // expected } - Assert.assertEquals(0, calls.get()); + assertEquals(0, calls.get()); } - @Test(expected = TestException.class) + @Test public void doOnCompletedThrows() { - Completable c = normal.completable.doOnComplete(() -> { throw new TestException(); }); + assertThrows(TestException.class, () -> { + Completable c = normal.completable.doOnComplete(() -> { throw new TestException(); }); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test @@ -2905,8 +3044,8 @@ public void onComplete() { c.blockingAwait(); - Assert.assertTrue("Not completed", complete.get()); - Assert.assertTrue("Closure called before onComplete", doneAfter.get()); + assertTrue(complete.get(), "Not completed"); + assertTrue(doneAfter.get(), "Closure called before onComplete"); } @Test @@ -2917,12 +3056,12 @@ public void doAfterTerminateWithError() { try { c.blockingAwait(5, TimeUnit.SECONDS); - Assert.fail("Did not throw TestException"); + fail("Did not throw TestException"); } catch (TestException ex) { // expected } - Assert.assertTrue("Closure not called", doneAfter.get()); + assertTrue(doneAfter.get(), "Closure not called"); } @Test @@ -2951,7 +3090,7 @@ public void andThenCompletableNormal() { c.blockingAwait(); - Assert.assertFalse("Start with other", run.get()); + assertFalse(run.get(), "Start with other"); normal.assertSubscriptions(1); } @@ -2961,7 +3100,7 @@ public void andThenCompletableError() { try { c.blockingAwait(); - Assert.fail("Did not throw TestException"); + fail("Did not throw TestException"); } catch (TestException ex) { normal.assertSubscriptions(1); error.assertSubscriptions(1); @@ -2981,7 +3120,7 @@ public void andThenFlowableNormal() { c.subscribe(ts); - Assert.assertFalse("Start with other", run.get()); + assertFalse(run.get(), "Start with other"); normal.assertSubscriptions(1); ts.assertValue(1); @@ -3049,8 +3188,8 @@ public void usingFactoryAndDisposerThrow() { assertEquals(2, listEx.size()); - assertTrue(listEx.get(0).toString(), listEx.get(0) instanceof TestException); - assertTrue(listEx.get(1).toString(), listEx.get(1) instanceof TestException); + assertTrue(listEx.get(0) instanceof TestException, listEx.get(0).toString()); + assertTrue(listEx.get(1) instanceof TestException, listEx.get(1).toString()); } @Test @@ -3081,7 +3220,7 @@ public void subscribeReportsUnsubscribed() { stringSubject.onComplete(); - assertTrue("Not unsubscribed?", completableSubscription.isDisposed()); + assertTrue(completableSubscription.isDisposed(), "Not unsubscribed?"); } @Test @@ -3126,12 +3265,12 @@ public void onErrorCompleteFunctionThrows() { CompositeException composite = (CompositeException)ts.errors().getFirst(); List errors = composite.getExceptions(); - Assert.assertEquals(2, errors.size()); + assertEquals(2, errors.size()); - Assert.assertTrue(errors.get(0).toString(), errors.get(0) instanceof TestException); - Assert.assertNull(errors.get(0).toString(), errors.get(0).getMessage()); - Assert.assertTrue(errors.get(1).toString(), errors.get(1) instanceof TestException); - Assert.assertEquals(errors.get(1).toString(), "Forced inner failure", errors.get(1).getMessage()); + assertTrue(errors.get(0) instanceof TestException, errors.get(0).toString()); + assertNull(errors.get(0).getMessage(), errors.get(0).toString()); + assertTrue(errors.get(1) instanceof TestException, errors.get(1).toString()); + assertEquals("Forced inner failure", errors.get(1).getMessage(), errors.get(1).toString()); } @Test @@ -3149,8 +3288,8 @@ public void subscribeAction2ReportsUnsubscribedAfter() { stringSubject.onComplete(); - assertTrue("Not unsubscribed?", completableSubscription.isDisposed()); - assertNotNull("Unsubscribed before the call to onComplete", disposableRef.get()); + assertTrue(completableSubscription.isDisposed(), "Not unsubscribed?"); + assertNotNull(disposableRef.get(), "Unsubscribed before the call to onComplete"); } @Test @@ -3169,8 +3308,8 @@ public void subscribeAction2ReportsUnsubscribedOnErrorAfter() { stringSubject.onError(new TestException()); - assertTrue("Not unsubscribed?", completableSubscription.isDisposed()); - assertNotNull("Unsubscribed before the call to onError", disposableRef.get()); + assertTrue(completableSubscription.isDisposed(), "Not unsubscribed?"); + assertNotNull(disposableRef.get(), "Unsubscribed before the call to onError"); } @Test @@ -3209,7 +3348,7 @@ public void andThenError() { ts.assertNoValues(); ts.assertError(e); - Assert.assertFalse("Should not have subscribed to observable when completable errors", hasRun.get()); + assertFalse(hasRun.get(), "Should not have subscribed to observable when completable errors"); } @Test @@ -3245,11 +3384,11 @@ public void fromFutureThrows() { try { c.blockingAwait(); - Assert.fail("Failed to throw Exception"); + fail("Failed to throw Exception"); } catch (RuntimeException ex) { if (!((ex.getCause() instanceof ExecutionException) && (ex.getCause().getCause() instanceof TestException))) { ex.printStackTrace(); - Assert.fail("Wrong exception received"); + fail("Wrong exception received"); } } finally { exec.shutdown(); @@ -3264,14 +3403,16 @@ public void fromRunnableNormal() { c.blockingAwait(); - Assert.assertEquals(1, calls.get()); + assertEquals(1, calls.get()); } - @Test(expected = TestException.class) + @Test public void fromRunnableThrows() { - Completable c = Completable.fromRunnable(() -> { throw new TestException(); }); + assertThrows(TestException.class, () -> { + Completable c = Completable.fromRunnable(() -> { throw new TestException(); }); - c.blockingAwait(); + c.blockingAwait(); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/completable/CompletableTimerTest.java b/src/test/java/io/reactivex/rxjava4/completable/CompletableTimerTest.java index c308feaea8..b2719ca4cd 100644 --- a/src/test/java/io/reactivex/rxjava4/completable/CompletableTimerTest.java +++ b/src/test/java/io/reactivex/rxjava4/completable/CompletableTimerTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.completable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.schedulers.TestScheduler; diff --git a/src/test/java/io/reactivex/rxjava4/core/BackpressureEnumTest.java b/src/test/java/io/reactivex/rxjava4/core/BackpressureEnumTest.java index 6bb7d86a49..68d7de4b30 100644 --- a/src/test/java/io/reactivex/rxjava4/core/BackpressureEnumTest.java +++ b/src/test/java/io/reactivex/rxjava4/core/BackpressureEnumTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.core; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.BackpressureKind; diff --git a/src/test/java/io/reactivex/rxjava4/core/ConverterTest.java b/src/test/java/io/reactivex/rxjava4/core/ConverterTest.java index 48d8300eae..464a9429f7 100644 --- a/src/test/java/io/reactivex/rxjava4/core/ConverterTest.java +++ b/src/test/java/io/reactivex/rxjava4/core/ConverterTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.core; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.parallel.*; diff --git a/src/test/java/io/reactivex/rxjava4/core/DisposeTaskTest.java b/src/test/java/io/reactivex/rxjava4/core/DisposeTaskTest.java index efdea61a1b..0bf299160f 100644 --- a/src/test/java/io/reactivex/rxjava4/core/DisposeTaskTest.java +++ b/src/test/java/io/reactivex/rxjava4/core/DisposeTaskTest.java @@ -13,10 +13,9 @@ package io.reactivex.rxjava4.core; -import static org.junit.Assert.fail; -import static org.testng.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Scheduler.DisposeTask; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/core/NotificationTest.java b/src/test/java/io/reactivex/rxjava4/core/NotificationTest.java index 8867e06bd8..57ac84f934 100644 --- a/src/test/java/io/reactivex/rxjava4/core/NotificationTest.java +++ b/src/test/java/io/reactivex/rxjava4/core/NotificationTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.core; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.exceptions.TestException; @@ -26,7 +26,7 @@ public void valueOfOnErrorIsNull() { Notification notification = Notification.createOnError(new TestException()); assertNull(notification.getValue()); - assertTrue(notification.getError().toString(), notification.getError() instanceof TestException); + assertTrue(notification.getError() instanceof TestException, notification.getError().toString()); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/core/PeriodicDirectTaskTest.java b/src/test/java/io/reactivex/rxjava4/core/PeriodicDirectTaskTest.java index c7244baf9b..e2eed3d2ed 100644 --- a/src/test/java/io/reactivex/rxjava4/core/PeriodicDirectTaskTest.java +++ b/src/test/java/io/reactivex/rxjava4/core/PeriodicDirectTaskTest.java @@ -13,12 +13,11 @@ package io.reactivex.rxjava4.core; -import static org.junit.Assert.fail; -import static org.testng.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Scheduler.PeriodicDirectTask; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/core/Retry.java b/src/test/java/io/reactivex/rxjava4/core/Retry.java deleted file mode 100644 index 08e9acff97..0000000000 --- a/src/test/java/io/reactivex/rxjava4/core/Retry.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * 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.core; - -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - -/** - * Test rule to retry flaky tests. - * From Stackoverflow. - */ -@SuppressWarnings("exports") -public class Retry implements TestRule { - - final class RetryStatement extends Statement { - private final Statement base; - private final Description description; - - RetryStatement(Statement base, Description description) { - this.base = base; - this.description = description; - } - - @Override - public void evaluate() throws Throwable { - Throwable caughtThrowable = null; - - for (int i = 0; i < retryCount; i++) { - try { - base.evaluate(); - return; - } catch (Throwable t) { - caughtThrowable = t; - System.err.println(description.getDisplayName() + ": run " + (i + 1) + " failed"); - int n = sleep; - if (backoff && i != 0) { - n = n * (2 << i); - } - Thread.sleep(n); - } - } - System.err.println(description.getDisplayName() + ": giving up after " + retryCount + " failures"); - throw caughtThrowable; - } - } - - final int retryCount; - - final int sleep; - - final boolean backoff; - - public Retry(int retryCount, int sleep, boolean backoff) { - this.retryCount = retryCount; - this.sleep = sleep; - this.backoff = backoff; - } - - @Override - public Statement apply(Statement base, Description description) { - return statement(base, description); - } - - private Statement statement(final Statement base, final Description description) { - return new RetryStatement(base, description); - } -} diff --git a/src/test/java/io/reactivex/rxjava4/core/RxJavaTest.java b/src/test/java/io/reactivex/rxjava4/core/RxJavaTest.java index 96fa5a67e4..0e78c15cb1 100644 --- a/src/test/java/io/reactivex/rxjava4/core/RxJavaTest.java +++ b/src/test/java/io/reactivex/rxjava4/core/RxJavaTest.java @@ -15,23 +15,42 @@ import java.util.concurrent.TimeUnit; -import org.junit.*; -import org.junit.rules.Timeout; +import org.junit.jupiter.api.*; -import io.reactivex.rxjava4.testsupport.SuppressUndeliverableRule; +import io.reactivex.rxjava4.exceptions.UndeliverableException; +import io.reactivex.rxjava4.plugins.RxJavaPlugins; +import io.reactivex.rxjava4.testsupport.*; -@SuppressWarnings("exports") +@Timeout(value = 5, unit = TimeUnit.MINUTES) public abstract class RxJavaTest { - @Rule - public Timeout globalTimeout = new Timeout(5, TimeUnit.MINUTES); - @Rule - public final SuppressUndeliverableRule suppressUndeliverableRule = new SuppressUndeliverableRule(); - /** * Announce creates a log print preventing Travis CI from killing the build. */ @Test - @Ignore + @Disabled public final void announce() { } + + @SuppressWarnings("exports") + @BeforeEach + public void beforeEach(TestInfo info) { + info.getTestMethod().ifPresent(description -> { + if (description.getAnnotation(SuppressUndeliverable.class) != null) { + RxJavaPlugins.setErrorHandler(throwable -> { + if (!(throwable instanceof UndeliverableException)) { + throwable.printStackTrace(); + Thread currentThread = Thread.currentThread(); + currentThread.getUncaughtExceptionHandler().uncaughtException(currentThread, throwable); + } + }); + } + }); + } + + @SuppressWarnings("exports") + @AfterEach + public void afterEach(TestInfo info) { + RxJavaPlugins.setErrorHandler(null); + } + } diff --git a/src/test/java/io/reactivex/rxjava4/core/SchedulerMainTest.java b/src/test/java/io/reactivex/rxjava4/core/SchedulerMainTest.java index e32847fbf3..97cfecbf99 100644 --- a/src/test/java/io/reactivex/rxjava4/core/SchedulerMainTest.java +++ b/src/test/java/io/reactivex/rxjava4/core/SchedulerMainTest.java @@ -13,23 +13,18 @@ package io.reactivex.rxjava4.core; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.After; -import org.junit.Test; +import java.util.concurrent.*; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.TimeUnit; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.schedulers.Schedulers; public class SchedulerMainTest { private static final String DRIFT_USE_NANOTIME = "rxjava4.scheduler.use-nanotime"; - @After + @AfterEach public void cleanup() { // reset value to default in order to not influence other tests Scheduler.IS_DRIFT_USE_NANOTIME = false; diff --git a/src/test/java/io/reactivex/rxjava4/core/TransformerTest.java b/src/test/java/io/reactivex/rxjava4/core/TransformerTest.java index c77da1f47a..12a722fe88 100644 --- a/src/test/java/io/reactivex/rxjava4/core/TransformerTest.java +++ b/src/test/java/io/reactivex/rxjava4/core/TransformerTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.core; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.ConverterTest.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/core/XFlatMapTest.java b/src/test/java/io/reactivex/rxjava4/core/XFlatMapTest.java index b84c2bb5f3..22cc085a90 100644 --- a/src/test/java/io/reactivex/rxjava4/core/XFlatMapTest.java +++ b/src/test/java/io/reactivex/rxjava4/core/XFlatMapTest.java @@ -13,13 +13,14 @@ package io.reactivex.rxjava4.core; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; import java.util.concurrent.CyclicBarrier; import java.util.concurrent.Flow.Publisher; -import org.junit.*; +import org.junit.jupiter.api.Test; +import org.junitpioneer.jupiter.RetryingTest; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.*; @@ -31,9 +32,6 @@ public class XFlatMapTest extends RxJavaTest { - @Rule - public Retry retry = new Retry(5, 1000, true); - static final int SLEEP_AFTER_CANCEL = 500; final CyclicBarrier cb = new CyclicBarrier(2); @@ -68,6 +66,7 @@ void beforeCancelSleep(TestObserver to) throws Exception { } @Test + @RetryingTest(3) public void flowableFlowable() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -89,13 +88,14 @@ public void flowableFlowable() throws Exception { ts.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void flowableSingle() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -117,13 +117,14 @@ public void flowableSingle() throws Exception { ts.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void flowableMaybe() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -145,13 +146,14 @@ public void flowableMaybe() throws Exception { ts.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void flowableCompletable() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -173,13 +175,14 @@ public void flowableCompletable() throws Exception { to.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void flowableCompletable2() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -202,13 +205,14 @@ public void flowableCompletable2() throws Exception { ts.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void observableObservable() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -230,13 +234,14 @@ public void observableObservable() throws Exception { to.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void observerSingle() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -258,13 +263,14 @@ public void observerSingle() throws Exception { to.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void observerMaybe() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -286,13 +292,14 @@ public void observerMaybe() throws Exception { to.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void observerCompletable() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -314,13 +321,14 @@ public void observerCompletable() throws Exception { to.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void observerCompletable2() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -343,13 +351,14 @@ public void observerCompletable2() throws Exception { to.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void singleSingle() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -371,13 +380,14 @@ public void singleSingle() throws Exception { to.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void singleMaybe() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -399,13 +409,14 @@ public void singleMaybe() throws Exception { to.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void singleCompletable() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -427,13 +438,14 @@ public void singleCompletable() throws Exception { to.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void singleCompletable2() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -456,13 +468,14 @@ public void singleCompletable2() throws Exception { to.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void singlePublisher() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -484,13 +497,14 @@ public void singlePublisher() throws Exception { ts.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void singleCombiner() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -512,13 +526,14 @@ public void singleCombiner() throws Exception { to.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void singleObservable() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -540,13 +555,14 @@ public void singleObservable() throws Exception { to.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void singleNotificationSuccess() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -574,13 +590,14 @@ public void singleNotificationSuccess() throws Exception { to.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void singleNotificationError() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -608,13 +625,14 @@ public void singleNotificationError() throws Exception { to.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void maybeSingle() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -637,13 +655,14 @@ public void maybeSingle() throws Exception { to.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void maybeSingle2() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -665,13 +684,14 @@ public void maybeSingle2() throws Exception { to.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void maybeMaybe() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -693,13 +713,14 @@ public void maybeMaybe() throws Exception { to.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void maybePublisher() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -721,13 +742,14 @@ public void maybePublisher() throws Exception { ts.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void maybeObservable() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -749,13 +771,14 @@ public void maybeObservable() throws Exception { to.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void maybeNotificationSuccess() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -787,13 +810,14 @@ public void maybeNotificationSuccess() throws Exception { to.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void maybeNotificationError() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -825,13 +849,14 @@ public void maybeNotificationError() throws Exception { to.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void maybeNotificationEmpty() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -863,13 +888,14 @@ public void maybeNotificationEmpty() throws Exception { to.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void maybeCombiner() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -891,13 +917,14 @@ public void maybeCombiner() throws Exception { to.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void maybeCompletable() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -919,13 +946,14 @@ public void maybeCompletable() throws Exception { to.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } @Test + @RetryingTest(3) public void maybeCompletable2() throws Exception { List errors = TestHelper.trackPluginErrors(); try { @@ -948,7 +976,7 @@ public void maybeCompletable2() throws Exception { to.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } diff --git a/src/test/java/io/reactivex/rxjava4/disposables/CompositeDisposableTest.java b/src/test/java/io/reactivex/rxjava4/disposables/CompositeDisposableTest.java index 217ea5dc54..4c4a5d8195 100644 --- a/src/test/java/io/reactivex/rxjava4/disposables/CompositeDisposableTest.java +++ b/src/test/java/io/reactivex/rxjava4/disposables/CompositeDisposableTest.java @@ -13,17 +13,18 @@ package io.reactivex.rxjava4.disposables; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.*; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; +import org.junit.jupiter.api.Test; + import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.exceptions.CompositeException; import io.reactivex.rxjava4.testsupport.TestHelper; -import org.junit.Test; public class CompositeDisposableTest extends RxJavaTest { @@ -224,10 +225,12 @@ public void tryRemoveIfNotIn() { cd.remove(cd1); // try removing again } - @Test(expected = NullPointerException.class) + @Test public void addingNullDisposableIllegal() { - CompositeDisposable cd = new CompositeDisposable(); - cd.add(null); + assertThrows(NullPointerException.class, () -> { + CompositeDisposable cd = new CompositeDisposable(); + cd.add(null); + }); } @Test @@ -661,15 +664,15 @@ public void register() { var e = cd.register(d); - assertFalse("d is disposed", d.isDisposed()); - assertFalse("e is disposed", e.isDisposed()); - assertFalse("cd is disposed", cd.isDisposed()); + assertFalse(d.isDisposed(), "d is disposed"); + assertFalse(e.isDisposed(), "e is disposed"); + assertFalse(cd.isDisposed(), "cd is disposed"); e.dispose(); - assertTrue("d is not is disposed", d.isDisposed()); - assertTrue("e not is disposed", e.isDisposed()); - assertFalse("cd is disposed", cd.isDisposed()); + assertTrue(d.isDisposed(), "d is not is disposed"); + assertTrue(e.isDisposed(), "e not is disposed"); + assertFalse(cd.isDisposed(), "cd is disposed"); assertEquals(0, cd.size()); } @@ -682,15 +685,15 @@ public void subscribe() { var e = cd.subscribe(d); - assertFalse("d is disposed", d.isDisposed()); - assertFalse("e is disposed", e.isDisposed()); - assertFalse("cd is disposed", cd.isDisposed()); + assertFalse(d.isDisposed(), "d is disposed"); + assertFalse(e.isDisposed(), "e is disposed"); + assertFalse(cd.isDisposed(), "cd is disposed"); e.dispose(); - assertFalse("d is disposed", d.isDisposed()); - assertTrue("e not is disposed", e.isDisposed()); - assertFalse("cd is disposed", cd.isDisposed()); + assertFalse(d.isDisposed(), "d is disposed"); + assertTrue(e.isDisposed(), "e not is disposed"); + assertFalse(cd.isDisposed(), "cd is disposed"); assertEquals(0, cd.size()); } diff --git a/src/test/java/io/reactivex/rxjava4/disposables/DisposableTest.java b/src/test/java/io/reactivex/rxjava4/disposables/DisposableTest.java index dac6faf33d..fd9484395e 100644 --- a/src/test/java/io/reactivex/rxjava4/disposables/DisposableTest.java +++ b/src/test/java/io/reactivex/rxjava4/disposables/DisposableTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.disposables; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.*; import java.io.IOException; import java.util.List; +import java.util.concurrent.Flow.Subscription; import java.util.concurrent.atomic.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.exceptions.TestException; @@ -39,13 +39,13 @@ public void unsubscribeOnlyOnce() { Disposable d = Disposable.fromRunnable(run); - assertTrue(d.toString(), d.toString().contains("RunnableDisposable(disposed=false, ")); + assertTrue(d.toString().contains("RunnableDisposable(disposed=false, "), d.toString()); d.dispose(); - assertTrue(d.toString(), d.toString().contains("RunnableDisposable(disposed=true, ")); + assertTrue(d.toString().contains("RunnableDisposable(disposed=true, "), d.toString()); d.dispose(); - assertTrue(d.toString(), d.toString().contains("RunnableDisposable(disposed=true, ")); + assertTrue(d.toString().contains("RunnableDisposable(disposed=true, "), d.toString()); verify(run, times(1)).run(); } @@ -70,13 +70,13 @@ public void fromAction() throws Throwable { Disposable d = Disposable.fromAction(action); - assertTrue(d.toString(), d.toString().contains("ActionDisposable(disposed=false, ")); + assertTrue(d.toString().contains("ActionDisposable(disposed=false, "), d.toString()); d.dispose(); - assertTrue(d.toString(), d.toString().contains("ActionDisposable(disposed=true, ")); + assertTrue(d.toString().contains("ActionDisposable(disposed=true, "), d.toString()); d.dispose(); - assertTrue(d.toString(), d.toString().contains("ActionDisposable(disposed=true, ")); + assertTrue(d.toString().contains("ActionDisposable(disposed=true, "), d.toString()); verify(action, times(1)).run(); } @@ -126,9 +126,11 @@ public void disposeRace() { } } - @Test(expected = NullPointerException.class) + @Test public void fromSubscriptionNull() { - Disposable.fromSubscription(null); + assertThrows(NullPointerException.class, () -> { + Disposable.fromSubscription(null); + }); } @Test @@ -173,19 +175,19 @@ public void fromAutoCloseable() { assertFalse(d.isDisposed()); assertEquals(0, counter.get()); - assertTrue(d.toString(), d.toString().contains("AutoCloseableDisposable(disposed=false, ")); + assertTrue(d.toString().contains("AutoCloseableDisposable(disposed=false, "), d.toString()); d.dispose(); assertTrue(d.isDisposed()); assertEquals(1, counter.get()); - assertTrue(d.toString(), d.toString().contains("AutoCloseableDisposable(disposed=true, ")); + assertTrue(d.toString().contains("AutoCloseableDisposable(disposed=true, "), d.toString()); d.dispose(); assertTrue(d.isDisposed()); assertEquals(1, counter.get()); - assertTrue(d.toString(), d.toString().contains("AutoCloseableDisposable(disposed=true, ")); + assertTrue(d.toString().contains("AutoCloseableDisposable(disposed=true, "), d.toString()); } @Test @@ -246,6 +248,6 @@ public void autoCloseable() throws Throwable { assertNotNull(a); } - assertTrue("d is not disposed", d.isDisposed()); + assertTrue(d.isDisposed(), "d is not disposed"); } } diff --git a/src/test/java/io/reactivex/rxjava4/disposables/FutureDisposableTest.java b/src/test/java/io/reactivex/rxjava4/disposables/FutureDisposableTest.java index 50da24c817..9a09aa68a6 100644 --- a/src/test/java/io/reactivex/rxjava4/disposables/FutureDisposableTest.java +++ b/src/test/java/io/reactivex/rxjava4/disposables/FutureDisposableTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.disposables; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.FutureTask; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.internal.functions.Functions; diff --git a/src/test/java/io/reactivex/rxjava4/disposables/SequentialDisposableTest.java b/src/test/java/io/reactivex/rxjava4/disposables/SequentialDisposableTest.java index 791cc38158..ddf59b3edf 100644 --- a/src/test/java/io/reactivex/rxjava4/disposables/SequentialDisposableTest.java +++ b/src/test/java/io/reactivex/rxjava4/disposables/SequentialDisposableTest.java @@ -13,24 +13,24 @@ package io.reactivex.rxjava4.disposables; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.*; import java.util.concurrent.CountDownLatch; -import org.junit.*; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.*; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.internal.disposables.SequentialDisposable; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class SequentialDisposableTest extends RxJavaTest { private SequentialDisposable serialDisposable; - @Before + @BeforeEach public void setUp() { serialDisposable = new SequentialDisposable(); } diff --git a/src/test/java/io/reactivex/rxjava4/disposables/SerialDisposableTests.java b/src/test/java/io/reactivex/rxjava4/disposables/SerialDisposableTests.java index b74cd8d0b6..1963b95b72 100644 --- a/src/test/java/io/reactivex/rxjava4/disposables/SerialDisposableTests.java +++ b/src/test/java/io/reactivex/rxjava4/disposables/SerialDisposableTests.java @@ -13,24 +13,24 @@ package io.reactivex.rxjava4.disposables; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.*; import java.util.concurrent.CountDownLatch; -import org.junit.*; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.*; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.internal.disposables.DisposableHelper; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class SerialDisposableTests extends RxJavaTest { private SerialDisposable serialDisposable; - @Before + @BeforeEach public void setUp() { serialDisposable = new SerialDisposable(); } diff --git a/src/test/java/io/reactivex/rxjava4/exceptions/CompositeExceptionTest.java b/src/test/java/io/reactivex/rxjava4/exceptions/CompositeExceptionTest.java index 8a9c797739..39b25be5c8 100644 --- a/src/test/java/io/reactivex/rxjava4/exceptions/CompositeExceptionTest.java +++ b/src/test/java/io/reactivex/rxjava4/exceptions/CompositeExceptionTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.exceptions; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; @@ -286,12 +286,12 @@ public void exceptionOverview() { String overview = composite.getCause().getMessage(); - assertTrue(overview, overview.contains("Multiple exceptions (3)")); - assertTrue(overview, overview.contains("io.reactivex.rxjava4.exceptions.TestException: ex1")); - assertTrue(overview, overview.contains("io.reactivex.rxjava4.exceptions.TestException: ex2")); - assertTrue(overview, overview.contains("io.reactivex.rxjava4.exceptions.TestException: ex3")); - assertTrue(overview, overview.contains("io.reactivex.rxjava4.exceptions.TestException: ex4")); - assertTrue(overview, overview.contains("at io.reactivex.rxjava4.exceptions.CompositeExceptionTest.exceptionOverview")); + assertTrue(overview.contains("Multiple exceptions (3)"), overview); + assertTrue(overview.contains("io.reactivex.rxjava4.exceptions.TestException: ex1"), overview); + assertTrue(overview.contains("io.reactivex.rxjava4.exceptions.TestException: ex2"), overview); + assertTrue(overview.contains("io.reactivex.rxjava4.exceptions.TestException: ex3"), overview); + assertTrue(overview.contains("io.reactivex.rxjava4.exceptions.TestException: ex4"), overview); + assertTrue(overview.contains("at io.reactivex.rxjava4.exceptions.CompositeExceptionTest.exceptionOverview"), overview); } @Test @@ -303,11 +303,11 @@ public void causeWithExceptionWithoutStacktrace() { String overview = composite.getCause().getMessage(); - assertTrue(overview, overview.contains("Multiple exceptions (2)")); - assertTrue(overview, overview.contains("io.reactivex.rxjava4.exceptions.TestException: ex1")); - assertTrue(overview, overview.contains("io.reactivex.rxjava4.exceptions.CompositeException.ExceptionOverview: example")); + assertTrue(overview.contains("Multiple exceptions (2)"), overview); + assertTrue(overview.contains("io.reactivex.rxjava4.exceptions.TestException: ex1"), overview); + assertTrue( overview.contains("io.reactivex.rxjava4.exceptions.CompositeException.ExceptionOverview: example"), overview); - assertEquals(overview, 2, overview.split("at\\s").length); + assertEquals(2, overview.split("at\\s").length, overview); } @Test @@ -322,12 +322,12 @@ public void reoccurringException() { String overview = composite.getCause().getMessage(); System.err.println(overview); - assertTrue(overview, overview.contains("Multiple exceptions (2)")); - assertTrue(overview, overview.contains("io.reactivex.rxjava4.exceptions.TestException: ex0")); - assertTrue(overview, overview.contains("io.reactivex.rxjava4.exceptions.TestException: ex1")); - assertTrue(overview, overview.contains("io.reactivex.rxjava4.exceptions.TestException: ex2")); - assertTrue(overview, overview.contains("(cause not expanded again) io.reactivex.rxjava4.exceptions.TestException: ex0")); - assertEquals(overview, 5, overview.split("at\\s").length); + assertTrue(overview.contains("Multiple exceptions (2)"), overview); + assertTrue(overview.contains("io.reactivex.rxjava4.exceptions.TestException: ex0"), overview); + assertTrue(overview.contains("io.reactivex.rxjava4.exceptions.TestException: ex1"), overview); + assertTrue(overview.contains("io.reactivex.rxjava4.exceptions.TestException: ex2"), overview); + assertTrue(overview.contains("(cause not expanded again) io.reactivex.rxjava4.exceptions.TestException: ex0"), overview); + assertEquals(5, overview.split("at\\s").length, overview); } @Test @@ -349,9 +349,9 @@ public void nestedMultilineMessage() { String overview = composite2.getCause().getMessage(); System.err.println(overview); - assertTrue(overview, overview.contains(" Multiple exceptions (2)")); - assertTrue(overview, overview.contains(" |-- io.reactivex.rxjava4.exceptions.TestException: ex1")); - assertTrue(overview, overview.contains(" |-- io.reactivex.rxjava4.exceptions.TestException: ex2")); + assertTrue(overview.contains(" Multiple exceptions (2)"), overview); + assertTrue(overview.contains(" |-- io.reactivex.rxjava4.exceptions.TestException: ex1"), overview); + assertTrue(overview.contains(" |-- io.reactivex.rxjava4.exceptions.TestException: ex2"), overview); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/exceptions/ExceptionsTest.java b/src/test/java/io/reactivex/rxjava4/exceptions/ExceptionsTest.java index 2e1408daff..8100b17fc3 100644 --- a/src/test/java/io/reactivex/rxjava4/exceptions/ExceptionsTest.java +++ b/src/test/java/io/reactivex/rxjava4/exceptions/ExceptionsTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.exceptions; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; @@ -44,7 +44,7 @@ public void onErrorNotImplementedIsThrown() { }); TestHelper.assertError(errors, 0, RuntimeException.class); - assertTrue(errors.getFirst().toString(), errors.getFirst().getMessage().contains("hello")); + assertTrue(errors.getFirst().getMessage().contains("hello"), errors.getFirst().toString()); RxJavaPlugins.reset(); } @@ -107,30 +107,32 @@ public void onNext(Integer n) { assertTrue(depth.get() >= MAX_STACK_DEPTH); } - @Test(expected = StackOverflowError.class) + @Test public void stackOverflowErrorIsThrown() { - Observable.just(1).subscribe(new Observer<>() /* NFI */ { + assertThrows(StackOverflowError.class, () -> { + Observable.just(1).subscribe(new Observer<>() /* NFI */ { - @Override - public void onSubscribe(Disposable d) { + @Override + public void onSubscribe(Disposable d) { - } + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } + } - @Override - public void onError(Throwable e) { - e.printStackTrace(); - } + @Override + public void onError(Throwable e) { + e.printStackTrace(); + } - @Override - public void onNext(Integer t) { - throw new StackOverflowError(); - } + @Override + public void onNext(Integer t) { + throw new StackOverflowError(); + } + }); }); } @@ -168,22 +170,22 @@ public void manualPropagate() { public void errorNotImplementedNull1() { OnErrorNotImplementedException ex = new OnErrorNotImplementedException(null); - assertTrue("" + ex.getCause(), ex.getCause() instanceof NullPointerException); + assertTrue(ex.getCause() instanceof NullPointerException, "" + ex.getCause()); } @Test public void errorNotImplementedNull2() { OnErrorNotImplementedException ex = new OnErrorNotImplementedException("Message", null); - assertTrue("" + ex.getCause(), ex.getCause() instanceof NullPointerException); + assertTrue(ex.getCause() instanceof NullPointerException, "" + ex.getCause()); } @Test public void errorNotImplementedWithCause() { OnErrorNotImplementedException ex = new OnErrorNotImplementedException("Message", new TestException("Forced failure")); - assertTrue("" + ex.getCause(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, "" + ex.getCause()); - assertEquals("" + ex.getCause(), "Forced failure", ex.getCause().getMessage()); + assertEquals("Forced failure", ex.getCause().getMessage(), "" + ex.getCause()); } } diff --git a/src/test/java/io/reactivex/rxjava4/exceptions/OnErrorNotImplementedExceptionTest.java b/src/test/java/io/reactivex/rxjava4/exceptions/OnErrorNotImplementedExceptionTest.java index b3437b00b2..dfd7211f75 100644 --- a/src/test/java/io/reactivex/rxjava4/exceptions/OnErrorNotImplementedExceptionTest.java +++ b/src/test/java/io/reactivex/rxjava4/exceptions/OnErrorNotImplementedExceptionTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.exceptions; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import org.junit.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.internal.functions.Functions; @@ -28,19 +28,19 @@ public class OnErrorNotImplementedExceptionTest extends RxJavaTest { List errors; - @Before + @BeforeEach public void before() { errors = TestHelper.trackPluginErrors(); } - @After + @AfterEach public void after() { RxJavaPlugins.reset(); - assertFalse("" + errors, errors.isEmpty()); + assertFalse(errors.isEmpty(), "" + errors); TestHelper.assertError(errors, 0, OnErrorNotImplementedException.class); Throwable c = errors.getFirst().getCause(); - assertTrue("" + c, c instanceof TestException); + assertTrue(c instanceof TestException, "" + c); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/flowable/FlowableBackpressureTests.java b/src/test/java/io/reactivex/rxjava4/flowable/FlowableBackpressureTests.java index c7d93de77b..86de83849f 100644 --- a/src/test/java/io/reactivex/rxjava4/flowable/FlowableBackpressureTests.java +++ b/src/test/java/io/reactivex/rxjava4/flowable/FlowableBackpressureTests.java @@ -13,21 +13,19 @@ package io.reactivex.rxjava4.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.Serial; import java.util.List; import java.util.concurrent.*; -import java.util.concurrent.Flow.Publisher; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.*; -import org.junit.rules.TestName; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.QueueOverflowException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava4.internal.util.BackpressureHelper; import io.reactivex.rxjava4.schedulers.Schedulers; @@ -72,10 +70,7 @@ public void cancel() { } } - @Rule - public TestName testName = new TestName(); - - @After + @AfterEach public void doAfterTest() { // FIXME LATER // TestObstructionDetection.checkObstruction(); @@ -156,8 +151,8 @@ public void mergeAsync() { // TODO is it possible to make this deterministic rather than one possibly starving the other? // benjchristensen => In general I'd say it's not worth trying to make it so, as "fair" algorithms generally take a performance hit int max = Flowable.bufferSize() * 7; - assertTrue("" + c1.get() + " >= " + max, c1.get() < max); - assertTrue("" + c2.get() + " >= " + max, c2.get() < max); + assertTrue(c1.get() < max, "" + c1.get() + " >= " + max); + assertTrue(c2.get() < max, "" + c2.get() + " >= " + max); } @Test @@ -271,8 +266,8 @@ public void zipAsync() { System.out.println("testZipAsync => Received: " + ts.values().size() + " Emitted: " + c1.get() + " / " + c2.get()); assertEquals(num, ts.values().size()); int max = Flowable.bufferSize() * 5; - assertTrue("" + c1.get() + " >= " + max, c1.get() < max); - assertTrue("" + c2.get() + " >= " + max, c2.get() < max); + assertTrue(c1.get() < max, "" + c1.get() + " >= " + max); + assertTrue(c2.get() < max, "" + c2.get() + " >= " + max); } @Test @@ -451,7 +446,7 @@ public void firehoseFailsAsExpected() { // FIXME it is possible slow is not slow enough or the main gets delayed and thus more than one source value is emitted. int vc = ts.values().size(); - assertTrue("10 < " + vc, vc <= 10); + assertTrue(vc <= 10, "10 < " + vc); ts.assertError(QueueOverflowException.class); } @@ -493,7 +488,7 @@ public void onBackpressureDrop() { } @Test - public void onBackpressureDropWithAction() { + public void onBackpressureDropWithAction(TestInfo testInfo) { for (int i = 0; i < 100; i++) { final AtomicInteger emitCount = new AtomicInteger(); final AtomicInteger dropCount = new AtomicInteger(); @@ -513,7 +508,7 @@ public void onBackpressureDropWithAction() { List onNextEvents = ts.values(); Integer lastEvent = onNextEvents.get(num - 1); - System.out.println(testName.getMethodName() + " => Received: " + onNextEvents.size() + " Passed: " + System.out.println(testInfo.getDisplayName() + " => Received: " + onNextEvents.size() + " Passed: " + passCount.get() + " Dropped: " + dropCount.get() + " Emitted: " + emitCount.get() + " Last value: " + lastEvent); assertEquals(num, onNextEvents.size()); // in reality, num < passCount diff --git a/src/test/java/io/reactivex/rxjava4/flowable/FlowableCollectTest.java b/src/test/java/io/reactivex/rxjava4/flowable/FlowableCollectTest.java index 93381dcabf..8483b4761b 100644 --- a/src/test/java/io/reactivex/rxjava4/flowable/FlowableCollectTest.java +++ b/src/test/java/io/reactivex/rxjava4/flowable/FlowableCollectTest.java @@ -14,13 +14,13 @@ package io.reactivex.rxjava4.flowable; import static io.reactivex.rxjava4.internal.util.TestingHelper.*; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.functions.*; diff --git a/src/test/java/io/reactivex/rxjava4/flowable/FlowableCombineLatestTests.java b/src/test/java/io/reactivex/rxjava4/flowable/FlowableCombineLatestTests.java index aec68b7330..e945358869 100644 --- a/src/test/java/io/reactivex/rxjava4/flowable/FlowableCombineLatestTests.java +++ b/src/test/java/io/reactivex/rxjava4/flowable/FlowableCombineLatestTests.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.flowable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.flowable.FlowableCovarianceTest.*; diff --git a/src/test/java/io/reactivex/rxjava4/flowable/FlowableConcatTests.java b/src/test/java/io/reactivex/rxjava4/flowable/FlowableConcatTests.java index d8d7046c57..bc1bb1a880 100644 --- a/src/test/java/io/reactivex/rxjava4/flowable/FlowableConcatTests.java +++ b/src/test/java/io/reactivex/rxjava4/flowable/FlowableConcatTests.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.flowable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.flowable.FlowableCovarianceTest.*; diff --git a/src/test/java/io/reactivex/rxjava4/flowable/FlowableConversionTest.java b/src/test/java/io/reactivex/rxjava4/flowable/FlowableConversionTest.java index 0b76871e2d..0be03ec03c 100644 --- a/src/test/java/io/reactivex/rxjava4/flowable/FlowableConversionTest.java +++ b/src/test/java/io/reactivex/rxjava4/flowable/FlowableConversionTest.java @@ -13,13 +13,14 @@ package io.reactivex.rxjava4.flowable; +import static org.junit.jupiter.api.Assertions.assertNull; + import java.util.*; import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.Flow.Publisher; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.*; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.functions.*; @@ -223,6 +224,6 @@ public void onNext(Integer t) { System.out.println(x + " item: " + i); } } - Assert.assertNull(thrown.get()); + assertNull(thrown.get()); } } diff --git a/src/test/java/io/reactivex/rxjava4/flowable/FlowableCovarianceTest.java b/src/test/java/io/reactivex/rxjava4/flowable/FlowableCovarianceTest.java index 4331b19dfb..1c232612c7 100644 --- a/src/test/java/io/reactivex/rxjava4/flowable/FlowableCovarianceTest.java +++ b/src/test/java/io/reactivex/rxjava4/flowable/FlowableCovarianceTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.flowable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.*; import java.util.concurrent.Flow.Publisher; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.flowables.GroupedFlowable; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.testsupport.TestSubscriberEx; /** diff --git a/src/test/java/io/reactivex/rxjava4/flowable/FlowableDoAfterNextTest.java b/src/test/java/io/reactivex/rxjava4/flowable/FlowableDoAfterNextTest.java index 80dcab9a17..e07dffc2d6 100644 --- a/src/test/java/io/reactivex/rxjava4/flowable/FlowableDoAfterNextTest.java +++ b/src/test/java/io/reactivex/rxjava4/flowable/FlowableDoAfterNextTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.flowable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; diff --git a/src/test/java/io/reactivex/rxjava4/flowable/FlowableDoOnTest.java b/src/test/java/io/reactivex/rxjava4/flowable/FlowableDoOnTest.java index 1225c1f602..fd63dc47e5 100644 --- a/src/test/java/io/reactivex/rxjava4/flowable/FlowableDoOnTest.java +++ b/src/test/java/io/reactivex/rxjava4/flowable/FlowableDoOnTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/flowable/FlowableErrorHandlingTests.java b/src/test/java/io/reactivex/rxjava4/flowable/FlowableErrorHandlingTests.java index fdbd86356b..e2fe59a099 100644 --- a/src/test/java/io/reactivex/rxjava4/flowable/FlowableErrorHandlingTests.java +++ b/src/test/java/io/reactivex/rxjava4/flowable/FlowableErrorHandlingTests.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.flowable; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.schedulers.Schedulers; diff --git a/src/test/java/io/reactivex/rxjava4/flowable/FlowableEventStreamTest.java b/src/test/java/io/reactivex/rxjava4/flowable/FlowableEventStreamTest.java index 1efa1a665a..5e566fdb09 100644 --- a/src/test/java/io/reactivex/rxjava4/flowable/FlowableEventStreamTest.java +++ b/src/test/java/io/reactivex/rxjava4/flowable/FlowableEventStreamTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.flowable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/flowable/FlowableFuseableTest.java b/src/test/java/io/reactivex/rxjava4/flowable/FlowableFuseableTest.java index 67530557be..fb25c577ed 100644 --- a/src/test/java/io/reactivex/rxjava4/flowable/FlowableFuseableTest.java +++ b/src/test/java/io/reactivex/rxjava4/flowable/FlowableFuseableTest.java @@ -15,7 +15,7 @@ import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.operators.QueueFuseable; diff --git a/src/test/java/io/reactivex/rxjava4/flowable/FlowableGroupByTests.java b/src/test/java/io/reactivex/rxjava4/flowable/FlowableGroupByTests.java index cbaf94f37e..4b6301446d 100644 --- a/src/test/java/io/reactivex/rxjava4/flowable/FlowableGroupByTests.java +++ b/src/test/java/io/reactivex/rxjava4/flowable/FlowableGroupByTests.java @@ -15,7 +15,7 @@ import java.util.concurrent.Flow.Publisher; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; diff --git a/src/test/java/io/reactivex/rxjava4/flowable/FlowableMergeTests.java b/src/test/java/io/reactivex/rxjava4/flowable/FlowableMergeTests.java index e7c1d17cda..c514dda2a7 100644 --- a/src/test/java/io/reactivex/rxjava4/flowable/FlowableMergeTests.java +++ b/src/test/java/io/reactivex/rxjava4/flowable/FlowableMergeTests.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.Flow.Publisher; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.flowable.FlowableCovarianceTest.*; diff --git a/src/test/java/io/reactivex/rxjava4/flowable/FlowableNotificationTest.java b/src/test/java/io/reactivex/rxjava4/flowable/FlowableNotificationTest.java index 708156e084..d5949fdde6 100644 --- a/src/test/java/io/reactivex/rxjava4/flowable/FlowableNotificationTest.java +++ b/src/test/java/io/reactivex/rxjava4/flowable/FlowableNotificationTest.java @@ -13,38 +13,44 @@ package io.reactivex.rxjava4.flowable; -import org.junit.*; +import static org.junit.jupiter.api.Assertions.*; + +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; public class FlowableNotificationTest extends RxJavaTest { - @Test(expected = NullPointerException.class) + @Test public void onNextIntegerNotificationDoesNotEqualNullNotification() { - final Notification integerNotification = Notification.createOnNext(1); - final Notification nullNotification = Notification.createOnNext(null); - Assert.assertNotEquals(integerNotification, nullNotification); + assertThrows(NullPointerException.class, () -> { + final Notification integerNotification = Notification.createOnNext(1); + final Notification nullNotification = Notification.createOnNext(null); + assertNotEquals(integerNotification, nullNotification); + }); } - @Test(expected = NullPointerException.class) + @Test public void onNextNullNotificationDoesNotEqualIntegerNotification() { - final Notification integerNotification = Notification.createOnNext(1); - final Notification nullNotification = Notification.createOnNext(null); - Assert.assertNotEquals(nullNotification, integerNotification); + assertThrows(NullPointerException.class, () -> { + final Notification integerNotification = Notification.createOnNext(1); + final Notification nullNotification = Notification.createOnNext(null); + assertNotEquals(nullNotification, integerNotification); + }); } @Test public void onNextIntegerNotificationsWhenEqual() { final Notification integerNotification = Notification.createOnNext(1); final Notification integerNotification2 = Notification.createOnNext(1); - Assert.assertEquals(integerNotification, integerNotification2); + assertEquals(integerNotification, integerNotification2); } @Test public void onNextIntegerNotificationsWhenNotEqual() { final Notification integerNotification = Notification.createOnNext(1); final Notification integerNotification2 = Notification.createOnNext(2); - Assert.assertNotEquals(integerNotification, integerNotification2); + assertNotEquals(integerNotification, integerNotification2); } @Test @@ -52,13 +58,13 @@ public void onErrorIntegerNotificationsWhenEqual() { final Exception exception = new Exception(); final Notification onErrorNotification = Notification.createOnError(exception); final Notification onErrorNotification2 = Notification.createOnError(exception); - Assert.assertEquals(onErrorNotification, onErrorNotification2); + assertEquals(onErrorNotification, onErrorNotification2); } @Test public void onErrorIntegerNotificationWhenNotEqual() { final Notification onErrorNotification = Notification.createOnError(new Exception()); final Notification onErrorNotification2 = Notification.createOnError(new Exception()); - Assert.assertNotEquals(onErrorNotification, onErrorNotification2); + assertNotEquals(onErrorNotification, onErrorNotification2); } } diff --git a/src/test/java/io/reactivex/rxjava4/flowable/FlowableReduceTests.java b/src/test/java/io/reactivex/rxjava4/flowable/FlowableReduceTests.java index 446a5fa2b0..0fe52d8472 100644 --- a/src/test/java/io/reactivex/rxjava4/flowable/FlowableReduceTests.java +++ b/src/test/java/io/reactivex/rxjava4/flowable/FlowableReduceTests.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.flowable.FlowableCovarianceTest.*; diff --git a/src/test/java/io/reactivex/rxjava4/flowable/FlowableStartWithTests.java b/src/test/java/io/reactivex/rxjava4/flowable/FlowableStartWithTests.java index dde857ba91..a9524bafb4 100644 --- a/src/test/java/io/reactivex/rxjava4/flowable/FlowableStartWithTests.java +++ b/src/test/java/io/reactivex/rxjava4/flowable/FlowableStartWithTests.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.flowable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/flowable/FlowableSubscriberTest.java b/src/test/java/io/reactivex/rxjava4/flowable/FlowableSubscriberTest.java index dfb7762e75..2003d32e19 100644 --- a/src/test/java/io/reactivex/rxjava4/flowable/FlowableSubscriberTest.java +++ b/src/test/java/io/reactivex/rxjava4/flowable/FlowableSubscriberTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; diff --git a/src/test/java/io/reactivex/rxjava4/flowable/FlowableTests.java b/src/test/java/io/reactivex/rxjava4/flowable/FlowableTests.java index c0f114a8cd..ee5dbbb1de 100644 --- a/src/test/java/io/reactivex/rxjava4/flowable/FlowableTests.java +++ b/src/test/java/io/reactivex/rxjava4/flowable/FlowableTests.java @@ -13,23 +13,23 @@ package io.reactivex.rxjava4.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.*; import java.util.concurrent.*; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; import io.reactivex.rxjava4.flowables.ConnectableFlowable; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Predicate; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.plugins.RxJavaPlugins; @@ -48,7 +48,7 @@ public class FlowableTests extends RxJavaTest { private static final Predicate IS_EVEN = v -> v % 2 == 0; - @Before + @BeforeEach public void before() { w = TestHelper.mockSubscriber(); wo = TestHelper.mockSingleObserver(); diff --git a/src/test/java/io/reactivex/rxjava4/flowable/FlowableThrottleLastTests.java b/src/test/java/io/reactivex/rxjava4/flowable/FlowableThrottleLastTests.java index d3d01fc312..2c73974f38 100644 --- a/src/test/java/io/reactivex/rxjava4/flowable/FlowableThrottleLastTests.java +++ b/src/test/java/io/reactivex/rxjava4/flowable/FlowableThrottleLastTests.java @@ -16,16 +16,15 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.TimeUnit; -import io.reactivex.rxjava4.core.Observer; -import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.Action; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; -import io.reactivex.rxjava4.core.RxJavaTest; +import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.exceptions.TestException; +import io.reactivex.rxjava4.functions.Action; import io.reactivex.rxjava4.processors.PublishProcessor; import io.reactivex.rxjava4.schedulers.TestScheduler; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/flowable/FlowableThrottleWithTimeoutTests.java b/src/test/java/io/reactivex/rxjava4/flowable/FlowableThrottleWithTimeoutTests.java index 390ccda680..c8e3ed4cb1 100644 --- a/src/test/java/io/reactivex/rxjava4/flowable/FlowableThrottleWithTimeoutTests.java +++ b/src/test/java/io/reactivex/rxjava4/flowable/FlowableThrottleWithTimeoutTests.java @@ -15,11 +15,11 @@ import static org.mockito.Mockito.inOrder; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.processors.PublishProcessor; diff --git a/src/test/java/io/reactivex/rxjava4/flowable/FlowableWindowTests.java b/src/test/java/io/reactivex/rxjava4/flowable/FlowableWindowTests.java index 79babf32df..ce85795ffe 100644 --- a/src/test/java/io/reactivex/rxjava4/flowable/FlowableWindowTests.java +++ b/src/test/java/io/reactivex/rxjava4/flowable/FlowableWindowTests.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.processors.PublishProcessor; import io.reactivex.rxjava4.schedulers.TestScheduler; import io.reactivex.rxjava4.subscribers.TestSubscriber; diff --git a/src/test/java/io/reactivex/rxjava4/flowable/FlowableZipTests.java b/src/test/java/io/reactivex/rxjava4/flowable/FlowableZipTests.java index 82a0b37c8c..d06f6b3a6f 100644 --- a/src/test/java/io/reactivex/rxjava4/flowable/FlowableZipTests.java +++ b/src/test/java/io/reactivex/rxjava4/flowable/FlowableZipTests.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.Flow.Publisher; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; @@ -73,20 +73,22 @@ public void covarianceOfZip() { * * We now expect an NoSuchElementException since last() requires at least one value and nothing will be emitted. */ - @Test(expected = NoSuchElementException.class) + @Test public void nonBlockingObservable() { + assertThrows(NoSuchElementException.class, () -> { + final Object invoked = new Object(); - final Object invoked = new Object(); + Collection> observables = Collections.emptyList(); - Collection> observables = Collections.emptyList(); + Flowable result = Flowable.zip(observables, args -> { + System.out.println("received: " + args); + assertEquals(0, args.length, "No argument should have been passed"); + return invoked; + }); - Flowable result = Flowable.zip(observables, args -> { - System.out.println("received: " + args); - assertEquals("No argument should have been passed", 0, args.length); - return invoked; + assertSame(invoked, result.blockingLast()); }); - assertSame(invoked, result.blockingLast()); } BiFunction combine = (_, _) -> new ExtendedResult(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/SubscribeWithTest.java b/src/test/java/io/reactivex/rxjava4/internal/SubscribeWithTest.java index ded60fb7d1..0e94aefe47 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/SubscribeWithTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/SubscribeWithTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; diff --git a/src/test/java/io/reactivex/rxjava4/internal/disposables/ArrayCompositeDisposableTest.java b/src/test/java/io/reactivex/rxjava4/internal/disposables/ArrayCompositeDisposableTest.java index af98cefd42..24a849381e 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/disposables/ArrayCompositeDisposableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/disposables/ArrayCompositeDisposableTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.disposables; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.testsupport.TestHelper; public class ArrayCompositeDisposableTest extends RxJavaTest { 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 2824cabc00..b6c31cb8c5 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/disposables/CancellableDisposableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/disposables/CancellableDisposableTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.disposables; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.exceptions.TestException; 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 06b0f937a6..784ec7a1f0 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/disposables/DisposableHelperTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/disposables/DisposableHelperTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.disposables; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/disposables/EmptyDisposableTest.java b/src/test/java/io/reactivex/rxjava4/internal/disposables/EmptyDisposableTest.java index fc2bb4682e..6e2b9c1d8d 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/disposables/EmptyDisposableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/disposables/EmptyDisposableTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.disposables; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.operators.QueueFuseable; diff --git a/src/test/java/io/reactivex/rxjava4/internal/disposables/ListCompositeDisposableTest.java b/src/test/java/io/reactivex/rxjava4/internal/disposables/ListCompositeDisposableTest.java index 2addf1c93f..8ec39cd5e5 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/disposables/ListCompositeDisposableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/disposables/ListCompositeDisposableTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.disposables; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/functions/FunctionsTest.java b/src/test/java/io/reactivex/rxjava4/internal/functions/FunctionsTest.java index 33f37e4551..60ca5e2166 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/functions/FunctionsTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/functions/FunctionsTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.functions; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.lang.reflect.Method; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.exceptions.TestException; @@ -83,49 +83,65 @@ public void booleanSupplierPredicateReverse() throws Throwable { assertFalse(Functions.predicateReverseFor(s).test(1)); } - @Test(expected = IllegalArgumentException.class) + @Test public void toFunction2() throws Throwable { - Functions.toFunction((BiFunction) (_, _) -> null).apply(new Object[20]); + assertThrows(IllegalArgumentException.class, () -> { + Functions.toFunction((BiFunction) (_, _) -> null).apply(new Object[20]); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void toFunction3() throws Throwable { - Functions.toFunction((Function3) (_, _, _) -> null).apply(new Object[20]); + assertThrows(IllegalArgumentException.class, () -> { + Functions.toFunction((Function3) (_, _, _) -> null).apply(new Object[20]); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void toFunction4() throws Throwable { - Functions.toFunction((Function4) (_, _, _, _) -> null).apply(new Object[20]); + assertThrows(IllegalArgumentException.class, () -> { + Functions.toFunction((Function4) (_, _, _, _) -> null).apply(new Object[20]); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void toFunction5() throws Throwable { - Functions.toFunction((Function5) (_, _, _, _, - _) -> null).apply(new Object[20]); + assertThrows(IllegalArgumentException.class, () -> { + Functions.toFunction((Function5) (_, _, _, _, + _) -> null).apply(new Object[20]); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void toFunction6() throws Throwable { - Functions.toFunction((Function6) (_, _, _, _, - _, _) -> null).apply(new Object[20]); + assertThrows(IllegalArgumentException.class, () -> { + Functions.toFunction((Function6) (_, _, _, _, + _, _) -> null).apply(new Object[20]); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void toFunction7() throws Throwable { - Functions.toFunction((Function7) (_, _, _, - _, _, _, _) -> null).apply(new Object[20]); + assertThrows(IllegalArgumentException.class, () -> { + Functions.toFunction((Function7) (_, _, _, + _, _, _, _) -> null).apply(new Object[20]); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void toFunction8() throws Throwable { - Functions.toFunction((Function8) (_, _, - _, _, _, _, _, _) -> null).apply(new Object[20]); + assertThrows(IllegalArgumentException.class, () -> { + Functions.toFunction((Function8) (_, _, + _, _, _, _, _, _) -> null).apply(new Object[20]); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void toFunction9() throws Throwable { - Functions.toFunction((Function9) (_, - _, _, _, _, _, _, _, _) -> null).apply(new Object[20]); + assertThrows(IllegalArgumentException.class, () -> { + Functions.toFunction((Function9) (_, + _, _, _, _, _, _, _, _) -> null).apply(new Object[20]); + }); } @Test @@ -155,7 +171,7 @@ public void errorConsumerEmpty() throws Throwable { Functions.ERROR_CONSUMER.accept(new TestException()); TestHelper.assertUndeliverable(errors, 0, TestException.class); - assertEquals(errors.toString(), 1, errors.size()); + assertEquals(1, errors.size(), errors.toString()); } finally { RxJavaPlugins.reset(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/functions/ObjectHelperTest.java b/src/test/java/io/reactivex/rxjava4/internal/functions/ObjectHelperTest.java index 45711a3de1..b934f8268c 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/functions/ObjectHelperTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/functions/ObjectHelperTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.functions; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.testsupport.TestHelper; @@ -37,13 +37,17 @@ public void verifyPositiveLong() throws Exception { assertEquals(1L, ObjectHelper.verifyPositive(1L, "param")); } - @Test(expected = IllegalArgumentException.class) + @Test public void verifyPositiveIntFail() throws Exception { - assertEquals(-1, ObjectHelper.verifyPositive(-1, "param")); + assertThrows(IllegalArgumentException.class, () -> { + assertEquals(-1, ObjectHelper.verifyPositive(-1, "param")); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void verifyPositiveLongFail() throws Exception { - assertEquals(-1L, ObjectHelper.verifyPositive(-1L, "param")); + assertThrows(IllegalArgumentException.class, () -> { + assertEquals(-1L, ObjectHelper.verifyPositive(-1L, "param")); + }); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/fuseable/CancellableQueueFuseableTest.java b/src/test/java/io/reactivex/rxjava4/internal/fuseable/CancellableQueueFuseableTest.java index 3d49c3b636..4e0402903e 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/fuseable/CancellableQueueFuseableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/fuseable/CancellableQueueFuseableTest.java @@ -13,8 +13,9 @@ package io.reactivex.rxjava4.internal.fuseable; -import static org.junit.Assert.*; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.*; + +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/CompletableFromCompletionStageTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/CompletableFromCompletionStageTest.java index f295aafb12..b9c15b3234 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/CompletableFromCompletionStageTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/CompletableFromCompletionStageTest.java @@ -15,7 +15,7 @@ import java.util.concurrent.CompletableFuture; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/CompletableToCompletionStageTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/CompletableToCompletionStageTest.java index 468381b799..2ad83ac0dd 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/CompletableToCompletionStageTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/CompletableToCompletionStageTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.jdk8; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.CompletableFuture; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableBlockingStreamTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableBlockingStreamTest.java index d39c2633e9..d6cbb0833d 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableBlockingStreamTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableBlockingStreamTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.jdk8; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.stream.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableCollectWithCollectorTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableCollectWithCollectorTest.java index 23d7a51330..29bb7b5101 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableCollectWithCollectorTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableCollectWithCollectorTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.jdk8; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import java.io.IOException; import java.util.*; +import java.util.concurrent.Flow.Subscriber; import java.util.function.*; import java.util.stream.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableFlatMapStreamTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableFlatMapStreamTest.java index fa7e1b4d5a..0c97d0dc5a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableFlatMapStreamTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableFlatMapStreamTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.jdk8; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.io.IOException; @@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableFromCompletionStageTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableFromCompletionStageTest.java index 833e81a1fa..a5270dcdc3 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableFromCompletionStageTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableFromCompletionStageTest.java @@ -15,7 +15,7 @@ import java.util.concurrent.CompletableFuture; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableFromOptionalTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableFromOptionalTest.java index 6b8d9e2fda..b43ab53b15 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableFromOptionalTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableFromOptionalTest.java @@ -15,7 +15,7 @@ import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableFromStreamTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableFromStreamTest.java index 81fe78afb2..c519225576 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableFromStreamTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableFromStreamTest.java @@ -13,22 +13,20 @@ package io.reactivex.rxjava4.internal.jdk8; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.*; +import java.util.concurrent.Flow.Subscription; import java.util.concurrent.atomic.*; import java.util.stream.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.operators.QueueFuseable; -import io.reactivex.rxjava4.operators.QueueSubscription; -import io.reactivex.rxjava4.operators.SimpleQueue; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.schedulers.Schedulers; import io.reactivex.rxjava4.testsupport.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableMapOptionalTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableMapOptionalTest.java index 5b00496ec7..63c1dea28a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableMapOptionalTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableMapOptionalTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.jdk8; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import java.util.Optional; +import java.util.concurrent.Flow.Subscriber; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableStageSubscriberOrDefaultTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableStageSubscriberOrDefaultTest.java index c2e1fab91e..51022abf78 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableStageSubscriberOrDefaultTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableStageSubscriberOrDefaultTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.jdk8; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import java.util.concurrent.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Flow.Subscriber; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableStageSubscriberOrErrorTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableStageSubscriberOrErrorTest.java index d2d4006810..a2d33d78da 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableStageSubscriberOrErrorTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/FlowableStageSubscriberOrErrorTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.jdk8; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.NoSuchElementException; -import java.util.concurrent.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Flow.Subscriber; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeFlattenStreamAsFlowableTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeFlattenStreamAsFlowableTest.java index 9b22f8956a..295471d5be 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeFlattenStreamAsFlowableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeFlattenStreamAsFlowableTest.java @@ -13,24 +13,23 @@ package io.reactivex.rxjava4.internal.jdk8; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.Iterator; +import java.util.concurrent.Flow.Subscription; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; -import io.reactivex.rxjava4.operators.QueueFuseable; -import io.reactivex.rxjava4.operators.QueueSubscription; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.subjects.MaybeSubject; import io.reactivex.rxjava4.subscribers.TestSubscriber; import io.reactivex.rxjava4.testsupport.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeFlattenStreamAsObservableTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeFlattenStreamAsObservableTest.java index 31e3067f54..509baeb56c 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeFlattenStreamAsObservableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeFlattenStreamAsObservableTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.jdk8; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -21,15 +21,14 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Stream; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.observers.TestObserver; -import io.reactivex.rxjava4.operators.QueueDisposable; -import io.reactivex.rxjava4.operators.QueueFuseable; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.subjects.MaybeSubject; import io.reactivex.rxjava4.testsupport.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeFromCompletionStageTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeFromCompletionStageTest.java index 5d02290861..fcff26d9a2 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeFromCompletionStageTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeFromCompletionStageTest.java @@ -15,7 +15,7 @@ import java.util.concurrent.CompletableFuture; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeFromOptionalTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeFromOptionalTest.java index 23f33f5dc1..03c8e62e1f 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeFromOptionalTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeFromOptionalTest.java @@ -15,7 +15,7 @@ import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeMapOptionalTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeMapOptionalTest.java index 9e48d85db0..1f46b9e1c0 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeMapOptionalTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeMapOptionalTest.java @@ -18,7 +18,7 @@ import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeToCompletionStageTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeToCompletionStageTest.java index 32de9e9416..c459ab74e8 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeToCompletionStageTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/MaybeToCompletionStageTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.jdk8; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.NoSuchElementException; import java.util.concurrent.CompletableFuture; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableBlockingStreamTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableBlockingStreamTest.java index 93322f98f5..f7ce636d42 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableBlockingStreamTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableBlockingStreamTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.jdk8; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.stream.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableCollectWithCollectorTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableCollectWithCollectorTest.java index 6d748d86f9..4a9deb4832 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableCollectWithCollectorTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableCollectWithCollectorTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.jdk8; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import java.io.IOException; import java.util.*; import java.util.function.*; import java.util.stream.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableFlatMapStreamTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableFlatMapStreamTest.java index decf25a842..2e07c83c42 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableFlatMapStreamTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableFlatMapStreamTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.jdk8; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.io.IOException; @@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableFromCompletionStageTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableFromCompletionStageTest.java index da0cad5b96..85228a45e9 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableFromCompletionStageTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableFromCompletionStageTest.java @@ -15,7 +15,7 @@ import java.util.concurrent.CompletableFuture; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableFromOptionalTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableFromOptionalTest.java index a0f2f3a995..8269a6988f 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableFromOptionalTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableFromOptionalTest.java @@ -15,7 +15,7 @@ import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableFromStreamTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableFromStreamTest.java index 9e81d6bf84..6b03fda613 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableFromStreamTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableFromStreamTest.java @@ -13,23 +13,21 @@ package io.reactivex.rxjava4.internal.jdk8; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.Iterator; import java.util.concurrent.atomic.*; import java.util.stream.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.observers.TestObserver; -import io.reactivex.rxjava4.operators.QueueDisposable; -import io.reactivex.rxjava4.operators.QueueFuseable; -import io.reactivex.rxjava4.operators.SimpleQueue; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.testsupport.*; public class ObservableFromStreamTest extends RxJavaTest { diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableMapOptionalTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableMapOptionalTest.java index 0219bb923e..8d9cce78f5 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableMapOptionalTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableMapOptionalTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.jdk8; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableStageSubscriberOrDefaultTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableStageSubscriberOrDefaultTest.java index 8d4b0f2df4..83732c8026 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableStageSubscriberOrDefaultTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableStageSubscriberOrDefaultTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.jdk8; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.CompletableFuture; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableStageSubscriberOrErrorTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableStageSubscriberOrErrorTest.java index 2c188d894d..231d0f629a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableStageSubscriberOrErrorTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ObservableStageSubscriberOrErrorTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.jdk8; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.NoSuchElementException; import java.util.concurrent.CompletableFuture; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ParallelCollectorTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ParallelCollectorTest.java index 0bca127fa0..f9f1d62a60 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ParallelCollectorTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ParallelCollectorTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.jdk8; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.TimeUnit; @@ -272,7 +272,7 @@ public void doubleError() { assertFalse(errors.isEmpty()); for (Throwable ex : errors) { - assertTrue(ex.toString(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, ex.toString()); } } finally { RxJavaPlugins.reset(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ParallelFlatMapStreamTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ParallelFlatMapStreamTest.java index 242e82afb2..67725391f8 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ParallelFlatMapStreamTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ParallelFlatMapStreamTest.java @@ -15,7 +15,7 @@ import java.util.stream.Stream; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.parallel.ParallelFlowableTest; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ParallelMapOptionalTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ParallelMapOptionalTest.java index 3f6a1a1cdb..7eef18c886 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ParallelMapOptionalTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ParallelMapOptionalTest.java @@ -13,17 +13,17 @@ package io.reactivex.rxjava4.internal.jdk8; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.internal.functions.Functions; -import io.reactivex.rxjava4.parallel.*; +import io.reactivex.rxjava4.parallel.ParallelInvalid; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.schedulers.Schedulers; import io.reactivex.rxjava4.testsupport.TestHelper; @@ -68,7 +68,7 @@ public void doubleError() { assertFalse(errors.isEmpty()); for (Throwable ex : errors) { - assertTrue(ex.toString(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, ex.toString()); } } finally { RxJavaPlugins.reset(); @@ -88,7 +88,7 @@ public void doubleError2() { assertFalse(errors.isEmpty()); for (Throwable ex : errors) { - assertTrue(ex.toString(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, ex.toString()); } } finally { RxJavaPlugins.reset(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ParallelMapTryOptionalTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ParallelMapTryOptionalTest.java index 5407d180a9..7862dc155f 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/ParallelMapTryOptionalTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/ParallelMapTryOptionalTest.java @@ -15,7 +15,7 @@ import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/SingleFlattenStreamAsFlowableTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/SingleFlattenStreamAsFlowableTest.java index 4b15e01b14..a8620a5b71 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/SingleFlattenStreamAsFlowableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/SingleFlattenStreamAsFlowableTest.java @@ -13,24 +13,23 @@ package io.reactivex.rxjava4.internal.jdk8; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.Iterator; +import java.util.concurrent.Flow.Subscription; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; -import io.reactivex.rxjava4.operators.QueueFuseable; -import io.reactivex.rxjava4.operators.QueueSubscription; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.subjects.SingleSubject; import io.reactivex.rxjava4.subscribers.TestSubscriber; import io.reactivex.rxjava4.testsupport.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/SingleFlattenStreamAsObservableTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/SingleFlattenStreamAsObservableTest.java index cf9a72f971..2b8b8225e8 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/SingleFlattenStreamAsObservableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/SingleFlattenStreamAsObservableTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.jdk8; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -21,15 +21,14 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Stream; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.observers.TestObserver; -import io.reactivex.rxjava4.operators.QueueDisposable; -import io.reactivex.rxjava4.operators.QueueFuseable; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.subjects.SingleSubject; import io.reactivex.rxjava4.testsupport.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/SingleFromCompletionStageTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/SingleFromCompletionStageTest.java index e872d3509c..06855c2c18 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/SingleFromCompletionStageTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/SingleFromCompletionStageTest.java @@ -15,7 +15,7 @@ import java.util.concurrent.CompletableFuture; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/SingleMapOptionalTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/SingleMapOptionalTest.java index 5e53e1700e..40cf4ed1e9 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/SingleMapOptionalTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/SingleMapOptionalTest.java @@ -18,7 +18,7 @@ import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/jdk8/SingleToCompletionStageTest.java b/src/test/java/io/reactivex/rxjava4/internal/jdk8/SingleToCompletionStageTest.java index e1d4e2f809..a6c11413ab 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/jdk8/SingleToCompletionStageTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/jdk8/SingleToCompletionStageTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.jdk8; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.CompletableFuture; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; diff --git a/src/test/java/io/reactivex/rxjava4/internal/observers/BasicFuseableObserverTest.java b/src/test/java/io/reactivex/rxjava4/internal/observers/BasicFuseableObserverTest.java index e0f32ad980..721af21634 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/observers/BasicFuseableObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/observers/BasicFuseableObserverTest.java @@ -13,67 +13,73 @@ package io.reactivex.rxjava4.internal.observers; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.Nullable; import io.reactivex.rxjava4.core.RxJavaTest; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.testsupport.TestObserverEx; public class BasicFuseableObserverTest extends RxJavaTest { - @Test(expected = UnsupportedOperationException.class) + @Test public void offer() { - TestObserverEx to = new TestObserverEx<>(); - - var o = new BasicFuseableObserver(to) /* NFI */ { - @Nullable - @Override - public Integer poll() throws Exception { - return null; - } - - @Override - public int requestFusion(int mode) { - return 0; - } - - @Override - public void onNext(Integer value) { - } - - @Override - protected boolean beforeDownstream() { - return false; - } - }; - o.onSubscribe(Disposable.disposed()); - - to.assertNotSubscribed(); - - o.offer(1); + assertThrows(UnsupportedOperationException.class, () -> { + TestObserverEx to = new TestObserverEx<>(); + + var o = new BasicFuseableObserver(to) /* NFI */ { + @Nullable + @Override + public Integer poll() throws Exception { + return null; + } + + @Override + public int requestFusion(int mode) { + return 0; + } + + @Override + public void onNext(Integer value) { + } + + @Override + protected boolean beforeDownstream() { + return false; + } + }; + o.onSubscribe(Disposable.disposed()); + + to.assertNotSubscribed(); + + o.offer(1); + }); } - @Test(expected = UnsupportedOperationException.class) + @Test public void offer2() { - var o = new BasicFuseableObserver(new TestObserver<>()) { - @Nullable - @Override - public Integer poll() throws Exception { - return null; - } - - @Override - public int requestFusion(int mode) { - return 0; - } - - @Override - public void onNext(Integer value) { - } - }; - - o.offer(1, 2); + assertThrows(UnsupportedOperationException.class, () -> { + var o = new BasicFuseableObserver(new TestObserver<>()) { + @Nullable + @Override + public Integer poll() throws Exception { + return null; + } + + @Override + public int requestFusion(int mode) { + return 0; + } + + @Override + public void onNext(Integer value) { + } + }; + + o.offer(1, 2); + }); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/observers/BasicQueueDisposableTest.java b/src/test/java/io/reactivex/rxjava4/internal/observers/BasicQueueDisposableTest.java index 6f98c4d07c..d317457f5a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/observers/BasicQueueDisposableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/observers/BasicQueueDisposableTest.java @@ -13,7 +13,9 @@ package io.reactivex.rxjava4.internal.observers; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.Nullable; import io.reactivex.rxjava4.core.RxJavaTest; @@ -54,13 +56,17 @@ public int requestFusion(int mode) { } }; - @Test(expected = UnsupportedOperationException.class) + @Test public void offer() { - q.offer(1); + assertThrows(UnsupportedOperationException.class, () -> { + q.offer(1); + }); } - @Test(expected = UnsupportedOperationException.class) + @Test public void offer2() { - q.offer(1, 2); + assertThrows(UnsupportedOperationException.class, () -> { + q.offer(1, 2); + }); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/observers/BlockingFirstObserverTest.java b/src/test/java/io/reactivex/rxjava4/internal/observers/BlockingFirstObserverTest.java index d74463c9ce..50e00b028e 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/observers/BlockingFirstObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/observers/BlockingFirstObserverTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.observers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; public class BlockingFirstObserverTest extends RxJavaTest { diff --git a/src/test/java/io/reactivex/rxjava4/internal/observers/BlockingMultiObserverTest.java b/src/test/java/io/reactivex/rxjava4/internal/observers/BlockingMultiObserverTest.java index bb44473777..5e05975879 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/observers/BlockingMultiObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/observers/BlockingMultiObserverTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.observers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.schedulers.Schedulers; public class BlockingMultiObserverTest extends RxJavaTest { diff --git a/src/test/java/io/reactivex/rxjava4/internal/observers/BlockingObserverTest.java b/src/test/java/io/reactivex/rxjava4/internal/observers/BlockingObserverTest.java index cb0eb0df46..faec79e144 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/observers/BlockingObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/observers/BlockingObserverTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.observers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; diff --git a/src/test/java/io/reactivex/rxjava4/internal/observers/CallbackCompletableObserverTest.java b/src/test/java/io/reactivex/rxjava4/internal/observers/CallbackCompletableObserverTest.java index 2d67997c83..00cca70f79 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/observers/CallbackCompletableObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/observers/CallbackCompletableObserverTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.observers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.internal.functions.Functions; diff --git a/src/test/java/io/reactivex/rxjava4/internal/observers/CompletableConsumersTest.java b/src/test/java/io/reactivex/rxjava4/internal/observers/CompletableConsumersTest.java index 14c929cec5..bc23d4acc6 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/observers/CompletableConsumersTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/observers/CompletableConsumersTest.java @@ -29,12 +29,12 @@ package io.reactivex.rxjava4.internal.observers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.*; @@ -70,7 +70,7 @@ public void onErrorNormal() { assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); processor.onComplete(); @@ -85,15 +85,15 @@ public void onErrorError() { Disposable d = processor.subscribe(this, this, composite); - assertTrue(d.getClass().toString(), ((LambdaConsumerIntrospection)d).hasCustomOnError()); + assertTrue(((LambdaConsumerIntrospection)d).hasCustomOnError(), d.getClass().toString()); assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); processor.onError(new IOException()); - assertTrue(events.toString(), events.getFirst() instanceof IOException); + assertTrue(events.getFirst() instanceof IOException, events.toString()); assertEquals(0, composite.size()); } @@ -105,7 +105,7 @@ public void onCompleteNormal() { assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); processor.onComplete(); @@ -122,11 +122,11 @@ public void onCompleteError() { assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); processor.onError(new IOException()); - assertTrue(events.toString(), events.getFirst() instanceof IOException); + assertTrue(events.getFirst() instanceof IOException, events.toString()); assertEquals(0, composite.size()); } @@ -138,7 +138,7 @@ public void onCompleteDispose() { assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); assertFalse(d.isDisposed()); @@ -162,7 +162,7 @@ public void onErrorCrash() { processor.onError(new IllegalArgumentException()); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); TestHelper.assertError(errors, 0, CompositeException.class); List inners = TestHelper.compositeList(errors.getFirst()); @@ -183,7 +183,7 @@ public void onCompleteCrash() { processor.onComplete(); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); TestHelper.assertUndeliverable(errors, 0, IOException.class); } finally { diff --git a/src/test/java/io/reactivex/rxjava4/internal/observers/ConsumerSingleObserverTest.java b/src/test/java/io/reactivex/rxjava4/internal/observers/ConsumerSingleObserverTest.java index 718312f8de..c8211cdfd5 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/observers/ConsumerSingleObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/observers/ConsumerSingleObserverTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.observers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.internal.functions.Functions; diff --git a/src/test/java/io/reactivex/rxjava4/internal/observers/DeferredScalarDisposableTest.java b/src/test/java/io/reactivex/rxjava4/internal/observers/DeferredScalarDisposableTest.java index 3daeb6f060..bafdc4363d 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/observers/DeferredScalarDisposableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/observers/DeferredScalarDisposableTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.observers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.observers.TestObserver; diff --git a/src/test/java/io/reactivex/rxjava4/internal/observers/DeferredScalarObserverTest.java b/src/test/java/io/reactivex/rxjava4/internal/observers/DeferredScalarObserverTest.java index 277601c385..fbcbc1a56a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/observers/DeferredScalarObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/observers/DeferredScalarObserverTest.java @@ -13,19 +13,18 @@ package io.reactivex.rxjava4.internal.observers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.Serial; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; import io.reactivex.rxjava4.observers.TestObserver; -import io.reactivex.rxjava4.operators.QueueDisposable; -import io.reactivex.rxjava4.operators.QueueFuseable; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.testsupport.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/observers/DisposableLambdaObserverTest.java b/src/test/java/io/reactivex/rxjava4/internal/observers/DisposableLambdaObserverTest.java index 047acb9b02..8b14f41f27 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/observers/DisposableLambdaObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/observers/DisposableLambdaObserverTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.observers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.observers.TestObserver; diff --git a/src/test/java/io/reactivex/rxjava4/internal/observers/EmptyCompletableObserverTest.java b/src/test/java/io/reactivex/rxjava4/internal/observers/EmptyCompletableObserverTest.java index bd8d8769ca..38cca1ee52 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/observers/EmptyCompletableObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/observers/EmptyCompletableObserverTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.observers; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; diff --git a/src/test/java/io/reactivex/rxjava4/internal/observers/FutureMultiObserverTest.java b/src/test/java/io/reactivex/rxjava4/internal/observers/FutureMultiObserverTest.java index 0d04e1560f..b49109928d 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/observers/FutureMultiObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/observers/FutureMultiObserverTest.java @@ -13,8 +13,9 @@ package io.reactivex.rxjava4.internal.observers; -import static org.junit.Assert.*; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.disposables.Disposable; diff --git a/src/test/java/io/reactivex/rxjava4/internal/observers/FutureObserverTest.java b/src/test/java/io/reactivex/rxjava4/internal/observers/FutureObserverTest.java index 0c333559a7..1d754d4f53 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/observers/FutureObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/observers/FutureObserverTest.java @@ -14,12 +14,12 @@ package io.reactivex.rxjava4.internal.observers; import static io.reactivex.rxjava4.internal.util.ExceptionHelper.timeoutMessage; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.*; -import org.junit.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.disposables.Disposable; @@ -32,7 +32,7 @@ public class FutureObserverTest extends RxJavaTest { FutureObserver fo; - @Before + @BeforeEach public void before() { fo = new FutureObserver<>(); } @@ -111,7 +111,7 @@ public void onError() throws Exception { try { fo.get(5, TimeUnit.MILLISECONDS); } catch (ExecutionException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, ex.toString()); assertEquals("One", ex.getCause().getMessage()); } @@ -229,7 +229,7 @@ public void onErrorOnComplete() throws Exception { try { fo.get(5, TimeUnit.MILLISECONDS); } catch (ExecutionException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, ex.toString()); assertEquals("One", ex.getCause().getMessage()); } @@ -249,7 +249,7 @@ public void onCompleteOnError() throws Exception { try { assertNull(fo.get(5, TimeUnit.MILLISECONDS)); } catch (ExecutionException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof NoSuchElementException); + assertTrue(ex.getCause() instanceof NoSuchElementException, ex.toString()); } TestHelper.assertUndeliverable(errors, 0, TestException.class); @@ -322,10 +322,12 @@ public void onNextThenOnCompleteTwice() throws Exception { assertEquals(1, fo.get(5, TimeUnit.MILLISECONDS).intValue()); } - @Test(expected = InterruptedException.class) + @Test public void getInterrupted() throws Exception { - Thread.currentThread().interrupt(); - fo.get(); + assertThrows(InterruptedException.class, () -> { + Thread.currentThread().interrupt(); + fo.get(); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/observers/FutureSingleObserverTest.java b/src/test/java/io/reactivex/rxjava4/internal/observers/FutureSingleObserverTest.java index 9d5dcaf525..eaadc7de2d 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/observers/FutureSingleObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/observers/FutureSingleObserverTest.java @@ -14,11 +14,11 @@ package io.reactivex.rxjava4.internal.observers; import static io.reactivex.rxjava4.internal.util.ExceptionHelper.timeoutMessage; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; @@ -102,7 +102,7 @@ public void errorGetWithTimeout() throws Exception { f.get(5, TimeUnit.SECONDS); fail("Should have thrown"); } catch (ExecutionException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, ex.toString()); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/observers/InnerQueuedObserverTest.java b/src/test/java/io/reactivex/rxjava4/internal/observers/InnerQueuedObserverTest.java index 95ad4fb917..f2b35c311d 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/observers/InnerQueuedObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/observers/InnerQueuedObserverTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.observers; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/observers/LambdaObserverTest.java b/src/test/java/io/reactivex/rxjava4/internal/observers/LambdaObserverTest.java index 70ad16baaa..7a6b9cde86 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/observers/LambdaObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/observers/LambdaObserverTest.java @@ -13,17 +13,17 @@ package io.reactivex.rxjava4.internal.observers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; import io.reactivex.rxjava4.core.RxJavaTest; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.plugins.RxJavaPlugins; @@ -46,8 +46,8 @@ public void onSubscribeThrows() { Observable.just(1).subscribe(o); - assertTrue(received.toString(), received.getFirst() instanceof TestException); - assertEquals(received.toString(), 1, received.size()); + assertTrue(received.getFirst() instanceof TestException, received.toString()); + assertEquals(1, received.size(), received.toString()); assertTrue(o.isDisposed()); } @@ -66,8 +66,8 @@ public void onNextThrows() { Observable.just(1).subscribe(o); - assertTrue(received.toString(), received.getFirst() instanceof TestException); - assertEquals(received.toString(), 1, received.size()); + assertTrue(received.getFirst() instanceof TestException, received.toString()); + assertEquals(1, received.size(), received.toString()); assertTrue(o.isDisposed()); } @@ -89,7 +89,7 @@ public void onErrorThrows() { Observable.error(new TestException("Outer")).subscribe(o); - assertTrue(received.toString(), received.isEmpty()); + assertTrue(received.isEmpty(), received.toString()); assertTrue(o.isDisposed()); @@ -119,7 +119,7 @@ public void onCompleteThrows() { Observable.empty().subscribe(o); - assertTrue(received.toString(), received.isEmpty()); + assertTrue(received.isEmpty(), received.toString()); assertTrue(o.isDisposed()); @@ -209,15 +209,15 @@ public void onNextThrowsCancelsUpstream() { throw new TestException(); }, errors::add); - assertTrue("No observers?!", ps.hasObservers()); - assertTrue("Has errors already?!", errors.isEmpty()); + assertTrue(ps.hasObservers(), "No observers?!"); + assertTrue(errors.isEmpty(), "Has errors already?!"); ps.onNext(1); - assertFalse("Has observers?!", ps.hasObservers()); - assertFalse("No errors?!", errors.isEmpty()); + assertFalse(ps.hasObservers(), "Has observers?!"); + assertFalse(errors.isEmpty(), "No errors?!"); - assertTrue(errors.toString(), errors.getFirst() instanceof TestException); + assertTrue(errors.getFirst() instanceof TestException, errors.toString()); } @Test @@ -232,10 +232,10 @@ public void onSubscribeThrowsCancelsUpstream() { throw new TestException(); })); - assertFalse("Has observers?!", ps.hasObservers()); - assertFalse("No errors?!", errors.isEmpty()); + assertFalse(ps.hasObservers(), "Has observers?!"); + assertFalse(errors.isEmpty(), "No errors?!"); - assertTrue(errors.toString(), errors.getFirst() instanceof TestException); + assertTrue(errors.getFirst() instanceof TestException, errors.toString()); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/observers/MaybeConsumersTest.java b/src/test/java/io/reactivex/rxjava4/internal/observers/MaybeConsumersTest.java index e98a89c47f..c911be0ac4 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/observers/MaybeConsumersTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/observers/MaybeConsumersTest.java @@ -29,12 +29,12 @@ package io.reactivex.rxjava4.internal.observers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.*; @@ -74,11 +74,11 @@ public void onSuccessNormal() { Disposable d = subscribeAutoDispose(processor, composite, this, Functions.ON_ERROR_MISSING, () -> { }); - assertFalse(d.getClass().toString(), ((LambdaConsumerIntrospection)d).hasCustomOnError()); + assertFalse(((LambdaConsumerIntrospection)d).hasCustomOnError(), d.getClass().toString()); assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); processor.onSuccess(1); @@ -95,7 +95,7 @@ public void onErrorNormal() { assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); processor.onSuccess(1); @@ -110,15 +110,15 @@ public void onErrorError() { Disposable d = subscribeAutoDispose(processor, composite, this, this, this); - assertTrue(d.getClass().toString(), ((LambdaConsumerIntrospection)d).hasCustomOnError()); + assertTrue(((LambdaConsumerIntrospection)d).hasCustomOnError(), d.getClass().toString()); assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); processor.onError(new IOException()); - assertTrue(events.toString(), events.getFirst() instanceof IOException); + assertTrue(events.getFirst() instanceof IOException, events.toString()); assertEquals(0, composite.size()); } @@ -130,7 +130,7 @@ public void onCompleteNormal() { assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); processor.onComplete(); @@ -147,11 +147,11 @@ public void onCompleteError() { assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); processor.onError(new IOException()); - assertTrue(events.toString(), events.getFirst() instanceof IOException); + assertTrue(events.getFirst() instanceof IOException, events.toString()); assertEquals(0, composite.size()); } @@ -163,7 +163,7 @@ public void onCompleteDispose() { assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); assertFalse(d.isDisposed()); @@ -187,7 +187,7 @@ public void onSuccessCrash() { processor.onSuccess(1); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); TestHelper.assertUndeliverable(errors, 0, IOException.class); } finally { @@ -205,7 +205,7 @@ public void onErrorCrash() { processor.onError(new IllegalArgumentException()); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); TestHelper.assertError(errors, 0, CompositeException.class); List inners = TestHelper.compositeList(errors.getFirst()); @@ -226,7 +226,7 @@ public void onCompleteCrash() { processor.onComplete(); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); TestHelper.assertUndeliverable(errors, 0, IOException.class); } finally { diff --git a/src/test/java/io/reactivex/rxjava4/internal/observers/ObservableConsumersTest.java b/src/test/java/io/reactivex/rxjava4/internal/observers/ObservableConsumersTest.java index ba3c940800..ac963e7b42 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/observers/ObservableConsumersTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/observers/ObservableConsumersTest.java @@ -29,12 +29,12 @@ package io.reactivex.rxjava4.internal.observers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; @@ -75,11 +75,11 @@ public void onNextNormal() { Disposable d = subscribeAutoDispose(processor, composite, this, Functions.ON_ERROR_MISSING, () -> { }); - assertFalse(d.getClass().toString(), ((LambdaConsumerIntrospection)d).hasCustomOnError()); + assertFalse(((LambdaConsumerIntrospection)d).hasCustomOnError(), d.getClass().toString()); assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); processor.onNext(1); @@ -101,7 +101,7 @@ public void onErrorNormal() { assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); processor.onNext(1); @@ -121,11 +121,11 @@ public void onErrorError() { Disposable d = subscribeAutoDispose(processor, composite, this, this, this); - assertTrue(d.getClass().toString(), ((LambdaConsumerIntrospection)d).hasCustomOnError()); + assertTrue(((LambdaConsumerIntrospection)d).hasCustomOnError(), d.getClass().toString()); assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); processor.onNext(1); @@ -135,8 +135,8 @@ public void onErrorError() { processor.onError(new IOException()); - assertEquals(events.toString(), 1, events.get(0)); - assertTrue(events.toString(), events.get(1) instanceof IOException); + assertEquals(1, events.get(0), events.toString()); + assertTrue(events.get(1) instanceof IOException, events.toString()); assertEquals(0, composite.size()); } @@ -148,7 +148,7 @@ public void onCompleteNormal() { assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); processor.onNext(1); @@ -170,7 +170,7 @@ public void onCompleteError() { assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); processor.onNext(1); @@ -180,8 +180,8 @@ public void onCompleteError() { processor.onError(new IOException()); - assertEquals(events.toString(), 1, events.get(0)); - assertTrue(events.toString(), events.get(1) instanceof IOException); + assertEquals(1, events.get(0), events.toString()); + assertTrue(events.get(1) instanceof IOException, events.toString()); assertEquals(0, composite.size()); } @@ -193,7 +193,7 @@ public void onCompleteDispose() { assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); assertFalse(d.isDisposed()); @@ -217,9 +217,9 @@ public void onNextCrash() { processor.onNext(1); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); - assertTrue(events.toString(), events.getFirst() instanceof IOException); + assertTrue(events.getFirst() instanceof IOException, events.toString()); } finally { RxJavaPlugins.reset(); } @@ -235,7 +235,7 @@ public void onNextCrashOnError() { processor.onError(new IllegalArgumentException()); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); TestHelper.assertError(errors, 0, CompositeException.class); List inners = TestHelper.compositeList(errors.getFirst()); @@ -256,7 +256,7 @@ public void onNextCrashNoError() { processor.onNext(1); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); TestHelper.assertError(errors, 0, OnErrorNotImplementedException.class); assertTrue(errors.getFirst().getCause() instanceof IOException); diff --git a/src/test/java/io/reactivex/rxjava4/internal/observers/QueueDrainObserverTest.java b/src/test/java/io/reactivex/rxjava4/internal/observers/QueueDrainObserverTest.java index 9dd0bfcd19..471cea15bc 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/observers/QueueDrainObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/observers/QueueDrainObserverTest.java @@ -13,10 +13,10 @@ package io.reactivex.rxjava4.internal.observers; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.operators.SpscArrayQueue; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/observers/SingleConsumersTest.java b/src/test/java/io/reactivex/rxjava4/internal/observers/SingleConsumersTest.java index dc41bf5343..0018d21d51 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/observers/SingleConsumersTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/observers/SingleConsumersTest.java @@ -29,12 +29,12 @@ package io.reactivex.rxjava4.internal.observers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.*; @@ -69,11 +69,11 @@ public void onSuccessNormal() { Disposable d = subscribeAutoDispose(processor, composite, this, Functions.ON_ERROR_MISSING); - assertFalse(d.getClass().toString(), ((LambdaConsumerIntrospection)d).hasCustomOnError()); + assertFalse(((LambdaConsumerIntrospection)d).hasCustomOnError(), d.getClass().toString()); assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); processor.onSuccess(1); @@ -90,7 +90,7 @@ public void onErrorNormal() { assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); processor.onSuccess(1); @@ -105,15 +105,15 @@ public void onErrorError() { Disposable d = subscribeAutoDispose(processor, composite, this, this); - assertTrue(d.getClass().toString(), ((LambdaConsumerIntrospection)d).hasCustomOnError()); + assertTrue(((LambdaConsumerIntrospection)d).hasCustomOnError(), d.getClass().toString()); assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); processor.onError(new IOException()); - assertTrue(events.toString(), events.getFirst() instanceof IOException); + assertTrue(events.getFirst() instanceof IOException, events.toString()); assertEquals(0, composite.size()); } @@ -128,7 +128,7 @@ public void onSuccessCrash() { processor.onSuccess(1); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); TestHelper.assertUndeliverable(errors, 0, IOException.class); } finally { @@ -146,7 +146,7 @@ public void onErrorCrash() { processor.onError(new IllegalArgumentException()); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); TestHelper.assertError(errors, 0, CompositeException.class); List inners = TestHelper.compositeList(errors.getFirst()); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableAmbTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableAmbTest.java index 98bb909d4c..24d30987cc 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableAmbTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableAmbTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.*; @@ -179,13 +179,13 @@ public void untilCompletableMainComplete() { TestObserver to = main.ambWith(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); main.onComplete(); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertResult(); } @@ -197,13 +197,13 @@ public void untilCompletableMainError() { TestObserver to = main.ambWith(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); main.onError(new TestException()); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertFailure(TestException.class); } @@ -215,13 +215,13 @@ public void untilCompletableOtherOnComplete() { TestObserver to = main.ambWith(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); other.onComplete(); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertResult(); } @@ -233,13 +233,13 @@ public void untilCompletableOtherError() { TestObserver to = main.ambWith(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); other.onError(new TestException()); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertFailure(TestException.class); } @@ -263,7 +263,7 @@ public void noWinnerErrorDispose() throws Exception { }); assertTrue(cdl.await(500, TimeUnit.SECONDS)); - assertFalse("Interrupted!", interrupted.get()); + assertFalse(interrupted.get(), "Interrupted!"); } } @@ -285,7 +285,7 @@ public void noWinnerCompleteDispose() throws Exception { }); assertTrue(cdl.await(500, TimeUnit.SECONDS)); - assertFalse("Interrupted!", interrupted.get()); + assertFalse(interrupted.get(), "Interrupted!"); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableAndThenCompletableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableAndThenCompletableTest.java index 33896a6eb7..956fe8e111 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableAndThenCompletableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableAndThenCompletableTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -150,7 +150,7 @@ public void andThenNoInterrupt() throws InterruptedException { } latch.await(); - assertFalse("The second Completable was interrupted!", interrupted[0]); + assertFalse(interrupted[0], "The second Completable was interrupted!"); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableAndThenTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableAndThenTest.java index f485dadfd5..417df98305 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableAndThenTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableAndThenTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.completable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableAwaitTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableAwaitTest.java index 775aa37246..09cc75a3e4 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableAwaitTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableAwaitTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.processors.PublishProcessor; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableBlockingSubscribeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableBlockingSubscribeTest.java index 4512c2bb15..4d2a077be6 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableBlockingSubscribeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableBlockingSubscribeTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Completable; import io.reactivex.rxjava4.exceptions.TestException; @@ -184,7 +184,7 @@ public void twoArgError() throws Throwable { Completable.error(new TestException()) .blockingSubscribe(action, consumer); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); verify(action, never()).run(); verify(consumer).accept(any(TestException.class)); @@ -202,7 +202,7 @@ public void twoArgErrorAsync() throws Throwable { .delay(50, TimeUnit.MILLISECONDS, Schedulers.computation(), true) .blockingSubscribe(action, consumer); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); verify(action, never()).run(); verify(consumer).accept(any(TestException.class)); @@ -243,7 +243,7 @@ public void twoArgInterrupted() throws Throwable { .doOnDispose(onDispose) .blockingSubscribe(action, consumer); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); verify(onDispose).run(); verify(action, never()).run(); @@ -322,7 +322,7 @@ public void ovserverInterrupted() throws Throwable { .doOnDispose(onDispose) .blockingSubscribe(to); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); verify(onDispose).run(); to.assertFailure(InterruptedException.class); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableCacheTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableCacheTest.java index 3685e71255..85a48d7c0d 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableCacheTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableCacheTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableConcatArrayDelayErrorTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableConcatArrayDelayErrorTest.java index 5e3849b3b2..ab7a521d52 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableConcatArrayDelayErrorTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableConcatArrayDelayErrorTest.java @@ -15,7 +15,7 @@ import static org.mockito.Mockito.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Completable; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableConcatDelayErrorTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableConcatDelayErrorTest.java index cd047247c4..73a5faf196 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableConcatDelayErrorTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableConcatDelayErrorTest.java @@ -17,7 +17,7 @@ import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableConcatTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableConcatTest.java index cfbe8436b2..04621bb747 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableConcatTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableConcatTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.CountDownLatch; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; @@ -247,7 +247,7 @@ public void noInterrupt() throws InterruptedException { } latch.await(); - assertFalse("The second Completable was interrupted!", interrupted[0]); + assertFalse(interrupted[0], "The second Completable was interrupted!"); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableCreateTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableCreateTest.java index 76e7045cdb..c5c8cfcae2 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableCreateTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableCreateTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.testsupport.TestHelper; @@ -266,7 +266,7 @@ public void tryOnError() { assertFalse(response[0]); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDelaySubscriptionTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDelaySubscriptionTest.java index 44674dfa05..5415d057f2 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDelaySubscriptionTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDelaySubscriptionTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDelayTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDelayTest.java index c157863c7f..3b0d7a5c32 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDelayTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDelayTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDetachTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDetachTest.java index 4043b9386d..63947fee54 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDetachTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDetachTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; import java.io.IOException; import java.lang.ref.WeakReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.processors.PublishProcessor; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDisposeOnTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDisposeOnTest.java index e0c42a4b5f..5304787d18 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDisposeOnTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDisposeOnTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDoFinallyTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDoFinallyTest.java index 2f027abe32..9869e60599 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDoFinallyTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDoFinallyTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDoOnLifecycleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDoOnLifecycleTest.java index ff289d0f75..1658cce3cf 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDoOnLifecycleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDoOnLifecycleTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDoOnTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDoOnTest.java index eab71b0a1c..a428dba6dd 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDoOnTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableDoOnTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.testsupport.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromActionTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromActionTest.java index 5a6334aa22..fcf125282e 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromActionTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromActionTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromCallableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromCallableTest.java index c23bfb4c7e..d2a17f7913 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromCallableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromCallableTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.stubbing.Answer; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromMaybeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromMaybeTest.java index 993885c0af..193f57c877 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromMaybeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromMaybeTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.completable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromObservableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromObservableTest.java index fe0acbe1b4..298eec185f 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromObservableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromObservableTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.completable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromPublisherTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromPublisherTest.java index b9e1cffbc3..aba112b103 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromPublisherTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromPublisherTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.completable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromRunnableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromRunnableTest.java index 0a208496ed..95bef0d5be 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromRunnableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromRunnableTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromSingleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromSingleTest.java index 60047d7da2..fd9e751bb6 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromSingleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromSingleTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.completable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromSupplierTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromSupplierTest.java index 274df06962..604472b945 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromSupplierTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableFromSupplierTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.stubbing.Answer; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableHideTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableHideTest.java index f36d90c52c..2587a3e578 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableHideTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableHideTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableLiftTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableLiftTest.java index abaf692189..5226af6b9c 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableLiftTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableLiftTest.java @@ -15,7 +15,7 @@ import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableMaterializeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableMaterializeTest.java index 89c17a24b2..9af610dbc3 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableMaterializeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableMaterializeTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.completable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableMergeIterableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableMergeIterableTest.java index c0015615fd..0405786dc8 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableMergeIterableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableMergeIterableTest.java @@ -16,7 +16,7 @@ import java.util.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.CompositeDisposable; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableMergeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableMergeTest.java index ecf8080d0f..fc52693661 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableMergeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableMergeTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardConcurrentConfig; @@ -573,6 +573,6 @@ public void mergeMaxIntConcurrent() { .awaitDone(5, TimeUnit.SECONDS) .assertResult(); - assertEquals("Action count mismatch", 6, ref.get()); + assertEquals(6, ref.get(), "Action count mismatch"); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableObserveOnTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableObserveOnTest.java index 33f4d9f488..99ac49fa7e 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableObserveOnTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableObserveOnTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.completable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.schedulers.Schedulers; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableOnErrorXTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableOnErrorXTest.java index d933a5f83f..6a85eccccb 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableOnErrorXTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableOnErrorXTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletablePeekTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletablePeekTest.java index 9625297e82..c3631a0de0 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletablePeekTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletablePeekTest.java @@ -15,7 +15,7 @@ import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableRepeatWhenTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableRepeatWhenTest.java index e1dc4b60f0..bfea8c7fae 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableRepeatWhenTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableRepeatWhenTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.concurrent.Flow.Publisher; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; public class CompletableRepeatWhenTest extends RxJavaTest { @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableResumeNextTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableResumeNextTest.java index db326238bb..392fc67147 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableResumeNextTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableResumeNextTest.java @@ -14,11 +14,12 @@ package io.reactivex.rxjava4.internal.operators.completable; import static org.mockito.Mockito.*; -import org.junit.Test; + +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Action; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableSafeSubscribeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableSafeSubscribeTest.java index 3a79413c1c..b2ea238489 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableSafeSubscribeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableSafeSubscribeTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.annotations.NonNull; @@ -43,7 +43,7 @@ public void normalError() throws Throwable { order.verify(consumer).onError(any(TestException.class)); order.verifyNoMoreInteractions(); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); }); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableSequenceEqualTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableSequenceEqualTest.java index 366f41a028..818d425e70 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableSequenceEqualTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableSequenceEqualTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.completable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Completable; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableStartWithTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableStartWithTest.java index 832c33133c..f267eeedbf 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableStartWithTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableStartWithTest.java @@ -15,7 +15,7 @@ import static org.mockito.Mockito.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableSubscribeOnTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableSubscribeOnTest.java index 681387716b..608b3ac134 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableSubscribeOnTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableSubscribeOnTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.observers.TestObserver; @@ -43,7 +43,7 @@ public void normal() { to.assertResult(); - assertTrue(list.toString(), list.isEmpty()); + assertTrue(list.isEmpty(), list.toString()); } finally { RxJavaPlugins.reset(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableSubscribeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableSubscribeTest.java index 79bed572c4..2e19029daf 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableSubscribeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableSubscribeTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.processors.PublishProcessor; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableSwitchOnNextTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableSwitchOnNextTest.java index ba295898a6..8e2db2b3f4 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableSwitchOnNextTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableSwitchOnNextTest.java @@ -13,10 +13,10 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableTakeUntilTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableTakeUntilTest.java index 0e9ddf4f5c..0c6b1fec6a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableTakeUntilTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableTakeUntilTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.plugins.RxJavaPlugins; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableTimeoutTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableTimeoutTest.java index 5b53c1cd61..13c3830325 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableTimeoutTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableTimeoutTest.java @@ -14,13 +14,13 @@ package io.reactivex.rxjava4.internal.operators.completable; import static io.reactivex.rxjava4.internal.util.ExceptionHelper.timeoutMessage; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableTimerTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableTimerTest.java index d50bc3f2eb..56a3daa289 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableTimerTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableTimerTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.observers.TestObserver; @@ -54,7 +54,7 @@ public void timerInterruptible() throws Exception { Thread.sleep(500); - assertTrue(s.getClass().getSimpleName(), interrupted.get()); + assertTrue(interrupted.get(), s.getClass().getSimpleName()); } } finally { exec.shutdown(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableToFlowableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableToFlowableTest.java index dd6ca7d82a..876d0040d2 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableToFlowableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableToFlowableTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.completable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableToFutureTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableToFutureTest.java index a027a2bd2d..73666c16d2 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableToFutureTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableToFutureTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -44,7 +44,7 @@ public void error() throws InterruptedException { fail("Should have thrown!"); } catch (ExecutionException ex) { - assertTrue("" + ex.getCause(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, "" + ex.getCause()); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableToObservableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableToObservableTest.java index fd507b6cdb..882a09a29f 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableToObservableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableToObservableTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.completable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.functions.Function; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableUnsafeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableUnsafeTest.java index aca62cc249..d7036d5611 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableUnsafeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableUnsafeTest.java @@ -13,22 +13,24 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.testsupport.TestHelper; public class CompletableUnsafeTest extends RxJavaTest { - @Test(expected = IllegalArgumentException.class) + @Test public void unsafeCreateRejectsCompletable() { - Completable.unsafeCreate(Completable.complete()); + assertThrows(IllegalArgumentException.class, () -> { + Completable.unsafeCreate(Completable.complete()); + }); } @Test @@ -47,11 +49,13 @@ public void wrapCustomCompletable() { .assertResult(); } - @Test(expected = NullPointerException.class) + @Test public void unsafeCreateThrowsNPE() { - Completable.unsafeCreate(_ -> { - throw new NullPointerException(); - }).test(); + assertThrows(NullPointerException.class, () -> { + Completable.unsafeCreate(_ -> { + throw new NullPointerException(); + }).test(); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableUsingTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableUsingTest.java index 2a61280431..ea4b1f1f6d 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableUsingTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/completable/CompletableUsingTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.internal.operators.completable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.plugins.RxJavaPlugins; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/AbstractFlowableWithUpstreamTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/AbstractFlowableWithUpstreamTest.java index 96b514176d..b1acd8c319 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/AbstractFlowableWithUpstreamTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/AbstractFlowableWithUpstreamTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertSame; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.internal.functions.Functions; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/BlockingFlowableLatestTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/BlockingFlowableLatestTest.java index 8593f71e96..a41fcd5a23 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/BlockingFlowableLatestTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/BlockingFlowableLatestTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.TimeUnit; -import org.junit.*; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -44,13 +44,13 @@ public void simple() { for (int i = 0; i < 9; i++) { scheduler.advanceTimeBy(1, TimeUnit.SECONDS); - Assert.assertTrue(it.hasNext()); + assertTrue(it.hasNext()); - Assert.assertEquals(Long.valueOf(i), it.next()); + assertEquals(Long.valueOf(i), it.next()); } scheduler.advanceTimeBy(1, TimeUnit.SECONDS); - Assert.assertFalse(it.hasNext()); + assertFalse(it.hasNext()); } @Test @@ -69,75 +69,84 @@ public void sameSourceMultipleIterators() { for (int i = 0; i < 9; i++) { scheduler.advanceTimeBy(1, TimeUnit.SECONDS); - Assert.assertTrue(it.hasNext()); + assertTrue(it.hasNext()); - Assert.assertEquals(Long.valueOf(i), it.next()); + assertEquals(Long.valueOf(i), it.next()); } scheduler.advanceTimeBy(1, TimeUnit.SECONDS); - Assert.assertFalse(it.hasNext()); + assertFalse(it.hasNext()); } } - @Test(expected = NoSuchElementException.class) + @Test public void empty() { - Flowable source = Flowable. empty(); + assertThrows(NoSuchElementException.class, () -> { + Flowable source = Flowable. empty(); - Iterable iter = source.blockingLatest(); + Iterable iter = source.blockingLatest(); - Iterator it = iter.iterator(); + Iterator it = iter.iterator(); - Assert.assertFalse(it.hasNext()); + assertFalse(it.hasNext()); - it.next(); + it.next(); + }); } - @Test(expected = NoSuchElementException.class) + @Test public void simpleJustNext() { - TestScheduler scheduler = new TestScheduler(); + assertThrows(NoSuchElementException.class, () -> { + TestScheduler scheduler = new TestScheduler(); - Flowable source = Flowable.interval(1, TimeUnit.SECONDS, scheduler).take(10); + Flowable source = Flowable.interval(1, TimeUnit.SECONDS, scheduler).take(10); - Iterable iter = source.blockingLatest(); + Iterable iter = source.blockingLatest(); - Iterator it = iter.iterator(); + Iterator it = iter.iterator(); - // only 9 because take(10) will immediately call onComplete when receiving the 10th item - // which onComplete will overwrite the previous value - for (int i = 0; i < 10; i++) { - scheduler.advanceTimeBy(1, TimeUnit.SECONDS); + // only 9 because take(10) will immediately call onComplete when receiving the 10th item + // which onComplete will overwrite the previous value + for (int i = 0; i < 10; i++) { + scheduler.advanceTimeBy(1, TimeUnit.SECONDS); + + assertEquals(Long.valueOf(i), it.next()); + } + }); - Assert.assertEquals(Long.valueOf(i), it.next()); - } } - @Test(expected = RuntimeException.class) + @Test public void hasNextThrows() { - TestScheduler scheduler = new TestScheduler(); + assertThrows(RuntimeException.class, () -> { + TestScheduler scheduler = new TestScheduler(); - Flowable source = Flowable. error(new RuntimeException("Forced failure!")).subscribeOn(scheduler); + Flowable source = Flowable. error(new RuntimeException("Forced failure!")).subscribeOn(scheduler); - Iterable iter = source.blockingLatest(); + Iterable iter = source.blockingLatest(); - Iterator it = iter.iterator(); + Iterator it = iter.iterator(); - scheduler.advanceTimeBy(1, TimeUnit.SECONDS); + scheduler.advanceTimeBy(1, TimeUnit.SECONDS); - it.hasNext(); + it.hasNext(); + }); } - @Test(expected = RuntimeException.class) + @Test public void nextThrows() { - TestScheduler scheduler = new TestScheduler(); + assertThrows(RuntimeException.class, () -> { + TestScheduler scheduler = new TestScheduler(); - Flowable source = Flowable. error(new RuntimeException("Forced failure!")).subscribeOn(scheduler); + Flowable source = Flowable. error(new RuntimeException("Forced failure!")).subscribeOn(scheduler); - Iterable iter = source.blockingLatest(); - Iterator it = iter.iterator(); + Iterable iter = source.blockingLatest(); + Iterator it = iter.iterator(); - scheduler.advanceTimeBy(1, TimeUnit.SECONDS); + scheduler.advanceTimeBy(1, TimeUnit.SECONDS); - it.next(); + it.next(); + }); } @Test @@ -150,28 +159,30 @@ public void fasterSource() { source.onNext(1); - Assert.assertEquals(Integer.valueOf(1), it.next()); + assertEquals(Integer.valueOf(1), it.next()); source.onNext(2); source.onNext(3); - Assert.assertEquals(Integer.valueOf(3), it.next()); + assertEquals(Integer.valueOf(3), it.next()); source.onNext(4); source.onNext(5); source.onNext(6); - Assert.assertEquals(Integer.valueOf(6), it.next()); + assertEquals(Integer.valueOf(6), it.next()); source.onNext(7); source.onComplete(); - Assert.assertFalse(it.hasNext()); + assertFalse(it.hasNext()); } - @Test(expected = UnsupportedOperationException.class) + @Test public void remove() { - Flowable.never().blockingLatest().iterator().remove(); + assertThrows(UnsupportedOperationException.class, () -> { + Flowable.never().blockingLatest().iterator().remove(); + }); } @Test @@ -183,19 +194,23 @@ public void interrupted() { try { it.hasNext(); } catch (RuntimeException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof InterruptedException); + assertTrue(ex.getCause() instanceof InterruptedException, ex.toString()); } Thread.interrupted(); } - @Test(expected = NoSuchElementException.class) + @Test public void empty2() { - Flowable.empty().blockingLatest().iterator().next(); + assertThrows(NoSuchElementException.class, () -> { + Flowable.empty().blockingLatest().iterator().next(); + }); } - @Test(expected = TestException.class) + @Test public void error() { - Flowable.error(new TestException()).blockingLatest().iterator().next(); + assertThrows(TestException.class, () -> { + Flowable.error(new TestException()).blockingLatest().iterator().next(); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/BlockingFlowableMostRecentTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/BlockingFlowableMostRecentTest.java index 11fcd560a1..63def300e8 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/BlockingFlowableMostRecentTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/BlockingFlowableMostRecentTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.TimeUnit; -import org.junit.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -52,20 +52,22 @@ public void mostRecent() { } - @Test(expected = TestException.class) + @Test public void mostRecentWithException() { - FlowableProcessor s = PublishProcessor.create(); + assertThrows(TestException.class, () -> { + FlowableProcessor s = PublishProcessor.create(); - Iterator it = s.blockingMostRecent("default").iterator(); + Iterator it = s.blockingMostRecent("default").iterator(); - assertTrue(it.hasNext()); - assertEquals("default", it.next()); - assertEquals("default", it.next()); + assertTrue(it.hasNext()); + assertEquals("default", it.next()); + assertEquals("default", it.next()); - s.onError(new TestException()); - assertTrue(it.hasNext()); + s.onError(new TestException()); + assertTrue(it.hasNext()); - it.next(); + it.next(); + }); } @Test @@ -78,17 +80,17 @@ public void singleSourceManyIterators() { for (int j = 0; j < 3; j++) { Iterator it = iter.iterator(); - Assert.assertEquals(Long.valueOf(-1), it.next()); + assertEquals(Long.valueOf(-1), it.next()); for (int i = 0; i < 9; i++) { scheduler.advanceTimeBy(1, TimeUnit.SECONDS); - Assert.assertTrue(it.hasNext()); - Assert.assertEquals(Long.valueOf(i), it.next()); + assertTrue(it.hasNext()); + assertEquals(Long.valueOf(i), it.next()); } scheduler.advanceTimeBy(1, TimeUnit.SECONDS); - Assert.assertFalse(it.hasNext()); + assertFalse(it.hasNext()); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/BlockingFlowableNextTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/BlockingFlowableNextTest.java index 7808f36b47..4641ea7576 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/BlockingFlowableNextTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/BlockingFlowableNextTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.SerialDisposable; @@ -256,7 +256,7 @@ public void noBufferingOrBlockingOfSequence() throws Throwable { assertTrue(it.hasNext()); int b = it.next(); // we should have a different value - assertTrue("a and b should be different", a != b); + assertTrue(a != b, "a and b should be different"); // wait for some time (if times out we are blocked somewhere so fail ... set very high for very slow, constrained machines) timeHasPassed.await(8000, TimeUnit.MILLISECONDS); @@ -264,8 +264,8 @@ public void noBufferingOrBlockingOfSequence() throws Throwable { assertTrue(it.hasNext()); int c = it.next(); - assertTrue("c should not just be the next in sequence", c != (b + 1)); - assertTrue("expected that c [" + c + "] is higher than or equal to " + COUNT, c >= COUNT); + assertTrue(c != (b + 1), "c should not just be the next in sequence"); + assertTrue(c >= COUNT, "expected that c [" + c + "] is higher than or equal to " + COUNT); assertTrue(it.hasNext()); int d = it.next(); @@ -303,8 +303,8 @@ public void singleSourceManyIterators() throws InterruptedException { BlockingFlowableNext.NextIterator it = (BlockingFlowableNext.NextIterator)iter.iterator(); for (long i = 0; i < 10; i++) { - Assert.assertTrue(it.hasNext()); - Assert.assertEquals(j + "th iteration next", Long.valueOf(i), it.next()); + assertTrue(it.hasNext()); + assertEquals(Long.valueOf(i), it.next(), j + "th iteration next"); } terminal.onNext(1); } @@ -317,9 +317,11 @@ public void synchronousNext() { assertEquals(3, BehaviorProcessor.createDefault(3).blockingNext().iterator().next().intValue()); } - @Test(expected = UnsupportedOperationException.class) + @Test public void remove() { - Flowable.never().blockingNext().iterator().remove(); + assertThrows(UnsupportedOperationException.class, () -> { + Flowable.never().blockingNext().iterator().remove(); + }); } @Test @@ -330,7 +332,7 @@ public void interrupt() { Thread.currentThread().interrupt(); it.next(); } catch (RuntimeException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof InterruptedException); + assertTrue(ex.getCause() instanceof InterruptedException, ex.toString()); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/BlockingFlowableToFutureTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/BlockingFlowableToFutureTest.java index 237a1877d5..3d6f0780bb 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/BlockingFlowableToFutureTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/BlockingFlowableToFutureTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Flowable; import io.reactivex.rxjava4.exceptions.TestException; @@ -42,18 +42,20 @@ public void toFutureList() throws InterruptedException, ExecutionException { assertEquals("three", f.get().get(2)); } - @Test(expected = IndexOutOfBoundsException.class) + @Test public void exceptionWithMoreThanOneElement() throws Throwable { - Flowable obs = Flowable.just("one", "two"); - Future f = obs.toFuture(); - try { - // we expect an exception since there are more than 1 element - f.get(); - fail("Should have thrown!"); - } - catch (ExecutionException e) { - throw e.getCause(); - } + assertThrows(IndexOutOfBoundsException.class, () -> { + Flowable obs = Flowable.just("one", "two"); + Future f = obs.toFuture(); + try { + // we expect an exception since there are more than 1 element + f.get(); + fail("Should have thrown!"); + } + catch (ExecutionException e) { + throw e.getCause(); + } + }); } @Test @@ -73,33 +75,39 @@ public void toFutureWithException() { } } - @Test(expected = CancellationException.class) + @Test public void getAfterCancel() throws Exception { - Flowable obs = Flowable.never(); - Future f = obs.toFuture(); - boolean cancelled = f.cancel(true); - assertTrue(cancelled); // because OperationNeverComplete never does - f.get(); // Future.get() docs require this to throw + assertThrows(CancellationException.class, () -> { + Flowable obs = Flowable.never(); + Future f = obs.toFuture(); + boolean cancelled = f.cancel(true); + assertTrue(cancelled); // because OperationNeverComplete never does + f.get(); // Future.get() docs require this to throw + }); } - @Test(expected = CancellationException.class) + @Test public void getWithTimeoutAfterCancel() throws Exception { - Flowable obs = Flowable.never(); - Future f = obs.toFuture(); - boolean cancelled = f.cancel(true); - assertTrue(cancelled); // because OperationNeverComplete never does - f.get(Long.MAX_VALUE, TimeUnit.NANOSECONDS); // Future.get() docs require this to throw + assertThrows(CancellationException.class, () -> { + Flowable obs = Flowable.never(); + Future f = obs.toFuture(); + boolean cancelled = f.cancel(true); + assertTrue(cancelled); // because OperationNeverComplete never does + f.get(Long.MAX_VALUE, TimeUnit.NANOSECONDS); // Future.get() docs require this to throw + }); } - @Test(expected = NoSuchElementException.class) + @Test public void getWithEmptyFlowable() throws Throwable { - Flowable obs = Flowable.empty(); - Future f = obs.toFuture(); - try { - f.get(); - } - catch (ExecutionException e) { - throw e.getCause(); - } + assertThrows(NoSuchElementException.class, () -> { + Flowable obs = Flowable.empty(); + Future f = obs.toFuture(); + try { + f.get(); + } + catch (ExecutionException e) { + throw e.getCause(); + } + }); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/BlockingFlowableToIteratorTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/BlockingFlowableToIteratorTest.java index fde7d2f85d..95a7fe9763 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/BlockingFlowableToIteratorTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/BlockingFlowableToIteratorTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.TimeUnit; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; @@ -50,21 +50,23 @@ public void toIterator() { } - @Test(expected = TestException.class) + @Test public void toIteratorWithException() { - Flowable obs = Flowable.unsafeCreate(subscriber -> { - subscriber.onSubscribe(new BooleanSubscription()); - subscriber.onNext("one"); - subscriber.onError(new TestException()); - }); + assertThrows(TestException.class, () -> { + Flowable obs = Flowable.unsafeCreate(subscriber -> { + subscriber.onSubscribe(new BooleanSubscription()); + subscriber.onNext("one"); + subscriber.onError(new TestException()); + }); - Iterator it = obs.blockingIterable().iterator(); + Iterator it = obs.blockingIterable().iterator(); - assertTrue(it.hasNext()); - assertEquals("one", it.next()); + assertTrue(it.hasNext()); + assertEquals("one", it.next()); - assertTrue(it.hasNext()); - it.next(); + assertTrue(it.hasNext()); + it.next(); + }); } @Test @@ -104,10 +106,12 @@ public void remove() { } } - @Test(expected = UnsupportedOperationException.class) + @Test public void remove() { - BlockingFlowableIterator it = new BlockingFlowableIterator<>(128); - it.remove(); + assertThrows(UnsupportedOperationException.class, () -> { + BlockingFlowableIterator it = new BlockingFlowableIterator<>(128); + it.remove(); + }); } @Test @@ -130,40 +134,46 @@ public void interruptWait() { it.hasNext(); } catch (RuntimeException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof InterruptedException); + assertTrue(ex.getCause() instanceof InterruptedException, ex.toString()); } } - @Test(expected = NoSuchElementException.class) + @Test public void emptyThrowsNoSuch() { - BlockingFlowableIterator it = new BlockingFlowableIterator<>(128); - it.onComplete(); - it.next(); + assertThrows(NoSuchElementException.class, () -> { + BlockingFlowableIterator it = new BlockingFlowableIterator<>(128); + it.onComplete(); + it.next(); + }); } - @Test(expected = QueueOverflowException.class) + @Test public void overflowQueue() { - Iterator it = new Flowable() /* NFI */ { - @Override - protected void subscribeActual(Subscriber s) { - s.onSubscribe(new BooleanSubscription()); - s.onNext(1); - s.onNext(2); + assertThrows(QueueOverflowException.class, () -> { + Iterator it = new Flowable() /* NFI */ { + @Override + protected void subscribeActual(Subscriber s) { + s.onSubscribe(new BooleanSubscription()); + s.onNext(1); + s.onNext(2); + } } - } - .blockingIterable(1) - .iterator(); + .blockingIterable(1) + .iterator(); - it.next(); + it.next(); + }); } - @Test(expected = NoSuchElementException.class) + @Test public void disposedIteratorHasNextReturns() { - Iterator it = PublishProcessor.create() - .blockingIterable().iterator(); - ((Disposable)it).dispose(); - assertFalse(it.hasNext()); - it.next(); + assertThrows(NoSuchElementException.class, () -> { + Iterator it = PublishProcessor.create() + .blockingIterable().iterator(); + ((Disposable)it).dispose(); + assertFalse(it.hasNext()); + it.next(); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/BufferUntilSubscriberTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/BufferUntilSubscriberTest.java index f5c2066cd4..b4117797f5 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/BufferUntilSubscriberTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/BufferUntilSubscriberTest.java @@ -13,14 +13,16 @@ package io.reactivex.rxjava4.internal.operators.flowable; +import static org.junit.jupiter.api.Assertions.*; + import java.util.concurrent.*; import java.util.concurrent.Flow.Publisher; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.processors.PublishProcessor; import io.reactivex.rxjava4.schedulers.Schedulers; @@ -60,13 +62,13 @@ public void issue1677() throws InterruptedException { }) .subscribe(); if (!innerLatch.await(30, TimeUnit.SECONDS)) { - Assert.fail("Failed inner latch wait, iteration " + iters); + fail("Failed inner latch wait, iteration " + iters); } } if (!latch.await(30, TimeUnit.SECONDS)) { - Assert.fail("Incomplete! Went through " + latch.getCount() + " iterations"); + fail("Incomplete! Went through " + latch.getCount() + " iterations"); } else { - Assert.assertEquals(NITERS, counter.get()); + assertEquals(NITERS, counter.get()); } } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableAllTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableAllTest.java index 30ecd92527..d7a6163841 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableAllTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableAllTest.java @@ -13,20 +13,19 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.List; -import java.util.concurrent.Flow.Publisher; +import java.util.concurrent.Flow.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.plugins.RxJavaPlugins; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableAmbTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableAmbTest.java index 5b45c18c7f..0fa675e3cb 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableAmbTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableAmbTest.java @@ -13,23 +13,23 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.io.IOException; import java.util.*; import java.util.concurrent.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.CompositeDisposable; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Consumer; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.internal.util.CrashingMappedIterable; import io.reactivex.rxjava4.plugins.RxJavaPlugins; @@ -43,7 +43,7 @@ public class FlowableAmbTest extends RxJavaTest { private TestScheduler scheduler; private Scheduler.Worker innerScheduler; - @Before + @BeforeEach public void setUp() { scheduler = new TestScheduler(); innerScheduler = scheduler.createWorker(); @@ -273,15 +273,15 @@ public void ambCancelsOthers() { Flowable.ambArray(source1, source2, source3).subscribe(ts); - assertTrue("Source 1 doesn't have subscribers!", source1.hasSubscribers()); - assertTrue("Source 2 doesn't have subscribers!", source2.hasSubscribers()); - assertTrue("Source 3 doesn't have subscribers!", source3.hasSubscribers()); + assertTrue(source1.hasSubscribers(), "Source 1 doesn't have subscribers!"); + assertTrue(source2.hasSubscribers(), "Source 2 doesn't have subscribers!"); + assertTrue(source3.hasSubscribers(), "Source 3 doesn't have subscribers!"); source1.onNext(1); - assertTrue("Source 1 doesn't have subscribers!", source1.hasSubscribers()); - assertFalse("Source 2 still has subscribers!", source2.hasSubscribers()); - assertFalse("Source 2 still has subscribers!", source3.hasSubscribers()); + assertTrue(source1.hasSubscribers(), "Source 1 doesn't have subscribers!"); + assertFalse(source2.hasSubscribers(), "Source 2 still has subscribers!"); + assertFalse(source3.hasSubscribers(), "Source 2 still has subscribers!"); } @@ -512,7 +512,7 @@ public void noWinnerSuccessDispose() throws Exception { }); assertTrue(cdl.await(500, TimeUnit.SECONDS)); - assertFalse("Interrupted!", interrupted.get()); + assertFalse(interrupted.get(), "Interrupted!"); } } @@ -535,7 +535,7 @@ public void noWinnerErrorDispose() throws Exception { }); assertTrue(cdl.await(500, TimeUnit.SECONDS)); - assertFalse("Interrupted!", interrupted.get()); + assertFalse(interrupted.get(), "Interrupted!"); } } @@ -557,7 +557,7 @@ public void noWinnerCompleteDispose() throws Exception { }); assertTrue(cdl.await(500, TimeUnit.SECONDS)); - assertFalse("Interrupted!", interrupted.get()); + assertFalse(interrupted.get(), "Interrupted!"); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableAnyTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableAnyTest.java index 521d88b4b7..cc1f499c9f 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableAnyTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableAnyTest.java @@ -13,21 +13,20 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.io.IOException; import java.util.List; -import java.util.concurrent.Flow.Publisher; +import java.util.concurrent.Flow.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.plugins.RxJavaPlugins; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableAsObservableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableAsObservableTest.java index bddc01710e..2f6bae4320 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableAsObservableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableAsObservableTest.java @@ -13,13 +13,14 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -import org.junit.Test; +import java.util.concurrent.Flow.Subscriber; + +import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableAutoConnectTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableAutoConnectTest.java index fe62aa813d..dd4444b452 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableAutoConnectTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableAutoConnectTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.processors.PublishProcessor; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableBlockingTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableBlockingTest.java index b341f53fd0..b33252a3b0 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableBlockingTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableBlockingTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.Flow.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -269,22 +269,28 @@ public void onComplete() { assertEquals(Arrays.asList(1, 2, 3, 4, 5, ex), list); } - @Test(expected = TestException.class) + @Test public void blockingForEachThrows() { - Flowable.just(1) - .blockingForEach(_ -> { - throw new TestException(); + assertThrows(TestException.class, () -> { + Flowable.just(1) + .blockingForEach(_ -> { + throw new TestException(); + }); }); } - @Test(expected = NoSuchElementException.class) + @Test public void blockingFirstEmpty() { - Flowable.empty().blockingFirst(); + assertThrows(NoSuchElementException.class, () -> { + Flowable.empty().blockingFirst(); + }); } - @Test(expected = NoSuchElementException.class) + @Test public void blockingLastEmpty() { - Flowable.empty().blockingLast(); + assertThrows(NoSuchElementException.class, () -> { + Flowable.empty().blockingLast(); + }); } @Test @@ -326,14 +332,16 @@ public void firstIgnoredCancelAndOnError() { } } - @Test(expected = TestException.class) + @Test public void firstOnError() { - Flowable source = Flowable.fromPublisher(s -> { - s.onSubscribe(new BooleanSubscription()); - s.onError(new TestException()); - }); + assertThrows(TestException.class, () -> { + Flowable source = Flowable.fromPublisher(s -> { + s.onSubscribe(new BooleanSubscription()); + s.onError(new TestException()); + }); - source.blockingFirst(); + source.blockingFirst(); + }); } @Test @@ -352,9 +360,11 @@ public void interrupt() { } } - @Test(expected = NoSuchElementException.class) + @Test public void blockingSingleEmpty() { - Flowable.empty().blockingSingle(); + assertThrows(NoSuchElementException.class, () -> { + Flowable.empty().blockingSingle(); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableBufferTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableBufferTest.java index d5d0a72466..f242ccdd2f 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableBufferTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableBufferTest.java @@ -13,19 +13,18 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.io.IOException; import java.util.*; import java.util.concurrent.*; -import java.util.concurrent.Flow.Publisher; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.*; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; @@ -46,7 +45,7 @@ public class FlowableBufferTest extends RxJavaTest { private TestScheduler scheduler; private Scheduler.Worker innerScheduler; - @Before + @BeforeEach public void before() { subscriber = TestHelper.mockSubscriber(); scheduler = new TestScheduler(); @@ -1573,7 +1572,7 @@ public void withTimeAndSizeCapacityRace() { items += o.size(); } - assertEquals("Round: " + i, 5, items); + assertEquals(5, items, "Round: " + i); } } 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 76ee3d6335..ad05de2643 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 @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -36,14 +36,14 @@ public class FlowableCacheTest extends RxJavaTest { public void coldReplayNoBackpressure() { FlowableCache source = new FlowableCache<>(Flowable.range(0, 1000), 16); - assertFalse("Source is connected!", source.isConnected()); + assertFalse(source.isConnected(), "Source is connected!"); TestSubscriberEx ts = new TestSubscriberEx<>(); source.subscribe(ts); - assertTrue("Source is not connected!", source.isConnected()); - assertFalse("Subscribers retained!", source.hasSubscribers()); + assertTrue(source.isConnected(), "Source is not connected!"); + assertFalse(source.hasSubscribers(), "Subscribers retained!"); ts.assertNoErrors(); ts.assertTerminated(); @@ -59,15 +59,15 @@ public void coldReplayNoBackpressure() { public void coldReplayBackpressure() { FlowableCache source = new FlowableCache<>(Flowable.range(0, 1000), 16); - assertFalse("Source is connected!", source.isConnected()); + assertFalse(source.isConnected(), "Source is connected!"); TestSubscriber ts = new TestSubscriber<>(0L); ts.request(10); source.subscribe(ts); - assertTrue("Source is not connected!", source.isConnected()); - assertFalse("Subscribers retained!", source.hasSubscribers()); + assertTrue(source.isConnected(), "Source is not connected!"); + assertFalse(source.hasSubscribers(), "Subscribers retained!"); ts.assertNoErrors(); ts.assertNotComplete(); @@ -79,7 +79,7 @@ public void coldReplayBackpressure() { } ts.cancel(); - assertFalse("Subscribers retained!", source.hasSubscribers()); + assertFalse(source.hasSubscribers(), "Subscribers retained!"); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableCastTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableCastTest.java index b6018bed8b..a50aee6099 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableCastTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableCastTest.java @@ -13,11 +13,13 @@ package io.reactivex.rxjava4.internal.operators.flowable; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -import org.junit.*; -import static java.util.concurrent.Flow.*; +import java.util.concurrent.Flow.Subscriber; + +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.processors.PublishProcessor; @@ -62,11 +64,11 @@ public void castCrashUnsubscribes() { pp.cast(String.class).subscribe(ts); - Assert.assertTrue("Not subscribed?", pp.hasSubscribers()); + assertTrue(pp.hasSubscribers(), "Not subscribed?"); pp.onNext(1); - Assert.assertFalse("Subscribed?", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Subscribed?"); ts.assertError(ClassCastException.class); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableCombineLatestTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableCombineLatestTest.java index 7f0963eb60..12b600d8dc 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableCombineLatestTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableCombineLatestTest.java @@ -13,19 +13,18 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.lang.reflect.*; import java.util.*; import java.util.concurrent.*; -import java.util.concurrent.Flow.Publisher; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.*; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; @@ -909,7 +908,7 @@ public void combineLatestNArguments() throws Exception { m.invoke(null, params0); fail("Should have thrown @ " + m); } catch (InvocationTargetException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof NullPointerException); + assertTrue(ex.getCause() instanceof NullPointerException, ex.toString()); if (j < i) { assertEquals("source" + (j + 1) + " is null", ex.getCause().getMessage()); @@ -1059,7 +1058,7 @@ public void onErrorRace() { .assertNoValues(); for (Throwable e : TestHelper.errorList(ts)) { - assertTrue(e.toString(), e instanceof TestException); + assertTrue(e instanceof TestException, e.toString()); } } else { @@ -1068,7 +1067,7 @@ public void onErrorRace() { } for (Throwable e : errors) { - assertTrue(e.toString(), e.getCause() instanceof TestException); + assertTrue(e.getCause() instanceof TestException, e.toString()); } } finally { RxJavaPlugins.reset(); @@ -1127,7 +1126,7 @@ public void dontSubscribeIfDone() { assertEquals(0, count[0]); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } @@ -1150,7 +1149,7 @@ public void dontSubscribeIfDone2() { assertEquals(0, count[0]); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } @@ -1190,7 +1189,7 @@ public void combine2Flowable2Errors() throws Exception { testSubscriber.awaitDone(5, TimeUnit.SECONDS); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatDelayErrorTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatDelayErrorTest.java index 97de5af92b..5e38c63cdc 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatDelayErrorTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatDelayErrorTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; @@ -222,9 +222,9 @@ public void concatDelayErrorFlowableError() { assertEquals(3, cex.size()); - assertTrue(cex.get(0).toString(), cex.get(0) instanceof TestException); - assertTrue(cex.get(1).toString(), cex.get(1) instanceof TestException); - assertTrue(cex.get(2).toString(), cex.get(2) instanceof TestException); + assertTrue(cex.get(0) instanceof TestException, cex.get(0).toString()); + assertTrue(cex.get(1) instanceof TestException, cex.get(1).toString()); + assertTrue(cex.get(2) instanceof TestException, cex.get(2).toString()); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatMapEagerTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatMapEagerTest.java index 49ed4e1475..f8a3366430 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatMapEagerTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatMapEagerTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.Flow.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardConcurrentBufferedConfig; @@ -189,7 +189,7 @@ public void mainErrorsImmediate() { main.onError(new TestException("Forced failure")); - assertFalse("inner has subscribers?", inner.hasSubscribers()); + assertFalse(inner.hasSubscribers(), "inner has subscribers?"); inner.onNext(3); inner.onComplete(); @@ -215,7 +215,7 @@ public void longEager() { Function> toRange = t -> Flowable.range(t, 2); - @Before + @BeforeEach public void before() { ts = new TestSubscriber<>(); tsBp = new TestSubscriber<>(0L); @@ -246,7 +246,7 @@ public void eagerness2() { Flowable.concatArrayEager(source, source).subscribe(tsBp); - Assert.assertEquals(2, count.get()); + assertEquals(2, count.get()); tsBp.assertNoErrors(); tsBp.assertNotComplete(); tsBp.assertNoValues(); @@ -265,7 +265,7 @@ public void eagerness3() { Flowable.concatArrayEager(source, source, source).subscribe(tsBp); - Assert.assertEquals(3, count.get()); + assertEquals(3, count.get()); tsBp.assertNoErrors(); tsBp.assertNotComplete(); tsBp.assertNoValues(); @@ -284,7 +284,7 @@ public void eagerness4() { Flowable.concatArrayEager(source, source, source, source).subscribe(tsBp); - Assert.assertEquals(4, count.get()); + assertEquals(4, count.get()); tsBp.assertNoErrors(); tsBp.assertNotComplete(); tsBp.assertNoValues(); @@ -303,7 +303,7 @@ public void eagerness5() { Flowable.concatArrayEager(source, source, source, source, source).subscribe(tsBp); - Assert.assertEquals(5, count.get()); + assertEquals(5, count.get()); tsBp.assertNoErrors(); tsBp.assertNotComplete(); tsBp.assertNoValues(); @@ -322,7 +322,7 @@ public void eagerness6() { Flowable.concatArrayEager(source, source, source, source, source, source).subscribe(tsBp); - Assert.assertEquals(6, count.get()); + assertEquals(6, count.get()); tsBp.assertNoErrors(); tsBp.assertNotComplete(); tsBp.assertNoValues(); @@ -341,7 +341,7 @@ public void eagerness7() { Flowable.concatArrayEager(source, source, source, source, source, source, source).subscribe(tsBp); - Assert.assertEquals(7, count.get()); + assertEquals(7, count.get()); tsBp.assertNoErrors(); tsBp.assertNotComplete(); tsBp.assertNoValues(); @@ -360,7 +360,7 @@ public void eagerness8() { Flowable.concatArrayEager(source, source, source, source, source, source, source, source).subscribe(tsBp); - Assert.assertEquals(8, count.get()); + assertEquals(8, count.get()); tsBp.assertNoErrors(); tsBp.assertNotComplete(); tsBp.assertNoValues(); @@ -379,7 +379,7 @@ public void eagerness9() { Flowable.concatArrayEager(source, source, source, source, source, source, source, source, source).subscribe(tsBp); - Assert.assertEquals(9, count.get()); + assertEquals(9, count.get()); tsBp.assertNoErrors(); tsBp.assertNotComplete(); tsBp.assertNoValues(); @@ -429,14 +429,20 @@ public void mapperThrows() { ts.assertError(TestException.class); } - @Test(expected = IllegalArgumentException.class) + @Test public void invalidMaxConcurrent() { - Flowable.just(1).concatMapEager(toJust, new StandardConcurrentBufferedConfig(ErrorMode.IMMEDIATE, 0, Flowable.bufferSize())); + assertThrows(IllegalArgumentException.class, () -> { + Flowable.just(1) + .concatMapEager(toJust, new StandardConcurrentBufferedConfig(ErrorMode.IMMEDIATE, 0, Flowable.bufferSize())); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void invalidCapacityHint() { - Flowable.just(1).concatMapEager(toJust, new StandardConcurrentBufferedConfig(ErrorMode.IMMEDIATE, Flowable.bufferSize(), 0)); + assertThrows(IllegalArgumentException.class, () -> { + Flowable.just(1) + .concatMapEager(toJust, new StandardConcurrentBufferedConfig(ErrorMode.IMMEDIATE, Flowable.bufferSize(), 0)); + }); } @Test @@ -503,7 +509,7 @@ public void prefetchIsBounded() { ts.assertNoErrors(); ts.assertNoValues(); ts.assertNotComplete(); - Assert.assertEquals(Flowable.bufferSize(), count.get()); + assertEquals(Flowable.bufferSize(), count.get()); } @Test @@ -517,12 +523,12 @@ public void maxConcurrent5() { ts.assertValueCount(100); ts.assertComplete(); - Assert.assertEquals(5, (long) requests.get(0)); - Assert.assertEquals(1, (long) requests.get(1)); - Assert.assertEquals(1, (long) requests.get(2)); - Assert.assertEquals(1, (long) requests.get(3)); - Assert.assertEquals(1, (long) requests.get(4)); - Assert.assertEquals(1, (long) requests.get(5)); + assertEquals(5, (long) requests.get(0)); + assertEquals(1, (long) requests.get(1)); + assertEquals(1, (long) requests.get(2)); + assertEquals(1, (long) requests.get(3)); + assertEquals(1, (long) requests.get(4)); + assertEquals(1, (long) requests.get(5)); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatMapSchedulerTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatMapSchedulerTest.java index 20f51f6363..cc46090dea 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatMapSchedulerTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatMapSchedulerTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.lang.reflect.Method; import java.util.*; @@ -21,7 +21,7 @@ import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; @@ -201,7 +201,7 @@ public void mapperScheduled() { .assertNoErrors() .assertComplete(); - assertTrue(ts.values().toString(), ts.values().getFirst().startsWith("RxSingleScheduler-")); + assertTrue(ts.values().getFirst().startsWith("RxSingleScheduler-"), ts.values().toString()); } @Test @@ -215,7 +215,7 @@ public void mapperScheduledHidden() { .assertNoErrors() .assertComplete(); - assertTrue(ts.values().toString(), ts.values().getFirst().startsWith("RxSingleScheduler-")); + assertTrue(ts.values().getFirst().startsWith("RxSingleScheduler-"), ts.values().toString()); } @Test @@ -229,7 +229,7 @@ public void mapperDelayErrorScheduled() { .assertNoErrors() .assertComplete(); - assertTrue(ts.values().toString(), ts.values().getFirst().startsWith("RxSingleScheduler-")); + assertTrue(ts.values().getFirst().startsWith("RxSingleScheduler-"), ts.values().toString()); } @Test @@ -244,7 +244,7 @@ public void mapperDelayErrorScheduledHidden() { .assertNoErrors() .assertComplete(); - assertTrue(ts.values().toString(), ts.values().getFirst().startsWith("RxSingleScheduler-")); + assertTrue(ts.values().getFirst().startsWith("RxSingleScheduler-"), ts.values().toString()); } @Test @@ -259,7 +259,7 @@ public void mapperDelayError2Scheduled() { .assertNoErrors() .assertComplete(); - assertTrue(ts.values().toString(), ts.values().getFirst().startsWith("RxSingleScheduler-")); + assertTrue(ts.values().getFirst().startsWith("RxSingleScheduler-"), ts.values().toString()); } @Test @@ -274,7 +274,7 @@ public void mapperDelayError2ScheduledHidden() { .assertNoErrors() .assertComplete(); - assertTrue(ts.values().toString(), ts.values().getFirst().startsWith("RxSingleScheduler-")); + assertTrue(ts.values().getFirst().startsWith("RxSingleScheduler-"), ts.values().toString()); } @Test @@ -898,7 +898,7 @@ public void mapperScheduledLong() { .assertNoErrors() .assertComplete(); - assertTrue(ts.values().toString(), ts.values().getFirst().startsWith("RxSingleScheduler-")); + assertTrue(ts.values().getFirst().startsWith("RxSingleScheduler-"), ts.values().toString()); } @Test @@ -916,7 +916,7 @@ public void mapperDelayErrorScheduledLong() { .assertNoErrors() .assertComplete(); - assertTrue(ts.values().toString(), ts.values().getFirst().startsWith("RxSingleScheduler-")); + assertTrue(ts.values().getFirst().startsWith("RxSingleScheduler-"), ts.values().toString()); } @Test @@ -934,7 +934,7 @@ public void mapperDelayError2ScheduledLong() { .assertNoErrors() .assertComplete(); - assertTrue(ts.values().toString(), ts.values().getFirst().startsWith("RxSingleScheduler-")); + assertTrue(ts.values().getFirst().startsWith("RxSingleScheduler-"), ts.values().toString()); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatMapTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatMapTest.java index abcc6dc1a4..1be1a7f7d3 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatMapTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatMapTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.concurrent.Flow.Publisher; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatTest.java index 6ec93d5d62..a49d0a0891 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -24,7 +24,7 @@ import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; @@ -811,8 +811,8 @@ public void arrayDelayError() { CompositeException composite = (CompositeException)ts.errors().getFirst(); List list = composite.getExceptions(); - assertTrue(list.get(0).toString(), list.get(0) instanceof NullPointerException); - assertTrue(list.get(1).toString(), list.get(1) instanceof TestException); + assertTrue(list.get(0) instanceof NullPointerException, list.get(0).toString()); + assertTrue(list.get(1) instanceof TestException, list.get(1).toString()); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatWithCompletableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatWithCompletableTest.java index f577a08005..a1b1102e75 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatWithCompletableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatWithCompletableTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; +import java.util.concurrent.Flow.Subscriber; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatWithMaybeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatWithMaybeTest.java index 6aed1b3b4c..774d29c201 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatWithMaybeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatWithMaybeTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatWithSingleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatWithSingleTest.java index 21bb324924..3d5965a596 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatWithSingleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableConcatWithSingleTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableCountTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableCountTest.java index 9076e43457..964f44cb6a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableCountTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableCountTest.java @@ -13,7 +13,9 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import org.junit.*; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.testsupport.TestHelper; @@ -21,21 +23,21 @@ public class FlowableCountTest extends RxJavaTest { @Test public void simpleFlowable() { - Assert.assertEquals(0, Flowable.empty().count().toFlowable().blockingLast().intValue()); + assertEquals(0, Flowable.empty().count().toFlowable().blockingLast().intValue()); - Assert.assertEquals(1, Flowable.just(1).count().toFlowable().blockingLast().intValue()); + assertEquals(1, Flowable.just(1).count().toFlowable().blockingLast().intValue()); - Assert.assertEquals(10, Flowable.range(1, 10).count().toFlowable().blockingLast().intValue()); + assertEquals(10, Flowable.range(1, 10).count().toFlowable().blockingLast().intValue()); } @Test public void simple() { - Assert.assertEquals(0, Flowable.empty().count().blockingGet().intValue()); + assertEquals(0, Flowable.empty().count().blockingGet().intValue()); - Assert.assertEquals(1, Flowable.just(1).count().blockingGet().intValue()); + assertEquals(1, Flowable.just(1).count().blockingGet().intValue()); - Assert.assertEquals(10, Flowable.range(1, 10).count().blockingGet().intValue()); + assertEquals(10, Flowable.range(1, 10).count().blockingGet().intValue()); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableCreateTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableCreateTest.java index 96881cdc95..07ea290219 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableCreateTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableCreateTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.*; +import java.util.concurrent.Flow.Subscription; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; @@ -215,9 +215,11 @@ public void unsafe() { .assertResult(1, 2, 3, 4, 5); } - @Test(expected = IllegalArgumentException.class) + @Test public void unsafeWithFlowable() { - Flowable.unsafeCreate(Flowable.just(1)); + assertThrows(IllegalArgumentException.class, () -> { + Flowable.unsafeCreate(Flowable.just(1)); + }); } @Test @@ -802,7 +804,7 @@ public void serializedConcurrentOnNextOnComplete() { .assertNoErrors(); int c = ts.values().size(); - assertTrue("" + c, c >= 100); + assertTrue(c >= 100, "" + c); } } @@ -831,7 +833,7 @@ public void serialized() { .test() .assertResult(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } @@ -855,7 +857,7 @@ public void tryOnError() { assertFalse(response[0]); - assertTrue(strategy + ": " + errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), strategy + ": " + errors.toString()); } finally { RxJavaPlugins.reset(); } @@ -880,7 +882,7 @@ public void tryOnErrorSerialized() { assertFalse(response[0]); - assertTrue(strategy + ": " + errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), strategy + ": " + errors.toString()); } finally { RxJavaPlugins.reset(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDebounceTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDebounceTest.java index 89fc530830..8e6afc27f3 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDebounceTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDebounceTest.java @@ -13,23 +13,22 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.List; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.rxjava4.functions.Action; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; -import io.reactivex.rxjava4.functions.Function; +import io.reactivex.rxjava4.functions.*; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.internal.operators.flowable.FlowableDebounceTimed.*; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; @@ -45,7 +44,7 @@ public class FlowableDebounceTest extends RxJavaTest { private Subscriber subscriber; private Scheduler.Worker innerScheduler; - @Before + @BeforeEach public void before() { scheduler = new TestScheduler(); subscriber = TestHelper.mockSubscriber(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDefaultIfEmptyTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDefaultIfEmptyTest.java index f19580e6e4..d3ab96b079 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDefaultIfEmptyTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDefaultIfEmptyTest.java @@ -16,8 +16,9 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import java.util.concurrent.Flow.Subscriber; + +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.testsupport.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDeferTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDeferTest.java index c14337796b..26b92f341a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDeferTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDeferTest.java @@ -16,8 +16,9 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import java.util.concurrent.Flow.Subscriber; + +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java index 6c903c1fa3..cc0546be11 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java @@ -13,10 +13,12 @@ package io.reactivex.rxjava4.internal.operators.flowable; +import static org.junit.jupiter.api.Assertions.*; + import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -43,11 +45,11 @@ public void noPrematureSubscription() { ts.assertNoErrors(); ts.assertNoValues(); - Assert.assertEquals("Premature subscription", 0, subscribed.get()); + assertEquals(0, subscribed.get(), "Premature subscription"); other.onNext(1); - Assert.assertEquals("No subscription", 1, subscribed.get()); + assertEquals(1, subscribed.get(), "No subscription"); ts.assertValue(1); ts.assertNoErrors(); @@ -71,12 +73,12 @@ public void noMultipleSubscriptions() { ts.assertNoErrors(); ts.assertNoValues(); - Assert.assertEquals("Premature subscription", 0, subscribed.get()); + assertEquals(0, subscribed.get(), "Premature subscription"); other.onNext(1); other.onNext(2); - Assert.assertEquals("No subscription", 1, subscribed.get()); + assertEquals(1, subscribed.get(), "No subscription"); ts.assertValue(1); ts.assertNoErrors(); @@ -100,11 +102,11 @@ public void completeTriggersSubscription() { ts.assertNoErrors(); ts.assertNoValues(); - Assert.assertEquals("Premature subscription", 0, subscribed.get()); + assertEquals(0, subscribed.get(), "Premature subscription"); other.onComplete(); - Assert.assertEquals("No subscription", 1, subscribed.get()); + assertEquals(1, subscribed.get(), "No subscription"); ts.assertValue(1); ts.assertNoErrors(); @@ -128,11 +130,11 @@ public void noPrematureSubscriptionToError() { ts.assertNoErrors(); ts.assertNoValues(); - Assert.assertEquals("Premature subscription", 0, subscribed.get()); + assertEquals(0, subscribed.get(), "Premature subscription"); other.onComplete(); - Assert.assertEquals("No subscription", 1, subscribed.get()); + assertEquals(1, subscribed.get(), "No subscription"); ts.assertNoValues(); ts.assertNotComplete(); @@ -156,11 +158,11 @@ public void noSubscriptionIfOtherErrors() { ts.assertNoErrors(); ts.assertNoValues(); - Assert.assertEquals("Premature subscription", 0, subscribed.get()); + assertEquals(0, subscribed.get(), "Premature subscription"); other.onError(new TestException()); - Assert.assertEquals("Premature subscription", 0, subscribed.get()); + assertEquals(0, subscribed.get(), "Premature subscription"); ts.assertNoValues(); ts.assertNotComplete(); @@ -185,13 +187,13 @@ public void backpressurePassesThrough() { ts.assertNoErrors(); ts.assertNoValues(); - Assert.assertEquals("Premature subscription", 0, subscribed.get()); + assertEquals(0, subscribed.get(), "Premature subscription"); other.onNext(1); - Assert.assertEquals("No subscription", 1, subscribed.get()); + assertEquals(1, subscribed.get(), "No subscription"); - Assert.assertFalse("Not unsubscribed from other", other.hasSubscribers()); + assertFalse(other.hasSubscribers(), "Not unsubscribed from other"); ts.assertNotComplete(); ts.assertNoErrors(); @@ -222,13 +224,13 @@ public void unsubscriptionPropagatesBeforeSubscribe() { source.delaySubscription(other).subscribe(ts); - Assert.assertFalse("source subscribed?", source.hasSubscribers()); - Assert.assertTrue("other not subscribed?", other.hasSubscribers()); + assertFalse(source.hasSubscribers(), "source subscribed?"); + assertTrue(other.hasSubscribers(), "other not subscribed?"); ts.cancel(); - Assert.assertFalse("source subscribed?", source.hasSubscribers()); - Assert.assertFalse("other still subscribed?", other.hasSubscribers()); + assertFalse(source.hasSubscribers(), "source subscribed?"); + assertFalse(other.hasSubscribers(), "other still subscribed?"); } @Test @@ -240,18 +242,18 @@ public void unsubscriptionPropagatesAfterSubscribe() { source.delaySubscription(other).subscribe(ts); - Assert.assertFalse("source subscribed?", source.hasSubscribers()); - Assert.assertTrue("other not subscribed?", other.hasSubscribers()); + assertFalse(source.hasSubscribers(), "source subscribed?"); + assertTrue(other.hasSubscribers(), "other not subscribed?"); other.onComplete(); - Assert.assertTrue("source not subscribed?", source.hasSubscribers()); - Assert.assertFalse("other still subscribed?", other.hasSubscribers()); + assertTrue(source.hasSubscribers(), "source not subscribed?"); + assertFalse(other.hasSubscribers(), "other still subscribed?"); ts.cancel(); - Assert.assertFalse("source subscribed?", source.hasSubscribers()); - Assert.assertFalse("other still subscribed?", other.hasSubscribers()); + assertFalse(source.hasSubscribers(), "source subscribed?"); + assertFalse(other.hasSubscribers(), "other still subscribed?"); } @Test @@ -269,7 +271,7 @@ public void delayAndTakeUntilNeverSubscribeToSource() { interrupt.onNext(9000); delayUntil.onNext(1); - Assert.assertFalse(subscribed.get()); + assertFalse(subscribed.get()); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDelayTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDelayTest.java index 51f34c5a7d..31aa67d998 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDelayTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDelayTest.java @@ -13,19 +13,18 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.*; import java.util.concurrent.*; -import java.util.concurrent.Flow.Publisher; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; import java.util.concurrent.locks.LockSupport; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -43,7 +42,7 @@ public class FlowableDelayTest extends RxJavaTest { private TestScheduler scheduler; - @Before + @BeforeEach public void before() { subscriber = TestHelper.mockSubscriber(); subscriber2 = TestHelper.mockSubscriber(); @@ -760,7 +759,7 @@ public void delayAndTakeUntilNeverSubscribeToSource() { interrupt.onNext(9000); delayUntil.onNext(1); - Assert.assertFalse(subscribed.get()); + assertFalse(subscribed.get()); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDematerializeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDematerializeTest.java index fe682f2ac3..b31b4aa8fb 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDematerializeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDematerializeTest.java @@ -17,9 +17,9 @@ import static org.mockito.Mockito.*; import java.util.List; +import java.util.concurrent.Flow.Subscriber; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDetachTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDetachTest.java index 7c277005d0..958b4eca54 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDetachTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDetachTest.java @@ -13,11 +13,13 @@ package io.reactivex.rxjava4.internal.operators.flowable; +import static org.junit.jupiter.api.Assertions.assertNull; + import java.lang.ref.WeakReference; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.atomic.AtomicReference; -import org.junit.*; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -48,7 +50,7 @@ public void just() throws Exception { System.gc(); Thread.sleep(200); - Assert.assertNull("Object retained!", wr.get()); + assertNull(wr.get(), "Object retained!"); } @@ -108,7 +110,7 @@ public void backpressured() throws Exception { System.gc(); Thread.sleep(200); - Assert.assertNull("Object retained!", wr.get()); + assertNull(wr.get(), "Object retained!"); } @Test @@ -127,7 +129,7 @@ public void justUnsubscribed() throws Exception { System.gc(); Thread.sleep(200); - Assert.assertNull("Object retained!", wr.get()); + assertNull(wr.get(), "Object retained!"); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDistinctTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDistinctTest.java index 7a4da640bc..530e6c55c7 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDistinctTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDistinctTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.*; +import java.util.concurrent.Flow.*; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -29,8 +29,7 @@ import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.internal.util.ExceptionHelper; -import io.reactivex.rxjava4.operators.QueueFuseable; -import io.reactivex.rxjava4.operators.QueueSubscription; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.processors.UnicastProcessor; import io.reactivex.rxjava4.testsupport.*; @@ -47,7 +46,7 @@ public class FlowableDistinctTest extends RxJavaTest { return s.toUpperCase(); }; - @Before + @BeforeEach public void before() { w = TestHelper.mockSubscriber(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDistinctUntilChangedTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDistinctUntilChangedTest.java index 2e94beed80..378983c256 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDistinctUntilChangedTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDistinctUntilChangedTest.java @@ -13,20 +13,21 @@ package io.reactivex.rxjava4.internal.operators.flowable; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.io.IOException; import java.util.List; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.operators.QueueFuseable; @@ -48,7 +49,7 @@ public class FlowableDistinctUntilChangedTest extends RxJavaTest { return s.toUpperCase(); }; - @Before + @BeforeEach public void before() { w = TestHelper.mockSubscriber(); w2 = TestHelper.mockSubscriber(); @@ -158,7 +159,7 @@ public void distinctUntilChangedWhenNonFatalExceptionThrownByKeySelectorIsNotRep .doOnError(_ -> errorOccurred.set(true)) .distinctUntilChanged(THROWS_NON_FATAL) .subscribe(w); - Assert.assertFalse(errorOccurred.get()); + assertFalse(errorOccurred.get()); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoAfterNextTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoAfterNextTest.java index dfe83d074a..77517ae4b3 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoAfterNextTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoAfterNextTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoAfterTerminateTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoAfterTerminateTest.java index 6f48a64a0b..5dc427b9a7 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoAfterTerminateTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoAfterTerminateTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.List; +import java.util.concurrent.Flow.Subscriber; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.Mockito; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.functions.Action; @@ -34,7 +34,7 @@ public class FlowableDoAfterTerminateTest extends RxJavaTest { private Action aAction0; private Subscriber subscriber; - @Before + @BeforeEach public void before() { aAction0 = Mockito.mock(Action.class); subscriber = TestHelper.mockSubscriber(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoFinallyTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoFinallyTest.java index e68979a2f4..920c38ca5f 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoFinallyTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoFinallyTest.java @@ -13,19 +13,18 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; +import java.util.concurrent.Flow.Subscription; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Action; import io.reactivex.rxjava4.internal.functions.Functions; -import io.reactivex.rxjava4.operators.QueueFuseable; -import io.reactivex.rxjava4.operators.QueueSubscription; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.processors.UnicastProcessor; import io.reactivex.rxjava4.testsupport.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoOnEachTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoOnEachTest.java index 66c3ffcf38..e037ef75d5 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoOnEachTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoOnEachTest.java @@ -13,25 +13,24 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.io.IOException; import java.util.List; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.*; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; import io.reactivex.rxjava4.flowables.ConnectableFlowable; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; -import io.reactivex.rxjava4.operators.ConditionalSubscriber; -import io.reactivex.rxjava4.operators.QueueFuseable; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.processors.UnicastProcessor; import io.reactivex.rxjava4.subscribers.TestSubscriber; @@ -42,7 +41,7 @@ public class FlowableDoOnEachTest extends RxJavaTest { Subscriber subscribedSubscriber; Subscriber sideEffectSubscriber; - @Before + @BeforeEach public void before() { subscribedSubscriber = TestHelper.mockSubscriber(); sideEffectSubscriber = TestHelper.mockSubscriber(); @@ -163,8 +162,8 @@ public void onErrorThrows() { List exceptions = ex.getExceptions(); assertEquals(2, exceptions.size()); - Assert.assertTrue(exceptions.get(0) instanceof TestException); - Assert.assertTrue(exceptions.get(1) instanceof TestException); + assertTrue(exceptions.get(0) instanceof TestException); + assertTrue(exceptions.get(1) instanceof TestException); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoOnLifecycleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoOnLifecycleTest.java index 431aa02e59..4b581d1e3b 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoOnLifecycleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoOnLifecycleTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; +import java.util.concurrent.Flow.Subscriber; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoOnRequestTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoOnRequestTest.java index cfbccfe1ed..a3df80d3dd 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoOnRequestTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoOnRequestTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.subscribers.DefaultSubscriber; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoOnSubscribeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoOnSubscribeTest.java index 666bc9c99f..f0d5a0d123 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoOnSubscribeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoOnSubscribeTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.atomic.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoOnUnsubscribeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoOnUnsubscribeTest.java index dff5b8b051..a9e7034bd7 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoOnUnsubscribeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableDoOnUnsubscribeTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.processors.BehaviorProcessor; import io.reactivex.rxjava4.subscribers.TestSubscriber; @@ -72,8 +72,8 @@ public void doOnUnsubscribe() throws Exception { upperLatch.await(); lowerLatch.await(); - assertEquals(String.format("There should exactly %d un-subscription events for upper stream", subCount), subCount, upperCount.get()); - assertEquals(String.format("There should exactly %d un-subscription events for lower stream", subCount), subCount, lowerCount.get()); + assertEquals(subCount, upperCount.get(), String.format("There should exactly %d un-subscription events for upper stream", subCount)); + assertEquals(subCount, lowerCount.get(), String.format("There should exactly %d un-subscription events for lower stream", subCount)); } @Test @@ -121,8 +121,8 @@ public void doOnUnSubscribeWorksWithRefCount() throws Exception { upperLatch.await(); lowerLatch.await(); - assertEquals("There should exactly 1 un-subscription events for upper stream", 1, upperCount.get()); - assertEquals("There should exactly 1 un-subscription events for lower stream", 1, lowerCount.get()); + assertEquals(1, upperCount.get(), "There should exactly 1 un-subscription events for upper stream"); + assertEquals(1, lowerCount.get(), "There should exactly 1 un-subscription events for lower stream"); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableElementAtTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableElementAtTest.java index ef68f25dc5..4b650078cc 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableElementAtTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableElementAtTest.java @@ -13,19 +13,19 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; +import java.util.concurrent.Flow.Subscriber; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.processors.PublishProcessor; @@ -39,9 +39,11 @@ public void elementAtFlowable() { .intValue()); } - @Test(expected = IndexOutOfBoundsException.class) + @Test public void elementAtWithMinusIndexFlowable() { - Flowable.fromArray(1, 2).elementAt(-1); + assertThrows(IndexOutOfBoundsException.class, () -> { + Flowable.fromArray(1, 2).elementAt(-1); + }); } @Test @@ -59,9 +61,11 @@ public void elementAtOrDefaultWithIndexOutOfBoundsFlowable() { assertEquals(0, Flowable.fromArray(1, 2).elementAt(2, 0).toFlowable().blockingSingle().intValue()); } - @Test(expected = IndexOutOfBoundsException.class) + @Test public void elementAtOrDefaultWithMinusIndexFlowable() { - Flowable.fromArray(1, 2).elementAt(-1, 0); + assertThrows(IndexOutOfBoundsException.class, () -> { + Flowable.fromArray(1, 2).elementAt(-1, 0); + }); } @Test @@ -90,9 +94,11 @@ public void elementAtWithDefaultConstrainsUpstreamRequests() { assertEquals(List.of(3L), requests); } - @Test(expected = IndexOutOfBoundsException.class) + @Test public void elementAtWithMinusIndex() { - Flowable.fromArray(1, 2).elementAt(-1); + assertThrows(IndexOutOfBoundsException.class, () -> { + Flowable.fromArray(1, 2).elementAt(-1); + }); } @Test @@ -110,15 +116,19 @@ public void elementAtOrDefaultWithIndexOutOfBounds() { assertEquals(0, Flowable.fromArray(1, 2).elementAt(2, 0).blockingGet().intValue()); } - @Test(expected = IndexOutOfBoundsException.class) + @Test public void elementAtOrDefaultWithMinusIndex() { - Flowable.fromArray(1, 2).elementAt(-1, 0); + assertThrows(IndexOutOfBoundsException.class, () -> { + Flowable.fromArray(1, 2).elementAt(-1, 0); + }); } - @Test(expected = IndexOutOfBoundsException.class) + @Test public void elementAtOrErrorNegativeIndex() { - Flowable.empty() + assertThrows(IndexOutOfBoundsException.class, () -> { + Flowable.empty() .elementAtOrError(-1); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFilterTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFilterTest.java index 2afef122c8..2cd4518e5a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFilterTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFilterTest.java @@ -13,24 +13,24 @@ package io.reactivex.rxjava4.internal.operators.flowable; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.io.IOException; import java.util.List; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Flow.Subscriber; -import org.junit.*; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; -import io.reactivex.rxjava4.operators.ConditionalSubscriber; -import io.reactivex.rxjava4.operators.QueueFuseable; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.processors.*; import io.reactivex.rxjava4.subscribers.TestSubscriber; @@ -147,11 +147,11 @@ public void functionCrashUnsubscribes() { throw new TestException(); }).subscribe(ts); - Assert.assertTrue("Not subscribed?", pp.hasSubscribers()); + assertTrue(pp.hasSubscribers(), "Not subscribed?"); pp.onNext(1); - Assert.assertFalse("Subscribed?", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Subscribed?"); ts.assertError(TestException.class); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFirstTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFirstTest.java index 9d00072f73..68b23b0faa 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFirstTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFirstTest.java @@ -17,10 +17,10 @@ import static org.mockito.Mockito.*; import java.util.NoSuchElementException; +import java.util.concurrent.Flow.Subscriber; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.functions.Predicate; @@ -36,7 +36,7 @@ public class FlowableFirstTest extends RxJavaTest { private static final Predicate IS_D = "d"::equals; - @Before + @BeforeEach public void before() { w = TestHelper.mockSubscriber(); wo = TestHelper.mockSingleObserver(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFlatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFlatMapCompletableTest.java index c1c7b434c3..17774a9101 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFlatMapCompletableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFlatMapCompletableTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.*; import java.util.concurrent.Flow.Subscription; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardConcurrentConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFlatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFlatMapMaybeTest.java index 099d2c0987..ca83f72338 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFlatMapMaybeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFlatMapMaybeTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardConcurrentConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFlatMapSingleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFlatMapSingleTest.java index c9f66f052b..9d6b44379f 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFlatMapSingleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFlatMapSingleTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import java.util.concurrent.*; +import java.util.concurrent.Flow.Subscriber; +import java.util.concurrent.TimeUnit; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardConcurrentConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFlatMapTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFlatMapTest.java index ccb3e087fe..7c7772c032 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFlatMapTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFlatMapTest.java @@ -13,18 +13,17 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.io.IOException; import java.util.*; import java.util.concurrent.*; -import java.util.concurrent.Flow.Publisher; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.*; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; @@ -261,12 +260,12 @@ private static Flowable composer(Flowable source, final AtomicInteger return source.doOnSubscribe(_ -> { int n = subscriptionCount.getAndIncrement(); if (n >= m) { - Assert.fail("Too many subscriptions! " + (n + 1)); + fail("Too many subscriptions! " + (n + 1)); } }).doOnComplete(() -> { int n = subscriptionCount.decrementAndGet(); if (n < 0) { - Assert.fail("Too many unsubscriptions! " + (n - 1)); + fail("Too many unsubscriptions! " + (n - 1)); } }); } @@ -288,8 +287,8 @@ public void flatMapMaxConcurrent() { Set expected = new HashSet<>(Arrays.asList( 10, 11, 20, 21, 30, 31, 40, 41, 50, 51, 60, 61, 70, 71, 80, 81, 90, 91, 100, 101 )); - Assert.assertEquals(expected.size(), ts.values().size()); - Assert.assertTrue(expected.containsAll(ts.values())); + assertEquals(expected.size(), ts.values().size()); + assertTrue(expected.containsAll(ts.values())); } @Test @@ -310,9 +309,9 @@ public void flatMapSelectorMaxConcurrent() { 1010, 1011, 2020, 2021, 3030, 3031, 4040, 4041, 5050, 5051, 6060, 6061, 7070, 7071, 8080, 8081, 9090, 9091, 10100, 10101 )); - Assert.assertEquals(expected.size(), ts.values().size()); + assertEquals(expected.size(), ts.values().size()); System.out.println("--> testFlatMapSelectorMaxConcurrent: " + ts.values()); - Assert.assertTrue(expected.containsAll(ts.values())); + assertTrue(expected.containsAll(ts.values())); } @Test @@ -450,7 +449,7 @@ public void justEmptyMixture() { int j = 1; for (Integer v : ts.values()) { - Assert.assertEquals(j, v.intValue()); + assertEquals(j, v.intValue()); j += 2; } @@ -471,8 +470,8 @@ public void rangeEmptyMixture() { int j = 1; List list = ts.values(); for (int i = 0; i < list.size(); i += 2) { - Assert.assertEquals(j, list.get(i).intValue()); - Assert.assertEquals(j + 1, list.get(i + 1).intValue()); + assertEquals(j, list.get(i).intValue()); + assertEquals(j + 1, list.get(i + 1).intValue()); j += 2; } @@ -492,7 +491,7 @@ public void justEmptyMixtureMaxConcurrent() { int j = 1; for (Integer v : ts.values()) { - Assert.assertEquals(j, v.intValue()); + assertEquals(j, v.intValue()); j += 2; } @@ -513,8 +512,8 @@ public void rangeEmptyMixtureMaxConcurrent() { int j = 1; List list = ts.values(); for (int i = 0; i < list.size(); i += 2) { - Assert.assertEquals(j, list.get(i).intValue()); - Assert.assertEquals(j + 1, list.get(i + 1).intValue()); + assertEquals(j, list.get(i).intValue()); + assertEquals(j + 1, list.get(i + 1).intValue()); j += 2; } @@ -531,11 +530,11 @@ public void castCrashUnsubscribes() { throw new TestException(); }, (t1, _) -> t1).subscribe(ts); - Assert.assertTrue("Not subscribed?", pp.hasSubscribers()); + assertTrue(pp.hasSubscribers(), "Not subscribed?"); pp.onNext(1); - Assert.assertFalse("Subscribed?", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Subscribed?"); ts.assertError(TestException.class); } @@ -711,8 +710,8 @@ public void noCrossBoundaryFusion() { List list = ts.values(); - assertTrue(list.toString(), list.contains("RxSi")); - assertTrue(list.toString(), list.contains("RxCo")); + assertTrue(list.contains("RxSi"), list.toString()); + assertTrue(list.contains("RxCo"), list.toString()); } } @@ -731,7 +730,7 @@ public void cancelScalarDrainRace() { TestHelper.race(r1, r2); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } @@ -760,7 +759,7 @@ public void cancelDrainRace() { TestHelper.race(r1, r2); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } @@ -867,11 +866,11 @@ public void mainErrorsInnerCancelled() { .test(); pp1.onNext(1); - assertTrue("No subscribers?", pp2.hasSubscribers()); + assertTrue(pp2.hasSubscribers(), "No subscribers?"); pp1.onError(new TestException()); - assertFalse("Has subscribers?", pp2.hasSubscribers()); + assertFalse(pp2.hasSubscribers(), "Has subscribers?"); } @Test @@ -884,11 +883,11 @@ public void innerErrorsMainCancelled() { .test(); pp1.onNext(1); - assertTrue("No subscribers?", pp2.hasSubscribers()); + assertTrue(pp2.hasSubscribers(), "No subscribers?"); pp2.onError(new TestException()); - assertFalse("Has subscribers?", pp1.hasSubscribers()); + assertFalse(pp1.hasSubscribers(), "Has subscribers?"); } @Test @@ -1216,7 +1215,7 @@ public void innerCompletesAfterOnNextInDrainThenCancels() { .assertValuesOnly(1); } - @Test(timeout = 5000) + @Test @Timeout(value = 5000, unit = TimeUnit.MILLISECONDS) public void mixedScalarAsync() { for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { Flowable diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFlattenIterableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFlattenIterableTest.java index 45a6394fd0..96c911d2bf 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFlattenIterableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFlattenIterableTest.java @@ -13,24 +13,23 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.*; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.*; import io.reactivex.rxjava4.exceptions.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.internal.operators.flowable.FlowableFlattenIterable.FlattenIterableSubscriber; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.internal.util.ExceptionHelper; -import io.reactivex.rxjava4.operators.QueueFuseable; -import io.reactivex.rxjava4.operators.QueueSubscription; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.processors.PublishProcessor; import io.reactivex.rxjava4.subscribers.TestSubscriber; @@ -345,7 +344,7 @@ public void remove() { ts.assertError(TestException.class); ts.assertNotComplete(); - Assert.assertFalse("PublishProcessor has Subscribers?!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "PublishProcessor has Subscribers?!"); } @Test @@ -424,8 +423,8 @@ public void remove() { ts.assertNoErrors(); ts.assertComplete(); - Assert.assertFalse("PublishProcessor has Subscribers?!", pp.hasSubscribers()); - Assert.assertEquals(1, counter.get()); + assertFalse(pp.hasSubscribers(), "PublishProcessor has Subscribers?!"); + assertEquals(1, counter.get()); } @Test @@ -498,19 +497,19 @@ public void onSubscribe(Subscription s) { assertEquals(QueueFuseable.SYNC, qs.requestFusion(QueueFuseable.ANY)); try { - assertFalse("Source reports being empty!", qs.isEmpty()); + assertFalse(qs.isEmpty(), "Source reports being empty!"); assertEquals(1, qs.poll().intValue()); - assertFalse("Source reports being empty!", qs.isEmpty()); + assertFalse(qs.isEmpty(), "Source reports being empty!"); assertEquals(2, qs.poll().intValue()); - assertFalse("Source reports being empty!", qs.isEmpty()); + assertFalse(qs.isEmpty(), "Source reports being empty!"); qs.clear(); - assertTrue("Source reports not empty!", qs.isEmpty()); + assertTrue(qs.isEmpty(), "Source reports not empty!"); assertNull(qs.poll()); } catch (Throwable ex) { @@ -612,15 +611,15 @@ public void onSubscribe(Subscription s) { assertEquals(QueueFuseable.SYNC, qs.requestFusion(QueueFuseable.ANY)); try { - assertFalse("Source reports being empty!", qs.isEmpty()); + assertFalse(qs.isEmpty(), "Source reports being empty!"); assertEquals(1, qs.poll().intValue()); - assertFalse("Source reports being empty!", qs.isEmpty()); + assertFalse(qs.isEmpty(), "Source reports being empty!"); assertEquals(3, qs.poll().intValue()); - assertTrue("Source reports being non-empty!", qs.isEmpty()); + assertTrue(qs.isEmpty(), "Source reports being non-empty!"); } catch (Throwable ex) { throw ExceptionHelper.wrapOrThrow(ex); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableForEachTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableForEachTest.java index 226dd70bd2..3522e3e966 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableForEachTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableForEachTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromActionTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromActionTest.java index 7014e6a8fc..656bdd2d3b 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromActionTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromActionTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.List; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.functions.*; @@ -92,7 +92,7 @@ public void callable() throws Throwable { Flowable m = Flowable.fromAction(() -> counter[0]++); - assertTrue(m.getClass().toString(), m instanceof Supplier); + assertTrue(m instanceof Supplier, m.getClass().toString()); assertNull(((Supplier)m).get()); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromArrayTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromArrayTest.java index 71ce3316db..3d3e16dfcc 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromArrayTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromArrayTest.java @@ -13,7 +13,9 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import org.junit.*; +import static org.junit.jupiter.api.Assertions.*; + +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.internal.functions.Functions; @@ -92,13 +94,13 @@ public void conditionalBackpressure() { @Test public void empty() { - Assert.assertSame(Flowable.empty(), Flowable.fromArray(new Object[0])); + assertSame(Flowable.empty(), Flowable.fromArray(new Object[0])); } @Test public void just() { Flowable source = Flowable.fromArray(new Integer[] { 1 }); - Assert.assertTrue(source.getClass().toString(), source instanceof ScalarSupplier); + assertTrue(source instanceof ScalarSupplier, source.getClass().toString()); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromCallableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromCallableTest.java index d3c495eb16..3df942a934 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromCallableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromCallableTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.List; import java.util.concurrent.*; +import java.util.concurrent.Flow.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.stubbing.Answer; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromCompletableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromCompletableTest.java index 30c1013599..27d9cb48cb 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromCompletableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromCompletableTest.java @@ -13,18 +13,18 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.List; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.functions.*; -import io.reactivex.rxjava4.internal.fuseable.*; +import io.reactivex.rxjava4.functions.Action; +import io.reactivex.rxjava4.internal.fuseable.HasUpstreamCompletableSource; import io.reactivex.rxjava4.operators.QueueFuseable; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.schedulers.Schedulers; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromIterableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromIterableTest.java index 0dd9f58a11..531b70bc83 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromIterableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromIterableTest.java @@ -13,17 +13,17 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.*; import java.util.concurrent.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; @@ -31,9 +31,7 @@ import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.internal.util.CrashingIterable; -import io.reactivex.rxjava4.operators.QueueFuseable; -import io.reactivex.rxjava4.operators.QueueSubscription; -import io.reactivex.rxjava4.operators.SimpleQueue; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.schedulers.Schedulers; import io.reactivex.rxjava4.subscribers.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromMaybeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromMaybeTest.java index f1b655de8f..06c414fa71 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromMaybeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromMaybeTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromObservableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromObservableTest.java index df032677c0..41b9b613f9 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromObservableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromObservableTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromRunnableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromRunnableTest.java index 879cc10b57..3f28fc4ea4 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromRunnableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromRunnableTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.List; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -93,7 +93,7 @@ public void callable() throws Throwable { Flowable m = Flowable.fromRunnable(() -> counter[0]++); - assertTrue(m.getClass().toString(), m instanceof Supplier); + assertTrue(m instanceof Supplier, m.getClass().toString()); assertNull(((Supplier)m).get()); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromSingleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromSingleTest.java index 14b0cb8096..1133641f71 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromSingleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromSingleTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromSourceTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromSourceTest.java index 2cc779da30..bb1360b8e5 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromSourceTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromSourceTest.java @@ -13,10 +13,12 @@ package io.reactivex.rxjava4.internal.operators.flowable; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.List; +import java.util.concurrent.Flow.Subscription; -import org.junit.*; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; @@ -33,7 +35,7 @@ public class FlowableFromSourceTest extends RxJavaTest { TestSubscriberEx ts; - @Before + @BeforeEach public void before() { source = new PublishAsyncEmitter(); sourceNoCancel = new PublishAsyncEmitterNoCancel(); @@ -52,7 +54,7 @@ public void normalBuffered() { ts.assertValue(1); - Assert.assertEquals(0, source.requested()); + assertEquals(0, source.requested()); ts.request(1); @@ -136,7 +138,7 @@ public void normalError() { ts.assertError(MissingBackpressureException.class); ts.assertNotComplete(); - Assert.assertEquals("create: " + MissingBackpressureException.DEFAULT_MESSAGE, ts.errors().getFirst().getMessage()); + assertEquals("create: " + MissingBackpressureException.DEFAULT_MESSAGE, ts.errors().getFirst().getMessage()); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromSupplierTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromSupplierTest.java index 4094b7157b..49d6d98678 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromSupplierTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableFromSupplierTest.java @@ -13,20 +13,20 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.List; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Flow.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.stubbing.Answer; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Supplier; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.schedulers.Schedulers; import io.reactivex.rxjava4.subscribers.TestSubscriber; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableGenerateTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableGenerateTest.java index 7343e4d40e..94098900f6 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableGenerateTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableGenerateTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.BiConsumer; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.subscribers.TestSubscriber; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableGroupByTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableGroupByTest.java index ea46301c7a..79b21b08d2 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableGroupByTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableGroupByTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -24,7 +24,7 @@ import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import com.google.common.base.Ticker; @@ -140,7 +140,7 @@ public void onNext(String v) { assertEquals(3, groupCounter.get()); assertEquals(6, eventCounter.get()); assertNotNull(error.get()); - assertTrue("" + error.get(), error.get() instanceof TestException); + assertTrue(error.get() instanceof TestException, "" + error.get()); assertEquals(error.get().getMessage(), "forced failure"); } @@ -1008,15 +1008,17 @@ public void backpressureObserveOnOuter() { } } - @Test(expected = MissingBackpressureException.class) + @Test public void backpressureObserveOnOuterMissingBackpressure() { - for (int j = 0; j < 1000; j++) { - Flowable.merge( - Flowable.range(0, 500) - .groupBy(i -> i % (Flowable.bufferSize() + 2)) - .observeOn(Schedulers.computation()) - ).blockingLast(); - } + assertThrows(MissingBackpressureException.class, () -> { + for (int j = 0; j < 1000; j++) { + Flowable.merge( + Flowable.range(0, 500) + .groupBy(i -> i % (Flowable.bufferSize() + 2)) + .observeOn(Schedulers.computation()) + ).blockingLast(); + } + }); } /** @@ -1572,7 +1574,7 @@ public void cancelOverFlatmapRace() { TestHelper.race(r1, r2); - assertFalse("Round " + i, pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Round " + i); } } @@ -1669,7 +1671,7 @@ public void valueSelectorCrashAndMissingBackpressure() { ts.assertFailure(MissingBackpressureException.class); - assertTrue("" + ts.errors().getFirst().getCause(), ts.errors().getFirst().getCause() instanceof TestException); + assertTrue(ts.errors().getFirst().getCause() instanceof TestException, "" + ts.errors().getFirst().getCause()); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableGroupJoinTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableGroupJoinTest.java index c65761124c..47ea3569fd 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableGroupJoinTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableGroupJoinTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.*; +import java.util.concurrent.Flow.*; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.MockitoAnnotations; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; @@ -50,7 +50,7 @@ Function> just2(final Flowable flowable) { BiFunction, Flowable> add2 = (leftValue, rightValues) -> rightValues.map(rightValue -> add.apply(leftValue, rightValue)); - @Before + @BeforeEach public void before() { MockitoAnnotations.openMocks(this); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableHideTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableHideTest.java index 8d76a6daea..94fdd52704 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableHideTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableHideTest.java @@ -13,12 +13,13 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import java.util.concurrent.Flow.Subscriber; + +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableIgnoreElementsTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableIgnoreElementsTest.java index 9668fdf49e..b01bee0129 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableIgnoreElementsTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableIgnoreElementsTest.java @@ -13,19 +13,18 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; +import java.util.concurrent.Flow.Subscription; import java.util.concurrent.atomic.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.observers.DisposableCompletableObserver; -import io.reactivex.rxjava4.operators.QueueFuseable; -import io.reactivex.rxjava4.operators.QueueSubscription; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.processors.PublishProcessor; import io.reactivex.rxjava4.subscribers.*; import io.reactivex.rxjava4.testsupport.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableInternalHelperTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableInternalHelperTest.java index 86a3f2176f..45c63c1719 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableInternalHelperTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableInternalHelperTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableIntervalRangeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableIntervalRangeTest.java index 8044ea2af5..d5b589e0ca 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableIntervalRangeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableIntervalRangeTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.MissingBackpressureException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableIntervalTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableIntervalTest.java index 6a9c2bce78..ec83461397 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableIntervalTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableIntervalTest.java @@ -15,7 +15,7 @@ import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.internal.operators.flowable.FlowableInterval.IntervalSubscriber; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableJoinTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableJoinTest.java index 4d7d5db216..42e922b093 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableJoinTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableJoinTest.java @@ -17,10 +17,10 @@ import static org.mockito.Mockito.*; import java.util.List; +import java.util.concurrent.Flow.Subscriber; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.MockitoAnnotations; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; @@ -41,7 +41,7 @@ Function> just(final Flowable flowable) { return _ -> flowable; } - @Before + @BeforeEach public void before() { MockitoAnnotations.openMocks(this); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableLastTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableLastTest.java index 95af0289e9..fba9584bf5 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableLastTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableLastTest.java @@ -13,18 +13,18 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.NoSuchElementException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.testsupport.TestHelper; public class FlowableLastTest extends RxJavaTest { diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableLiftTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableLiftTest.java index 9d30b02b0a..c52e375fa4 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableLiftTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableLiftTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -37,7 +37,7 @@ public void callbackCrash() { .test(); fail("Should have thrown"); } catch (NullPointerException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, ex.toString()); TestHelper.assertUndeliverable(errors, 0, TestException.class); } finally { RxJavaPlugins.reset(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMapNotificationTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMapNotificationTest.java index e23490eaf4..20a6e2c6db 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMapNotificationTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMapNotificationTest.java @@ -13,10 +13,9 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import java.util.concurrent.Flow.*; -import java.util.concurrent.Flow.Publisher; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMapTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMapTest.java index 06ab5c0fa4..3bbe2f55fb 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMapTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMapTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.io.IOException; import java.util.*; +import java.util.concurrent.Flow.Subscriber; -import org.junit.*; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -29,8 +29,7 @@ import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.internal.schedulers.ImmediateThinScheduler; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; -import io.reactivex.rxjava4.operators.ConditionalSubscriber; -import io.reactivex.rxjava4.operators.QueueFuseable; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.processors.*; import io.reactivex.rxjava4.schedulers.Schedulers; @@ -44,7 +43,7 @@ public class FlowableMapTest extends RxJavaTest { static final BiFunction APPEND_INDEX = (value, index) -> value + index; - @Before + @BeforeEach public void before() { stringSubscriber = TestHelper.mockSubscriber(); stringSubscriber2 = TestHelper.mockSubscriber(); @@ -145,27 +144,31 @@ public void mapWithError() { TestHelper.assertError(errors, 0, TestException.class, "Forced Failure"); } - @Test(expected = IllegalArgumentException.class) + @Test public void mapWithIssue417() { - Flowable.just(1).observeOn(Schedulers.computation()) - .map(_ -> { - throw new IllegalArgumentException("any error"); - }).blockingSingle(); + assertThrows(IllegalArgumentException.class, () -> { + Flowable.just(1).observeOn(Schedulers.computation()) + .map(_ -> { + throw new IllegalArgumentException("any error"); + }).blockingSingle(); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void mapWithErrorInFuncAndThreadPoolScheduler() throws InterruptedException { - // The error will throw in one of threads in the thread pool. - // If map does not handle it, the error will disappear. - // so map needs to handle the error by itself. - Flowable m = Flowable.just("one") - .observeOn(Schedulers.computation()) - .map(_ -> { - throw new IllegalArgumentException("any error"); - }); - - // block for response, expecting exception thrown - m.blockingLast(); + assertThrows(IllegalArgumentException.class, () -> { + // The error will throw in one of threads in the thread pool. + // If map does not handle it, the error will disappear. + // so map needs to handle the error by itself. + Flowable m = Flowable.just("one") + .observeOn(Schedulers.computation()) + .map(_ -> { + throw new IllegalArgumentException("any error"); + }); + + // block for response, expecting exception thrown + m.blockingLast(); + }); } /** @@ -179,18 +182,22 @@ public void errorPassesThruMap() { /** * We expect IllegalStateException to pass thru map. */ - @Test(expected = IllegalStateException.class) + @Test public void errorPassesThruMap2() { - Flowable.error(new IllegalStateException()).map(i -> i).blockingSingle(); + assertThrows(IllegalStateException.class, () -> { + Flowable.error(new IllegalStateException()).map(i -> i).blockingSingle(); + }); } /** * We expect an ArithmeticException exception here because last() emits a single value * but then we divide by 0. */ - @Test(expected = ArithmeticException.class) + @Test public void mapWithErrorInFunc() { - Flowable.range(1, 1).lastElement().map(i -> i / 0).blockingGet(); + assertThrows(ArithmeticException.class, () -> { + Flowable.range(1, 1).lastElement().map(i -> i / 0).blockingGet(); + }); } private static Map getMap(String prefix) { @@ -211,11 +218,11 @@ public void functionCrashUnsubscribes() { throw new TestException(); }).subscribe(ts); - Assert.assertTrue("Not subscribed?", pp.hasSubscribers()); + assertTrue(pp.hasSubscribers(), "Not subscribed?"); pp.onNext(1); - Assert.assertFalse("Subscribed?", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Subscribed?"); ts.assertError(TestException.class); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMaterializeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMaterializeTest.java index 0e341ef8bb..7d23f3e442 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMaterializeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMaterializeTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.ExecutionException; +import java.util.concurrent.Flow.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.schedulers.Schedulers; import io.reactivex.rxjava4.subscribers.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMergeDelayErrorTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMergeDelayErrorTest.java index a1f5576d34..b574aa6c7e 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMergeDelayErrorTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMergeDelayErrorTest.java @@ -13,8 +13,7 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; -import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -22,7 +21,7 @@ import java.util.concurrent.*; import java.util.concurrent.Flow.*; -import org.junit.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardConcurrentBufferedConfig; @@ -36,7 +35,7 @@ public class FlowableMergeDelayErrorTest extends RxJavaTest { Subscriber stringSubscriber; - @Before + @BeforeEach public void before() { stringSubscriber = TestHelper.mockSubscriber(); } @@ -536,14 +535,14 @@ public void iterableMaxConcurrent() { Flowable.merge(Arrays.asList(pp1, pp2), new StandardConcurrentBufferedConfig(ErrorMode.END, 1)).subscribe(ts); - assertTrue("ps1 has no subscribers?!", pp1.hasSubscribers()); - assertFalse("ps2 has subscribers?!", pp2.hasSubscribers()); + assertTrue(pp1.hasSubscribers(), "ps1 has no subscribers?!"); + assertFalse(pp2.hasSubscribers(), "ps2 has subscribers?!"); pp1.onNext(1); pp1.onComplete(); - assertFalse("ps1 has subscribers?!", pp1.hasSubscribers()); - assertTrue("ps2 has no subscribers?!", pp2.hasSubscribers()); + assertFalse(pp1.hasSubscribers(), "ps1 has subscribers?!"); + assertTrue(pp2.hasSubscribers(), "ps2 has no subscribers?!"); pp2.onNext(2); pp2.onComplete(); @@ -563,14 +562,14 @@ public void iterableMaxConcurrentError() { Flowable.merge(Arrays.asList(pp1, pp2), new StandardConcurrentBufferedConfig(ErrorMode.END, 1)) .subscribe(ts); - assertTrue("ps1 has no subscribers?!", pp1.hasSubscribers()); - assertFalse("ps2 has subscribers?!", pp2.hasSubscribers()); + assertTrue(pp1.hasSubscribers(), "ps1 has no subscribers?!"); + assertFalse(pp2.hasSubscribers(), "ps2 has subscribers?!"); pp1.onNext(1); pp1.onError(new TestException()); - assertFalse("ps1 has subscribers?!", pp1.hasSubscribers()); - assertTrue("ps2 has no subscribers?!", pp2.hasSubscribers()); + assertFalse(pp1.hasSubscribers(), "ps1 has subscribers?!"); + assertTrue(pp2.hasSubscribers(), "ps2 has no subscribers?!"); pp2.onNext(2); pp2.onError(new TestException()); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMergeMaxConcurrentTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMergeMaxConcurrentTest.java index 353097c228..770ee8dbc7 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMergeMaxConcurrentTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMergeMaxConcurrentTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardConcurrentBufferedConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMergeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMergeTest.java index b6d7e6fded..d17e7d3c78 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMergeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMergeTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -22,7 +22,7 @@ import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.*; import org.junit.jupiter.api.parallel.Isolated; import io.reactivex.rxjava4.core.*; @@ -46,7 +46,7 @@ public class FlowableMergeTest extends RxJavaTest { int count; - @Before + @BeforeEach public void before() { stringSubscriber = TestHelper.mockSubscriber(); @@ -57,7 +57,7 @@ public void before() { } } - @After + @AfterEach public void after() { try { Thread.sleep(100); @@ -196,7 +196,7 @@ public void mergeArrayWithThreading() { verify(stringSubscriber, times(1)).onComplete(); } - @Ignore("The underlying test keeps randomly failing and I don't know how to fix it or what it actually tries to test.") + @Disabled("The underlying test keeps randomly failing and I don't know how to fix it or what it actually tries to test.") @org.junit.jupiter.api.Test public void synchronizationOfMultipleSequencesLoop() throws Throwable { for (int i = 0; i < 100; i++) { @@ -205,7 +205,7 @@ public void synchronizationOfMultipleSequencesLoop() throws Throwable { } } - @Ignore("The underlying test keeps randomly failing and I don't know how to fix it or what it actually tries to test.") + @Disabled("The underlying test keeps randomly failing and I don't know how to fix it or what it actually tries to test.") @Test public void synchronizationOfMultipleSequences() throws Throwable { final TestASynchronousFlowable f1 = new TestASynchronousFlowable(); @@ -1285,14 +1285,14 @@ public void mergeArrayMaxConcurrent() { Flowable.mergeArray(new StandardConcurrentBufferedConfig(ErrorMode.IMMEDIATE, 1, 128), new Flowable[] { pp1, pp2 }) .subscribe(ts); - assertTrue("ps1 has no subscribers?!", pp1.hasSubscribers()); - assertFalse("ps2 has subscribers?!", pp2.hasSubscribers()); + assertTrue(pp1.hasSubscribers(), "ps1 has no subscribers?!"); + assertFalse(pp2.hasSubscribers(), "ps2 has subscribers?!"); pp1.onNext(1); pp1.onComplete(); - assertFalse("ps1 has subscribers?!", pp1.hasSubscribers()); - assertTrue("ps2 has no subscribers?!", pp2.hasSubscribers()); + assertFalse(pp1.hasSubscribers(), "ps1 has subscribers?!"); + assertTrue(pp2.hasSubscribers(), "ps2 has no subscribers?!"); pp2.onNext(2); pp2.onComplete(); @@ -1426,7 +1426,7 @@ public void mergeErrors() { .to(TestHelper.testConsumer()) .assertFailureAndMessage(TestException.class, "First"); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMergeWithCompletableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMergeWithCompletableTest.java index 61a51f8229..d0f9b458a6 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMergeWithCompletableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMergeWithCompletableTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -133,8 +133,8 @@ public void cancelOtherOnMainError() { ts.assertFailure(TestException.class); - assertFalse("main has observers!", pp.hasSubscribers()); - assertFalse("other has observers", cs.hasObservers()); + assertFalse(pp.hasSubscribers(), "main has observers!"); + assertFalse(cs.hasObservers(), "other has observers"); } @Test @@ -151,8 +151,8 @@ public void cancelMainOnOtherError() { ts.assertFailure(TestException.class); - assertFalse("main has observers!", pp.hasSubscribers()); - assertFalse("other has observers", cs.hasObservers()); + assertFalse(pp.hasSubscribers(), "main has observers!"); + assertFalse(cs.hasObservers(), "other has observers"); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMergeWithMaybeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMergeWithMaybeTest.java index 6257d7b480..aa29285c3a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMergeWithMaybeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMergeWithMaybeTest.java @@ -13,21 +13,21 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.List; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.processors.PublishProcessor; -import io.reactivex.rxjava4.subjects.*; +import io.reactivex.rxjava4.subjects.MaybeSubject; import io.reactivex.rxjava4.subscribers.TestSubscriber; import io.reactivex.rxjava4.testsupport.TestHelper; @@ -382,8 +382,8 @@ public void cancelOtherOnMainError() { ts.assertFailure(TestException.class); - assertFalse("main has observers!", pp.hasSubscribers()); - assertFalse("other has observers", ms.hasObservers()); + assertFalse(pp.hasSubscribers(), "main has observers!"); + assertFalse(ms.hasObservers(), "other has observers"); } @Test @@ -400,8 +400,8 @@ public void cancelMainOnOtherError() { ts.assertFailure(TestException.class); - assertFalse("main has observers!", pp.hasSubscribers()); - assertFalse("other has observers", ms.hasObservers()); + assertFalse(pp.hasSubscribers(), "main has observers!"); + assertFalse(ms.hasObservers(), "other has observers"); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMergeWithSingleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMergeWithSingleTest.java index 1d614423b4..269ed546e0 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMergeWithSingleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableMergeWithSingleTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.List; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -378,8 +378,8 @@ public void cancelOtherOnMainError() { ts.assertFailure(TestException.class); - assertFalse("main has observers!", pp.hasSubscribers()); - assertFalse("other has observers", ss.hasObservers()); + assertFalse(pp.hasSubscribers(), "main has observers!"); + assertFalse(ss.hasObservers(), "other has observers"); } @Test @@ -396,8 +396,8 @@ public void cancelMainOnOtherError() { ts.assertFailure(TestException.class); - assertFalse("main has observers!", pp.hasSubscribers()); - assertFalse("other has observers", ss.hasObservers()); + assertFalse(pp.hasSubscribers(), "main has observers!"); + assertFalse(ss.hasObservers(), "other has observers"); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableObserveOnTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableObserveOnTest.java index 8b261f2bf8..6a8f56139a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableObserveOnTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableObserveOnTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -22,7 +22,7 @@ import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.annotations.Nullable; @@ -201,7 +201,7 @@ public void observeOnWithNewThreadScheduler() { assertEquals(count.incrementAndGet() * _multiple, t1.intValue()); // FIXME toBlocking methods run on the current thread String name = Thread.currentThread().getName(); - assertFalse("Wrong thread name: " + name, name.startsWith("Rx")); + assertFalse(name.startsWith("Rx"), "Wrong thread name: " + name); }); } @@ -219,7 +219,7 @@ public void observeOnWithThreadPoolScheduler() { assertEquals(count.incrementAndGet() * _multiple, t1.intValue()); // FIXME toBlocking methods run on the caller's thread String name = Thread.currentThread().getName(); - assertFalse("Wrong thread name: " + name, name.startsWith("Rx")); + assertFalse(name.startsWith("Rx"), "Wrong thread name: " + name); }); } @@ -252,7 +252,7 @@ public void observeOnOrderingConcurrency() { // assertTrue(name.startsWith("RxComputationThreadPool")); // FIXME toBlocking now runs its methods on the caller thread String name = Thread.currentThread().getName(); - assertFalse("Wrong thread name: " + name, name.startsWith("Rx")); + assertFalse(name.startsWith("Rx"), "Wrong thread name: " + name); }); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java index ae9fe82d90..6a24120b43 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java @@ -14,18 +14,18 @@ package io.reactivex.rxjava4.internal.operators.flowable; import static io.reactivex.rxjava4.core.BackpressureOverflowStrategy.*; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Consumer; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.processors.PublishProcessor; import io.reactivex.rxjava4.subscribers.*; @@ -105,14 +105,18 @@ public void backpressureWithBufferDropLatest() throws InterruptedException { } }); - @Test(expected = IllegalArgumentException.class) + @Test public void backpressureBufferNegativeCapacity() throws InterruptedException { - Flowable.empty().onBackpressureBuffer(-1, DROP_OLDEST); + assertThrows(IllegalArgumentException.class, () -> { + Flowable.empty().onBackpressureBuffer(-1, DROP_OLDEST); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void backpressureBufferZeroCapacity() throws InterruptedException { - Flowable.empty().onBackpressureBuffer(0, DROP_OLDEST); + assertThrows(IllegalArgumentException.class, () -> { + Flowable.empty().onBackpressureBuffer(0, DROP_OLDEST); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureBufferTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureBufferTest.java index 3d4c6941df..a90ee177ab 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureBufferTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureBufferTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -21,12 +21,12 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.OnBackpressureBufferConfig; import io.reactivex.rxjava4.exceptions.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Consumer; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.observers.TestObserver; @@ -98,14 +98,18 @@ public void onNext(Long t) { assertEquals(499, ts.values().get(499).intValue()); } - @Test(expected = IllegalArgumentException.class) + @Test public void fixBackpressureBufferNegativeCapacity() throws InterruptedException { - Flowable.empty().onBackpressureBuffer(new OnBackpressureBufferConfig<>(-1)); + assertThrows(IllegalArgumentException.class, () -> { + Flowable.empty().onBackpressureBuffer(new OnBackpressureBufferConfig<>(-1)); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void fixBackpressureBufferZeroCapacity() throws InterruptedException { - Flowable.empty().onBackpressureBuffer(new OnBackpressureBufferConfig<>(0)); + assertThrows(IllegalArgumentException.class, () -> { + Flowable.empty().onBackpressureBuffer(new OnBackpressureBufferConfig<>(0)); + }); } @Test @@ -188,14 +192,18 @@ public void maxSize() { ts.assertNotComplete(); } - @Test(expected = IllegalArgumentException.class) + @Test public void fixBackpressureBufferNegativeCapacity2() throws InterruptedException { - Flowable.empty().onBackpressureBuffer(new OnBackpressureBufferConfig<>(-1)); + assertThrows(IllegalArgumentException.class, () -> { + Flowable.empty().onBackpressureBuffer(new OnBackpressureBufferConfig<>(-1)); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void fixBackpressureBufferZeroCapacity2() throws InterruptedException { - Flowable.empty().onBackpressureBuffer(new OnBackpressureBufferConfig<>(0)); + assertThrows(IllegalArgumentException.class, () -> { + Flowable.empty().onBackpressureBuffer(new OnBackpressureBufferConfig<>(0)); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureDropTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureDropTest.java index 43818ef0f3..701f3db565 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureDropTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureDropTest.java @@ -13,14 +13,15 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; + import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Consumer; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.schedulers.Schedulers; import io.reactivex.rxjava4.subscribers.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureErrorTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureErrorTest.java index 18e6088878..5fb76d868d 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureErrorTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureErrorTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.MissingBackpressureException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureLatestTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureLatestTest.java index 9d0edaf2d5..b8cbe661d1 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureLatestTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureLatestTest.java @@ -13,10 +13,13 @@ package io.reactivex.rxjava4.internal.operators.flowable; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.inOrder; + import java.util.Random; import java.util.concurrent.TimeUnit; -import org.junit.*; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; @@ -26,8 +29,6 @@ import io.reactivex.rxjava4.subscribers.TestSubscriber; import io.reactivex.rxjava4.testsupport.*; -import static org.mockito.Mockito.inOrder; - public class FlowableOnBackpressureLatestTest extends RxJavaTest { @Test public void simple() { @@ -195,11 +196,11 @@ public void onNext(Integer t) { ts.assertTerminated(); int n = ts.values().size(); System.out.println("testAsynchronousDrop -> " + n); - Assert.assertTrue("All events received?", n < m); + assertTrue(n < m, "All events received?"); int previous = 0; for (Integer current : ts.values()) { - Assert.assertTrue("The sequence must be increasing [current value=" + previous + - ", previous value=" + current + "]", previous <= current); + assertTrue(previous <= current, "The sequence must be increasing [current value=" + previous + + ", previous value=" + current + "]"); previous = current; } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureReduceTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureReduceTest.java index e16706fdc7..a39aa1427e 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureReduceTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureReduceTest.java @@ -13,20 +13,20 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import io.reactivex.rxjava4.core.Flowable; -import io.reactivex.rxjava4.core.RxJavaTest; +import static org.junit.jupiter.api.Assertions.*; + +import java.util.Random; +import java.util.concurrent.TimeUnit; + +import org.junit.jupiter.api.Test; + +import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.BiFunction; import io.reactivex.rxjava4.processors.PublishProcessor; import io.reactivex.rxjava4.schedulers.Schedulers; import io.reactivex.rxjava4.subscribers.TestSubscriber; -import io.reactivex.rxjava4.testsupport.TestHelper; -import io.reactivex.rxjava4.testsupport.TestSubscriberEx; -import org.junit.Assert; -import org.junit.Test; - -import java.util.Random; -import java.util.concurrent.TimeUnit; +import io.reactivex.rxjava4.testsupport.*; public class FlowableOnBackpressureReduceTest extends RxJavaTest { @@ -156,14 +156,14 @@ public void onNext(T t) { private void assertValuesDropped(TestSubscriberEx ts, int totalValues) { int n = ts.values().size(); System.out.println("testAsynchronousDrop -> " + n); - Assert.assertTrue("All events received?", n < totalValues); + assertTrue(n < totalValues, "All events received?"); } private void assertIncreasingSequence(TestSubscriberEx ts) { int previous = 0; for (Integer current : ts.values()) { - Assert.assertTrue("The sequence must be increasing [current value=" + previous + - ", previous value=" + current + "]", previous <= current); + assertTrue(previous <= current, "The sequence must be increasing [current value=" + previous + + ", previous value=" + current + "]"); previous = current; } } @@ -206,7 +206,7 @@ public void asynchronousDrop2() { sum += i; } //sum = (A1 + An) * n / 2 = 100_001 * 50_000 = 50_000_00000 + 50_000 = 50_000_50_000 - Assert.assertEquals("Wrong sum: " + sum, 5000050000L, sum); + assertEquals(5000050000L, sum, "Wrong sum: " + sum); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureReduceWithTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureReduceWithTest.java index c706cd22b0..aeb7455df2 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureReduceWithTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnBackpressureReduceWithTest.java @@ -13,21 +13,20 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import io.reactivex.rxjava4.core.Flowable; -import io.reactivex.rxjava4.core.RxJavaTest; -import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.BiFunction; -import io.reactivex.rxjava4.functions.Supplier; -import io.reactivex.rxjava4.processors.PublishProcessor; -import io.reactivex.rxjava4.schedulers.Schedulers; -import io.reactivex.rxjava4.testsupport.TestHelper; -import io.reactivex.rxjava4.testsupport.TestSubscriberEx; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.TimeUnit; +import org.junit.jupiter.api.Test; + +import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.exceptions.TestException; +import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.processors.PublishProcessor; +import io.reactivex.rxjava4.schedulers.Schedulers; +import io.reactivex.rxjava4.testsupport.*; + public class FlowableOnBackpressureReduceWithTest extends RxJavaTest { private static BiFunction, T, List> createTestReducer() { @@ -196,14 +195,14 @@ public void onNext(T t) { private void assertValuesDropped(TestSubscriberEx ts, int totalValues) { int n = ts.values().size(); System.out.println("testAsynchronousDrop -> " + n); - Assert.assertTrue("All events received?", n < totalValues); + assertTrue(n < totalValues, "All events received?"); } private void assertIncreasingSequence(TestSubscriberEx ts) { int previous = 0; for (Integer current : ts.values()) { - Assert.assertTrue("The sequence must be increasing [current value=" + previous + - ", previous value=" + current + "]", previous <= current); + assertTrue(previous <= current, "The sequence must be increasing [current value=" + previous + + ", previous value=" + current + "]"); previous = current; } } @@ -250,7 +249,7 @@ public void asynchronousDrop2() { sum += i; } //sum = (A1 + An) * n / 2 = 100_001 * 50_000 = 50_000_00000 + 50_000 = 50_000_50_000 - Assert.assertEquals("Wrong sum: " + sum, 5000050000L, sum); + assertEquals(5000050000L, sum, "Wrong sum: " + sum); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnErrorCompleteTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnErrorCompleteTest.java index 8b2430745c..fb38213cf0 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnErrorCompleteTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnErrorCompleteTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Flowable; import io.reactivex.rxjava4.exceptions.*; @@ -65,7 +65,7 @@ public void error() throws Throwable { .test() .assertResult(); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); }); } @@ -77,7 +77,7 @@ public void errorMatches() throws Throwable { .test() .assertResult(); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); }); } @@ -89,7 +89,7 @@ public void errorNotMatches() throws Throwable { .test() .assertFailure(IOException.class); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); }); } @@ -104,7 +104,7 @@ public void errorPredicateCrash() throws Throwable { TestHelper.assertError(ts, 0, IOException.class); TestHelper.assertError(ts, 1, TestException.class); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); }); } @@ -117,7 +117,7 @@ public void itemsThenError() throws Throwable { .test() .assertResult(2, 4); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); }); } @@ -129,11 +129,11 @@ public void cancel() { .onErrorComplete() .test(); - assertTrue("No subscribers?!", pp.hasSubscribers()); + assertTrue(pp.hasSubscribers(), "No subscribers?!"); ts.cancel(); - assertFalse("Still subscribers?!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Still subscribers?!"); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnErrorResumeNextViaFlowableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnErrorResumeNextViaFlowableTest.java index eb624bcefa..55ab5f4f7e 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnErrorResumeNextViaFlowableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnErrorResumeNextViaFlowableTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnErrorResumeNextViaFunctionTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnErrorResumeNextViaFunctionTest.java index 60c031751f..3f23f08dfd 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnErrorResumeNextViaFunctionTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnErrorResumeNextViaFunctionTest.java @@ -13,17 +13,17 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.io.IOException; +import java.util.concurrent.Flow.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnErrorReturnTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnErrorReturnTest.java index dcc48ed191..66b6f3ffcf 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnErrorReturnTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableOnErrorReturnTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowablePublishFunctionTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowablePublishFunctionTest.java index f65a1424c1..ffa360166b 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowablePublishFunctionTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowablePublishFunctionTest.java @@ -13,14 +13,13 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.*; -import org.junit.*; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; @@ -88,7 +87,7 @@ public void canBeCancelled() { ts.cancel(); - Assert.assertFalse("Source has subscribers?", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Source has subscribers?"); } @Test @@ -97,7 +96,7 @@ public void invalidPrefetch() { Flowable.never().publish(Functions.identity(), -99); fail("Didn't throw IllegalArgumentException"); } catch (IllegalArgumentException ex) { - Assert.assertEquals("prefetch > 0 required but it was -99", ex.getMessage()); + assertEquals("prefetch > 0 required but it was -99", ex.getMessage()); } } @@ -115,7 +114,7 @@ public void takeCompletes() { ts.assertNoErrors(); ts.assertComplete(); - Assert.assertFalse("Source has subscribers?", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Source has subscribers?"); } @@ -135,7 +134,7 @@ public void onStart() { pp.publish(f -> f.take(1)).subscribe(ts); - Assert.assertEquals(1, startCount.get()); + assertEquals(1, startCount.get()); } @Test @@ -152,7 +151,7 @@ public void takeCompletesUnsafe() { ts.assertNoErrors(); ts.assertComplete(); - Assert.assertFalse("Source has subscribers?", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Source has subscribers?"); } @Test @@ -170,7 +169,7 @@ public void directCompletesUnsafe() { ts.assertNoErrors(); ts.assertComplete(); - Assert.assertFalse("Source has subscribers?", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Source has subscribers?"); } @Test @@ -189,9 +188,9 @@ public void overflowMissingBackpressureException() { ts.assertError(MissingBackpressureException.class); ts.assertNotComplete(); - Assert.assertEquals(MissingBackpressureException.DEFAULT_MESSAGE, + assertEquals(MissingBackpressureException.DEFAULT_MESSAGE, ts.errors().getFirst().getMessage()); - Assert.assertFalse("Source has subscribers?", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Source has subscribers?"); } @Test @@ -212,8 +211,8 @@ public void overflowMissingBackpressureExceptionDelayed() { ts.assertError(MissingBackpressureException.class); ts.assertNotComplete(); - Assert.assertEquals(MissingBackpressureException.DEFAULT_MESSAGE, ts.errors().getFirst().getMessage()); - Assert.assertFalse("Source has subscribers?", pp.hasSubscribers()); + assertEquals(MissingBackpressureException.DEFAULT_MESSAGE, ts.errors().getFirst().getMessage()); + assertFalse(pp.hasSubscribers(), "Source has subscribers?"); } @Test @@ -230,7 +229,7 @@ public void independentlyMapped() { TestSubscriber ts = pp.publish(_ -> Flowable.range(1, 5)).test(0); - assertTrue("pp has no Subscribers?!", pp.hasSubscribers()); + assertTrue(pp.hasSubscribers(), "pp has no Subscribers?!"); ts.assertNoValues() .assertNoErrors() @@ -240,7 +239,7 @@ public void independentlyMapped() { ts.assertResult(1, 2, 3, 4, 5); - assertFalse("pp has Subscribers?!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "pp has Subscribers?!"); } @Test @@ -422,7 +421,7 @@ public void noUpstreamCancelOnCasualChainClose() { .publish(Functions.identity()) .test() .awaitDone(1, TimeUnit.SECONDS); - assertFalse("Unnecessary upstream .cancel() call in FlowablePublishMulticast", parentUpstreamCancelled.get()); + assertFalse(parentUpstreamCancelled.get(), "Unnecessary upstream .cancel() call in FlowablePublishMulticast"); } @Test @@ -433,7 +432,7 @@ public void noUpstreamCancelOnCasualChainCloseWithInnerCancels() { .publish(v -> Flowable.concatArray(v.take(1), v.skip(5))) .test() .awaitDone(1, TimeUnit.SECONDS); - assertFalse("Unnecessary upstream .cancel() call in FlowablePublishMulticast", parentUpstreamCancelled.get()); + assertFalse(parentUpstreamCancelled.get(), "Unnecessary upstream .cancel() call in FlowablePublishMulticast"); } @Test @@ -445,6 +444,6 @@ public void upstreamCancelOnDownstreamCancel() { .take(1) .test() .awaitDone(1, TimeUnit.SECONDS); - assertTrue("Upstream .cancel() not called in FlowablePublishMulticast", parentUpstreamCancelled.get()); + assertTrue(parentUpstreamCancelled.get(), "Upstream .cancel() not called in FlowablePublishMulticast"); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowablePublishMulticastTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowablePublishMulticastTest.java index f2bcc9e613..3d8bb7dca8 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowablePublishMulticastTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowablePublishMulticastTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.internal.operators.flowable.FlowablePublishMulticast.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowablePublishTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowablePublishTest.java index a4e05a87ff..7a6ff4cfa2 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowablePublishTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowablePublishTest.java @@ -13,20 +13,20 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; import io.reactivex.rxjava4.flowables.ConnectableFlowable; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.internal.fuseable.HasUpstreamPublisher; import io.reactivex.rxjava4.internal.operators.flowable.FlowablePublish.*; @@ -1389,13 +1389,15 @@ public void disposeResets() { ts.assertValuesOnly(1); } - @Test(expected = TestException.class) + @Test public void connectDisposeCrash() { - ConnectableFlowable cf = Flowable.never().publish(); + assertThrows(TestException.class, () -> { + ConnectableFlowable cf = Flowable.never().publish(); - cf.connect(); + cf.connect(); - cf.connect(_ -> { throw new TestException(); }); + cf.connect(_ -> { throw new TestException(); }); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableRangeLongTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableRangeLongTest.java index e36b0723d6..780d88f242 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableRangeLongTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableRangeLongTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.*; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.atomic.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.internal.functions.Functions; @@ -78,9 +78,11 @@ public void rangeWithOverflow3() { Flowable.rangeLong(1, Long.MAX_VALUE); } - @Test(expected = IllegalArgumentException.class) + @Test public void rangeWithOverflow4() { - Flowable.rangeLong(2, Long.MAX_VALUE); + assertThrows(IllegalArgumentException.class, () -> { + Flowable.rangeLong(2, Long.MAX_VALUE); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableRangeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableRangeTest.java index e251078787..42d08c2353 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableRangeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableRangeTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.*; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.atomic.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.internal.functions.Functions; @@ -78,9 +78,11 @@ public void rangeWithOverflow3() { Flowable.range(1, Integer.MAX_VALUE); } - @Test(expected = IllegalArgumentException.class) + @Test public void rangeWithOverflow4() { - Flowable.range(2, Integer.MAX_VALUE); + assertThrows(IllegalArgumentException.class, () -> { + Flowable.range(2, Integer.MAX_VALUE); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableReduceTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableReduceTest.java index f8e1f42394..cbbb22a421 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableReduceTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableReduceTest.java @@ -13,16 +13,15 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.List; -import java.util.concurrent.Flow.Publisher; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.*; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -40,7 +39,7 @@ public class FlowableReduceTest extends RxJavaTest { SingleObserver singleObserver; - @Before + @BeforeEach public void before() { subscriber = TestHelper.mockSubscriber(); singleObserver = TestHelper.mockSingleObserver(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableReduceWithSingleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableReduceWithSingleTest.java index 8c042198e4..9df083c905 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableReduceWithSingleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableReduceWithSingleTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.internal.functions.Functions; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableRefCountTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableRefCountTest.java index 8db3a654fc..e907500da3 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableRefCountTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableRefCountTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -21,14 +21,14 @@ import java.lang.management.ManagementFactory; import java.util.*; import java.util.concurrent.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; import io.reactivex.rxjava4.flowables.ConnectableFlowable; import io.reactivex.rxjava4.functions.*; @@ -570,7 +570,7 @@ public void replayNoLeak() throws Exception { long after = TestHelper.awaitGC(GC_SLEEP_TIME, 20, start + 20 * 1000 * 1000); source = null; - assertTrue(String.format("%,3d -> %,3d%n", start, after), start + 20 * 1000 * 1000 > after); + assertTrue(start + 20 * 1000 * 1000 > after, String.format("%,3d -> %,3d%n", start, after)); } @Test @@ -597,7 +597,7 @@ public void replayNoLeak2() throws Exception { long after = TestHelper.awaitGC(GC_SLEEP_TIME, 20, start + 20 * 1000 * 1000); source = null; - assertTrue(String.format("%,3d -> %,3d%n", start, after), start + 20 * 1000 * 1000 > after); + assertTrue(start + 20 * 1000 * 1000 > after, String.format("%,3d -> %,3d%n", start, after)); } static final class ExceptionData extends Exception { @@ -632,7 +632,7 @@ public void publishNoLeak() throws Exception { source = null; - assertTrue(String.format("%,3d -> %,3d%n", start, after), start + 20 * 1000 * 1000 > after); + assertTrue(start + 20 * 1000 * 1000 > after, String.format("%,3d -> %,3d%n", start, after)); } @Test @@ -658,7 +658,7 @@ public void publishNoLeak2() throws Exception { long after = TestHelper.awaitGC(GC_SLEEP_TIME, 20, start + 20 * 1000 * 1000); source = null; - assertTrue(String.format("%,3d -> %,3d%n", start, after), start + 20 * 1000 * 1000 > after); + assertTrue(start + 20 * 1000 * 1000 > after, String.format("%,3d -> %,3d%n", start, after)); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableRepeatTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableRepeatTest.java index 1754953668..116207c997 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableRepeatTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableRepeatTest.java @@ -13,21 +13,21 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Flowable; import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.processors.PublishProcessor; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableReplayEagerTruncateTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableReplayEagerTruncateTest.java index 0a32f95f83..8a19a42fb9 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableReplayEagerTruncateTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableReplayEagerTruncateTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -21,11 +21,11 @@ import java.lang.management.*; import java.util.*; import java.util.concurrent.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; @@ -684,7 +684,7 @@ void truncate() { List values = new ArrayList<>(); buf.collect(values); - Assert.assertEquals(Arrays.asList(1, 2, 3, 4, 5), values); + assertEquals(Arrays.asList(1, 2, 3, 4, 5), values); buf.removeSome(2); buf.removeFirst(); @@ -692,13 +692,13 @@ void truncate() { values.clear(); buf.collect(values); - Assert.assertTrue(values.isEmpty()); + assertTrue(values.isEmpty()); buf.addLast(new Node(5, 5)); buf.addLast(new Node(6, 6)); buf.collect(values); - Assert.assertEquals(Arrays.asList(5, 6), values); + assertEquals(Arrays.asList(5, 6), values); } @Test @@ -712,30 +712,30 @@ public void timedAndSizedTruncation() { buf.next(2); test.advanceTimeBy(1, TimeUnit.SECONDS); buf.collect(values); - Assert.assertEquals(List.of(2), values); + assertEquals(List.of(2), values); buf.next(3); buf.next(4); values.clear(); buf.collect(values); - Assert.assertEquals(Arrays.asList(3, 4), values); + assertEquals(Arrays.asList(3, 4), values); test.advanceTimeBy(2, TimeUnit.SECONDS); buf.next(5); values.clear(); buf.collect(values); - Assert.assertEquals(List.of(5), values); + assertEquals(List.of(5), values); test.advanceTimeBy(2, TimeUnit.SECONDS); buf.complete(); values.clear(); buf.collect(values); - Assert.assertTrue(values.isEmpty()); + assertTrue(values.isEmpty()); - Assert.assertEquals(1, buf.size); - Assert.assertTrue(buf.hasCompleted()); + assertEquals(1, buf.size); + assertTrue(buf.hasCompleted()); } @Test @@ -761,7 +761,7 @@ public void backpressure() { ts2.assertValueCount(100); ts2.assertNotTerminated(); - Assert.assertEquals(100, requested.get()); + assertEquals(100, requested.get()); } @Test @@ -787,7 +787,7 @@ public void backpressureBounded() { ts2.assertValueCount(100); ts2.assertNotTerminated(); - Assert.assertEquals(100, requested.get()); + assertEquals(100, requested.get()); } @Test @@ -847,14 +847,14 @@ public void cache() throws InterruptedException { // subscribe once f.subscribe(v -> { - Assert.assertEquals("one", v); + assertEquals("one", v); System.out.println("v: " + v); latch.countDown(); }); // subscribe again f.subscribe(v -> { - Assert.assertEquals("one", v); + assertEquals("one", v); System.out.println("v: " + v); latch.countDown(); }); @@ -980,14 +980,14 @@ public void valuesAndThenError() { ts.assertValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); ts.assertNotComplete(); - Assert.assertEquals(1, ts.errors().size()); + assertEquals(1, ts.errors().size()); TestSubscriberEx ts2 = new TestSubscriberEx<>(); source.subscribe(ts2); ts2.assertValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); ts2.assertNotComplete(); - Assert.assertEquals(1, ts2.errors().size()); + assertEquals(1, ts2.errors().size()); } @Test @@ -1007,7 +1007,7 @@ public void onNext(Integer t) { source.subscribe(ts); - Assert.assertEquals(100, count.get()); + assertEquals(100, count.get()); ts.assertNoValues(); ts.assertNotComplete(); @@ -1030,7 +1030,7 @@ public void unboundedLeavesEarly() { out.subscribe(ts2); ts2.cancel(); - Assert.assertEquals(Arrays.asList(5L, 5L), requests); + assertEquals(Arrays.asList(5L, 5L), requests); } @Test @@ -1443,8 +1443,8 @@ public void timedAndSizedTruncationError() { TestScheduler test = new TestScheduler(); SizeAndTimeBoundReplayBuffer buf = new SizeAndTimeBoundReplayBuffer<>(2, 2000, TimeUnit.MILLISECONDS, test, true); - Assert.assertFalse(buf.hasCompleted()); - Assert.assertFalse(buf.hasError()); + assertFalse(buf.hasCompleted()); + assertFalse(buf.hasError()); List values = new ArrayList<>(); @@ -1453,33 +1453,33 @@ public void timedAndSizedTruncationError() { buf.next(2); test.advanceTimeBy(1, TimeUnit.SECONDS); buf.collect(values); - Assert.assertEquals(List.of(2), values); + assertEquals(List.of(2), values); buf.next(3); buf.next(4); values.clear(); buf.collect(values); - Assert.assertEquals(Arrays.asList(3, 4), values); + assertEquals(Arrays.asList(3, 4), values); test.advanceTimeBy(2, TimeUnit.SECONDS); buf.next(5); values.clear(); buf.collect(values); - Assert.assertEquals(List.of(5), values); - Assert.assertFalse(buf.hasCompleted()); - Assert.assertFalse(buf.hasError()); + assertEquals(List.of(5), values); + assertFalse(buf.hasCompleted()); + assertFalse(buf.hasError()); test.advanceTimeBy(2, TimeUnit.SECONDS); buf.error(new TestException()); values.clear(); buf.collect(values); - Assert.assertTrue(values.isEmpty()); + assertTrue(values.isEmpty()); - Assert.assertEquals(1, buf.size); - Assert.assertFalse(buf.hasCompleted()); - Assert.assertTrue(buf.hasError()); + assertEquals(1, buf.size); + assertFalse(buf.hasCompleted()); + assertTrue(buf.hasError()); } @Test @@ -1490,30 +1490,30 @@ public void sizedTruncation() { buf.next(1); buf.next(2); buf.collect(values); - Assert.assertEquals(Arrays.asList(1, 2), values); + assertEquals(Arrays.asList(1, 2), values); buf.next(3); buf.next(4); values.clear(); buf.collect(values); - Assert.assertEquals(Arrays.asList(3, 4), values); + assertEquals(Arrays.asList(3, 4), values); buf.next(5); values.clear(); buf.collect(values); - Assert.assertEquals(Arrays.asList(4, 5), values); - Assert.assertFalse(buf.hasCompleted()); + assertEquals(Arrays.asList(4, 5), values); + assertFalse(buf.hasCompleted()); buf.complete(); values.clear(); buf.collect(values); - Assert.assertEquals(Arrays.asList(4, 5), values); + assertEquals(Arrays.asList(4, 5), values); - Assert.assertEquals(3, buf.size); - Assert.assertTrue(buf.hasCompleted()); - Assert.assertFalse(buf.hasError()); + assertEquals(3, buf.size); + assertTrue(buf.hasCompleted()); + assertFalse(buf.hasError()); } @Test @@ -1739,12 +1739,14 @@ public void noHeadRetentionTime() { assertSame(o, buf.get()); } - @Test(expected = TestException.class) + @Test public void createBufferFactoryCrash() { - FlowableReplay.create(Flowable.just(1), () -> { - throw new TestException(); - }) - .connect(); + assertThrows(TestException.class, () -> { + FlowableReplay.create(Flowable.just(1), () -> { + throw new TestException(); + }) + .connect(); + }); } @Test @@ -1796,7 +1798,7 @@ public void noBoundedRetentionViaThreadLocal() throws Exception { System.out.printf("Bounded Replay Leak check: After: %.3f MB%n", after.get() / 1024.0 / 1024.0); if (initial + 100 * 1024 * 1024 < after.get()) { - Assert.fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + " -> " + after.get() / 1024.0 / 1024.0); } } @@ -1839,7 +1841,7 @@ public void sizeBoundEagerTruncate() throws Exception { System.out.printf("Bounded Replay Leak check: After: %.3f MB%n", after / 1024.0 / 1024.0); if (initial + 100 * 1024 * 1024 < after) { - Assert.fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + " -> " + after / 1024.0 / 1024.0); } } @@ -1886,7 +1888,7 @@ public void timeBoundEagerTruncate() throws Exception { System.out.printf("Bounded Replay Leak check: After: %.3f MB%n", after / 1024.0 / 1024.0); if (initial + 100 * 1024 * 1024 < after) { - Assert.fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + " -> " + after / 1024.0 / 1024.0); } } @@ -1933,7 +1935,7 @@ public void timeAndSizeBoundEagerTruncate() throws Exception { System.out.printf("Bounded Replay Leak check: After: %.3f MB%n", after / 1024.0 / 1024.0); if (initial + 100 * 1024 * 1024 < after) { - Assert.fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + " -> " + after / 1024.0 / 1024.0); } } @@ -1974,7 +1976,7 @@ public void sizeBoundSelectorEagerTruncate() throws Exception { System.out.printf("Bounded Replay Leak check: After: %.3f MB%n", after / 1024.0 / 1024.0); if (initial + 100 * 1024 * 1024 < after) { - Assert.fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + " -> " + after / 1024.0 / 1024.0); } } @@ -2019,7 +2021,7 @@ public void timeBoundSelectorEagerTruncate() throws Exception { System.out.printf("Bounded Replay Leak check: After: %.3f MB%n", after / 1024.0 / 1024.0); if (initial + 100 * 1024 * 1024 < after) { - Assert.fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + " -> " + after / 1024.0 / 1024.0); } } @@ -2064,7 +2066,7 @@ public void timeAndSizeBoundSelectorEagerTruncate() throws Exception { System.out.printf("Bounded Replay Leak check: After: %.3f MB%n", after / 1024.0 / 1024.0); if (initial + 100 * 1024 * 1024 < after) { - Assert.fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + " -> " + after / 1024.0 / 1024.0); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableReplayTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableReplayTest.java index 76470bd203..52df8040de 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableReplayTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableReplayTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -21,11 +21,11 @@ import java.lang.management.*; import java.util.*; import java.util.concurrent.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; @@ -686,7 +686,7 @@ void truncate() { List values = new ArrayList<>(); buf.collect(values); - Assert.assertEquals(Arrays.asList(1, 2, 3, 4, 5), values); + assertEquals(Arrays.asList(1, 2, 3, 4, 5), values); buf.removeSome(2); buf.removeFirst(); @@ -694,28 +694,30 @@ void truncate() { values.clear(); buf.collect(values); - Assert.assertTrue(values.isEmpty()); + assertTrue(values.isEmpty()); buf.addLast(new Node(5, 5)); buf.addLast(new Node(6, 6)); buf.collect(values); - Assert.assertEquals(Arrays.asList(5, 6), values); + assertEquals(Arrays.asList(5, 6), values); } - @Test(expected = IllegalStateException.class) + @Test public void boundedRemoveFirstOneItemOnly() { - var buf = new BoundedReplayBuffer(false) /* NFI */ { - @Serial - private static final long serialVersionUID = -9081211580719235896L; + assertThrows(IllegalStateException.class, () -> { + var buf = new BoundedReplayBuffer(false) /* NFI */ { + @Serial + private static final long serialVersionUID = -9081211580719235896L; - @Override - void truncate() { - } - }; + @Override + void truncate() { + } + }; - buf.removeFirst(); + buf.removeFirst(); + }); } @Test @@ -729,30 +731,30 @@ public void timedAndSizedTruncation() { buf.next(2); test.advanceTimeBy(1, TimeUnit.SECONDS); buf.collect(values); - Assert.assertEquals(List.of(2), values); + assertEquals(List.of(2), values); buf.next(3); buf.next(4); values.clear(); buf.collect(values); - Assert.assertEquals(Arrays.asList(3, 4), values); + assertEquals(Arrays.asList(3, 4), values); test.advanceTimeBy(2, TimeUnit.SECONDS); buf.next(5); values.clear(); buf.collect(values); - Assert.assertEquals(List.of(5), values); + assertEquals(List.of(5), values); test.advanceTimeBy(2, TimeUnit.SECONDS); buf.complete(); values.clear(); buf.collect(values); - Assert.assertTrue(values.isEmpty()); + assertTrue(values.isEmpty()); - Assert.assertEquals(1, buf.size); - Assert.assertTrue(buf.hasCompleted()); + assertEquals(1, buf.size); + assertTrue(buf.hasCompleted()); } @Test @@ -778,7 +780,7 @@ public void backpressure() { ts2.assertValueCount(100); ts2.assertNotTerminated(); - Assert.assertEquals(100, requested.get()); + assertEquals(100, requested.get()); } @Test @@ -804,7 +806,7 @@ public void backpressureBounded() { ts2.assertValueCount(100); ts2.assertNotTerminated(); - Assert.assertEquals(100, requested.get()); + assertEquals(100, requested.get()); } @Test @@ -864,14 +866,14 @@ public void cache() throws InterruptedException { // subscribe once f.subscribe(v -> { - Assert.assertEquals("one", v); + assertEquals("one", v); System.out.println("v: " + v); latch.countDown(); }); // subscribe again f.subscribe(v -> { - Assert.assertEquals("one", v); + assertEquals("one", v); System.out.println("v: " + v); latch.countDown(); }); @@ -999,14 +1001,14 @@ public void valuesAndThenError() { ts.assertValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); ts.assertNotComplete(); - Assert.assertEquals(1, ts.errors().size()); + assertEquals(1, ts.errors().size()); TestSubscriberEx ts2 = new TestSubscriberEx<>(); source.subscribe(ts2); ts2.assertValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); ts2.assertNotComplete(); - Assert.assertEquals(1, ts2.errors().size()); + assertEquals(1, ts2.errors().size()); } @Test @@ -1026,7 +1028,7 @@ public void onNext(Integer t) { source.subscribe(ts); - Assert.assertEquals(100, count.get()); + assertEquals(100, count.get()); ts.assertNoValues(); ts.assertNotComplete(); @@ -1095,7 +1097,7 @@ public void unboundedLeavesEarly() { out.subscribe(ts2); ts2.cancel(); - Assert.assertEquals(Arrays.asList(5L, 5L), requests); + assertEquals(Arrays.asList(5L, 5L), requests); } @Test @@ -1508,8 +1510,8 @@ public void timedAndSizedTruncationError() { TestScheduler test = new TestScheduler(); SizeAndTimeBoundReplayBuffer buf = new SizeAndTimeBoundReplayBuffer<>(2, 2000, TimeUnit.MILLISECONDS, test, false); - Assert.assertFalse(buf.hasCompleted()); - Assert.assertFalse(buf.hasError()); + assertFalse(buf.hasCompleted()); + assertFalse(buf.hasError()); List values = new ArrayList<>(); @@ -1518,33 +1520,33 @@ public void timedAndSizedTruncationError() { buf.next(2); test.advanceTimeBy(1, TimeUnit.SECONDS); buf.collect(values); - Assert.assertEquals(List.of(2), values); + assertEquals(List.of(2), values); buf.next(3); buf.next(4); values.clear(); buf.collect(values); - Assert.assertEquals(Arrays.asList(3, 4), values); + assertEquals(Arrays.asList(3, 4), values); test.advanceTimeBy(2, TimeUnit.SECONDS); buf.next(5); values.clear(); buf.collect(values); - Assert.assertEquals(List.of(5), values); - Assert.assertFalse(buf.hasCompleted()); - Assert.assertFalse(buf.hasError()); + assertEquals(List.of(5), values); + assertFalse(buf.hasCompleted()); + assertFalse(buf.hasError()); test.advanceTimeBy(2, TimeUnit.SECONDS); buf.error(new TestException()); values.clear(); buf.collect(values); - Assert.assertTrue(values.isEmpty()); + assertTrue(values.isEmpty()); - Assert.assertEquals(1, buf.size); - Assert.assertFalse(buf.hasCompleted()); - Assert.assertTrue(buf.hasError()); + assertEquals(1, buf.size); + assertFalse(buf.hasCompleted()); + assertTrue(buf.hasError()); } @Test @@ -1555,30 +1557,30 @@ public void sizedTruncation() { buf.next(1); buf.next(2); buf.collect(values); - Assert.assertEquals(Arrays.asList(1, 2), values); + assertEquals(Arrays.asList(1, 2), values); buf.next(3); buf.next(4); values.clear(); buf.collect(values); - Assert.assertEquals(Arrays.asList(3, 4), values); + assertEquals(Arrays.asList(3, 4), values); buf.next(5); values.clear(); buf.collect(values); - Assert.assertEquals(Arrays.asList(4, 5), values); - Assert.assertFalse(buf.hasCompleted()); + assertEquals(Arrays.asList(4, 5), values); + assertFalse(buf.hasCompleted()); buf.complete(); values.clear(); buf.collect(values); - Assert.assertEquals(Arrays.asList(4, 5), values); + assertEquals(Arrays.asList(4, 5), values); - Assert.assertEquals(3, buf.size); - Assert.assertTrue(buf.hasCompleted()); - Assert.assertFalse(buf.hasError()); + assertEquals(3, buf.size); + assertTrue(buf.hasCompleted()); + assertFalse(buf.hasError()); } @Test @@ -1804,12 +1806,14 @@ public void noHeadRetentionTime() { assertSame(o, buf.get()); } - @Test(expected = TestException.class) + @Test public void createBufferFactoryCrash() { - FlowableReplay.create(Flowable.just(1), () -> { - throw new TestException(); - }) - .connect(); + assertThrows(TestException.class, () -> { + FlowableReplay.create(Flowable.just(1), () -> { + throw new TestException(); + }) + .connect(); + }); } @Test @@ -1861,7 +1865,7 @@ public void noBoundedRetentionViaThreadLocal() throws Exception { System.out.printf("Bounded Replay Leak check: After: %.3f MB%n", after.get() / 1024.0 / 1024.0); if (initial + 100 * 1024 * 1024 < after.get()) { - Assert.fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + " -> " + after.get() / 1024.0 / 1024.0); } } @@ -1883,7 +1887,7 @@ public void onNext(Integer t) { source.subscribe(ts); - Assert.assertEquals(100, count.get()); + assertEquals(100, count.get()); ts.assertNoValues(); ts.assertNotComplete(); @@ -1936,13 +1940,15 @@ public void onComplete() { }); } - @Test(expected = TestException.class) + @Test public void connectDisposeCrash() { - ConnectableFlowable cf = Flowable.never().replay(); + assertThrows(TestException.class, () -> { + ConnectableFlowable cf = Flowable.never().replay(); - cf.connect(); + cf.connect(); - cf.connect(_ -> { throw new TestException(); }); + cf.connect(_ -> { throw new TestException(); }); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableRetryTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableRetryTest.java index 1bece5f61e..3d9c5f488c 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableRetryTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableRetryTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -22,7 +22,7 @@ import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.*; import io.reactivex.rxjava4.core.*; @@ -210,8 +210,8 @@ public void singleSubscriptionOnFirst() throws Exception { .retryWhen(attempt -> attempt.zipWith(Flowable.just(1), (_, _) -> 0)) .blockingFirst(); - assertEquals("Observer did not receive the expected output", 1, first); - assertEquals("Subscribe was not called once", 1, inc.get()); + assertEquals(1, first, "Observer did not receive the expected output"); + assertEquals(1, inc.get(), "Subscribe was not called once"); } @Test @@ -608,8 +608,8 @@ public void unsubscribeAfterError() { inOrder.verify(subscriber, times(1)).onError(any(Throwable.class)); inOrder.verify(subscriber, never()).onComplete(); - assertEquals("Start 6 threads, retry 5 then fail on 6", 6, so.efforts.get()); - assertEquals("Only 1 active subscription", 1, so.maxActive.get()); + assertEquals(6, so.efforts.get(), "Start 6 threads, retry 5 then fail on 6"); + assertEquals(1, so.maxActive.get(), "Only 1 active subscription"); } @Test @@ -632,7 +632,7 @@ public void timeoutWithRetry() { inOrder.verify(subscriber, times(1)).onError(any(Throwable.class)); inOrder.verify(subscriber, never()).onComplete(); - assertEquals("Start 6 threads, retry 5 then fail on 6", 6, sf.efforts.get()); + assertEquals(6, sf.efforts.get(), "Start 6 threads, retry 5 then fail on 6"); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableRetryWithPredicateTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableRetryWithPredicateTest.java index 1dfc02df5a..db598444b2 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableRetryWithPredicateTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableRetryWithPredicateTest.java @@ -13,18 +13,18 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.io.IOException; import java.util.*; import java.util.concurrent.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; @@ -227,8 +227,8 @@ public void unsubscribeAfterError() { inOrder.verify(subscriber, times(1)).onError(any(Throwable.class)); inOrder.verify(subscriber, never()).onComplete(); - assertEquals("Start 6 threads, retry 5 then fail on 6", 6, so.efforts.get()); - assertEquals("Only 1 active subscription", 1, so.maxActive.get()); + assertEquals(6, so.efforts.get(), "Start 6 threads, retry 5 then fail on 6"); + assertEquals(1, so.maxActive.get(), "Only 1 active subscription"); } @Test @@ -254,7 +254,7 @@ public void timeoutWithRetry() { inOrder.verify(subscriber, times(1)).onError(any(Throwable.class)); inOrder.verify(subscriber, never()).onComplete(); - assertEquals("Start 6 threads, retry 5 then fail on 6", 6, so.efforts.get()); + assertEquals(6, so.efforts.get(), "Start 6 threads, retry 5 then fail on 6"); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSampleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSampleTest.java index 76d3c3a2ff..e2a2b13667 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSampleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSampleTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.TimeUnit; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.SampleConfig; @@ -39,7 +39,7 @@ public class FlowableSampleTest extends RxJavaTest { private Subscriber subscriber; private Subscriber subscriber2; - @Before + @BeforeEach // due to mocking public void before() { scheduler = new TestScheduler(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableScalarXMapTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableScalarXMapTest.java index 227584bcbc..054be207f1 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableScalarXMapTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableScalarXMapTest.java @@ -13,10 +13,11 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import java.util.concurrent.Flow.*; + +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableScanTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableScanTest.java index adb6b57376..863f275166 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableScanTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableScanTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -22,7 +22,7 @@ import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.*; import io.reactivex.rxjava4.core.*; @@ -122,7 +122,7 @@ public void onComplete() { @Override public void onError(Throwable e) { - Assert.fail(e.getMessage()); + fail(e.getMessage()); e.printStackTrace(); } @@ -156,7 +156,7 @@ public void onComplete() { @Override public void onError(Throwable e) { - Assert.fail(e.getMessage()); + fail(e.getMessage()); e.printStackTrace(); } @@ -185,7 +185,7 @@ public void onComplete() { @Override public void onError(Throwable e) { - Assert.fail(e.getMessage()); + fail(e.getMessage()); e.printStackTrace(); } @@ -374,8 +374,8 @@ public void scanWithSeedDoesNotEmitErrorTwiceIfScanFunctionThrows() { .assertValues(0) .assertError(e); - assertEquals("" + list, 1, list.size()); - assertTrue("" + list, list.getFirst() instanceof UndeliverableException); + assertEquals(1, list.size(), "" + list); + assertTrue(list.getFirst() instanceof UndeliverableException, "" + list); assertEquals(e2, list.getFirst().getCause()); } finally { RxJavaPlugins.reset(); @@ -447,8 +447,8 @@ public void scanNoSeedDoesNotEmitErrorTwiceIfScanFunctionThrows() { .assertValue(1) .assertError(e); - assertEquals("" + list, 1, list.size()); - assertTrue("" + list, list.getFirst() instanceof UndeliverableException); + assertEquals(1, list.size(), "" + list); + assertTrue(list.getFirst() instanceof UndeliverableException, "" + list); assertEquals(e2, list.getFirst().getCause()); } finally { RxJavaPlugins.reset(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSequenceEqualTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSequenceEqualTest.java index b5be0ab983..7fd58f10a4 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSequenceEqualTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSequenceEqualTest.java @@ -20,7 +20,7 @@ import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSerializeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSerializeTest.java index 4dc84bdeee..56441c4ac0 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSerializeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSerializeTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.concurrent.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.*; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; @@ -32,7 +32,7 @@ public class FlowableSerializeTest extends RxJavaTest { Subscriber subscriber; - @Before + @BeforeEach public void before() { subscriber = TestHelper.mockSubscriber(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSingleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSingleTest.java index c5a4c71f65..5feff5e87e 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSingleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSingleTest.java @@ -13,19 +13,19 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.processors.PublishProcessor; import io.reactivex.rxjava4.subscribers.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSkipLastTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSkipLastTest.java index 2c26465214..8ebf8862e6 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSkipLastTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSkipLastTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.Arrays; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -97,9 +97,11 @@ public void skipLastWithBackpressure() { } - @Test(expected = IllegalArgumentException.class) + @Test public void skipLastWithNegativeCount() { - Flowable.just("one").skipLast(-1); + assertThrows(IllegalArgumentException.class, () -> { + Flowable.just("one").skipLast(-1); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSkipLastTimedTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSkipLastTimedTest.java index 0ad8aabeb4..0a58923d05 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSkipLastTimedTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSkipLastTimedTest.java @@ -19,7 +19,7 @@ import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSkipTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSkipTest.java index 6ac0ae5751..c54e611de0 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSkipTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSkipTest.java @@ -13,36 +13,37 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.Arrays; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.subscribers.TestSubscriber; import io.reactivex.rxjava4.testsupport.*; public class FlowableSkipTest extends RxJavaTest { - @Test(expected = IllegalArgumentException.class) + @Test public void skipNegativeElements() { - - Flowable skip = Flowable.just("one", "two", "three").skip(-99); - - Subscriber subscriber = TestHelper.mockSubscriber(); - skip.subscribe(subscriber); - verify(subscriber, times(1)).onNext("one"); - verify(subscriber, times(1)).onNext("two"); - verify(subscriber, times(1)).onNext("three"); - verify(subscriber, never()).onError(any(Throwable.class)); - verify(subscriber, times(1)).onComplete(); + assertThrows(IllegalArgumentException.class, () -> { + Flowable skip = Flowable.just("one", "two", "three").skip(-99); + + Subscriber subscriber = TestHelper.mockSubscriber(); + skip.subscribe(subscriber); + verify(subscriber, times(1)).onNext("one"); + verify(subscriber, times(1)).onNext("two"); + verify(subscriber, times(1)).onNext("three"); + verify(subscriber, never()).onError(any(Throwable.class)); + verify(subscriber, times(1)).onComplete(); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSkipTimedTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSkipTimedTest.java index ba4182dc83..ad51393c64 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSkipTimedTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSkipTimedTest.java @@ -16,11 +16,11 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSkipUntilTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSkipUntilTest.java index 0780b7e7c2..b7483b6906 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSkipUntilTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSkipUntilTest.java @@ -16,8 +16,9 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -import org.junit.*; -import static java.util.concurrent.Flow.*; +import java.util.concurrent.Flow.Subscriber; + +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.functions.Function; @@ -27,7 +28,7 @@ public class FlowableSkipUntilTest extends RxJavaTest { Subscriber subscriber; - @Before + @BeforeEach public void before() { subscriber = TestHelper.mockSubscriber(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSkipWhileTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSkipWhileTest.java index 4cbfd61aec..e7b569a824 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSkipWhileTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSkipWhileTest.java @@ -16,9 +16,10 @@ import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; -import org.junit.Test; +import java.util.concurrent.Flow.Subscriber; + +import org.junit.jupiter.api.Test; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableStartWithTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableStartWithTest.java index dcfde64cf1..1c62a562e9 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableStartWithTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableStartWithTest.java @@ -15,7 +15,7 @@ import static org.mockito.Mockito.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSubscribeOnTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSubscribeOnTest.java index 4bd5d8f042..d67c0dadd2 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSubscribeOnTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSubscribeOnTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; @@ -304,7 +304,7 @@ public void nonScheduledRequests() { int c = ts.values().size(); - assertTrue("" + c, c > Flowable.bufferSize()); + assertTrue(c > Flowable.bufferSize(), "" + c); } @Test @@ -345,7 +345,7 @@ public void nonScheduledRequestsNotSubsequentSubscribeOn() { int c = ts.values().size(); - assertTrue("" + c, c > Flowable.bufferSize()); + assertTrue(c > Flowable.bufferSize(), "" + c); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSwitchIfEmptyTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSwitchIfEmptyTest.java index 8feb14d0bb..2a747c4681 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSwitchIfEmptyTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSwitchIfEmptyTest.java @@ -13,15 +13,14 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import java.util.Arrays; -import java.util.List; +import java.util.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSwitchTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSwitchTest.java index 23e6661351..0db2d13fc8 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSwitchTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableSwitchTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; @@ -44,7 +44,7 @@ public class FlowableSwitchTest extends RxJavaTest { private Scheduler.Worker innerScheduler; private Subscriber subscriber; - @Before + @BeforeEach public void before() { scheduler = new TestScheduler(); innerScheduler = scheduler.createWorker(); @@ -419,7 +419,7 @@ public void unsubscribe() { isUnsubscribed.set(bs.isCancelled()); }) ).take(1).subscribe(); - assertTrue("Switch doesn't propagate 'unsubscribe'", isUnsubscribed.get()); + assertTrue(isUnsubscribed.get(), "Switch doesn't propagate 'unsubscribe'"); } /** The upstream producer hijacked the switch producer stopping the requests aimed at the inner observables. */ @Test @@ -451,7 +451,7 @@ public void onNext(String t) { ts.assertTerminated(); ts.assertNoErrors(); - Assert.assertEquals(250, ts.values().size()); + assertEquals(250, ts.values().size()); } @Test @@ -669,7 +669,7 @@ public void nextSourceErrorRace() { TestHelper.race(r1, r2); for (Throwable e : errors) { - assertTrue(e.toString(), e instanceof TestException); + assertTrue(e instanceof TestException, e.toString()); } } finally { RxJavaPlugins.reset(); @@ -705,7 +705,7 @@ public void outerInnerErrorRace() { TestHelper.race(r1, r2); for (Throwable e : errors) { - assertTrue(e.toString(), e instanceof TestException); + assertTrue(e instanceof TestException, e.toString()); } } finally { RxJavaPlugins.reset(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTake2Test.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTake2Test.java index 56c82dbf7a..ed844eaaa6 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTake2Test.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTake2Test.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; +import java.util.concurrent.Flow.Subscriber; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeLastOneTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeLastOneTest.java index f017568cb1..07f45b1826 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeLastOneTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeLastOneTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeLastTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeLastTest.java index 05c1d80cc6..898da19f72 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeLastTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeLastTest.java @@ -13,22 +13,22 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.schedulers.Schedulers; import io.reactivex.rxjava4.subscribers.*; import io.reactivex.rxjava4.testsupport.TestHelper; @@ -90,9 +90,11 @@ public void takeLastWithZeroCount() { verify(subscriber, times(1)).onComplete(); } - @Test(expected = IllegalArgumentException.class) + @Test public void takeLastWithNegativeCount() { - Flowable.just("one").takeLast(-1); + assertThrows(IllegalArgumentException.class, () -> { + Flowable.just("one").takeLast(-1); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeLastTimedTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeLastTimedTest.java index 344cd7d36f..61b92a0061 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeLastTimedTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeLastTimedTest.java @@ -13,13 +13,14 @@ package io.reactivex.rxjava4.internal.operators.flowable; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; @@ -32,9 +33,11 @@ public class FlowableTakeLastTimedTest extends RxJavaTest { - @Test(expected = IllegalArgumentException.class) + @Test public void takeLastTimedWithNegativeCount() { - Flowable.just("one").takeLast(-1, 1, TimeUnit.SECONDS); + assertThrows(IllegalArgumentException.class, () -> { + Flowable.just("one").takeLast(-1, 1, TimeUnit.SECONDS); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeTest.java index 4966cfb488..0de5b7f7f4 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeTest.java @@ -13,21 +13,21 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.*; import java.util.concurrent.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.processors.PublishProcessor; @@ -67,12 +67,14 @@ public void take2() { verify(subscriber, times(1)).onComplete(); } - @Test(expected = IllegalArgumentException.class) + @Test public void takeWithError() { - Flowable.fromIterable(Arrays.asList(1, 2, 3)).take(1) - .map((Function) _ -> { - throw new IllegalArgumentException("some error"); - }).blockingSingle(); + assertThrows(IllegalArgumentException.class, () -> { + Flowable.fromIterable(Arrays.asList(1, 2, 3)).take(1) + .map((Function) _ -> { + throw new IllegalArgumentException("some error"); + }).blockingSingle(); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeTimedTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeTimedTest.java index 03eb77a8e9..63b9eb1794 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeTimedTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeTimedTest.java @@ -16,11 +16,11 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeUntilPredicateTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeUntilPredicateTest.java index 18a6da09aa..66345bec72 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeUntilPredicateTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeUntilPredicateTest.java @@ -17,9 +17,9 @@ import static org.mockito.Mockito.*; import java.util.List; +import java.util.concurrent.Flow.Subscriber; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeUntilTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeUntilTest.java index e869356411..b11306f656 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeUntilTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeUntilTest.java @@ -13,11 +13,12 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import java.util.concurrent.Flow.*; + +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -206,9 +207,9 @@ public void untilFires() { ts.assertNoErrors(); ts.assertTerminated(); - assertFalse("Source still has observers", source.hasSubscribers()); - assertFalse("Until still has observers", until.hasSubscribers()); - assertFalse("TestSubscriber is unsubscribed", ts.isCancelled()); + assertFalse(source.hasSubscribers(), "Source still has observers"); + assertFalse(until.hasSubscribers(), "Until still has observers"); + assertFalse(ts.isCancelled(), "TestSubscriber is unsubscribed"); } @Test @@ -230,9 +231,9 @@ public void mainCompletes() { ts.assertNoErrors(); ts.assertTerminated(); - assertFalse("Source still has observers", source.hasSubscribers()); - assertFalse("Until still has observers", until.hasSubscribers()); - assertFalse("TestSubscriber is unsubscribed", ts.isCancelled()); + assertFalse(source.hasSubscribers(), "Source still has observers"); + assertFalse(until.hasSubscribers(), "Until still has observers"); + assertFalse(ts.isCancelled(), "TestSubscriber is unsubscribed"); } @Test @@ -253,9 +254,9 @@ public void downstreamUnsubscribes() { ts.assertNoErrors(); ts.assertTerminated(); - assertFalse("Source still has observers", source.hasSubscribers()); - assertFalse("Until still has observers", until.hasSubscribers()); - assertFalse("TestSubscriber is unsubscribed", ts.isCancelled()); + assertFalse(source.hasSubscribers(), "Source still has observers"); + assertFalse(until.hasSubscribers(), "Until still has observers"); + assertFalse(ts.isCancelled(), "TestSubscriber is unsubscribed"); } @Test @@ -279,8 +280,8 @@ public void backpressure() { ts.assertComplete(); ts.assertNoErrors(); - assertFalse("Until still has observers", until.hasSubscribers()); - assertFalse("TestSubscriber is unsubscribed", ts.isCancelled()); + assertFalse(until.hasSubscribers(), "Until still has observers"); + assertFalse(ts.isCancelled(), "TestSubscriber is unsubscribed"); } @Test @@ -300,15 +301,15 @@ public void untilPublisherMainSuccess() { TestSubscriber ts = main.takeUntil(other).test(); - assertTrue("Main no subscribers?", main.hasSubscribers()); - assertTrue("Other no subscribers?", other.hasSubscribers()); + assertTrue(main.hasSubscribers(), "Main no subscribers?"); + assertTrue(other.hasSubscribers(), "Other no subscribers?"); main.onNext(1); main.onNext(2); main.onComplete(); - assertFalse("Main has subscribers?", main.hasSubscribers()); - assertFalse("Other has subscribers?", other.hasSubscribers()); + assertFalse(main.hasSubscribers(), "Main has subscribers?"); + assertFalse(other.hasSubscribers(), "Other has subscribers?"); ts.assertResult(1, 2); } @@ -320,13 +321,13 @@ public void untilPublisherMainComplete() { TestSubscriber ts = main.takeUntil(other).test(); - assertTrue("Main no subscribers?", main.hasSubscribers()); - assertTrue("Other no subscribers?", other.hasSubscribers()); + assertTrue(main.hasSubscribers(), "Main no subscribers?"); + assertTrue(other.hasSubscribers(), "Other no subscribers?"); main.onComplete(); - assertFalse("Main has subscribers?", main.hasSubscribers()); - assertFalse("Other has subscribers?", other.hasSubscribers()); + assertFalse(main.hasSubscribers(), "Main has subscribers?"); + assertFalse(other.hasSubscribers(), "Other has subscribers?"); ts.assertResult(); } @@ -338,13 +339,13 @@ public void untilPublisherMainError() { TestSubscriber ts = main.takeUntil(other).test(); - assertTrue("Main no subscribers?", main.hasSubscribers()); - assertTrue("Other no subscribers?", other.hasSubscribers()); + assertTrue(main.hasSubscribers(), "Main no subscribers?"); + assertTrue(other.hasSubscribers(), "Other no subscribers?"); main.onError(new TestException()); - assertFalse("Main has subscribers?", main.hasSubscribers()); - assertFalse("Other has subscribers?", other.hasSubscribers()); + assertFalse(main.hasSubscribers(), "Main has subscribers?"); + assertFalse(other.hasSubscribers(), "Other has subscribers?"); ts.assertFailure(TestException.class); } @@ -356,13 +357,13 @@ public void untilPublisherOtherOnNext() { TestSubscriber ts = main.takeUntil(other).test(); - assertTrue("Main no subscribers?", main.hasSubscribers()); - assertTrue("Other no subscribers?", other.hasSubscribers()); + assertTrue(main.hasSubscribers(), "Main no subscribers?"); + assertTrue(other.hasSubscribers(), "Other no subscribers?"); other.onNext(1); - assertFalse("Main has subscribers?", main.hasSubscribers()); - assertFalse("Other has subscribers?", other.hasSubscribers()); + assertFalse(main.hasSubscribers(), "Main has subscribers?"); + assertFalse(other.hasSubscribers(), "Other has subscribers?"); ts.assertResult(); } @@ -374,13 +375,13 @@ public void untilPublisherOtherOnComplete() { TestSubscriber ts = main.takeUntil(other).test(); - assertTrue("Main no subscribers?", main.hasSubscribers()); - assertTrue("Other no subscribers?", other.hasSubscribers()); + assertTrue(main.hasSubscribers(), "Main no subscribers?"); + assertTrue(other.hasSubscribers(), "Other no subscribers?"); other.onComplete(); - assertFalse("Main has subscribers?", main.hasSubscribers()); - assertFalse("Other has subscribers?", other.hasSubscribers()); + assertFalse(main.hasSubscribers(), "Main has subscribers?"); + assertFalse(other.hasSubscribers(), "Other has subscribers?"); ts.assertResult(); } @@ -392,13 +393,13 @@ public void untilPublisherOtherError() { TestSubscriber ts = main.takeUntil(other).test(); - assertTrue("Main no subscribers?", main.hasSubscribers()); - assertTrue("Other no subscribers?", other.hasSubscribers()); + assertTrue(main.hasSubscribers(), "Main no subscribers?"); + assertTrue(other.hasSubscribers(), "Other no subscribers?"); other.onError(new TestException()); - assertFalse("Main has subscribers?", main.hasSubscribers()); - assertFalse("Other has subscribers?", other.hasSubscribers()); + assertFalse(main.hasSubscribers(), "Main has subscribers?"); + assertFalse(other.hasSubscribers(), "Other has subscribers?"); ts.assertFailure(TestException.class); } @@ -410,13 +411,13 @@ public void untilPublisherDispose() { TestSubscriber ts = main.takeUntil(other).test(); - assertTrue("Main no subscribers?", main.hasSubscribers()); - assertTrue("Other no subscribers?", other.hasSubscribers()); + assertTrue(main.hasSubscribers(), "Main no subscribers?"); + assertTrue(other.hasSubscribers(), "Other no subscribers?"); ts.cancel(); - assertFalse("Main has subscribers?", main.hasSubscribers()); - assertFalse("Other has subscribers?", other.hasSubscribers()); + assertFalse(main.hasSubscribers(), "Main has subscribers?"); + assertFalse(other.hasSubscribers(), "Other has subscribers?"); ts.assertEmpty(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeWhileTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeWhileTest.java index 4f1b5df051..198edf01f5 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeWhileTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTakeWhileTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.List; +import java.util.concurrent.Flow.*; -import org.junit.*; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -228,7 +228,7 @@ public void noUnsubscribeDownstream() { ts.assertNoErrors(); ts.assertValue(1); - Assert.assertFalse("Unsubscribed!", ts.isCancelled()); + assertFalse(ts.isCancelled(), "Unsubscribed!"); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableThrottleFirstTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableThrottleFirstTest.java index c27754155f..4dc38913fa 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableThrottleFirstTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableThrottleFirstTest.java @@ -17,15 +17,15 @@ import static org.mockito.Mockito.*; import java.util.List; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.TimeUnit; -import io.reactivex.rxjava4.functions.Action; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; +import io.reactivex.rxjava4.functions.Action; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.processors.PublishProcessor; @@ -38,7 +38,7 @@ public class FlowableThrottleFirstTest extends RxJavaTest { private Scheduler.Worker innerScheduler; private Subscriber subscriber; - @Before + @BeforeEach public void before() { scheduler = new TestScheduler(); innerScheduler = scheduler.createWorker(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableThrottleLatestTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableThrottleLatestTest.java index 20be724c77..deacc96527 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableThrottleLatestTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableThrottleLatestTest.java @@ -17,7 +17,7 @@ import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.SampleConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTimeIntervalTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTimeIntervalTest.java index 00912ac770..30359a3717 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTimeIntervalTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTimeIntervalTest.java @@ -15,11 +15,11 @@ import static org.mockito.Mockito.*; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.TimeUnit; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -38,7 +38,7 @@ public class FlowableTimeIntervalTest extends RxJavaTest { private PublishProcessor processor; private Flowable> flowable; - @Before + @BeforeEach public void setUp() { subscriber = TestHelper.mockSubscriber(); testScheduler = new TestScheduler(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTimeoutTests.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTimeoutTests.java index 48403b9047..e3337678c2 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTimeoutTests.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTimeoutTests.java @@ -14,23 +14,23 @@ package io.reactivex.rxjava4.internal.operators.flowable; import static io.reactivex.rxjava4.internal.util.ExceptionHelper.timeoutMessage; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.List; import java.util.concurrent.*; +import java.util.concurrent.Flow.*; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.processors.PublishProcessor; -import io.reactivex.rxjava4.schedulers.*; +import io.reactivex.rxjava4.schedulers.TestScheduler; import io.reactivex.rxjava4.subscribers.TestSubscriber; import io.reactivex.rxjava4.testsupport.*; @@ -41,7 +41,7 @@ public class FlowableTimeoutTests extends RxJavaTest { private static final long TIMEOUT = 3; private static final TimeUnit TIME_UNIT = TimeUnit.SECONDS; - @Before + @BeforeEach public void setUp() { underlyingSubject = PublishProcessor.create(); @@ -483,7 +483,7 @@ public void onNextOnTimeoutRaceFallback() { int c = ts.values().size(); if (c == 1) { int v = ts.values().getFirst(); - assertTrue("" + v, v == 1 || v == 2); + assertTrue(v == 1 || v == 2, "" + v); } else { ts.assertResult(1, 2); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTimeoutWithSelectorTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTimeoutWithSelectorTest.java index 21d4f2a115..b4f22e276c 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTimeoutWithSelectorTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTimeoutWithSelectorTest.java @@ -13,18 +13,18 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; -import java.util.*; +import java.util.List; import java.util.concurrent.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import org.mockito.stubbing.Answer; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; @@ -300,7 +300,7 @@ public void timeoutSelectorWithTimeoutAndOnNextRaceCondition() throws Interrupte latchTimeout.set(true); } - assertFalse("CoundDownLatch timeout", latchTimeout.get()); + assertFalse(latchTimeout.get(), "CoundDownLatch timeout"); InOrder inOrder = inOrder(subscriber); inOrder.verify(subscriber).onSubscribe(notNull()); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTimerTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTimerTest.java index fab91a81bf..3755e78e18 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTimerTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTimerTest.java @@ -13,17 +13,17 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.List; import java.util.concurrent.*; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.*; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; @@ -41,7 +41,7 @@ public class FlowableTimerTest extends RxJavaTest { TestScheduler scheduler; - @Before + @BeforeEach public void before() { subscriber = TestHelper.mockSubscriber(); @@ -331,7 +331,7 @@ public void timerDelayZero() { Flowable.timer(0, TimeUnit.MILLISECONDS).blockingFirst(); } - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } @@ -360,7 +360,7 @@ public void timerInterruptible() throws Exception { Thread.sleep(500); - assertTrue(s.getClass().getSimpleName(), interrupted.get()); + assertTrue(interrupted.get(), s.getClass().getSimpleName()); } } finally { exec.shutdown(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTimestampTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTimestampTest.java index 9ea2051fb1..ec2deefd5e 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTimestampTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableTimestampTest.java @@ -16,11 +16,11 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.TimeUnit; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.plugins.RxJavaPlugins; @@ -31,7 +31,7 @@ public class FlowableTimestampTest extends RxJavaTest { Subscriber subscriber; - @Before + @BeforeEach public void before() { subscriber = TestHelper.mockSubscriber(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToCompletableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToCompletableTest.java index 6813a5c7db..f7a4890c2c 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToCompletableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToCompletableTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.subscribers.TestSubscriber; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToFutureTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToFutureTest.java index 09705dec2d..05869fa17d 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToFutureTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToFutureTest.java @@ -17,10 +17,10 @@ import static org.mockito.Mockito.*; import java.util.concurrent.*; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.schedulers.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToListTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToListTest.java index a0f6c4f01f..e4a9dad10a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToListTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToListTest.java @@ -13,15 +13,16 @@ package io.reactivex.rxjava4.internal.operators.flowable; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.*; import java.util.concurrent.*; +import java.util.concurrent.Flow.Subscriber; -import org.junit.*; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -86,7 +87,7 @@ public void listMultipleSubscribersFlowable() { public void listWithBlockingFirstFlowable() { Flowable f = Flowable.fromIterable(Arrays.asList("one", "two", "three")); List actual = f.toList().toFlowable().blockingFirst(); - Assert.assertEquals(Arrays.asList("one", "two", "three"), actual); + assertEquals(Arrays.asList("one", "two", "three"), actual); } @Test @@ -168,7 +169,7 @@ public void listMultipleSubscribers() { public void listWithBlockingFirst() { Flowable f = Flowable.fromIterable(Arrays.asList("one", "two", "three")); List actual = f.toList().blockingGet(); - Assert.assertEquals(Arrays.asList("one", "two", "three"), actual); + assertEquals(Arrays.asList("one", "two", "three"), actual); } static void await(CyclicBarrier cb) { diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToMapTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToMapTest.java index 7c674c5023..83786febf4 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToMapTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToMapTest.java @@ -18,9 +18,9 @@ import java.io.Serial; import java.util.*; +import java.util.concurrent.Flow.Subscriber; -import org.junit.*; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.functions.*; @@ -30,7 +30,7 @@ public class FlowableToMapTest extends RxJavaTest { Subscriber objectSubscriber; SingleObserver singleObserver; - @Before + @BeforeEach public void before() { objectSubscriber = TestHelper.mockSubscriber(); singleObserver = TestHelper.mockSingleObserver(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToMultimapTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToMultimapTest.java index 0db5e6ea20..c7c36d1ada 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToMultimapTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToMultimapTest.java @@ -18,9 +18,9 @@ import java.io.Serial; import java.util.*; +import java.util.concurrent.Flow.Subscriber; -import org.junit.*; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.functions.*; @@ -31,7 +31,7 @@ public class FlowableToMultimapTest extends RxJavaTest { SingleObserver singleObserver; - @Before + @BeforeEach public void before() { objectSubscriber = TestHelper.mockSubscriber(); singleObserver = TestHelper.mockSingleObserver(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToSingleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToSingleTest.java index aea757727a..36b5dbb1ee 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToSingleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToSingleTest.java @@ -13,9 +13,11 @@ package io.reactivex.rxjava4.internal.operators.flowable; +import static org.junit.jupiter.api.Assertions.assertFalse; + import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.subscribers.TestSubscriber; @@ -75,6 +77,6 @@ public void shouldUseUnsafeSubscribeInternallyNotSubscribe() { Single single = Flowable.just("Hello World!").doOnCancel(() -> unsubscribed.set(true)).single(""); single.toFlowable().subscribe(subscriber); subscriber.assertComplete(); - Assert.assertFalse(unsubscribed.get()); + assertFalse(unsubscribed.get()); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToSortedListTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToSortedListTest.java index b0001cf2e2..f5bd809e05 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToSortedListTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableToSortedListTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.*; import java.util.concurrent.*; +import java.util.concurrent.Flow.Subscriber; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.subscribers.TestSubscriber; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableUnsubscribeOnTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableUnsubscribeOnTest.java index 9a0ba48f3e..95a42d0e8c 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableUnsubscribeOnTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableUnsubscribeOnTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableUsingTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableUsingTest.java index 95e39d9822..3afa9e0360 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableUsingTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableUsingTest.java @@ -13,18 +13,18 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.*; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; import io.reactivex.rxjava4.functions.*; import io.reactivex.rxjava4.internal.functions.Functions; @@ -139,14 +139,18 @@ public void dispose() { inOrder.verifyNoMoreInteractions(); } - @Test(expected = TestException.class) + @Test public void usingWithResourceFactoryError() { - performTestUsingWithResourceFactoryError(false); + assertThrows(TestException.class, () -> { + performTestUsingWithResourceFactoryError(false); + }); } - @Test(expected = TestException.class) + @Test public void usingWithResourceFactoryErrorDisposeEagerly() { - performTestUsingWithResourceFactoryError(true); + assertThrows(TestException.class, () -> { + performTestUsingWithResourceFactoryError(true); + }); } private void performTestUsingWithResourceFactoryError(boolean disposeEagerly) { @@ -322,7 +326,7 @@ public void factoryThrows() { ts.assertError(TestException.class); - Assert.assertEquals(1, count.get()); + assertEquals(1, count.get()); } @Test @@ -343,7 +347,7 @@ public void nonEagerTermination() { ts.assertNoErrors(); ts.assertComplete(); - Assert.assertEquals(1, count.get()); + assertEquals(1, count.get()); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableWindowWithFlowableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableWindowWithFlowableTest.java index 031e6723c8..5f6d401161 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableWindowWithFlowableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableWindowWithFlowableTest.java @@ -13,21 +13,21 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.core.config.*; +import io.reactivex.rxjava4.core.config.StandardConcurrentBufferedConfig; import io.reactivex.rxjava4.exceptions.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.plugins.RxJavaPlugins; @@ -364,8 +364,8 @@ public void upstreamDisposedWhenOutputsDisposed() { source.onNext(1); - assertFalse("source not disposed", source.hasSubscribers()); - assertFalse("boundary not disposed", boundary.hasSubscribers()); + assertFalse(source.hasSubscribers(), "source not disposed"); + assertFalse(boundary.hasSubscribers(), "boundary not disposed"); ts.assertResult(1); } @@ -625,7 +625,7 @@ public void cancellingWindowCancelsUpstream() { ts .assertResult(1); - assertFalse("Processor still has subscribers!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Processor still has subscribers!"); } @Test @@ -655,7 +655,7 @@ public void windowAbandonmentCancelsUpstream() { .assertNoErrors() .assertNotComplete(); - assertFalse("Processor still has subscribers!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Processor still has subscribers!"); inner.get().test().assertResult(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableWindowWithSizeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableWindowWithSizeTest.java index 6f451d830d..b98b0f62c0 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableWindowWithSizeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableWindowWithSizeTest.java @@ -13,22 +13,21 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.core.Flowable; import io.reactivex.rxjava4.core.config.StandardConcurrentBufferedConfig; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.processors.PublishProcessor; import io.reactivex.rxjava4.schedulers.Schedulers; @@ -381,7 +380,7 @@ public void cancellingWindowCancelsUpstreamSize() { ts .assertResult(1); - assertFalse("Processor still has subscribers!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Processor still has subscribers!"); } @Test @@ -404,7 +403,7 @@ public void windowAbandonmentCancelsUpstreamSize() { .assertNoErrors() .assertComplete(); - assertFalse("Processor still has subscribers!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Processor still has subscribers!"); inner.get().test().assertResult(1); } @@ -425,7 +424,7 @@ public void cancellingWindowCancelsUpstreamSkip() { ts .assertResult(1); - assertFalse("Processor still has subscribers!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Processor still has subscribers!"); } @Test @@ -448,7 +447,7 @@ public void windowAbandonmentCancelsUpstreamSkip() { .assertNoErrors() .assertComplete(); - assertFalse("Processor still has subscribers!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Processor still has subscribers!"); inner.get().test().assertResult(1); } @@ -469,7 +468,7 @@ public void cancellingWindowCancelsUpstreamOverlap() { ts .assertResult(1); - assertFalse("Processor still has subscribers!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Processor still has subscribers!"); } @Test @@ -492,7 +491,7 @@ public void windowAbandonmentCancelsUpstreamOverlap() { .assertNoErrors() .assertComplete(); - assertFalse("Processor still has subscribers!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Processor still has subscribers!"); inner.get().test().assertResult(1); } @@ -624,7 +623,7 @@ public void cancelWithoutWindowSize() { ts.cancel(); - assertFalse("Subject still has subscribers!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Subject still has subscribers!"); } @Test @@ -640,7 +639,7 @@ public void cancelAfterAbandonmentSize() { ts.cancel(); - assertFalse("Subject still has subscribers!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Subject still has subscribers!"); } @Test @@ -654,7 +653,7 @@ public void cancelWithoutWindowSkip() { ts.cancel(); - assertFalse("Subject still has subscribers!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Subject still has subscribers!"); } @Test @@ -670,7 +669,7 @@ public void cancelAfterAbandonmentSkip() { ts.cancel(); - assertFalse("Subject still has subscribers!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Subject still has subscribers!"); } @Test @@ -684,7 +683,7 @@ public void cancelWithoutWindowOverlap() { ts.cancel(); - assertFalse("Subject still has subscribers!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Subject still has subscribers!"); } @Test @@ -700,6 +699,6 @@ public void cancelAfterAbandonmentOverlap() { ts.cancel(); - assertFalse("Subject still has subscribers!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Subject still has subscribers!"); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java index eebd1ef069..e8fa2bf959 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; -import org.junit.*; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; @@ -39,7 +39,7 @@ public class FlowableWindowWithStartEndFlowableTest extends RxJavaTest { private TestScheduler scheduler; private Scheduler.Worker innerScheduler; - @Before + @BeforeEach public void before() { scheduler = new TestScheduler(); innerScheduler = scheduler.createWorker(); @@ -258,9 +258,9 @@ public void startError() { ts.assertFailure(TestException.class); - assertFalse("Source has observers!", source.hasSubscribers()); - assertFalse("Start has observers!", start.hasSubscribers()); - assertFalse("End has observers!", end.hasSubscribers()); + assertFalse(source.hasSubscribers(), "Source has observers!"); + assertFalse(start.hasSubscribers(), "Start has observers!"); + assertFalse(end.hasSubscribers(), "End has observers!"); } @Test @@ -279,9 +279,9 @@ public void endError() { ts.assertFailure(TestException.class); - assertFalse("Source has observers!", source.hasSubscribers()); - assertFalse("Start has observers!", start.hasSubscribers()); - assertFalse("End has observers!", end.hasSubscribers()); + assertFalse(source.hasSubscribers(), "Source has observers!"); + assertFalse(start.hasSubscribers(), "Start has observers!"); + assertFalse(end.hasSubscribers(), "End has observers!"); } @Test @@ -384,7 +384,7 @@ public void cancellingWindowCancelsUpstream() { ts .assertResult(1); - assertFalse("Processor still has subscribers!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Processor still has subscribers!"); } @Test @@ -415,7 +415,7 @@ public void windowAbandonmentCancelsUpstream() { .assertNoErrors() .assertNotComplete(); - assertFalse("Processor still has subscribers!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Processor still has subscribers!"); inner.get().test().assertResult(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableWindowWithTimeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableWindowWithTimeTest.java index df08b17670..64625d51c0 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableWindowWithTimeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableWindowWithTimeTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardConcurrentBufferedConfig; @@ -39,7 +39,7 @@ public class FlowableWindowWithTimeTest extends RxJavaTest { private TestScheduler scheduler; private Scheduler.Worker innerScheduler; - @Before + @BeforeEach public void before() { scheduler = new TestScheduler(); innerScheduler = scheduler.createWorker(); @@ -131,7 +131,7 @@ public void onComplete() { @Override public void onError(Throwable e) { - Assert.fail(e.getMessage()); + fail(e.getMessage()); } @Override @@ -181,7 +181,7 @@ public void takeFlatMapCompletes() { ts.awaitDone(5, TimeUnit.SECONDS); ts.assertComplete(); - Assert.assertTrue(!ts.values().isEmpty()); + assertTrue(!ts.values().isEmpty()); } @Test @@ -540,7 +540,7 @@ public void restartTimerMany() throws Exception { Thread.sleep(100); } - assertTrue("intervalRange was not cancelled!", cancel1.get()); + assertTrue(cancel1.get(), "intervalRange was not cancelled!"); } @Test @@ -889,7 +889,7 @@ public void accept(Flowable v) throws Exception { assertTrue(doOnNextDone.await(5, TimeUnit.SECONDS)); - assertFalse("The doOnNext got interrupted!", isInterrupted.get()); + assertFalse(isInterrupted.get(), "The doOnNext got interrupted!"); } @Test @@ -931,7 +931,7 @@ public void accept(Flowable v) throws Exception { assertTrue(doOnNextDone.await(5, TimeUnit.SECONDS)); - assertFalse("The doOnNext got interrupted!", isInterrupted.get()); + assertFalse(isInterrupted.get(), "The doOnNext got interrupted!"); } @Test @@ -972,7 +972,7 @@ public void accept(Flowable v) throws Exception { assertTrue(doOnNextDone.await(5, TimeUnit.SECONDS)); - assertFalse("The doOnNext got interrupted!", isInterrupted.get()); + assertFalse(isInterrupted.get(), "The doOnNext got interrupted!"); } @Test @@ -1014,7 +1014,7 @@ public void accept(Flowable v) throws Exception { assertTrue(doOnNextDone.await(5, TimeUnit.SECONDS)); - assertFalse("The doOnNext got interrupted!", isInterrupted.get()); + assertFalse(isInterrupted.get(), "The doOnNext got interrupted!"); } @Test @@ -1055,7 +1055,7 @@ public void accept(Flowable v) throws Exception { assertTrue(doOnNextDone.await(5, TimeUnit.SECONDS)); - assertFalse("The doOnNext got interrupted!", isInterrupted.get()); + assertFalse(isInterrupted.get(), "The doOnNext got interrupted!"); } @Test @@ -1097,7 +1097,7 @@ public void accept(Flowable v) throws Exception { assertTrue(doOnNextDone.await(5, TimeUnit.SECONDS)); - assertFalse("The doOnNext got interrupted!", isInterrupted.get()); + assertFalse(isInterrupted.get(), "The doOnNext got interrupted!"); } @Test @@ -1116,7 +1116,7 @@ public void cancellingWindowCancelsUpstreamExactTime() { ts .assertResult(1); - assertFalse("Processor still has subscribers!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Processor still has subscribers!"); } @Test @@ -1130,7 +1130,7 @@ public void windowAbandonmentCancelsUpstreamExactTime() { .doOnNext(inner::set) .test(); - assertFalse("Processor still has subscribers!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Processor still has subscribers!"); ts .assertValueCount(1) @@ -1156,7 +1156,7 @@ public void cancellingWindowCancelsUpstreamExactTimeAndSize() { ts .assertResult(1); - assertFalse("Processor still has subscribers!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Processor still has subscribers!"); } @Test @@ -1170,7 +1170,7 @@ public void windowAbandonmentCancelsUpstreamExactTimeAndSize() { .doOnNext(inner::set) .test(); - assertFalse("Processor still has subscribers!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Processor still has subscribers!"); ts .assertValueCount(1) @@ -1196,7 +1196,7 @@ public void cancellingWindowCancelsUpstreamExactTimeSkip() { ts .assertResult(1); - assertFalse("Processor still has subscribers!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Processor still has subscribers!"); } @Test @@ -1210,7 +1210,7 @@ public void windowAbandonmentCancelsUpstreamExactTimeSkip() { .doOnNext(inner::set) .test(); - assertFalse("Processor still has subscribers!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Processor still has subscribers!"); ts .assertValueCount(1) diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableWithLatestFromTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableWithLatestFromTest.java index 311011a657..75bcea52c7 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableWithLatestFromTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableWithLatestFromTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.*; +import java.util.concurrent.Flow.Subscriber; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -263,13 +263,13 @@ public void backpressure() { result.subscribe(ts); - assertTrue("Other has no observers!", other.hasSubscribers()); + assertTrue(other.hasSubscribers(), "Other has no observers!"); ts.request(1); source.onNext(1); - assertTrue("Other has no observers!", other.hasSubscribers()); + assertTrue(other.hasSubscribers(), "Other has no observers!"); ts.assertNoValues(); @@ -292,7 +292,7 @@ public void backpressure() { ts.cancel(); - assertFalse("Other has observers!", other.hasSubscribers()); + assertFalse(other.hasSubscribers(), "Other has observers!"); ts.assertNoErrors(); } @@ -341,9 +341,9 @@ public void manySources() { ts.assertNoErrors(); ts.assertComplete(); - assertFalse("ps1 has subscribers?", pp1.hasSubscribers()); - assertFalse("ps2 has subscribers?", pp2.hasSubscribers()); - assertFalse("ps3 has subscribers?", pp3.hasSubscribers()); + assertFalse(pp1.hasSubscribers(), "ps1 has subscribers?"); + assertFalse(pp2.hasSubscribers(), "ps2 has subscribers?"); + assertFalse(pp3.hasSubscribers(), "ps3 has subscribers?"); } @Test @@ -388,9 +388,9 @@ public void manySourcesIterable() { ts.assertNoErrors(); ts.assertComplete(); - assertFalse("ps1 has subscribers?", pp1.hasSubscribers()); - assertFalse("ps2 has subscribers?", pp2.hasSubscribers()); - assertFalse("ps3 has subscribers?", pp3.hasSubscribers()); + assertFalse(pp1.hasSubscribers(), "ps1 has subscribers?"); + assertFalse(pp2.hasSubscribers(), "ps2 has subscribers?"); + assertFalse(pp3.hasSubscribers(), "ps3 has subscribers?"); } @Test @@ -443,8 +443,8 @@ public void backpressureNoSignal() { ts.assertNoErrors(); ts.assertComplete(); - assertFalse("ps1 has subscribers?", pp1.hasSubscribers()); - assertFalse("ps2 has subscribers?", pp2.hasSubscribers()); + assertFalse(pp1.hasSubscribers(), "ps1 has subscribers?"); + assertFalse(pp2.hasSubscribers(), "ps2 has subscribers?"); } @Test @@ -476,8 +476,8 @@ public void backpressureWithSignal() { ts.assertNoErrors(); ts.assertComplete(); - assertFalse("ps1 has subscribers?", pp1.hasSubscribers()); - assertFalse("ps2 has subscribers?", pp2.hasSubscribers()); + assertFalse(pp1.hasSubscribers(), "ps1 has subscribers?"); + assertFalse(pp2.hasSubscribers(), "ps2 has subscribers?"); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableZipCompletionTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableZipCompletionTest.java index eccff7d33c..f57461b4bb 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableZipCompletionTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableZipCompletionTest.java @@ -15,9 +15,10 @@ import static org.mockito.Mockito.*; -import org.junit.*; +import java.util.concurrent.Flow.Subscriber; + +import org.junit.jupiter.api.*; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.functions.BiFunction; @@ -39,7 +40,7 @@ public class FlowableZipCompletionTest extends RxJavaTest { Subscriber subscriber; InOrder inOrder; - @Before + @BeforeEach public void setUp() { concat2Strings = (t1, t2) -> t1 + "-" + t2; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableZipIterableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableZipIterableTest.java index 07cd62a24e..91d8ffb477 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableZipIterableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableZipIterableTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.*; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -42,7 +42,7 @@ public class FlowableZipIterableTest extends RxJavaTest { Subscriber subscriber; InOrder inOrder; - @Before + @BeforeEach public void setUp() { concat2Strings = (t1, t2) -> t1 + "-" + t2; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableZipTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableZipTest.java index 5ad1dc347e..cf5770e3ca 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableZipTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/FlowableZipTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -23,7 +23,7 @@ import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; @@ -48,7 +48,7 @@ public class FlowableZipTest extends RxJavaTest { Subscriber subscriber; InOrder inOrder; - @Before + @BeforeEach public void setUp() { concat2Strings = (t1, t2) -> t1 + "-" + t2; @@ -837,7 +837,7 @@ public void startEmptyList() { Collection> observables = Collections.emptyList(); Flowable f = Flowable.zip(observables, args -> { - Assert.assertEquals("No argument should have been passed", 0, args.length); + assertEquals(0, args.length, "No argument should have been passed"); return invoked; }); @@ -851,18 +851,19 @@ public void startEmptyList() { * Expect NoSuchElementException instead of blocking forever as zip should emit onComplete and no onNext * and last() expects at least a single response. */ - @Test(expected = NoSuchElementException.class) + @Test public void startEmptyListBlocking() { + assertThrows(NoSuchElementException.class, () -> { + final Object invoked = new Object(); + Collection> observables = Collections.emptyList(); - final Object invoked = new Object(); - Collection> observables = Collections.emptyList(); + Flowable f = Flowable.zip(observables, args -> { + assertEquals(0, args.length, "No argument should have been passed"); + return invoked; + }); - Flowable f = Flowable.zip(observables, args -> { - Assert.assertEquals("No argument should have been passed", 0, args.length); - return invoked; + f.blockingLast(); }); - - f.blockingLast(); } @Test @@ -1057,7 +1058,7 @@ public void zipRace() { while (System.currentTimeMillis() - startTime < 9000 && i++ < 100000) { int value = Flowable.zip(src, src, (t1, t2) -> t1 + t2 * 10).blockingSingle(0); - Assert.assertEquals(11, value); + assertEquals(11, value); } } /** @@ -1105,7 +1106,7 @@ public void zipNArguments() throws Exception { m.invoke(null, params0); fail("Should have thrown @ " + m); } catch (InvocationTargetException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof NullPointerException); + assertTrue(ex.getCause() instanceof NullPointerException, ex.toString()); if (j < i) { assertEquals("source" + (j + 1) + " is null", ex.getCause().getMessage()); @@ -1454,8 +1455,8 @@ public void noCrossBoundaryFusion() { List list = ts.values().getFirst(); - assertTrue(list.toString(), list.contains("RxSi")); - assertTrue(list.toString(), list.contains("RxCo")); + assertTrue(list.contains("RxSi"), list.toString()); + assertTrue(list.contains("RxCo"), list.toString()); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/NotificationLiteTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/NotificationLiteTest.java index 807e706856..3b41566562 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/NotificationLiteTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/flowable/NotificationLiteTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.flowable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.internal.util.NotificationLite; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/AbstractMaybeWithUpstreamTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/AbstractMaybeWithUpstreamTest.java index 912c251c40..79b95da32c 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/AbstractMaybeWithUpstreamTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/AbstractMaybeWithUpstreamTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertSame; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.internal.functions.Functions; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeAmbTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeAmbTest.java index 1f6b011ce8..1f99c0d207 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeAmbTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeAmbTest.java @@ -13,18 +13,18 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Consumer; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.plugins.RxJavaPlugins; @@ -141,7 +141,7 @@ public void noWinnerSuccessDispose() throws Exception { }); assertTrue(cdl.await(500, TimeUnit.SECONDS)); - assertFalse("Interrupted!", interrupted.get()); + assertFalse(interrupted.get(), "Interrupted!"); } } @@ -164,7 +164,7 @@ public void noWinnerErrorDispose() throws Exception { }); assertTrue(cdl.await(500, TimeUnit.SECONDS)); - assertFalse("Interrupted!", interrupted.get()); + assertFalse(interrupted.get(), "Interrupted!"); } } @@ -186,7 +186,7 @@ public void noWinnerCompleteDispose() throws Exception { }); assertTrue(cdl.await(500, TimeUnit.SECONDS)); - assertFalse("Interrupted!", interrupted.get()); + assertFalse(interrupted.get(), "Interrupted!"); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeBlockingSubscribeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeBlockingSubscribeTest.java index 905fa87f2c..79bdeaf1f4 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeBlockingSubscribeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeBlockingSubscribeTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Maybe; import io.reactivex.rxjava4.exceptions.TestException; @@ -258,7 +258,7 @@ public void twoArgError() throws Throwable { Maybe.error(new TestException()) .blockingSubscribe(success, consumer); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); verify(success, never()).accept(any()); verify(consumer).accept(any(TestException.class)); @@ -277,7 +277,7 @@ public void twoArgErrorAsync() throws Throwable { .delay(50, TimeUnit.MILLISECONDS, Schedulers.computation()) .blockingSubscribe(success, consumer); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); verify(success, never()).accept(any()); verify(consumer).accept(any(TestException.class)); @@ -392,7 +392,7 @@ public void threeArgInterrupted() throws Throwable { .doOnDispose(onDispose) .blockingSubscribe(success, consumer, action); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); verify(onDispose).run(); verify(success, never()).accept(any()); @@ -493,7 +493,7 @@ public void ovserverInterrupted() throws Throwable { .doOnDispose(onDispose) .blockingSubscribe(to); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); verify(onDispose).run(); to.assertFailure(InterruptedException.class); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeCacheTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeCacheTest.java index 4bbcc0f9bd..65f5a3ee0b 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeCacheTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeCacheTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Consumer; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.processors.PublishProcessor; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeCallbackObserverTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeCallbackObserverTest.java index 4a15f6c67c..8dedf18450 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeCallbackObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeCallbackObserverTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Consumer; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatArrayEagerDelayErrorTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatArrayEagerDelayErrorTest.java index cc4c566097..ec6be0ea4c 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatArrayEagerDelayErrorTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatArrayEagerDelayErrorTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Maybe; import io.reactivex.rxjava4.core.config.StandardConcurrentBufferedConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatArrayTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatArrayTest.java index a7b6e1c4c3..ce088eb11a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatArrayTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatArrayTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatEagerTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatEagerTest.java index 1d326c96ec..2482eae7af 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatEagerTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatEagerTest.java @@ -15,7 +15,7 @@ import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardConcurrentBufferedConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatIterableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatIterableTest.java index 40c7a4ad5f..642805a9ca 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatIterableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatIterableTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatMapCompletableTest.java index 534be9718e..33a8784f1b 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatMapCompletableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatMapCompletableTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatMapSingleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatMapSingleTest.java index 04a695b51d..02ce546cae 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatMapSingleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatMapSingleTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatMapTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatMapTest.java index fef7750661..979f9416ad 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatMapTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatMapTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatPublisherTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatPublisherTest.java index a42d24338c..799852ee5a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatPublisherTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeConcatPublisherTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeContainsTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeContainsTest.java index c652ebe876..08c19582e6 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeContainsTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeContainsTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeCountTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeCountTest.java index ece59ab1e0..cc5d9cdda1 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeCountTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeCountTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeCreateTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeCreateTest.java index 2bd006d354..f7fd7b4deb 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeCreateTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeCreateTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.testsupport.TestHelper; @@ -292,7 +292,7 @@ public void tryOnError() { assertFalse(response[0]); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDelayOtherTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDelayOtherTest.java index 929d697d80..d22314cb03 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDelayOtherTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDelayOtherTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; +import java.util.concurrent.Flow.Subscriber; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDelaySubscriptionTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDelaySubscriptionTest.java index 8db4f451e7..c436cb28f4 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDelaySubscriptionTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDelaySubscriptionTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.TimeUnit; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDelayTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDelayTest.java index 2989a38a57..fd568c2243 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDelayTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDelayTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDematerializeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDematerializeTest.java index 86388a2884..06aefe1940 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDematerializeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDematerializeTest.java @@ -13,8 +13,10 @@ package io.reactivex.rxjava4.internal.operators.maybe; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -import org.junit.Test; + +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDetachTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDetachTest.java index ddb9db220a..85a01088e6 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDetachTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDetachTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; import java.io.IOException; import java.lang.ref.WeakReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.processors.PublishProcessor; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDoAfterSuccessTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDoAfterSuccessTest.java index 00c639e630..78397ed4ed 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDoAfterSuccessTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDoAfterSuccessTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDoFinallyTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDoFinallyTest.java index 60410d3a9c..ed97db8ae0 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDoFinallyTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDoFinallyTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDoOnEventTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDoOnEventTest.java index f8b62b79ba..2e594eb8f7 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDoOnEventTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDoOnEventTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.subjects.PublishSubject; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDoOnLifecycleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDoOnLifecycleTest.java index e75b955835..d23845e886 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDoOnLifecycleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDoOnLifecycleTest.java @@ -13,10 +13,11 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDoOnTerminateTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDoOnTerminateTest.java index 6becb22273..e060b101b6 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDoOnTerminateTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeDoOnTerminateTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeEmptyTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeEmptyTest.java index fd7b6dd3fd..06fc0c0e47 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeEmptyTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeEmptyTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.operators.ScalarSupplier; @@ -26,7 +26,7 @@ public class MaybeEmptyTest extends RxJavaTest { public void scalarSupplier() { Maybe m = Maybe.empty(); - assertTrue(m.getClass().toString(), m instanceof ScalarSupplier); + assertTrue(m instanceof ScalarSupplier, m.getClass().toString()); assertNull(((ScalarSupplier)m).get()); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeEqualTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeEqualTest.java index 45e3bef1cb..7b297062b2 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeEqualTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeEqualTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeErrorTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeErrorTest.java index d688f2c538..1e51750644 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeErrorTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeErrorTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFilterSingleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFilterSingleTest.java index 0003f19e3f..7b7c94415d 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFilterSingleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFilterSingleTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapBiSelectorTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapBiSelectorTest.java index 6d1d9e9890..d021a1410f 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapBiSelectorTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapBiSelectorTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapCompletableTest.java index 9d1065f8ca..5d27631312 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapCompletableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapCompletableTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; 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 e35409d773..cdcc373278 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 @@ -13,19 +13,18 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; +import java.util.concurrent.Flow.Subscription; import java.util.concurrent.TimeUnit; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.internal.util.CrashingIterable; -import io.reactivex.rxjava4.operators.QueueFuseable; -import io.reactivex.rxjava4.operators.QueueSubscription; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.schedulers.Schedulers; import io.reactivex.rxjava4.subjects.*; import io.reactivex.rxjava4.subscribers.TestSubscriber; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java index e8a22ab4f0..7f15893bb2 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java @@ -13,20 +13,19 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observer; import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.internal.util.CrashingIterable; -import io.reactivex.rxjava4.operators.QueueDisposable; -import io.reactivex.rxjava4.operators.QueueFuseable; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.schedulers.Schedulers; import io.reactivex.rxjava4.testsupport.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapNotificationTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapNotificationTest.java index c1c6e95cfa..47e41d1623 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapNotificationTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapNotificationTest.java @@ -15,7 +15,7 @@ import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapSingleElementTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapSingleElementTest.java index 1f1586f216..26cd6b57fe 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapSingleElementTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapSingleElementTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapSingleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapSingleTest.java index 236040fbf4..e238a8a033 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapSingleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlatMapSingleTest.java @@ -15,7 +15,7 @@ import java.util.NoSuchElementException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlattenTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlattenTest.java index d0e7595c57..da180ebd58 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlattenTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFlattenTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromActionTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromActionTest.java index 6b5a0642f1..3372852a8a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromActionTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromActionTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.List; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.functions.*; @@ -91,7 +91,7 @@ public void callable() throws Throwable { Maybe m = Maybe.fromAction(() -> counter[0]++); - assertTrue(m.getClass().toString(), m instanceof Supplier); + assertTrue(m instanceof Supplier, m.getClass().toString()); assertNull(((Supplier)m).get()); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromCallableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromCallableTest.java index a2ce904cad..4111e570d8 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromCallableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromCallableTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -21,7 +21,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.stubbing.Answer; import io.reactivex.rxjava4.core.*; @@ -106,7 +106,7 @@ public void callable() throws Throwable { return 0; }); - assertTrue(m.getClass().toString(), m instanceof Supplier); + assertTrue(m instanceof Supplier, m.getClass().toString()); assertEquals(0, ((Supplier)m).get()); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromCompletableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromCompletableTest.java index aa9e1cdcaf..d2c40baaa8 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromCompletableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromCompletableTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertSame; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.internal.fuseable.HasUpstreamCompletableSource; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromFutureTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromFutureTest.java index aded0c7906..6502992684 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromFutureTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromFutureTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.concurrent.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromObservableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromObservableTest.java index 2d6f293135..46a9b99427 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromObservableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromObservableTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromPubisherTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromPubisherTest.java index 13da50493b..388be7adec 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromPubisherTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromPubisherTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromRunnableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromRunnableTest.java index 407656f6d5..d7777f1167 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromRunnableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromRunnableTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.List; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.functions.Supplier; @@ -91,7 +91,7 @@ public void callable() throws Throwable { Maybe m = Maybe.fromRunnable(() -> counter[0]++); - assertTrue(m.getClass().toString(), m instanceof Supplier); + assertTrue(m instanceof Supplier, m.getClass().toString()); assertNull(((Supplier)m).get()); @@ -126,7 +126,7 @@ public void noErrorLoss() throws Exception { TestHelper.assertUndeliverable(errors, 0, RuntimeException.class); - assertTrue(errors.getFirst().toString(), errors.getFirst().getCause().getCause() instanceof InterruptedException); + assertTrue( errors.getFirst().getCause().getCause() instanceof InterruptedException, errors.getFirst().toString()); } finally { RxJavaPlugins.reset(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromSingleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromSingleTest.java index 7b7d8fad17..6c4d947756 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromSingleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromSingleTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertSame; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.internal.fuseable.HasUpstreamSingleSource; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromSupplierTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromSupplierTest.java index b36a6aa8d5..1dabc17540 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromSupplierTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeFromSupplierTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -21,7 +21,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.stubbing.Answer; import io.reactivex.rxjava4.core.*; @@ -107,7 +107,7 @@ public void supplier() throws Throwable { return 0; }); - assertTrue(m.getClass().toString(), m instanceof Supplier); + assertTrue(m instanceof Supplier, m.getClass().toString()); assertEquals(0, ((Supplier)m).get()); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeHideTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeHideTest.java index 5684ef6448..f71bdc957f 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeHideTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeHideTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeIgnoreElementTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeIgnoreElementTest.java index 169164c2ef..99da4d2fb0 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeIgnoreElementTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeIgnoreElementTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.processors.PublishProcessor; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeIsEmptySingleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeIsEmptySingleTest.java index a3d635f8fc..6e757d7b32 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeIsEmptySingleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeIsEmptySingleTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertSame; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.internal.fuseable.HasUpstreamMaybeSource; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeIsEmptyTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeIsEmptyTest.java index c218e40130..4f069c8493 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeIsEmptyTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeIsEmptyTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeJustTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeJustTest.java index 56a6025c5e..55c31e7526 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeJustTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeJustTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.operators.ScalarSupplier; @@ -27,7 +27,7 @@ public class MaybeJustTest extends RxJavaTest { public void scalarSupplier() { Maybe m = Maybe.just(1); - assertTrue(m.getClass().toString(), m instanceof ScalarSupplier); + assertTrue(m instanceof ScalarSupplier, m.getClass().toString()); assertEquals(1, ((ScalarSupplier)m).get().intValue()); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeMapTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeMapTest.java index fe1e369f03..7f36c30967 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeMapTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeMapTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeMaterializeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeMaterializeTest.java index 79a9dc4955..c8b112a8f0 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeMaterializeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeMaterializeTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; 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 a067685192..f54feed290 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 @@ -13,19 +13,18 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; +import java.util.concurrent.Flow.Subscription; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.internal.operators.maybe.MaybeMergeArray.MergeMaybeObserver; -import io.reactivex.rxjava4.operators.QueueFuseable; -import io.reactivex.rxjava4.operators.QueueSubscription; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.subjects.*; import io.reactivex.rxjava4.subscribers.TestSubscriber; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeMergeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeMergeTest.java index 0546bb71ea..612472d8dd 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeMergeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeMergeTest.java @@ -16,7 +16,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardConcurrentConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeMergeWithTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeMergeWithTest.java index 81227bfb05..07f0f39301 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeMergeWithTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeMergeWithTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeOfTypeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeOfTypeTest.java index 10342e5785..f653ba2070 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeOfTypeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeOfTypeTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeOnErrorXTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeOnErrorXTest.java index 0229b11da9..4e584fea95 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeOnErrorXTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeOnErrorXTest.java @@ -15,7 +15,7 @@ import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybePeekTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybePeekTest.java index e4c5cef465..7e61f7ffda 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybePeekTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybePeekTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Consumer; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.plugins.RxJavaPlugins; @@ -61,7 +61,7 @@ protected void subscribeActual(MaybeObserver observer) { TestHelper.assertUndeliverable(errors, 0, TestException.class, "Second"); - assertTrue("" + err, err[0] instanceof TestException); + assertTrue(err[0] instanceof TestException, "" + err); assertEquals("First", err[0].getMessage()); to.assertFailureAndMessage(TestException.class, "First"); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeSafeSubscribeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeSafeSubscribeTest.java index 3e0521fe49..8ccb6b089c 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeSafeSubscribeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeSafeSubscribeTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.annotations.NonNull; @@ -44,7 +44,7 @@ public void normalSuccess() throws Throwable { order.verify(consumer).onSuccess(1); order.verifyNoMoreInteractions(); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); }); } @@ -62,7 +62,7 @@ public void normalError() throws Throwable { order.verify(consumer).onError(any(TestException.class)); order.verifyNoMoreInteractions(); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); }); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeStartWithTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeStartWithTest.java index ea13fa692a..44f0e5d1c8 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeStartWithTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeStartWithTest.java @@ -15,7 +15,7 @@ import static org.mockito.Mockito.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeSubscribeOnTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeSubscribeOnTest.java index 7c91dda906..59dfc6489c 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeSubscribeOnTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeSubscribeOnTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.schedulers.Schedulers; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeSwitchIfEmptySingleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeSwitchIfEmptySingleTest.java index 8033b02c63..44e3765430 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeSwitchIfEmptySingleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeSwitchIfEmptySingleTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeSwitchIfEmptyTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeSwitchIfEmptyTest.java index 17085080d2..1bc97c87fc 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeSwitchIfEmptyTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeSwitchIfEmptyTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeSwitchOnNextTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeSwitchOnNextTest.java index b9e09c62f6..8992eeea52 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeSwitchOnNextTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeSwitchOnNextTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTakeUntilPublisherTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTakeUntilPublisherTest.java index 4104b9dbdb..81b6c17d07 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTakeUntilPublisherTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTakeUntilPublisherTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -167,7 +167,7 @@ public void otherSignalsAndCompletes() { .test() .assertResult(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTakeUntilTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTakeUntilTest.java index 087d6069bf..9750093c33 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTakeUntilTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTakeUntilTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -195,13 +195,13 @@ public void untilMaybeMainSuccess() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); main.onSuccess(1); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertResult(1); } @@ -213,13 +213,13 @@ public void untilMaybeMainComplete() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); main.onComplete(); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertResult(); } @@ -231,13 +231,13 @@ public void untilMaybeMainError() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); main.onError(new TestException()); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertFailure(TestException.class); } @@ -249,13 +249,13 @@ public void untilMaybeOtherSuccess() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); other.onSuccess(1); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertResult(); } @@ -267,13 +267,13 @@ public void untilMaybeOtherComplete() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); other.onComplete(); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertResult(); } @@ -285,13 +285,13 @@ public void untilMaybeOtherError() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); other.onError(new TestException()); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertFailure(TestException.class); } @@ -303,13 +303,13 @@ public void untilMaybeDispose() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); to.dispose(); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertEmpty(); } @@ -321,13 +321,13 @@ public void untilPublisherMainSuccess() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasSubscribers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasSubscribers(), "Other no observers?"); main.onSuccess(1); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasSubscribers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasSubscribers(), "Other has observers?"); to.assertResult(1); } @@ -339,13 +339,13 @@ public void untilPublisherMainComplete() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasSubscribers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasSubscribers(), "Other no observers?"); main.onComplete(); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasSubscribers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasSubscribers(), "Other has observers?"); to.assertResult(); } @@ -357,13 +357,13 @@ public void untilPublisherMainError() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasSubscribers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasSubscribers(), "Other no observers?"); main.onError(new TestException()); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasSubscribers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasSubscribers(), "Other has observers?"); to.assertFailure(TestException.class); } @@ -375,13 +375,13 @@ public void untilPublisherOtherOnNext() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasSubscribers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasSubscribers(), "Other no observers?"); other.onNext(1); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasSubscribers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasSubscribers(), "Other has observers?"); to.assertResult(); } @@ -393,13 +393,13 @@ public void untilPublisherOtherOnComplete() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasSubscribers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasSubscribers(), "Other no observers?"); other.onComplete(); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasSubscribers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasSubscribers(), "Other has observers?"); to.assertResult(); } @@ -411,13 +411,13 @@ public void untilPublisherOtherError() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasSubscribers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasSubscribers(), "Other no observers?"); other.onError(new TestException()); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasSubscribers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasSubscribers(), "Other has observers?"); to.assertFailure(TestException.class); } @@ -429,13 +429,13 @@ public void untilPublisherDispose() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasSubscribers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasSubscribers(), "Other no observers?"); to.dispose(); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasSubscribers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasSubscribers(), "Other has observers?"); to.assertEmpty(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTimeIntervalTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTimeIntervalTest.java index 89079d21ed..341ac47e4c 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTimeIntervalTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTimeIntervalTest.java @@ -15,7 +15,7 @@ import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Maybe; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTimeoutPublisherTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTimeoutPublisherTest.java index 767e1550e2..ae2a83a9fc 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTimeoutPublisherTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTimeoutPublisherTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.TimeoutException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTimeoutTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTimeoutTest.java index f07b5b0120..2153cbb6f3 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTimeoutTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTimeoutTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTimerTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTimerTest.java index 004c540191..7faffa95d0 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTimerTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTimerTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.observers.TestObserver; @@ -55,7 +55,7 @@ public void timerInterruptible() throws Exception { Thread.sleep(500); - assertTrue(s.getClass().getSimpleName(), interrupted.get()); + assertTrue(interrupted.get(), s.getClass().getSimpleName()); } } finally { exec.shutdown(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTimestampTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTimestampTest.java index 7919c5bf2a..79deac5884 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTimestampTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeTimestampTest.java @@ -15,7 +15,7 @@ import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Maybe; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeToCompletableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeToCompletableTest.java index 3b024d6319..87cac27a55 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeToCompletableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeToCompletableTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertSame; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.internal.fuseable.HasUpstreamMaybeSource; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeToFlowableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeToFlowableTest.java index 718097fe95..b22371934f 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeToFlowableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeToFlowableTest.java @@ -13,9 +13,10 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertSame; + +import org.junit.jupiter.api.Test; -import org.junit.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.internal.fuseable.HasUpstreamMaybeSource; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeToFutureTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeToFutureTest.java index a2994f1437..1b7d5298a0 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeToFutureTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeToFutureTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -52,7 +52,7 @@ public void error() throws InterruptedException { fail("Should have thrown!"); } catch (ExecutionException ex) { - assertTrue("" + ex.getCause(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, "" + ex.getCause()); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeToObservableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeToObservableTest.java index d58a27da9b..552ced45a2 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeToObservableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeToObservableTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertSame; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.internal.fuseable.HasUpstreamMaybeSource; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeToSingleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeToSingleTest.java index c7013725f2..dc1a91c9fc 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeToSingleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeToSingleTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.internal.fuseable.HasUpstreamMaybeSource; @@ -29,7 +29,7 @@ public void source() { Maybe m = Maybe.just(1); Single s = m.toSingle(); - assertTrue(s.getClass().toString(), s instanceof HasUpstreamMaybeSource); + assertTrue(s instanceof HasUpstreamMaybeSource, s.getClass().toString()); assertSame(m, (((HasUpstreamMaybeSource)s).source())); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeUnsubscribeOnTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeUnsubscribeOnTest.java index b02fe16b81..c0bdb6776c 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeUnsubscribeOnTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeUnsubscribeOnTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeUsingTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeUsingTest.java index 83747543b2..7510d87013 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeUsingTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeUsingTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.plugins.RxJavaPlugins; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeZipArrayTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeZipArrayTest.java index 72a2d36eed..2079c1b0a2 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeZipArrayTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeZipArrayTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; @@ -127,10 +127,12 @@ public void innerErrorRace() { } } - @Test(expected = NullPointerException.class) + @Test public void zipArrayOneIsNull() { - Maybe.zipArray((Function) _ -> 1, Maybe.just(1), null) - .blockingGet(); + assertThrows(NullPointerException.class, () -> { + Maybe.zipArray((Function) _ -> 1, Maybe.just(1), null) + .blockingGet(); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeZipIterableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeZipIterableTest.java index a48fa62c8f..8e4df23ae4 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeZipIterableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/maybe/MaybeZipIterableTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -145,16 +145,20 @@ public void nextThrows() { .assertFailureAndMessage(TestException.class, "next()"); } - @Test(expected = NullPointerException.class) + @Test public void zipIterableOneIsNull() { - Maybe.zip(Arrays.asList(null, Maybe.just(1)), (Function) _ -> 1) - .blockingGet(); + assertThrows(NullPointerException.class, () -> { + Maybe.zip(Arrays.asList(null, Maybe.just(1)), (Function) _ -> 1) + .blockingGet(); + }); } - @Test(expected = NullPointerException.class) + @Test public void zipIterableTwoIsNull() { - Maybe.zip(Arrays.asList(Maybe.just(1), null), (Function) _ -> 1) - .blockingGet(); + assertThrows(NullPointerException.class, () -> { + Maybe.zip(Arrays.asList(Maybe.just(1), null), (Function) _ -> 1) + .blockingGet(); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/CompletableAndThenObservableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/CompletableAndThenObservableTest.java index 83a184a41f..31aa06b9be 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/CompletableAndThenObservableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/CompletableAndThenObservableTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.mixed; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/CompletableAndThenPublisherTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/CompletableAndThenPublisherTest.java index 0b522c0507..3912a0f904 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/CompletableAndThenPublisherTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/CompletableAndThenPublisherTest.java @@ -13,10 +13,11 @@ package io.reactivex.rxjava4.internal.operators.mixed; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import java.util.concurrent.Flow.Publisher; + +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.functions.Function; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/FlowableConcatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/FlowableConcatMapCompletableTest.java index f55e3c7d28..d29318e4cf 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/FlowableConcatMapCompletableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/FlowableConcatMapCompletableTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.mixed; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/FlowableConcatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/FlowableConcatMapMaybeTest.java index 34683e0814..64fe3a671c 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/FlowableConcatMapMaybeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/FlowableConcatMapMaybeTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.mixed; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/FlowableConcatMapSingleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/FlowableConcatMapSingleTest.java index 134591170f..38e55d059f 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/FlowableConcatMapSingleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/FlowableConcatMapSingleTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.mixed; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/FlowableSwitchMapCompletableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/FlowableSwitchMapCompletableTest.java index 0f1f56db38..06f168c322 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/FlowableSwitchMapCompletableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/FlowableSwitchMapCompletableTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.internal.operators.mixed; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; +import java.util.concurrent.Flow.Subscriber; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.observers.TestObserver; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/FlowableSwitchMapMaybeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/FlowableSwitchMapMaybeTest.java index 86fb0649c6..7fced2e6f0 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/FlowableSwitchMapMaybeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/FlowableSwitchMapMaybeTest.java @@ -13,18 +13,18 @@ package io.reactivex.rxjava4.internal.operators.mixed; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.plugins.RxJavaPlugins; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/FlowableSwitchMapSingleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/FlowableSwitchMapSingleTest.java index 13534703df..aaf0033433 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/FlowableSwitchMapSingleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/FlowableSwitchMapSingleTest.java @@ -13,18 +13,18 @@ package io.reactivex.rxjava4.internal.operators.mixed; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.plugins.RxJavaPlugins; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/MaybeFlatMapObservableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/MaybeFlatMapObservableTest.java index a4e740f8cd..aebfed3188 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/MaybeFlatMapObservableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/MaybeFlatMapObservableTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.mixed; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/MaybeFlatMapPublisherTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/MaybeFlatMapPublisherTest.java index 4674c4cf77..e1d2811a2f 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/MaybeFlatMapPublisherTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/MaybeFlatMapPublisherTest.java @@ -13,9 +13,10 @@ package io.reactivex.rxjava4.internal.operators.mixed; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; + +import org.junit.jupiter.api.Test; -import org.junit.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.internal.functions.Functions; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ObservableConcatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ObservableConcatMapCompletableTest.java index eae74badfa..e796d44ce2 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ObservableConcatMapCompletableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ObservableConcatMapCompletableTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.mixed; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ObservableConcatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ObservableConcatMapMaybeTest.java index 1263204bae..0f4689c09d 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ObservableConcatMapMaybeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ObservableConcatMapMaybeTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.mixed; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ObservableConcatMapSingleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ObservableConcatMapSingleTest.java index 9d6532c23e..5a6d1a870f 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ObservableConcatMapSingleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ObservableConcatMapSingleTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.mixed; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ObservableSwitchMapCompletableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ObservableSwitchMapCompletableTest.java index f33eae0a59..4f9b52a460 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ObservableSwitchMapCompletableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ObservableSwitchMapCompletableTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.internal.operators.mixed; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.plugins.RxJavaPlugins; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ObservableSwitchMapMaybeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ObservableSwitchMapMaybeTest.java index 672bf3d662..1fb096d78a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ObservableSwitchMapMaybeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ObservableSwitchMapMaybeTest.java @@ -13,17 +13,17 @@ package io.reactivex.rxjava4.internal.operators.mixed; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.plugins.RxJavaPlugins; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ObservableSwitchMapSingleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ObservableSwitchMapSingleTest.java index e8611c3559..aeae157445 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ObservableSwitchMapSingleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ObservableSwitchMapSingleTest.java @@ -13,17 +13,17 @@ package io.reactivex.rxjava4.internal.operators.mixed; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.plugins.RxJavaPlugins; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ScalarXMapZHelperTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ScalarXMapZHelperTest.java index 147a3108a7..65e2a4e498 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ScalarXMapZHelperTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/ScalarXMapZHelperTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.mixed; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/SingleFlatMapObservableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/SingleFlatMapObservableTest.java index 94b11dfdab..17519e068d 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/SingleFlatMapObservableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/mixed/SingleFlatMapObservableTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.mixed; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/AbstractObservableWithUpstreamTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/AbstractObservableWithUpstreamTest.java index f64e330904..ce68a501dd 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/AbstractObservableWithUpstreamTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/AbstractObservableWithUpstreamTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertSame; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.internal.functions.Functions; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/BlockingObservableLatestTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/BlockingObservableLatestTest.java index 34d5182457..27122befda 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/BlockingObservableLatestTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/BlockingObservableLatestTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.TimeUnit; -import org.junit.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; @@ -45,13 +45,13 @@ public void simple() { for (int i = 0; i < 9; i++) { scheduler.advanceTimeBy(1, TimeUnit.SECONDS); - Assert.assertTrue(it.hasNext()); + assertTrue(it.hasNext()); - Assert.assertEquals(Long.valueOf(i), it.next()); + assertEquals(Long.valueOf(i), it.next()); } scheduler.advanceTimeBy(1, TimeUnit.SECONDS); - Assert.assertFalse(it.hasNext()); + assertFalse(it.hasNext()); } @Test @@ -70,75 +70,83 @@ public void sameSourceMultipleIterators() { for (int i = 0; i < 9; i++) { scheduler.advanceTimeBy(1, TimeUnit.SECONDS); - Assert.assertTrue(it.hasNext()); + assertTrue(it.hasNext()); - Assert.assertEquals(Long.valueOf(i), it.next()); + assertEquals(Long.valueOf(i), it.next()); } scheduler.advanceTimeBy(1, TimeUnit.SECONDS); - Assert.assertFalse(it.hasNext()); + assertFalse(it.hasNext()); } } - @Test(expected = NoSuchElementException.class) + @Test public void empty() { - Observable source = Observable. empty(); + assertThrows(NoSuchElementException.class, () -> { + Observable source = Observable. empty(); - Iterable iter = source.blockingLatest(); + Iterable iter = source.blockingLatest(); - Iterator it = iter.iterator(); + Iterator it = iter.iterator(); - Assert.assertFalse(it.hasNext()); + assertFalse(it.hasNext()); - it.next(); + it.next(); + }); } - @Test(expected = NoSuchElementException.class) + @Test public void simpleJustNext() { - TestScheduler scheduler = new TestScheduler(); + assertThrows(NoSuchElementException.class, () -> { + TestScheduler scheduler = new TestScheduler(); - Observable source = Observable.interval(1, TimeUnit.SECONDS, scheduler).take(10); + Observable source = Observable.interval(1, TimeUnit.SECONDS, scheduler).take(10); - Iterable iter = source.blockingLatest(); + Iterable iter = source.blockingLatest(); - Iterator it = iter.iterator(); + Iterator it = iter.iterator(); - // only 9 because take(10) will immediately call onComplete when receiving the 10th item - // which onComplete will overwrite the previous value - for (int i = 0; i < 10; i++) { - scheduler.advanceTimeBy(1, TimeUnit.SECONDS); + // only 9 because take(10) will immediately call onComplete when receiving the 10th item + // which onComplete will overwrite the previous value + for (int i = 0; i < 10; i++) { + scheduler.advanceTimeBy(1, TimeUnit.SECONDS); - Assert.assertEquals(Long.valueOf(i), it.next()); - } + assertEquals(Long.valueOf(i), it.next()); + } + }); } - @Test(expected = RuntimeException.class) + @Test public void hasNextThrows() { - TestScheduler scheduler = new TestScheduler(); + assertThrows(RuntimeException.class, () -> { + TestScheduler scheduler = new TestScheduler(); - Observable source = Observable. error(new RuntimeException("Forced failure!")).subscribeOn(scheduler); + Observable source = Observable. error(new RuntimeException("Forced failure!")).subscribeOn(scheduler); - Iterable iter = source.blockingLatest(); + Iterable iter = source.blockingLatest(); - Iterator it = iter.iterator(); + Iterator it = iter.iterator(); - scheduler.advanceTimeBy(1, TimeUnit.SECONDS); + scheduler.advanceTimeBy(1, TimeUnit.SECONDS); - it.hasNext(); + it.hasNext(); + }); } - @Test(expected = RuntimeException.class) + @Test public void nextThrows() { - TestScheduler scheduler = new TestScheduler(); + assertThrows(RuntimeException.class, () -> { + TestScheduler scheduler = new TestScheduler(); - Observable source = Observable. error(new RuntimeException("Forced failure!")).subscribeOn(scheduler); + Observable source = Observable. error(new RuntimeException("Forced failure!")).subscribeOn(scheduler); - Iterable iter = source.blockingLatest(); - Iterator it = iter.iterator(); + Iterable iter = source.blockingLatest(); + Iterator it = iter.iterator(); - scheduler.advanceTimeBy(1, TimeUnit.SECONDS); + scheduler.advanceTimeBy(1, TimeUnit.SECONDS); - it.next(); + it.next(); + }); } @Test @@ -151,38 +159,44 @@ public void fasterSource() { source.onNext(1); - Assert.assertEquals(Integer.valueOf(1), it.next()); + assertEquals(Integer.valueOf(1), it.next()); source.onNext(2); source.onNext(3); - Assert.assertEquals(Integer.valueOf(3), it.next()); + assertEquals(Integer.valueOf(3), it.next()); source.onNext(4); source.onNext(5); source.onNext(6); - Assert.assertEquals(Integer.valueOf(6), it.next()); + assertEquals(Integer.valueOf(6), it.next()); source.onNext(7); source.onComplete(); - Assert.assertFalse(it.hasNext()); + assertFalse(it.hasNext()); } - @Test(expected = UnsupportedOperationException.class) + @Test public void remove() { - Observable.never().blockingLatest().iterator().remove(); + assertThrows(UnsupportedOperationException.class, () -> { + Observable.never().blockingLatest().iterator().remove(); + }); } - @Test(expected = NoSuchElementException.class) + @Test public void empty2() { - Observable.empty().blockingLatest().iterator().next(); + assertThrows(NoSuchElementException.class, () -> { + Observable.empty().blockingLatest().iterator().next(); + }); } - @Test(expected = TestException.class) + @Test public void error() { - Observable.error(new TestException()).blockingLatest().iterator().next(); + assertThrows(TestException.class, () -> { + Observable.error(new TestException()).blockingLatest().iterator().next(); + }); } @Test @@ -208,7 +222,7 @@ public void interrupted() { try { it.hasNext(); } catch (RuntimeException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof InterruptedException); + assertTrue(ex.getCause() instanceof InterruptedException, ex.toString()); } Thread.interrupted(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/BlockingObservableMostRecentTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/BlockingObservableMostRecentTest.java index 75aabee78a..e2b2a8ac75 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/BlockingObservableMostRecentTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/BlockingObservableMostRecentTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.TimeUnit; -import org.junit.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.RxJavaTest; @@ -57,20 +57,22 @@ public void mostRecent() { } - @Test(expected = TestException.class) + @Test public void mostRecentWithException() { - Subject s = PublishSubject.create(); + assertThrows(TestException.class, () -> { + Subject s = PublishSubject.create(); - Iterator it = mostRecent(s, "default").iterator(); + Iterator it = mostRecent(s, "default").iterator(); - assertTrue(it.hasNext()); - assertEquals("default", it.next()); - assertEquals("default", it.next()); + assertTrue(it.hasNext()); + assertEquals("default", it.next()); + assertEquals("default", it.next()); - s.onError(new TestException()); - assertTrue(it.hasNext()); + s.onError(new TestException()); + assertTrue(it.hasNext()); - it.next(); + it.next(); + }); } @Test @@ -83,17 +85,17 @@ public void singleSourceManyIterators() { for (int j = 0; j < 3; j++) { Iterator it = iter.iterator(); - Assert.assertEquals(Long.valueOf(-1), it.next()); + assertEquals(Long.valueOf(-1), it.next()); for (int i = 0; i < 9; i++) { scheduler.advanceTimeBy(1, TimeUnit.SECONDS); - Assert.assertTrue(it.hasNext()); - Assert.assertEquals(Long.valueOf(i), it.next()); + assertTrue(it.hasNext()); + assertEquals(Long.valueOf(i), it.next()); } scheduler.advanceTimeBy(1, TimeUnit.SECONDS); - Assert.assertFalse(it.hasNext()); + assertFalse(it.hasNext()); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/BlockingObservableNextTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/BlockingObservableNextTest.java index d545e55580..40e2d56d45 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/BlockingObservableNextTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/BlockingObservableNextTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; @@ -260,7 +260,7 @@ public void noBufferingOrBlockingOfSequence() throws Throwable { assertTrue(it.hasNext()); int b = it.next(); // we should have a different value - assertTrue("a and b should be different", a != b); + assertTrue(a != b, "a and b should be different"); // wait for some time (if times out we are blocked somewhere so fail ... set very high for very slow, constrained machines) timeHasPassed.await(8000, TimeUnit.MILLISECONDS); @@ -268,8 +268,8 @@ public void noBufferingOrBlockingOfSequence() throws Throwable { assertTrue(it.hasNext()); int c = it.next(); - assertTrue("c should not just be the next in sequence", c != (b + 1)); - assertTrue("expected that c [" + c + "] is higher than or equal to " + COUNT, c >= COUNT); + assertTrue(c != (b + 1), "c should not just be the next in sequence"); + assertTrue(c >= COUNT, "expected that c [" + c + "] is higher than or equal to " + COUNT); assertTrue(it.hasNext()); int d = it.next(); @@ -307,8 +307,8 @@ public void singleSourceManyIterators() throws InterruptedException { BlockingObservableNext.NextIterator it = (BlockingObservableNext.NextIterator)iter.iterator(); for (long i = 0; i < 10; i++) { - Assert.assertTrue(it.hasNext()); - Assert.assertEquals(j + "th iteration next", Long.valueOf(i), it.next()); + assertTrue(it.hasNext()); + assertEquals(Long.valueOf(i), it.next(), j + "th iteration next"); } terminal.onNext(1); } @@ -329,13 +329,15 @@ public void interrupt() { Thread.currentThread().interrupt(); it.next(); } catch (RuntimeException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof InterruptedException); + assertTrue(ex.getCause() instanceof InterruptedException, ex.toString()); } } - @Test(expected = UnsupportedOperationException.class) + @Test public void remove() { - Observable.never().blockingNext().iterator().remove(); + assertThrows(UnsupportedOperationException.class, () -> { + Observable.never().blockingNext().iterator().remove(); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/BlockingObservableToFutureTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/BlockingObservableToFutureTest.java index 775f421d80..abcbda1ccb 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/BlockingObservableToFutureTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/BlockingObservableToFutureTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.*; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; +import io.reactivex.rxjava4.core.RxJavaTest; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; public class BlockingObservableToFutureTest extends RxJavaTest { @@ -42,18 +42,20 @@ public void toFutureList() throws InterruptedException, ExecutionException { assertEquals("three", f.get().get(2)); } - @Test(expected = IndexOutOfBoundsException.class) + @Test public void exceptionWithMoreThanOneElement() throws Throwable { - Observable obs = Observable.just("one", "two"); - Future f = obs.toFuture(); - try { - // we expect an exception since there are more than 1 element - f.get(); - fail("Should have thrown!"); - } - catch (ExecutionException e) { - throw e.getCause(); - } + assertThrows(IndexOutOfBoundsException.class, () -> { + Observable obs = Observable.just("one", "two"); + Future f = obs.toFuture(); + try { + // we expect an exception since there are more than 1 element + f.get(); + fail("Should have thrown!"); + } + catch (ExecutionException e) { + throw e.getCause(); + } + }); } @Test @@ -73,33 +75,39 @@ public void toFutureWithException() { } } - @Test(expected = CancellationException.class) + @Test public void getAfterCancel() throws Exception { - Observable obs = Observable.never(); - Future f = obs.toFuture(); - boolean cancelled = f.cancel(true); - assertTrue(cancelled); // because OperationNeverComplete never does - f.get(); // Future.get() docs require this to throw + assertThrows(CancellationException.class, () -> { + Observable obs = Observable.never(); + Future f = obs.toFuture(); + boolean cancelled = f.cancel(true); + assertTrue(cancelled); // because OperationNeverComplete never does + f.get(); // Future.get() docs require this to throw + }); } - @Test(expected = CancellationException.class) + @Test public void getWithTimeoutAfterCancel() throws Exception { - Observable obs = Observable.never(); - Future f = obs.toFuture(); - boolean cancelled = f.cancel(true); - assertTrue(cancelled); // because OperationNeverComplete never does - f.get(Long.MAX_VALUE, TimeUnit.NANOSECONDS); // Future.get() docs require this to throw + assertThrows(CancellationException.class, () -> { + Observable obs = Observable.never(); + Future f = obs.toFuture(); + boolean cancelled = f.cancel(true); + assertTrue(cancelled); // because OperationNeverComplete never does + f.get(Long.MAX_VALUE, TimeUnit.NANOSECONDS); // Future.get() docs require this to throw + }); } - @Test(expected = NoSuchElementException.class) + @Test public void getWithEmptyFlowable() throws Throwable { - Observable obs = Observable.empty(); - Future f = obs.toFuture(); - try { - f.get(); - } - catch (ExecutionException e) { - throw e.getCause(); - } + assertThrows(NoSuchElementException.class, () -> { + Observable obs = Observable.empty(); + Future f = obs.toFuture(); + try { + f.get(); + } + catch (ExecutionException e) { + throw e.getCause(); + } + }); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/BlockingObservableToIteratorTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/BlockingObservableToIteratorTest.java index eb818e9907..397ece20ac 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/BlockingObservableToIteratorTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/BlockingObservableToIteratorTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; +import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.internal.operators.observable.BlockingObservableIterable.BlockingObservableIterator; @@ -49,21 +49,23 @@ public void toIterator() { } - @Test(expected = TestException.class) + @Test public void toIteratorWithException() { - Observable obs = Observable.unsafeCreate(observer -> { - observer.onSubscribe(Disposable.empty()); - observer.onNext("one"); - observer.onError(new TestException()); - }); + assertThrows(TestException.class, () -> { + Observable obs = Observable.unsafeCreate(observer -> { + observer.onSubscribe(Disposable.empty()); + observer.onNext("one"); + observer.onError(new TestException()); + }); - Iterator it = obs.blockingIterable().iterator(); + Iterator it = obs.blockingIterable().iterator(); - assertTrue(it.hasNext()); - assertEquals("one", it.next()); + assertTrue(it.hasNext()); + assertEquals("one", it.next()); - assertTrue(it.hasNext()); - it.next(); + assertTrue(it.hasNext()); + it.next(); + }); } @Test @@ -86,30 +88,36 @@ public void interruptWait() { it.hasNext(); } catch (RuntimeException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof InterruptedException); + assertTrue(ex.getCause() instanceof InterruptedException, ex.toString()); } } - @Test(expected = NoSuchElementException.class) + @Test public void emptyThrowsNoSuch() { - BlockingObservableIterator it = new BlockingObservableIterator<>(128); - it.onComplete(); - it.next(); + assertThrows(NoSuchElementException.class, () -> { + BlockingObservableIterator it = new BlockingObservableIterator<>(128); + it.onComplete(); + it.next(); + }); } - @Test(expected = UnsupportedOperationException.class) + @Test public void remove() { - BlockingObservableIterator it = new BlockingObservableIterator<>(128); - it.remove(); + assertThrows(UnsupportedOperationException.class, () -> { + BlockingObservableIterator it = new BlockingObservableIterator<>(128); + it.remove(); + }); } - @Test(expected = NoSuchElementException.class) + @Test public void disposedIteratorHasNextReturns() { - Iterator it = PublishSubject.create() - .blockingIterable().iterator(); - ((Disposable)it).dispose(); - assertFalse(it.hasNext()); - it.next(); + assertThrows(NoSuchElementException.class, () -> { + Iterator it = PublishSubject.create() + .blockingIterable().iterator(); + ((Disposable)it).dispose(); + assertFalse(it.hasNext()); + it.next(); + }); } @Test @@ -122,12 +130,14 @@ public void asyncDisposeUnblocks() { assertFalse(it.hasNext()); } - @Test(expected = TestException.class) + @Test public void errorAfterDispose() { - Iterator it = Observable.error(new TestException()).blockingIterable().iterator(); + assertThrows(TestException.class, () -> { + Iterator it = Observable.error(new TestException()).blockingIterable().iterator(); - ((Disposable)it).dispose(); + ((Disposable)it).dispose(); - it.hasNext(); + it.hasNext(); + }); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableAllTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableAllTest.java index 73c70108bc..1414f441ec 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableAllTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableAllTest.java @@ -13,19 +13,19 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.List; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.testsupport.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableAmbTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableAmbTest.java index 021b489440..4ebf2b52a7 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableAmbTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableAmbTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.io.IOException; @@ -21,7 +21,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; @@ -29,7 +29,7 @@ import io.reactivex.rxjava4.core.Observer; import io.reactivex.rxjava4.disposables.*; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Consumer; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.plugins.RxJavaPlugins; @@ -42,7 +42,7 @@ public class ObservableAmbTest extends RxJavaTest { private TestScheduler scheduler; private Scheduler.Worker innerScheduler; - @Before + @BeforeEach public void setUp() { scheduler = new TestScheduler(); innerScheduler = scheduler.createWorker(); @@ -191,15 +191,15 @@ public void ambCancelsOthers() { Observable.ambArray(source1, source2, source3).subscribe(to); - assertTrue("Source 1 doesn't have subscribers!", source1.hasObservers()); - assertTrue("Source 2 doesn't have subscribers!", source2.hasObservers()); - assertTrue("Source 3 doesn't have subscribers!", source3.hasObservers()); + assertTrue(source1.hasObservers(), "Source 1 doesn't have subscribers!"); + assertTrue(source2.hasObservers(), "Source 2 doesn't have subscribers!"); + assertTrue(source3.hasObservers(), "Source 3 doesn't have subscribers!"); source1.onNext(1); - assertTrue("Source 1 doesn't have subscribers!", source1.hasObservers()); - assertFalse("Source 2 still has subscribers!", source2.hasObservers()); - assertFalse("Source 2 still has subscribers!", source3.hasObservers()); + assertTrue(source1.hasObservers(), "Source 1 doesn't have subscribers!"); + assertFalse(source2.hasObservers(), "Source 2 still has subscribers!"); + assertFalse(source3.hasObservers(), "Source 2 still has subscribers!"); } @@ -344,7 +344,7 @@ public void noWinnerSuccessDispose() throws Exception { }); assertTrue(cdl.await(500, TimeUnit.SECONDS)); - assertFalse("Interrupted!", interrupted.get()); + assertFalse(interrupted.get(), "Interrupted!"); } } @@ -367,7 +367,7 @@ public void noWinnerErrorDispose() throws Exception { }); assertTrue(cdl.await(500, TimeUnit.SECONDS)); - assertFalse("Interrupted!", interrupted.get()); + assertFalse(interrupted.get(), "Interrupted!"); } } @@ -389,7 +389,7 @@ public void noWinnerCompleteDispose() throws Exception { }); assertTrue(cdl.await(500, TimeUnit.SECONDS)); - assertFalse("Interrupted!", interrupted.get()); + assertFalse(interrupted.get(), "Interrupted!"); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableAnyTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableAnyTest.java index 9fa13099fa..83e0ceffca 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableAnyTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableAnyTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -21,12 +21,12 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.testsupport.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableAutoConnectTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableAutoConnectTest.java index d910345fc2..1293a2e358 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableAutoConnectTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableAutoConnectTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.subjects.PublishSubject; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableBlockingTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableBlockingTest.java index 2ac97eab5d..5f597a9dfa 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableBlockingTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableBlockingTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; @@ -165,22 +165,28 @@ public void onComplete() { assertEquals(Arrays.asList(1, 2, 3, 4, 5, ex), list); } - @Test(expected = TestException.class) + @Test public void blockingForEachThrows() { - Observable.just(1) - .blockingForEach(_ -> { - throw new TestException(); + assertThrows(TestException.class, () -> { + Observable.just(1) + .blockingForEach(_ -> { + throw new TestException(); + }); }); } - @Test(expected = NoSuchElementException.class) + @Test public void blockingFirstEmpty() { - Observable.empty().blockingFirst(); + assertThrows(NoSuchElementException.class, () -> { + Observable.empty().blockingFirst(); + }); } - @Test(expected = NoSuchElementException.class) + @Test public void blockingLastEmpty() { - Observable.empty().blockingLast(); + assertThrows(NoSuchElementException.class, () -> { + Observable.empty().blockingLast(); + }); } @Test @@ -193,9 +199,11 @@ public void blockingLastNormal() { assertEquals(2, Observable.just(1, 2).blockingLast(3).intValue()); } - @Test(expected = NoSuchElementException.class) + @Test public void blockingSingleEmpty() { - Observable.empty().blockingSingle(); + assertThrows(NoSuchElementException.class, () -> { + Observable.empty().blockingSingle(); + }); } @Test @@ -273,7 +281,7 @@ public void blockingCancelUpfront() { o.blockingGet(); fail("Should have thrown"); } catch (RuntimeException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof InterruptedException); + assertTrue(ex.getCause() instanceof InterruptedException, ex.toString()); } Thread.interrupted(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableBufferTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableBufferTest.java index 36e8722c1f..ee95ab92d1 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableBufferTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableBufferTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -22,13 +22,13 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; import io.reactivex.rxjava4.functions.*; import io.reactivex.rxjava4.internal.functions.Functions; @@ -46,7 +46,7 @@ public class ObservableBufferTest extends RxJavaTest { private TestScheduler scheduler; private Scheduler.Worker innerScheduler; - @Before + @BeforeEach public void before() { observer = TestHelper.mockObserver(); scheduler = new TestScheduler(); @@ -1087,7 +1087,7 @@ public void withTimeAndSizeCapacityRace() { items += o.size(); } - assertEquals("Round: " + i, 5, items); + assertEquals(5, items, "Round: " + i); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableBufferUntilSubscriberTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableBufferUntilSubscriberTest.java index feb2f85b97..5d03e3a590 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableBufferUntilSubscriberTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableBufferUntilSubscriberTest.java @@ -13,13 +13,15 @@ package io.reactivex.rxjava4.internal.operators.observable; +import static org.junit.jupiter.api.Assertions.*; + import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.schedulers.Schedulers; import io.reactivex.rxjava4.subjects.PublishSubject; @@ -59,13 +61,13 @@ public void issue1677() throws InterruptedException { }) .subscribe(); if (!innerLatch.await(30, TimeUnit.SECONDS)) { - Assert.fail("Failed inner latch wait, iteration " + iters); + fail("Failed inner latch wait, iteration " + iters); } } if (!latch.await(30, TimeUnit.SECONDS)) { - Assert.fail("Incomplete! Went through " + latch.getCount() + " iterations"); + fail("Incomplete! Went through " + latch.getCount() + " iterations"); } else { - Assert.assertEquals(NITERS, counter.get()); + assertEquals(NITERS, counter.get()); } } } 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 d92f9b6408..bacf81d55d 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 @@ -13,26 +13,22 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; -import java.lang.management.ManagementFactory; -import java.lang.management.MemoryMXBean; -import java.lang.management.MemoryUsage; +import java.lang.management.*; import java.util.*; import java.util.concurrent.*; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.atomic.*; -import io.reactivex.rxjava4.observables.ConnectableObservable; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Action; +import io.reactivex.rxjava4.observables.ConnectableObservable; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.schedulers.Schedulers; import io.reactivex.rxjava4.subjects.PublishSubject; @@ -43,14 +39,14 @@ public class ObservableCacheTest extends RxJavaTest { public void coldReplayNoBackpressure() { ObservableCache source = new ObservableCache<>(Observable.range(0, 1000), 16); - assertFalse("Source is connected!", source.isConnected()); + assertFalse(source.isConnected(), "Source is connected!"); TestObserverEx to = new TestObserverEx<>(); source.subscribe(to); - assertTrue("Source is not connected!", source.isConnected()); - assertFalse("Subscribers retained!", source.hasObservers()); + assertTrue(source.isConnected(), "Source is not connected!"); + assertFalse(source.hasObservers(), "Subscribers retained!"); to.assertNoErrors(); to.assertTerminated(); @@ -80,14 +76,14 @@ public void cache() throws InterruptedException { // subscribe once o.subscribe(v -> { - Assert.assertEquals("one", v); + assertEquals("one", v); System.out.println("v: " + v); latch.countDown(); }); // subscribe again o.subscribe(v -> { - Assert.assertEquals("one", v); + assertEquals("one", v); System.out.println("v: " + v); latch.countDown(); }); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCastTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCastTest.java index 63c0e3ba9e..014cdfa83f 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCastTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCastTest.java @@ -16,7 +16,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCollectTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCollectTest.java index a0e1a9b96c..d8eeb45c72 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCollectTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCollectTest.java @@ -14,13 +14,13 @@ package io.reactivex.rxjava4.internal.operators.observable; import static io.reactivex.rxjava4.internal.util.TestingHelper.*; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCombineLatestTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCombineLatestTest.java index bc63ebcbf3..7835ce3ca4 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCombineLatestTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCombineLatestTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -21,7 +21,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.*; import io.reactivex.rxjava4.core.*; @@ -835,7 +835,7 @@ public void onErrorRace() { .assertNoValues(); for (Throwable e : TestHelper.errorList(to)) { - assertTrue(e.toString(), e instanceof TestException); + assertTrue(e instanceof TestException, e.toString()); } } else { @@ -844,7 +844,7 @@ public void onErrorRace() { } for (Throwable e : errors) { - assertTrue(e.toString(), e.getCause() instanceof TestException); + assertTrue(e.getCause() instanceof TestException, e.toString()); } } finally { RxJavaPlugins.reset(); @@ -867,7 +867,7 @@ public void dontSubscribeIfDone() { assertEquals(0, count[0]); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } @@ -892,7 +892,7 @@ public void dontSubscribeIfDone2() { assertEquals(0, count[0]); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } @@ -932,7 +932,7 @@ public void combine2Observable2Errors() throws Exception { testObserver.awaitDone(5, TimeUnit.SECONDS); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatMapCompletableTest.java index 6d43a5c158..770c54d980 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatMapCompletableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatMapCompletableTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.observers.TestObserver; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatMapEagerTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatMapEagerTest.java index 54f775a605..8310a678e5 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatMapEagerTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatMapEagerTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.lang.reflect.Method; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; @@ -128,7 +128,7 @@ public void mainErrorsImmediate() { main.onError(new TestException("Forced failure")); - assertFalse("inner has subscribers?", inner.hasObservers()); + assertFalse(inner.hasObservers(), "inner has subscribers?"); inner.onNext(3); inner.onComplete(); @@ -153,7 +153,7 @@ public void longEager() { Function> toRange = t -> Observable.range(t, 2); - @Before + @BeforeEach public void before() { to = new TestObserver<>(); } @@ -183,7 +183,7 @@ public void eagerness2() { Observable.concatArrayEager(source, source).subscribe(to); - Assert.assertEquals(2, count.get()); + assertEquals(2, count.get()); to.assertValueCount(count.get()); to.assertNoErrors(); @@ -197,7 +197,7 @@ public void eagerness3() { Observable.concatArrayEager(source, source, source).subscribe(to); - Assert.assertEquals(3, count.get()); + assertEquals(3, count.get()); to.assertValueCount(count.get()); to.assertNoErrors(); @@ -211,7 +211,7 @@ public void eagerness4() { Observable.concatArrayEager(source, source, source, source).subscribe(to); - Assert.assertEquals(4, count.get()); + assertEquals(4, count.get()); to.assertValueCount(count.get()); to.assertNoErrors(); @@ -225,7 +225,7 @@ public void eagerness5() { Observable.concatArrayEager(source, source, source, source, source).subscribe(to); - Assert.assertEquals(5, count.get()); + assertEquals(5, count.get()); to.assertValueCount(count.get()); to.assertNoErrors(); @@ -239,7 +239,7 @@ public void eagerness6() { Observable.concatArrayEager(source, source, source, source, source, source).subscribe(to); - Assert.assertEquals(6, count.get()); + assertEquals(6, count.get()); to.assertValueCount(count.get()); to.assertNoErrors(); @@ -253,7 +253,7 @@ public void eagerness7() { Observable.concatArrayEager(source, source, source, source, source, source, source).subscribe(to); - Assert.assertEquals(7, count.get()); + assertEquals(7, count.get()); to.assertValueCount(count.get()); to.assertNoErrors(); @@ -267,7 +267,7 @@ public void eagerness8() { Observable.concatArrayEager(source, source, source, source, source, source, source, source).subscribe(to); - Assert.assertEquals(8, count.get()); + assertEquals(8, count.get()); to.assertValueCount(count.get()); to.assertNoErrors(); @@ -281,7 +281,7 @@ public void eagerness9() { Observable.concatArrayEager(source, source, source, source, source, source, source, source, source).subscribe(to); - Assert.assertEquals(9, count.get()); + assertEquals(9, count.get()); to.assertValueCount(count.get()); to.assertNoErrors(); @@ -333,14 +333,20 @@ public void mapperThrows() { to.assertError(TestException.class); } - @Test(expected = IllegalArgumentException.class) + @Test public void invalidMaxConcurrent() { - assertNotNull(Observable.just(1).concatMapEager(toJust, new StandardConcurrentBufferedConfig(ErrorMode.IMMEDIATE, 0, Observable.bufferSize()))); + assertThrows(IllegalArgumentException.class, () -> { + assertNotNull(Observable.just(1) + .concatMapEager(toJust, new StandardConcurrentBufferedConfig(ErrorMode.IMMEDIATE, 0, Observable.bufferSize()))); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void invalidCapacityHint() { - assertNotNull(Observable.just(1).concatMapEager(toJust, new StandardConcurrentBufferedConfig(ErrorMode.IMMEDIATE, Observable.bufferSize(), 0))); + assertThrows(IllegalArgumentException.class, () -> { + assertNotNull(Observable.just(1) + .concatMapEager(toJust, new StandardConcurrentBufferedConfig(ErrorMode.IMMEDIATE, Observable.bufferSize(), 0))); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatMapSchedulerTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatMapSchedulerTest.java index 426745f4cf..a95dd015a8 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatMapSchedulerTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatMapSchedulerTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.lang.reflect.Method; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; @@ -152,7 +152,7 @@ public void mapperScheduled() { .assertNoErrors() .assertComplete(); - assertTrue(to.values().toString(), to.values().getFirst().startsWith("RxSingleScheduler-")); + assertTrue(to.values().getFirst().startsWith("RxSingleScheduler-"), to.values().toString()); } @Test @@ -166,7 +166,7 @@ public void mapperScheduledHidden() { .assertNoErrors() .assertComplete(); - assertTrue(to.values().toString(), to.values().getFirst().startsWith("RxSingleScheduler-")); + assertTrue(to.values().getFirst().startsWith("RxSingleScheduler-"), to.values().toString()); } @Test @@ -180,7 +180,7 @@ public void mapperDelayErrorScheduled() { .assertNoErrors() .assertComplete(); - assertTrue(to.values().toString(), to.values().getFirst().startsWith("RxSingleScheduler-")); + assertTrue(to.values().getFirst().startsWith("RxSingleScheduler-"), to.values().toString()); } @Test @@ -194,7 +194,7 @@ public void mapperDelayErrorScheduledHidden() { .assertNoErrors() .assertComplete(); - assertTrue(to.values().toString(), to.values().getFirst().startsWith("RxSingleScheduler-")); + assertTrue(to.values().getFirst().startsWith("RxSingleScheduler-"), to.values().toString()); } @Test @@ -207,7 +207,7 @@ public void mapperDelayError2Scheduled() { .assertNoErrors() .assertComplete(); - assertTrue(to.values().toString(), to.values().getFirst().startsWith("RxSingleScheduler-")); + assertTrue(to.values().getFirst().startsWith("RxSingleScheduler-"), to.values().toString()); } @Test @@ -221,7 +221,7 @@ public void mapperDelayError2ScheduledHidden() { .assertNoErrors() .assertComplete(); - assertTrue(to.values().toString(), to.values().getFirst().startsWith("RxSingleScheduler-")); + assertTrue(to.values().getFirst().startsWith("RxSingleScheduler-"), to.values().toString()); } @Test @@ -799,7 +799,7 @@ public void mapperScheduledLong() { .assertNoErrors() .assertComplete(); - assertTrue(to.values().toString(), to.values().getFirst().startsWith("RxSingleScheduler-")); + assertTrue(to.values().getFirst().startsWith("RxSingleScheduler-"), to.values().toString()); } @Test @@ -817,7 +817,7 @@ public void mapperDelayErrorScheduledLong() { .assertNoErrors() .assertComplete(); - assertTrue(to.values().toString(), to.values().getFirst().startsWith("RxSingleScheduler-")); + assertTrue(to.values().getFirst().startsWith("RxSingleScheduler-"), to.values().toString()); } @Test @@ -835,7 +835,7 @@ public void mapperDelayError2ScheduledLong() { .assertNoErrors() .assertComplete(); - assertTrue(to.values().toString(), to.values().getFirst().startsWith("RxSingleScheduler-")); + assertTrue(to.values().getFirst().startsWith("RxSingleScheduler-"), to.values().toString()); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatMapTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatMapTest.java index f291a75f5c..15af78b7c5 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatMapTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatMapTest.java @@ -13,19 +13,19 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.internal.operators.observable.ObservableConcatMapSchedulerTest.EmptyDisposingObservable; import io.reactivex.rxjava4.observers.TestObserver; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatTest.java index 5c91d85f54..3c261f2ffe 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -21,13 +21,13 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; -import io.reactivex.rxjava4.core.config.*; +import io.reactivex.rxjava4.core.config.StandardBufferedConfig; import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.Function; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatWithCompletableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatWithCompletableTest.java index adea898aeb..cd9d2eb707 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatWithCompletableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatWithCompletableTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.subjects.CompletableSubject; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatWithMaybeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatWithMaybeTest.java index 9b02c50ddf..5707e07213 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatWithMaybeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatWithMaybeTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.subjects.MaybeSubject; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatWithSingleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatWithSingleTest.java index a022ae8ec6..f79b5311ec 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatWithSingleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableConcatWithSingleTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.subjects.SingleSubject; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCountTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCountTest.java index ec774ffaa2..9000bdd302 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCountTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCountTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCreateTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCreateTest.java index 31dbf3301c..fb8b785359 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCreateTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableCreateTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; @@ -181,9 +181,11 @@ public void unsafe() { .assertResult(1, 2, 3, 4, 5); } - @Test(expected = IllegalArgumentException.class) + @Test public void unsafeWithObservable() { - Observable.unsafeCreate(Observable.just(1)); + assertThrows(IllegalArgumentException.class, () -> { + Observable.unsafeCreate(Observable.just(1)); + }); } @Test @@ -356,7 +358,7 @@ public void serialized() { .test() .assertResult(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } @@ -435,7 +437,7 @@ public void serializedConcurrentOnNextOnComplete() { .assertNoErrors(); int c = to.values().size(); - assertTrue("" + c, c >= 100); + assertTrue(c >= 100, "" + c); } @Test @@ -500,7 +502,7 @@ public void tryOnError() { assertFalse(response[0]); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } @@ -522,7 +524,7 @@ public void tryOnErrorSerialized() { assertFalse(response[0]); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDebounceTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDebounceTest.java index d2ff57fcb3..96222b3bdf 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDebounceTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDebounceTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -21,13 +21,13 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.rxjava4.functions.Action; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; + import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.Function; +import io.reactivex.rxjava4.functions.*; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.internal.operators.observable.ObservableDebounceTimed.*; import io.reactivex.rxjava4.observers.TestObserver; @@ -42,7 +42,7 @@ public class ObservableDebounceTest extends RxJavaTest { private Observer observer; private Scheduler.Worker innerScheduler; - @Before + @BeforeEach public void before() { scheduler = new TestScheduler(); observer = TestHelper.mockObserver(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDefaultIfEmptyTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDefaultIfEmptyTest.java index 773dda160b..7611b3dbaf 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDefaultIfEmptyTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDefaultIfEmptyTest.java @@ -16,7 +16,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDeferTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDeferTest.java index 85a4cfd7c3..cd25bf18dd 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDeferTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDeferTest.java @@ -16,7 +16,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDelaySubscriptionOtherTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDelaySubscriptionOtherTest.java index 776c68bda8..173dd4f626 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDelaySubscriptionOtherTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDelaySubscriptionOtherTest.java @@ -13,10 +13,12 @@ package io.reactivex.rxjava4.internal.operators.observable; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -43,11 +45,11 @@ public void noPrematureSubscription() { to.assertNoErrors(); to.assertNoValues(); - Assert.assertEquals("Premature subscription", 0, subscribed.get()); + assertEquals(0, subscribed.get(), "Premature subscription"); other.onNext(1); - Assert.assertEquals("No subscription", 1, subscribed.get()); + assertEquals(1, subscribed.get(), "No subscription"); to.assertValue(1); to.assertNoErrors(); @@ -71,12 +73,12 @@ public void noMultipleSubscriptions() { to.assertNoErrors(); to.assertNoValues(); - Assert.assertEquals("Premature subscription", 0, subscribed.get()); + assertEquals(0, subscribed.get(), "Premature subscription"); other.onNext(1); other.onNext(2); - Assert.assertEquals("No subscription", 1, subscribed.get()); + assertEquals(1, subscribed.get(), "No subscription"); to.assertValue(1); to.assertNoErrors(); @@ -100,11 +102,11 @@ public void completeTriggersSubscription() { to.assertNoErrors(); to.assertNoValues(); - Assert.assertEquals("Premature subscription", 0, subscribed.get()); + assertEquals(0, subscribed.get(), "Premature subscription"); other.onComplete(); - Assert.assertEquals("No subscription", 1, subscribed.get()); + assertEquals(1, subscribed.get(), "No subscription"); to.assertValue(1); to.assertNoErrors(); @@ -128,11 +130,11 @@ public void noPrematureSubscriptionToError() { to.assertNoErrors(); to.assertNoValues(); - Assert.assertEquals("Premature subscription", 0, subscribed.get()); + assertEquals(0, subscribed.get(), "Premature subscription"); other.onComplete(); - Assert.assertEquals("No subscription", 1, subscribed.get()); + assertEquals(1, subscribed.get(), "No subscription"); to.assertNoValues(); to.assertNotComplete(); @@ -156,11 +158,11 @@ public void noSubscriptionIfOtherErrors() { to.assertNoErrors(); to.assertNoValues(); - Assert.assertEquals("Premature subscription", 0, subscribed.get()); + assertEquals(0, subscribed.get(), "Premature subscription"); other.onError(new TestException()); - Assert.assertEquals("Premature subscription", 0, subscribed.get()); + assertEquals(0, subscribed.get(), "Premature subscription"); to.assertNoValues(); to.assertNotComplete(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDelayTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDelayTest.java index ebd773088c..3bce79f63d 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDelayTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDelayTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.LockSupport; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; @@ -43,7 +43,7 @@ public class ObservableDelayTest extends RxJavaTest { private TestScheduler scheduler; - @Before + @BeforeEach public void before() { observer = TestHelper.mockObserver(); observer2 = TestHelper.mockObserver(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDematerializeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDematerializeTest.java index d41fd78b1e..b8e3de4a02 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDematerializeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDematerializeTest.java @@ -18,10 +18,10 @@ import java.util.List; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDetachTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDetachTest.java index 4b6a1b976f..e381915cd4 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDetachTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDetachTest.java @@ -13,9 +13,11 @@ package io.reactivex.rxjava4.internal.operators.observable; +import static org.junit.jupiter.api.Assertions.assertNull; + import java.lang.ref.WeakReference; -import org.junit.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -45,7 +47,7 @@ public void just() throws Exception { System.gc(); Thread.sleep(200); - Assert.assertNull("Object retained!", wr.get()); + assertNull(wr.get(), "Object retained!"); } @@ -96,7 +98,7 @@ public void justUnsubscribed() throws Exception { System.gc(); Thread.sleep(200); - Assert.assertNull("Object retained!", wr.get()); + assertNull(wr.get(), "Object retained!"); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDistinctTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDistinctTest.java index a79bfbf504..ed53a15468 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDistinctTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDistinctTest.java @@ -13,25 +13,24 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.*; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; import io.reactivex.rxjava4.core.RxJavaTest; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.*; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.internal.util.ExceptionHelper; -import io.reactivex.rxjava4.operators.QueueDisposable; -import io.reactivex.rxjava4.operators.QueueFuseable; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.subjects.UnicastSubject; import io.reactivex.rxjava4.testsupport.*; @@ -48,7 +47,7 @@ public class ObservableDistinctTest extends RxJavaTest { return s.toUpperCase(); }; - @Before + @BeforeEach public void before() { w = TestHelper.mockObserver(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDistinctUntilChangedTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDistinctUntilChangedTest.java index 98acb5d05f..0f035440f3 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDistinctUntilChangedTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDistinctUntilChangedTest.java @@ -19,13 +19,13 @@ import java.io.IOException; import java.util.List; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.operators.QueueFuseable; import io.reactivex.rxjava4.plugins.RxJavaPlugins; @@ -45,7 +45,7 @@ public class ObservableDistinctUntilChangedTest extends RxJavaTest { return s.toUpperCase(); }; - @Before + @BeforeEach public void before() { w = TestHelper.mockObserver(); w2 = TestHelper.mockObserver(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDoAfterNextTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDoAfterNextTest.java index 6eb21216ce..bdd98d4c0b 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDoAfterNextTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDoAfterNextTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.RxJavaTest; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDoFinallyTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDoFinallyTest.java index 10a64e488e..5cbee4a8a7 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDoFinallyTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDoFinallyTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; @@ -26,8 +26,7 @@ import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.*; import io.reactivex.rxjava4.internal.functions.Functions; -import io.reactivex.rxjava4.operators.QueueDisposable; -import io.reactivex.rxjava4.operators.QueueFuseable; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.subjects.UnicastSubject; import io.reactivex.rxjava4.testsupport.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDoOnEachTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDoOnEachTest.java index 44a95b393c..91e46161e8 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDoOnEachTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDoOnEachTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -21,10 +21,10 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.observers.TestObserver; @@ -38,7 +38,7 @@ public class ObservableDoOnEachTest extends RxJavaTest { Observer subscribedObserver; Observer sideEffectObserver; - @Before + @BeforeEach public void before() { subscribedObserver = TestHelper.mockObserver(); sideEffectObserver = TestHelper.mockObserver(); @@ -159,8 +159,8 @@ public void onErrorThrows() { List exceptions = ex.getExceptions(); assertEquals(2, exceptions.size()); - Assert.assertTrue(exceptions.get(0) instanceof TestException); - Assert.assertTrue(exceptions.get(1) instanceof TestException); + assertTrue(exceptions.get(0) instanceof TestException); + assertTrue(exceptions.get(1) instanceof TestException); } @Test @@ -353,7 +353,7 @@ public void onErrorOnErrorCrashConditional() { } @Test - @Ignore("Fusion not supported yet") // TODO decide/implement fusion + @Disabled("Fusion not supported yet") // TODO decide/implement fusion public void fused() { TestObserverEx to = new TestObserverEx<>(QueueFuseable.ANY); @@ -373,7 +373,7 @@ public void fused() { } @Test - @Ignore("Fusion not supported yet") // TODO decide/implement fusion + @Disabled("Fusion not supported yet") // TODO decide/implement fusion public void fusedOnErrorCrash() { TestObserverEx to = new TestObserverEx<>(QueueFuseable.ANY); @@ -394,7 +394,7 @@ public void fusedOnErrorCrash() { } @Test - @Ignore("Fusion not supported yet") // TODO decide/implement fusion + @Disabled("Fusion not supported yet") // TODO decide/implement fusion public void fusedConditional() { TestObserverEx to = new TestObserverEx<>(QueueFuseable.ANY); @@ -415,7 +415,7 @@ public void fusedConditional() { } @Test - @Ignore("Fusion not supported yet") // TODO decide/implement fusion + @Disabled("Fusion not supported yet") // TODO decide/implement fusion public void fusedOnErrorCrashConditional() { TestObserverEx to = new TestObserverEx<>(QueueFuseable.ANY); @@ -437,7 +437,7 @@ public void fusedOnErrorCrashConditional() { } @Test - @Ignore("Fusion not supported yet") // TODO decide/implement fusion + @Disabled("Fusion not supported yet") // TODO decide/implement fusion public void fusedAsync() { TestObserverEx to = new TestObserverEx<>(QueueFuseable.ANY); @@ -461,7 +461,7 @@ public void fusedAsync() { } @Test - @Ignore("Fusion not supported yet") // TODO decide/implement fusion + @Disabled("Fusion not supported yet") // TODO decide/implement fusion public void fusedAsyncConditional() { TestObserverEx to = new TestObserverEx<>(QueueFuseable.ANY); @@ -486,7 +486,7 @@ public void fusedAsyncConditional() { } @Test - @Ignore("Fusion not supported yet") // TODO decide/implement fusion + @Disabled("Fusion not supported yet") // TODO decide/implement fusion public void fusedAsyncConditional2() { TestObserverEx to = new TestObserverEx<>(QueueFuseable.ANY); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDoOnSubscribeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDoOnSubscribeTest.java index c3fef7242a..b8f67ebb84 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDoOnSubscribeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDoOnSubscribeTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDoOnUnsubscribeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDoOnUnsubscribeTest.java index 152f491d1d..fbde12f03f 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDoOnUnsubscribeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableDoOnUnsubscribeTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.RxJavaTest; @@ -78,8 +78,8 @@ public void doOnUnsubscribe() throws Exception { upperLatch.await(); lowerLatch.await(); - assertEquals(String.format("There should exactly %d un-subscription events for upper stream", subCount), subCount, upperCount.get()); - assertEquals(String.format("There should exactly %d un-subscription events for lower stream", subCount), subCount, lowerCount.get()); + assertEquals(subCount, upperCount.get(), String.format("There should exactly %d un-subscription events for upper stream", subCount)); + assertEquals(subCount, lowerCount.get(), String.format("There should exactly %d un-subscription events for lower stream", subCount)); } @Test @@ -132,8 +132,8 @@ public void doOnUnSubscribeWorksWithRefCount() throws Exception { upperLatch.await(); lowerLatch.await(); - assertEquals("There should exactly 1 un-subscription events for upper stream", 1, upperCount.get()); - assertEquals("There should exactly 1 un-subscription events for lower stream", 1, lowerCount.get()); + assertEquals(1, upperCount.get(), "There should exactly 1 un-subscription events for upper stream"); + assertEquals(1, lowerCount.get(), "There should exactly 1 un-subscription events for lower stream"); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableElementAtTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableElementAtTest.java index 4f274c1e86..b12ce1b31a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableElementAtTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableElementAtTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; +import io.reactivex.rxjava4.core.RxJavaTest; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.subjects.PublishSubject; @@ -57,9 +57,11 @@ public void elementAt() { .intValue()); } - @Test(expected = IndexOutOfBoundsException.class) + @Test public void elementAtWithMinusIndex() { - Observable.fromArray(1, 2).elementAt(-1); + assertThrows(IndexOutOfBoundsException.class, () -> { + Observable.fromArray(1, 2).elementAt(-1); + }); } @Test @@ -77,15 +79,19 @@ public void elementAtOrDefaultWithIndexOutOfBounds() { assertEquals(0, Observable.fromArray(1, 2).elementAt(2, 0).blockingGet().intValue()); } - @Test(expected = IndexOutOfBoundsException.class) + @Test public void elementAtOrDefaultWithMinusIndex() { - Observable.fromArray(1, 2).elementAt(-1, 0); + assertThrows(IndexOutOfBoundsException.class, () -> { + Observable.fromArray(1, 2).elementAt(-1, 0); + }); } - @Test(expected = IndexOutOfBoundsException.class) + @Test public void elementAtOrErrorNegativeIndex() { - Observable.empty() + assertThrows(IndexOutOfBoundsException.class, () -> { + Observable.empty() .elementAtOrError(-1); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFilterTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFilterTest.java index 505495e497..6bf041bb14 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFilterTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFilterTest.java @@ -16,7 +16,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFinallyTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFinallyTest.java index 9e36ebf0c7..65aeb94cbe 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFinallyTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFinallyTest.java @@ -15,7 +15,7 @@ import static org.mockito.Mockito.*; -import org.junit.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.functions.Action; @@ -28,7 +28,7 @@ public class ObservableFinallyTest extends RxJavaTest { private Observer observer; // mocking has to be unchecked, unfortunately - @Before + @BeforeEach public void before() { aAction0 = mock(Action.class); observer = TestHelper.mockObserver(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFirstTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFirstTest.java index 92507ce01e..40ed5fb6bc 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFirstTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFirstTest.java @@ -18,7 +18,7 @@ import java.util.NoSuchElementException; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; @@ -33,7 +33,7 @@ public class ObservableFirstTest extends RxJavaTest { private static final Predicate IS_D = "d"::equals; - @Before + @BeforeEach public void before() { w = TestHelper.mockObserver(); wo = TestHelper.mockSingleObserver(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFlatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFlatMapCompletableTest.java index 5a2042170a..4efa6cf22b 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFlatMapCompletableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFlatMapCompletableTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardConcurrentBufferedConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFlatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFlatMapMaybeTest.java index 6a8d4fe321..ce26336038 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFlatMapMaybeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFlatMapMaybeTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardConcurrentBufferedConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFlatMapSingleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFlatMapSingleTest.java index 92671fd9d2..396bb857e0 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFlatMapSingleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFlatMapSingleTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardConcurrentBufferedConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFlatMapTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFlatMapTest.java index 0d398ceee7..645e2bec86 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFlatMapTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFlatMapTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -22,13 +22,13 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.rxjava4.core.config.StandardConcurrentBufferedConfig; -import org.junit.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; +import io.reactivex.rxjava4.core.config.StandardConcurrentBufferedConfig; import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; import io.reactivex.rxjava4.functions.*; @@ -254,12 +254,12 @@ private static Observable composer(Observable source, final AtomicInte return source.doOnSubscribe(_ -> { int n = subscriptionCount.getAndIncrement(); if (n >= m) { - Assert.fail("Too many subscriptions! " + (n + 1)); + fail("Too many subscriptions! " + (n + 1)); } }).doOnComplete(() -> { int n = subscriptionCount.decrementAndGet(); if (n < 0) { - Assert.fail("Too many unsubscriptions! " + (n - 1)); + fail("Too many unsubscriptions! " + (n - 1)); } }); } @@ -281,8 +281,8 @@ public void flatMapMaxConcurrent() { Set expected = new HashSet<>(Arrays.asList( 10, 11, 20, 21, 30, 31, 40, 41, 50, 51, 60, 61, 70, 71, 80, 81, 90, 91, 100, 101 )); - Assert.assertEquals(expected.size(), to.values().size()); - Assert.assertTrue(expected.containsAll(to.values())); + assertEquals(expected.size(), to.values().size()); + assertTrue(expected.containsAll(to.values())); } @Test @@ -303,9 +303,9 @@ public void flatMapSelectorMaxConcurrent() { 1010, 1011, 2020, 2021, 3030, 3031, 4040, 4041, 5050, 5051, 6060, 6061, 7070, 7071, 8080, 8081, 9090, 9091, 10100, 10101 )); - Assert.assertEquals(expected.size(), to.values().size()); + assertEquals(expected.size(), to.values().size()); System.out.println("--> testFlatMapSelectorMaxConcurrent: " + to.values()); - Assert.assertTrue(expected.containsAll(to.values())); + assertTrue(expected.containsAll(to.values())); } @Test @@ -590,8 +590,8 @@ public void noCrossBoundaryFusion() { List list = to.values(); - assertTrue(list.toString(), list.contains("RxSi")); - assertTrue(list.toString(), list.contains("RxCo")); + assertTrue(list.contains("RxSi"), list.toString()); + assertTrue(list.contains("RxCo"), list.toString()); } } @@ -610,7 +610,7 @@ public void cancelScalarDrainRace() { TestHelper.race(r1, r2); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } @@ -641,7 +641,7 @@ public void cancelDrainRace() { TestHelper.race(r1, r2); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } @@ -838,11 +838,11 @@ public void mainErrorsInnerCancelled() { .test(); ps1.onNext(1); - assertTrue("No subscribers?", ps2.hasObservers()); + assertTrue(ps2.hasObservers(), "No subscribers?"); ps1.onError(new TestException()); - assertFalse("Has subscribers?", ps2.hasObservers()); + assertFalse(ps2.hasObservers(), "Has subscribers?"); } @Test @@ -855,11 +855,11 @@ public void innerErrorsMainCancelled() { .test(); ps1.onNext(1); - assertTrue("No subscribers?", ps2.hasObservers()); + assertTrue(ps2.hasObservers(), "No subscribers?"); ps2.onError(new TestException()); - assertFalse("Has subscribers?", ps1.hasObservers()); + assertFalse(ps1.hasObservers(), "Has subscribers?"); } @Test @@ -987,7 +987,7 @@ public void fusedInnerCrash2() { to.assertFailure(TestException.class, 1, 2); } - @Test(timeout = 5000) + @Test @Timeout(value = 5000, unit = TimeUnit.MILLISECONDS) public void mixedScalarAsync() { for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { Observable diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFlattenIterableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFlattenIterableTest.java index 195b0acbc0..5402a7c62a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFlattenIterableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFlattenIterableTest.java @@ -13,17 +13,17 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.subjects.PublishSubject; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableForEachTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableForEachTest.java index bd4d9d89e3..b9a88e2f8f 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableForEachTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableForEachTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.RxJavaTest; @@ -80,7 +80,7 @@ public void whilePredicateThrows() { TestHelper.assertError(errors, 0, OnErrorNotImplementedException.class); Throwable c = errors.getFirst().getCause(); - assertTrue("" + c, c instanceof TestException); + assertTrue(c instanceof TestException, "" + c); } finally { RxJavaPlugins.reset(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromActionTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromActionTest.java index b71c8da16e..7b76eff777 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromActionTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromActionTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.List; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.functions.*; @@ -92,7 +92,7 @@ public void callable() throws Throwable { Observable m = Observable.fromAction(() -> counter[0]++); - assertTrue(m.getClass().toString(), m instanceof Supplier); + assertTrue(m instanceof Supplier, m.getClass().toString()); assertNull(((Supplier)m).get()); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromCallableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromCallableTest.java index b091e97ffb..dfd5ffdada 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromCallableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromCallableTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.List; import java.util.concurrent.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.stubbing.Answer; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromCompletableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromCompletableTest.java index b535912853..42b69c3a90 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromCompletableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromCompletableTest.java @@ -13,18 +13,18 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.List; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.functions.*; -import io.reactivex.rxjava4.internal.fuseable.*; +import io.reactivex.rxjava4.functions.Action; +import io.reactivex.rxjava4.internal.fuseable.HasUpstreamCompletableSource; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.operators.QueueFuseable; import io.reactivex.rxjava4.plugins.RxJavaPlugins; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromIterableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromIterableTest.java index 5d2b5317be..00acebacf7 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromIterableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromIterableTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import io.reactivex.rxjava4.core.*; @@ -31,8 +31,7 @@ import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.util.CrashingIterable; import io.reactivex.rxjava4.observers.*; -import io.reactivex.rxjava4.operators.QueueDisposable; -import io.reactivex.rxjava4.operators.QueueFuseable; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.testsupport.*; public class ObservableFromIterableTest extends RxJavaTest { diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromMaybeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromMaybeTest.java index 9f4de844a7..d6e14c4a9f 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromMaybeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromMaybeTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromRunnableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromRunnableTest.java index e7b7a62852..eb0550562b 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromRunnableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromRunnableTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.List; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -93,7 +93,7 @@ public void callable() throws Throwable { Observable m = Observable.fromRunnable(() -> counter[0]++); - assertTrue(m.getClass().toString(), m instanceof Supplier); + assertTrue(m instanceof Supplier, m.getClass().toString()); assertNull(((Supplier)m).get()); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromSingleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromSingleTest.java index ec15db89f2..124eecbc7c 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromSingleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromSingleTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromSupplierTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromSupplierTest.java index a9dd52b082..1b95093c65 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromSupplierTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromSupplierTest.java @@ -13,20 +13,20 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.List; import java.util.concurrent.CountDownLatch; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.stubbing.Answer; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Supplier; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.schedulers.Schedulers; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromTest.java index 673ba61643..843c611984 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableFromTest.java @@ -13,15 +13,14 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.operators.QueueFuseable; -import io.reactivex.rxjava4.operators.ScalarSupplier; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.schedulers.Schedulers; import io.reactivex.rxjava4.testsupport.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableGenerateTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableGenerateTest.java index f481d67c3f..dd3f6560e4 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableGenerateTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableGenerateTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.BiConsumer; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableGroupByTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableGroupByTest.java index f71a5139d3..0471e51931 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableGroupByTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableGroupByTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -21,7 +21,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import io.reactivex.rxjava4.core.*; @@ -1035,7 +1035,7 @@ public void cancelOverFlatmapRace() { TestHelper.race(r1, r2); - assertFalse("Round " + i, ps.hasObservers()); + assertFalse(ps.hasObservers(), "Round " + i); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableGroupJoinTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableGroupJoinTest.java index 8f975f943a..98a33ea0e2 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableGroupJoinTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableGroupJoinTest.java @@ -13,18 +13,18 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.*; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.MockitoAnnotations; -import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; +import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; import io.reactivex.rxjava4.functions.*; @@ -51,7 +51,7 @@ Function> just2(final Observable observable) { BiFunction, Observable> add2 = (leftValue, rightValues) -> rightValues.map(rightValue -> add.apply(leftValue, rightValue)); - @Before + @BeforeEach public void before() { MockitoAnnotations.openMocks(this); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableHideTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableHideTest.java index 101067272d..6fa1766502 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableHideTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableHideTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableIgnoreElementsTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableIgnoreElementsTest.java index 0536318d8b..7f6b0cbb02 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableIgnoreElementsTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableIgnoreElementsTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableInternalHelperTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableInternalHelperTest.java index 142dbf9758..3f0be8f3e3 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableInternalHelperTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableInternalHelperTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableIntervalRangeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableIntervalRangeTest.java index 96436cc4e0..6c124470f4 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableIntervalRangeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableIntervalRangeTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.schedulers.Schedulers; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableIntervalTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableIntervalTest.java index ee57f619be..10ab3daa55 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableIntervalTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableIntervalTest.java @@ -15,7 +15,7 @@ import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.internal.operators.observable.ObservableInterval.IntervalObserver; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableJoinTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableJoinTest.java index 77d21bf0c5..25f79018a5 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableJoinTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableJoinTest.java @@ -18,11 +18,11 @@ import java.util.List; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.MockitoAnnotations; import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.*; import io.reactivex.rxjava4.internal.functions.Functions; @@ -40,7 +40,7 @@ Function> just(final Observable observable) { return _ -> observable; } - @Before + @BeforeEach public void before() { MockitoAnnotations.openMocks(this); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableLastTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableLastTest.java index 5a044ccce1..e2f9231cd3 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableLastTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableLastTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.NoSuchElementException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableLiftTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableLiftTest.java index c9b9870d1c..8fc09ccd5a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableLiftTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableLiftTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -34,7 +34,7 @@ public void callbackCrash() { .test(); fail("Should have thrown"); } catch (NullPointerException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, ex.toString()); } } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMapNotificationTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMapNotificationTest.java index 22f5690e7c..23e536cf8b 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMapNotificationTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMapNotificationTest.java @@ -13,10 +13,10 @@ package io.reactivex.rxjava4.internal.operators.observable; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; import io.reactivex.rxjava4.functions.*; import io.reactivex.rxjava4.internal.functions.Functions; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMapTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMapTest.java index 7c4e0ff48f..f52381171b 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMapTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMapTest.java @@ -13,17 +13,17 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.*; -import org.junit.*; +import org.junit.jupiter.api.*; -import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; +import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.functions.*; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.operators.QueueFuseable; @@ -38,7 +38,7 @@ public class ObservableMapTest extends RxJavaTest { static final BiFunction APPEND_INDEX = (value, index) -> value + index; - @Before + @BeforeEach public void before() { stringObserver = TestHelper.mockObserver(); stringObserver2 = TestHelper.mockObserver(); @@ -134,27 +134,31 @@ public void mapWithError() { verify(stringObserver, times(1)).onError(any(Throwable.class)); } - @Test(expected = IllegalArgumentException.class) + @Test public void mapWithIssue417() { - Observable.just(1).observeOn(Schedulers.computation()) - .map((Function) _ -> { - throw new IllegalArgumentException("any error"); - }).blockingSingle(); + assertThrows(IllegalArgumentException.class, () -> { + Observable.just(1).observeOn(Schedulers.computation()) + .map((Function) _ -> { + throw new IllegalArgumentException("any error"); + }).blockingSingle(); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void mapWithErrorInFuncAndThreadPoolScheduler() throws InterruptedException { - // The error will throw in one of threads in the thread pool. - // If map does not handle it, the error will disappear. - // so map needs to handle the error by itself. - Observable m = Observable.just("one") - .observeOn(Schedulers.computation()) - .map(_ -> { - throw new IllegalArgumentException("any error"); - }); - - // block for response, expecting exception thrown - m.blockingLast(); + assertThrows(IllegalArgumentException.class, () -> { + // The error will throw in one of threads in the thread pool. + // If map does not handle it, the error will disappear. + // so map needs to handle the error by itself. + Observable m = Observable.just("one") + .observeOn(Schedulers.computation()) + .map(_ -> { + throw new IllegalArgumentException("any error"); + }); + + // block for response, expecting exception thrown + m.blockingLast(); + }); } /** @@ -168,18 +172,22 @@ public void errorPassesThruMap() { /** * We expect IllegalStateException to pass thru map. */ - @Test(expected = IllegalStateException.class) + @Test public void errorPassesThruMap2() { - Observable.error(new IllegalStateException()).map(i -> i).blockingSingle(); + assertThrows(IllegalStateException.class, () -> { + Observable.error(new IllegalStateException()).map(i -> i).blockingSingle(); + }); } /** * We expect an ArithmeticException exception here because last() emits a single value * but then we divide by 0. */ - @Test(expected = ArithmeticException.class) + @Test public void mapWithErrorInFunc() { - Observable.range(1, 1).lastElement().map(i -> i / 0).blockingGet(); + assertThrows(ArithmeticException.class, () -> { + Observable.range(1, 1).lastElement().map(i -> i / 0).blockingGet(); + }); } private static Map getMap(String prefix) { diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMaterializeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMaterializeTest.java index ade5eb56da..8f476726a7 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMaterializeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMaterializeTest.java @@ -13,18 +13,18 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.ExecutionException; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.disposables.Disposable; +import io.reactivex.rxjava4.functions.Consumer; import io.reactivex.rxjava4.observers.DefaultObserver; import io.reactivex.rxjava4.testsupport.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMergeDelayErrorTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMergeDelayErrorTest.java index cee0ca65a5..fcacb6541e 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMergeDelayErrorTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMergeDelayErrorTest.java @@ -13,20 +13,20 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.*; import java.util.concurrent.*; -import io.reactivex.rxjava4.core.config.StandardConcurrentBufferedConfig; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; +import io.reactivex.rxjava4.core.config.StandardConcurrentBufferedConfig; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; import io.reactivex.rxjava4.observers.DefaultObserver; import io.reactivex.rxjava4.testsupport.*; @@ -35,7 +35,7 @@ public class ObservableMergeDelayErrorTest extends RxJavaTest { Observer stringObserver; - @Before + @BeforeEach public void before() { stringObserver = TestHelper.mockObserver(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMergeMaxConcurrentTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMergeMaxConcurrentTest.java index 4755f17e4a..4ae9cd0d5a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMergeMaxConcurrentTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMergeMaxConcurrentTest.java @@ -13,18 +13,18 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.rxjava4.core.config.StandardConcurrentBufferedConfig; -import org.junit.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; +import io.reactivex.rxjava4.core.config.StandardConcurrentBufferedConfig; import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.internal.schedulers.CachedScheduler; import io.reactivex.rxjava4.observers.TestObserver; @@ -35,7 +35,7 @@ public class ObservableMergeMaxConcurrentTest extends RxJavaTest { Observer stringObserver; - @Before + @BeforeEach public void before() { stringObserver = TestHelper.mockObserver(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMergeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMergeTest.java index f959d323de..5f4527652d 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMergeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMergeTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -21,7 +21,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; @@ -29,7 +29,7 @@ import io.reactivex.rxjava4.core.Scheduler.Worker; import io.reactivex.rxjava4.disposables.*; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.observers.*; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.schedulers.*; @@ -41,7 +41,7 @@ public class ObservableMergeTest extends RxJavaTest { int count; - @Before + @BeforeEach public void before() { stringObserver = TestHelper.mockObserver(); @@ -52,7 +52,7 @@ public void before() { } } - @After + @AfterEach public void after() { try { Thread.sleep(100); @@ -181,7 +181,7 @@ public void mergeArrayWithThreading() { verify(stringObserver, times(1)).onComplete(); } - @Ignore("The underlying test keeps randomly failing and I don't know how to fix it or what it actually tries to test.") + @Disabled("The underlying test keeps randomly failing and I don't know how to fix it or what it actually tries to test.") @Test public void synchronizationOfMultipleSequencesLoop() throws Throwable { for (int i = 0; i < 100; i++) { @@ -190,7 +190,7 @@ public void synchronizationOfMultipleSequencesLoop() throws Throwable { } } - @Ignore("The underlying test keeps randomly failing and I don't know how to fix it or what it actually tries to test.") + @Disabled("The underlying test keeps randomly failing and I don't know how to fix it or what it actually tries to test.") @Test public void synchronizationOfMultipleSequences() throws Throwable { final TestASynchronousObservable o1 = new TestASynchronousObservable(); @@ -995,7 +995,7 @@ public void mergeErrors() { .to(TestHelper.testConsumer()) .assertFailureAndMessage(TestException.class, "First"); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMergeWithCompletableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMergeWithCompletableTest.java index 681b0b021f..c76fd436f3 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMergeWithCompletableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMergeWithCompletableTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.subjects.*; @@ -137,8 +137,8 @@ public void cancelOtherOnMainError() { to.assertFailure(TestException.class); - assertFalse("main has observers!", ps.hasObservers()); - assertFalse("other has observers", cs.hasObservers()); + assertFalse(ps.hasObservers(), "main has observers!"); + assertFalse(cs.hasObservers(), "other has observers"); } @Test @@ -155,8 +155,8 @@ public void cancelMainOnOtherError() { to.assertFailure(TestException.class); - assertFalse("main has observers!", ps.hasObservers()); - assertFalse("other has observers", cs.hasObservers()); + assertFalse(ps.hasObservers(), "main has observers!"); + assertFalse(cs.hasObservers(), "other has observers"); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMergeWithMaybeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMergeWithMaybeTest.java index 7afe1b983b..752f139ffe 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMergeWithMaybeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMergeWithMaybeTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.observers.TestObserver; @@ -275,8 +275,8 @@ public void cancelOtherOnMainError() { to.assertFailure(TestException.class); - assertFalse("main has observers!", ps.hasObservers()); - assertFalse("other has observers", ms.hasObservers()); + assertFalse(ps.hasObservers(), "main has observers!"); + assertFalse(ms.hasObservers(), "other has observers"); } @Test @@ -293,8 +293,8 @@ public void cancelMainOnOtherError() { to.assertFailure(TestException.class); - assertFalse("main has observers!", ps.hasObservers()); - assertFalse("other has observers", ms.hasObservers()); + assertFalse(ps.hasObservers(), "main has observers!"); + assertFalse(ms.hasObservers(), "other has observers"); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMergeWithSingleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMergeWithSingleTest.java index c4dab7d1e1..02bf161d91 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMergeWithSingleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableMergeWithSingleTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.observers.TestObserver; @@ -268,8 +268,8 @@ public void cancelOtherOnMainError() { to.assertFailure(TestException.class); - assertFalse("main has observers!", ps.hasObservers()); - assertFalse("other has observers", ss.hasObservers()); + assertFalse(ps.hasObservers(), "main has observers!"); + assertFalse(ss.hasObservers(), "other has observers"); } @Test @@ -286,8 +286,8 @@ public void cancelMainOnOtherError() { to.assertFailure(TestException.class); - assertFalse("main has observers!", ps.hasObservers()); - assertFalse("other has observers", ss.hasObservers()); + assertFalse(ps.hasObservers(), "main has observers!"); + assertFalse(ss.hasObservers(), "other has observers"); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableObserveOnTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableObserveOnTest.java index 9f0d4b42f8..52bfbd3710 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableObserveOnTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableObserveOnTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -21,8 +21,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.annotations.Nullable; @@ -30,16 +29,14 @@ import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.operators.flowable.FlowableObserveOnTest.DisposeTrackingScheduler; import io.reactivex.rxjava4.internal.operators.observable.ObservableObserveOn.ObserveOnObserver; import io.reactivex.rxjava4.internal.schedulers.ImmediateThinScheduler; import io.reactivex.rxjava4.observers.*; -import io.reactivex.rxjava4.operators.QueueDisposable; -import io.reactivex.rxjava4.operators.QueueFuseable; -import io.reactivex.rxjava4.operators.SimpleQueue; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.schedulers.*; import io.reactivex.rxjava4.subjects.*; @@ -204,10 +201,10 @@ public void observeOnWithNewThreadScheduler() { Observable.range(1, 100000).map(t1 -> t1 * _multiple).observeOn(Schedulers.newThread()) .blockingForEach(t1 -> { - Assert.assertEquals(count.incrementAndGet() * _multiple, t1.intValue()); + assertEquals(count.incrementAndGet() * _multiple, t1.intValue()); // FIXME toBlocking methods run on the current thread String name = Thread.currentThread().getName(); - assertFalse("Wrong thread name: " + name, name.startsWith("Rx")); + assertFalse(name.startsWith("Rx"), "Wrong thread name: " + name); }); } @@ -222,10 +219,10 @@ public void observeOnWithThreadPoolScheduler() { Observable.range(1, 100000).map(t1 -> t1 * _multiple).observeOn(Schedulers.computation()) .blockingForEach(t1 -> { - Assert.assertEquals(count.incrementAndGet() * _multiple, t1.intValue()); + assertEquals(count.incrementAndGet() * _multiple, t1.intValue()); // FIXME toBlocking methods run on the caller's thread String name = Thread.currentThread().getName(); - assertFalse("Wrong thread name: " + name, name.startsWith("Rx")); + assertFalse(name.startsWith("Rx"), "Wrong thread name: " + name); }); } @@ -253,11 +250,11 @@ public void observeOnOrderingConcurrency() { return t1 * _multiple; }).observeOn(Schedulers.computation()) .blockingForEach(t1 -> { - Assert.assertEquals(count.incrementAndGet() * _multiple, t1.intValue()); + assertEquals(count.incrementAndGet() * _multiple, t1.intValue()); // assertTrue(name.startsWith("RxComputationThreadPool")); // FIXME toBlocking now runs its methods on the caller thread String name = Thread.currentThread().getName(); - assertFalse("Wrong thread name: " + name, name.startsWith("Rx")); + assertFalse(name.startsWith("Rx"), "Wrong thread name: " + name); }); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableOnErrorCompleteTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableOnErrorCompleteTest.java index 27f7ca3257..0bd9b00f02 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableOnErrorCompleteTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableOnErrorCompleteTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.exceptions.*; @@ -51,7 +51,7 @@ public void error() throws Throwable { .test() .assertResult(); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); }); } @@ -63,7 +63,7 @@ public void errorMatches() throws Throwable { .test() .assertResult(); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); }); } @@ -75,7 +75,7 @@ public void errorNotMatches() throws Throwable { .test() .assertFailure(IOException.class); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); }); } @@ -90,7 +90,7 @@ public void errorPredicateCrash() throws Throwable { TestHelper.assertError(to, 0, IOException.class); TestHelper.assertError(to, 1, TestException.class); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); }); } @@ -103,7 +103,7 @@ public void itemsThenError() throws Throwable { .test() .assertResult(2, 4); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); }); } @@ -115,11 +115,11 @@ public void dispose() { .onErrorComplete() .test(); - assertTrue("No subscribers?!", ps.hasObservers()); + assertTrue(ps.hasObservers(), "No subscribers?!"); to.dispose(); - assertFalse("Still subscribers?!", ps.hasObservers()); + assertFalse(ps.hasObservers(), "Still subscribers?!"); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableOnErrorResumeNextTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableOnErrorResumeNextTest.java index c4becba9e4..ba07f1db3b 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableOnErrorResumeNextTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableOnErrorResumeNextTest.java @@ -13,20 +13,20 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.io.IOException; +import java.util.concurrent.Flow.Subscription; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.observers.TestObserver; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableOnErrorResumeWithTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableOnErrorResumeWithTest.java index a48c144ced..7fd70df13d 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableOnErrorResumeWithTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableOnErrorResumeWithTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableOnErrorReturnTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableOnErrorReturnTest.java index b877642a09..e176318b8a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableOnErrorReturnTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableOnErrorReturnTest.java @@ -13,18 +13,18 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.observers.TestObserver; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservablePublishTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservablePublishTest.java index 839bda4032..1902946576 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservablePublishTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservablePublishTest.java @@ -13,21 +13,20 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.internal.fuseable.HasUpstreamObservableSource; import io.reactivex.rxjava4.observables.ConnectableObservable; @@ -55,13 +54,13 @@ public void publish() throws InterruptedException { // subscribe once o.subscribe(v -> { - Assert.assertEquals("one", v); + assertEquals("one", v); latch.countDown(); }); // subscribe again o.subscribe(v -> { - Assert.assertEquals("one", v); + assertEquals("one", v); latch.countDown(); }); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRangeLongTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRangeLongTest.java index e94513bf23..b0bc2fb075 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRangeLongTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRangeLongTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.ArrayList; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.observers.*; @@ -75,9 +75,11 @@ public void rangeWithOverflow3() { Observable.rangeLong(1L, Long.MAX_VALUE); } - @Test(expected = IllegalArgumentException.class) + @Test public void rangeWithOverflow4() { - Observable.rangeLong(2L, Long.MAX_VALUE); + assertThrows(IllegalArgumentException.class, () -> { + Observable.rangeLong(2L, Long.MAX_VALUE); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRangeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRangeTest.java index 89a552de02..115d14757d 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRangeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRangeTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.ArrayList; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.observers.*; @@ -76,9 +76,11 @@ public void rangeWithOverflow3() { Observable.range(1, Integer.MAX_VALUE); } - @Test(expected = IllegalArgumentException.class) + @Test public void rangeWithOverflow4() { - Observable.range(2, Integer.MAX_VALUE); + assertThrows(IllegalArgumentException.class, () -> { + Observable.range(2, Integer.MAX_VALUE); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRedoTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRedoTest.java index 612cb3b34e..262326f41b 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRedoTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRedoTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableReduceTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableReduceTest.java index 343c7cd833..3ac2df32b7 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableReduceTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableReduceTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.List; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.*; import io.reactivex.rxjava4.plugins.RxJavaPlugins; @@ -33,7 +33,7 @@ public class ObservableReduceTest extends RxJavaTest { Observer observer; SingleObserver singleObserver; - @Before + @BeforeEach public void before() { observer = TestHelper.mockObserver(); singleObserver = TestHelper.mockSingleObserver(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRefCountTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRefCountTest.java index d66bc29dcc..1078db4878 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRefCountTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRefCountTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -23,13 +23,13 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; -import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.core.RxJavaTest; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; import io.reactivex.rxjava4.functions.*; import io.reactivex.rxjava4.internal.functions.Functions; @@ -537,7 +537,7 @@ public void replayNoLeak() throws Exception { long after = TestHelper.awaitGC(GC_SLEEP_TIME, 20, start + 20 * 1000 * 1000); source = null; - assertTrue(String.format("%,3d -> %,3d%n", start, after), start + 20 * 1000 * 1000 > after); + assertTrue(start + 20 * 1000 * 1000 > after, String.format("%,3d -> %,3d%n", start, after)); } @Test @@ -563,7 +563,7 @@ public void replayNoLeak2() throws Exception { long after = TestHelper.awaitGC(GC_SLEEP_TIME, 20, start + 20 * 1000 * 1000); source = null; - assertTrue(String.format("%,3d -> %,3d%n", start, after), start + 20 * 1000 * 1000 > after); + assertTrue(start + 20 * 1000 * 1000 > after, String.format("%,3d -> %,3d%n", start, after)); } static final class ExceptionData extends Exception { @@ -597,7 +597,7 @@ public void publishNoLeak() throws Exception { long after = TestHelper.awaitGC(GC_SLEEP_TIME, 20, start + 20 * 1000 * 1000); source = null; - assertTrue(String.format("%,3d -> %,3d%n", start, after), start + 20 * 1000 * 1000 > after); + assertTrue(start + 20 * 1000 * 1000 > after, String.format("%,3d -> %,3d%n", start, after)); } @Test @@ -623,7 +623,7 @@ public void publishNoLeak2() throws Exception { long after = TestHelper.awaitGC(GC_SLEEP_TIME, 20, start + 20 * 1000 * 1000); source = null; - assertTrue(String.format("%,3d -> %,3d%n", start, after), start + 20 * 1000 * 1000 > after); + assertTrue(start + 20 * 1000 * 1000 > after, String.format("%,3d -> %,3d%n", start, after)); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRepeatTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRepeatTest.java index 8a4f657ae0..7214d80df2 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRepeatTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRepeatTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -21,14 +21,14 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.schedulers.Schedulers; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableReplayEagerTruncateTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableReplayEagerTruncateTest.java index 24665e5b7d..2c96807d27 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableReplayEagerTruncateTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableReplayEagerTruncateTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -23,7 +23,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.annotations.NonNull; @@ -666,7 +666,7 @@ void truncate() { List values = new ArrayList<>(); buf.collect(values); - Assert.assertEquals(Arrays.asList(1, 2, 3, 4, 5), values); + assertEquals(Arrays.asList(1, 2, 3, 4, 5), values); buf.removeSome(2); buf.removeFirst(); @@ -674,13 +674,13 @@ void truncate() { values.clear(); buf.collect(values); - Assert.assertTrue(values.isEmpty()); + assertTrue(values.isEmpty()); buf.addLast(new Node(5)); buf.addLast(new Node(6)); buf.collect(values); - Assert.assertEquals(Arrays.asList(5, 6), values); + assertEquals(Arrays.asList(5, 6), values); } @@ -695,32 +695,32 @@ public void timedAndSizedTruncation() { buf.next(2); test.advanceTimeBy(1, TimeUnit.SECONDS); buf.collect(values); - Assert.assertEquals(List.of(2), values); + assertEquals(List.of(2), values); buf.next(3); buf.next(4); values.clear(); buf.collect(values); - Assert.assertEquals(Arrays.asList(3, 4), values); + assertEquals(Arrays.asList(3, 4), values); test.advanceTimeBy(2, TimeUnit.SECONDS); buf.next(5); values.clear(); buf.collect(values); - Assert.assertEquals(List.of(5), values); - Assert.assertFalse(buf.hasCompleted()); + assertEquals(List.of(5), values); + assertFalse(buf.hasCompleted()); test.advanceTimeBy(2, TimeUnit.SECONDS); buf.complete(); values.clear(); buf.collect(values); - Assert.assertTrue(values.isEmpty()); + assertTrue(values.isEmpty()); - Assert.assertEquals(1, buf.size); - Assert.assertTrue(buf.hasCompleted()); - Assert.assertFalse(buf.hasError()); + assertEquals(1, buf.size); + assertTrue(buf.hasCompleted()); + assertFalse(buf.hasError()); } @Test @@ -728,8 +728,8 @@ public void timedAndSizedTruncationError() { TestScheduler test = new TestScheduler(); SizeAndTimeBoundReplayBuffer buf = new SizeAndTimeBoundReplayBuffer<>(2, 2000, TimeUnit.MILLISECONDS, test, false); - Assert.assertFalse(buf.hasCompleted()); - Assert.assertFalse(buf.hasError()); + assertFalse(buf.hasCompleted()); + assertFalse(buf.hasError()); List values = new ArrayList<>(); @@ -738,33 +738,33 @@ public void timedAndSizedTruncationError() { buf.next(2); test.advanceTimeBy(1, TimeUnit.SECONDS); buf.collect(values); - Assert.assertEquals(List.of(2), values); + assertEquals(List.of(2), values); buf.next(3); buf.next(4); values.clear(); buf.collect(values); - Assert.assertEquals(Arrays.asList(3, 4), values); + assertEquals(Arrays.asList(3, 4), values); test.advanceTimeBy(2, TimeUnit.SECONDS); buf.next(5); values.clear(); buf.collect(values); - Assert.assertEquals(List.of(5), values); - Assert.assertFalse(buf.hasCompleted()); - Assert.assertFalse(buf.hasError()); + assertEquals(List.of(5), values); + assertFalse(buf.hasCompleted()); + assertFalse(buf.hasError()); test.advanceTimeBy(2, TimeUnit.SECONDS); buf.error(new TestException()); values.clear(); buf.collect(values); - Assert.assertTrue(values.isEmpty()); + assertTrue(values.isEmpty()); - Assert.assertEquals(1, buf.size); - Assert.assertFalse(buf.hasCompleted()); - Assert.assertTrue(buf.hasError()); + assertEquals(1, buf.size); + assertFalse(buf.hasCompleted()); + assertTrue(buf.hasError()); } @Test @@ -775,30 +775,30 @@ public void sizedTruncation() { buf.next(1); buf.next(2); buf.collect(values); - Assert.assertEquals(Arrays.asList(1, 2), values); + assertEquals(Arrays.asList(1, 2), values); buf.next(3); buf.next(4); values.clear(); buf.collect(values); - Assert.assertEquals(Arrays.asList(3, 4), values); + assertEquals(Arrays.asList(3, 4), values); buf.next(5); values.clear(); buf.collect(values); - Assert.assertEquals(Arrays.asList(4, 5), values); - Assert.assertFalse(buf.hasCompleted()); + assertEquals(Arrays.asList(4, 5), values); + assertFalse(buf.hasCompleted()); buf.complete(); values.clear(); buf.collect(values); - Assert.assertEquals(Arrays.asList(4, 5), values); + assertEquals(Arrays.asList(4, 5), values); - Assert.assertEquals(3, buf.size); - Assert.assertTrue(buf.hasCompleted()); - Assert.assertFalse(buf.hasError()); + assertEquals(3, buf.size); + assertTrue(buf.hasCompleted()); + assertFalse(buf.hasError()); } @Test @@ -837,14 +837,14 @@ public void cache() throws InterruptedException { // subscribe once o.subscribe(v -> { - Assert.assertEquals("one", v); + assertEquals("one", v); System.out.println("v: " + v); latch.countDown(); }); // subscribe again o.subscribe(v -> { - Assert.assertEquals("one", v); + assertEquals("one", v); System.out.println("v: " + v); latch.countDown(); }); @@ -972,14 +972,14 @@ public void valuesAndThenError() { to.assertValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); to.assertNotComplete(); - Assert.assertEquals(1, to.errors().size()); + assertEquals(1, to.errors().size()); TestObserverEx to2 = new TestObserverEx<>(); source.subscribe(to2); to2.assertValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); to2.assertNotComplete(); - Assert.assertEquals(1, to2.errors().size()); + assertEquals(1, to2.errors().size()); } @Test @@ -1533,7 +1533,7 @@ public void noBoundedRetentionViaThreadLocal() throws Exception { System.out.printf("Bounded Replay Leak check: After: %.3f MB%n", after.get() / 1024.0 / 1024.0); if (initial + 100 * 1024 * 1024 < after.get()) { - Assert.fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + " -> " + after.get() / 1024.0 / 1024.0); } } @@ -1576,7 +1576,7 @@ public void sizeBoundEagerTruncate() throws Exception { System.out.printf("Bounded Replay Leak check: After: %.3f MB%n", after / 1024.0 / 1024.0); if (initial + 100 * 1024 * 1024 < after) { - Assert.fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + " -> " + after / 1024.0 / 1024.0); } } @@ -1623,7 +1623,7 @@ public void timeBoundEagerTruncate() throws Exception { System.out.printf("Bounded Replay Leak check: After: %.3f MB%n", after / 1024.0 / 1024.0); if (initial + 100 * 1024 * 1024 < after) { - Assert.fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + " -> " + after / 1024.0 / 1024.0); } } @@ -1670,7 +1670,7 @@ public void timeAndSizeBoundEagerTruncate() throws Exception { System.out.printf("Bounded Replay Leak check: After: %.3f MB%n", after / 1024.0 / 1024.0); if (initial + 100 * 1024 * 1024 < after) { - Assert.fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + " -> " + after / 1024.0 / 1024.0); } } @@ -1711,7 +1711,7 @@ public void sizeBoundSelectorEagerTruncate() throws Exception { System.out.printf("Bounded Replay Leak check: After: %.3f MB%n", after / 1024.0 / 1024.0); if (initial + 100 * 1024 * 1024 < after) { - Assert.fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + " -> " + after / 1024.0 / 1024.0); } } @@ -1756,7 +1756,7 @@ public void timeBoundSelectorEagerTruncate() throws Exception { System.out.printf("Bounded Replay Leak check: After: %.3f MB%n", after / 1024.0 / 1024.0); if (initial + 100 * 1024 * 1024 < after) { - Assert.fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + " -> " + after / 1024.0 / 1024.0); } } @@ -1801,7 +1801,7 @@ public void timeAndSizeSelectorBoundEagerTruncate() throws Exception { System.out.printf("Bounded Replay Leak check: After: %.3f MB%n", after / 1024.0 / 1024.0); if (initial + 100 * 1024 * 1024 < after) { - Assert.fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + " -> " + after / 1024.0 / 1024.0); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableReplayTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableReplayTest.java index 5efbcf1a75..011d55a2b0 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableReplayTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableReplayTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -23,7 +23,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.annotations.NonNull; @@ -31,7 +31,7 @@ import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; import io.reactivex.rxjava4.core.Scheduler.Worker; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.*; import io.reactivex.rxjava4.internal.functions.Functions; @@ -666,7 +666,7 @@ void truncate() { List values = new ArrayList<>(); buf.collect(values); - Assert.assertEquals(Arrays.asList(1, 2, 3, 4, 5), values); + assertEquals(Arrays.asList(1, 2, 3, 4, 5), values); buf.removeSome(2); buf.removeFirst(); @@ -674,13 +674,13 @@ void truncate() { values.clear(); buf.collect(values); - Assert.assertTrue(values.isEmpty()); + assertTrue(values.isEmpty()); buf.addLast(new Node(5)); buf.addLast(new Node(6)); buf.collect(values); - Assert.assertEquals(Arrays.asList(5, 6), values); + assertEquals(Arrays.asList(5, 6), values); } @@ -695,32 +695,32 @@ public void timedAndSizedTruncation() { buf.next(2); test.advanceTimeBy(1, TimeUnit.SECONDS); buf.collect(values); - Assert.assertEquals(List.of(2), values); + assertEquals(List.of(2), values); buf.next(3); buf.next(4); values.clear(); buf.collect(values); - Assert.assertEquals(Arrays.asList(3, 4), values); + assertEquals(Arrays.asList(3, 4), values); test.advanceTimeBy(2, TimeUnit.SECONDS); buf.next(5); values.clear(); buf.collect(values); - Assert.assertEquals(List.of(5), values); - Assert.assertFalse(buf.hasCompleted()); + assertEquals(List.of(5), values); + assertFalse(buf.hasCompleted()); test.advanceTimeBy(2, TimeUnit.SECONDS); buf.complete(); values.clear(); buf.collect(values); - Assert.assertTrue(values.isEmpty()); + assertTrue(values.isEmpty()); - Assert.assertEquals(1, buf.size); - Assert.assertTrue(buf.hasCompleted()); - Assert.assertFalse(buf.hasError()); + assertEquals(1, buf.size); + assertTrue(buf.hasCompleted()); + assertFalse(buf.hasError()); } @Test @@ -728,8 +728,8 @@ public void timedAndSizedTruncationError() { TestScheduler test = new TestScheduler(); SizeAndTimeBoundReplayBuffer buf = new SizeAndTimeBoundReplayBuffer<>(2, 2000, TimeUnit.MILLISECONDS, test, false); - Assert.assertFalse(buf.hasCompleted()); - Assert.assertFalse(buf.hasError()); + assertFalse(buf.hasCompleted()); + assertFalse(buf.hasError()); List values = new ArrayList<>(); @@ -738,33 +738,33 @@ public void timedAndSizedTruncationError() { buf.next(2); test.advanceTimeBy(1, TimeUnit.SECONDS); buf.collect(values); - Assert.assertEquals(List.of(2), values); + assertEquals(List.of(2), values); buf.next(3); buf.next(4); values.clear(); buf.collect(values); - Assert.assertEquals(Arrays.asList(3, 4), values); + assertEquals(Arrays.asList(3, 4), values); test.advanceTimeBy(2, TimeUnit.SECONDS); buf.next(5); values.clear(); buf.collect(values); - Assert.assertEquals(List.of(5), values); - Assert.assertFalse(buf.hasCompleted()); - Assert.assertFalse(buf.hasError()); + assertEquals(List.of(5), values); + assertFalse(buf.hasCompleted()); + assertFalse(buf.hasError()); test.advanceTimeBy(2, TimeUnit.SECONDS); buf.error(new TestException()); values.clear(); buf.collect(values); - Assert.assertTrue(values.isEmpty()); + assertTrue(values.isEmpty()); - Assert.assertEquals(1, buf.size); - Assert.assertFalse(buf.hasCompleted()); - Assert.assertTrue(buf.hasError()); + assertEquals(1, buf.size); + assertFalse(buf.hasCompleted()); + assertTrue(buf.hasError()); } @Test @@ -775,30 +775,30 @@ public void sizedTruncation() { buf.next(1); buf.next(2); buf.collect(values); - Assert.assertEquals(Arrays.asList(1, 2), values); + assertEquals(Arrays.asList(1, 2), values); buf.next(3); buf.next(4); values.clear(); buf.collect(values); - Assert.assertEquals(Arrays.asList(3, 4), values); + assertEquals(Arrays.asList(3, 4), values); buf.next(5); values.clear(); buf.collect(values); - Assert.assertEquals(Arrays.asList(4, 5), values); - Assert.assertFalse(buf.hasCompleted()); + assertEquals(Arrays.asList(4, 5), values); + assertFalse(buf.hasCompleted()); buf.complete(); values.clear(); buf.collect(values); - Assert.assertEquals(Arrays.asList(4, 5), values); + assertEquals(Arrays.asList(4, 5), values); - Assert.assertEquals(3, buf.size); - Assert.assertTrue(buf.hasCompleted()); - Assert.assertFalse(buf.hasError()); + assertEquals(3, buf.size); + assertTrue(buf.hasCompleted()); + assertFalse(buf.hasError()); } @Test @@ -837,14 +837,14 @@ public void cache() throws InterruptedException { // subscribe once o.subscribe(v -> { - Assert.assertEquals("one", v); + assertEquals("one", v); System.out.println("v: " + v); latch.countDown(); }); // subscribe again o.subscribe(v -> { - Assert.assertEquals("one", v); + assertEquals("one", v); System.out.println("v: " + v); latch.countDown(); }); @@ -972,14 +972,14 @@ public void valuesAndThenError() { to.assertValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); to.assertNotComplete(); - Assert.assertEquals(1, to.errors().size()); + assertEquals(1, to.errors().size()); TestObserverEx to2 = new TestObserverEx<>(); source.subscribe(to2); to2.assertValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); to2.assertNotComplete(); - Assert.assertEquals(1, to2.errors().size()); + assertEquals(1, to2.errors().size()); } @Test @@ -1533,18 +1533,20 @@ public void noBoundedRetentionViaThreadLocal() throws Exception { System.out.printf("Bounded Replay Leak check: After: %.3f MB%n", after.get() / 1024.0 / 1024.0); if (initial + 100 * 1024 * 1024 < after.get()) { - Assert.fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + " -> " + after.get() / 1024.0 / 1024.0); } } - @Test(expected = TestException.class) + @Test public void connectDisposeCrash() { - ConnectableObservable co = Observable.never().replay(); + assertThrows(TestException.class, () -> { + ConnectableObservable co = Observable.never().replay(); - co.connect(); + co.connect(); - co.connect(_ -> { throw new TestException(); }); + co.connect(_ -> { throw new TestException(); }); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableResourceWrapperTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableResourceWrapperTest.java index ca441d555e..906cd6ca1f 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableResourceWrapperTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableResourceWrapperTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRetryTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRetryTest.java index 2b9b71cf53..27061d5e3c 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRetryTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRetryTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -21,13 +21,13 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.*; import io.reactivex.rxjava4.internal.functions.Functions; @@ -208,8 +208,8 @@ public void singleSubscriptionOnFirst() throws Exception { attempt.zipWith(Observable.just(1), (BiFunction) (_, _) -> null)) .blockingFirst(); - assertEquals("Observer did not receive the expected output", 1, first); - assertEquals("Subscribe was not called once", 1, inc.get()); + assertEquals(1, first, "Observer did not receive the expected output"); + assertEquals(1, inc.get(), "Subscribe was not called once"); } @Test @@ -547,8 +547,8 @@ public void unsubscribeAfterError() { inOrder.verify(observer, times(1)).onError(any(Throwable.class)); inOrder.verify(observer, never()).onComplete(); - assertEquals("Start 6 threads, retry 5 then fail on 6", 6, so.efforts.get()); - assertEquals("Only 1 active subscription", 1, so.maxActive.get()); + assertEquals(6, so.efforts.get(), "Start 6 threads, retry 5 then fail on 6"); + assertEquals(1, so.maxActive.get(), "Only 1 active subscription"); } @Test @@ -571,7 +571,7 @@ public void timeoutWithRetry() { inOrder.verify(observer, times(1)).onError(any(Throwable.class)); inOrder.verify(observer, never()).onComplete(); - assertEquals("Start 6 threads, retry 5 then fail on 6", 6, so.efforts.get()); + assertEquals(6, so.efforts.get(), "Start 6 threads, retry 5 then fail on 6"); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRetryWithPredicateTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRetryWithPredicateTest.java index 90a27528e2..5fb9cb2bd2 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRetryWithPredicateTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableRetryWithPredicateTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -22,13 +22,13 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; import io.reactivex.rxjava4.functions.*; import io.reactivex.rxjava4.internal.functions.Functions; @@ -224,8 +224,8 @@ public void unsubscribeAfterError() { inOrder.verify(observer, times(1)).onError(any(Throwable.class)); inOrder.verify(observer, never()).onComplete(); - assertEquals("Start 6 threads, retry 5 then fail on 6", 6, so.efforts.get()); - assertEquals("Only 1 active subscription", 1, so.maxActive.get()); + assertEquals(6, so.efforts.get(), "Start 6 threads, retry 5 then fail on 6"); + assertEquals(1, so.maxActive.get(), "Only 1 active subscription"); } @Test @@ -251,7 +251,7 @@ public void timeoutWithRetry() { inOrder.verify(observer, times(1)).onError(any(Throwable.class)); inOrder.verify(observer, never()).onComplete(); - assertEquals("Start 6 threads, retry 5 then fail on 6", 6, so.efforts.get()); + assertEquals(6, so.efforts.get(), "Start 6 threads, retry 5 then fail on 6"); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSampleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSampleTest.java index 52253e3452..5a3d304f3e 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSampleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSampleTest.java @@ -18,7 +18,7 @@ import java.util.concurrent.TimeUnit; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; @@ -37,7 +37,7 @@ public class ObservableSampleTest extends RxJavaTest { private Observer observer; private Observer observer2; - @Before + @BeforeEach // due to mocking public void before() { scheduler = new TestScheduler(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableScalarXMapTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableScalarXMapTest.java index 490dc91334..f954861ff2 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableScalarXMapTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableScalarXMapTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableScanTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableScanTest.java index eb656e328b..aefac31054 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableScanTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableScanTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -21,12 +21,12 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.*; import io.reactivex.rxjava4.observers.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSequenceEqualTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSequenceEqualTest.java index ce69963959..60fccd04cb 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSequenceEqualTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSequenceEqualTest.java @@ -16,7 +16,7 @@ import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSerializeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSerializeTest.java index 720d0f9c8f..b3cbfa2d83 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSerializeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSerializeTest.java @@ -13,17 +13,17 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.observers.DefaultObserver; import io.reactivex.rxjava4.testsupport.TestHelper; @@ -31,7 +31,7 @@ public class ObservableSerializeTest extends RxJavaTest { Observer observer; - @Before + @BeforeEach public void before() { observer = TestHelper.mockObserver(); } @@ -164,7 +164,7 @@ void multiThreadedWithNPEinMiddle() { // we can have concurrency ... int n = onSubscribe.maxConcurrentThreads.get(); - assertTrue("" + n, n > 1); + assertTrue(n > 1, "" + n); // ... but the onNext execution should be single threaded assertEquals(1, busyobserver.maxConcurrentThreads.get()); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSingleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSingleTest.java index e0d29eb47a..30a1ba29da 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSingleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSingleTest.java @@ -13,18 +13,18 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.NoSuchElementException; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSkipLastTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSkipLastTest.java index d640fbecf1..0a302e1e4d 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSkipLastTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSkipLastTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.Arrays; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; @@ -92,9 +92,11 @@ public void skipLastWithBackpressure() { } - @Test(expected = IllegalArgumentException.class) + @Test public void skipLastWithNegativeCount() { - Observable.just("one").skipLast(-1); + assertThrows(IllegalArgumentException.class, () -> { + Observable.just("one").skipLast(-1); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSkipLastTimedTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSkipLastTimedTest.java index e416ea58cf..491b6fabc1 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSkipLastTimedTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSkipLastTimedTest.java @@ -18,7 +18,7 @@ import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSkipTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSkipTest.java index a9919347d9..91d1d6c6d1 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSkipTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSkipTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.functions.Function; @@ -27,18 +27,20 @@ public class ObservableSkipTest extends RxJavaTest { - @Test(expected = IllegalArgumentException.class) + @Test public void skipNegativeElements() { + assertThrows(IllegalArgumentException.class, () -> { + Observable skip = Observable.just("one", "two", "three").skip(-99); + + Observer observer = TestHelper.mockObserver(); + skip.subscribe(observer); + verify(observer, times(1)).onNext("one"); + verify(observer, times(1)).onNext("two"); + verify(observer, times(1)).onNext("three"); + verify(observer, never()).onError(any(Throwable.class)); + verify(observer, times(1)).onComplete(); + }); - Observable skip = Observable.just("one", "two", "three").skip(-99); - - Observer observer = TestHelper.mockObserver(); - skip.subscribe(observer); - verify(observer, times(1)).onNext("one"); - verify(observer, times(1)).onNext("two"); - verify(observer, times(1)).onNext("three"); - verify(observer, never()).onError(any(Throwable.class)); - verify(observer, times(1)).onComplete(); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSkipTimedTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSkipTimedTest.java index 4c97d6a172..6322ba579e 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSkipTimedTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSkipTimedTest.java @@ -18,7 +18,7 @@ import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSkipUntilTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSkipUntilTest.java index c21ef8eb60..8187645828 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSkipUntilTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSkipUntilTest.java @@ -16,7 +16,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -import org.junit.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.subjects.PublishSubject; @@ -25,7 +25,7 @@ public class ObservableSkipUntilTest extends RxJavaTest { Observer observer; - @Before + @BeforeEach public void before() { observer = TestHelper.mockObserver(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSkipWhileTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSkipWhileTest.java index 61957e2e75..d0f9fd4574 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSkipWhileTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSkipWhileTest.java @@ -16,12 +16,12 @@ import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Predicate; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.subjects.PublishSubject; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableStartWithTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableStartWithTest.java index 58eda3fff0..dcd6a5bf91 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableStartWithTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableStartWithTest.java @@ -15,7 +15,7 @@ import static org.mockito.Mockito.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSubscribeOnTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSubscribeOnTest.java index 28a6ae537b..3017a4bd0f 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSubscribeOnTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSubscribeOnTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.schedulers.*; import io.reactivex.rxjava4.testsupport.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSwitchIfEmptyTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSwitchIfEmptyTest.java index 3a1d62e67e..e27454be40 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSwitchIfEmptyTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSwitchIfEmptyTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.observers.DefaultObserver; public class ObservableSwitchIfEmptyTest extends RxJavaTest { diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSwitchTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSwitchTest.java index 0122c577ec..801c430a3b 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSwitchTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableSwitchTest.java @@ -13,25 +13,23 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; -import java.util.*; +import java.util.List; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.core.Observable; -import io.reactivex.rxjava4.core.Observer; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.internal.schedulers.ImmediateThinScheduler; import io.reactivex.rxjava4.internal.util.ExceptionHelper; @@ -47,7 +45,7 @@ public class ObservableSwitchTest extends RxJavaTest { private Scheduler.Worker innerScheduler; private Observer observer; - @Before + @BeforeEach public void before() { scheduler = new TestScheduler(); innerScheduler = scheduler.createWorker(); @@ -360,7 +358,7 @@ public void unsubscribe() { isUnsubscribed.set(bs.isDisposed()); }) ).take(1).subscribe(); - assertTrue("Switch doesn't propagate 'unsubscribe'", isUnsubscribed.get()); + assertTrue(isUnsubscribed.get(), "Switch doesn't propagate 'unsubscribe'"); } /** The upstream producer hijacked the switch producer stopping the requests aimed at the inner observables. */ @Test @@ -392,7 +390,7 @@ public void onNext(String t) { to.assertTerminated(); to.assertNoErrors(); - Assert.assertEquals(250, to.values().size()); + assertEquals(250, to.values().size()); } @Test @@ -604,7 +602,7 @@ public void nextSourceErrorRace() { TestHelper.race(r1, r2); for (Throwable e : errors) { - assertTrue(e.toString(), e instanceof TestException); + assertTrue(e instanceof TestException, e.toString()); } } finally { RxJavaPlugins.reset(); @@ -642,7 +640,7 @@ public void outerInnerErrorRace() { TestHelper.race(r1, r2); for (Throwable e : errors) { - assertTrue(e.getCause().toString(), e.getCause() instanceof TestException); + assertTrue(e.getCause() instanceof TestException, e.getCause().toString()); } } finally { RxJavaPlugins.reset(); @@ -849,7 +847,7 @@ protected void subscribeActual( TestHelper.race(r1, r2); for (Throwable e : errors) { - assertTrue(e.toString(), e.getCause() instanceof TestException); + assertTrue(e.getCause() instanceof TestException, e.toString()); } } finally { RxJavaPlugins.reset(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeLastOneTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeLastOneTest.java index b622965acf..b169d9da5e 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeLastOneTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeLastOneTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Action; import io.reactivex.rxjava4.testsupport.*; public class ObservableTakeLastOneTest extends RxJavaTest { diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeLastTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeLastTest.java index 57215a0ce9..07cf10503a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeLastTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeLastTest.java @@ -13,19 +13,19 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.observers.*; import io.reactivex.rxjava4.schedulers.Schedulers; import io.reactivex.rxjava4.testsupport.TestHelper; @@ -83,9 +83,11 @@ public void takeLastWithZeroCount() { verify(observer, times(1)).onComplete(); } - @Test(expected = IllegalArgumentException.class) + @Test public void takeLastWithNegativeCount() { - Observable.just("one").takeLast(-1); + assertThrows(IllegalArgumentException.class, () -> { + Observable.just("one").takeLast(-1); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeLastTimedTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeLastTimedTest.java index 4dcdc9b3d4..5c003634eb 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeLastTimedTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeLastTimedTest.java @@ -13,12 +13,13 @@ package io.reactivex.rxjava4.internal.operators.observable; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; @@ -31,9 +32,11 @@ public class ObservableTakeLastTimedTest extends RxJavaTest { - @Test(expected = IllegalArgumentException.class) + @Test public void takeLastTimedWithNegativeCount() { - Observable.just("one").takeLast(-1, 1, TimeUnit.SECONDS); + assertThrows(IllegalArgumentException.class, () -> { + Observable.just("one").takeLast(-1, 1, TimeUnit.SECONDS); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeTest.java index f54a7bdb75..ef56e3d347 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -21,15 +21,15 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.schedulers.Schedulers; @@ -66,12 +66,14 @@ public void take2() { verify(observer, times(1)).onComplete(); } - @Test(expected = IllegalArgumentException.class) + @Test public void takeWithError() { - Observable.fromIterable(Arrays.asList(1, 2, 3)).take(1) - .map((Function) _ -> { - throw new IllegalArgumentException("some error"); - }).blockingSingle(); + assertThrows(IllegalArgumentException.class, () -> { + Observable.fromIterable(Arrays.asList(1, 2, 3)).take(1) + .map((Function) _ -> { + throw new IllegalArgumentException("some error"); + }).blockingSingle(); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeTimedTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeTimedTest.java index 68b81b3d51..5bfc343216 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeTimedTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeTimedTest.java @@ -18,7 +18,7 @@ import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeUntilPredicateTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeUntilPredicateTest.java index 446237e382..7843d6731f 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeUntilPredicateTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeUntilPredicateTest.java @@ -18,12 +18,12 @@ import java.util.List; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Predicate; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.subjects.PublishSubject; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeUntilTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeUntilTest.java index 50c0f2c458..ed258a9bdc 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeUntilTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeUntilTest.java @@ -13,10 +13,10 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; @@ -206,8 +206,8 @@ public void untilFires() { to.assertNoErrors(); to.assertTerminated(); - assertFalse("Source still has observers", source.hasObservers()); - assertFalse("Until still has observers", until.hasObservers()); + assertFalse(source.hasObservers(), "Source still has observers"); + assertFalse(until.hasObservers(), "Until still has observers"); // 2.0.2 - not anymore // assertTrue("Not cancelled!", ts.isCancelled()); } @@ -231,8 +231,8 @@ public void mainCompletes() { to.assertNoErrors(); to.assertTerminated(); - assertFalse("Source still has observers", source.hasObservers()); - assertFalse("Until still has observers", until.hasObservers()); + assertFalse(source.hasObservers(), "Source still has observers"); + assertFalse(until.hasObservers(), "Until still has observers"); // 2.0.2 - not anymore // assertTrue("Not cancelled!", ts.isCancelled()); } @@ -255,8 +255,8 @@ public void downstreamUnsubscribes() { to.assertNoErrors(); to.assertTerminated(); - assertFalse("Source still has observers", source.hasObservers()); - assertFalse("Until still has observers", until.hasObservers()); + assertFalse(source.hasObservers(), "Source still has observers"); + assertFalse(until.hasObservers(), "Until still has observers"); // 2.0.2 - not anymore // assertTrue("Not cancelled!", ts.isCancelled()); } @@ -278,15 +278,15 @@ public void untilPublisherMainSuccess() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); main.onNext(1); main.onNext(2); main.onComplete(); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertResult(1, 2); } @@ -298,13 +298,13 @@ public void untilPublisherMainComplete() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); main.onComplete(); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertResult(); } @@ -316,13 +316,13 @@ public void untilPublisherMainError() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); main.onError(new TestException()); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertFailure(TestException.class); } @@ -334,13 +334,13 @@ public void untilPublisherOtherOnNext() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); other.onNext(1); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertResult(); } @@ -352,13 +352,13 @@ public void untilPublisherOtherOnComplete() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); other.onComplete(); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertResult(); } @@ -370,13 +370,13 @@ public void untilPublisherOtherError() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); other.onError(new TestException()); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertFailure(TestException.class); } @@ -388,13 +388,13 @@ public void untilPublisherDispose() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); to.dispose(); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertEmpty(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeWhileTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeWhileTest.java index 8048c8afc9..67d1029c83 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeWhileTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTakeWhileTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Predicate; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.subjects.*; @@ -201,7 +201,7 @@ public void noUnsubscribeDownstream() { to.assertValue(1); // 2.0.2 - not anymore -// Assert.assertTrue("Not cancelled!", ts.isCancelled()); +// assertTrue("Not cancelled!", ts.isCancelled()); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableThrottleFirstTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableThrottleFirstTest.java index c6faec66d4..1cb280520d 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableThrottleFirstTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableThrottleFirstTest.java @@ -18,13 +18,13 @@ import java.util.concurrent.TimeUnit; -import io.reactivex.rxjava4.functions.Action; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; +import io.reactivex.rxjava4.functions.Action; import io.reactivex.rxjava4.schedulers.TestScheduler; import io.reactivex.rxjava4.subjects.PublishSubject; import io.reactivex.rxjava4.testsupport.TestHelper; @@ -35,7 +35,7 @@ public class ObservableThrottleFirstTest extends RxJavaTest { private Scheduler.Worker innerScheduler; private Observer observer; - @Before + @BeforeEach public void before() { scheduler = new TestScheduler(); innerScheduler = scheduler.createWorker(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableThrottleLatestTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableThrottleLatestTest.java index b4151a3bc6..a3ecaf74be 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableThrottleLatestTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableThrottleLatestTest.java @@ -17,7 +17,7 @@ import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.SampleConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTimeIntervalTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTimeIntervalTest.java index 00e5f27446..4a46e69924 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTimeIntervalTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTimeIntervalTest.java @@ -17,7 +17,7 @@ import java.util.concurrent.TimeUnit; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; @@ -38,7 +38,7 @@ public class ObservableTimeIntervalTest extends RxJavaTest { private PublishSubject subject; private Observable> observable; - @Before + @BeforeEach public void setUp() { observer = TestHelper.mockObserver(); testScheduler = new TestScheduler(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTimeoutTests.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTimeoutTests.java index 4d9b1387d7..165e0638fd 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTimeoutTests.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTimeoutTests.java @@ -14,18 +14,18 @@ package io.reactivex.rxjava4.internal.operators.observable; import static io.reactivex.rxjava4.internal.util.ExceptionHelper.timeoutMessage; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.List; import java.util.concurrent.*; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.plugins.RxJavaPlugins; @@ -40,7 +40,7 @@ public class ObservableTimeoutTests extends RxJavaTest { private static final long TIMEOUT = 3; private static final TimeUnit TIME_UNIT = TimeUnit.SECONDS; - @Before + @BeforeEach public void setUp() { underlyingSubject = PublishSubject.create(); @@ -480,7 +480,7 @@ public void onNextOnTimeoutRaceFallback() { int c = to.values().size(); if (c == 1) { int v = to.values().getFirst(); - assertTrue("" + v, v == 1 || v == 2); + assertTrue(v == 1 || v == 2, "" + v); } else { to.assertResult(1, 2); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTimeoutWithSelectorTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTimeoutWithSelectorTest.java index 32c712ef89..37d6695a28 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTimeoutWithSelectorTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTimeoutWithSelectorTest.java @@ -13,22 +13,20 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; -import java.util.*; +import java.util.List; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import org.mockito.stubbing.Answer; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.core.Observable; -import io.reactivex.rxjava4.core.Observer; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.*; import io.reactivex.rxjava4.internal.functions.Functions; @@ -300,7 +298,7 @@ public void timeoutSelectorWithTimeoutAndOnNextRaceCondition() throws Interrupte latchTimeout.set(true); } - assertFalse("CoundDownLatch timeout", latchTimeout.get()); + assertFalse(latchTimeout.get(), "CoundDownLatch timeout"); InOrder inOrder = inOrder(o); inOrder.verify(o).onSubscribe(notNull()); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTimerTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTimerTest.java index b93ff49230..5b19add94f 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTimerTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTimerTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -21,11 +21,11 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.*; import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.internal.operators.observable.ObservableTimer.TimerObserver; import io.reactivex.rxjava4.observables.ConnectableObservable; @@ -42,7 +42,7 @@ public class ObservableTimerTest extends RxJavaTest { TestScheduler scheduler; - @Before + @BeforeEach public void before() { observer = TestHelper.mockObserver(); @@ -306,7 +306,7 @@ public void timerDelayZero() { Observable.timer(0, TimeUnit.MILLISECONDS).blockingFirst(); } - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } @@ -335,7 +335,7 @@ public void timerInterruptible() throws Exception { Thread.sleep(500); - assertTrue(s.getClass().getSimpleName(), interrupted.get()); + assertTrue(interrupted.get(), s.getClass().getSimpleName()); } } finally { exec.shutdown(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTimestampTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTimestampTest.java index 08f0875434..6113536bf5 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTimestampTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableTimestampTest.java @@ -18,7 +18,7 @@ import java.util.concurrent.TimeUnit; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; @@ -30,7 +30,7 @@ public class ObservableTimestampTest extends RxJavaTest { Observer observer; - @Before + @BeforeEach public void before() { observer = TestHelper.mockObserver(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableToFutureTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableToFutureTest.java index 2aa783142c..a1ee40808a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableToFutureTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableToFutureTest.java @@ -19,7 +19,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.observers.TestObserver; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableToListTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableToListTest.java index 9e73d33e0f..dcbfb5ed10 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableToListTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableToListTest.java @@ -13,13 +13,14 @@ package io.reactivex.rxjava4.internal.operators.observable; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.*; import java.util.concurrent.*; -import org.junit.*; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import io.reactivex.rxjava4.core.*; @@ -82,7 +83,7 @@ public void listMultipleSubscribersObservable() { public void listWithBlockingFirstObservable() { Observable o = Observable.fromIterable(Arrays.asList("one", "two", "three")); List actual = o.toList().toObservable().blockingFirst(); - Assert.assertEquals(Arrays.asList("one", "two", "three"), actual); + assertEquals(Arrays.asList("one", "two", "three"), actual); } @Test @@ -140,7 +141,7 @@ public void listMultipleSubscribers() { public void listWithBlockingFirst() { Observable o = Observable.fromIterable(Arrays.asList("one", "two", "three")); List actual = o.toList().blockingGet(); - Assert.assertEquals(Arrays.asList("one", "two", "three"), actual); + assertEquals(Arrays.asList("one", "two", "three"), actual); } static void await(CyclicBarrier cb) { diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableToMapTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableToMapTest.java index bfa60878d4..40172492cf 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableToMapTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableToMapTest.java @@ -19,7 +19,7 @@ import java.io.Serial; import java.util.*; -import org.junit.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; @@ -31,7 +31,7 @@ public class ObservableToMapTest extends RxJavaTest { Observer objectObserver; SingleObserver singleObserver; - @Before + @BeforeEach public void before() { objectObserver = TestHelper.mockObserver(); singleObserver = TestHelper.mockSingleObserver(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableToMultimapTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableToMultimapTest.java index 3ed7bd0683..c504bd5de0 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableToMultimapTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableToMultimapTest.java @@ -19,7 +19,7 @@ import java.io.Serial; import java.util.*; -import org.junit.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; @@ -31,7 +31,7 @@ public class ObservableToMultimapTest extends RxJavaTest { Observer objectObserver; SingleObserver singleObserver; - @Before + @BeforeEach public void before() { objectObserver = TestHelper.mockObserver(); singleObserver = TestHelper.mockSingleObserver(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableToSortedListTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableToSortedListTest.java index dc1b2646ae..b868847821 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableToSortedListTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableToSortedListTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.*; import java.util.concurrent.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableToXTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableToXTest.java index 74e032842e..cad902ec41 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableToXTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableToXTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.MissingBackpressureException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableUnsubscribeOnTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableUnsubscribeOnTest.java index d2e494f2ae..6397347969 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableUnsubscribeOnTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableUnsubscribeOnTest.java @@ -13,18 +13,18 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.Serial; import java.util.List; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.internal.schedulers.ImmediateThinScheduler; import io.reactivex.rxjava4.plugins.RxJavaPlugins; @@ -70,7 +70,7 @@ public void unsubscribeWhenSubscribeOnAndUnsubscribeOnAreOnSameThread() throws I System.out.println("unsubscribeThread: " + unsubscribeThread); System.out.println("subscribeThread.get(): " + subscribeThread.get()); - assertSame(unsubscribeThread.toString(), unsubscribeThread, uiEventLoop.getThread()); + assertSame(unsubscribeThread, uiEventLoop.getThread(), unsubscribeThread.toString()); observer.assertValues(1, 2); observer.assertTerminated(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableUsingTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableUsingTest.java index ceed9005aa..1b9905a303 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableUsingTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableUsingTest.java @@ -13,18 +13,18 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; import io.reactivex.rxjava4.functions.*; import io.reactivex.rxjava4.internal.functions.Functions; @@ -138,14 +138,18 @@ public void dispose() { inOrder.verifyNoMoreInteractions(); } - @Test(expected = TestException.class) + @Test public void usingWithResourceFactoryError() { - performTestUsingWithResourceFactoryError(false); + assertThrows(TestException.class, () -> { + performTestUsingWithResourceFactoryError(false); + }); } - @Test(expected = TestException.class) + @Test public void usingWithResourceFactoryErrorDisposeEagerly() { - performTestUsingWithResourceFactoryError(true); + assertThrows(TestException.class, () -> { + performTestUsingWithResourceFactoryError(true); + }); } private void performTestUsingWithResourceFactoryError(boolean disposeEagerly) { diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableWindowWithObservableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableWindowWithObservableTest.java index 8e1b941586..0edb9437c8 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableWindowWithObservableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableWindowWithObservableTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; @@ -325,8 +325,8 @@ public void upstreamDisposedWhenOutputsDisposed() { source.onNext(1); - assertFalse("source not disposed", source.hasObservers()); - assertFalse("boundary not disposed", boundary.hasObservers()); + assertFalse(source.hasObservers(), "source not disposed"); + assertFalse(boundary.hasObservers(), "boundary not disposed"); to.assertResult(1); } @@ -588,7 +588,7 @@ public void cancellingWindowCancelsUpstream() { to .assertResult(1); - assertFalse("Subject still has observers!", ps.hasObservers()); + assertFalse(ps.hasObservers(), "Subject still has observers!"); } @Test @@ -618,7 +618,7 @@ public void windowAbandonmentCancelsUpstream() { .assertNoErrors() .assertNotComplete(); - assertFalse("Subject still has observers!", ps.hasObservers()); + assertFalse(ps.hasObservers(), "Subject still has observers!"); inner.get().test().assertResult(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableWindowWithSizeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableWindowWithSizeTest.java index f7e1cc9808..ae09edaf68 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableWindowWithSizeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableWindowWithSizeTest.java @@ -13,19 +13,19 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.schedulers.Schedulers; import io.reactivex.rxjava4.subjects.PublishSubject; @@ -293,7 +293,7 @@ public void cancellingWindowCancelsUpstreamSize() { to .assertResult(1); - assertFalse("Subject still has observers!", ps.hasObservers()); + assertFalse(ps.hasObservers(), "Subject still has observers!"); } @Test @@ -316,7 +316,7 @@ public void windowAbandonmentCancelsUpstreamSize() { .assertNoErrors() .assertComplete(); - assertFalse("Subject still has observers!", ps.hasObservers()); + assertFalse(ps.hasObservers(), "Subject still has observers!"); inner.get().test().assertResult(1); } @@ -337,7 +337,7 @@ public void cancellingWindowCancelsUpstreamSkip() { to .assertResult(1); - assertFalse("Subject still has observers!", ps.hasObservers()); + assertFalse(ps.hasObservers(), "Subject still has observers!"); } @Test @@ -360,7 +360,7 @@ public void windowAbandonmentCancelsUpstreamSkip() { .assertNoErrors() .assertComplete(); - assertFalse("Subject still has observers!", ps.hasObservers()); + assertFalse(ps.hasObservers(), "Subject still has observers!"); inner.get().test().assertResult(1); } @@ -381,7 +381,7 @@ public void cancellingWindowCancelsUpstreamOverlap() { to .assertResult(1); - assertFalse("Subject still has observers!", ps.hasObservers()); + assertFalse(ps.hasObservers(), "Subject still has observers!"); } @Test @@ -404,7 +404,7 @@ public void windowAbandonmentCancelsUpstreamOverlap() { .assertNoErrors() .assertComplete(); - assertFalse("Subject still has observers!", ps.hasObservers()); + assertFalse(ps.hasObservers(), "Subject still has observers!"); inner.get().test().assertResult(1); } @@ -420,7 +420,7 @@ public void cancelWithoutWindowSize() { to.dispose(); - assertFalse("Subject still has observers!", ps.hasObservers()); + assertFalse(ps.hasObservers(), "Subject still has observers!"); } @Test @@ -436,7 +436,7 @@ public void cancelAfterAbandonmentSize() { to.dispose(); - assertFalse("Subject still has observers!", ps.hasObservers()); + assertFalse(ps.hasObservers(), "Subject still has observers!"); } @Test @@ -446,11 +446,11 @@ public void cancelWithoutWindowSkip() { TestObserver> to = ps.window(10, 15) .test(); - assertTrue(ps.hasObservers()); + assertTrue(ps.hasObservers(), "Subject has no observers!"); to.dispose(); - assertFalse("Subject still has observers!", ps.hasObservers()); + assertFalse(ps.hasObservers(), "Subject still has observers!"); } @Test @@ -460,13 +460,13 @@ public void cancelAfterAbandonmentSkip() { TestObserver> to = ps.window(10, 15) .test(); - assertTrue(ps.hasObservers()); + assertTrue(ps.hasObservers(), "Subject has no observers!"); ps.onNext(1); to.dispose(); - assertFalse("Subject still has observers!", ps.hasObservers()); + assertFalse(ps.hasObservers(), "Subject still has observers!"); } @Test @@ -476,11 +476,11 @@ public void cancelWithoutWindowOverlap() { TestObserver> to = ps.window(10, 5) .test(); - assertTrue(ps.hasObservers()); + assertTrue(ps.hasObservers(), "Subject has no observers!"); to.dispose(); - assertFalse("Subject still has observers!", ps.hasObservers()); + assertFalse(ps.hasObservers(), "Subject still has observers!"); } @Test @@ -490,12 +490,12 @@ public void cancelAfterAbandonmentOverlap() { TestObserver> to = ps.window(10, 5) .test(); - assertTrue(ps.hasObservers()); + assertTrue(ps.hasObservers(), "Subject has no observers!"); ps.onNext(1); to.dispose(); - assertFalse("Subject still has observers!", ps.hasObservers()); + assertFalse(ps.hasObservers(), "Subject still has observers!"); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java index d48a2b0472..2164f4ded3 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; @@ -40,7 +40,7 @@ public class ObservableWindowWithStartEndObservableTest extends RxJavaTest { private TestScheduler scheduler; private Scheduler.Worker innerScheduler; - @Before + @BeforeEach public void before() { scheduler = new TestScheduler(); innerScheduler = scheduler.createWorker(); @@ -229,9 +229,9 @@ public void startError() { to.assertFailure(TestException.class); - assertFalse("Source has observers!", source.hasObservers()); - assertFalse("Start has observers!", start.hasObservers()); - assertFalse("End has observers!", end.hasObservers()); + assertFalse(source.hasObservers(), "Source has observers!"); + assertFalse(start.hasObservers(), "Start has observers!"); + assertFalse(end.hasObservers(), "End has observers!"); } @Test @@ -250,9 +250,9 @@ public void endError() { to.assertFailure(TestException.class); - assertFalse("Source has observers!", source.hasObservers()); - assertFalse("Start has observers!", start.hasObservers()); - assertFalse("End has observers!", end.hasObservers()); + assertFalse(source.hasObservers(), "Source has observers!"); + assertFalse(start.hasObservers(), "Start has observers!"); + assertFalse(end.hasObservers(), "End has observers!"); } @Test @@ -365,7 +365,7 @@ public void cancellingWindowCancelsUpstream() { to .assertResult(1); - assertFalse("Subject still has observers!", ps.hasObservers()); + assertFalse(ps.hasObservers(), "Subject still has observers!"); } @Test @@ -396,7 +396,7 @@ public void windowAbandonmentCancelsUpstream() { .assertNoErrors() .assertNotComplete(); - assertFalse("Subject still has observers!", ps.hasObservers()); + assertFalse(ps.hasObservers(), "Subject still has observers!"); inner.get().test().assertResult(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableWindowWithTimeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableWindowWithTimeTest.java index 33ab61cfa9..b1ea5b3a05 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableWindowWithTimeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableWindowWithTimeTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; @@ -39,7 +39,7 @@ public class ObservableWindowWithTimeTest extends RxJavaTest { private TestScheduler scheduler; private Scheduler.Worker innerScheduler; - @Before + @BeforeEach public void before() { scheduler = new TestScheduler(); innerScheduler = scheduler.createWorker(); @@ -131,7 +131,7 @@ public void onComplete() { @Override public void onError(Throwable e) { - Assert.fail(e.getMessage()); + fail(e.getMessage()); } @Override @@ -181,7 +181,7 @@ public void takeFlatMapCompletes() { to.awaitDone(5, TimeUnit.SECONDS); to.assertComplete(); - Assert.assertTrue(!to.values().isEmpty()); + assertTrue(!to.values().isEmpty()); } @Test @@ -691,7 +691,7 @@ public void accept(Observable v) throws Exception { assertTrue(doOnNextDone.await(5, TimeUnit.SECONDS)); - assertFalse("The doOnNext got interrupted!", isInterrupted.get()); + assertFalse(isInterrupted.get(), "The doOnNext got interrupted!"); } @Test @@ -733,7 +733,7 @@ public void accept(Observable v) throws Exception { assertTrue(doOnNextDone.await(5, TimeUnit.SECONDS)); - assertFalse("The doOnNext got interrupted!", isInterrupted.get()); + assertFalse(isInterrupted.get(), "The doOnNext got interrupted!"); } @Test @@ -774,7 +774,7 @@ public void accept(Observable v) throws Exception { assertTrue(doOnNextDone.await(5, TimeUnit.SECONDS)); - assertFalse("The doOnNext got interrupted!", isInterrupted.get()); + assertFalse(isInterrupted.get(), "The doOnNext got interrupted!"); } @Test @@ -816,7 +816,7 @@ public void accept(Observable v) throws Exception { assertTrue(doOnNextDone.await(5, TimeUnit.SECONDS)); - assertFalse("The doOnNext got interrupted!", isInterrupted.get()); + assertFalse(isInterrupted.get(), "The doOnNext got interrupted!"); } @Test @@ -857,7 +857,7 @@ public void accept(Observable v) throws Exception { assertTrue(doOnNextDone.await(5, TimeUnit.SECONDS)); - assertFalse("The doOnNext got interrupted!", isInterrupted.get()); + assertFalse(isInterrupted.get(), "The doOnNext got interrupted!"); } @Test @@ -899,7 +899,7 @@ public void accept(Observable v) throws Exception { assertTrue(doOnNextDone.await(5, TimeUnit.SECONDS)); - assertFalse("The doOnNext got interrupted!", isInterrupted.get()); + assertFalse(isInterrupted.get(), "The doOnNext got interrupted!"); } @Test @@ -918,7 +918,7 @@ public void cancellingWindowCancelsUpstreamExactTime() { to .assertResult(1); - assertFalse("Subject still has observers!", ps.hasObservers()); + assertFalse(ps.hasObservers(), "Subject still has observers!"); } @Test @@ -932,7 +932,7 @@ public void windowAbandonmentCancelsUpstreamExactTime() { .doOnNext(inner::set) .test(); - assertFalse("Subject still has observers!", ps.hasObservers()); + assertFalse(ps.hasObservers(), "Subject still has observers!"); to .assertValueCount(1) @@ -958,7 +958,7 @@ public void cancellingWindowCancelsUpstreamExactTimeAndSize() { to .assertResult(1); - assertFalse("Subject still has observers!", ps.hasObservers()); + assertFalse(ps.hasObservers(), "Subject still has observers!"); } @Test @@ -972,7 +972,7 @@ public void windowAbandonmentCancelsUpstreamExactTimeAndSize() { .doOnNext(inner::set) .test(); - assertFalse("Subject still has observers!", ps.hasObservers()); + assertFalse(ps.hasObservers(), "Subject still has observers!"); to .assertValueCount(1) @@ -998,7 +998,7 @@ public void cancellingWindowCancelsUpstreamExactTimeSkip() { to .assertResult(1); - assertFalse("Subject still has observers!", ps.hasObservers()); + assertFalse(ps.hasObservers(), "Subject still has observers!"); } @Test @@ -1012,7 +1012,7 @@ public void windowAbandonmentCancelsUpstreamExactTimeSkip() { .doOnNext(inner::set) .test(); - assertFalse("Subject still has observers!", ps.hasObservers()); + assertFalse(ps.hasObservers(), "Subject still has observers!"); to .assertValueCount(1) diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableWithLatestFromTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableWithLatestFromTest.java index 3b688086d8..10a8695804 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableWithLatestFromTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableWithLatestFromTest.java @@ -13,19 +13,19 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.*; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; import io.reactivex.rxjava4.core.RxJavaTest; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.*; import io.reactivex.rxjava4.internal.functions.Functions; @@ -298,9 +298,9 @@ public void manySources() { to.assertNoErrors(); to.assertComplete(); - assertFalse("ps1 has subscribers?", ps1.hasObservers()); - assertFalse("ps2 has subscribers?", ps2.hasObservers()); - assertFalse("ps3 has subscribers?", ps3.hasObservers()); + assertFalse(ps1.hasObservers(), "ps1 has subscribers?"); + assertFalse(ps2.hasObservers(), "ps2 has subscribers?"); + assertFalse(ps3.hasObservers(), "ps3 has subscribers?"); } @Test @@ -345,9 +345,9 @@ public void manySourcesIterable() { to.assertNoErrors(); to.assertComplete(); - assertFalse("ps1 has subscribers?", ps1.hasObservers()); - assertFalse("ps2 has subscribers?", ps2.hasObservers()); - assertFalse("ps3 has subscribers?", ps3.hasObservers()); + assertFalse(ps1.hasObservers(), "ps1 has subscribers?"); + assertFalse(ps2.hasObservers(), "ps2 has subscribers?"); + assertFalse(ps3.hasObservers(), "ps3 has subscribers?"); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableZipCompletionTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableZipCompletionTest.java index 3510ccb454..41f8765cba 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableZipCompletionTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableZipCompletionTest.java @@ -15,7 +15,7 @@ import static org.mockito.Mockito.*; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; @@ -38,7 +38,7 @@ public class ObservableZipCompletionTest extends RxJavaTest { Observer observer; InOrder inOrder; - @Before + @BeforeEach public void setUp() { concat2Strings = (t1, t2) -> t1 + "-" + t2; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableZipIterableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableZipIterableTest.java index 9fc4e12cf3..eed62aa854 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableZipIterableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableZipIterableTest.java @@ -13,20 +13,20 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.*; import io.reactivex.rxjava4.internal.util.CrashingIterable; @@ -43,7 +43,7 @@ public class ObservableZipIterableTest extends RxJavaTest { Observer observer; InOrder inOrder; - @Before + @BeforeEach public void setUp() { concat2Strings = (t1, t2) -> t1 + "-" + t2; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableZipTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableZipTest.java index 9936cca1ad..738ad1abdd 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableZipTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/observable/ObservableZipTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -21,7 +21,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; @@ -46,7 +46,7 @@ public class ObservableZipTest extends RxJavaTest { Observer observer; InOrder inOrder; - @Before + @BeforeEach public void setUp() { concat2Strings = (t1, t2) -> t1 + "-" + t2; @@ -836,7 +836,7 @@ public void startEmptyList() { Collection> observables = Collections.emptyList(); Observable o = Observable.zip(observables, args -> { - Assert.assertEquals("No argument should have been passed", 0, args.length); + assertEquals(0, args.length, "No argument should have been passed"); return invoked; }); @@ -850,18 +850,19 @@ public void startEmptyList() { * Expect NoSuchElementException instead of blocking forever as zip should emit onComplete and no onNext * and last() expects at least a single response. */ - @Test(expected = NoSuchElementException.class) + @Test public void startEmptyListBlocking() { + assertThrows(NoSuchElementException.class, () -> { + final Object invoked = new Object(); + Collection> observables = Collections.emptyList(); - final Object invoked = new Object(); - Collection> observables = Collections.emptyList(); + Observable o = Observable.zip(observables, args -> { + assertEquals(0, args.length, "No argument should have been passed"); + return invoked; + }); - Observable o = Observable.zip(observables, args -> { - Assert.assertEquals("No argument should have been passed", 0, args.length); - return invoked; + o.blockingLast(); }); - - o.blockingLast(); } @Test @@ -967,7 +968,7 @@ public void zipRace() { while (System.currentTimeMillis() - startTime < 9000 && i++ < 100000) { int value = Observable.zip(src, src, (t1, t2) -> t1 + t2 * 10).blockingSingle(0); - Assert.assertEquals(11, value); + assertEquals(11, value); } } @@ -1137,8 +1138,8 @@ public void noCrossBoundaryFusion() { List list = to.values().getFirst(); - assertTrue(list.toString(), list.contains("RxSi")); - assertTrue(list.toString(), list.contains("RxCo")); + assertTrue(list.contains("RxSi"), list.toString()); + assertTrue(list.contains("RxCo"), list.toString()); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleAmbTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleAmbTest.java index 73a0828d5c..cca0aabcbb 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleAmbTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleAmbTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -269,7 +269,7 @@ public void noWinnerSuccessDispose() throws Exception { }); assertTrue(cdl.await(500, TimeUnit.SECONDS)); - assertFalse("Interrupted!", interrupted.get()); + assertFalse(interrupted.get(), "Interrupted!"); } } @@ -294,7 +294,7 @@ public void noWinnerErrorDispose() throws Exception { }); assertTrue(cdl.await(500, TimeUnit.SECONDS)); - assertFalse("Interrupted!", interrupted.get()); + assertFalse(interrupted.get(), "Interrupted!"); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleBlockingSubscribeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleBlockingSubscribeTest.java index 26648f9217..1b14ad56cf 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleBlockingSubscribeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleBlockingSubscribeTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Single; import io.reactivex.rxjava4.exceptions.TestException; @@ -193,7 +193,7 @@ public void twoArgError() throws Throwable { Single.error(new TestException()) .blockingSubscribe(success, consumer); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); verify(success, never()).accept(any()); verify(consumer).accept(any(TestException.class)); @@ -212,7 +212,7 @@ public void twoArgErrorAsync() throws Throwable { .delay(50, TimeUnit.MILLISECONDS, Schedulers.computation(), true) .blockingSubscribe(success, consumer); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); verify(success, never()).accept(any()); verify(consumer).accept(any(TestException.class)); @@ -255,7 +255,7 @@ public void twoArgInterrupted() throws Throwable { .doOnDispose(onDispose) .blockingSubscribe(success, consumer); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); verify(onDispose).run(); verify(success, never()).accept(any()); @@ -334,7 +334,7 @@ public void ovserverInterrupted() throws Throwable { .doOnDispose(onDispose) .blockingSubscribe(to); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); verify(onDispose).run(); to.assertFailure(InterruptedException.class); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleCacheTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleCacheTest.java index c29681f62c..2fe358742b 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleCacheTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleCacheTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.single; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatArrayDelayErrorTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatArrayDelayErrorTest.java index 0e66a2423d..9c0bd6d20b 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatArrayDelayErrorTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatArrayDelayErrorTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.single; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Single; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatArrayEagerDelayErrorTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatArrayEagerDelayErrorTest.java index 11d7584206..23eb0fa7ec 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatArrayEagerDelayErrorTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatArrayEagerDelayErrorTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.single; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Single; import io.reactivex.rxjava4.core.config.StandardConcurrentBufferedConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatDelayErrorTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatDelayErrorTest.java index f3d369c53c..9fd14e2789 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatDelayErrorTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatDelayErrorTest.java @@ -15,10 +15,9 @@ import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import io.reactivex.rxjava4.core.Flowable; -import io.reactivex.rxjava4.core.Single; +import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatEagerTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatEagerTest.java index 10932c436a..18d8ceab6e 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatEagerTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatEagerTest.java @@ -15,10 +15,9 @@ import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import io.reactivex.rxjava4.core.Flowable; -import io.reactivex.rxjava4.core.Single; +import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardConcurrentBufferedConfig; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatMapCompletableTest.java index 8a293752c5..d77472c853 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatMapCompletableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatMapCompletableTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.testsupport.TestHelper; public class SingleConcatMapCompletableTest extends RxJavaTest { diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatMapMaybeTest.java index 522112315b..7bfbe1e923 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatMapMaybeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatMapMaybeTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.single; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatMapTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatMapTest.java index d2e8e92c88..288133489d 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatMapTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatMapTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.single; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatPublisherTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatPublisherTest.java index 9f9470c9a5..53c5f3076b 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatPublisherTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatPublisherTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.single; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatTest.java index 532113ea00..ee2f4ec931 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleConcatTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.processors.PublishProcessor; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleContainstTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleContainstTest.java index 0f359b8104..6ea4e8e204 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleContainstTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleContainstTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.single; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleCreateTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleCreateTest.java index a135d83dfa..136e316b81 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleCreateTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleCreateTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.testsupport.*; @@ -87,9 +87,11 @@ public void basicWithError() { assertTrue(d.isDisposed()); } - @Test(expected = IllegalArgumentException.class) + @Test public void unsafeCreate() { - Single.unsafeCreate(Single.just(1)); + assertThrows(IllegalArgumentException.class, () -> { + Single.unsafeCreate(Single.just(1)); + }); } @Test @@ -257,7 +259,7 @@ public void tryOnError() { assertFalse(response[0]); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDeferTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDeferTest.java index 1ae55eeaeb..2b41f6a3fc 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDeferTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDeferTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.single; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.functions.Supplier; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDelayTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDelayTest.java index a14c3a1b63..ad249db404 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDelayTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDelayTest.java @@ -13,19 +13,19 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import java.util.List; import java.util.concurrent.*; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.plugins.RxJavaPlugins; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDematerializeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDematerializeTest.java index 2870f232d9..74fa87346e 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDematerializeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDematerializeTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.single; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDetachTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDetachTest.java index f67f8dd1f5..ead45f25d2 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDetachTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDetachTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; import java.io.IOException; import java.lang.ref.WeakReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.processors.PublishProcessor; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDoAfterSuccessTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDoAfterSuccessTest.java index 69d704ebf1..3abf1e020c 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDoAfterSuccessTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDoAfterSuccessTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDoAfterTerminateTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDoAfterTerminateTest.java index 977313ebed..1529c9d359 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDoAfterTerminateTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDoAfterTerminateTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDoFinallyTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDoFinallyTest.java index ed104ec31d..ed332037cb 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDoFinallyTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDoFinallyTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDoOnLifecycleTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDoOnLifecycleTest.java index 8756926fe2..a2394f8c97 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDoOnLifecycleTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDoOnLifecycleTest.java @@ -13,10 +13,11 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDoOnTerminateTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDoOnTerminateTest.java index af07e77c04..c0e74777a4 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDoOnTerminateTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDoOnTerminateTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDoOnTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDoOnTest.java index bfde4d599e..3fdf23000d 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDoOnTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleDoOnTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.plugins.RxJavaPlugins; @@ -45,7 +45,7 @@ public void doOnError() { Single.error(new TestException()).doOnError(e -> event[0] = e) .test(); - assertTrue(event[0].toString(), event[0] instanceof TestException); + assertTrue(event[0] instanceof TestException, event[0].toString()); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleEqualsTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleEqualsTest.java index 65c45d5c38..19f1e55c55 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleEqualsTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleEqualsTest.java @@ -15,7 +15,7 @@ import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleErrorTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleErrorTest.java index 194e384b7d..2d1b32d7f1 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleErrorTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleErrorTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.single; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapBiSelectorTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapBiSelectorTest.java index 1b0399c6cd..cfb221ef2c 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapBiSelectorTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapBiSelectorTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapCompletableTest.java index 63de674639..808d052ec4 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapCompletableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapCompletableTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.single; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.functions.Function; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapIterableFlowableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapIterableFlowableTest.java index f0e0f83612..3ce2df1a93 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapIterableFlowableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapIterableFlowableTest.java @@ -13,21 +13,20 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; +import java.util.concurrent.Flow.Subscription; import java.util.concurrent.TimeUnit; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.util.CrashingIterable; -import io.reactivex.rxjava4.operators.QueueFuseable; -import io.reactivex.rxjava4.operators.QueueSubscription; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.schedulers.Schedulers; import io.reactivex.rxjava4.subjects.*; import io.reactivex.rxjava4.subscribers.TestSubscriber; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapIterableObservableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapIterableObservableTest.java index 3c09829b7a..85a4755e14 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapIterableObservableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapIterableObservableTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observer; @@ -26,8 +26,7 @@ import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.util.CrashingIterable; -import io.reactivex.rxjava4.operators.QueueDisposable; -import io.reactivex.rxjava4.operators.QueueFuseable; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.schedulers.Schedulers; import io.reactivex.rxjava4.testsupport.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapMaybeTest.java index 7a1b18bdd0..fdb38f1bfa 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapMaybeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapMaybeTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.single; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapNotificationTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapNotificationTest.java index 8fb569834f..42b592610b 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapNotificationTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapNotificationTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; @@ -90,7 +90,7 @@ public void onErrorSuccess() throws Throwable { .test() .assertResult(3); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); }); } @@ -102,7 +102,7 @@ public void onErrorError() throws Throwable { .test() .assertFailure(IOException.class); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); }); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapTest.java index 1bb80816c7..832517248b 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFlatMapTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; +import java.util.concurrent.Flow.Publisher; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.testsupport.*; public class SingleFlatMapTest extends RxJavaTest { diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFromCallableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFromCallableTest.java index 4b08eaf6c1..d3d216be7e 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFromCallableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFromCallableTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -21,7 +21,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.stubbing.Answer; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFromMaybeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFromMaybeTest.java index 1426518b6d..b44f173a9a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFromMaybeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFromMaybeTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.NoSuchElementException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFromPublisherTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFromPublisherTest.java index 7ed09ca301..cb11a79091 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFromPublisherTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFromPublisherTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; +import java.util.concurrent.Flow.Subscriber; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFromSupplierTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFromSupplierTest.java index 929fe5586c..71bedf0398 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFromSupplierTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFromSupplierTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -21,7 +21,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.stubbing.Answer; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFromTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFromTest.java index e942b99467..1793cf4291 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFromTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleFromTest.java @@ -15,7 +15,7 @@ import java.util.concurrent.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.schedulers.Schedulers; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleHideTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleHideTest.java index c338602d69..d10fceee1e 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleHideTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleHideTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.single; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleInternalHelperTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleInternalHelperTest.java index 54863adf2c..94a39e96a0 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleInternalHelperTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleInternalHelperTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleLiftTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleLiftTest.java index 344ed27601..bbeb6e8089 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleLiftTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleLiftTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.single; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleMapTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleMapTest.java index 38aa6779bb..35e787b828 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleMapTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleMapTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.single; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.functions.Function; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleMaterializeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleMaterializeTest.java index fbd229cf22..cf2c2225f2 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleMaterializeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleMaterializeTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.single; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleMergeArrayTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleMergeArrayTest.java index cfba586482..978a936068 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleMergeArrayTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleMergeArrayTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.single; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardConcurrentConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleMergeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleMergeTest.java index a4cfab6517..ee6f3f0c9d 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleMergeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleMergeTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.config.StandardConcurrentConfig; @@ -67,7 +67,7 @@ public void mergeErrors() { .to(TestHelper.testConsumer()) .assertFailureAndMessage(TestException.class, "First"); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleMiscTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleMiscTest.java index 0456c4a4d2..84320c2106 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleMiscTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleMiscTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.*; import io.reactivex.rxjava4.schedulers.Schedulers; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleObserveOnTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleObserveOnTest.java index 070465c0d4..540299e362 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleObserveOnTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleObserveOnTest.java @@ -15,7 +15,7 @@ import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleOfTypeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleOfTypeTest.java index 4293268eda..a9e588c279 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleOfTypeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleOfTypeTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.single; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleOnErrorCompleteTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleOnErrorCompleteTest.java index 02bcdaeedc..63a2fdbde9 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleOnErrorCompleteTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleOnErrorCompleteTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Single; import io.reactivex.rxjava4.exceptions.*; import io.reactivex.rxjava4.observers.TestObserver; -import io.reactivex.rxjava4.subjects.*; +import io.reactivex.rxjava4.subjects.SingleSubject; import io.reactivex.rxjava4.testsupport.*; public class SingleOnErrorCompleteTest { @@ -43,7 +43,7 @@ public void error() throws Throwable { .test() .assertResult(); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); }); } @@ -55,7 +55,7 @@ public void errorMatches() throws Throwable { .test() .assertResult(); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); }); } @@ -67,7 +67,7 @@ public void errorNotMatches() throws Throwable { .test() .assertFailure(IOException.class); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); }); } @@ -82,7 +82,7 @@ public void errorPredicateCrash() throws Throwable { TestHelper.assertError(to, 0, IOException.class); TestHelper.assertError(to, 1, TestException.class); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); }); } @@ -94,11 +94,11 @@ public void dispose() { .onErrorComplete() .test(); - assertTrue("No subscribers?!", ss.hasObservers()); + assertTrue(ss.hasObservers(), "No subscribers?!"); to.dispose(); - assertFalse("Still subscribers?!", ss.hasObservers()); + assertFalse(ss.hasObservers(), "Still subscribers?!"); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleOnErrorXTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleOnErrorXTest.java index 5632f361e1..170996d5c9 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleOnErrorXTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleOnErrorXTest.java @@ -15,7 +15,7 @@ import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleSafeSubscribeTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleSafeSubscribeTest.java index 4bc95d4024..027dcdbf59 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleSafeSubscribeTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleSafeSubscribeTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.annotations.NonNull; @@ -44,7 +44,7 @@ public void normalSuccess() throws Throwable { order.verify(consumer).onSuccess(1); order.verifyNoMoreInteractions(); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); }); } @@ -62,7 +62,7 @@ public void normalError() throws Throwable { order.verify(consumer).onError(any(TestException.class)); order.verifyNoMoreInteractions(); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); }); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleStartWithTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleStartWithTest.java index 7a9a99f660..6086b7cfe6 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleStartWithTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleStartWithTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.single; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleSubscribeOnTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleSubscribeOnTest.java index 29388cfec7..b38f2852f7 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleSubscribeOnTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleSubscribeOnTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -44,7 +44,7 @@ public void normal() { to.assertResult(1); - assertTrue(list.toString(), list.isEmpty()); + assertTrue(list.isEmpty(), list.toString()); } finally { RxJavaPlugins.reset(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleSwitchOnNextTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleSwitchOnNextTest.java index 42b8a83278..6b8ecbc889 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleSwitchOnNextTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleSwitchOnNextTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleTakeUntilTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleTakeUntilTest.java index dff4655693..cb15777432 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleTakeUntilTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleTakeUntilTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.CancellationException; +import java.util.concurrent.Flow.Subscriber; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -262,7 +262,7 @@ public void otherSignalsAndCompletes() { .test() .assertFailure(CancellationException.class); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } @@ -290,13 +290,13 @@ public void untilSingleMainSuccess() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); main.onSuccess(1); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertResult(1); } @@ -308,13 +308,13 @@ public void untilSingleMainError() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); main.onError(new TestException()); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertFailure(TestException.class); } @@ -326,13 +326,13 @@ public void untilSingleOtherSuccess() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); other.onSuccess(1); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertFailure(CancellationException.class); } @@ -344,13 +344,13 @@ public void untilSingleOtherError() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); other.onError(new TestException()); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertFailure(TestException.class); } @@ -362,13 +362,13 @@ public void untilSingleDispose() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); to.dispose(); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertEmpty(); } @@ -380,13 +380,13 @@ public void untilPublisherMainSuccess() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasSubscribers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasSubscribers(), "Other no observers?"); main.onSuccess(1); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasSubscribers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasSubscribers(), "Other has observers?"); to.assertResult(1); } @@ -398,13 +398,13 @@ public void untilPublisherMainError() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasSubscribers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasSubscribers(), "Other no observers?"); main.onError(new TestException()); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasSubscribers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasSubscribers(), "Other has observers?"); to.assertFailure(TestException.class); } @@ -416,13 +416,13 @@ public void untilPublisherOtherOnNext() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasSubscribers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasSubscribers(), "Other no observers?"); other.onNext(1); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasSubscribers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasSubscribers(), "Other has observers?"); to.assertFailure(CancellationException.class); } @@ -434,13 +434,13 @@ public void untilPublisherOtherOnComplete() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasSubscribers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasSubscribers(), "Other no observers?"); other.onComplete(); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasSubscribers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasSubscribers(), "Other has observers?"); to.assertFailure(CancellationException.class); } @@ -452,13 +452,13 @@ public void untilPublisherOtherError() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasSubscribers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasSubscribers(), "Other no observers?"); other.onError(new TestException()); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasSubscribers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasSubscribers(), "Other has observers?"); to.assertFailure(TestException.class); } @@ -470,13 +470,13 @@ public void untilPublisherDispose() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasSubscribers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasSubscribers(), "Other no observers?"); to.dispose(); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasSubscribers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasSubscribers(), "Other has observers?"); to.assertEmpty(); } @@ -488,13 +488,13 @@ public void untilCompletableMainSuccess() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); main.onSuccess(1); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertResult(1); } @@ -506,13 +506,13 @@ public void untilCompletableMainError() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); main.onError(new TestException()); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertFailure(TestException.class); } @@ -524,13 +524,13 @@ public void untilCompletableOtherOnComplete() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); other.onComplete(); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertFailure(CancellationException.class); } @@ -542,13 +542,13 @@ public void untilCompletableOtherError() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); other.onError(new TestException()); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertFailure(TestException.class); } @@ -560,13 +560,13 @@ public void untilCompletableDispose() { TestObserver to = main.takeUntil(other).test(); - assertTrue("Main no observers?", main.hasObservers()); - assertTrue("Other no observers?", other.hasObservers()); + assertTrue(main.hasObservers(), "Main no observers?"); + assertTrue(other.hasObservers(), "Other no observers?"); to.dispose(); - assertFalse("Main has observers?", main.hasObservers()); - assertFalse("Other has observers?", other.hasObservers()); + assertFalse(main.hasObservers(), "Main has observers?"); + assertFalse(other.hasObservers(), "Other has observers?"); to.assertEmpty(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleTimeIntervalTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleTimeIntervalTest.java index 5cd9fbc0ee..a780f3687b 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleTimeIntervalTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleTimeIntervalTest.java @@ -15,7 +15,7 @@ import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Single; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleTimeoutTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleTimeoutTest.java index e49cbbfeed..8714ded27e 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleTimeoutTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleTimeoutTest.java @@ -14,12 +14,12 @@ package io.reactivex.rxjava4.internal.operators.single; import static io.reactivex.rxjava4.internal.util.ExceptionHelper.timeoutMessage; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleTimerTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleTimerTest.java index f3da43f2f9..ce971b87bc 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleTimerTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleTimerTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.observers.TestObserver; @@ -55,7 +55,7 @@ public void timerInterruptible() throws Exception { Thread.sleep(500); - assertTrue(s.getClass().getSimpleName(), interrupted.get()); + assertTrue(interrupted.get(), s.getClass().getSimpleName()); } } finally { exec.shutdown(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleTimestampTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleTimestampTest.java index 9e8acebf7d..61363d8271 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleTimestampTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleTimestampTest.java @@ -15,7 +15,7 @@ import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Single; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleToFlowableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleToFlowableTest.java index 6074b20420..7817924478 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleToFlowableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleToFlowableTest.java @@ -13,7 +13,8 @@ package io.reactivex.rxjava4.internal.operators.single; -import org.junit.Test; +import org.junit.jupiter.api.Test; + import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.subjects.PublishSubject; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleToObservableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleToObservableTest.java index ddac55fc49..211b2c9ffc 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleToObservableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleToObservableTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.internal.operators.single; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.subjects.PublishSubject; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleUnsubscribeOnTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleUnsubscribeOnTest.java index 0d311b70c8..37683e9e21 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleUnsubscribeOnTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleUnsubscribeOnTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleUsingTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleUsingTest.java index 3e1a42476a..a4464d8f52 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleUsingTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleUsingTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; import io.reactivex.rxjava4.functions.*; import io.reactivex.rxjava4.internal.functions.Functions; diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleZipArrayTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleZipArrayTest.java index eeff94b9e0..4cfeac839c 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleZipArrayTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleZipArrayTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; @@ -126,10 +126,12 @@ public void innerErrorRace() { } } - @Test(expected = NullPointerException.class) + @Test public void zipArrayOneIsNull() { - Single.zipArray((Function) _ -> 1, Single.just(1), null) - .blockingGet(); + assertThrows(NullPointerException.class, () -> { + Single.zipArray((Function) _ -> 1, Single.just(1), null) + .blockingGet(); + }); } @SuppressWarnings("unchecked") diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleZipIterableTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleZipIterableTest.java index 7577120db4..ae7c87d525 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleZipIterableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleZipIterableTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -145,16 +145,20 @@ public void nextThrows() { .assertFailureAndMessage(TestException.class, "next()"); } - @Test(expected = NullPointerException.class) + @Test public void zipIterableOneIsNull() { - Single.zip(Arrays.asList(null, Single.just(1)), (Function) _ -> 1) - .blockingGet(); + assertThrows(NullPointerException.class, () -> { + Single.zip(Arrays.asList(null, Single.just(1)), (Function) _ -> 1) + .blockingGet(); + }); } - @Test(expected = NullPointerException.class) + @Test public void zipIterableTwoIsNull() { - Single.zip(Arrays.asList(Single.just(1), null), (Function) _ -> 1) - .blockingGet(); + assertThrows(NullPointerException.class, () -> { + Single.zip(Arrays.asList(Single.just(1), null), (Function) _ -> 1) + .blockingGet(); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleZipTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleZipTest.java index d792b0b7b3..f4af1c9c4d 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleZipTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/single/SingleZipTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.operators.single; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Arrays; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.functions.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/schedulers/AbstractDirectTaskTest.java b/src/test/java/io/reactivex/rxjava4/internal/schedulers/AbstractDirectTaskTest.java index 187c4dc13e..7b77324035 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/schedulers/AbstractDirectTaskTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/schedulers/AbstractDirectTaskTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.Serial; import java.util.concurrent.FutureTask; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.internal.functions.Functions; diff --git a/src/test/java/io/reactivex/rxjava4/internal/schedulers/BlockingSchedulerTest.java b/src/test/java/io/reactivex/rxjava4/internal/schedulers/BlockingSchedulerTest.java index e5e3740927..a85f27d7dd 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/schedulers/BlockingSchedulerTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/schedulers/BlockingSchedulerTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.Flowable; import io.reactivex.rxjava4.core.Scheduler.Worker; @@ -34,7 +34,8 @@ public class BlockingSchedulerTest { TestSubscriber ts = new TestSubscriber<>(); - @Test(timeout = 10000) + @Test + @Timeout(value = 10000, unit = TimeUnit.MILLISECONDS) public void workerUntimed() { List errors = TestHelper.trackPluginErrors(); try { @@ -50,13 +51,13 @@ public void workerUntimed() { ts.assertResult(1, 2, 3, 4, 5); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } - @Test(timeout = 10000) + @Test @Timeout(value = 10000, unit = TimeUnit.MILLISECONDS) public void workerUntimedVia() { List errors = TestHelper.trackPluginErrors(); try { @@ -72,13 +73,13 @@ public void workerUntimedVia() { ts.assertResult(1, 2, 3, 4, 5); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } - @Test(timeout = 10000) + @Test @Timeout(value = 10000, unit = TimeUnit.MILLISECONDS) public void workerTimed() { List errors = TestHelper.trackPluginErrors(); try { @@ -94,13 +95,13 @@ public void workerTimed() { }); ts.assertResult(1, 2, 3, 4, 5); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } - @Test(timeout = 10000) + @Test @Timeout(value = 10000, unit = TimeUnit.MILLISECONDS) public void directCrash() { List errors = TestHelper.trackPluginErrors(); try { @@ -116,7 +117,7 @@ public void directCrash() { } } - @Test(timeout = 10000) + @Test @Timeout(value = 10000, unit = TimeUnit.MILLISECONDS) public void workerCrash() { List errors = TestHelper.trackPluginErrors(); try { @@ -136,7 +137,7 @@ public void workerCrash() { } } - @Test(timeout = 10000) + @Test @Timeout(value = 10000, unit = TimeUnit.MILLISECONDS) public void directUntimed() { List errors = TestHelper.trackPluginErrors(); try { @@ -162,13 +163,13 @@ public void directUntimed() { for (Throwable t : errors) { t.printStackTrace(); } - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } - @Test(timeout = 10000) + @Test @Timeout(value = 10000, unit = TimeUnit.MILLISECONDS) public void directTimed() { List errors = TestHelper.trackPluginErrors(); try { @@ -191,13 +192,13 @@ public void directTimed() { }); ts.assertResult(1, 2, 3, 4, 5); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } - @Test(timeout = 10000) + @Test @Timeout(value = 10000, unit = TimeUnit.MILLISECONDS) public void cancelDirect() { List errors = TestHelper.trackPluginErrors(); try { @@ -224,13 +225,13 @@ public void cancelDirect() { }); ts.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } - @Test(timeout = 10000) + @Test @Timeout(value = 10000, unit = TimeUnit.MILLISECONDS) public void cancelDirectUntimed() { List errors = TestHelper.trackPluginErrors(); try { @@ -257,13 +258,13 @@ public void cancelDirectUntimed() { }); ts.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } - @Test(timeout = 10000) + @Test @Timeout(value = 10000, unit = TimeUnit.MILLISECONDS) public void cancelWorker() { List errors = TestHelper.trackPluginErrors(); try { @@ -296,13 +297,13 @@ public void cancelWorker() { }); ts.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } - @Test(timeout = 10000) + @Test @Timeout(value = 10000, unit = TimeUnit.MILLISECONDS) public void cancelWorkerUntimed() { List errors = TestHelper.trackPluginErrors(); try { @@ -337,13 +338,13 @@ public void cancelWorkerUntimed() { }); ts.assertEmpty(); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } - @Test(timeout = 10000) + @Test @Timeout(value = 10000, unit = TimeUnit.MILLISECONDS) public void asyncShutdown() { List errors = TestHelper.trackPluginErrors(); try { @@ -358,13 +359,13 @@ public void asyncShutdown() { scheduler.execute(() -> { }); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } - @Test(timeout = 10000) + @Test @Timeout(value = 10000, unit = TimeUnit.MILLISECONDS) public void asyncInterrupt() { List errors = TestHelper.trackPluginErrors(); try { @@ -377,13 +378,13 @@ public void asyncInterrupt() { scheduler.execute(() -> { }); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } - @Test(timeout = 10000) + @Test @Timeout(value = 10000, unit = TimeUnit.MILLISECONDS) public void asyncDispose() { List errors = TestHelper.trackPluginErrors(); try { @@ -407,13 +408,13 @@ public void asyncDispose() { }, 500, TimeUnit.MILLISECONDS); }); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } - @Test(timeout = 10000) + @Test @Timeout(value = 10000, unit = TimeUnit.MILLISECONDS) public void asyncFeedInto() { List errors = TestHelper.trackPluginErrors(); try { @@ -431,13 +432,13 @@ public void asyncFeedInto() { })); assertEquals(n, counter[0]); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } - @Test(timeout = 10000) + @Test @Timeout(value = 10000, unit = TimeUnit.MILLISECONDS) public void asyncFeedInto2() { List errors = TestHelper.trackPluginErrors(); try { @@ -455,13 +456,13 @@ public void asyncFeedInto2() { }); assertEquals(n, counter[0]); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } } - @Test(timeout = 10000) + @Test @Timeout(value = 10000, unit = TimeUnit.MILLISECONDS) public void backtoSameThread() { List errors = TestHelper.trackPluginErrors(); try { @@ -478,7 +479,7 @@ public void backtoSameThread() { assertSame(t0, t1[0]); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/schedulers/BooleanRunnableTest.java b/src/test/java/io/reactivex/rxjava4/internal/schedulers/BooleanRunnableTest.java index f1c6191522..9796f3d3c5 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/schedulers/BooleanRunnableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/schedulers/BooleanRunnableTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.schedulers; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/schedulers/CachedScheduledReleaseTest.java b/src/test/java/io/reactivex/rxjava4/internal/schedulers/CachedScheduledReleaseTest.java index 6f40049176..3dd79ea0b9 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/schedulers/CachedScheduledReleaseTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/schedulers/CachedScheduledReleaseTest.java @@ -13,14 +13,13 @@ package io.reactivex.rxjava4.internal.schedulers; -import io.reactivex.rxjava4.core.Completable; -import io.reactivex.rxjava4.core.Flowable; -import io.reactivex.rxjava4.core.RxJavaTest; -import io.reactivex.rxjava4.schedulers.Schedulers; -import org.junit.Test; - import java.util.concurrent.TimeUnit; +import org.junit.jupiter.api.Test; + +import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.schedulers.Schedulers; + public class CachedScheduledReleaseTest extends RxJavaTest { /* This test will be stuck in a deadlock if CachedScheduler.USE_SCHEDULED_RELEASE is not set */ diff --git a/src/test/java/io/reactivex/rxjava4/internal/schedulers/CachedSchedulerInternalTest.java b/src/test/java/io/reactivex/rxjava4/internal/schedulers/CachedSchedulerInternalTest.java index 2d6b894dd2..a062180049 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/schedulers/CachedSchedulerInternalTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/schedulers/CachedSchedulerInternalTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.ConcurrentLinkedQueue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.disposables.CompositeDisposable; diff --git a/src/test/java/io/reactivex/rxjava4/internal/schedulers/ComputationSchedulerInternalTest.java b/src/test/java/io/reactivex/rxjava4/internal/schedulers/ComputationSchedulerInternalTest.java index 1ec95c9149..5d9133936b 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/schedulers/ComputationSchedulerInternalTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/schedulers/ComputationSchedulerInternalTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.schedulers; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; diff --git a/src/test/java/io/reactivex/rxjava4/internal/schedulers/DisposeOnCancelTest.java b/src/test/java/io/reactivex/rxjava4/internal/schedulers/DisposeOnCancelTest.java index 4fb87a94b5..a810e9a413 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/schedulers/DisposeOnCancelTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/schedulers/DisposeOnCancelTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; public class DisposeOnCancelTest extends RxJavaTest { diff --git a/src/test/java/io/reactivex/rxjava4/internal/schedulers/ExecutorSchedulerDelayedRunnableTest.java b/src/test/java/io/reactivex/rxjava4/internal/schedulers/ExecutorSchedulerDelayedRunnableTest.java index 44a9681d75..7f47a6d227 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/schedulers/ExecutorSchedulerDelayedRunnableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/schedulers/ExecutorSchedulerDelayedRunnableTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.schedulers; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.exceptions.TestException; @@ -26,13 +26,15 @@ public class ExecutorSchedulerDelayedRunnableTest extends RxJavaTest { - @Test(expected = TestException.class) + @Test @SuppressUndeliverable public void delayedRunnableCrash() { - DelayedRunnable dl = new DelayedRunnable(() -> { - throw new TestException(); + assertThrows(TestException.class, () -> { + DelayedRunnable dl = new DelayedRunnable(() -> { + throw new TestException(); + }); + dl.run(); }); - dl.run(); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/schedulers/ExecutorSchedulerInternalTest.java b/src/test/java/io/reactivex/rxjava4/internal/schedulers/ExecutorSchedulerInternalTest.java index 9c5d5783ad..987a32b58d 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/schedulers/ExecutorSchedulerInternalTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/schedulers/ExecutorSchedulerInternalTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.schedulers; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ExecutorSchedulerInternalTest { diff --git a/src/test/java/io/reactivex/rxjava4/internal/schedulers/ImmediateThinSchedulerTest.java b/src/test/java/io/reactivex/rxjava4/internal/schedulers/ImmediateThinSchedulerTest.java index 45a0abae6a..a0e452c9c7 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/schedulers/ImmediateThinSchedulerTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/schedulers/ImmediateThinSchedulerTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.core.Scheduler.Worker; @@ -34,14 +34,18 @@ public void scheduleDirect() { assertEquals(1, count[0]); } - @Test(expected = UnsupportedOperationException.class) + @Test public void scheduleDirectTimed() { - ImmediateThinScheduler.INSTANCE.scheduleDirect(Functions.EMPTY_RUNNABLE, 1, TimeUnit.SECONDS); + assertThrows(UnsupportedOperationException.class, () -> { + ImmediateThinScheduler.INSTANCE.scheduleDirect(Functions.EMPTY_RUNNABLE, 1, TimeUnit.SECONDS); + }); } - @Test(expected = UnsupportedOperationException.class) + @Test public void scheduleDirectPeriodic() { - ImmediateThinScheduler.INSTANCE.schedulePeriodicallyDirect(Functions.EMPTY_RUNNABLE, 1, 1, TimeUnit.SECONDS); + assertThrows(UnsupportedOperationException.class, () -> { + ImmediateThinScheduler.INSTANCE.schedulePeriodicallyDirect(Functions.EMPTY_RUNNABLE, 1, 1, TimeUnit.SECONDS); + }); } @Test @@ -57,13 +61,17 @@ public void schedule() { assertEquals(1, count[0]); } - @Test(expected = UnsupportedOperationException.class) + @Test public void scheduleTimed() { - ImmediateThinScheduler.INSTANCE.createWorker().schedule(Functions.EMPTY_RUNNABLE, 1, TimeUnit.SECONDS); + assertThrows(UnsupportedOperationException.class, () -> { + ImmediateThinScheduler.INSTANCE.createWorker().schedule(Functions.EMPTY_RUNNABLE, 1, TimeUnit.SECONDS); + }); } - @Test(expected = UnsupportedOperationException.class) + @Test public void schedulePeriodic() { - ImmediateThinScheduler.INSTANCE.createWorker().schedulePeriodically(Functions.EMPTY_RUNNABLE, 1, 1, TimeUnit.SECONDS); + assertThrows(UnsupportedOperationException.class, () -> { + ImmediateThinScheduler.INSTANCE.createWorker().schedulePeriodically(Functions.EMPTY_RUNNABLE, 1, 1, TimeUnit.SECONDS); + }); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/schedulers/InstantPeriodicTaskTest.java b/src/test/java/io/reactivex/rxjava4/internal/schedulers/InstantPeriodicTaskTest.java index 4b3f9d867b..38b07438b5 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/schedulers/InstantPeriodicTaskTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/schedulers/InstantPeriodicTaskTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/schedulers/InterruptibleRunnableTest.java b/src/test/java/io/reactivex/rxjava4/internal/schedulers/InterruptibleRunnableTest.java index fce7ee9e33..d461cb79a8 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/schedulers/InterruptibleRunnableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/schedulers/InterruptibleRunnableTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.schedulers; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/schedulers/ParallelSchedulerTest.java b/src/test/java/io/reactivex/rxjava4/internal/schedulers/ParallelSchedulerTest.java index 40e13e4299..bf45cbd9d7 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/schedulers/ParallelSchedulerTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/schedulers/ParallelSchedulerTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Scheduler.Worker; @@ -27,7 +27,7 @@ import io.reactivex.rxjava4.disposables.*; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.internal.schedulers.ParallelScheduler.TrackingParallelWorker.TrackedAction; -import io.reactivex.rxjava4.schedulers.Schedulers; +import io.reactivex.rxjava4.schedulers.*; import io.reactivex.rxjava4.testsupport.TestHelper; public class ParallelSchedulerTest implements Runnable { @@ -187,19 +187,21 @@ protected void shutdown(Scheduler s) throws InterruptedException { Thread.sleep(1000); int c = calls.get(); - assertTrue("" + c, c > 6); + assertTrue(c > 6, "" + c); } finally { s.shutdown(); } } - @Test(timeout = 5000) + @Test + @Timeout(value = 5000, unit = TimeUnit.MILLISECONDS) public void taskThrowsNonTracking() throws Exception { Scheduler s = new ParallelScheduler(2, false, ParallelScheduler.DEFAULT_FACTORY); taskThrows(s); } - @Test(timeout = 5000) + @Test + @Timeout(value = 5000, unit = TimeUnit.MILLISECONDS) public void taskThrowsTracking() throws Exception { Scheduler s = new ParallelScheduler(2, true, ParallelScheduler.DEFAULT_FACTORY); taskThrows(s); @@ -382,46 +384,92 @@ public void setFutureRace3() { } } - @Test(expected = IllegalArgumentException.class) + @Test public void illegalParallelism() { - new ParallelScheduler(0, true, ParallelScheduler.DEFAULT_FACTORY); + assertThrows(IllegalArgumentException.class, () -> { + new ParallelScheduler(0, true, ParallelScheduler.DEFAULT_FACTORY); + }); } @Test public void parallelSchedulerConfig() { { var psc1 = ParallelSchedulerConfig.DEFAULT; - assertEquals("Parallelism", psc1.parallelism(), Runtime.getRuntime().availableProcessors()); - assertTrue("Tracking", psc1.tracking()); - assertEquals("threadNamePrefix", psc1.threadNamePrefix(), "RxParallelScheduler"); + assertEquals(psc1.parallelism(), Runtime.getRuntime().availableProcessors(), "Parallelism"); + assertTrue(psc1.tracking(), "Tracking"); + assertEquals(psc1.threadNamePrefix(), "RxParallelScheduler", "threadNamePrefix"); } { var psc2 = new ParallelSchedulerConfig(1); - assertEquals("Parallelism", psc2.parallelism(), 1); - assertTrue("Tracking", psc2.tracking()); - assertEquals("threadNamePrefix", psc2.threadNamePrefix(), "RxParallelScheduler"); + assertEquals(psc2.parallelism(), 1, "Parallelism"); + assertTrue(psc2.tracking(), "Tracking"); + assertEquals(psc2.threadNamePrefix(), "RxParallelScheduler", "threadNamePrefix"); } { var psc3 = new ParallelSchedulerConfig(1, false); - assertEquals("Parallelism", psc3.parallelism(), 1); - assertFalse("Tracking", psc3.tracking()); - assertEquals("threadNamePrefix", psc3.threadNamePrefix(), "RxParallelScheduler"); + assertEquals(psc3.parallelism(), 1, "Parallelism"); + assertFalse(psc3.tracking(), "Tracking"); + assertEquals(psc3.threadNamePrefix(), "RxParallelScheduler", "threadNamePrefix"); } { var psc4 = new ParallelSchedulerConfig(1, "Test"); - assertEquals("Parallelism", psc4.parallelism(), 1); - assertTrue("Tracking", psc4.tracking()); - assertEquals("threadNamePrefix", psc4.threadNamePrefix(), "Test"); + assertEquals(psc4.parallelism(), 1, "Parallelism"); + assertTrue(psc4.tracking(), "Tracking"); + assertEquals(psc4.threadNamePrefix(), "Test", "threadNamePrefix"); } { var psc5 = new ParallelSchedulerConfig(1, false, "Test"); - assertEquals("Parallelism", psc5.parallelism(), 1); - assertFalse("Tracking", psc5.tracking()); - assertEquals("threadNamePrefix", psc5.threadNamePrefix(), "Test"); + assertEquals(psc5.parallelism(), 1, "Parallelism"); + assertFalse(psc5.tracking(), "Tracking"); + assertEquals(psc5.threadNamePrefix(), "Test", "threadNamePrefix"); + } + } + + @Test + public void introspectionNonTracking() { + Runnable run = () -> { }; + var scheduler = Schedulers.createParallel(new ParallelSchedulerConfig(2, false)); + try { + var worker = scheduler.createWorker(); + try { + var task = worker.schedule(run); + + if (task instanceof SchedulerRunnableIntrospection intro) { + assertSame(run, intro.getWrappedRunnable()); + } else { + fail(task.getClass() + " doesn't implement SchedulerRunnableIntrospection"); + } + } finally { + worker.dispose(); + } + } finally { + scheduler.shutdown(); + } + } + + @Test + public void introspectionTracking() { + Runnable run = () -> { }; + var scheduler = Schedulers.createParallel(new ParallelSchedulerConfig(2, true)); + try { + var worker = scheduler.createWorker(); + try { + var task = worker.schedule(run); + + if (task instanceof SchedulerRunnableIntrospection intro) { + assertSame(run, intro.getWrappedRunnable()); + } else { + fail(task.getClass() + " doesn't implement SchedulerRunnableIntrospection"); + } + } finally { + worker.dispose(); + } + } finally { + scheduler.shutdown(); } } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/schedulers/RxThreadFactoryTest.java b/src/test/java/io/reactivex/rxjava4/internal/schedulers/RxThreadFactoryTest.java index 30e209ebf3..83ab18e684 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/schedulers/RxThreadFactoryTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/schedulers/RxThreadFactoryTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.internal.functions.Functions; diff --git a/src/test/java/io/reactivex/rxjava4/internal/schedulers/ScheduledDirectPeriodicTaskTest.java b/src/test/java/io/reactivex/rxjava4/internal/schedulers/ScheduledDirectPeriodicTaskTest.java index 754a2664cd..6f3d51d5ba 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/schedulers/ScheduledDirectPeriodicTaskTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/schedulers/ScheduledDirectPeriodicTaskTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.schedulers; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/schedulers/ScheduledRunnableTest.java b/src/test/java/io/reactivex/rxjava4/internal/schedulers/ScheduledRunnableTest.java index 4a71677b08..fc232fe17f 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/schedulers/ScheduledRunnableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/schedulers/ScheduledRunnableTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.FutureTask; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.disposables.CompositeDisposable; @@ -277,7 +277,7 @@ public void syncWorkerCancelRace() { TestHelper.race(ft, r2); - assertFalse("The task was interrupted", interrupted.get()); + assertFalse(interrupted.get(), "The task was interrupted"); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/schedulers/SchedulerMultiWorkerSupportParallelNonTrackingTest.java b/src/test/java/io/reactivex/rxjava4/internal/schedulers/SchedulerMultiWorkerSupportParallelNonTrackingTest.java new file mode 100644 index 0000000000..3e67145ccc --- /dev/null +++ b/src/test/java/io/reactivex/rxjava4/internal/schedulers/SchedulerMultiWorkerSupportParallelNonTrackingTest.java @@ -0,0 +1,137 @@ +/* + * 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.schedulers; + +import static org.junit.jupiter.api.Assertions.*; + +import java.util.*; +import java.util.concurrent.*; + +import org.junit.jupiter.api.*; + +import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.core.Scheduler.Worker; +import io.reactivex.rxjava4.core.config.ParallelSchedulerConfig; +import io.reactivex.rxjava4.disposables.CompositeDisposable; +import io.reactivex.rxjava4.schedulers.Schedulers; +import io.reactivex.rxjava4.testsupport.TestHelper; + +public class SchedulerMultiWorkerSupportParallelNonTrackingTest extends RxJavaTest { + + final int max = 2; + + Scheduler scheduler; + + @BeforeEach + public void before() { + scheduler = Schedulers.createParallel(new ParallelSchedulerConfig(2, false)); + } + + @AfterEach + public void after() { + scheduler.shutdown(); + } + + @Test + public void moreThanMaxWorkers() { + final List list = new ArrayList<>(); + + SchedulerMultiWorkerSupport mws = (SchedulerMultiWorkerSupport)scheduler; + + mws.createWorkers(max * 2, (_, w) -> list.add(w)); + + assertEquals(max * 2, list.size()); + } + + @Test + public void getShutdownWorkers() { + final List list = new ArrayList<>(); + + scheduler.shutdown(); + SchedulerMultiWorkerSupport mws = (SchedulerMultiWorkerSupport)scheduler; + + mws.createWorkers(max * 2, (_, w) -> list.add(w)); + + assertEquals(max * 2, list.size()); + + for (Worker w : list) { + assertEquals(ParallelScheduler.SHUTDOWN_NON_TRACKING_WORKER, w); + } + } + + @Test + public void distinctThreads() throws Exception { + for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { + + final CompositeDisposable composite = new CompositeDisposable(); + + try { + final CountDownLatch cdl = new CountDownLatch(max * 2); + + final Set threads1 = Collections.synchronizedSet(new HashSet<>()); + + final Set threads2 = Collections.synchronizedSet(new HashSet<>()); + + Runnable parallel1 = () -> { + final List list1 = new ArrayList<>(); + + SchedulerMultiWorkerSupport mws = (SchedulerMultiWorkerSupport)scheduler; + + mws.createWorkers(max, (_, w) -> { + list1.add(w); + composite.add(w); + }); + + Runnable run = () -> { + threads1.add(Thread.currentThread().getName()); + cdl.countDown(); + }; + + for (Worker w : list1) { + w.schedule(run); + } + }; + + Runnable parallel2 = () -> { + final List list2 = new ArrayList<>(); + + SchedulerMultiWorkerSupport mws = (SchedulerMultiWorkerSupport)scheduler; + + mws.createWorkers(max, (_, w) -> { + list2.add(w); + composite.add(w); + }); + + Runnable run = () -> { + threads2.add(Thread.currentThread().getName()); + cdl.countDown(); + }; + + for (Worker w : list2) { + w.schedule(run); + } + }; + + TestHelper.race(parallel1, parallel2); + + assertTrue(cdl.await(5, TimeUnit.SECONDS)); + + assertEquals(max, threads1.size(), threads1.toString()); + assertEquals(max, threads2.size(), threads2.toString()); + } finally { + composite.dispose(); + } + } + } +} diff --git a/src/test/java/io/reactivex/rxjava4/internal/schedulers/SchedulerMultiWorkerSupportParallelTest.java b/src/test/java/io/reactivex/rxjava4/internal/schedulers/SchedulerMultiWorkerSupportParallelTest.java new file mode 100644 index 0000000000..5cdb2ccfa1 --- /dev/null +++ b/src/test/java/io/reactivex/rxjava4/internal/schedulers/SchedulerMultiWorkerSupportParallelTest.java @@ -0,0 +1,137 @@ +/* + * 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.schedulers; + +import static org.junit.jupiter.api.Assertions.*; + +import java.util.*; +import java.util.concurrent.*; + +import org.junit.jupiter.api.*; + +import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.core.Scheduler.Worker; +import io.reactivex.rxjava4.core.config.ParallelSchedulerConfig; +import io.reactivex.rxjava4.disposables.CompositeDisposable; +import io.reactivex.rxjava4.schedulers.Schedulers; +import io.reactivex.rxjava4.testsupport.TestHelper; + +public class SchedulerMultiWorkerSupportParallelTest extends RxJavaTest { + + final int max = 2; + + Scheduler scheduler; + + @BeforeEach + public void before() { + scheduler = Schedulers.createParallel(new ParallelSchedulerConfig(2, true)); + } + + @AfterEach + public void after() { + scheduler.shutdown(); + } + + @Test + public void moreThanMaxWorkers() { + final List list = new ArrayList<>(); + + SchedulerMultiWorkerSupport mws = (SchedulerMultiWorkerSupport)scheduler; + + mws.createWorkers(max * 2, (_, w) -> list.add(w)); + + assertEquals(max * 2, list.size()); + } + + @Test + public void getShutdownWorkers() { + final List list = new ArrayList<>(); + + scheduler.shutdown(); + SchedulerMultiWorkerSupport mws = (SchedulerMultiWorkerSupport)scheduler; + + mws.createWorkers(max * 2, (_, w) -> list.add(w)); + + assertEquals(max * 2, list.size()); + + for (Worker w : list) { + assertEquals(ParallelScheduler.SHUTDOWN_TRACKING_WORKER, w, w.getClass().toString()); + } + } + + @Test + public void distinctThreads() throws Exception { + for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) { + + final CompositeDisposable composite = new CompositeDisposable(); + + try { + final CountDownLatch cdl = new CountDownLatch(max * 2); + + final Set threads1 = Collections.synchronizedSet(new HashSet<>()); + + final Set threads2 = Collections.synchronizedSet(new HashSet<>()); + + Runnable parallel1 = () -> { + final List list1 = new ArrayList<>(); + + SchedulerMultiWorkerSupport mws = (SchedulerMultiWorkerSupport)scheduler; + + mws.createWorkers(max, (_, w) -> { + list1.add(w); + composite.add(w); + }); + + Runnable run = () -> { + threads1.add(Thread.currentThread().getName()); + cdl.countDown(); + }; + + for (Worker w : list1) { + w.schedule(run); + } + }; + + Runnable parallel2 = () -> { + final List list2 = new ArrayList<>(); + + SchedulerMultiWorkerSupport mws = (SchedulerMultiWorkerSupport)scheduler; + + mws.createWorkers(max, (_, w) -> { + list2.add(w); + composite.add(w); + }); + + Runnable run = () -> { + threads2.add(Thread.currentThread().getName()); + cdl.countDown(); + }; + + for (Worker w : list2) { + w.schedule(run); + } + }; + + TestHelper.race(parallel1, parallel2); + + assertTrue(cdl.await(5, TimeUnit.SECONDS)); + + assertEquals(max, threads1.size(), threads1.toString()); + assertEquals(max, threads2.size(), threads2.toString()); + } finally { + composite.dispose(); + } + } + } +} diff --git a/src/test/java/io/reactivex/rxjava4/internal/schedulers/SchedulerMultiWorkerSupportTest.java b/src/test/java/io/reactivex/rxjava4/internal/schedulers/SchedulerMultiWorkerSupportTest.java index 6dfc9963fb..7d26fe5273 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/schedulers/SchedulerMultiWorkerSupportTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/schedulers/SchedulerMultiWorkerSupportTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.core.Scheduler.Worker; @@ -111,8 +111,8 @@ public void distinctThreads() throws Exception { assertTrue(cdl.await(5, TimeUnit.SECONDS)); - assertEquals(threads1.toString(), max, threads1.size()); - assertEquals(threads2.toString(), max, threads2.size()); + assertEquals(max, threads1.size(), threads1.toString()); + assertEquals(max, threads2.size(), threads2.toString()); } finally { composite.dispose(); } diff --git a/src/test/java/io/reactivex/rxjava4/internal/schedulers/SchedulerPoolFactoryTest.java b/src/test/java/io/reactivex/rxjava4/internal/schedulers/SchedulerPoolFactoryTest.java index e2a255cbff..becf9fb1d8 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/schedulers/SchedulerPoolFactoryTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/schedulers/SchedulerPoolFactoryTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.functions.Function; diff --git a/src/test/java/io/reactivex/rxjava4/internal/schedulers/SchedulerToExecutorServiceTest.java b/src/test/java/io/reactivex/rxjava4/internal/schedulers/SchedulerToExecutorServiceTest.java index 5e64d37105..9a7d2a29be 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/schedulers/SchedulerToExecutorServiceTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/schedulers/SchedulerToExecutorServiceTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.Arrays; -import java.util.concurrent.*; +import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Scheduler; import io.reactivex.rxjava4.schedulers.Schedulers; @@ -39,8 +39,7 @@ public void invokeAnyShouldReturnResultOfCompletedTask() throws Exception { String result = executor.invokeAny(Arrays.asList(task1, task2)); assertNotNull("invokeAny should return a result", result); - assertTrue("result should be one of the task results", - result.equals("result1") || result.equals("result2")); + assertTrue(result.equals("result1") || result.equals("result2"), "result should be one of the task results"); } @Test @@ -54,7 +53,7 @@ public void invokeAnyWithSingleTask() throws Exception { Integer result = executor.invokeAny(Arrays.asList(task)); - assertEquals("invokeAny should return the single task result", Integer.valueOf(42), result); + assertEquals(Integer.valueOf(42), result, "invokeAny should return the single task result"); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/schedulers/SharedSchedulerTest.java b/src/test/java/io/reactivex/rxjava4/internal/schedulers/SharedSchedulerTest.java index 698de8865e..dffc4d06a0 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/schedulers/SharedSchedulerTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/schedulers/SharedSchedulerTest.java @@ -13,16 +13,17 @@ package io.reactivex.rxjava4.internal.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.lang.management.ManagementFactory; import java.util.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.Flowable; import io.reactivex.rxjava4.core.Scheduler.Worker; +import io.reactivex.rxjava4.core.config.ParallelSchedulerConfig; import io.reactivex.rxjava4.disposables.*; import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; @@ -39,7 +40,7 @@ public void run() { calls++; } - @Test(timeout = 5000) + @Test @Timeout(value = 5000, unit = TimeUnit.MILLISECONDS) public void normal() { var scheduler = Schedulers.cached().share(); try { @@ -57,7 +58,7 @@ public void normal() { } } - @Test(timeout = 5000) + @Test @Timeout(value = 5000, unit = TimeUnit.MILLISECONDS) public void delay() { var scheduler = Schedulers.cached().share(); try { @@ -198,7 +199,7 @@ public void taskCrash() { assertTrue(d.isDisposed()); } - @Test(timeout = 5000) + @Test @Timeout(value = 5000, unit = TimeUnit.MILLISECONDS) public void futureDisposeRace() throws Exception { var scheduler = Schedulers.computation().share(); try { @@ -227,7 +228,7 @@ public void disposeSetFutureRace() { TestHelper.race(r1, r2, Schedulers.single()); - assertTrue("Future not disposed", d.isDisposed()); + assertTrue(d.isDisposed(), "Future not disposed"); } } @@ -243,8 +244,30 @@ public void runSetFutureRace() { TestHelper.race(r1, r2, Schedulers.single()); - assertFalse("Future disposed", d.isDisposed()); + assertFalse(d.isDisposed(), "Future disposed"); assertEquals(i + 1, calls); } } + + @Test + public void introspection() { + Runnable run = () -> { }; + var scheduler = Schedulers.computation().share(); + try { + var worker = scheduler.createWorker(); + try { + var task = worker.schedule(run); + + if (task instanceof SchedulerRunnableIntrospection intro) { + assertSame(run, intro.getWrappedRunnable()); + } else { + fail(task.getClass() + " doesn't implement SchedulerRunnableIntrospection"); + } + } finally { + worker.dispose(); + } + } finally { + scheduler.shutdown(); + } + } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/schedulers/SingleSchedulerTest.java b/src/test/java/io/reactivex/rxjava4/internal/schedulers/SingleSchedulerTest.java index ba50eb0cb6..6cc1a053bc 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/schedulers/SingleSchedulerTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/schedulers/SingleSchedulerTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.concurrent.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Scheduler; import io.reactivex.rxjava4.core.Scheduler.Worker; diff --git a/src/test/java/io/reactivex/rxjava4/internal/schedulers/TrampolineSchedulerInternalTest.java b/src/test/java/io/reactivex/rxjava4/internal/schedulers/TrampolineSchedulerInternalTest.java index 799fac8907..d758718abf 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/schedulers/TrampolineSchedulerInternalTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/schedulers/TrampolineSchedulerInternalTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Scheduler.Worker; diff --git a/src/test/java/io/reactivex/rxjava4/internal/subscribers/BasicFuseableConditionalSubscriberTest.java b/src/test/java/io/reactivex/rxjava4/internal/subscribers/BasicFuseableConditionalSubscriberTest.java index c5285a0645..499d957ddc 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/subscribers/BasicFuseableConditionalSubscriberTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/subscribers/BasicFuseableConditionalSubscriberTest.java @@ -13,19 +13,19 @@ package io.reactivex.rxjava4.internal.subscribers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import java.util.concurrent.Flow.Subscription; + +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.*; -import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.internal.subscriptions.*; -import io.reactivex.rxjava4.operators.ConditionalSubscriber; -import io.reactivex.rxjava4.operators.QueueFuseable; -import io.reactivex.rxjava4.testsupport.*; +import io.reactivex.rxjava4.operators.*; +import io.reactivex.rxjava4.testsupport.TestHelper; public class BasicFuseableConditionalSubscriberTest extends RxJavaTest { diff --git a/src/test/java/io/reactivex/rxjava4/internal/subscribers/BasicFuseableSubscriberTest.java b/src/test/java/io/reactivex/rxjava4/internal/subscribers/BasicFuseableSubscriberTest.java index 0098fc4c50..bea7a89551 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/subscribers/BasicFuseableSubscriberTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/subscribers/BasicFuseableSubscriberTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.subscribers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.*; import io.reactivex.rxjava4.core.RxJavaTest; diff --git a/src/test/java/io/reactivex/rxjava4/internal/subscribers/BlockingSubscriberTest.java b/src/test/java/io/reactivex/rxjava4/internal/subscribers/BlockingSubscriberTest.java index 2874ebd3fa..24ad79147a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/subscribers/BlockingSubscriberTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/subscribers/BlockingSubscriberTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.subscribers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayDeque; +import java.util.concurrent.Flow.Subscription; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; @@ -62,7 +62,7 @@ public void blockingFirstTimeout() { bf.blockingGet(); fail("Should have thrown!"); } catch (RuntimeException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof InterruptedException); + assertTrue(ex.getCause() instanceof InterruptedException, ex.toString()); } } @@ -78,7 +78,7 @@ public void blockingFirstTimeout2() { bf.blockingGet(); fail("Should have thrown!"); } catch (RuntimeException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof InterruptedException); + assertTrue(ex.getCause() instanceof InterruptedException, ex.toString()); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/subscribers/BoundedSubscriberTest.java b/src/test/java/io/reactivex/rxjava4/internal/subscribers/BoundedSubscriberTest.java index 735dac27a6..9c425116b1 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/subscribers/BoundedSubscriberTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/subscribers/BoundedSubscriberTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.subscribers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; +import java.util.concurrent.Flow.Subscription; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; @@ -44,8 +44,8 @@ public void onSubscribeThrows() { Flowable.just(1).subscribe(subscriber); - assertTrue(received.toString(), received.getFirst() instanceof TestException); - assertEquals(received.toString(), 1, received.size()); + assertTrue(received.getFirst() instanceof TestException, received.toString()); + assertEquals(1, received.size(), received.toString()); assertTrue(subscriber.isDisposed()); } @@ -62,8 +62,8 @@ public void onNextThrows() { Flowable.just(1).subscribe(subscriber); - assertTrue(received.toString(), received.getFirst() instanceof TestException); - assertEquals(received.toString(), 1, received.size()); + assertTrue(received.getFirst() instanceof TestException, received.toString()); + assertEquals(1, received.size(), received.toString()); assertTrue(subscriber.isDisposed()); } @@ -83,7 +83,7 @@ public void onErrorThrows() { Flowable.error(new TestException("Outer")).subscribe(subscriber); - assertTrue(received.toString(), received.isEmpty()); + assertTrue(received.isEmpty(), received.toString()); assertTrue(subscriber.isDisposed()); @@ -111,7 +111,7 @@ public void onCompleteThrows() { Flowable.empty().subscribe(subscriber); - assertTrue(received.toString(), received.isEmpty()); + assertTrue(received.isEmpty(), received.toString()); assertTrue(subscriber.isDisposed()); @@ -135,15 +135,15 @@ public void onNextThrowsCancelsUpstream() { pp.subscribe(s); - assertTrue("No observers?!", pp.hasSubscribers()); - assertTrue("Has errors already?!", errors.isEmpty()); + assertTrue(pp.hasSubscribers(), "No observers?!"); + assertTrue(errors.isEmpty(), "Has errors already?!"); pp.onNext(1); - assertFalse("Has observers?!", pp.hasSubscribers()); - assertFalse("No errors?!", errors.isEmpty()); + assertFalse(pp.hasSubscribers(), "Has observers?!"); + assertFalse(errors.isEmpty(), "No errors?!"); - assertTrue(errors.toString(), errors.getFirst() instanceof TestException); + assertTrue(errors.getFirst() instanceof TestException, errors.toString()); } @Test @@ -160,10 +160,10 @@ public void onSubscribeThrowsCancelsUpstream() { pp.subscribe(s); - assertFalse("Has observers?!", pp.hasSubscribers()); - assertFalse("No errors?!", errors.isEmpty()); + assertFalse(pp.hasSubscribers(), "Has observers?!"); + assertFalse(errors.isEmpty(), "No errors?!"); - assertTrue(errors.toString(), errors.getFirst() instanceof TestException); + assertTrue(errors.getFirst() instanceof TestException, errors.toString()); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/subscribers/DeferredScalarSubscriberTest.java b/src/test/java/io/reactivex/rxjava4/internal/subscribers/DeferredScalarSubscriberTest.java index 573b03a67b..64c4f63d10 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/subscribers/DeferredScalarSubscriberTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/subscribers/DeferredScalarSubscriberTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.subscribers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.Serial; import java.util.List; +import java.util.concurrent.Flow.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Scheduler.Worker; @@ -111,7 +111,7 @@ public void unsubscribeComposes() { pp.subscribe(ds); - assertTrue("No subscribers?", pp.hasSubscribers()); + assertTrue(pp.hasSubscribers(), "No subscribers?"); ts.cancel(); @@ -124,8 +124,8 @@ public void unsubscribeComposes() { ts.assertNoErrors(); ts.assertNotComplete(); - assertFalse("Subscribers?", pp.hasSubscribers()); - assertTrue("Deferred not unsubscribed?", ds.isCancelled()); + assertFalse(pp.hasSubscribers(), "Subscribers?"); + assertTrue(ds.isCancelled(), "Deferred not unsubscribed?"); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/subscribers/EmptyComponentTest.java b/src/test/java/io/reactivex/rxjava4/internal/subscribers/EmptyComponentTest.java index 3bf0bb856b..ff59d95713 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/subscribers/EmptyComponentTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/subscribers/EmptyComponentTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.subscribers; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.internal.util.EmptyComponent; diff --git a/src/test/java/io/reactivex/rxjava4/internal/subscribers/FlowableConsumersTest.java b/src/test/java/io/reactivex/rxjava4/internal/subscribers/FlowableConsumersTest.java index b1e65bf8df..487fe4eaca 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/subscribers/FlowableConsumersTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/subscribers/FlowableConsumersTest.java @@ -29,15 +29,15 @@ package io.reactivex.rxjava4.internal.subscribers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.*; +import java.util.concurrent.Flow.Subscriber; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; -import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.core.Flowable; import io.reactivex.rxjava4.disposables.*; import io.reactivex.rxjava4.exceptions.*; import io.reactivex.rxjava4.functions.*; @@ -76,11 +76,11 @@ public void onNextNormal() { Disposable d = subscribeAutoDispose(processor, composite, this, Functions.ON_ERROR_MISSING, () -> { }); - assertFalse(d.getClass().toString(), ((LambdaConsumerIntrospection)d).hasCustomOnError()); + assertFalse(((LambdaConsumerIntrospection)d).hasCustomOnError(), d.getClass().toString()); assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); processor.onNext(1); @@ -102,7 +102,7 @@ public void onErrorNormal() { assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); processor.onNext(1); @@ -122,11 +122,11 @@ public void onErrorError() { Disposable d = subscribeAutoDispose(processor, composite, this, this, this); - assertTrue(d.getClass().toString(), ((LambdaConsumerIntrospection)d).hasCustomOnError()); + assertTrue(((LambdaConsumerIntrospection)d).hasCustomOnError(), d.getClass().toString()); assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); processor.onNext(1); @@ -136,8 +136,8 @@ public void onErrorError() { processor.onError(new IOException()); - assertEquals(events.toString(), 1, events.get(0)); - assertTrue(events.toString(), events.get(1) instanceof IOException); + assertEquals(1, events.get(0), events.toString()); + assertTrue(events.get(1) instanceof IOException, events.toString()); assertEquals(0, composite.size()); } @@ -149,7 +149,7 @@ public void onCompleteNormal() { assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); processor.onNext(1); @@ -171,7 +171,7 @@ public void onCompleteError() { assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); processor.onNext(1); @@ -181,8 +181,8 @@ public void onCompleteError() { processor.onError(new IOException()); - assertEquals(events.toString(), 1, events.get(0)); - assertTrue(events.toString(), events.get(1) instanceof IOException); + assertEquals(1, events.get(0), events.toString()); + assertTrue(events.get(1) instanceof IOException, events.toString()); assertEquals(0, composite.size()); } @@ -194,7 +194,7 @@ public void onCompleteDispose() { assertTrue(composite.size() > 0); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); assertFalse(d.isDisposed()); @@ -218,9 +218,9 @@ public void onNextCrash() { processor.onNext(1); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); - assertTrue(events.toString(), events.getFirst() instanceof IOException); + assertTrue(events.getFirst() instanceof IOException, events.toString()); } finally { RxJavaPlugins.reset(); } @@ -236,7 +236,7 @@ public void onNextCrashOnError() { processor.onError(new IllegalArgumentException()); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); TestHelper.assertError(errors, 0, CompositeException.class); List inners = TestHelper.compositeList(errors.getFirst()); @@ -257,7 +257,7 @@ public void onNextCrashNoError() { processor.onNext(1); - assertTrue(events.toString(), events.isEmpty()); + assertTrue(events.isEmpty(), events.toString()); TestHelper.assertError(errors, 0, OnErrorNotImplementedException.class); assertTrue(errors.getFirst().getCause() instanceof IOException); diff --git a/src/test/java/io/reactivex/rxjava4/internal/subscribers/FutureSubscriberTest.java b/src/test/java/io/reactivex/rxjava4/internal/subscribers/FutureSubscriberTest.java index bdd9984827..0607719c95 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/subscribers/FutureSubscriberTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/subscribers/FutureSubscriberTest.java @@ -14,12 +14,12 @@ package io.reactivex.rxjava4.internal.subscribers; import static io.reactivex.rxjava4.internal.util.ExceptionHelper.timeoutMessage; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.*; -import org.junit.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.exceptions.TestException; @@ -32,7 +32,7 @@ public class FutureSubscriberTest extends RxJavaTest { FutureSubscriber fs; - @Before + @BeforeEach public void before() { fs = new FutureSubscriber<>(); } @@ -84,7 +84,7 @@ public void onError() throws Exception { try { fs.get(5, TimeUnit.MILLISECONDS); } catch (ExecutionException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, ex.toString()); assertEquals("One", ex.getCause().getMessage()); } @@ -193,7 +193,7 @@ public void onErrorOnComplete() throws Exception { try { fs.get(5, TimeUnit.MILLISECONDS); } catch (ExecutionException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, ex.toString()); assertEquals("One", ex.getCause().getMessage()); } } @@ -207,7 +207,7 @@ public void onCompleteOnError() throws Exception { try { assertNull(fs.get(5, TimeUnit.MILLISECONDS)); } catch (ExecutionException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof NoSuchElementException); + assertTrue(ex.getCause() instanceof NoSuchElementException, ex.toString()); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/subscribers/InnerQueuedSubscriberTest.java b/src/test/java/io/reactivex/rxjava4/internal/subscribers/InnerQueuedSubscriberTest.java index 3e663f4f52..9ed6cb3e50 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/subscribers/InnerQueuedSubscriberTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/subscribers/InnerQueuedSubscriberTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.subscribers; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.*; +import java.util.concurrent.Flow.Subscription; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; diff --git a/src/test/java/io/reactivex/rxjava4/internal/subscribers/LambdaSubscriberTest.java b/src/test/java/io/reactivex/rxjava4/internal/subscribers/LambdaSubscriberTest.java index 932113be5b..3f18e5eb58 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/subscribers/LambdaSubscriberTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/subscribers/LambdaSubscriberTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.subscribers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; @@ -43,8 +43,8 @@ public void onSubscribeThrows() { Flowable.just(1).subscribe(subscriber); - assertTrue(received.toString(), received.getFirst() instanceof TestException); - assertEquals(received.toString(), 1, received.size()); + assertTrue(received.getFirst() instanceof TestException, received.toString()); + assertEquals(1, received.size(), received.toString()); assertTrue(subscriber.isDisposed()); } @@ -62,8 +62,8 @@ public void onNextThrows() { Flowable.just(1).subscribe(subscriber); - assertTrue(received.toString(), received.getFirst() instanceof TestException); - assertEquals(received.toString(), 1, received.size()); + assertTrue(received.getFirst() instanceof TestException, received.toString()); + assertEquals(1, received.size(), received.toString()); assertTrue(subscriber.isDisposed()); } @@ -84,7 +84,7 @@ public void onErrorThrows() { Flowable.error(new TestException("Outer")).subscribe(subscriber); - assertTrue(received.toString(), received.isEmpty()); + assertTrue(received.isEmpty(), received.toString()); assertTrue(subscriber.isDisposed()); @@ -113,7 +113,7 @@ public void onCompleteThrows() { Flowable.empty().subscribe(subscriber); - assertTrue(received.toString(), received.isEmpty()); + assertTrue(received.isEmpty(), received.toString()); assertTrue(subscriber.isDisposed()); @@ -182,15 +182,15 @@ public void onNextThrowsCancelsUpstream() { throw new TestException(); }, errors::add); - assertTrue("No observers?!", pp.hasSubscribers()); - assertTrue("Has errors already?!", errors.isEmpty()); + assertTrue(pp.hasSubscribers(), "No observers?!"); + assertTrue(errors.isEmpty(), "Has errors already?!"); pp.onNext(1); - assertFalse("Has observers?!", pp.hasSubscribers()); - assertFalse("No errors?!", errors.isEmpty()); + assertFalse(pp.hasSubscribers(), "Has observers?!"); + assertFalse(errors.isEmpty(), "No errors?!"); - assertTrue(errors.toString(), errors.getFirst() instanceof TestException); + assertTrue(errors.getFirst() instanceof TestException, errors.toString()); } @Test @@ -205,10 +205,10 @@ public void onSubscribeThrowsCancelsUpstream() { throw new TestException(); })); - assertFalse("Has observers?!", pp.hasSubscribers()); - assertFalse("No errors?!", errors.isEmpty()); + assertFalse(pp.hasSubscribers(), "Has observers?!"); + assertFalse(errors.isEmpty(), "No errors?!"); - assertTrue(errors.toString(), errors.getFirst() instanceof TestException); + assertTrue(errors.getFirst() instanceof TestException, errors.toString()); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/subscribers/QueueDrainSubscriberTest.java b/src/test/java/io/reactivex/rxjava4/internal/subscribers/QueueDrainSubscriberTest.java index 3ead8b239e..f2354a680a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/subscribers/QueueDrainSubscriberTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/subscribers/QueueDrainSubscriberTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.subscribers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; +import java.util.concurrent.Flow.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.MissingBackpressureException; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.operators.SpscArrayQueue; diff --git a/src/test/java/io/reactivex/rxjava4/internal/subscribers/SinglePostCompleteSubscriberTest.java b/src/test/java/io/reactivex/rxjava4/internal/subscribers/SinglePostCompleteSubscriberTest.java index f1f3b63a61..2f038ac1ab 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/subscribers/SinglePostCompleteSubscriberTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/subscribers/SinglePostCompleteSubscriberTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.subscribers; -import org.junit.Test; +import java.io.Serial; + +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.subscribers.TestSubscriber; import io.reactivex.rxjava4.testsupport.TestHelper; -import java.io.Serial; - public class SinglePostCompleteSubscriberTest extends RxJavaTest { @Test diff --git a/src/test/java/io/reactivex/rxjava4/internal/subscribers/StrictSubscriberTest.java b/src/test/java/io/reactivex/rxjava4/internal/subscribers/StrictSubscriberTest.java index 95c5c0f0dc..5e7a939df5 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/subscribers/StrictSubscriberTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/subscribers/StrictSubscriberTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.subscribers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; +import java.util.concurrent.Flow.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -61,7 +61,7 @@ protected void subscribeActual(Subscriber s) { } }.subscribe(sub); - assertTrue(list.toString(), list.getFirst() instanceof StrictSubscriber); + assertTrue(list.getFirst() instanceof StrictSubscriber, list.toString()); } record SubscriberWrapper(TestSubscriberEx tester) implements Subscriber { @@ -184,8 +184,8 @@ public void onComplete() { Flowable.range(1, 5).subscribe(sub); - assertTrue(list.toString(), list.getFirst() instanceof IllegalArgumentException); - assertTrue(list.toString(), list.getFirst().toString().contains("3.9")); + assertTrue(list.getFirst() instanceof IllegalArgumentException, list.toString()); + assertTrue(list.getFirst().toString().contains("3.9"), list.toString()); } @Test @@ -216,8 +216,8 @@ public void onComplete() { Flowable.range(1, 5).subscribe(sub); - assertTrue(list.toString(), list.getFirst() instanceof IllegalArgumentException); - assertTrue(list.toString(), list.getFirst().toString().contains("3.9")); + assertTrue(list.getFirst() instanceof IllegalArgumentException, list.toString()); + assertTrue(list.getFirst().toString().contains("3.9"), list.toString()); } @Test @@ -325,6 +325,6 @@ protected void subscribeActual(Subscriber s) { }.subscribe(wrapper); ts.assertFailure(IllegalStateException.class); - assertTrue(ts.errors().toString(), ts.errors().getFirst().getMessage().contains("2.12")); + assertTrue(ts.errors().getFirst().getMessage().contains("2.12"), ts.errors().toString()); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/subscribers/SubscriberResourceWrapperTest.java b/src/test/java/io/reactivex/rxjava4/internal/subscribers/SubscriberResourceWrapperTest.java index ad4c3d2baa..082e6e21a6 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/subscribers/SubscriberResourceWrapperTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/subscribers/SubscriberResourceWrapperTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.subscribers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; diff --git a/src/test/java/io/reactivex/rxjava4/internal/subscriptions/ArrayCompositeSubscriptionTest.java b/src/test/java/io/reactivex/rxjava4/internal/subscriptions/ArrayCompositeSubscriptionTest.java index 5432080b07..897f6f14c6 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/subscriptions/ArrayCompositeSubscriptionTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/subscriptions/ArrayCompositeSubscriptionTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.subscriptions; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/subscriptions/AsyncSubscriptionTest.java b/src/test/java/io/reactivex/rxjava4/internal/subscriptions/AsyncSubscriptionTest.java index 558139b5bc..170d56e9f0 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/subscriptions/AsyncSubscriptionTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/subscriptions/AsyncSubscriptionTest.java @@ -13,12 +13,13 @@ package io.reactivex.rxjava4.internal.subscriptions; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import java.util.concurrent.Flow.Subscription; + +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.disposables.Disposable; diff --git a/src/test/java/io/reactivex/rxjava4/internal/subscriptions/DeferredScalarSubscriptionTest.java b/src/test/java/io/reactivex/rxjava4/internal/subscriptions/DeferredScalarSubscriptionTest.java index 8aef892d2a..9c961d1551 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/subscriptions/DeferredScalarSubscriptionTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/subscriptions/DeferredScalarSubscriptionTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.subscriptions; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.operators.QueueFuseable; diff --git a/src/test/java/io/reactivex/rxjava4/internal/subscriptions/QueueSubscriptionTest.java b/src/test/java/io/reactivex/rxjava4/internal/subscriptions/QueueSubscriptionTest.java index 76c4e18005..9331e0bbea 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/subscriptions/QueueSubscriptionTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/subscriptions/QueueSubscriptionTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.internal.subscriptions; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import java.io.Serial; + +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.Nullable; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.testsupport.TestHelper; -import java.io.Serial; - public class QueueSubscriptionTest extends RxJavaTest { static final class EmptyQS extends BasicQueueSubscription { diff --git a/src/test/java/io/reactivex/rxjava4/internal/subscriptions/ScalarSubscriptionTest.java b/src/test/java/io/reactivex/rxjava4/internal/subscriptions/ScalarSubscriptionTest.java index 4c00381c0d..ef9616c32b 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/subscriptions/ScalarSubscriptionTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/subscriptions/ScalarSubscriptionTest.java @@ -15,7 +15,7 @@ import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.plugins.RxJavaPlugins; diff --git a/src/test/java/io/reactivex/rxjava4/internal/subscriptions/SubscriptionArbiterTest.java b/src/test/java/io/reactivex/rxjava4/internal/subscriptions/SubscriptionArbiterTest.java index a5fd42c31b..43b8259924 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/subscriptions/SubscriptionArbiterTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/subscriptions/SubscriptionArbiterTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.subscriptions; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.plugins.RxJavaPlugins; diff --git a/src/test/java/io/reactivex/rxjava4/internal/subscriptions/SubscriptionHelperTest.java b/src/test/java/io/reactivex/rxjava4/internal/subscriptions/SubscriptionHelperTest.java index 0251c8d694..139dc9bebb 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/subscriptions/SubscriptionHelperTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/subscriptions/SubscriptionHelperTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.subscriptions; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.*; import java.util.List; +import java.util.concurrent.Flow.Subscription; import java.util.concurrent.atomic.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.exceptions.ProtocolViolationException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/util/AtomicThrowableTest.java b/src/test/java/io/reactivex/rxjava4/internal/util/AtomicThrowableTest.java index 9a82b3c8b9..33d63b72a5 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/util/AtomicThrowableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/util/AtomicThrowableTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.util; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.observers.TestObserver; @@ -49,7 +49,7 @@ public void tryTerminateAndReportNull() { AtomicThrowable ex = new AtomicThrowable(); ex.tryTerminateAndReport(); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); } finally { RxJavaPlugins.reset(); } @@ -65,7 +65,7 @@ public void tryTerminateAndReportAlreadyTerminated() { ex.tryTerminateAndReport(); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); } finally { RxJavaPlugins.reset(); } @@ -308,7 +308,7 @@ public void tryAddThrowableOrReportNull() { AtomicThrowable ex = new AtomicThrowable(); ex.tryAddThrowableOrReport(new TestException()); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); } finally { RxJavaPlugins.reset(); } @@ -324,7 +324,7 @@ public void tryAddThrowableOrReportTerminated() { assertFalse(ex.tryAddThrowableOrReport(new TestException())); - assertFalse("" + errors, errors.isEmpty()); + assertFalse(errors.isEmpty(), "" + errors); TestHelper.assertUndeliverable(errors, 0, TestException.class); } finally { RxJavaPlugins.reset(); diff --git a/src/test/java/io/reactivex/rxjava4/internal/util/BackpressureHelperTest.java b/src/test/java/io/reactivex/rxjava4/internal/util/BackpressureHelperTest.java index db655d1c4f..a47160705e 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/util/BackpressureHelperTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/util/BackpressureHelperTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.util; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; import java.util.concurrent.atomic.AtomicLong; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.plugins.RxJavaPlugins; diff --git a/src/test/java/io/reactivex/rxjava4/internal/util/BlockingHelperTest.java b/src/test/java/io/reactivex/rxjava4/internal/util/BlockingHelperTest.java index 419f622a95..6e1639b766 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/util/BlockingHelperTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/util/BlockingHelperTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.internal.util; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.schedulers.Schedulers; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/util/EndConsumerHelperTest.java b/src/test/java/io/reactivex/rxjava4/internal/util/EndConsumerHelperTest.java index f37654e399..ba822b770e 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/util/EndConsumerHelperTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/util/EndConsumerHelperTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.util; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; +import java.util.concurrent.Flow.Subscriber; -import org.junit.*; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.ProtocolViolationException; import io.reactivex.rxjava4.internal.disposables.DisposableHelper; import io.reactivex.rxjava4.internal.subscriptions.*; @@ -34,12 +34,12 @@ public class EndConsumerHelperTest extends RxJavaTest { List errors; - @Before + @BeforeEach public void before() { errors = TestHelper.trackPluginErrors(); } - @After + @AfterEach public void after() { RxJavaPlugins.reset(); } @@ -81,7 +81,7 @@ public void onComplete() { TestHelper.assertError(errors, 0, ProtocolViolationException.class); assertEquals(EndConsumerHelper.composeMessage(consumer.getClass().getName()), errors.getFirst().getMessage()); - assertEquals(errors.toString(), 1, errors.size()); + assertEquals(1, errors.size(), errors.toString()); } static final class EndDefaultSubscriber extends DefaultSubscriber { @@ -120,7 +120,7 @@ public void checkDoubleDefaultSubscriberNonAnonymous() { // with this consumer, the class name should be predictable assertEquals(EndConsumerHelper.composeMessage("io.reactivex.rxjava4.internal.util.EndConsumerHelperTest$EndDefaultSubscriber"), errors.getFirst().getMessage()); - assertEquals(errors.toString(), 1, errors.size()); + assertEquals(1, errors.size(), errors.toString()); } @Test @@ -155,7 +155,7 @@ public void onComplete() { TestHelper.assertError(errors, 0, ProtocolViolationException.class); assertEquals(EndConsumerHelper.composeMessage(consumer.getClass().getName()), errors.getFirst().getMessage()); - assertEquals(errors.toString(), 1, errors.size()); + assertEquals(1, errors.size(), errors.toString()); } @Test @@ -190,7 +190,7 @@ public void onComplete() { TestHelper.assertError(errors, 0, ProtocolViolationException.class); assertEquals(EndConsumerHelper.composeMessage(consumer.getClass().getName()), errors.getFirst().getMessage()); - assertEquals(errors.toString(), 1, errors.size()); + assertEquals(1, errors.size(), errors.toString()); } @Test @@ -225,7 +225,7 @@ public void onComplete() { TestHelper.assertError(errors, 0, ProtocolViolationException.class); assertEquals(EndConsumerHelper.composeMessage(consumer.getClass().getName()), errors.getFirst().getMessage()); - assertEquals(errors.toString(), 1, errors.size()); + assertEquals(1, errors.size(), errors.toString()); } @Test @@ -260,7 +260,7 @@ public void onComplete() { TestHelper.assertError(errors, 0, ProtocolViolationException.class); assertEquals(EndConsumerHelper.composeMessage(consumer.getClass().getName()), errors.getFirst().getMessage()); - assertEquals(errors.toString(), 1, errors.size()); + assertEquals(1, errors.size(), errors.toString()); } @Test @@ -295,7 +295,7 @@ public void onComplete() { TestHelper.assertError(errors, 0, ProtocolViolationException.class); assertEquals(EndConsumerHelper.composeMessage(consumer.getClass().getName()), errors.getFirst().getMessage()); - assertEquals(errors.toString(), 1, errors.size()); + assertEquals(1, errors.size(), errors.toString()); } @Test @@ -326,7 +326,7 @@ public void onError(Throwable t) { TestHelper.assertError(errors, 0, ProtocolViolationException.class); assertEquals(EndConsumerHelper.composeMessage(consumer.getClass().getName()), errors.getFirst().getMessage()); - assertEquals(errors.toString(), 1, errors.size()); + assertEquals(1, errors.size(), errors.toString()); } @Test @@ -357,7 +357,7 @@ public void onError(Throwable t) { TestHelper.assertError(errors, 0, ProtocolViolationException.class); assertEquals(EndConsumerHelper.composeMessage(consumer.getClass().getName()), errors.getFirst().getMessage()); - assertEquals(errors.toString(), 1, errors.size()); + assertEquals(1, errors.size(), errors.toString()); } @Test @@ -392,7 +392,7 @@ public void onComplete() { TestHelper.assertError(errors, 0, ProtocolViolationException.class); assertEquals(EndConsumerHelper.composeMessage(consumer.getClass().getName()), errors.getFirst().getMessage()); - assertEquals(errors.toString(), 1, errors.size()); + assertEquals(1, errors.size(), errors.toString()); } @Test @@ -427,7 +427,7 @@ public void onComplete() { TestHelper.assertError(errors, 0, ProtocolViolationException.class); assertEquals(EndConsumerHelper.composeMessage(consumer.getClass().getName()), errors.getFirst().getMessage()); - assertEquals(errors.toString(), 1, errors.size()); + assertEquals(1, errors.size(), errors.toString()); } @Test @@ -458,7 +458,7 @@ public void onComplete() { TestHelper.assertError(errors, 0, ProtocolViolationException.class); assertEquals(EndConsumerHelper.composeMessage(consumer.getClass().getName()), errors.getFirst().getMessage()); - assertEquals(errors.toString(), 1, errors.size()); + assertEquals(1, errors.size(), errors.toString()); } @Test @@ -489,7 +489,7 @@ public void onComplete() { TestHelper.assertError(errors, 0, ProtocolViolationException.class); assertEquals(EndConsumerHelper.composeMessage(consumer.getClass().getName()), errors.getFirst().getMessage()); - assertEquals(errors.toString(), 1, errors.size()); + assertEquals(1, errors.size(), errors.toString()); } @Test @@ -500,7 +500,7 @@ public void validateDisposable() { assertTrue(d1.isDisposed()); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } @Test @@ -511,6 +511,6 @@ public void validateSubscription() { assertTrue(bs1.isCancelled()); - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/util/ExceptionHelperTest.java b/src/test/java/io/reactivex/rxjava4/internal/util/ExceptionHelperTest.java index 440e90beb0..9b487ebefa 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/util/ExceptionHelperTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/util/ExceptionHelperTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.util; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.exceptions.TestException; @@ -43,8 +43,10 @@ public void addRace() { } } - @Test(expected = InternalError.class) + @Test public void throwIfThrowable() throws Exception { - ExceptionHelper.throwIfThrowable(new InternalError()); + assertThrows(InternalError.class, () -> { + ExceptionHelper.throwIfThrowable(new InternalError()); + }); } } diff --git a/src/test/java/io/reactivex/rxjava4/internal/util/HalfSerializerObserverTest.java b/src/test/java/io/reactivex/rxjava4/internal/util/HalfSerializerObserverTest.java index a7f39b0ca7..304275922b 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/util/HalfSerializerObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/util/HalfSerializerObserverTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.internal.util; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.testsupport.*; diff --git a/src/test/java/io/reactivex/rxjava4/internal/util/HalfSerializerSubscriberTest.java b/src/test/java/io/reactivex/rxjava4/internal/util/HalfSerializerSubscriberTest.java index af4572dbcc..0bd42f3d70 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/util/HalfSerializerSubscriberTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/util/HalfSerializerSubscriberTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.util; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/internal/util/MergerBiFunctionTest.java b/src/test/java/io/reactivex/rxjava4/internal/util/MergerBiFunctionTest.java index 3779797117..8dba97b560 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/util/MergerBiFunctionTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/util/MergerBiFunctionTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.util; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; diff --git a/src/test/java/io/reactivex/rxjava4/internal/util/MiscUtilTest.java b/src/test/java/io/reactivex/rxjava4/internal/util/MiscUtilTest.java index 2365d993ee..61deb70b17 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/util/MiscUtilTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/util/MiscUtilTest.java @@ -13,14 +13,13 @@ package io.reactivex.rxjava4.internal.util; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import io.reactivex.rxjava4.core.ErrorMode; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import io.reactivex.rxjava4.core.RxJavaTest; +import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.functions.BiPredicate; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/internal/util/NotificationLiteTest.java b/src/test/java/io/reactivex/rxjava4/internal/util/NotificationLiteTest.java index 3835ff9326..7e9442b2bd 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/util/NotificationLiteTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/util/NotificationLiteTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.util; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.testsupport.TestObserverEx; diff --git a/src/test/java/io/reactivex/rxjava4/internal/util/OpenHashSetTest.java b/src/test/java/io/reactivex/rxjava4/internal/util/OpenHashSetTest.java index f7ebe7f95a..dcb30493ac 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/util/OpenHashSetTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/util/OpenHashSetTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.internal.util; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; diff --git a/src/test/java/io/reactivex/rxjava4/internal/util/QueueDrainHelperTest.java b/src/test/java/io/reactivex/rxjava4/internal/util/QueueDrainHelperTest.java index 44b62a6708..b388df2eec 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/util/QueueDrainHelperTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/util/QueueDrainHelperTest.java @@ -13,18 +13,18 @@ package io.reactivex.rxjava4.internal.util; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.AtomicLong; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Observer; import io.reactivex.rxjava4.core.RxJavaTest; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; import io.reactivex.rxjava4.functions.BooleanSupplier; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; diff --git a/src/test/java/io/reactivex/rxjava4/internal/util/VolatileSizeArrayListTest.java b/src/test/java/io/reactivex/rxjava4/internal/util/VolatileSizeArrayListTest.java index 7c81a54457..355a82599a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/util/VolatileSizeArrayListTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/util/VolatileSizeArrayListTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.internal.util; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; diff --git a/src/test/java/io/reactivex/rxjava4/internal/virtual/VirtualCreateTest.java b/src/test/java/io/reactivex/rxjava4/internal/virtual/VirtualCreateTest.java index 10b69301fd..f49e27528a 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/virtual/VirtualCreateTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/virtual/VirtualCreateTest.java @@ -30,13 +30,13 @@ package io.reactivex.rxjava4.internal.virtual; import static io.reactivex.rxjava4.testsupport.TestHelper.withVirtual; -import static org.testng.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Flowable; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/virtual/VirtualCreateVirtualTest.java b/src/test/java/io/reactivex/rxjava4/internal/virtual/VirtualCreateVirtualTest.java index ed08977c7c..155e16be9f 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/virtual/VirtualCreateVirtualTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/virtual/VirtualCreateVirtualTest.java @@ -29,13 +29,13 @@ package io.reactivex.rxjava4.internal.virtual; -import static org.testng.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Flowable; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/virtual/VirtualResumableTest.java b/src/test/java/io/reactivex/rxjava4/internal/virtual/VirtualResumableTest.java index ff3aae6835..cf16a5785d 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/virtual/VirtualResumableTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/virtual/VirtualResumableTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.internal.virtual; -import static org.testng.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import java.util.concurrent.Executors; +import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.*; public class VirtualResumableTest { @@ -60,7 +60,7 @@ public void concurrentAwait() { assertEquals(1, stateEx++); } - @Test(timeout = 30000) + @Test @Timeout(value = 30000, unit = TimeUnit.MILLISECONDS) public void pingPong() throws Exception { try (var scope = Executors.newThreadPerTaskExecutor(Thread.ofVirtual().factory())) { diff --git a/src/test/java/io/reactivex/rxjava4/internal/virtual/VirtualTransformTest.java b/src/test/java/io/reactivex/rxjava4/internal/virtual/VirtualTransformTest.java index d51f3b365f..29f294baad 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/virtual/VirtualTransformTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/virtual/VirtualTransformTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.virtual; -import static org.testng.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Flowable; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; diff --git a/src/test/java/io/reactivex/rxjava4/internal/virtual/VirtualTransformVirtualTest.java b/src/test/java/io/reactivex/rxjava4/internal/virtual/VirtualTransformVirtualTest.java index 40f245af9c..40b79b2157 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/virtual/VirtualTransformVirtualTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/virtual/VirtualTransformVirtualTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.internal.virtual; -import static org.testng.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; -import java.util.concurrent.*; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Flowable; import io.reactivex.rxjava4.core.config.StandardBufferedConfig; diff --git a/src/test/java/io/reactivex/rxjava4/maybe/MaybeCreateTest.java b/src/test/java/io/reactivex/rxjava4/maybe/MaybeCreateTest.java index 8f0b77b1e7..84954c3337 100644 --- a/src/test/java/io/reactivex/rxjava4/maybe/MaybeCreateTest.java +++ b/src/test/java/io/reactivex/rxjava4/maybe/MaybeCreateTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.maybe; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.testsupport.TestHelper; @@ -118,8 +118,10 @@ public void basicWithCompletion() { } } - @Test(expected = IllegalArgumentException.class) + @Test public void unsafeCreate() { - Maybe.unsafeCreate(Maybe.just(1)); + assertThrows(IllegalArgumentException.class, () -> { + Maybe.unsafeCreate(Maybe.just(1)); + }); } } diff --git a/src/test/java/io/reactivex/rxjava4/maybe/MaybeRetryTest.java b/src/test/java/io/reactivex/rxjava4/maybe/MaybeRetryTest.java index 251438a120..2abf4b5650 100644 --- a/src/test/java/io/reactivex/rxjava4/maybe/MaybeRetryTest.java +++ b/src/test/java/io/reactivex/rxjava4/maybe/MaybeRetryTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.maybe; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/maybe/MaybeTest.java b/src/test/java/io/reactivex/rxjava4/maybe/MaybeTest.java index ba77f7447e..3069b439fb 100644 --- a/src/test/java/io/reactivex/rxjava4/maybe/MaybeTest.java +++ b/src/test/java/io/reactivex/rxjava4/maybe/MaybeTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.maybe; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.lang.management.*; @@ -22,7 +22,7 @@ import java.util.concurrent.Flow.Publisher; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; @@ -754,7 +754,7 @@ public void sourceThrowsIAE() { fail("Should have thrown!"); } catch (NullPointerException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof IllegalArgumentException); + assertTrue(ex.getCause() instanceof IllegalArgumentException, ex.toString()); assertEquals("Forced failure", ex.getCause().getMessage()); } } @@ -1234,9 +1234,11 @@ public void basicWithComplete() { } } - @Test(expected = IllegalArgumentException.class) + @Test public void unsafeCreateWithMaybe() { - Maybe.unsafeCreate(Maybe.just(1)); + assertThrows(IllegalArgumentException.class, () -> { + Maybe.unsafeCreate(Maybe.just(1)); + }); } @Test @@ -1875,7 +1877,7 @@ public void subscribeZeroError() { TestHelper.assertError(errors, 0, OnErrorNotImplementedException.class); Throwable c = errors.getFirst().getCause(); - assertTrue("" + c, c instanceof TestException); + assertTrue(c instanceof TestException, "" + c); } finally { RxJavaPlugins.reset(); } diff --git a/src/test/java/io/reactivex/rxjava4/maybe/MaybeTimerTest.java b/src/test/java/io/reactivex/rxjava4/maybe/MaybeTimerTest.java index b417d82910..4e855bda30 100644 --- a/src/test/java/io/reactivex/rxjava4/maybe/MaybeTimerTest.java +++ b/src/test/java/io/reactivex/rxjava4/maybe/MaybeTimerTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.maybe; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.schedulers.TestScheduler; diff --git a/src/test/java/io/reactivex/rxjava4/observable/ObservableCombineLatestTests.java b/src/test/java/io/reactivex/rxjava4/observable/ObservableCombineLatestTests.java index e3722c1d60..325dcb2ec6 100644 --- a/src/test/java/io/reactivex/rxjava4/observable/ObservableCombineLatestTests.java +++ b/src/test/java/io/reactivex/rxjava4/observable/ObservableCombineLatestTests.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.observable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.functions.*; diff --git a/src/test/java/io/reactivex/rxjava4/observable/ObservableConcatTests.java b/src/test/java/io/reactivex/rxjava4/observable/ObservableConcatTests.java index 9ac5191516..2b3465228d 100644 --- a/src/test/java/io/reactivex/rxjava4/observable/ObservableConcatTests.java +++ b/src/test/java/io/reactivex/rxjava4/observable/ObservableConcatTests.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.observable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; +import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.observable.ObservableCovarianceTest.*; public class ObservableConcatTests extends RxJavaTest { diff --git a/src/test/java/io/reactivex/rxjava4/observable/ObservableCovarianceTest.java b/src/test/java/io/reactivex/rxjava4/observable/ObservableCovarianceTest.java index c6334ec01b..f6913a711d 100644 --- a/src/test/java/io/reactivex/rxjava4/observable/ObservableCovarianceTest.java +++ b/src/test/java/io/reactivex/rxjava4/observable/ObservableCovarianceTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.observable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.observables.GroupedObservable; import io.reactivex.rxjava4.testsupport.TestObserverEx; diff --git a/src/test/java/io/reactivex/rxjava4/observable/ObservableDoOnTest.java b/src/test/java/io/reactivex/rxjava4/observable/ObservableDoOnTest.java index 833b3cd0a7..e8e0a0cba1 100644 --- a/src/test/java/io/reactivex/rxjava4/observable/ObservableDoOnTest.java +++ b/src/test/java/io/reactivex/rxjava4/observable/ObservableDoOnTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/observable/ObservableErrorHandlingTests.java b/src/test/java/io/reactivex/rxjava4/observable/ObservableErrorHandlingTests.java index 16a9e5f831..9d5a9614f6 100644 --- a/src/test/java/io/reactivex/rxjava4/observable/ObservableErrorHandlingTests.java +++ b/src/test/java/io/reactivex/rxjava4/observable/ObservableErrorHandlingTests.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.observable; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.observers.DefaultObserver; diff --git a/src/test/java/io/reactivex/rxjava4/observable/ObservableFuseableTest.java b/src/test/java/io/reactivex/rxjava4/observable/ObservableFuseableTest.java index bb755920b5..91de3f04ee 100644 --- a/src/test/java/io/reactivex/rxjava4/observable/ObservableFuseableTest.java +++ b/src/test/java/io/reactivex/rxjava4/observable/ObservableFuseableTest.java @@ -15,7 +15,7 @@ import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.operators.QueueFuseable; diff --git a/src/test/java/io/reactivex/rxjava4/observable/ObservableGroupByTests.java b/src/test/java/io/reactivex/rxjava4/observable/ObservableGroupByTests.java index c0c419210b..9d37e5082d 100644 --- a/src/test/java/io/reactivex/rxjava4/observable/ObservableGroupByTests.java +++ b/src/test/java/io/reactivex/rxjava4/observable/ObservableGroupByTests.java @@ -13,10 +13,10 @@ package io.reactivex.rxjava4.observable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.observable.ObservableEventStream.Event; import io.reactivex.rxjava4.observables.GroupedObservable; diff --git a/src/test/java/io/reactivex/rxjava4/observable/ObservableMergeTests.java b/src/test/java/io/reactivex/rxjava4/observable/ObservableMergeTests.java index 928a713e8f..3571b5bf9a 100644 --- a/src/test/java/io/reactivex/rxjava4/observable/ObservableMergeTests.java +++ b/src/test/java/io/reactivex/rxjava4/observable/ObservableMergeTests.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.functions.Supplier; diff --git a/src/test/java/io/reactivex/rxjava4/observable/ObservableReduceTests.java b/src/test/java/io/reactivex/rxjava4/observable/ObservableReduceTests.java index 94ca03792c..11f8fbfff5 100644 --- a/src/test/java/io/reactivex/rxjava4/observable/ObservableReduceTests.java +++ b/src/test/java/io/reactivex/rxjava4/observable/ObservableReduceTests.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.observable.ObservableCovarianceTest.*; diff --git a/src/test/java/io/reactivex/rxjava4/observable/ObservableScanTests.java b/src/test/java/io/reactivex/rxjava4/observable/ObservableScanTests.java index 103db6235d..a361895294 100644 --- a/src/test/java/io/reactivex/rxjava4/observable/ObservableScanTests.java +++ b/src/test/java/io/reactivex/rxjava4/observable/ObservableScanTests.java @@ -15,10 +15,10 @@ import java.util.HashMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.BiFunction; import io.reactivex.rxjava4.observable.ObservableEventStream.Event; public class ObservableScanTests extends RxJavaTest { diff --git a/src/test/java/io/reactivex/rxjava4/observable/ObservableStartWithTests.java b/src/test/java/io/reactivex/rxjava4/observable/ObservableStartWithTests.java index 07f077e16a..dea857d3e9 100644 --- a/src/test/java/io/reactivex/rxjava4/observable/ObservableStartWithTests.java +++ b/src/test/java/io/reactivex/rxjava4/observable/ObservableStartWithTests.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.observable; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.RxJavaTest; diff --git a/src/test/java/io/reactivex/rxjava4/observable/ObservableSubscriberTest.java b/src/test/java/io/reactivex/rxjava4/observable/ObservableSubscriberTest.java index d09798a9ec..7d4fb0c645 100644 --- a/src/test/java/io/reactivex/rxjava4/observable/ObservableSubscriberTest.java +++ b/src/test/java/io/reactivex/rxjava4/observable/ObservableSubscriberTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; diff --git a/src/test/java/io/reactivex/rxjava4/observable/ObservableTest.java b/src/test/java/io/reactivex/rxjava4/observable/ObservableTest.java index 2a059acf07..46ea171d98 100644 --- a/src/test/java/io/reactivex/rxjava4/observable/ObservableTest.java +++ b/src/test/java/io/reactivex/rxjava4/observable/ObservableTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -21,13 +21,13 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.*; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.Observer; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.functions.*; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.observables.ConnectableObservable; @@ -44,7 +44,7 @@ public class ObservableTest extends RxJavaTest { private static final Predicate IS_EVEN = v -> v % 2 == 0; - @Before + @BeforeEach public void before() { w = TestHelper.mockObserver(); wo = TestHelper.mockSingleObserver(); @@ -460,7 +460,7 @@ public void publishLast() throws InterruptedException { // subscribe once final CountDownLatch latch = new CountDownLatch(1); connectable.subscribe(value -> { - Assert.assertEquals("last", value); + assertEquals("last", value); latch.countDown(); }); @@ -494,13 +494,13 @@ public void replay() throws InterruptedException { // subscribe once o.subscribe(v -> { - Assert.assertEquals("one", v); + assertEquals("one", v); latch.countDown(); }); // subscribe again o.subscribe(v -> { - Assert.assertEquals("one", v); + assertEquals("one", v); latch.countDown(); }); @@ -530,13 +530,13 @@ public void cache() throws InterruptedException { // subscribe once o.subscribe(v -> { - Assert.assertEquals("one", v); + assertEquals("one", v); latch.countDown(); }); // subscribe again o.subscribe(v -> { - Assert.assertEquals("one", v); + assertEquals("one", v); latch.countDown(); }); @@ -563,13 +563,13 @@ public void cacheWithCapacity() throws InterruptedException { // subscribe once o.subscribe(v -> { - Assert.assertEquals("one", v); + assertEquals("one", v); latch.countDown(); }); // subscribe again o.subscribe(v -> { - Assert.assertEquals("one", v); + assertEquals("one", v); latch.countDown(); }); @@ -940,7 +940,7 @@ public void as() { public void flatMap() { List list = Observable.range(1, 5).flatMap((Function>) v -> Observable.range(v, 2)).toList().blockingGet(); - Assert.assertEquals(Arrays.asList(1, 2, 2, 3, 3, 4, 4, 5, 5, 6), list); + assertEquals(Arrays.asList(1, 2, 2, 3, 3, 4, 4, 5, 5, 6), list); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/observable/ObservableThrottleLastTests.java b/src/test/java/io/reactivex/rxjava4/observable/ObservableThrottleLastTests.java index 45983653f6..6dbfce2219 100644 --- a/src/test/java/io/reactivex/rxjava4/observable/ObservableThrottleLastTests.java +++ b/src/test/java/io/reactivex/rxjava4/observable/ObservableThrottleLastTests.java @@ -13,20 +13,21 @@ package io.reactivex.rxjava4.observable; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; + import java.util.concurrent.TimeUnit; -import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.Action; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.exceptions.TestException; +import io.reactivex.rxjava4.functions.Action; import io.reactivex.rxjava4.schedulers.TestScheduler; import io.reactivex.rxjava4.subjects.PublishSubject; import io.reactivex.rxjava4.testsupport.TestHelper; -import static org.mockito.Mockito.*; - public class ObservableThrottleLastTests extends RxJavaTest { @Test diff --git a/src/test/java/io/reactivex/rxjava4/observable/ObservableThrottleWithTimeoutTests.java b/src/test/java/io/reactivex/rxjava4/observable/ObservableThrottleWithTimeoutTests.java index 82b579be5c..ea5415d524 100644 --- a/src/test/java/io/reactivex/rxjava4/observable/ObservableThrottleWithTimeoutTests.java +++ b/src/test/java/io/reactivex/rxjava4/observable/ObservableThrottleWithTimeoutTests.java @@ -17,7 +17,7 @@ import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/observable/ObservableWindowTests.java b/src/test/java/io/reactivex/rxjava4/observable/ObservableWindowTests.java index 452a6db20a..bc273c6ca4 100644 --- a/src/test/java/io/reactivex/rxjava4/observable/ObservableWindowTests.java +++ b/src/test/java/io/reactivex/rxjava4/observable/ObservableWindowTests.java @@ -13,18 +13,18 @@ package io.reactivex.rxjava4.observable; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.observers.TestObserver; -import io.reactivex.rxjava4.schedulers.*; +import io.reactivex.rxjava4.schedulers.TestScheduler; import io.reactivex.rxjava4.subjects.PublishSubject; public class ObservableWindowTests extends RxJavaTest { diff --git a/src/test/java/io/reactivex/rxjava4/observable/ObservableZipTests.java b/src/test/java/io/reactivex/rxjava4/observable/ObservableZipTests.java index eeed720521..ab77e627ec 100644 --- a/src/test/java/io/reactivex/rxjava4/observable/ObservableZipTests.java +++ b/src/test/java/io/reactivex/rxjava4/observable/ObservableZipTests.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.observable; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.RxJavaTest; @@ -78,20 +78,21 @@ public void covarianceOfZip() { * * We now expect an NoSuchElementException since last() requires at least one value and nothing will be emitted. */ - @Test(expected = NoSuchElementException.class) + @Test public void nonBlockingObservable() { + assertThrows(NoSuchElementException.class, () -> { + final Object invoked = new Object(); - final Object invoked = new Object(); + Collection> observables = Collections.emptyList(); - Collection> observables = Collections.emptyList(); + Observable result = Observable.zip(observables, args -> { + System.out.println("received: " + args); + assertEquals(0, args.length, "No argument should have been passed"); + return invoked; + }); - Observable result = Observable.zip(observables, args -> { - System.out.println("received: " + args); - Assert.assertEquals("No argument should have been passed", 0, args.length); - return invoked; + assertSame(invoked, result.blockingLast()); }); - - assertSame(invoked, result.blockingLast()); } BiFunction combine = (_, _) -> new ExtendedResult(); diff --git a/src/test/java/io/reactivex/rxjava4/observers/DisposableCompletableObserverTest.java b/src/test/java/io/reactivex/rxjava4/observers/DisposableCompletableObserverTest.java index 3ffc762f6d..6e04980611 100644 --- a/src/test/java/io/reactivex/rxjava4/observers/DisposableCompletableObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/observers/DisposableCompletableObserverTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.observers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.internal.util.EndConsumerHelper; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/observers/DisposableMaybeObserverTest.java b/src/test/java/io/reactivex/rxjava4/observers/DisposableMaybeObserverTest.java index 087b0f6973..078192310b 100644 --- a/src/test/java/io/reactivex/rxjava4/observers/DisposableMaybeObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/observers/DisposableMaybeObserverTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.observers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.internal.util.EndConsumerHelper; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/observers/DisposableObserverTest.java b/src/test/java/io/reactivex/rxjava4/observers/DisposableObserverTest.java index dd579c05b2..e7e9826207 100644 --- a/src/test/java/io/reactivex/rxjava4/observers/DisposableObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/observers/DisposableObserverTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.observers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.RxJavaTest; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.internal.util.EndConsumerHelper; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/observers/DisposableSingleObserverTest.java b/src/test/java/io/reactivex/rxjava4/observers/DisposableSingleObserverTest.java index a4cbcc9a9d..647dd78ad4 100644 --- a/src/test/java/io/reactivex/rxjava4/observers/DisposableSingleObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/observers/DisposableSingleObserverTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.observers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.internal.util.EndConsumerHelper; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/observers/ResourceCompletableObserverTest.java b/src/test/java/io/reactivex/rxjava4/observers/ResourceCompletableObserverTest.java index f5d5e77d10..244c59d846 100644 --- a/src/test/java/io/reactivex/rxjava4/observers/ResourceCompletableObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/observers/ResourceCompletableObserverTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.observers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.internal.util.EndConsumerHelper; import io.reactivex.rxjava4.plugins.RxJavaPlugins; @@ -56,10 +56,12 @@ public void onError(Throwable e) { } } - @Test(expected = NullPointerException.class) + @Test public void nullResource() { - TestResourceCompletableObserver rco = new TestResourceCompletableObserver(); - rco.add(null); + assertThrows(NullPointerException.class, () -> { + TestResourceCompletableObserver rco = new TestResourceCompletableObserver(); + rco.add(null); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/observers/ResourceMaybeObserverTest.java b/src/test/java/io/reactivex/rxjava4/observers/ResourceMaybeObserverTest.java index 8e3e88a7aa..18ba9d6cb9 100644 --- a/src/test/java/io/reactivex/rxjava4/observers/ResourceMaybeObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/observers/ResourceMaybeObserverTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.observers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.internal.util.EndConsumerHelper; import io.reactivex.rxjava4.plugins.RxJavaPlugins; @@ -65,10 +65,12 @@ public void onError(Throwable e) { } } - @Test(expected = NullPointerException.class) + @Test public void nullResource() { - TestResourceMaybeObserver rmo = new TestResourceMaybeObserver<>(); - rmo.add(null); + assertThrows(NullPointerException.class, () -> { + TestResourceMaybeObserver rmo = new TestResourceMaybeObserver<>(); + rmo.add(null); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/observers/ResourceObserverTest.java b/src/test/java/io/reactivex/rxjava4/observers/ResourceObserverTest.java index ac96518e7b..fa76982b61 100644 --- a/src/test/java/io/reactivex/rxjava4/observers/ResourceObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/observers/ResourceObserverTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.observers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.core.RxJavaTest; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.internal.util.EndConsumerHelper; import io.reactivex.rxjava4.plugins.RxJavaPlugins; @@ -65,10 +65,12 @@ public void onComplete() { } } - @Test(expected = NullPointerException.class) + @Test public void nullResource() { - TestResourceObserver ro = new TestResourceObserver<>(); - ro.add(null); + assertThrows(NullPointerException.class, () -> { + TestResourceObserver ro = new TestResourceObserver<>(); + ro.add(null); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/observers/ResourceSingleObserverTest.java b/src/test/java/io/reactivex/rxjava4/observers/ResourceSingleObserverTest.java index ff4bfc0969..c8c95d4dd9 100644 --- a/src/test/java/io/reactivex/rxjava4/observers/ResourceSingleObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/observers/ResourceSingleObserverTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.observers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.internal.util.EndConsumerHelper; import io.reactivex.rxjava4.plugins.RxJavaPlugins; @@ -56,10 +56,12 @@ public void onError(Throwable e) { } } - @Test(expected = NullPointerException.class) + @Test public void nullResource() { - TestResourceSingleObserver rso = new TestResourceSingleObserver<>(); - rso.add(null); + assertThrows(NullPointerException.class, () -> { + TestResourceSingleObserver rso = new TestResourceSingleObserver<>(); + rso.add(null); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/observers/SafeObserverTest.java b/src/test/java/io/reactivex/rxjava4/observers/SafeObserverTest.java index 8af9f0e373..6454fe2205 100644 --- a/src/test/java/io/reactivex/rxjava4/observers/SafeObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/observers/SafeObserverTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.observers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.testsupport.*; diff --git a/src/test/java/io/reactivex/rxjava4/observers/SerializedObserverTest.java b/src/test/java/io/reactivex/rxjava4/observers/SerializedObserverTest.java index d19d4fdfc3..c4d9d7802c 100644 --- a/src/test/java/io/reactivex/rxjava4/observers/SerializedObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/observers/SerializedObserverTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.observers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -21,7 +21,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; @@ -35,7 +35,7 @@ public class SerializedObserverTest extends RxJavaTest { Observer observer; - @Before + @BeforeEach public void before() { observer = TestHelper.mockObserver(); } @@ -264,7 +264,7 @@ public void runConcurrencyTest() { * * @throws InterruptedException if the {@link CountDownLatch#await()} is interrupted */ - @Ignore("this is non-deterministic ... haven't figured out what's wrong with the test yet (benjchristensen: July 2014)") + @Disabled("this is non-deterministic ... haven't figured out what's wrong with the test yet (benjchristensen: July 2014)") @Test public void notificationDelay() throws InterruptedException { ExecutorService tp1 = Executors.newFixedThreadPool(1); @@ -354,7 +354,7 @@ public void onNext(String t) { * * @throws InterruptedException if the {@link CountDownLatch#await()} is interrupted */ - @Ignore("Demonstrates thread starvation problem. Read Javadoc") + @Disabled("Demonstrates thread starvation problem. Read Javadoc") @Test public void threadStarvation() throws InterruptedException { @@ -1057,7 +1057,7 @@ public void onCompleteOnErrorRace() { } for (Throwable e : errors) { - assertTrue(e.toString(), e.getCause() instanceof TestException); + assertTrue(e.getCause() instanceof TestException, e.toString()); } } finally { RxJavaPlugins.reset(); diff --git a/src/test/java/io/reactivex/rxjava4/observers/TestObserverTest.java b/src/test/java/io/reactivex/rxjava4/observers/TestObserverTest.java index 667ed89973..894ec2d9e5 100644 --- a/src/test/java/io/reactivex/rxjava4/observers/TestObserverTest.java +++ b/src/test/java/io/reactivex/rxjava4/observers/TestObserverTest.java @@ -13,17 +13,17 @@ package io.reactivex.rxjava4.observers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.io.IOException; import java.util.*; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.TimeUnit; -import org.junit.Test; -import org.junit.function.ThrowingRunnable; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.function.Executable; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; @@ -39,14 +39,14 @@ public class TestObserverTest extends RxJavaTest { - static void assertThrowsWithMessage(String message, Class clazz, ThrowingRunnable run) { + static void assertThrowsWithMessage(String message, Class clazz, Executable run) { if (message.startsWith("~")) { message = message.substring(1); } assertEquals(message, assertThrows(clazz, run).getMessage()); } - static void assertThrowsWithMessageMatchRegex(String regex, Class clazz, ThrowingRunnable run) { + static void assertThrowsWithMessageMatchRegex(String regex, Class clazz, Executable run) { assertTrue(assertThrows(clazz, run).getMessage().matches(regex)); } @@ -530,7 +530,7 @@ public void awaitTerminalEventInterrupt() { try { to.awaitDone(5, TimeUnit.SECONDS); } catch (RuntimeException allowed) { - assertTrue(allowed.toString(), allowed.getCause() instanceof InterruptedException); + assertTrue(allowed.getCause() instanceof InterruptedException, allowed.toString()); } // FIXME ? catch consumes this flag @@ -541,7 +541,7 @@ public void awaitTerminalEventInterrupt() { try { to.awaitDone(5, TimeUnit.SECONDS); } catch (RuntimeException allowed) { - assertTrue(allowed.toString(), allowed.getCause() instanceof InterruptedException); + assertTrue(allowed.getCause() instanceof InterruptedException, allowed.toString()); } // FIXME ? catch consumes this flag @@ -616,14 +616,14 @@ public void assertValueSequence() { to.assertValueSequence(Collections.emptyList()); throw new RuntimeException("Should have thrown"); } catch (AssertionError expected) { - assertTrue(expected.getMessage(), expected.getMessage().startsWith("More values received than expected (0)")); + assertTrue(expected.getMessage().startsWith("More values received than expected (0)"), expected.getMessage()); } try { to.assertValueSequence(Collections.singletonList(1)); throw new RuntimeException("Should have thrown"); } catch (AssertionError expected) { - assertTrue(expected.getMessage(), expected.getMessage().startsWith("More values received than expected (1)")); + assertTrue(expected.getMessage().startsWith("More values received than expected (1)"), expected.getMessage()); } to.assertValueSequence(Arrays.asList(1, 2)); @@ -632,7 +632,7 @@ public void assertValueSequence() { to.assertValueSequence(Arrays.asList(1, 2, 3)); throw new RuntimeException("Should have thrown"); } catch (AssertionError expected) { - assertTrue(expected.getMessage(), expected.getMessage().startsWith("Fewer values received than expected (2)")); + assertTrue(expected.getMessage().startsWith("Fewer values received than expected (2)"), expected.getMessage()); } } @@ -670,7 +670,7 @@ public void awaitDoneTimed() { try { to.awaitDone(5, TimeUnit.SECONDS); } catch (RuntimeException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof InterruptedException); + assertTrue(ex.getCause() instanceof InterruptedException, ex.toString()); } } @@ -1120,7 +1120,7 @@ public void withTag() { } throw new RuntimeException("Should have thrown!"); } catch (AssertionError ex) { - assertTrue(ex.toString(), ex.toString().contains("testing with item=2")); + assertTrue(ex.toString().contains("testing with item=2"), ex.toString()); } } @@ -1204,15 +1204,17 @@ public void awaitCountTimeout() { assertTrue(to.timeout); } - @Test(expected = RuntimeException.class) + @Test public void awaitCountInterrupted() { - try { - TestObserver to = TestObserver.create(); - to.onSubscribe(Disposable.empty()); - Thread.currentThread().interrupt(); - to.awaitCount(1); - } finally { - Thread.interrupted(); - } + assertThrows(RuntimeException.class, () -> { + try { + TestObserver to = TestObserver.create(); + to.onSubscribe(Disposable.empty()); + Thread.currentThread().interrupt(); + to.awaitCount(1); + } finally { + Thread.interrupted(); + } + }); } } diff --git a/src/test/java/io/reactivex/rxjava4/operators/SimpleQueueTest.java b/src/test/java/io/reactivex/rxjava4/operators/SimpleQueueTest.java index a113b76c93..3b7fde0002 100644 --- a/src/test/java/io/reactivex/rxjava4/operators/SimpleQueueTest.java +++ b/src/test/java/io/reactivex/rxjava4/operators/SimpleQueueTest.java @@ -18,33 +18,39 @@ package io.reactivex.rxjava4.operators; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.internal.queue.MpscLinkedQueue; public class SimpleQueueTest extends RxJavaTest { - @Test(expected = NullPointerException.class) + @Test public void spscArrayQueueNull() { - SpscArrayQueue q = new SpscArrayQueue<>(16); - q.offer(null); + assertThrows(NullPointerException.class, () -> { + SpscArrayQueue q = new SpscArrayQueue<>(16); + q.offer(null); + }); } - @Test(expected = NullPointerException.class) + @Test public void spscLinkedArrayQueueNull() { - SpscLinkedArrayQueue q = new SpscLinkedArrayQueue<>(16); - q.offer(null); + assertThrows(NullPointerException.class, () -> { + SpscLinkedArrayQueue q = new SpscLinkedArrayQueue<>(16); + q.offer(null); + }); } - @Test(expected = NullPointerException.class) + @Test public void mpscLinkedQueueNull() { - MpscLinkedQueue q = new MpscLinkedQueue<>(); - q.offer(null); + assertThrows(NullPointerException.class, () -> { + MpscLinkedQueue q = new MpscLinkedQueue<>(); + q.offer(null); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/parallel/ParallelCollectTest.java b/src/test/java/io/reactivex/rxjava4/parallel/ParallelCollectTest.java index 3333208192..4c69ab06b5 100644 --- a/src/test/java/io/reactivex/rxjava4/parallel/ParallelCollectTest.java +++ b/src/test/java/io/reactivex/rxjava4/parallel/ParallelCollectTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.parallel; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -101,7 +101,7 @@ public void doubleError() { assertFalse(errors.isEmpty()); for (Throwable ex : errors) { - assertTrue(ex.toString(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, ex.toString()); } } finally { RxJavaPlugins.reset(); diff --git a/src/test/java/io/reactivex/rxjava4/parallel/ParallelDoOnNextTryTest.java b/src/test/java/io/reactivex/rxjava4/parallel/ParallelDoOnNextTryTest.java index 2cdaaeaa57..21e4764f60 100644 --- a/src/test/java/io/reactivex/rxjava4/parallel/ParallelDoOnNextTryTest.java +++ b/src/test/java/io/reactivex/rxjava4/parallel/ParallelDoOnNextTryTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.parallel; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Consumer; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.testsupport.*; diff --git a/src/test/java/io/reactivex/rxjava4/parallel/ParallelFilterTest.java b/src/test/java/io/reactivex/rxjava4/parallel/ParallelFilterTest.java index b9bf865b1a..147e1f66cf 100644 --- a/src/test/java/io/reactivex/rxjava4/parallel/ParallelFilterTest.java +++ b/src/test/java/io/reactivex/rxjava4/parallel/ParallelFilterTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.parallel; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -56,7 +56,7 @@ public void doubleError() { assertFalse(errors.isEmpty()); for (Throwable ex : errors) { - assertTrue(ex.toString(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, ex.toString()); } } finally { RxJavaPlugins.reset(); @@ -76,7 +76,7 @@ public void doubleError2() { assertFalse(errors.isEmpty()); for (Throwable ex : errors) { - assertTrue(ex.toString(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, ex.toString()); } } finally { RxJavaPlugins.reset(); diff --git a/src/test/java/io/reactivex/rxjava4/parallel/ParallelFilterTryTest.java b/src/test/java/io/reactivex/rxjava4/parallel/ParallelFilterTryTest.java index a1cecdcbbe..c89d228316 100644 --- a/src/test/java/io/reactivex/rxjava4/parallel/ParallelFilterTryTest.java +++ b/src/test/java/io/reactivex/rxjava4/parallel/ParallelFilterTryTest.java @@ -15,7 +15,7 @@ import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; diff --git a/src/test/java/io/reactivex/rxjava4/parallel/ParallelFlatMapIterableTest.java b/src/test/java/io/reactivex/rxjava4/parallel/ParallelFlatMapIterableTest.java index bb4d277262..6fbe9cf4b9 100644 --- a/src/test/java/io/reactivex/rxjava4/parallel/ParallelFlatMapIterableTest.java +++ b/src/test/java/io/reactivex/rxjava4/parallel/ParallelFlatMapIterableTest.java @@ -13,10 +13,9 @@ package io.reactivex.rxjava4.parallel; -import java.util.Arrays; -import java.util.List; +import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/parallel/ParallelFlowableTest.java b/src/test/java/io/reactivex/rxjava4/parallel/ParallelFlowableTest.java index 9de48f00ae..f02098610f 100644 --- a/src/test/java/io/reactivex/rxjava4/parallel/ParallelFlowableTest.java +++ b/src/test/java/io/reactivex/rxjava4/parallel/ParallelFlowableTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.parallel; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.*; import java.util.concurrent.*; +import java.util.concurrent.Flow.*; -import org.junit.*; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; @@ -331,7 +331,7 @@ public void collectAsyncFused() { List> list = ts.values(); - Assert.assertEquals(100000, list.get(0).size() + list.get(1).size() + list.get(2).size()); + assertEquals(100000, list.get(0).size() + list.get(1).size() + list.get(2).size()); } finally { exec.shutdown(); } @@ -363,7 +363,7 @@ public void collectAsync() { List> list = ts.values(); - Assert.assertEquals(100000, list.get(0).size() + list.get(1).size() + list.get(2).size()); + assertEquals(100000, list.get(0).size() + list.get(1).size() + list.get(2).size()); } finally { exec.shutdown(); } @@ -396,7 +396,7 @@ public void collectAsync2() { List> list = ts.values(); - Assert.assertEquals(100000, list.get(0).size() + list.get(1).size() + list.get(2).size()); + assertEquals(100000, list.get(0).size() + list.get(1).size() + list.get(2).size()); } finally { exec.shutdown(); } @@ -429,7 +429,7 @@ public void collectAsync3() { List> list = ts.values(); - Assert.assertEquals(100000, list.get(0).size() + list.get(1).size() + list.get(2).size()); + assertEquals(100000, list.get(0).size() + list.get(1).size() + list.get(2).size()); } finally { exec.shutdown(); } @@ -462,7 +462,7 @@ public void collectAsync3Fused() { List> list = ts.values(); - Assert.assertEquals(100000, list.get(0).size() + list.get(1).size() + list.get(2).size()); + assertEquals(100000, list.get(0).size() + list.get(1).size() + list.get(2).size()); } finally { exec.shutdown(); } @@ -496,7 +496,7 @@ public void collectAsync3Take() { List> list = ts.values(); - Assert.assertEquals(1000, list.get(0).size() + list.get(1).size() + list.get(2).size()); + assertEquals(1000, list.get(0).size() + list.get(1).size() + list.get(2).size()); } finally { exec.shutdown(); } @@ -536,7 +536,7 @@ public void collectAsync4Take() { List> list = ts.values(); - Assert.assertEquals(1000, list.get(0).size() + list.get(1).size() + list.get(2).size()); + assertEquals(1000, list.get(0).size() + list.get(1).size() + list.get(2).size()); } finally { exec.shutdown(); } @@ -689,7 +689,7 @@ public void doOnNextThrows() { .assertError(TestException.class) .assertNotComplete(); - assertTrue("" + count[0], count[0] < 5); + assertTrue(count[0] < 5, "" + count[0]); } @Test @@ -710,7 +710,7 @@ public void doAfterNextThrows() { .assertError(TestException.class) .assertNotComplete(); - assertTrue("" + count[0], count[0] < 5); + assertTrue(count[0] < 5, "" + count[0]); } @Test @@ -731,7 +731,7 @@ public void errorNotRepeating() throws Exception { for (Throwable ex : errors) { ex.printStackTrace(); } - assertTrue(errors.toString(), errors.isEmpty()); + assertTrue(errors.isEmpty(), errors.toString()); } finally { RxJavaPlugins.reset(); } @@ -859,9 +859,11 @@ public void doOnCancel() { } @SuppressWarnings("unchecked") - @Test(expected = IllegalArgumentException.class) + @Test public void fromPublishers() { - ParallelFlowable.fromArray(new Publisher[0]); + assertThrows(IllegalArgumentException.class, () -> { + ParallelFlowable.fromArray(new Publisher[0]); + }); } @Test @@ -873,12 +875,14 @@ public void to() { .assertResult(1, 2, 3, 4, 5); } - @Test(expected = TestException.class) + @Test public void toThrows() { - Flowable.range(1, 5) - .parallel() - .to((ParallelFlowableConverter>) _ -> { - throw new TestException(); + assertThrows(TestException.class, () -> { + Flowable.range(1, 5) + .parallel() + .to((ParallelFlowableConverter>) _ -> { + throw new TestException(); + }); }); } diff --git a/src/test/java/io/reactivex/rxjava4/parallel/ParallelFromPublisherTest.java b/src/test/java/io/reactivex/rxjava4/parallel/ParallelFromPublisherTest.java index 7a67fd4ec8..72ffacfd76 100644 --- a/src/test/java/io/reactivex/rxjava4/parallel/ParallelFromPublisherTest.java +++ b/src/test/java/io/reactivex/rxjava4/parallel/ParallelFromPublisherTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.parallel; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.Flow.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; @@ -166,13 +166,13 @@ public void boundaryConfinement() { TestHelper.assertValueSet(ts, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10); - assertEquals(between.toString(), 1, between.size()); - assertTrue(between.toString(), between.iterator().next().contains("RxSingleScheduler")); + assertEquals(1, between.size(), between.toString()); + assertTrue(between.iterator().next().contains("RxSingleScheduler"), between.toString()); Map map = processing; // AnimalSniffer: CHM.keySet() in Java 8 returns KeySetView for (String e : map.keySet()) { - assertTrue(map.toString(), e.contains("RxComputationThreadPool")); + assertTrue(e.contains("RxComputationThreadPool"), map.toString()); } } diff --git a/src/test/java/io/reactivex/rxjava4/parallel/ParallelJoinTest.java b/src/test/java/io/reactivex/rxjava4/parallel/ParallelJoinTest.java index 0cd1ca3cd3..d0e50c7a99 100644 --- a/src/test/java/io/reactivex/rxjava4/parallel/ParallelJoinTest.java +++ b/src/test/java/io/reactivex/rxjava4/parallel/ParallelJoinTest.java @@ -14,10 +14,10 @@ package io.reactivex.rxjava4.parallel; import java.util.List; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/parallel/ParallelMapTest.java b/src/test/java/io/reactivex/rxjava4/parallel/ParallelMapTest.java index 0a548d8705..046f03aded 100644 --- a/src/test/java/io/reactivex/rxjava4/parallel/ParallelMapTest.java +++ b/src/test/java/io/reactivex/rxjava4/parallel/ParallelMapTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.parallel; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.TimeUnit; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; @@ -77,7 +77,7 @@ public void doubleError() { assertFalse(errors.isEmpty()); for (Throwable ex : errors) { - assertTrue(ex.toString(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, ex.toString()); } } finally { RxJavaPlugins.reset(); @@ -97,7 +97,7 @@ public void doubleError2() { assertFalse(errors.isEmpty()); for (Throwable ex : errors) { - assertTrue(ex.toString(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, ex.toString()); } } finally { RxJavaPlugins.reset(); diff --git a/src/test/java/io/reactivex/rxjava4/parallel/ParallelMapTryTest.java b/src/test/java/io/reactivex/rxjava4/parallel/ParallelMapTryTest.java index 3d811f1f0a..953da65089 100644 --- a/src/test/java/io/reactivex/rxjava4/parallel/ParallelMapTryTest.java +++ b/src/test/java/io/reactivex/rxjava4/parallel/ParallelMapTryTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.parallel; -import java.util.*; +import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; diff --git a/src/test/java/io/reactivex/rxjava4/parallel/ParallelPeekTest.java b/src/test/java/io/reactivex/rxjava4/parallel/ParallelPeekTest.java index 99dc572f7f..54817e0b1d 100644 --- a/src/test/java/io/reactivex/rxjava4/parallel/ParallelPeekTest.java +++ b/src/test/java/io/reactivex/rxjava4/parallel/ParallelPeekTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.parallel; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -59,7 +59,7 @@ public void doubleError() { assertFalse(errors.isEmpty()); for (Throwable ex : errors) { - assertTrue(ex.toString(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, ex.toString()); } } finally { RxJavaPlugins.reset(); @@ -83,7 +83,7 @@ public void requestCrash() { assertFalse(errors.isEmpty()); for (Throwable ex : errors) { - assertTrue(ex.toString(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, ex.toString()); } } finally { RxJavaPlugins.reset(); @@ -107,7 +107,7 @@ public void cancelCrash() { assertFalse(errors.isEmpty()); for (Throwable ex : errors) { - assertTrue(ex.toString(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, ex.toString()); } } finally { RxJavaPlugins.reset(); @@ -144,7 +144,7 @@ public void onAfterTerminatedCrash() { assertFalse(errors.isEmpty()); for (Throwable ex : errors) { - assertTrue(ex.toString(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, ex.toString()); } } finally { RxJavaPlugins.reset(); @@ -169,8 +169,8 @@ public void onAfterTerminatedCrash2() { for (Throwable ex : errors) { Throwable exc = ex.getCause(); - assertTrue(ex.toString(), exc instanceof TestException - || exc instanceof IOException); + assertTrue(exc instanceof TestException + || exc instanceof IOException, ex.toString()); } } finally { RxJavaPlugins.reset(); diff --git a/src/test/java/io/reactivex/rxjava4/parallel/ParallelReduceFullTest.java b/src/test/java/io/reactivex/rxjava4/parallel/ParallelReduceFullTest.java index 570640ee0b..4817199fa9 100644 --- a/src/test/java/io/reactivex/rxjava4/parallel/ParallelReduceFullTest.java +++ b/src/test/java/io/reactivex/rxjava4/parallel/ParallelReduceFullTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.parallel; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; -import java.util.*; +import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -98,7 +98,7 @@ public void doubleError() { assertFalse(errors.isEmpty()); for (Throwable ex : errors) { - assertTrue(ex.toString(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, ex.toString()); } } finally { RxJavaPlugins.reset(); diff --git a/src/test/java/io/reactivex/rxjava4/parallel/ParallelReduceTest.java b/src/test/java/io/reactivex/rxjava4/parallel/ParallelReduceTest.java index bbc6cfd3ac..574323e277 100644 --- a/src/test/java/io/reactivex/rxjava4/parallel/ParallelReduceTest.java +++ b/src/test/java/io/reactivex/rxjava4/parallel/ParallelReduceTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.parallel; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.BiFunction; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.processors.PublishProcessor; import io.reactivex.rxjava4.subscribers.TestSubscriber; @@ -117,7 +117,7 @@ public void doubleError() { assertFalse(errors.isEmpty()); for (Throwable ex : errors) { - assertTrue(ex.toString(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, ex.toString()); } } finally { RxJavaPlugins.reset(); diff --git a/src/test/java/io/reactivex/rxjava4/parallel/ParallelRunOnTest.java b/src/test/java/io/reactivex/rxjava4/parallel/ParallelRunOnTest.java index f71181dff4..c80816ac30 100644 --- a/src/test/java/io/reactivex/rxjava4/parallel/ParallelRunOnTest.java +++ b/src/test/java/io/reactivex/rxjava4/parallel/ParallelRunOnTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.parallel; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.TimeUnit; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; @@ -52,7 +52,7 @@ public void doubleError() { assertFalse(errors.isEmpty()); for (Throwable ex : errors) { - assertTrue(ex.toString(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, ex.toString()); } } finally { RxJavaPlugins.reset(); diff --git a/src/test/java/io/reactivex/rxjava4/parallel/ParallelSortedJoinTest.java b/src/test/java/io/reactivex/rxjava4/parallel/ParallelSortedJoinTest.java index d802328ee4..f6c0c0dcb1 100644 --- a/src/test/java/io/reactivex/rxjava4/parallel/ParallelSortedJoinTest.java +++ b/src/test/java/io/reactivex/rxjava4/parallel/ParallelSortedJoinTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.parallel; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; -import java.util.*; +import java.util.List; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/plugins/RxJavaPluginsTest.java b/src/test/java/io/reactivex/rxjava4/plugins/RxJavaPluginsTest.java index 7f5bd8644e..368a9dbd49 100644 --- a/src/test/java/io/reactivex/rxjava4/plugins/RxJavaPluginsTest.java +++ b/src/test/java/io/reactivex/rxjava4/plugins/RxJavaPluginsTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.plugins; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.*; import java.lang.reflect.*; @@ -22,7 +22,7 @@ import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; @@ -113,9 +113,9 @@ public void lockdown() throws Exception { Object after = getter.invoke(null); if (paramType.isPrimitive()) { - assertEquals(m.toString(), before, after); + assertEquals(before, after, m.toString()); } else { - assertSame(m.toString(), before, after); + assertSame(before, after, m.toString()); } } } @@ -1111,17 +1111,17 @@ public void onComplete() { } static void assertTestException(List list, int index, String message) { - assertTrue(list.get(index).toString(), list.get(index) instanceof TestException); + assertTrue(list.get(index) instanceof TestException, list.get(index).toString()); assertEquals(message, list.get(index).getMessage()); } static void assertUndeliverableTestException(List list, int index, String message) { - assertTrue(list.get(index).toString(), list.get(index).getCause() instanceof TestException); - assertEquals(message, list.get(index).getCause().getMessage()); + assertTrue(list.get(index).getCause() instanceof TestException, list.get(index).toString()); + assertEquals(list.get(index).getCause().getMessage(), message); } static void assertNPE(List list, int index) { - assertTrue(list.get(index).toString(), list.get(index) instanceof NullPointerException); + assertTrue(list.get(index) instanceof NullPointerException, list.get(index).toString()); } @SuppressWarnings("rawtypes") diff --git a/src/test/java/io/reactivex/rxjava4/processors/AsyncProcessorTest.java b/src/test/java/io/reactivex/rxjava4/processors/AsyncProcessorTest.java index 42a26f577e..6116ed80ac 100644 --- a/src/test/java/io/reactivex/rxjava4/processors/AsyncProcessorTest.java +++ b/src/test/java/io/reactivex/rxjava4/processors/AsyncProcessorTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.processors; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.*; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; diff --git a/src/test/java/io/reactivex/rxjava4/processors/BehaviorProcessorTest.java b/src/test/java/io/reactivex/rxjava4/processors/BehaviorProcessorTest.java index 2ca9cfed83..edabac30bd 100644 --- a/src/test/java/io/reactivex/rxjava4/processors/BehaviorProcessorTest.java +++ b/src/test/java/io/reactivex/rxjava4/processors/BehaviorProcessorTest.java @@ -13,17 +13,17 @@ package io.reactivex.rxjava4.processors; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.List; import java.util.concurrent.*; +import java.util.concurrent.Flow.Subscriber; import java.util.concurrent.atomic.AtomicReference; -import org.junit.*; +import org.junit.jupiter.api.Test; import org.mockito.*; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; @@ -410,10 +410,10 @@ public void onNext(Object t) { System.out.println(o.get()); System.out.println(rs.hasSubscribers()); rs.onComplete(); - Assert.fail("Timeout @ " + i); + fail("Timeout @ " + i); break; } else { - Assert.assertEquals(1, o.get()); + assertEquals(1, o.get()); worker.schedule(rs::onComplete); } } diff --git a/src/test/java/io/reactivex/rxjava4/processors/FlowableProcessorTest.java b/src/test/java/io/reactivex/rxjava4/processors/FlowableProcessorTest.java index 8ee16532a7..7268a30a51 100644 --- a/src/test/java/io/reactivex/rxjava4/processors/FlowableProcessorTest.java +++ b/src/test/java/io/reactivex/rxjava4/processors/FlowableProcessorTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.processors; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.internal.util.ExceptionHelper; diff --git a/src/test/java/io/reactivex/rxjava4/processors/MulticastProcessorTest.java b/src/test/java/io/reactivex/rxjava4/processors/MulticastProcessorTest.java index 8cc5d48220..64456f4399 100644 --- a/src/test/java/io/reactivex/rxjava4/processors/MulticastProcessorTest.java +++ b/src/test/java/io/reactivex/rxjava4/processors/MulticastProcessorTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.processors; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.List; +import java.util.concurrent.Flow.Subscription; import java.util.concurrent.TimeUnit; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; @@ -88,7 +88,7 @@ public void error() { assertFalse(mp.hasComplete()); assertTrue(mp.hasThrowable()); assertNotNull(mp.getThrowable()); - assertTrue("" + mp.getThrowable(), mp.getThrowable() instanceof IOException); + assertTrue(mp.getThrowable() instanceof IOException, "" + mp.getThrowable()); mp.test().assertFailure(IOException.class); } @@ -412,25 +412,31 @@ public void multiStart() { } } - @Test(expected = NullPointerException.class) + @Test public void onNextNull() { - MulticastProcessor mp = MulticastProcessor.create(4, false); - mp.start(); - mp.onNext(null); + assertThrows(NullPointerException.class, () -> { + MulticastProcessor mp = MulticastProcessor.create(4, false); + mp.start(); + mp.onNext(null); + }); } - @Test(expected = NullPointerException.class) + @Test public void onOfferNull() { - MulticastProcessor mp = MulticastProcessor.create(4, false); - mp.start(); - mp.offer(null); + assertThrows(NullPointerException.class, () -> { + MulticastProcessor mp = MulticastProcessor.create(4, false); + mp.start(); + mp.offer(null); + }); } - @Test(expected = NullPointerException.class) + @Test public void onErrorNull() { - MulticastProcessor mp = MulticastProcessor.create(4, false); - mp.start(); - mp.onError(null); + assertThrows(NullPointerException.class, () -> { + MulticastProcessor mp = MulticastProcessor.create(4, false); + mp.start(); + mp.onError(null); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/processors/PublishProcessorTest.java b/src/test/java/io/reactivex/rxjava4/processors/PublishProcessorTest.java index bef1c574e6..b39a8aa25b 100644 --- a/src/test/java/io/reactivex/rxjava4/processors/PublishProcessorTest.java +++ b/src/test/java/io/reactivex/rxjava4/processors/PublishProcessorTest.java @@ -13,21 +13,21 @@ package io.reactivex.rxjava4.processors; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.ArrayList; +import java.util.concurrent.Flow.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.*; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.schedulers.Schedulers; import io.reactivex.rxjava4.subscribers.*; import io.reactivex.rxjava4.testsupport.*; diff --git a/src/test/java/io/reactivex/rxjava4/processors/ReplayProcessorBoundedConcurrencyTest.java b/src/test/java/io/reactivex/rxjava4/processors/ReplayProcessorBoundedConcurrencyTest.java index 6bbd3b5a89..dd50be68e8 100644 --- a/src/test/java/io/reactivex/rxjava4/processors/ReplayProcessorBoundedConcurrencyTest.java +++ b/src/test/java/io/reactivex/rxjava4/processors/ReplayProcessorBoundedConcurrencyTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.processors; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.*; +import java.util.concurrent.Flow.Publisher; import java.util.concurrent.atomic.AtomicReference; -import org.junit.*; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.schedulers.Schedulers; @@ -345,10 +345,10 @@ public void onNext(Object t) { System.out.println(o.get()); System.out.println(rs.hasSubscribers()); rs.onComplete(); - Assert.fail("Timeout @ " + i); + fail("Timeout @ " + i); break; } else { - Assert.assertEquals(1, o.get()); + assertEquals(1, o.get()); worker.schedule(rs::onComplete); } } @@ -386,13 +386,13 @@ public void concurrentSizeAndHasAnyValue() throws InterruptedException { boolean hasAny = rs.hasValue(); Object[] values = rs.getValues(); if (size < lastSize) { - Assert.fail("Size decreased! " + lastSize + " -> " + size); + fail("Size decreased! " + lastSize + " -> " + size); } if ((size > 0) && !hasAny) { - Assert.fail("hasAnyValue reports emptyness but size doesn't"); + fail("hasAnyValue reports emptyness but size doesn't"); } if (size > values.length) { - Assert.fail("Got fewer values than size! " + size + " -> " + values.length); + fail("Got fewer values than size! " + size + " -> " + values.length); } for (int i = 0; i < values.length - 1; i++) { Integer v1 = (Integer)values[i]; diff --git a/src/test/java/io/reactivex/rxjava4/processors/ReplayProcessorConcurrencyTest.java b/src/test/java/io/reactivex/rxjava4/processors/ReplayProcessorConcurrencyTest.java index 9e3f7ce0e4..bf1700aaf3 100644 --- a/src/test/java/io/reactivex/rxjava4/processors/ReplayProcessorConcurrencyTest.java +++ b/src/test/java/io/reactivex/rxjava4/processors/ReplayProcessorConcurrencyTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.processors; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.*; +import java.util.concurrent.Flow.Publisher; import java.util.concurrent.atomic.AtomicReference; -import org.junit.*; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.schedulers.Schedulers; @@ -332,10 +332,10 @@ public void onNext(Object t) { System.out.println(o.get()); System.out.println(rs.hasSubscribers()); rs.onComplete(); - Assert.fail("Timeout @ " + i); + fail("Timeout @ " + i); break; } else { - Assert.assertEquals(1, o.get()); + assertEquals(1, o.get()); worker.schedule(rs::onComplete); } @@ -374,13 +374,13 @@ public void concurrentSizeAndHasAnyValue() throws InterruptedException { boolean hasAny = rs.hasValue(); Object[] values = rs.getValues(); if (size < lastSize) { - Assert.fail("Size decreased! " + lastSize + " -> " + size); + fail("Size decreased! " + lastSize + " -> " + size); } if ((size > 0) && !hasAny) { - Assert.fail("hasAnyValue reports emptyness but size doesn't"); + fail("hasAnyValue reports emptyness but size doesn't"); } if (size > values.length) { - Assert.fail("Got fewer values than size! " + size + " -> " + values.length); + fail("Got fewer values than size! " + size + " -> " + values.length); } lastSize = size; } diff --git a/src/test/java/io/reactivex/rxjava4/processors/ReplayProcessorTest.java b/src/test/java/io/reactivex/rxjava4/processors/ReplayProcessorTest.java index 55a1833cd3..1e277854f8 100644 --- a/src/test/java/io/reactivex/rxjava4/processors/ReplayProcessorTest.java +++ b/src/test/java/io/reactivex/rxjava4/processors/ReplayProcessorTest.java @@ -13,24 +13,24 @@ package io.reactivex.rxjava4.processors; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.lang.management.*; import java.util.Arrays; import java.util.concurrent.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.Test; import org.mockito.*; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.Flowable; import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.processors.ReplayProcessor.*; import io.reactivex.rxjava4.schedulers.*; @@ -1664,7 +1664,7 @@ public void noBoundedRetentionViaThreadLocal() throws Exception { System.out.printf("Bounded Replay Leak check: After: %.3f MB%n", after.get() / 1024.0 / 1024.0); if (initial + 100 * 1024 * 1024 < after.get()) { - Assert.fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + " -> " + after.get() / 1024.0 / 1024.0); } } diff --git a/src/test/java/io/reactivex/rxjava4/processors/SerializedProcessorTest.java b/src/test/java/io/reactivex/rxjava4/processors/SerializedProcessorTest.java index 14ed81474e..2d17f38bc1 100644 --- a/src/test/java/io/reactivex/rxjava4/processors/SerializedProcessorTest.java +++ b/src/test/java/io/reactivex/rxjava4/processors/SerializedProcessorTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.processors; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; @@ -437,7 +437,7 @@ public void onNextOnNextRace() { ; Set actualSet = new HashSet<>(ts.values()); - assertEquals("" + actualSet, expectedSet, actualSet); + assertEquals(expectedSet, actualSet, "" + actualSet); } } diff --git a/src/test/java/io/reactivex/rxjava4/processors/UnicastProcessorTest.java b/src/test/java/io/reactivex/rxjava4/processors/UnicastProcessorTest.java index e5a5e1036f..c2cf4cebd3 100644 --- a/src/test/java/io/reactivex/rxjava4/processors/UnicastProcessorTest.java +++ b/src/test/java/io/reactivex/rxjava4/processors/UnicastProcessorTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.processors; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.disposables.Disposable; @@ -159,19 +159,25 @@ public void onTerminateCalledWhenCancelled() { assertTrue(didRunOnTerminate.get()); } - @Test(expected = NullPointerException.class) + @Test public void nullOnTerminate() { - UnicastProcessor.create(5, null); + assertThrows(NullPointerException.class, () -> { + UnicastProcessor.create(5, null); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void negativeCapacityHint() { - UnicastProcessor.create(-1); + assertThrows(IllegalArgumentException.class, () -> { + UnicastProcessor.create(-1); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void zeroCapacityHint() { - UnicastProcessor.create(0); + assertThrows(IllegalArgumentException.class, () -> { + UnicastProcessor.create(0); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/schedulers/AbstractSchedulerConcurrencyTests.java b/src/test/java/io/reactivex/rxjava4/schedulers/AbstractSchedulerConcurrencyTests.java index 5df1c14de0..793ed51f27 100644 --- a/src/test/java/io/reactivex/rxjava4/schedulers/AbstractSchedulerConcurrencyTests.java +++ b/src/test/java/io/reactivex/rxjava4/schedulers/AbstractSchedulerConcurrencyTests.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Scheduler.Worker; diff --git a/src/test/java/io/reactivex/rxjava4/schedulers/AbstractSchedulerTests.java b/src/test/java/io/reactivex/rxjava4/schedulers/AbstractSchedulerTests.java index 6badf2003a..a064c66611 100644 --- a/src/test/java/io/reactivex/rxjava4/schedulers/AbstractSchedulerTests.java +++ b/src/test/java/io/reactivex/rxjava4/schedulers/AbstractSchedulerTests.java @@ -13,21 +13,21 @@ package io.reactivex.rxjava4.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.util.*; import java.util.concurrent.*; +import java.util.concurrent.Flow.Publisher; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Scheduler.Worker; import io.reactivex.rxjava4.disposables.Disposable; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.disposables.SequentialDisposable; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.internal.schedulers.TrampolineScheduler; @@ -499,7 +499,7 @@ public void run() { } }, initial, 0, TimeUnit.MILLISECONDS)); - assertTrue("" + initial, cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "" + initial); } finally { sd.dispose(); } @@ -534,7 +534,7 @@ public void run() { } }, initial, 0, TimeUnit.MILLISECONDS)); - assertTrue("" + initial, cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "" + initial); } finally { sd.dispose(); w.dispose(); @@ -597,11 +597,15 @@ public void unwrapDefaultPeriodicTask() throws InterruptedException { final CountDownLatch cdl = new CountDownLatch(1); Runnable countDownRunnable = cdl::countDown; Disposable disposable = s.schedulePeriodicallyDirect(countDownRunnable, 100, 100, TimeUnit.MILLISECONDS); - SchedulerRunnableIntrospection wrapper = (SchedulerRunnableIntrospection) disposable; - assertSame(countDownRunnable, wrapper.getWrappedRunnable()); - assertTrue(cdl.await(5, TimeUnit.SECONDS)); - disposable.dispose(); + if (disposable instanceof SchedulerRunnableIntrospection wrapper) { + assertSame(countDownRunnable, wrapper.getWrappedRunnable()); + assertTrue(cdl.await(5, TimeUnit.SECONDS)); + disposable.dispose(); + } else { + disposable.dispose(); + throw new AssertionError(disposable.getClass() + " does not implement SchedulerRunnableIntrospection"); + } } @Test @@ -614,9 +618,13 @@ public void unwrapScheduleDirectTask() { final CountDownLatch cdl = new CountDownLatch(1); Runnable countDownRunnable = cdl::countDown; Disposable disposable = scheduler.scheduleDirect(countDownRunnable, 100, TimeUnit.MILLISECONDS); - SchedulerRunnableIntrospection wrapper = (SchedulerRunnableIntrospection) disposable; - assertSame(countDownRunnable, wrapper.getWrappedRunnable()); - disposable.dispose(); + if (disposable instanceof SchedulerRunnableIntrospection wrapper) { + assertSame(countDownRunnable, wrapper.getWrappedRunnable()); + disposable.dispose(); + } else { + disposable.dispose(); + throw new AssertionError(disposable.getClass() + " does not implement SchedulerRunnableIntrospection"); + } } @Test diff --git a/src/test/java/io/reactivex/rxjava4/schedulers/CachedThreadSchedulerTest.java b/src/test/java/io/reactivex/rxjava4/schedulers/CachedThreadSchedulerTest.java index 8d894b4ec9..0ed34a4693 100644 --- a/src/test/java/io/reactivex/rxjava4/schedulers/CachedThreadSchedulerTest.java +++ b/src/test/java/io/reactivex/rxjava4/schedulers/CachedThreadSchedulerTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Scheduler.Worker; diff --git a/src/test/java/io/reactivex/rxjava4/schedulers/ComputationSchedulerTests.java b/src/test/java/io/reactivex/rxjava4/schedulers/ComputationSchedulerTests.java index c2e438d182..e81079c5b9 100644 --- a/src/test/java/io/reactivex/rxjava4/schedulers/ComputationSchedulerTests.java +++ b/src/test/java/io/reactivex/rxjava4/schedulers/ComputationSchedulerTests.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.HashMap; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Scheduler.Worker; @@ -32,7 +32,6 @@ public class ComputationSchedulerTests extends AbstractSchedulerConcurrencyTests @Override protected Scheduler getScheduler() { - // this is an implementation of ExecutorScheduler return Schedulers.computation(); } diff --git a/src/test/java/io/reactivex/rxjava4/schedulers/ExecutorSchedulerFairTest.java b/src/test/java/io/reactivex/rxjava4/schedulers/ExecutorSchedulerFairTest.java index 6e7ba3deb0..b94c7b0a8b 100644 --- a/src/test/java/io/reactivex/rxjava4/schedulers/ExecutorSchedulerFairTest.java +++ b/src/test/java/io/reactivex/rxjava4/schedulers/ExecutorSchedulerFairTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Scheduler.Worker; diff --git a/src/test/java/io/reactivex/rxjava4/schedulers/ExecutorSchedulerInterruptibleTest.java b/src/test/java/io/reactivex/rxjava4/schedulers/ExecutorSchedulerInterruptibleTest.java index 07fd410cb5..e71eb4646e 100644 --- a/src/test/java/io/reactivex/rxjava4/schedulers/ExecutorSchedulerInterruptibleTest.java +++ b/src/test/java/io/reactivex/rxjava4/schedulers/ExecutorSchedulerInterruptibleTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Scheduler; import io.reactivex.rxjava4.core.Scheduler.Worker; @@ -395,7 +395,7 @@ public void interruptibleDirectTask() throws Exception { Thread.sleep(50); } - assertTrue("Interruption did not propagate", isInterrupted.get()); + assertTrue(isInterrupted.get(), "Interruption did not propagate"); } @Test @@ -433,7 +433,7 @@ public void interruptibleWorkerTask() throws Exception { Thread.sleep(50); } - assertTrue("Interruption did not propagate", isInterrupted.get()); + assertTrue(isInterrupted.get(), "Interruption did not propagate"); } finally { worker.dispose(); } @@ -473,7 +473,7 @@ public void interruptibleDirectTaskScheduledExecutor() throws Exception { Thread.sleep(50); } - assertTrue("Interruption did not propagate", isInterrupted.get()); + assertTrue(isInterrupted.get(), "Interruption did not propagate"); } finally { exec.shutdown(); } @@ -516,7 +516,7 @@ public void interruptibleWorkerTaskScheduledExecutor() throws Exception { Thread.sleep(50); } - assertTrue("Interruption did not propagate", isInterrupted.get()); + assertTrue(isInterrupted.get(), "Interruption did not propagate"); } finally { worker.dispose(); } @@ -559,7 +559,7 @@ public void nonInterruptibleDirectTask() throws Exception { Thread.sleep(50); } - assertFalse("Interruption happened", isInterrupted.get()); + assertFalse(isInterrupted.get(), "Interruption happened"); } finally { exec.shutdown(); } @@ -602,7 +602,7 @@ public void nonInterruptibleWorkerTask() throws Exception { Thread.sleep(50); } - assertFalse("Interruption happened", isInterrupted.get()); + assertFalse(isInterrupted.get(), "Interruption happened"); } finally { worker.dispose(); } @@ -645,7 +645,7 @@ public void nonInterruptibleDirectTaskScheduledExecutor() throws Exception { Thread.sleep(50); } - assertFalse("Interruption happened", isInterrupted.get()); + assertFalse(isInterrupted.get(), "Interruption happened"); } finally { exec.shutdown(); } @@ -688,7 +688,7 @@ public void nonInterruptibleWorkerTaskScheduledExecutor() throws Exception { Thread.sleep(50); } - assertFalse("Interruption happened", isInterrupted.get()); + assertFalse(isInterrupted.get(), "Interruption happened"); } finally { worker.dispose(); } @@ -731,7 +731,7 @@ public void nonInterruptibleDirectTaskTimed() throws Exception { Thread.sleep(50); } - assertFalse("Interruption happened", isInterrupted.get()); + assertFalse(isInterrupted.get(), "Interruption happened"); } finally { exec.shutdown(); } @@ -774,7 +774,7 @@ public void nonInterruptibleWorkerTaskTimed() throws Exception { Thread.sleep(50); } - assertFalse("Interruption happened", isInterrupted.get()); + assertFalse(isInterrupted.get(), "Interruption happened"); } finally { worker.dispose(); } @@ -817,7 +817,7 @@ public void nonInterruptibleDirectTaskScheduledExecutorTimed() throws Exception Thread.sleep(50); } - assertFalse("Interruption happened", isInterrupted.get()); + assertFalse(isInterrupted.get(), "Interruption happened"); } finally { exec.shutdown(); } @@ -860,7 +860,7 @@ public void nonInterruptibleWorkerTaskScheduledExecutorTimed() throws Exception Thread.sleep(50); } - assertFalse("Interruption happened", isInterrupted.get()); + assertFalse(isInterrupted.get(), "Interruption happened"); } finally { worker.dispose(); } @@ -947,7 +947,7 @@ public void noInterruptBeforeRunningDelayedWorker() throws Throwable { int i = 150; while (i-- > 0) { - assertFalse("Task interrupt detected", exec.interruptReceived.get()); + assertFalse(exec.interruptReceived.get(), "Task interrupt detected"); Thread.sleep(10); } @@ -970,7 +970,7 @@ public void hasInterruptBeforeRunningDelayedWorker() throws Throwable { d.dispose(); Thread.sleep(100); - assertTrue("Task interrupt detected", exec.interruptReceived.get()); + assertTrue(exec.interruptReceived.get(), "Task interrupt detected"); } finally { exec.shutdownNow(); @@ -1002,11 +1002,11 @@ public void noInterruptAfterRunningDelayedWorker() throws Throwable { int i = 50; while (i-- > 0) { - assertFalse("Task interrupt detected", exec.interruptReceived.get()); + assertFalse(exec.interruptReceived.get(), "Task interrupt detected"); Thread.sleep(10); } - assertTrue("Task run at all", taskRun.get()); + assertTrue(taskRun.get(), "Task run at all"); } finally { exec.shutdownNow(); diff --git a/src/test/java/io/reactivex/rxjava4/schedulers/ExecutorSchedulerTest.java b/src/test/java/io/reactivex/rxjava4/schedulers/ExecutorSchedulerTest.java index 2b5fa42e00..9dd18e39b6 100644 --- a/src/test/java/io/reactivex/rxjava4/schedulers/ExecutorSchedulerTest.java +++ b/src/test/java/io/reactivex/rxjava4/schedulers/ExecutorSchedulerTest.java @@ -13,21 +13,21 @@ package io.reactivex.rxjava4.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.lang.management.*; import java.util.List; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Scheduler; import io.reactivex.rxjava4.core.Scheduler.Worker; import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.internal.disposables.*; import io.reactivex.rxjava4.internal.functions.Functions; -import io.reactivex.rxjava4.internal.schedulers.*; +import io.reactivex.rxjava4.internal.schedulers.RxThreadFactory; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/schedulers/FailOnBlockingTest.java b/src/test/java/io/reactivex/rxjava4/schedulers/FailOnBlockingTest.java index db4054bf17..8a327f0e40 100644 --- a/src/test/java/io/reactivex/rxjava4/schedulers/FailOnBlockingTest.java +++ b/src/test/java/io/reactivex/rxjava4/schedulers/FailOnBlockingTest.java @@ -15,7 +15,7 @@ import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.internal.functions.Functions; diff --git a/src/test/java/io/reactivex/rxjava4/schedulers/NewThreadSchedulerTest.java b/src/test/java/io/reactivex/rxjava4/schedulers/NewThreadSchedulerTest.java index cf068d9ab5..87a594c743 100644 --- a/src/test/java/io/reactivex/rxjava4/schedulers/NewThreadSchedulerTest.java +++ b/src/test/java/io/reactivex/rxjava4/schedulers/NewThreadSchedulerTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Scheduler; import io.reactivex.rxjava4.core.Scheduler.Worker; diff --git a/src/test/java/io/reactivex/rxjava4/schedulers/ParallelSchedulerTests.java b/src/test/java/io/reactivex/rxjava4/schedulers/ParallelSchedulerTests.java new file mode 100644 index 0000000000..5b46c2f7f3 --- /dev/null +++ b/src/test/java/io/reactivex/rxjava4/schedulers/ParallelSchedulerTests.java @@ -0,0 +1,291 @@ +/* + * 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.schedulers; + +import static org.junit.jupiter.api.Assertions.*; + +import java.util.HashMap; +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicInteger; + +import org.junit.jupiter.api.*; + +import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.core.config.*; +import io.reactivex.rxjava4.core.Scheduler.Worker; +import io.reactivex.rxjava4.disposables.Disposable; +import io.reactivex.rxjava4.internal.schedulers.ComputationScheduler; +import io.reactivex.rxjava4.plugins.RxJavaPlugins; +import io.reactivex.rxjava4.testsupport.SuppressUndeliverable; + +public class ParallelSchedulerTests extends AbstractSchedulerConcurrencyTests { + + Scheduler scheduler; + + @BeforeEach + public void before() { + scheduler = Schedulers.createParallel(new ParallelSchedulerConfig(2)); + } + + @AfterEach + public void after() { + scheduler.shutdown(); + } + + @Override + protected Scheduler getScheduler() { + return scheduler; + } + + @Test + public void threadSafetyWhenSchedulerIsHoppingBetweenThreads() { + + final int NUM = 1000000; + final CountDownLatch latch = new CountDownLatch(1); + final HashMap map = new HashMap<>(); + + final Scheduler.Worker inner = Schedulers.computation().createWorker(); + + try { + inner.schedule(new Runnable() /* NFI */ { + + private HashMap statefulMap = map; + int nonThreadSafeCounter; + + @Override + public void run() { + Integer i = statefulMap.get("a"); + if (i == null) { + i = 1; + statefulMap.put("a", i); + statefulMap.put("b", i); + } else { + i++; + statefulMap.put("a", i); + statefulMap.put("b", i); + } + nonThreadSafeCounter++; + statefulMap.put("nonThreadSafeCounter", nonThreadSafeCounter); + if (i < NUM) { + inner.schedule(this); + } else { + latch.countDown(); + } + } + }); + + try { + latch.await(); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + System.out.println("Count A: " + map.get("a")); + System.out.println("Count B: " + map.get("b")); + System.out.println("nonThreadSafeCounter: " + map.get("nonThreadSafeCounter")); + + assertEquals(NUM, map.get("a").intValue()); + assertEquals(NUM, map.get("b").intValue()); + assertEquals(NUM, map.get("nonThreadSafeCounter").intValue()); + } finally { + inner.dispose(); + } + } + + @Test + public final void computationThreadPool1() { + Flowable f1 = Flowable. just(1, 2, 3, 4, 5); + Flowable f2 = Flowable. just(6, 7, 8, 9, 10); + Flowable f = Flowable. mergeArray(f1, f2) + .map(t -> { + assertTrue(Thread.currentThread().getName().startsWith("RxComputationThreadPool")); + return "Value_" + t + "_Thread_" + Thread.currentThread().getName(); + }); + + f.subscribeOn(Schedulers.computation()).blockingForEach(t -> System.out.println("t: " + t)); + } + + @Test + public final void mergeWithExecutorScheduler() { + + final String currentThreadName = Thread.currentThread().getName(); + + Flowable f1 = Flowable. just(1, 2, 3, 4, 5); + Flowable f2 = Flowable. just(6, 7, 8, 9, 10); + Flowable f = Flowable. mergeArray(f1, f2) + .subscribeOn(Schedulers.computation()) + .map(t -> { + assertNotEquals(Thread.currentThread().getName(), currentThreadName); + assertTrue(Thread.currentThread().getName().startsWith("RxComputationThreadPool")); + return "Value_" + t + "_Thread_" + Thread.currentThread().getName(); + }); + + f.blockingForEach(t -> System.out.println("t: " + t)); + } + + @Test + public final void handledErrorIsNotDeliveredToThreadHandler() throws InterruptedException { + SchedulerTestHelper.handledErrorIsNotDeliveredToThreadHandler(getScheduler()); + } + + @Test + public void cancelledTaskRetention() throws InterruptedException { + Worker w = Schedulers.computation().createWorker(); + try { + ExecutorSchedulerTest.cancelledRetention(w, false); + } finally { + w.dispose(); + } + w = Schedulers.computation().createWorker(); + try { + ExecutorSchedulerTest.cancelledRetention(w, true); + } finally { + w.dispose(); + } + } + + @Test + @SuppressUndeliverable + public void shutdownRejects() { + final int[] calls = { 0 }; + + Runnable r = () -> calls[0]++; + + Scheduler s = new ComputationScheduler(); + s.shutdown(); + s.shutdown(); + + assertEquals(Disposable.disposed(), s.scheduleDirect(r)); + + assertEquals(Disposable.disposed(), s.scheduleDirect(r, 1, TimeUnit.SECONDS)); + + assertEquals(Disposable.disposed(), s.schedulePeriodicallyDirect(r, 1, 1, TimeUnit.SECONDS)); + + Worker w = s.createWorker(); + w.dispose(); + + assertTrue(w.isDisposed()); + + assertEquals(Disposable.disposed(), w.schedule(r)); + + assertEquals(Disposable.disposed(), w.schedule(r, 1, TimeUnit.SECONDS)); + + assertEquals(Disposable.disposed(), w.schedulePeriodically(r, 1, 1, TimeUnit.SECONDS)); + + assertEquals(0, calls[0]); + } + + @Test + public void exceptionFromObservableShouldNotBeSwallowed() throws Exception { + CountDownLatch latch = new CountDownLatch(1); + + // #3 thread's uncaught exception handler + Scheduler computationScheduler = new ComputationScheduler(r -> { + Thread t = new Thread(r); + t.setUncaughtExceptionHandler((_, _) -> latch.countDown()); + return t; + }); + + // #2 RxJava exception handler + RxJavaPlugins.setErrorHandler(_ -> latch.countDown()); + + // Exceptions, fatal or not, should be handled by + // #1 observer's onError(), or + // #2 RxJava exception handler, or + // #3 thread's uncaught exception handler, + // and should not be swallowed. + try { + + // #1 observer's onError() + Observable.create(s -> { + + s.onNext(1); + throw new OutOfMemoryError(); + }) + .subscribeOn(computationScheduler) + .subscribe(_ -> { }, + _ -> latch.countDown() + ); + + assertTrue(latch.await(2, TimeUnit.SECONDS)); + } finally { + RxJavaPlugins.reset(); + computationScheduler.shutdown(); + } + } + + @Test + public void exceptionFromObserverShouldNotBeSwallowed() throws Exception { + CountDownLatch latch = new CountDownLatch(1); + + // #3 thread's uncaught exception handler + Scheduler computationScheduler = new ComputationScheduler(r -> { + Thread t = new Thread(r); + t.setUncaughtExceptionHandler((_, _) -> latch.countDown()); + return t; + }); + + // #2 RxJava exception handler + RxJavaPlugins.setErrorHandler(_ -> latch.countDown()); + + // Exceptions, fatal or not, should be handled by + // #1 observer's onError(), or + // #2 RxJava exception handler, or + // #3 thread's uncaught exception handler, + // and should not be swallowed. + try { + + // #1 observer's onError() + Flowable.interval(500, TimeUnit.MILLISECONDS, computationScheduler) + .subscribe(_ -> { + throw new OutOfMemoryError(); + }, _ -> latch.countDown()); + + assertTrue(latch.await(2, TimeUnit.SECONDS)); + } finally { + RxJavaPlugins.reset(); + computationScheduler.shutdown(); + } + } + + @Test + @SuppressUndeliverable + public void periodicTaskShouldStopOnError() throws Exception { + AtomicInteger repeatCount = new AtomicInteger(); + + Schedulers.computation().schedulePeriodicallyDirect(() -> { + repeatCount.incrementAndGet(); + throw new OutOfMemoryError(); + }, 0, 1, TimeUnit.MILLISECONDS); + + Thread.sleep(200); + + assertEquals(1, repeatCount.get()); + } + + @Test + @SuppressUndeliverable + public void periodicTaskShouldStopOnError2() throws Exception { + AtomicInteger repeatCount = new AtomicInteger(); + + Schedulers.computation().schedulePeriodicallyDirect(() -> { + repeatCount.incrementAndGet(); + throw new OutOfMemoryError(); + }, 0, 1, TimeUnit.NANOSECONDS); + + Thread.sleep(200); + + assertEquals(1, repeatCount.get()); + } +} diff --git a/src/test/java/io/reactivex/rxjava4/schedulers/SchedulerLifecycleTest.java b/src/test/java/io/reactivex/rxjava4/schedulers/SchedulerLifecycleTest.java index 04f04c6f5b..472b04c1ef 100644 --- a/src/test/java/io/reactivex/rxjava4/schedulers/SchedulerLifecycleTest.java +++ b/src/test/java/io/reactivex/rxjava4/schedulers/SchedulerLifecycleTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.schedulers; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.*; -import org.junit.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.core.Scheduler.Worker; @@ -126,6 +126,6 @@ public void startIdempotence() throws InterruptedException { // cached threads may get dropped between the two checks rxThreadsAfter.removeAll(rxThreadsBefore); - Assert.assertTrue("Some new threads appeared: " + rxThreadsAfter, rxThreadsAfter.isEmpty()); + assertTrue(rxThreadsAfter.isEmpty(), "Some new threads appeared: " + rxThreadsAfter); } } diff --git a/src/test/java/io/reactivex/rxjava4/schedulers/SchedulerTest.java b/src/test/java/io/reactivex/rxjava4/schedulers/SchedulerTest.java index aa9a7c7548..d0937f93e9 100644 --- a/src/test/java/io/reactivex/rxjava4/schedulers/SchedulerTest.java +++ b/src/test/java/io/reactivex/rxjava4/schedulers/SchedulerTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/schedulers/SchedulerTestHelper.java b/src/test/java/io/reactivex/rxjava4/schedulers/SchedulerTestHelper.java index b50a02db9b..4537ff1c6f 100644 --- a/src/test/java/io/reactivex/rxjava4/schedulers/SchedulerTestHelper.java +++ b/src/test/java/io/reactivex/rxjava4/schedulers/SchedulerTestHelper.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.*; @@ -49,9 +49,9 @@ static void handledErrorIsNotDeliveredToThreadHandler(Scheduler scheduler) throw if (handler.count != 0) { handler.caught.printStackTrace(); } - assertEquals("Handler should not have received anything: " + handler.caught, 0, handler.count); - assertEquals("Observer should have received an error", 1, observer.errorCount); - assertEquals("Observer should not have received a next value", 0, observer.nextCount); + assertEquals(0, handler.count, "Handler should not have received anything: " + handler.caught); + assertEquals(1, observer.errorCount, "Observer should have received an error"); + assertEquals(0, observer.nextCount, "Observer should not have received a next value"); Throwable cause = observer.error; while (cause != null) { @@ -59,7 +59,7 @@ static void handledErrorIsNotDeliveredToThreadHandler(Scheduler scheduler) throw if (cause == cause.getCause()) { break; } cause = cause.getCause(); } - assertEquals("Our error should have been delivered to the observer", error, cause); + assertEquals(error, cause, "Our error should have been delivered to the observer"); } finally { Thread.setDefaultUncaughtExceptionHandler(originalHandler); } diff --git a/src/test/java/io/reactivex/rxjava4/schedulers/SchedulerWorkerTest.java b/src/test/java/io/reactivex/rxjava4/schedulers/SchedulerWorkerTest.java index f002de55cc..0c9df32761 100644 --- a/src/test/java/io/reactivex/rxjava4/schedulers/SchedulerWorkerTest.java +++ b/src/test/java/io/reactivex/rxjava4/schedulers/SchedulerWorkerTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.schedulers; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.*; @@ -95,10 +95,10 @@ public void currentTimeDriftBackwards() throws Exception { for (int i = 0; i < times.size() - 1 ; i++) { long diff = times.get(i + 1) - times.get(i); System.out.println("Diff #" + i + ": " + diff); - assertTrue("" + i + ":" + diff, diff < 150 && diff > 50); + assertTrue(diff < 150 && diff > 50, "" + i + ":" + diff); } - assertTrue("Too few invocations: " + times.size(), times.size() > 2); + assertTrue(times.size() > 2, "Too few invocations: " + times.size()); } finally { w.dispose(); @@ -134,7 +134,7 @@ public void currentTimeDriftForwards() throws Exception { for (int i = 0; i < times.size() - 1 ; i++) { long diff = times.get(i + 1) - times.get(i); System.out.println("Diff #" + i + ": " + diff); - assertTrue("Diff out of range: " + diff, diff < 250 && diff > 50); + assertTrue(diff < 250 && diff > 50, "Diff out of range: " + diff); } } finally { diff --git a/src/test/java/io/reactivex/rxjava4/schedulers/SharedSchedulerTests.java b/src/test/java/io/reactivex/rxjava4/schedulers/SharedSchedulerTests.java new file mode 100644 index 0000000000..6552023566 --- /dev/null +++ b/src/test/java/io/reactivex/rxjava4/schedulers/SharedSchedulerTests.java @@ -0,0 +1,290 @@ +/* + * 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.schedulers; + +import static org.junit.jupiter.api.Assertions.*; + +import java.util.HashMap; +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicInteger; + +import org.junit.jupiter.api.*; + +import io.reactivex.rxjava4.core.*; +import io.reactivex.rxjava4.core.Scheduler.Worker; +import io.reactivex.rxjava4.disposables.Disposable; +import io.reactivex.rxjava4.internal.schedulers.ComputationScheduler; +import io.reactivex.rxjava4.plugins.RxJavaPlugins; +import io.reactivex.rxjava4.testsupport.SuppressUndeliverable; + +public class SharedSchedulerTests extends AbstractSchedulerConcurrencyTests { + + Scheduler scheduler; + + @BeforeEach + public void before() { + scheduler = Schedulers.computation().share(); + } + + @AfterEach + public void after() { + scheduler.shutdown(); + } + + @Override + protected Scheduler getScheduler() { + return scheduler; + } + + @Test + public void threadSafetyWhenSchedulerIsHoppingBetweenThreads() { + + final int NUM = 1000000; + final CountDownLatch latch = new CountDownLatch(1); + final HashMap map = new HashMap<>(); + + final Scheduler.Worker inner = Schedulers.computation().createWorker(); + + try { + inner.schedule(new Runnable() /* NFI */ { + + private HashMap statefulMap = map; + int nonThreadSafeCounter; + + @Override + public void run() { + Integer i = statefulMap.get("a"); + if (i == null) { + i = 1; + statefulMap.put("a", i); + statefulMap.put("b", i); + } else { + i++; + statefulMap.put("a", i); + statefulMap.put("b", i); + } + nonThreadSafeCounter++; + statefulMap.put("nonThreadSafeCounter", nonThreadSafeCounter); + if (i < NUM) { + inner.schedule(this); + } else { + latch.countDown(); + } + } + }); + + try { + latch.await(); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + System.out.println("Count A: " + map.get("a")); + System.out.println("Count B: " + map.get("b")); + System.out.println("nonThreadSafeCounter: " + map.get("nonThreadSafeCounter")); + + assertEquals(NUM, map.get("a").intValue()); + assertEquals(NUM, map.get("b").intValue()); + assertEquals(NUM, map.get("nonThreadSafeCounter").intValue()); + } finally { + inner.dispose(); + } + } + + @Test + public final void computationThreadPool1() { + Flowable f1 = Flowable. just(1, 2, 3, 4, 5); + Flowable f2 = Flowable. just(6, 7, 8, 9, 10); + Flowable f = Flowable. mergeArray(f1, f2) + .map(t -> { + assertTrue(Thread.currentThread().getName().startsWith("RxComputationThreadPool")); + return "Value_" + t + "_Thread_" + Thread.currentThread().getName(); + }); + + f.subscribeOn(Schedulers.computation()).blockingForEach(t -> System.out.println("t: " + t)); + } + + @Test + public final void mergeWithExecutorScheduler() { + + final String currentThreadName = Thread.currentThread().getName(); + + Flowable f1 = Flowable. just(1, 2, 3, 4, 5); + Flowable f2 = Flowable. just(6, 7, 8, 9, 10); + Flowable f = Flowable. mergeArray(f1, f2) + .subscribeOn(Schedulers.computation()) + .map(t -> { + assertNotEquals(Thread.currentThread().getName(), currentThreadName); + assertTrue(Thread.currentThread().getName().startsWith("RxComputationThreadPool")); + return "Value_" + t + "_Thread_" + Thread.currentThread().getName(); + }); + + f.blockingForEach(t -> System.out.println("t: " + t)); + } + + @Test + public final void handledErrorIsNotDeliveredToThreadHandler() throws InterruptedException { + SchedulerTestHelper.handledErrorIsNotDeliveredToThreadHandler(getScheduler()); + } + + @Test + public void cancelledTaskRetention() throws InterruptedException { + Worker w = Schedulers.computation().createWorker(); + try { + ExecutorSchedulerTest.cancelledRetention(w, false); + } finally { + w.dispose(); + } + w = Schedulers.computation().createWorker(); + try { + ExecutorSchedulerTest.cancelledRetention(w, true); + } finally { + w.dispose(); + } + } + + @Test + @SuppressUndeliverable + public void shutdownRejects() { + final int[] calls = { 0 }; + + Runnable r = () -> calls[0]++; + + Scheduler s = new ComputationScheduler(); + s.shutdown(); + s.shutdown(); + + assertEquals(Disposable.disposed(), s.scheduleDirect(r)); + + assertEquals(Disposable.disposed(), s.scheduleDirect(r, 1, TimeUnit.SECONDS)); + + assertEquals(Disposable.disposed(), s.schedulePeriodicallyDirect(r, 1, 1, TimeUnit.SECONDS)); + + Worker w = s.createWorker(); + w.dispose(); + + assertTrue(w.isDisposed()); + + assertEquals(Disposable.disposed(), w.schedule(r)); + + assertEquals(Disposable.disposed(), w.schedule(r, 1, TimeUnit.SECONDS)); + + assertEquals(Disposable.disposed(), w.schedulePeriodically(r, 1, 1, TimeUnit.SECONDS)); + + assertEquals(0, calls[0]); + } + + @Test + public void exceptionFromObservableShouldNotBeSwallowed() throws Exception { + CountDownLatch latch = new CountDownLatch(1); + + // #3 thread's uncaught exception handler + Scheduler computationScheduler = new ComputationScheduler(r -> { + Thread t = new Thread(r); + t.setUncaughtExceptionHandler((_, _) -> latch.countDown()); + return t; + }); + + // #2 RxJava exception handler + RxJavaPlugins.setErrorHandler(_ -> latch.countDown()); + + // Exceptions, fatal or not, should be handled by + // #1 observer's onError(), or + // #2 RxJava exception handler, or + // #3 thread's uncaught exception handler, + // and should not be swallowed. + try { + + // #1 observer's onError() + Observable.create(s -> { + + s.onNext(1); + throw new OutOfMemoryError(); + }) + .subscribeOn(computationScheduler) + .subscribe(_ -> { }, + _ -> latch.countDown() + ); + + assertTrue(latch.await(2, TimeUnit.SECONDS)); + } finally { + RxJavaPlugins.reset(); + computationScheduler.shutdown(); + } + } + + @Test + public void exceptionFromObserverShouldNotBeSwallowed() throws Exception { + CountDownLatch latch = new CountDownLatch(1); + + // #3 thread's uncaught exception handler + Scheduler computationScheduler = new ComputationScheduler(r -> { + Thread t = new Thread(r); + t.setUncaughtExceptionHandler((_, _) -> latch.countDown()); + return t; + }); + + // #2 RxJava exception handler + RxJavaPlugins.setErrorHandler(_ -> latch.countDown()); + + // Exceptions, fatal or not, should be handled by + // #1 observer's onError(), or + // #2 RxJava exception handler, or + // #3 thread's uncaught exception handler, + // and should not be swallowed. + try { + + // #1 observer's onError() + Flowable.interval(500, TimeUnit.MILLISECONDS, computationScheduler) + .subscribe(_ -> { + throw new OutOfMemoryError(); + }, _ -> latch.countDown()); + + assertTrue(latch.await(2, TimeUnit.SECONDS)); + } finally { + RxJavaPlugins.reset(); + computationScheduler.shutdown(); + } + } + + @Test + @SuppressUndeliverable + public void periodicTaskShouldStopOnError() throws Exception { + AtomicInteger repeatCount = new AtomicInteger(); + + Schedulers.computation().schedulePeriodicallyDirect(() -> { + repeatCount.incrementAndGet(); + throw new OutOfMemoryError(); + }, 0, 1, TimeUnit.MILLISECONDS); + + Thread.sleep(200); + + assertEquals(1, repeatCount.get()); + } + + @Test + @SuppressUndeliverable + public void periodicTaskShouldStopOnError2() throws Exception { + AtomicInteger repeatCount = new AtomicInteger(); + + Schedulers.computation().schedulePeriodicallyDirect(() -> { + repeatCount.incrementAndGet(); + throw new OutOfMemoryError(); + }, 0, 1, TimeUnit.NANOSECONDS); + + Thread.sleep(200); + + assertEquals(1, repeatCount.get()); + } +} diff --git a/src/test/java/io/reactivex/rxjava4/schedulers/TestSchedulerTest.java b/src/test/java/io/reactivex/rxjava4/schedulers/TestSchedulerTest.java index b3f1959e80..ad7b7768e3 100644 --- a/src/test/java/io/reactivex/rxjava4/schedulers/TestSchedulerTest.java +++ b/src/test/java/io/reactivex/rxjava4/schedulers/TestSchedulerTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.*; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/schedulers/TimedTest.java b/src/test/java/io/reactivex/rxjava4/schedulers/TimedTest.java index e21dd07524..cdb9e56b57 100644 --- a/src/test/java/io/reactivex/rxjava4/schedulers/TimedTest.java +++ b/src/test/java/io/reactivex/rxjava4/schedulers/TimedTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; @@ -88,8 +88,10 @@ public void toStringOf() { assertEquals("Timed[time=5, unit=SECONDS, value=1]", t1.toString()); } - @Test(expected = NullPointerException.class) + @Test public void timeUnitNullFail() throws Exception { - new Timed<>(1, 5, null); + assertThrows(NullPointerException.class, () -> { + new Timed<>(1, 5, null); + }); } } diff --git a/src/test/java/io/reactivex/rxjava4/schedulers/TrampolineSchedulerTest.java b/src/test/java/io/reactivex/rxjava4/schedulers/TrampolineSchedulerTest.java index 10f6807f2f..ddd62dab42 100644 --- a/src/test/java/io/reactivex/rxjava4/schedulers/TrampolineSchedulerTest.java +++ b/src/test/java/io/reactivex/rxjava4/schedulers/TrampolineSchedulerTest.java @@ -13,18 +13,18 @@ package io.reactivex.rxjava4.schedulers; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Scheduler.Worker; import io.reactivex.rxjava4.disposables.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.subscribers.TestSubscriber; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/schedulers/VirtualThreadSchedulerTest.java b/src/test/java/io/reactivex/rxjava4/schedulers/VirtualThreadSchedulerTest.java index ce0a35cbd8..46f00c231a 100644 --- a/src/test/java/io/reactivex/rxjava4/schedulers/VirtualThreadSchedulerTest.java +++ b/src/test/java/io/reactivex/rxjava4/schedulers/VirtualThreadSchedulerTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.schedulers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.concurrent.*; -import org.junit.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Scheduler.Worker; @@ -81,7 +81,7 @@ public void workerDisposed() { assertTrue(w.isDisposed()); } - @Ignore("FIXME DeferredExecutorScheduler doesn't support shutdown yet") + @Disabled("FIXME DeferredExecutorScheduler doesn't support shutdown yet") @Test @SuppressUndeliverable public void shutdownRejects() { diff --git a/src/test/java/io/reactivex/rxjava4/single/SingleCacheMainTest.java b/src/test/java/io/reactivex/rxjava4/single/SingleCacheMainTest.java index 8919bad24c..4f39f350b2 100644 --- a/src/test/java/io/reactivex/rxjava4/single/SingleCacheMainTest.java +++ b/src/test/java/io/reactivex/rxjava4/single/SingleCacheMainTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.single; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/single/SingleRetryTest.java b/src/test/java/io/reactivex/rxjava4/single/SingleRetryTest.java index d682e7d1f7..41119c0e8c 100644 --- a/src/test/java/io/reactivex/rxjava4/single/SingleRetryTest.java +++ b/src/test/java/io/reactivex/rxjava4/single/SingleRetryTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.single; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; diff --git a/src/test/java/io/reactivex/rxjava4/single/SingleSubscribeTest.java b/src/test/java/io/reactivex/rxjava4/single/SingleSubscribeTest.java index 3b145a30f8..4ee2d7367c 100644 --- a/src/test/java/io/reactivex/rxjava4/single/SingleSubscribeTest.java +++ b/src/test/java/io/reactivex/rxjava4/single/SingleSubscribeTest.java @@ -13,17 +13,17 @@ package io.reactivex.rxjava4.single; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.BiConsumer; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.subjects.PublishSubject; @@ -214,7 +214,7 @@ public void biConsumerIsDisposedOnSuccess() { result[1] = t2; }); - assertTrue("Not disposed?!", d.isDisposed()); + assertTrue(d.isDisposed(), "Not disposed?!"); assertEquals(1, result[0]); assertNull(result[1]); } @@ -229,8 +229,8 @@ public void biConsumerIsDisposedOnError() { result[1] = t2; }); - assertTrue("Not disposed?!", d.isDisposed()); + assertTrue(d.isDisposed(), "Not disposed?!"); assertNull(result[0]); - assertTrue("" + result[1], result[1] instanceof IOException); + assertTrue(result[1] instanceof IOException, "" + result[1]); } } diff --git a/src/test/java/io/reactivex/rxjava4/single/SingleTest.java b/src/test/java/io/reactivex/rxjava4/single/SingleTest.java index c3d8826b31..cb71e9c89b 100644 --- a/src/test/java/io/reactivex/rxjava4/single/SingleTest.java +++ b/src/test/java/io/reactivex/rxjava4/single/SingleTest.java @@ -13,19 +13,19 @@ package io.reactivex.rxjava4.single; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; import io.reactivex.rxjava4.disposables.*; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.internal.operators.single.SingleInternalHelper; import io.reactivex.rxjava4.schedulers.Schedulers; import io.reactivex.rxjava4.subscribers.TestSubscriber; @@ -162,7 +162,7 @@ public void flatMap() throws InterruptedException { ).toFlowable().subscribe(ts); if (!ts.await(5, TimeUnit.SECONDS)) { ts.cancel(); - Assert.fail("TestSubscriber timed out."); + fail("TestSubscriber timed out."); } ts.assertValueSequence(List.of("Hello World!")); } @@ -384,9 +384,11 @@ public void toObservable() { ts.assertComplete(); } - @Test(expected = NullPointerException.class) + @Test public void doOnEventNullEvent() { - Single.just(1).doOnEvent(null); + assertThrows(NullPointerException.class, () -> { + Single.just(1).doOnEvent(null); + }); } @Test @@ -425,17 +427,19 @@ public void toFutureThrows() throws Exception { try { Single.error(new TestException()).toFuture().get(); } catch (ExecutionException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof TestException); + assertTrue(ex.getCause() instanceof TestException, ex.toString()); } } - @Test(expected = UnsupportedOperationException.class) + @Test public void toFlowableIterableRemove() { - Iterable> f = SingleInternalHelper.iterableToFlowable(Collections.singletonList(Single.just(1))); + assertThrows(UnsupportedOperationException.class, () -> { + Iterable> f = SingleInternalHelper.iterableToFlowable(Collections.singletonList(Single.just(1))); - Iterator> iterator = f.iterator(); - iterator.next(); - iterator.remove(); + Iterator> iterator = f.iterator(); + iterator.next(); + iterator.remove(); + }); } @Test @@ -457,9 +461,11 @@ public void to() { .assertResult(1); } - @Test(expected = NullPointerException.class) + @Test public void fromObservableNull() { - Single.fromObservable(null); + assertThrows(NullPointerException.class, () -> { + Single.fromObservable(null); + }); } @Test @@ -492,14 +498,16 @@ public void fromObservableError() { .assertErrorMessage("some error"); } - @Test(expected = NullPointerException.class) + @Test public void implementationThrows() { - new Single() /* NFI */ { - @Override - protected void subscribeActual(SingleObserver observer) { - throw new NullPointerException(); - } - }.test(); + assertThrows(NullPointerException.class, () -> { + new Single() /* NFI */ { + @Override + protected void subscribeActual(SingleObserver observer) { + throw new NullPointerException(); + } + }.test(); + }); } } diff --git a/src/test/java/io/reactivex/rxjava4/single/SingleTimerTest.java b/src/test/java/io/reactivex/rxjava4/single/SingleTimerTest.java index 4bd27d9c7b..d7c5e3e7c4 100644 --- a/src/test/java/io/reactivex/rxjava4/single/SingleTimerTest.java +++ b/src/test/java/io/reactivex/rxjava4/single/SingleTimerTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.single; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.schedulers.TestScheduler; diff --git a/src/test/java/io/reactivex/rxjava4/subjects/AsyncSubjectTest.java b/src/test/java/io/reactivex/rxjava4/subjects/AsyncSubjectTest.java index f8d18dd7e9..df3d69cd04 100644 --- a/src/test/java/io/reactivex/rxjava4/subjects/AsyncSubjectTest.java +++ b/src/test/java/io/reactivex/rxjava4/subjects/AsyncSubjectTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.subjects; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.*; import io.reactivex.rxjava4.core.Observer; diff --git a/src/test/java/io/reactivex/rxjava4/subjects/BehaviorSubjectTest.java b/src/test/java/io/reactivex/rxjava4/subjects/BehaviorSubjectTest.java index 6bed52dcac..f5b97e0c60 100644 --- a/src/test/java/io/reactivex/rxjava4/subjects/BehaviorSubjectTest.java +++ b/src/test/java/io/reactivex/rxjava4/subjects/BehaviorSubjectTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.subjects; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -21,11 +21,11 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; -import org.junit.*; +import org.junit.jupiter.api.Test; import org.mockito.*; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.observers.*; @@ -410,10 +410,10 @@ public void onNext(Object t) { System.out.println(o.get()); System.out.println(rs.hasObservers()); rs.onComplete(); - Assert.fail("Timeout @ " + i); + fail("Timeout @ " + i); break; } else { - Assert.assertEquals(1, o.get()); + assertEquals(1, o.get()); worker.schedule(rs::onComplete); } } diff --git a/src/test/java/io/reactivex/rxjava4/subjects/CompletableSubjectTest.java b/src/test/java/io/reactivex/rxjava4/subjects/CompletableSubjectTest.java index e05ad2168e..8cee01c4b4 100644 --- a/src/test/java/io/reactivex/rxjava4/subjects/CompletableSubjectTest.java +++ b/src/test/java/io/reactivex/rxjava4/subjects/CompletableSubjectTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.subjects; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.internal.util.ExceptionHelper; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.plugins.RxJavaPlugins; @@ -71,7 +71,7 @@ public void error() { assertFalse(cs.hasComplete()); assertTrue(cs.hasThrowable()); - assertTrue(cs.getThrowable().toString(), cs.getThrowable() instanceof IOException); + assertTrue(cs.getThrowable() instanceof IOException, cs.getThrowable().toString()); assertFalse(cs.hasObservers()); assertEquals(0, cs.observerCount()); @@ -81,7 +81,7 @@ public void error() { assertFalse(cs.hasComplete()); assertTrue(cs.hasThrowable()); - assertTrue(cs.getThrowable().toString(), cs.getThrowable() instanceof IOException); + assertTrue(cs.getThrowable() instanceof IOException, cs.getThrowable().toString()); assertFalse(cs.hasObservers()); assertEquals(0, cs.observerCount()); } diff --git a/src/test/java/io/reactivex/rxjava4/subjects/MaybeSubjectTest.java b/src/test/java/io/reactivex/rxjava4/subjects/MaybeSubjectTest.java index 4504fcc7f7..d5c3645fdf 100644 --- a/src/test/java/io/reactivex/rxjava4/subjects/MaybeSubjectTest.java +++ b/src/test/java/io/reactivex/rxjava4/subjects/MaybeSubjectTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.subjects; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.testsupport.TestHelper; @@ -117,7 +117,7 @@ public void error() { assertNull(ms.getValue()); assertFalse(ms.hasComplete()); assertTrue(ms.hasThrowable()); - assertTrue(ms.getThrowable().toString(), ms.getThrowable() instanceof IOException); + assertTrue(ms.getThrowable() instanceof IOException, ms.getThrowable().toString()); assertFalse(ms.hasObservers()); assertEquals(0, ms.observerCount()); @@ -129,7 +129,7 @@ public void error() { assertNull(ms.getValue()); assertFalse(ms.hasComplete()); assertTrue(ms.hasThrowable()); - assertTrue(ms.getThrowable().toString(), ms.getThrowable() instanceof IOException); + assertTrue(ms.getThrowable() instanceof IOException, ms.getThrowable().toString()); assertFalse(ms.hasObservers()); assertEquals(0, ms.observerCount()); } diff --git a/src/test/java/io/reactivex/rxjava4/subjects/PublishSubjectTest.java b/src/test/java/io/reactivex/rxjava4/subjects/PublishSubjectTest.java index 812509312e..65ee9eca55 100644 --- a/src/test/java/io/reactivex/rxjava4/subjects/PublishSubjectTest.java +++ b/src/test/java/io/reactivex/rxjava4/subjects/PublishSubjectTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.subjects; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -21,13 +21,13 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.observers.*; import io.reactivex.rxjava4.testsupport.*; diff --git a/src/test/java/io/reactivex/rxjava4/subjects/ReplaySubjectBoundedConcurrencyTest.java b/src/test/java/io/reactivex/rxjava4/subjects/ReplaySubjectBoundedConcurrencyTest.java index fb49aba3c9..5addd15cca 100644 --- a/src/test/java/io/reactivex/rxjava4/subjects/ReplaySubjectBoundedConcurrencyTest.java +++ b/src/test/java/io/reactivex/rxjava4/subjects/ReplaySubjectBoundedConcurrencyTest.java @@ -13,17 +13,17 @@ package io.reactivex.rxjava4.subjects; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.observers.DefaultObserver; import io.reactivex.rxjava4.schedulers.Schedulers; import io.reactivex.rxjava4.testsupport.TestObserverEx; @@ -348,10 +348,10 @@ public void onNext(Object t) { System.out.println(o.get()); System.out.println(rs.hasObservers()); rs.onComplete(); - Assert.fail("Timeout @ " + i); + fail("Timeout @ " + i); break; } else { - Assert.assertEquals(1, o.get()); + assertEquals(1, o.get()); worker.schedule(rs::onComplete); } } @@ -389,13 +389,13 @@ public void concurrentSizeAndHasAnyValue() throws InterruptedException { boolean hasAny = rs.hasValue(); Object[] values = rs.getValues(); if (size < lastSize) { - Assert.fail("Size decreased! " + lastSize + " -> " + size); + fail("Size decreased! " + lastSize + " -> " + size); } if ((size > 0) && !hasAny) { - Assert.fail("hasAnyValue reports emptyness but size doesn't"); + fail("hasAnyValue reports emptyness but size doesn't"); } if (size > values.length) { - Assert.fail("Got fewer values than size! " + size + " -> " + values.length); + fail("Got fewer values than size! " + size + " -> " + values.length); } for (int i = 0; i < values.length - 1; i++) { Integer v1 = (Integer)values[i]; diff --git a/src/test/java/io/reactivex/rxjava4/subjects/ReplaySubjectConcurrencyTest.java b/src/test/java/io/reactivex/rxjava4/subjects/ReplaySubjectConcurrencyTest.java index 20015f17f7..8247b8625a 100644 --- a/src/test/java/io/reactivex/rxjava4/subjects/ReplaySubjectConcurrencyTest.java +++ b/src/test/java/io/reactivex/rxjava4/subjects/ReplaySubjectConcurrencyTest.java @@ -13,17 +13,17 @@ package io.reactivex.rxjava4.subjects; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; -import io.reactivex.rxjava4.disposables.Disposable; -import org.junit.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.observers.DefaultObserver; import io.reactivex.rxjava4.schedulers.Schedulers; import io.reactivex.rxjava4.testsupport.TestObserverEx; @@ -335,10 +335,10 @@ public void onNext(Object t) { System.out.println(o.get()); System.out.println(rs.hasObservers()); rs.onComplete(); - Assert.fail("Timeout @ " + i); + fail("Timeout @ " + i); break; } else { - Assert.assertEquals(1, o.get()); + assertEquals(1, o.get()); worker.schedule(rs::onComplete); } @@ -377,13 +377,13 @@ public void concurrentSizeAndHasAnyValue() throws InterruptedException { boolean hasAny = rs.hasValue(); Object[] values = rs.getValues(); if (size < lastSize) { - Assert.fail("Size decreased! " + lastSize + " -> " + size); + fail("Size decreased! " + lastSize + " -> " + size); } if ((size > 0) && !hasAny) { - Assert.fail("hasAnyValue reports emptyness but size doesn't"); + fail("hasAnyValue reports emptyness but size doesn't"); } if (size > values.length) { - Assert.fail("Got fewer values than size! " + size + " -> " + values.length); + fail("Got fewer values than size! " + size + " -> " + values.length); } lastSize = size; } diff --git a/src/test/java/io/reactivex/rxjava4/subjects/ReplaySubjectTest.java b/src/test/java/io/reactivex/rxjava4/subjects/ReplaySubjectTest.java index 91875859eb..8d938cd75e 100644 --- a/src/test/java/io/reactivex/rxjava4/subjects/ReplaySubjectTest.java +++ b/src/test/java/io/reactivex/rxjava4/subjects/ReplaySubjectTest.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.subjects; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; @@ -22,13 +22,13 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import org.junit.*; +import org.junit.jupiter.api.Test; import org.mockito.*; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; -import io.reactivex.rxjava4.functions.*; +import io.reactivex.rxjava4.functions.Function; import io.reactivex.rxjava4.observers.*; import io.reactivex.rxjava4.schedulers.*; import io.reactivex.rxjava4.subjects.ReplaySubject.*; @@ -1260,7 +1260,7 @@ public void noBoundedRetentionViaThreadLocal() throws Exception { System.out.printf("Bounded Replay Leak check: After: %.3f MB%n", after.get() / 1024.0 / 1024.0); if (initial + 100 * 1024 * 1024 < after.get()) { - Assert.fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0) + " -> " + after.get() / 1024.0 / 1024.0); } } diff --git a/src/test/java/io/reactivex/rxjava4/subjects/SerializedSubjectTest.java b/src/test/java/io/reactivex/rxjava4/subjects/SerializedSubjectTest.java index 162404be4f..b19e30c337 100644 --- a/src/test/java/io/reactivex/rxjava4/subjects/SerializedSubjectTest.java +++ b/src/test/java/io/reactivex/rxjava4/subjects/SerializedSubjectTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.subjects; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.NonNull; import io.reactivex.rxjava4.core.Observable; @@ -438,7 +438,7 @@ public void onNextOnNextRace() { ; Set actualSet = new HashSet<>(to.values()); - assertEquals("" + actualSet, expectedSet, actualSet); + assertEquals(expectedSet, actualSet, "" + actualSet); } } diff --git a/src/test/java/io/reactivex/rxjava4/subjects/SingleSubjectTest.java b/src/test/java/io/reactivex/rxjava4/subjects/SingleSubjectTest.java index 65dbefbc2c..e4ad4b226f 100644 --- a/src/test/java/io/reactivex/rxjava4/subjects/SingleSubjectTest.java +++ b/src/test/java/io/reactivex/rxjava4/subjects/SingleSubjectTest.java @@ -13,15 +13,15 @@ package io.reactivex.rxjava4.subjects; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.internal.util.ExceptionHelper; import io.reactivex.rxjava4.observers.TestObserver; import io.reactivex.rxjava4.plugins.RxJavaPlugins; @@ -112,7 +112,7 @@ public void error() { assertFalse(ss.hasValue()); assertNull(ss.getValue()); assertTrue(ss.hasThrowable()); - assertTrue(ss.getThrowable().toString(), ss.getThrowable() instanceof IOException); + assertTrue(ss.getThrowable() instanceof IOException, ss.getThrowable().toString()); assertFalse(ss.hasObservers()); assertEquals(0, ss.observerCount()); @@ -123,7 +123,7 @@ public void error() { assertFalse(ss.hasValue()); assertNull(ss.getValue()); assertTrue(ss.hasThrowable()); - assertTrue(ss.getThrowable().toString(), ss.getThrowable() instanceof IOException); + assertTrue(ss.getThrowable() instanceof IOException, ss.getThrowable().toString()); assertFalse(ss.hasObservers()); assertEquals(0, ss.observerCount()); } diff --git a/src/test/java/io/reactivex/rxjava4/subjects/SubjectTest.java b/src/test/java/io/reactivex/rxjava4/subjects/SubjectTest.java index 52de602a7f..aba0a9b3a9 100644 --- a/src/test/java/io/reactivex/rxjava4/subjects/SubjectTest.java +++ b/src/test/java/io/reactivex/rxjava4/subjects/SubjectTest.java @@ -13,9 +13,9 @@ package io.reactivex.rxjava4.subjects; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.internal.util.ExceptionHelper; diff --git a/src/test/java/io/reactivex/rxjava4/subjects/UnicastSubjectTest.java b/src/test/java/io/reactivex/rxjava4/subjects/UnicastSubjectTest.java index 07427a0795..51c9bd419a 100644 --- a/src/test/java/io/reactivex/rxjava4/subjects/UnicastSubjectTest.java +++ b/src/test/java/io/reactivex/rxjava4/subjects/UnicastSubjectTest.java @@ -13,17 +13,17 @@ package io.reactivex.rxjava4.subjects; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.mock; import java.util.List; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.Observable; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.*; import io.reactivex.rxjava4.internal.functions.Functions; import io.reactivex.rxjava4.observers.TestObserver; @@ -197,19 +197,25 @@ public void onTerminateCalledWhenCancelled() { assertTrue(didRunOnTerminate.get()); } - @Test(expected = NullPointerException.class) + @Test public void nullOnTerminate() { - UnicastSubject.create(5, null); + assertThrows(NullPointerException.class, () -> { + UnicastSubject.create(5, null); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void negativeCapacityHint() { - UnicastSubject.create(-1); + assertThrows(IllegalArgumentException.class, () -> { + UnicastSubject.create(-1); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void zeroCapacityHint() { - UnicastSubject.create(0); + assertThrows(IllegalArgumentException.class, () -> { + UnicastSubject.create(0); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/subscribers/DefaultSubscriberTest.java b/src/test/java/io/reactivex/rxjava4/subscribers/DefaultSubscriberTest.java index de5c00228e..0f6be1924a 100644 --- a/src/test/java/io/reactivex/rxjava4/subscribers/DefaultSubscriberTest.java +++ b/src/test/java/io/reactivex/rxjava4/subscribers/DefaultSubscriberTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.subscribers; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/subscribers/DisposableSubscriberTest.java b/src/test/java/io/reactivex/rxjava4/subscribers/DisposableSubscriberTest.java index b3f7feaab7..b9dd0c0d71 100644 --- a/src/test/java/io/reactivex/rxjava4/subscribers/DisposableSubscriberTest.java +++ b/src/test/java/io/reactivex/rxjava4/subscribers/DisposableSubscriberTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.subscribers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; diff --git a/src/test/java/io/reactivex/rxjava4/subscribers/ResourceSubscriberTest.java b/src/test/java/io/reactivex/rxjava4/subscribers/ResourceSubscriberTest.java index 87747ab4ba..8d575373f2 100644 --- a/src/test/java/io/reactivex/rxjava4/subscribers/ResourceSubscriberTest.java +++ b/src/test/java/io/reactivex/rxjava4/subscribers/ResourceSubscriberTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.subscribers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; -import io.reactivex.rxjava4.disposables.*; +import io.reactivex.rxjava4.disposables.Disposable; import io.reactivex.rxjava4.exceptions.TestException; import io.reactivex.rxjava4.internal.subscriptions.BooleanSubscription; import io.reactivex.rxjava4.internal.util.EndConsumerHelper; @@ -69,10 +69,12 @@ void requestMore(long n) { } } - @Test(expected = NullPointerException.class) + @Test public void nullResource() { - TestResourceSubscriber ro = new TestResourceSubscriber<>(); - ro.add(null); + assertThrows(NullPointerException.class, () -> { + TestResourceSubscriber ro = new TestResourceSubscriber<>(); + ro.add(null); + }); } @Test diff --git a/src/test/java/io/reactivex/rxjava4/subscribers/SafeSubscriberTest.java b/src/test/java/io/reactivex/rxjava4/subscribers/SafeSubscriberTest.java index 7c6f835ab0..a2478f08dd 100644 --- a/src/test/java/io/reactivex/rxjava4/subscribers/SafeSubscriberTest.java +++ b/src/test/java/io/reactivex/rxjava4/subscribers/SafeSubscriberTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.subscribers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.List; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.*; diff --git a/src/test/java/io/reactivex/rxjava4/subscribers/SerializedSubscriberTest.java b/src/test/java/io/reactivex/rxjava4/subscribers/SerializedSubscriberTest.java index a052e40003..8018b35e25 100644 --- a/src/test/java/io/reactivex/rxjava4/subscribers/SerializedSubscriberTest.java +++ b/src/test/java/io/reactivex/rxjava4/subscribers/SerializedSubscriberTest.java @@ -13,16 +13,16 @@ package io.reactivex.rxjava4.subscribers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; import java.util.List; import java.util.concurrent.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.*; -import org.junit.*; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.exceptions.TestException; @@ -36,7 +36,7 @@ public class SerializedSubscriberTest extends RxJavaTest { Subscriber subscriber; - @Before + @BeforeEach public void before() { subscriber = TestHelper.mockSubscriber(); } @@ -265,7 +265,7 @@ public void runConcurrencyTest() { * * @throws InterruptedException if await() is interrupted */ - @Ignore("this is non-deterministic ... haven't figured out what's wrong with the test yet (benjchristensen: July 2014)") + @Disabled("this is non-deterministic ... haven't figured out what's wrong with the test yet (benjchristensen: July 2014)") @Test public void notificationDelay() throws InterruptedException { ExecutorService tp1 = Executors.newFixedThreadPool(1); @@ -355,7 +355,7 @@ public void onNext(String t) { * * @throws InterruptedException if await() is interrupted */ - @Ignore("Demonstrates thread starvation problem. Read JavaDoc") + @Disabled("Demonstrates thread starvation problem. Read JavaDoc") @Test public void threadStarvation() throws InterruptedException { @@ -1051,7 +1051,7 @@ public void onCompleteOnErrorRace() { TestHelper.assertUndeliverable(errors, 0, TestException.class); } else { ts.assertFailure(TestException.class).assertError(ex); - assertTrue("" + errors, errors.isEmpty()); + assertTrue(errors.isEmpty(), "" + errors); } } finally { RxJavaPlugins.reset(); diff --git a/src/test/java/io/reactivex/rxjava4/subscribers/TestSubscriberTest.java b/src/test/java/io/reactivex/rxjava4/subscribers/TestSubscriberTest.java index 8cccdf4fb0..349692bd72 100644 --- a/src/test/java/io/reactivex/rxjava4/subscribers/TestSubscriberTest.java +++ b/src/test/java/io/reactivex/rxjava4/subscribers/TestSubscriberTest.java @@ -13,18 +13,18 @@ package io.reactivex.rxjava4.subscribers; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.io.IOException; import java.util.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; -import org.junit.function.ThrowingRunnable; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.function.Executable; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Scheduler.Worker; @@ -152,22 +152,28 @@ public void awaitTerminalEventWithDurationAndUnsubscribeOnTimeout() { assertTrue(unsub.get()); } - @Test(expected = NullPointerException.class) + @Test public void nullDelegate1() { - TestSubscriber ts = new TestSubscriber<>(null); - ts.onComplete(); + assertThrows(NullPointerException.class, () -> { + TestSubscriber ts = new TestSubscriber<>(null); + ts.onComplete(); + }); } - @Test(expected = NullPointerException.class) + @Test public void nullDelegate2() { - TestSubscriber ts = new TestSubscriber<>(null); - ts.onComplete(); + assertThrows(NullPointerException.class, () -> { + TestSubscriber ts = new TestSubscriber<>(null); + ts.onComplete(); + }); } - @Test(expected = NullPointerException.class) + @Test public void nullDelegate3() { - TestSubscriber ts = new TestSubscriber<>(null, 0L); - ts.onComplete(); + assertThrows(NullPointerException.class, () -> { + TestSubscriber ts = new TestSubscriber<>(null, 0L); + ts.onComplete(); + }); } @Test @@ -517,7 +523,7 @@ public void interruptTerminalEventAwaitAndUnsubscribe() { try { ts.awaitDone(5, TimeUnit.SECONDS); } catch (RuntimeException allowed) { - assertTrue(allowed.toString(), allowed.getCause() instanceof InterruptedException); + assertTrue(allowed.getCause() instanceof InterruptedException, allowed.toString()); } ts.dispose(); if (!ts.isCancelled()) { @@ -1028,7 +1034,7 @@ public void awaitTerminalEventInterrupt() { try { ts.awaitDone(5, TimeUnit.SECONDS); } catch (RuntimeException allowed) { - assertTrue(allowed.toString(), allowed.getCause() instanceof InterruptedException); + assertTrue(allowed.getCause() instanceof InterruptedException, allowed.toString()); } // FIXME ? catch consumes this flag @@ -1039,7 +1045,7 @@ public void awaitTerminalEventInterrupt() { try { ts.awaitDone(5, TimeUnit.SECONDS); } catch (RuntimeException allowed) { - assertTrue(allowed.toString(), allowed.getCause() instanceof InterruptedException); + assertTrue(allowed.getCause() instanceof InterruptedException, allowed.toString()); } // FIXME ? catch consumes this flag @@ -1196,7 +1202,7 @@ public void awaitDoneTimed() { try { ts.awaitDone(5, TimeUnit.SECONDS); } catch (RuntimeException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof InterruptedException); + assertTrue(ex.getCause() instanceof InterruptedException, ex.toString()); } } @@ -1350,7 +1356,7 @@ public void assertValuePredicateMatch() { ts.assertValue(o -> o == 1); } - static void assertThrowsWithMessage(String message, Class clazz, ThrowingRunnable run) { + static void assertThrowsWithMessage(String message, Class clazz, Executable run) { assertEquals(message, assertThrows(clazz, run).getMessage()); } @@ -1478,7 +1484,7 @@ public void withTag() { } throw new RuntimeException("Should have thrown!"); } catch (AssertionError ex) { - assertTrue(ex.toString(), ex.toString().contains("testing with item=2")); + assertTrue(ex.toString().contains("testing with item=2"), ex.toString()); } } @@ -1494,7 +1500,7 @@ public void timeoutIndicated() throws InterruptedException { ts.assertResult(1); throw new RuntimeException("Should have thrown!"); } catch (AssertionError ex) { - assertTrue(ex.toString(), ex.toString().contains("timeout!")); + assertTrue(ex.toString().contains("timeout!"), ex.toString()); } } @@ -1508,7 +1514,7 @@ public void timeoutIndicated2() throws InterruptedException { throw new RuntimeException("Should have thrown!"); } catch (AssertionError ex) { - assertTrue(ex.toString(), ex.toString().contains("timeout!")); + assertTrue(ex.toString().contains("timeout!"), ex.toString()); } } @@ -1522,7 +1528,7 @@ public void timeoutIndicated3() throws InterruptedException { ts.assertResult(1); throw new RuntimeException("Should have thrown!"); } catch (AssertionError ex) { - assertTrue(ex.toString(), ex.toString().contains("timeout!")); + assertTrue(ex.toString().contains("timeout!"), ex.toString()); } } @@ -1535,7 +1541,7 @@ public void disposeIndicated() { ts.assertResult(1); throw new RuntimeException("Should have thrown!"); } catch (Throwable ex) { - assertTrue(ex.toString(), ex.toString().contains("disposed!")); + assertTrue(ex.toString().contains("disposed!"), ex.toString()); } } @@ -1649,11 +1655,11 @@ public void asDisposable() { var ts = new TestSubscriber<>(); var d = ts.asDisposable(); - assertFalse("d is disposed", d.isDisposed()); + assertFalse(d.isDisposed(), "d is disposed"); d.dispose(); - assertTrue("d is disposed", d.isDisposed()); + assertTrue(d.isDisposed(), "d is disposed"); } static final class TestSubscriberImpl extends TestSubscriber { @@ -1670,15 +1676,17 @@ public void awaitCountTimeout() { assertTrue(ts.isTimeout()); } - @Test(expected = RuntimeException.class) + @Test public void awaitCountInterrupted() { - try { - TestSubscriber ts = TestSubscriber.create(); - ts.onSubscribe(new BooleanSubscription()); - Thread.currentThread().interrupt(); - ts.awaitCount(1); - } finally { - Thread.interrupted(); - } + assertThrows(RuntimeException.class, () -> { + try { + TestSubscriber ts = TestSubscriber.create(); + ts.onSubscribe(new BooleanSubscription()); + Thread.currentThread().interrupt(); + ts.awaitCount(1); + } finally { + Thread.interrupted(); + } + }); } } diff --git a/src/test/java/io/reactivex/rxjava4/testsupport/SuppressUndeliverableRule.java b/src/test/java/io/reactivex/rxjava4/testsupport/SuppressUndeliverableRule.java deleted file mode 100644 index 0dfd69da2f..0000000000 --- a/src/test/java/io/reactivex/rxjava4/testsupport/SuppressUndeliverableRule.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * 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.testsupport; - -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - -import io.reactivex.rxjava4.exceptions.UndeliverableException; -import io.reactivex.rxjava4.plugins.RxJavaPlugins; - -/** - * A rule for suppressing UndeliverableException handling. - * - *

Test classes that use this rule can suppress UndeliverableException - * handling by annotating the test method with SuppressUndeliverable. - */ -public class SuppressUndeliverableRule implements TestRule { - - static final class SuppressUndeliverableRuleStatement extends Statement { - private Statement base; - - SuppressUndeliverableRuleStatement(Statement base) { - this.base = base; - } - - @Override - public void evaluate() throws Throwable { - try { - RxJavaPlugins.setErrorHandler(throwable -> { - if (!(throwable instanceof UndeliverableException)) { - throwable.printStackTrace(); - Thread currentThread = Thread.currentThread(); - currentThread.getUncaughtExceptionHandler().uncaughtException(currentThread, throwable); - } - }); - base.evaluate(); - } finally { - RxJavaPlugins.setErrorHandler(null); - } - } - } - - @Override - public Statement apply(Statement base, Description description) { - if (description != null && description.getAnnotation(SuppressUndeliverable.class) != null) { - return new SuppressUndeliverableRuleStatement(base); - } else { - return base; - } - } -} diff --git a/src/test/java/io/reactivex/rxjava4/testsupport/TestHelper.java b/src/test/java/io/reactivex/rxjava4/testsupport/TestHelper.java index a51825e395..b00212390b 100644 --- a/src/test/java/io/reactivex/rxjava4/testsupport/TestHelper.java +++ b/src/test/java/io/reactivex/rxjava4/testsupport/TestHelper.java @@ -13,7 +13,7 @@ package io.reactivex.rxjava4.testsupport; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; @@ -23,11 +23,11 @@ import java.net.URL; import java.util.*; import java.util.concurrent.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.atomic.AtomicInteger; import org.mockito.Mockito; import org.mockito.stubbing.Answer; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.annotations.*; import io.reactivex.rxjava4.core.*; @@ -42,11 +42,7 @@ import io.reactivex.rxjava4.internal.subscriptions.*; import io.reactivex.rxjava4.internal.util.ExceptionHelper; import io.reactivex.rxjava4.observers.BaseTestConsumer; -import io.reactivex.rxjava4.operators.ConditionalSubscriber; -import io.reactivex.rxjava4.operators.QueueDisposable; -import io.reactivex.rxjava4.operators.QueueFuseable; -import io.reactivex.rxjava4.operators.QueueSubscription; -import io.reactivex.rxjava4.operators.SimpleQueue; +import io.reactivex.rxjava4.operators.*; import io.reactivex.rxjava4.parallel.ParallelFlowable; import io.reactivex.rxjava4.plugins.RxJavaPlugins; import io.reactivex.rxjava4.processors.PublishProcessor; @@ -223,7 +219,7 @@ public static void assertError(TestObserverEx to, int index, Class cel = ce.getExceptions(); - assertTrue(cel.get(index).toString(), clazz.isInstance(cel.get(index))); + assertTrue(clazz.isInstance(cel.get(index)), cel.get(index).toString()); } else { fail(ex.toString() + ": not a CompositeException"); } @@ -237,7 +233,7 @@ public static void assertError(TestSubscriberEx ts, int index, Class cel = ce.getExceptions(); - assertTrue(cel.get(index).toString(), clazz.isInstance(cel.get(index))); + assertTrue(clazz.isInstance(cel.get(index)), cel.get(index).toString()); } else { fail(ex.toString() + ": not a CompositeException"); } @@ -247,7 +243,7 @@ public static void assertError(TestObserverEx to, int index, Class cel = ce.getExceptions(); - assertTrue(cel.get(index).toString(), clazz.isInstance(cel.get(index))); + assertTrue(clazz.isInstance(cel.get(index)), cel.get(index).toString()); assertEquals(message, cel.get(index).getMessage()); } else { fail(ex.toString() + ": not a CompositeException"); @@ -258,7 +254,7 @@ public static void assertError(TestSubscriberEx ts, int index, Class cel = ce.getExceptions(); - assertTrue(cel.get(index).toString(), clazz.isInstance(cel.get(index))); + assertTrue(clazz.isInstance(cel.get(index)), cel.get(index).toString()); assertEquals(message, cel.get(index).getMessage()); } else { fail(ex.toString() + ": not a CompositeException"); @@ -340,8 +336,8 @@ public void onComplete() { throw new AssertionError(ex.getMessage()); } - assertTrue(list.toString(), list.getFirst() instanceof IllegalArgumentException); - assertEquals("n > 0 required but it was -99", list.getFirst().getMessage()); + assertTrue(list.getFirst() instanceof IllegalArgumentException, list.toString()); + assertEquals(list.getFirst().getMessage(), "n > 0 required but it was -99"); } finally { RxJavaPlugins.setErrorHandler(null); } @@ -401,7 +397,7 @@ public void onComplete() { throw new AssertionError(ex.getMessage()); } - assertTrue(list.toString(), list.getFirst() instanceof IllegalArgumentException); + assertTrue(list.getFirst() instanceof IllegalArgumentException, list.toString()); assertEquals("n > 0 required but it was -99", list.getFirst().getMessage()); } finally { RxJavaPlugins.setErrorHandler(null); @@ -666,15 +662,15 @@ public static void doubleOnSubscribe(MaybeObserver observer) { } public static void checkDisposed(Disposable d) { - assertFalse("Disposed upfront?!", d.isDisposed()); + assertFalse(d.isDisposed(), "Disposed upfront?!"); d.dispose(); - assertTrue("Not disposed?!", d.isDisposed()); + assertTrue(d.isDisposed(), "Not disposed?!"); d.dispose(); - assertTrue("Not disposed again?!", d.isDisposed()); + assertTrue(d.isDisposed(), "Not disposed again?!"); } /** @@ -754,13 +750,13 @@ public void onComplete() { }); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("Reports disposed upfront?", false, b[0]); - assertEquals("Didn't report disposed after?", true, b[1]); + assertEquals(false, b[0], "Reports disposed upfront?"); + assertEquals(true, b[1], "Didn't report disposed after?"); } /** @@ -805,13 +801,13 @@ public void onComplete() { }); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("Reports disposed upfront?", false, b[0]); - assertEquals("Didn't report disposed after?", true, b[1]); + assertEquals(false, b[0], "Reports disposed upfront?"); + assertEquals(true, b[1], "Didn't report disposed after?"); } /** @@ -851,13 +847,13 @@ public void onError(Throwable e) { }); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("Reports disposed upfront?", false, b[0]); - assertEquals("Didn't report disposed after?", true, b[1]); + assertEquals(false, b[0], "Reports disposed upfront?"); + assertEquals(true, b[1], "Didn't report disposed after?"); } /** @@ -897,13 +893,13 @@ public void onComplete() { }); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("Reports disposed upfront?", false, b[0]); - assertEquals("Didn't report disposed after?", true, b[1]); + assertEquals(false, b[0], "Reports disposed upfront?"); + assertEquals(true, b[1], "Didn't report disposed after?"); } /** @@ -981,13 +977,13 @@ protected void subscribeActual(MaybeObserver observer) { out.subscribe(NoOpConsumer.INSTANCE); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("First disposed?", false, b[0]); - assertEquals("Second not disposed?", true, b[1]); + assertEquals(false, b[0], "First disposed?"); + assertEquals(true, b[1], "Second not disposed?"); assertError(errors, 0, IllegalStateException.class, "Disposable already set!"); } catch (Throwable ex) { @@ -1035,13 +1031,13 @@ protected void subscribeActual(MaybeObserver observer) { out.subscribe(NoOpConsumer.INSTANCE); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("First disposed?", false, b[0]); - assertEquals("Second not disposed?", true, b[1]); + assertEquals(false, b[0], "First disposed?"); + assertEquals(true, b[1], "Second not disposed?"); assertError(errors, 0, IllegalStateException.class, "Disposable already set!"); } catch (Throwable ex) { @@ -1089,13 +1085,13 @@ protected void subscribeActual(MaybeObserver observer) { out.subscribe(NoOpConsumer.INSTANCE); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("First disposed?", false, b[0]); - assertEquals("Second not disposed?", true, b[1]); + assertEquals(false, b[0], "First disposed?"); + assertEquals(true, b[1], "Second not disposed?"); assertError(errors, 0, IllegalStateException.class, "Disposable already set!"); } catch (Throwable ex) { @@ -1143,13 +1139,13 @@ protected void subscribeActual(MaybeObserver observer) { out.subscribe(NoOpConsumer.INSTANCE); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("First disposed?", false, b[0]); - assertEquals("Second not disposed?", true, b[1]); + assertEquals(false, b[0], "First disposed?"); + assertEquals(true, b[1], "Second not disposed?"); assertError(errors, 0, IllegalStateException.class, "Disposable already set!"); } catch (Throwable ex) { @@ -1197,13 +1193,13 @@ protected void subscribeActual(SingleObserver observer) { out.subscribe(NoOpConsumer.INSTANCE); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("First disposed?", false, b[0]); - assertEquals("Second not disposed?", true, b[1]); + assertEquals(false, b[0], "First disposed?"); + assertEquals(true, b[1], "Second not disposed?"); assertError(errors, 0, IllegalStateException.class, "Disposable already set!"); } catch (Throwable ex) { @@ -1251,13 +1247,13 @@ protected void subscribeActual(SingleObserver observer) { out.subscribe(NoOpConsumer.INSTANCE); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("First disposed?", false, b[0]); - assertEquals("Second not disposed?", true, b[1]); + assertEquals(false, b[0], "First disposed?"); + assertEquals(true, b[1], "Second not disposed?"); assertError(errors, 0, IllegalStateException.class, "Disposable already set!"); } catch (Throwable ex) { @@ -1305,13 +1301,13 @@ protected void subscribeActual(SingleObserver observer) { out.subscribe(NoOpConsumer.INSTANCE); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("First disposed?", false, b[0]); - assertEquals("Second not disposed?", true, b[1]); + assertEquals(false, b[0], "First disposed?"); + assertEquals(true, b[1], "Second not disposed?"); assertError(errors, 0, IllegalStateException.class, "Disposable already set!"); } catch (Throwable ex) { @@ -1358,13 +1354,13 @@ protected void subscribeActual(MaybeObserver observer) { out.subscribe(NoOpConsumer.INSTANCE); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("First disposed?", false, b[0]); - assertEquals("Second not disposed?", true, b[1]); + assertEquals(false, b[0], "First disposed?"); + assertEquals(true, b[1], "Second not disposed?"); assertError(errors, 0, IllegalStateException.class, "Disposable already set!"); } catch (Throwable ex) { @@ -1412,13 +1408,13 @@ protected void subscribeActual(SingleObserver observer) { out.subscribe(NoOpConsumer.INSTANCE); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("First disposed?", false, b[0]); - assertEquals("Second not disposed?", true, b[1]); + assertEquals(false, b[0], "First disposed?"); + assertEquals(true, b[1], "Second not disposed?"); assertError(errors, 0, IllegalStateException.class, "Disposable already set!"); } catch (Throwable ex) { @@ -1466,13 +1462,13 @@ protected void subscribeActual(Subscriber subscriber) { out.subscribe(NoOpConsumer.INSTANCE); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("First disposed?", false, b[0]); - assertEquals("Second not disposed?", true, b[1]); + assertEquals(false, b[0], "First disposed?"); + assertEquals(true, b[1], "Second not disposed?"); assertError(errors, 0, IllegalStateException.class, "Subscription already set!"); } catch (Throwable ex) { @@ -1527,16 +1523,16 @@ public int parallelism() { out.subscribe(new Subscriber[] { NoOpConsumer.INSTANCE, NoOpConsumer.INSTANCE }); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("Rail 1 First disposed?", false, b[0]); - assertEquals("Rail 1 Second not disposed?", true, b[1]); + assertEquals(false, b[0], "Rail 1 First disposed?"); + assertEquals(true, b[1], "Rail 1 Second not disposed?"); - assertEquals("Rail 2 First disposed?", false, b[2]); - assertEquals("Rail 2 Second not disposed?", true, b[3]); + assertEquals(false, b[2], "Rail 2 First disposed?"); + assertEquals(true, b[3], "Rail 2 Second not disposed?"); assertError(errors, 0, IllegalStateException.class, "Subscription already set!"); assertError(errors, 1, IllegalStateException.class, "Subscription already set!"); @@ -1590,16 +1586,16 @@ public int parallelism() { out.subscribe(NoOpConsumer.INSTANCE); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("Rail 1 First disposed?", false, b[0]); - assertEquals("Rail 1 Second not disposed?", true, b[1]); + assertEquals(false, b[0], "Rail 1 First disposed?"); + assertEquals(true, b[1], "Rail 1 Second not disposed?"); - assertEquals("Rail 2 First disposed?", false, b[2]); - assertEquals("Rail 2 Second not disposed?", true, b[3]); + assertEquals(false, b[2], "Rail 2 First disposed?"); + assertEquals(true, b[3], "Rail 2 Second not disposed?"); assertError(errors, 0, IllegalStateException.class, "Subscription already set!"); assertError(errors, 1, IllegalStateException.class, "Subscription already set!"); @@ -1648,13 +1644,13 @@ protected void subscribeActual(Observer observer) { out.subscribe(NoOpConsumer.INSTANCE); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("First disposed?", false, b[0]); - assertEquals("Second not disposed?", true, b[1]); + assertEquals(false, b[0], "First disposed?"); + assertEquals(true, b[1], "Second not disposed?"); assertError(errors, 0, IllegalStateException.class, "Disposable already set!"); } catch (Throwable ex) { @@ -1702,13 +1698,13 @@ protected void subscribeActual(Observer observer) { out.subscribe(NoOpConsumer.INSTANCE); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("First disposed?", false, b[0]); - assertEquals("Second not disposed?", true, b[1]); + assertEquals(false, b[0], "First disposed?"); + assertEquals(true, b[1], "Second not disposed?"); assertError(errors, 0, IllegalStateException.class, "Disposable already set!"); } catch (Throwable ex) { @@ -1756,13 +1752,13 @@ protected void subscribeActual(Observer observer) { out.subscribe(NoOpConsumer.INSTANCE); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("First disposed?", false, b[0]); - assertEquals("Second not disposed?", true, b[1]); + assertEquals(false, b[0], "First disposed?"); + assertEquals(true, b[1], "Second not disposed?"); assertError(errors, 0, IllegalStateException.class, "Disposable already set!"); } catch (Throwable ex) { @@ -1809,13 +1805,13 @@ protected void subscribeActual(Observer observer) { out.subscribe(NoOpConsumer.INSTANCE); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("First disposed?", false, b[0]); - assertEquals("Second not disposed?", true, b[1]); + assertEquals(false, b[0], "First disposed?"); + assertEquals(true, b[1], "Second not disposed?"); assertError(errors, 0, IllegalStateException.class, "Disposable already set!"); } catch (Throwable ex) { @@ -1863,13 +1859,13 @@ protected void subscribeActual(Subscriber subscriber) { out.subscribe(NoOpConsumer.INSTANCE); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("First cancelled?", false, b[0]); - assertEquals("Second not cancelled?", true, b[1]); + assertEquals(false, b[0], "First cancelled?"); + assertEquals(true, b[1], "Second not cancelled?"); assertError(errors, 0, IllegalStateException.class, "Subscription already set!"); } catch (Throwable ex) { @@ -1917,13 +1913,13 @@ protected void subscribeActual(Subscriber subscriber) { out.subscribe(NoOpConsumer.INSTANCE); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("First cancelled?", false, b[0]); - assertEquals("Second not cancelled?", true, b[1]); + assertEquals(false, b[0], "First cancelled?"); + assertEquals(true, b[1], "Second not cancelled?"); assertError(errors, 0, IllegalStateException.class, "Subscription already set!"); } catch (Throwable ex) { @@ -1971,13 +1967,13 @@ protected void subscribeActual(Subscriber subscriber) { out.subscribe(NoOpConsumer.INSTANCE); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("First cancelled?", false, b[0]); - assertEquals("Second not cancelled?", true, b[1]); + assertEquals(false, b[0], "First cancelled?"); + assertEquals(true, b[1], "Second not cancelled?"); assertError(errors, 0, IllegalStateException.class, "Subscription already set!"); } catch (Throwable ex) { @@ -2024,13 +2020,13 @@ protected void subscribeActual(Subscriber subscriber) { out.subscribe(NoOpConsumer.INSTANCE); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("First cancelled?", false, b[0]); - assertEquals("Second not cancelled?", true, b[1]); + assertEquals(false, b[0], "First cancelled?"); + assertEquals(true, b[1], "Second not cancelled?"); assertError(errors, 0, IllegalStateException.class, "Subscription already set!"); } catch (Throwable ex) { @@ -2076,13 +2072,13 @@ protected void subscribeActual(CompletableObserver observer) { out.subscribe(NoOpConsumer.INSTANCE); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("First disposed?", false, b[0]); - assertEquals("Second not disposed?", true, b[1]); + assertEquals(false, b[0], "First disposed?"); + assertEquals(true, b[1], "Second not disposed?"); assertError(errors, 0, IllegalStateException.class, "Disposable already set!"); } catch (Throwable ex) { @@ -2129,13 +2125,13 @@ protected void subscribeActual(CompletableObserver observer) { out.subscribe(NoOpConsumer.INSTANCE); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("First disposed?", false, b[0]); - assertEquals("Second not disposed?", true, b[1]); + assertEquals(false, b[0], "First disposed?"); + assertEquals(true, b[1], "Second not disposed?"); assertError(errors, 0, IllegalStateException.class, "Disposable already set!"); } catch (Throwable ex) { @@ -2182,13 +2178,13 @@ protected void subscribeActual(CompletableObserver observer) { out.subscribe(NoOpConsumer.INSTANCE); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("First disposed?", false, b[0]); - assertEquals("Second not disposed?", true, b[1]); + assertEquals(false, b[0], "First disposed?"); + assertEquals(true, b[1], "Second not disposed?"); assertError(errors, 0, IllegalStateException.class, "Disposable already set!"); } catch (Throwable ex) { @@ -2234,13 +2230,13 @@ protected void subscribeActual(CompletableObserver observer) { out.subscribe(NoOpConsumer.INSTANCE); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("First disposed?", false, b[0]); - assertEquals("Second not disposed?", true, b[1]); + assertEquals(false, b[0], "First disposed?"); + assertEquals(true, b[1], "Second not disposed?"); assertError(errors, 0, IllegalStateException.class, "Disposable already set!"); } catch (Throwable ex) { @@ -2286,13 +2282,13 @@ protected void subscribeActual(CompletableObserver observer) { out.subscribe(NoOpConsumer.INSTANCE); try { - assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS)); + assertTrue(cdl.await(5, TimeUnit.SECONDS), "Timed out"); } catch (InterruptedException ex) { throw ExceptionHelper.wrapOrThrow(ex); } - assertEquals("First disposed?", false, b[0]); - assertEquals("Second not disposed?", true, b[1]); + assertEquals(false, b[0], "First disposed?"); + assertEquals(true, b[1], "Second not disposed?"); assertError(errors, 0, IllegalStateException.class, "Disposable already set!"); } catch (Throwable ex) { @@ -2319,11 +2315,11 @@ public static void checkDisposedMaybe(Function, ? extends MaybeS throw ExceptionHelper.wrapOrThrow(ex); } - assertTrue("Not subscribed to source!", pp.hasSubscribers()); + assertTrue(pp.hasSubscribers(), "Not subscribed to source!"); ts.cancel(); - assertFalse("Dispose not propagated!", pp.hasSubscribers()); + assertFalse(pp.hasSubscribers(), "Dispose not propagated!"); } /** @@ -2341,11 +2337,11 @@ public static void checkDisposedCompletable(Function void checkUndeliverableUponCancel(FlowableConverter")); } - assertFalse("No undeliverable errors received", errors.isEmpty()); + assertFalse(errors.isEmpty(), "No undeliverable errors received"); TestHelper.assertUndeliverable(errors, 0, TestException.class); } finally { RxJavaPlugins.reset(); @@ -3651,7 +3647,7 @@ public static void checkUndeliverableUponCancel(ObservableConverter")); } - assertFalse("No undeliverable errors received", errors.isEmpty()); + assertFalse(errors.isEmpty(), "No undeliverable errors received"); TestHelper.assertUndeliverable(errors, 0, TestException.class); } finally { RxJavaPlugins.reset(); diff --git a/src/test/java/io/reactivex/rxjava4/testsupport/TestObserverExTest.java b/src/test/java/io/reactivex/rxjava4/testsupport/TestObserverExTest.java index c213b0bb07..fd0629012e 100644 --- a/src/test/java/io/reactivex/rxjava4/testsupport/TestObserverExTest.java +++ b/src/test/java/io/reactivex/rxjava4/testsupport/TestObserverExTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.testsupport; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.io.IOException; import java.util.*; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; import io.reactivex.rxjava4.core.Observable; @@ -806,14 +806,14 @@ public void assertValueSequence() { to.assertValueSequence(Collections.emptyList()); throw new RuntimeException("Should have thrown"); } catch (AssertionError expected) { - assertTrue(expected.getMessage(), expected.getMessage().startsWith("More values received than expected (0)")); + assertTrue(expected.getMessage().startsWith("More values received than expected (0)"), expected.getMessage()); } try { to.assertValueSequence(Collections.singletonList(1)); throw new RuntimeException("Should have thrown"); } catch (AssertionError expected) { - assertTrue(expected.getMessage(), expected.getMessage().startsWith("More values received than expected (1)")); + assertTrue(expected.getMessage().startsWith("More values received than expected (1)"), expected.getMessage()); } to.assertValueSequence(Arrays.asList(1, 2)); @@ -822,7 +822,7 @@ public void assertValueSequence() { to.assertValueSequence(Arrays.asList(1, 2, 3)); throw new RuntimeException("Should have thrown"); } catch (AssertionError expected) { - assertTrue(expected.getMessage(), expected.getMessage().startsWith("Fewer values received than expected (2)")); + assertTrue(expected.getMessage().startsWith("Fewer values received than expected (2)"), expected.getMessage()); } } @@ -860,7 +860,7 @@ public void awaitDoneTimed() { try { to.awaitDone(5, TimeUnit.SECONDS); } catch (RuntimeException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof InterruptedException); + assertTrue(ex.getCause() instanceof InterruptedException, ex.toString()); } } @@ -1108,13 +1108,13 @@ public void asyncFusion() { @Test public void assertValuePredicateEmpty() { - assertThrows("No values", AssertionError.class, () -> { + assertThrows(AssertionError.class, () -> { TestObserverEx to = new TestObserverEx<>(); Observable.empty().subscribe(to); to.assertValue(_ -> false); - }); + }, "No values"); } @Test @@ -1128,35 +1128,35 @@ public void assertValuePredicateMatch() { @Test public void assertValuePredicateNoMatch() { - assertThrows("Value not present", AssertionError.class, () -> { + assertThrows(AssertionError.class, () -> { TestObserverEx to = new TestObserverEx<>(); Observable.just(1).subscribe(to); to.assertValue(o -> o != 1); - }); + }, "Value not present"); } @Test public void assertValuePredicateMatchButMore() { - assertThrows("Value present but other values as well", AssertionError.class, () -> { + assertThrows(AssertionError.class, () -> { TestObserverEx to = new TestObserverEx<>(); Observable.just(1, 2).subscribe(to); to.assertValue(o -> o == 1); - }); + }, "Value present but other values as well"); } @Test public void assertValueAtPredicateEmpty() { - assertThrows("No values", AssertionError.class, () -> { + assertThrows(AssertionError.class, () -> { TestObserverEx to = new TestObserverEx<>(); Observable.empty().subscribe(to); to.assertValueAt(0, _ -> false); - }); + }, "No values"); } @Test @@ -1170,35 +1170,35 @@ public void assertValueAtPredicateMatch() { @Test public void assertValueAtPredicateNoMatch() { - assertThrows("Value not present", AssertionError.class, () -> { + assertThrows(AssertionError.class, () -> { TestObserverEx to = new TestObserverEx<>(); Observable.just(1, 2, 3).subscribe(to); to.assertValueAt(2, o -> o != 3); - }); + }, "Value not present"); } @Test public void assertValueAtInvalidIndex() { - assertThrows("Invalid index: 2 (latch = 0, values = 2, errors = 0, completions = 1)", AssertionError.class, () -> { + assertThrows(AssertionError.class, () -> { TestObserverEx to = new TestObserverEx<>(); Observable.just(1, 2).subscribe(to); to.assertValueAt(2, o -> o == 1); - }); + }, "Invalid index: 2 (latch = 0, values = 2, errors = 0, completions = 1)"); } @Test public void assertValueAtIndexEmpty() { - assertThrows("No values", AssertionError.class, () -> { + assertThrows(AssertionError.class, () -> { TestObserverEx to = new TestObserverEx<>(); Observable.empty().subscribe(to); to.assertValueAt(0, "a"); - }); + }, "No values"); } @Test @@ -1212,24 +1212,24 @@ public void assertValueAtIndexMatch() { @Test public void assertValueAtIndexNoMatch() { - assertThrows("\nexpected: b (class: String)\ngot: c (class: String) (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> { + assertThrows(AssertionError.class, () -> { TestObserverEx to = new TestObserverEx<>(); Observable.just("a", "b", "c").subscribe(to); to.assertValueAt(2, "b"); - }); + }, "\nexpected: b (class: String)\ngot: c (class: String) (latch = 0, values = 3, errors = 0, completions = 1)"); } @Test public void assertValueAtIndexInvalidIndex() { - assertThrows("Invalid index: 2 (latch = 0, values = 2, errors = 0, completions = 1)", AssertionError.class, () -> { + assertThrows(AssertionError.class, () -> { TestObserverEx to = new TestObserverEx<>(); Observable.just("a", "b").subscribe(to); to.assertValueAt(2, "c"); - }); + }, "Invalid index: 2 (latch = 0, values = 2, errors = 0, completions = 1)"); } @Test @@ -1244,7 +1244,7 @@ public void withTag() { } throw new RuntimeException("Should have thrown!"); } catch (AssertionError ex) { - assertTrue(ex.toString(), ex.toString().contains("testing with item=2")); + assertTrue(ex.toString().contains("testing with item=2"), ex.toString()); } } diff --git a/src/test/java/io/reactivex/rxjava4/testsupport/TestSubscriberExTest.java b/src/test/java/io/reactivex/rxjava4/testsupport/TestSubscriberExTest.java index 9c0ddab03c..4aa9899ffc 100644 --- a/src/test/java/io/reactivex/rxjava4/testsupport/TestSubscriberExTest.java +++ b/src/test/java/io/reactivex/rxjava4/testsupport/TestSubscriberExTest.java @@ -13,17 +13,17 @@ package io.reactivex.rxjava4.testsupport; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import java.io.IOException; import java.util.*; +import java.util.concurrent.Flow.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.InOrder; -import static java.util.concurrent.Flow.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Scheduler.Worker; @@ -186,22 +186,28 @@ public void awaitTerminalEventWithDurationAndUnsubscribeOnTimeout() { assertTrue(unsub.get()); } - @Test(expected = NullPointerException.class) + @Test public void nullDelegate1() { - TestSubscriberEx ts = new TestSubscriberEx<>(null); - ts.onComplete(); + assertThrows(NullPointerException.class, () -> { + TestSubscriberEx ts = new TestSubscriberEx<>(null); + ts.onComplete(); + }); } - @Test(expected = NullPointerException.class) + @Test public void nullDelegate2() { - TestSubscriberEx ts = new TestSubscriberEx<>(null); - ts.onComplete(); + assertThrows(NullPointerException.class, () -> { + TestSubscriberEx ts = new TestSubscriberEx<>(null); + ts.onComplete(); + }); } - @Test(expected = NullPointerException.class) + @Test public void nullDelegate3() { - TestSubscriberEx ts = new TestSubscriberEx<>(null, 0L); - ts.onComplete(); + assertThrows(NullPointerException.class, () -> { + TestSubscriberEx ts = new TestSubscriberEx<>(null, 0L); + ts.onComplete(); + }); } @Test @@ -550,7 +556,7 @@ public void interruptTerminalEventAwaitAndUnsubscribe() { try { ts.awaitDone(5, TimeUnit.SECONDS); } catch (RuntimeException allowed) { - assertTrue(allowed.toString(), allowed.getCause() instanceof InterruptedException); + assertTrue(allowed.getCause() instanceof InterruptedException, allowed.toString()); } ts.dispose(); @@ -1182,7 +1188,7 @@ public void awaitTerminalEventInterrupt() { try { ts.awaitDone(5, TimeUnit.SECONDS); } catch (RuntimeException allowed) { - assertTrue(allowed.toString(), allowed.getCause() instanceof InterruptedException); + assertTrue(allowed.getCause() instanceof InterruptedException, allowed.toString()); } // FIXME ? catch consumes this flag @@ -1193,7 +1199,7 @@ public void awaitTerminalEventInterrupt() { try { ts.awaitDone(5, TimeUnit.SECONDS); } catch (RuntimeException allowed) { - assertTrue(allowed.toString(), allowed.getCause() instanceof InterruptedException); + assertTrue(allowed.getCause() instanceof InterruptedException, allowed.toString()); } // FIXME ? catch consumes this flag @@ -1341,7 +1347,7 @@ public void awaitDoneTimed() { try { ts.awaitDone(5, TimeUnit.SECONDS); } catch (RuntimeException ex) { - assertTrue(ex.toString(), ex.getCause() instanceof InterruptedException); + assertTrue(ex.getCause() instanceof InterruptedException, ex.toString()); } } @@ -1533,13 +1539,13 @@ public void asyncQueueThrows() { @Test public void assertValuePredicateEmpty() { - assertThrows("No values", AssertionError.class, () -> { + assertThrows(AssertionError.class, () -> { TestSubscriberEx ts = new TestSubscriberEx<>(); Flowable.empty().subscribe(ts); ts.assertValue(_ -> false); - }); + }, "No values"); } @Test @@ -1553,35 +1559,35 @@ public void assertValuePredicateMatch() { @Test public void assertValuePredicateNoMatch() { - assertThrows("Value not present", AssertionError.class, () -> { + assertThrows(AssertionError.class, () -> { TestSubscriberEx ts = new TestSubscriberEx<>(); Flowable.just(1).subscribe(ts); ts.assertValue(o -> o != 1); - }); + }, "Value not present"); } @Test public void assertValuePredicateMatchButMore() { - assertThrows("Value present but other values as well", AssertionError.class, () -> { + assertThrows(AssertionError.class, () -> { TestSubscriberEx ts = new TestSubscriberEx<>(); Flowable.just(1, 2).subscribe(ts); ts.assertValue(o -> o == 1); - }); + }, "Value present but other values as well"); } @Test public void assertValueAtPredicateEmpty() { - assertThrows("No values", AssertionError.class, () -> { + assertThrows(AssertionError.class, () -> { TestSubscriberEx ts = new TestSubscriberEx<>(); Flowable.empty().subscribe(ts); ts.assertValueAt(0, _ -> false); - }); + }, "No values"); } @Test @@ -1595,24 +1601,24 @@ public void assertValueAtPredicateMatch() { @Test public void assertValueAtPredicateNoMatch() { - assertThrows("Value not present", AssertionError.class, () -> { + assertThrows(AssertionError.class, () -> { TestSubscriberEx ts = new TestSubscriberEx<>(); Flowable.just(1, 2, 3).subscribe(ts); ts.assertValueAt(2, o -> o != 3); - }); + }, "Value not present"); } @Test public void assertValueAtInvalidIndex() { - assertThrows("Invalid index: 2 (latch = 0, values = 2, errors = 0, completions = 1)", AssertionError.class, () -> { + assertThrows(AssertionError.class, () -> { TestSubscriberEx ts = new TestSubscriberEx<>(); Flowable.just(1, 2).subscribe(ts); ts.assertValueAt(2, o -> o == 1); - }); + }, "Invalid index: 2 (latch = 0, values = 2, errors = 0, completions = 1)"); } @Test @@ -1639,7 +1645,7 @@ public void withTag() { } throw new RuntimeException("Should have thrown!"); } catch (AssertionError ex) { - assertTrue(ex.toString(), ex.toString().contains("testing with item=2")); + assertTrue(ex.toString().contains("testing with item=2"), ex.toString()); } } @@ -1655,7 +1661,7 @@ public void timeoutIndicated() throws InterruptedException { ts.assertResult(1); throw new RuntimeException("Should have thrown!"); } catch (AssertionError ex) { - assertTrue(ex.toString(), ex.toString().contains("timeout!")); + assertTrue(ex.toString().contains("timeout!"), ex.toString()); } } @@ -1669,7 +1675,7 @@ public void timeoutIndicated2() throws InterruptedException { throw new RuntimeException("Should have thrown!"); } catch (AssertionError ex) { - assertTrue(ex.toString(), ex.toString().contains("timeout!")); + assertTrue(ex.toString().contains("timeout!"), ex.toString()); } } @@ -1683,7 +1689,7 @@ public void timeoutIndicated3() throws InterruptedException { ts.assertResult(1); throw new RuntimeException("Should have thrown!"); } catch (AssertionError ex) { - assertTrue(ex.toString(), ex.toString().contains("timeout!")); + assertTrue(ex.toString().contains("timeout!"), ex.toString()); } } @@ -1696,7 +1702,7 @@ public void disposeIndicated() { ts.assertResult(1); throw new RuntimeException("Should have thrown!"); } catch (Throwable ex) { - assertTrue(ex.toString(), ex.toString().contains("disposed!")); + assertTrue(ex.toString().contains("disposed!"), ex.toString()); } } diff --git a/src/test/java/io/reactivex/rxjava4/validators/CheckAndFixLicenseHeadersTest.java b/src/test/java/io/reactivex/rxjava4/validators/CheckAndFixLicenseHeadersTest.java index e7b4d8523b..0f51bf6e31 100644 --- a/src/test/java/io/reactivex/rxjava4/validators/CheckAndFixLicenseHeadersTest.java +++ b/src/test/java/io/reactivex/rxjava4/validators/CheckAndFixLicenseHeadersTest.java @@ -16,9 +16,9 @@ import java.io.*; import java.util.*; -import io.reactivex.rxjava4.core.RxJavaTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.testsupport.TestHelper; /** diff --git a/src/test/java/io/reactivex/rxjava4/validators/CheckAnonClassForLambdaTest.java b/src/test/java/io/reactivex/rxjava4/validators/CheckAnonClassForLambdaTest.java index 25f3e8d987..c130260fce 100644 --- a/src/test/java/io/reactivex/rxjava4/validators/CheckAnonClassForLambdaTest.java +++ b/src/test/java/io/reactivex/rxjava4/validators/CheckAnonClassForLambdaTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.validators; -import java.io.*; +import java.io.File; import java.nio.file.Files; import java.util.*; import java.util.regex.Pattern; -import io.reactivex.rxjava4.core.RxJavaTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.testsupport.TestHelper; /** diff --git a/src/test/java/io/reactivex/rxjava4/validators/CheckBaseTypeAnnotationsTest.java b/src/test/java/io/reactivex/rxjava4/validators/CheckBaseTypeAnnotationsTest.java index e12d4c93e2..5d3af49077 100644 --- a/src/test/java/io/reactivex/rxjava4/validators/CheckBaseTypeAnnotationsTest.java +++ b/src/test/java/io/reactivex/rxjava4/validators/CheckBaseTypeAnnotationsTest.java @@ -13,12 +13,12 @@ package io.reactivex.rxjava4.validators; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.lang.reflect.*; +import java.util.concurrent.Flow.Publisher; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.annotations.*; import io.reactivex.rxjava4.core.*; diff --git a/src/test/java/io/reactivex/rxjava4/validators/CheckCatchThrowIfFatalTest.java b/src/test/java/io/reactivex/rxjava4/validators/CheckCatchThrowIfFatalTest.java index 1b66c65056..4424fb35cd 100644 --- a/src/test/java/io/reactivex/rxjava4/validators/CheckCatchThrowIfFatalTest.java +++ b/src/test/java/io/reactivex/rxjava4/validators/CheckCatchThrowIfFatalTest.java @@ -17,9 +17,9 @@ import java.nio.file.Files; import java.util.*; -import io.reactivex.rxjava4.core.RxJavaTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.testsupport.TestHelper; /** diff --git a/src/test/java/io/reactivex/rxjava4/validators/CheckInternalWrongNamingTest.java b/src/test/java/io/reactivex/rxjava4/validators/CheckInternalWrongNamingTest.java index a7c7a1f0b6..a2761e9a64 100644 --- a/src/test/java/io/reactivex/rxjava4/validators/CheckInternalWrongNamingTest.java +++ b/src/test/java/io/reactivex/rxjava4/validators/CheckInternalWrongNamingTest.java @@ -16,9 +16,9 @@ import java.io.*; import java.util.*; -import io.reactivex.rxjava4.core.RxJavaTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.testsupport.TestHelper; /** diff --git a/src/test/java/io/reactivex/rxjava4/validators/CheckJavadocCodesAndLinksTest.java b/src/test/java/io/reactivex/rxjava4/validators/CheckJavadocCodesAndLinksTest.java index 3400f230c5..3faa4a2eda 100644 --- a/src/test/java/io/reactivex/rxjava4/validators/CheckJavadocCodesAndLinksTest.java +++ b/src/test/java/io/reactivex/rxjava4/validators/CheckJavadocCodesAndLinksTest.java @@ -17,9 +17,9 @@ import java.nio.file.Files; import java.util.*; -import io.reactivex.rxjava4.core.RxJavaTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.testsupport.TestHelper; /** diff --git a/src/test/java/io/reactivex/rxjava4/validators/CheckJavadocConfigAndArgumentTest.java b/src/test/java/io/reactivex/rxjava4/validators/CheckJavadocConfigAndArgumentTest.java index ab752bc475..6170d00609 100644 --- a/src/test/java/io/reactivex/rxjava4/validators/CheckJavadocConfigAndArgumentTest.java +++ b/src/test/java/io/reactivex/rxjava4/validators/CheckJavadocConfigAndArgumentTest.java @@ -17,9 +17,9 @@ import java.nio.file.Files; import java.util.*; -import io.reactivex.rxjava4.core.RxJavaTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.testsupport.TestHelper; /** diff --git a/src/test/java/io/reactivex/rxjava4/validators/CheckJavadocFindUnescapedAngleBracketsTest.java b/src/test/java/io/reactivex/rxjava4/validators/CheckJavadocFindUnescapedAngleBracketsTest.java index 37f56d56b9..8e81d37726 100644 --- a/src/test/java/io/reactivex/rxjava4/validators/CheckJavadocFindUnescapedAngleBracketsTest.java +++ b/src/test/java/io/reactivex/rxjava4/validators/CheckJavadocFindUnescapedAngleBracketsTest.java @@ -16,9 +16,9 @@ import java.io.*; import java.util.*; -import io.reactivex.rxjava4.core.RxJavaTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.testsupport.TestHelper; public class CheckJavadocFindUnescapedAngleBracketsTest extends RxJavaTest { diff --git a/src/test/java/io/reactivex/rxjava4/validators/CheckJavadocForAnnotationsTest.java b/src/test/java/io/reactivex/rxjava4/validators/CheckJavadocForAnnotationsTest.java index 4f98cc5dc2..33d23820cf 100644 --- a/src/test/java/io/reactivex/rxjava4/validators/CheckJavadocForAnnotationsTest.java +++ b/src/test/java/io/reactivex/rxjava4/validators/CheckJavadocForAnnotationsTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.validators; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.testsupport.TestHelper; diff --git a/src/test/java/io/reactivex/rxjava4/validators/CheckJavadocWordingTest.java b/src/test/java/io/reactivex/rxjava4/validators/CheckJavadocWordingTest.java index f32eadcb3c..42f887a9f1 100644 --- a/src/test/java/io/reactivex/rxjava4/validators/CheckJavadocWordingTest.java +++ b/src/test/java/io/reactivex/rxjava4/validators/CheckJavadocWordingTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.validators; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.regex.Pattern; -import io.reactivex.rxjava4.core.RxJavaTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.testsupport.TestHelper; import io.reactivex.rxjava4.validators.BaseTypeParser.RxMethod; diff --git a/src/test/java/io/reactivex/rxjava4/validators/CheckLocalVariablesInTest.java b/src/test/java/io/reactivex/rxjava4/validators/CheckLocalVariablesInTest.java index 6b232d3109..559ca27ffd 100644 --- a/src/test/java/io/reactivex/rxjava4/validators/CheckLocalVariablesInTest.java +++ b/src/test/java/io/reactivex/rxjava4/validators/CheckLocalVariablesInTest.java @@ -17,9 +17,10 @@ import java.util.*; import java.util.regex.Pattern; -import io.reactivex.rxjava4.core.RxJavaTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import io.reactivex.rxjava4.core.RxJavaTest; +import io.reactivex.rxjava4.functions.Predicate; import io.reactivex.rxjava4.testsupport.TestHelper; /** @@ -39,11 +40,19 @@ */ public class CheckLocalVariablesInTest extends RxJavaTest { - static void findPattern(String pattern) throws Exception { - findPattern(pattern, false); + static void findPattern(String pattern) throws Throwable { + findPattern(pattern, false, _ -> true); } - static void findPattern(String pattern, boolean checkMain) throws Exception { + static void findPattern(String pattern, boolean checkMain) throws Throwable { + findPattern(pattern, checkMain, _ -> true); + } + + static void findPattern(String pattern, Predicate fileFilter) throws Throwable { + findPattern(pattern, false, fileFilter); + } + + static void findPattern(String pattern, boolean checkMain, Predicate fileFilter) throws Throwable { File f = TestHelper.findSource("Flowable"); if (f == null) { System.out.println("Unable to find sources of RxJava"); @@ -77,7 +86,7 @@ static void findPattern(String pattern, boolean checkMain) throws Exception { dirs.offer(u); } else { String fname = u.getName(); - if (fname.endsWith(".java")) { + if (fname.endsWith(".java") && fileFilter.test(u.getAbsolutePath())) { int lineNum = 0; try (BufferedReader in = new BufferedReader(new FileReader(u))) { @@ -124,339 +133,344 @@ static void findPattern(String pattern, boolean checkMain) throws Exception { } @Test - public void subscriberAsTo() throws Exception { + public void subscriberAsTo() throws Throwable { findPattern("TestSubscriber(Ex)?<.*>\\s+to"); } @Test - public void observerAsTs() throws Exception { + public void observerAsTs() throws Throwable { findPattern("TestObserver(Ex)?<.*>\\s+ts"); } @Test - public void subscriberNoArgAsTo() throws Exception { + public void subscriberNoArgAsTo() throws Throwable { findPattern("TestSubscriber(Ex)?\\s+to"); } @Test - public void observerNoArgAsTs() throws Exception { + public void observerNoArgAsTs() throws Throwable { findPattern("TestObserver(Ex)?\\s+ts"); } @Test - public void publishSubjectAsPp() throws Exception { + public void publishSubjectAsPp() throws Throwable { findPattern("PublishSubject<.*>\\s+pp"); } @Test - public void publishProcessorAsPs() throws Exception { + public void publishProcessorAsPs() throws Throwable { findPattern("PublishProcessor<.*>\\s+ps"); } @Test - public void unicastSubjectAsUp() throws Exception { + public void unicastSubjectAsUp() throws Throwable { findPattern("UnicastSubject<.*>\\s+up"); } @Test - public void unicastProcessorAsUs() throws Exception { + public void unicastProcessorAsUs() throws Throwable { findPattern("UnicastProcessor<.*>\\s+us"); } @Test - public void behaviorProcessorAsBs() throws Exception { + public void behaviorProcessorAsBs() throws Throwable { findPattern("BehaviorProcessor<.*>\\s+bs"); } @Test - public void behaviorSubjectAsBp() throws Exception { + public void behaviorSubjectAsBp() throws Throwable { findPattern("BehaviorSubject<.*>\\s+bp"); } @Test - public void connectableFlowableAsCo() throws Exception { + public void connectableFlowableAsCo() throws Throwable { findPattern("ConnectableFlowable<.*>\\s+co(0-9|\\b)"); } @Test - public void connectableObservableAsCf() throws Exception { + public void connectableObservableAsCf() throws Throwable { findPattern("ConnectableObservable<.*>\\s+cf(0-9|\\b)"); } @Test - public void queueDisposableInsteadOfQueueFuseable() throws Exception { + public void queueDisposableInsteadOfQueueFuseable() throws Throwable { findPattern("QueueDisposable\\.(NONE|SYNC|ASYNC|ANY|BOUNDARY)"); } @Test - public void queueSubscriptionInsteadOfQueueFuseable() throws Exception { + public void queueSubscriptionInsteadOfQueueFuseable() throws Throwable { findPattern("QueueSubscription\\.(NONE|SYNC|ASYNC|ANY|BOUNDARY)"); } @Test - public void singleSourceAsMs() throws Exception { + public void singleSourceAsMs() throws Throwable { findPattern("SingleSource<.*>\\s+ms"); } @Test - public void singleSubjectAsMs() throws Exception { + public void singleSubjectAsMs() throws Throwable { findPattern("SingleSubject<.*>\\s+ms"); } @Test - public void singleSourceAsCs() throws Exception { + public void singleSourceAsCs() throws Throwable { findPattern("SingleSource<.*>\\s+cs"); } @Test - public void maybeSourceAsSs() throws Exception { + public void maybeSourceAsSs() throws Throwable { findPattern("MaybeSource<.*>\\s+ss"); } @Test - public void maybeSubjectAsSs() throws Exception { + public void maybeSubjectAsSs() throws Throwable { findPattern("MaybeSubject<.*>\\s+ss"); } @Test - public void maybeSourceAsCs() throws Exception { + public void maybeSourceAsCs() throws Throwable { findPattern("MaybeSource<.*>\\s+cs"); } @Test - public void completableSourceAsSs() throws Exception { + public void completableSourceAsSs() throws Throwable { findPattern("CompletableSource<.*>\\s+ss"); } @Test - public void completableSourceAsMs() throws Exception { + public void completableSourceAsMs() throws Throwable { findPattern("CompletableSource<.*>\\s+ms"); } @Test - public void completableSubjectAsSs() throws Exception { + public void completableSubjectAsSs() throws Throwable { findPattern("CompletableSubject<.*>\\s+ss"); } @Test - public void completableSubjectAsMs() throws Exception { + public void completableSubjectAsMs() throws Throwable { findPattern("CompletableSubject<.*>\\s+ms"); } @Test - public void observableAsC() throws Exception { + public void observableAsC() throws Throwable { findPattern("Observable<.*>\\s+c\\b"); } @Test - public void subscriberAsObserver() throws Exception { + public void subscriberAsObserver() throws Throwable { findPattern("Subscriber<.*>\\s+observer[0-9]?\\b"); } @Test - public void subscriberAsO() throws Exception { + public void subscriberAsO() throws Throwable { findPattern("Subscriber<.*>\\s+o[0-9]?\\b"); } @Test - public void singleAsObservable() throws Exception { + public void singleAsObservable() throws Throwable { findPattern("Single<.*>\\s+observable\\b"); } @Test - public void singleAsFlowable() throws Exception { + public void singleAsFlowable() throws Throwable { findPattern("Single<.*>\\s+flowable\\b"); } @Test - public void observerAsSubscriber() throws Exception { + public void observerAsSubscriber() throws Throwable { findPattern("Observer<.*>\\s+subscriber[0-9]?\\b"); } @Test - public void observerAsS() throws Exception { + public void observerAsS() throws Throwable { findPattern("Observer<.*>\\s+s[0-9]?\\b"); } @Test - public void observerNoArgAsSubscriber() throws Exception { + public void observerNoArgAsSubscriber() throws Throwable { findPattern("Observer\\s+subscriber[0-9]?\\b"); } @Test - public void observerNoArgAsS() throws Exception { + public void observerNoArgAsS() throws Throwable { findPattern("Observer\\s+s[0-9]?\\b"); } @Test - public void flowableAsObservable() throws Exception { + public void flowableAsObservable() throws Throwable { findPattern("Flowable<.*>\\s+observable[0-9]?\\b"); } @Test - public void flowableAsO() throws Exception { + public void flowableAsO() throws Throwable { findPattern("Flowable<.*>\\s+o[0-9]?\\b"); } @Test - public void flowableNoArgAsO() throws Exception { + public void flowableNoArgAsO() throws Throwable { findPattern("Flowable\\s+o[0-9]?\\b"); } @Test - public void flowableNoArgAsObservable() throws Exception { + public void flowableNoArgAsObservable() throws Throwable { findPattern("Flowable\\s+observable[0-9]?\\b"); } @Test - public void processorAsSubject() throws Exception { + public void processorAsSubject() throws Throwable { findPattern("Processor<.*>\\s+subject(0-9)?\\b"); } @Test - public void maybeAsObservable() throws Exception { + public void maybeAsObservable() throws Throwable { findPattern("Maybe<.*>\\s+observable\\b"); } @Test - public void maybeAsFlowable() throws Exception { + public void maybeAsFlowable() throws Throwable { findPattern("Maybe<.*>\\s+flowable\\b"); } @Test - public void completableAsObservable() throws Exception { + public void completableAsObservable() throws Throwable { findPattern("Completable\\s+observable\\b"); } @Test - public void completableAsFlowable() throws Exception { + public void completableAsFlowable() throws Throwable { findPattern("Completable\\s+flowable\\b"); } @Test - public void subscriptionAsFieldS() throws Exception { + public void subscriptionAsFieldS() throws Throwable { findPattern("Subscription\\s+s[0-9]?;", true); } @Test - public void subscriptionAsD() throws Exception { + public void subscriptionAsD() throws Throwable { findPattern("Subscription\\s+d[0-9]?", true); } @Test - public void subscriptionAsSubscription() throws Exception { + public void subscriptionAsSubscription() throws Throwable { findPattern("Subscription\\s+subscription[0-9]?;", true); } @Test - public void subscriptionAsDParenthesis() throws Exception { + public void subscriptionAsDParenthesis() throws Throwable { findPattern("Subscription\\s+d[0-9]?\\)", true); } @Test - public void queueSubscriptionAsD() throws Exception { + public void queueSubscriptionAsD() throws Throwable { findPattern("Subscription<.*>\\s+q?d[0-9]?\\b", true); } @Test - public void booleanSubscriptionAsbd() throws Exception { + public void booleanSubscriptionAsbd() throws Throwable { findPattern("BooleanSubscription\\s+bd[0-9]?;", true); } @Test - public void atomicSubscriptionAsS() throws Exception { + public void atomicSubscriptionAsS() throws Throwable { findPattern("AtomicReference\\s+s[0-9]?;", true); } @Test - public void atomicSubscriptionAsSInit() throws Exception { + public void atomicSubscriptionAsSInit() throws Throwable { findPattern("AtomicReference\\s+s[0-9]?\\s", true); } @Test - public void atomicSubscriptionAsSubscription() throws Exception { + public void atomicSubscriptionAsSubscription() throws Throwable { findPattern("AtomicReference\\s+subscription[0-9]?", true); } @Test - public void atomicSubscriptionAsD() throws Exception { + public void atomicSubscriptionAsD() throws Throwable { findPattern("AtomicReference\\s+d[0-9]?", true); } @Test - public void disposableAsS() throws Exception { + public void disposableAsS() throws Throwable { // the space before makes sure it doesn't match onSubscribe(Subscription) unnecessarily findPattern("Disposable\\s+s[0-9]?\\b", true); } @Test - public void disposableAsFieldD() throws Exception { + public void disposableAsFieldD() throws Throwable { findPattern("Disposable\\s+d[0-9]?;", true); } @Test - public void atomicDisposableAsS() throws Exception { + public void atomicDisposableAsS() throws Throwable { findPattern("AtomicReference\\s+s[0-9]?", true); } @Test - public void atomicDisposableAsD() throws Exception { + public void atomicDisposableAsD() throws Throwable { findPattern("AtomicReference\\s+d[0-9]?;", true); } @Test - public void subscriberAsFieldActual() throws Exception { + public void subscriberAsFieldActual() throws Throwable { findPattern("Subscriber<.*>\\s+actual[;\\)]", true); } @Test - public void subscriberNoArgAsFieldActual() throws Exception { + public void subscriberNoArgAsFieldActual() throws Throwable { findPattern("Subscriber\\s+actual[;\\)]", true); } @Test - public void subscriberAsFieldS() throws Exception { + public void subscriberAsFieldS() throws Throwable { findPattern("Subscriber<.*>\\s+s[0-9]?;", true); } @Test - public void observerAsFieldActual() throws Exception { + public void observerAsFieldActual() throws Throwable { findPattern("Observer<.*>\\s+actual[;\\)]", true); } @Test - public void observerAsFieldSO() throws Exception { + public void observerAsFieldSO() throws Throwable { findPattern("Observer<.*>\\s+[so][0-9]?;", true); } @Test - public void observerNoArgAsFieldActual() throws Exception { + public void observerNoArgAsFieldActual() throws Throwable { findPattern("Observer\\s+actual[;\\)]", true); } @Test - public void observerNoArgAsFieldCs() throws Exception { + public void observerNoArgAsFieldCs() throws Throwable { findPattern("Observer\\s+cs[;\\)]", true); } @Test - public void observerNoArgAsFieldSO() throws Exception { + public void observerNoArgAsFieldSO() throws Throwable { findPattern("Observer\\s+[so][0-9]?;", true); } @Test - public void queueDisposableAsD() throws Exception { + public void queueDisposableAsD() throws Throwable { findPattern("Disposable<.*>\\s+q?s[0-9]?\\b", true); } @Test - public void disposableAsDParenthesis() throws Exception { + public void disposableAsDParenthesis() throws Throwable { findPattern("Disposable\\s+s[0-9]?\\)", true); } @Test - public void compositeDisposableAsCs() throws Exception { + public void compositeDisposableAsCs() throws Throwable { findPattern("CompositeDisposable\\s+cs[0-9]?", true); } + @Test + public void checkFortestNGInJUnitFiles() throws Throwable { + findPattern("\\sorg\\.testng\\.", false, f -> !f.toLowerCase().contains("tck")); + } + } diff --git a/src/test/java/io/reactivex/rxjava4/validators/CheckMaybeForSinceTagsTest.java b/src/test/java/io/reactivex/rxjava4/validators/CheckMaybeForSinceTagsTest.java index b87370bcf4..e746c85d69 100644 --- a/src/test/java/io/reactivex/rxjava4/validators/CheckMaybeForSinceTagsTest.java +++ b/src/test/java/io/reactivex/rxjava4/validators/CheckMaybeForSinceTagsTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.validators; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.*; -import io.reactivex.rxjava4.core.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.testsupport.TestHelper; /** diff --git a/src/test/java/io/reactivex/rxjava4/validators/CheckNewLinesBeforeAnnotationTest.java b/src/test/java/io/reactivex/rxjava4/validators/CheckNewLinesBeforeAnnotationTest.java index e199d297bd..7d9d8bd6c8 100644 --- a/src/test/java/io/reactivex/rxjava4/validators/CheckNewLinesBeforeAnnotationTest.java +++ b/src/test/java/io/reactivex/rxjava4/validators/CheckNewLinesBeforeAnnotationTest.java @@ -16,9 +16,9 @@ import java.io.*; import java.util.*; -import io.reactivex.rxjava4.core.RxJavaTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.testsupport.TestHelper; /** @@ -140,6 +140,14 @@ static void findPattern(int newLines) throws Exception { .append("\\R"); } fail.append("\n"); + fail.append(" at ") + .append(fname.substring(0, fname.indexOf('.'))) + .append(".method(") + .append(fname) + .append(":") + .append(i + 1) + .append(")\r\n") + ; total++; } } diff --git a/src/test/java/io/reactivex/rxjava4/validators/CheckNoAnonymousInnerClassesTest.java b/src/test/java/io/reactivex/rxjava4/validators/CheckNoAnonymousInnerClassesTest.java index 03c0415e89..437ae38836 100644 --- a/src/test/java/io/reactivex/rxjava4/validators/CheckNoAnonymousInnerClassesTest.java +++ b/src/test/java/io/reactivex/rxjava4/validators/CheckNoAnonymousInnerClassesTest.java @@ -18,8 +18,9 @@ import java.nio.charset.StandardCharsets; import java.util.*; +import org.junit.jupiter.api.Test; + import io.reactivex.rxjava4.core.RxJavaTest; -import org.junit.Test; public class CheckNoAnonymousInnerClassesTest extends RxJavaTest { diff --git a/src/test/java/io/reactivex/rxjava4/validators/CheckNonNullMethodTypeArgumentTest.java b/src/test/java/io/reactivex/rxjava4/validators/CheckNonNullMethodTypeArgumentTest.java index 9f99bff71a..68d762e04c 100644 --- a/src/test/java/io/reactivex/rxjava4/validators/CheckNonNullMethodTypeArgumentTest.java +++ b/src/test/java/io/reactivex/rxjava4/validators/CheckNonNullMethodTypeArgumentTest.java @@ -13,13 +13,13 @@ package io.reactivex.rxjava4.validators; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.*; import java.nio.file.Files; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; diff --git a/src/test/java/io/reactivex/rxjava4/validators/CheckOperatorsAreFinalTest.java b/src/test/java/io/reactivex/rxjava4/validators/CheckOperatorsAreFinalTest.java index ca20c38b18..052b22b419 100644 --- a/src/test/java/io/reactivex/rxjava4/validators/CheckOperatorsAreFinalTest.java +++ b/src/test/java/io/reactivex/rxjava4/validators/CheckOperatorsAreFinalTest.java @@ -16,9 +16,9 @@ import java.io.File; import java.lang.reflect.Modifier; -import io.reactivex.rxjava4.core.RxJavaTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.testsupport.TestHelper; public class CheckOperatorsAreFinalTest extends RxJavaTest { diff --git a/src/test/java/io/reactivex/rxjava4/validators/CheckOperatorsUseInterfacesTest.java b/src/test/java/io/reactivex/rxjava4/validators/CheckOperatorsUseInterfacesTest.java index 8171c66b73..4d184e1d37 100644 --- a/src/test/java/io/reactivex/rxjava4/validators/CheckOperatorsUseInterfacesTest.java +++ b/src/test/java/io/reactivex/rxjava4/validators/CheckOperatorsUseInterfacesTest.java @@ -13,14 +13,14 @@ package io.reactivex.rxjava4.validators; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.lang.reflect.*; import java.util.*; import java.util.concurrent.Callable; +import java.util.concurrent.Flow.Publisher; -import org.junit.Test; -import static java.util.concurrent.Flow.*; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; @@ -179,12 +179,12 @@ public void checkSelf() { checkClass(CheckOperatorsUseInterfacesTest.class); throw new RuntimeException("Should have failed"); } catch (AssertionError expected) { - assertTrue(expected.toString(), expected.toString().contains("method1")); - assertTrue(expected.toString(), expected.toString().contains("method2")); - assertTrue(expected.toString(), expected.toString().contains("method3")); - assertTrue(expected.toString(), expected.toString().contains("method4")); - assertTrue(expected.toString(), expected.toString().contains("method5")); - assertTrue(expected.toString(), expected.toString().contains("method6")); + assertTrue(expected.toString().contains("method1"), expected.toString()); + assertTrue(expected.toString().contains("method2"), expected.toString()); + assertTrue(expected.toString().contains("method3"), expected.toString()); + assertTrue(expected.toString().contains("method4"), expected.toString()); + assertTrue(expected.toString().contains("method5"), expected.toString()); + assertTrue(expected.toString().contains("method6"), expected.toString()); } } diff --git a/src/test/java/io/reactivex/rxjava4/validators/CheckParamValidationNamingTest.java b/src/test/java/io/reactivex/rxjava4/validators/CheckParamValidationNamingTest.java index d8df2a8007..05f8c5183f 100644 --- a/src/test/java/io/reactivex/rxjava4/validators/CheckParamValidationNamingTest.java +++ b/src/test/java/io/reactivex/rxjava4/validators/CheckParamValidationNamingTest.java @@ -17,7 +17,7 @@ import java.nio.file.Files; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; diff --git a/src/test/java/io/reactivex/rxjava4/validators/CheckParamValidationTest.java b/src/test/java/io/reactivex/rxjava4/validators/CheckParamValidationTest.java index 5b81f7a248..f98f4af3ca 100644 --- a/src/test/java/io/reactivex/rxjava4/validators/CheckParamValidationTest.java +++ b/src/test/java/io/reactivex/rxjava4/validators/CheckParamValidationTest.java @@ -20,7 +20,7 @@ import java.util.concurrent.Flow.*; import java.util.stream.*; -import org.junit.Test; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; @@ -41,32 +41,32 @@ */ public class CheckParamValidationTest extends RxJavaTest { - @Test(timeout = 30000) + @Test @Timeout(value = 30000, unit = TimeUnit.MILLISECONDS) public void checkFlowable() { checkClass(Flowable.class); } - @Test(timeout = 30000) + @Test @Timeout(value = 30000, unit = TimeUnit.MILLISECONDS) public void checkObservable() { checkClass(Observable.class); } - @Test(timeout = 30000) + @Test @Timeout(value = 30000, unit = TimeUnit.MILLISECONDS) public void checkSingle() { checkClass(Single.class); } - @Test(timeout = 30000) + @Test @Timeout(value = 30000, unit = TimeUnit.MILLISECONDS) public void checkMaybe() { checkClass(Maybe.class); } - @Test(timeout = 30000) + @Test @Timeout(value = 30000, unit = TimeUnit.MILLISECONDS) public void checkCompletable() { checkClass(Completable.class); } - @Test(timeout = 30000) + @Test @Timeout(value = 30000, unit = TimeUnit.MILLISECONDS) public void checkParallelFlowable() { checkClass(ParallelFlowable.class); } diff --git a/src/test/java/io/reactivex/rxjava4/validators/CheckParameterNamesInClassesTest.java b/src/test/java/io/reactivex/rxjava4/validators/CheckParameterNamesInClassesTest.java index 0a174d86a1..b155751097 100644 --- a/src/test/java/io/reactivex/rxjava4/validators/CheckParameterNamesInClassesTest.java +++ b/src/test/java/io/reactivex/rxjava4/validators/CheckParameterNamesInClassesTest.java @@ -13,10 +13,11 @@ package io.reactivex.rxjava4.validators; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.RxJavaTest; -import org.junit.Test; public class CheckParameterNamesInClassesTest extends RxJavaTest { @@ -27,10 +28,11 @@ void method(int paramName) { @Test public void javacParametersEnabled() throws Exception { - assertEquals("Please enable saving parameter names via the -parameters javac argument", + assertEquals( "paramName", getClass() .getDeclaredMethod("method", Integer.TYPE) - .getParameters()[0].getName()); + .getParameters()[0].getName(), + "Please enable saving parameter names via the -parameters javac argument"); } } diff --git a/src/test/java/io/reactivex/rxjava4/validators/CheckPublicFinalMethodsTest.java b/src/test/java/io/reactivex/rxjava4/validators/CheckPublicFinalMethodsTest.java index ed6196037a..043dcc2591 100644 --- a/src/test/java/io/reactivex/rxjava4/validators/CheckPublicFinalMethodsTest.java +++ b/src/test/java/io/reactivex/rxjava4/validators/CheckPublicFinalMethodsTest.java @@ -13,11 +13,11 @@ package io.reactivex.rxjava4.validators; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.lang.reflect.*; -import org.junit.*; +import org.junit.jupiter.api.*; import io.reactivex.rxjava4.core.*; @@ -64,7 +64,7 @@ public void maybe() { } @Test - @Ignore("Interfaces and defaults not yet handled, TODO") + @Disabled("Interfaces and defaults not yet handled, TODO") public void streamable() { scan(Streamable.class); } diff --git a/src/test/java/io/reactivex/rxjava4/validators/CheckSourceAnnotationTest.java b/src/test/java/io/reactivex/rxjava4/validators/CheckSourceAnnotationTest.java index 28881b971f..1206f78cf0 100644 --- a/src/test/java/io/reactivex/rxjava4/validators/CheckSourceAnnotationTest.java +++ b/src/test/java/io/reactivex/rxjava4/validators/CheckSourceAnnotationTest.java @@ -17,7 +17,7 @@ import java.nio.file.Files; import java.util.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; import io.reactivex.rxjava4.core.*; import io.reactivex.rxjava4.core.Observable; diff --git a/src/test/java/io/reactivex/rxjava4/validators/CheckTestPrefixInMethodNameTest.java b/src/test/java/io/reactivex/rxjava4/validators/CheckTestPrefixInMethodNameTest.java index 833f3df96f..793daf2730 100644 --- a/src/test/java/io/reactivex/rxjava4/validators/CheckTestPrefixInMethodNameTest.java +++ b/src/test/java/io/reactivex/rxjava4/validators/CheckTestPrefixInMethodNameTest.java @@ -17,9 +17,9 @@ import java.util.*; import java.util.regex.*; -import io.reactivex.rxjava4.core.RxJavaTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.testsupport.TestHelper; /** @@ -82,7 +82,15 @@ public void checkAndUpdateTestMethodNames() throws Exception { .append(fileName) .append("#L").append(lineNum) .append(" ").append(line) - .append("\n"); + .append("\n") + .append(" at ") + .append(fileName.substring(0, fileName.indexOf('.'))) + .append(".method(") + .append(fileName) + .append(':') + .append(lineNum) + .append(")\n") + ; total++; } } diff --git a/src/test/java/io/reactivex/rxjava4/validators/CheckTextualAorAnTest.java b/src/test/java/io/reactivex/rxjava4/validators/CheckTextualAorAnTest.java index 7a3e9b7ebd..e245010db1 100644 --- a/src/test/java/io/reactivex/rxjava4/validators/CheckTextualAorAnTest.java +++ b/src/test/java/io/reactivex/rxjava4/validators/CheckTextualAorAnTest.java @@ -16,9 +16,9 @@ import java.io.*; import java.util.*; -import io.reactivex.rxjava4.core.RxJavaTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.testsupport.TestHelper; /** diff --git a/src/test/java/io/reactivex/rxjava4/validators/CheckTooManyEmptyNewLinesTest.java b/src/test/java/io/reactivex/rxjava4/validators/CheckTooManyEmptyNewLinesTest.java index ec9e712a97..f70a76e689 100644 --- a/src/test/java/io/reactivex/rxjava4/validators/CheckTooManyEmptyNewLinesTest.java +++ b/src/test/java/io/reactivex/rxjava4/validators/CheckTooManyEmptyNewLinesTest.java @@ -16,9 +16,9 @@ import java.io.*; import java.util.*; -import io.reactivex.rxjava4.core.RxJavaTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import io.reactivex.rxjava4.core.RxJavaTest; import io.reactivex.rxjava4.testsupport.TestHelper; /**