From f6a54e7ec9a11e04b43c3f5bf41b586d4c260168 Mon Sep 17 00:00:00 2001 From: RomanWuattier Date: Sat, 27 Jul 2019 23:09:53 +0200 Subject: [PATCH] Have unit tests extends `RxJavaTest` - 3 This commit updates the unit tests of the following operators: * single * subjects * subscribers And for internal operators: * internal.disposable * internal.fuctions * internal.observers * internal.queue * interanl.schedulers * internal.subscribers * internal.subscriptions * internal.operator.completable Related: #6583 --- .../io/reactivex/BackpressureEnumTest.java | 2 +- src/test/java/io/reactivex/ConverterTest.java | 2 +- .../java/io/reactivex/NotificationTest.java | 2 +- .../java/io/reactivex/TransformerTest.java | 2 +- src/test/java/io/reactivex/XFlatMapTest.java | 2 +- .../reactivex/internal/SubscribeWithTest.java | 2 +- .../ArrayCompositeDisposableTest.java | 3 +- .../CancellableDisposableTest.java | 3 +- .../disposables/DisposableHelperTest.java | 3 +- .../disposables/EmptyDisposableTest.java | 3 +- .../ListCompositeDisposableTest.java | 3 +- .../internal/functions/FunctionsTest.java | 3 +- .../internal/functions/ObjectHelperTest.java | 3 +- .../observers/BasicFuseableObserverTest.java | 3 +- .../observers/BasicQueueDisposableTest.java | 3 +- .../observers/BlockingFirstObserverTest.java | 3 +- .../observers/BlockingMultiObserverTest.java | 3 +- .../observers/BlockingObserverTest.java | 3 +- .../CallbackCompletableObserverTest.java | 3 +- .../observers/ConsumerSingleObserverTest.java | 3 +- .../observers/DeferredScalarObserverTest.java | 3 +- .../DisposableLambdaObserverTest.java | 3 +- .../EmptyCompletableObserverTest.java | 3 +- .../observers/FutureObserverTest.java | 3 +- .../observers/FutureSingleObserverTest.java | 2 +- .../observers/LambdaObserverTest.java | 3 +- .../observers/QueueDrainObserverTest.java | 2 +- .../completable/CompletableAmbTest.java | 2 +- .../CompletableAndThenCompletableabTest.java | 2 +- .../completable/CompletableAndThenTest.java | 2 +- .../completable/CompletableAwaitTest.java | 3 +- .../completable/CompletableCacheTest.java | 2 +- .../completable/CompletableConcatTest.java | 2 +- .../completable/CompletableCreateTest.java | 2 +- .../CompletableDelaySubscriptionTest.java | 3 +- .../completable/CompletableDelayTest.java | 2 +- .../completable/CompletableDetachTest.java | 2 +- .../completable/CompletableDisposeOnTest.java | 2 +- .../completable/CompletableDoFinallyTest.java | 2 +- .../completable/CompletableDoOnTest.java | 2 +- .../CompletableFromActionTest.java | 3 +- .../CompletableFromCallableTest.java | 2 +- .../completable/CompletableFromMaybeTest.java | 3 +- .../CompletableFromObservableTest.java | 3 +- .../CompletableFromPublisherTest.java | 2 +- .../CompletableFromRunnableTest.java | 3 +- .../CompletableFromSingleTest.java | 3 +- .../CompletableFromSupplierTest.java | 2 +- .../completable/CompletableHideTest.java | 2 +- .../completable/CompletableLiftTest.java | 2 +- .../CompletableMaterializeTest.java | 2 +- .../CompletableMergeIterableTest.java | 2 +- .../completable/CompletableMergeTest.java | 2 +- .../completable/CompletableObserveOnTest.java | 2 +- .../completable/CompletableOnErrorXTest.java | 2 +- .../completable/CompletablePeekTest.java | 2 +- .../CompletableRepeatWhenTest.java | 2 +- .../CompletableResumeNextTest.java | 2 +- .../CompletableSubscribeOnTest.java | 2 +- .../completable/CompletableSubscribeTest.java | 4 +- .../completable/CompletableTakeUntilTest.java | 2 +- .../completable/CompletableTimeoutTest.java | 3 +- .../completable/CompletableTimerTest.java | 2 +- .../CompletableToFlowableTest.java | 2 +- .../CompletableToObservableTest.java | 2 +- .../completable/CompletableUnsafeTest.java | 2 +- .../completable/CompletableUsingTest.java | 2 +- .../internal/queue/SimpleQueueTest.java | 3 +- .../schedulers/AbstractDirectTaskTest.java | 3 +- .../ComputationSchedulerInternalTest.java | 4 +- .../schedulers/DisposeOnCancelTest.java | 3 +- .../ExecutorSchedulerDelayedRunnableTest.java | 3 +- .../ImmediateThinSchedulerTest.java | 3 +- .../schedulers/InstantPeriodicTaskTest.java | 3 +- .../schedulers/RxThreadFactoryTest.java | 4 +- .../ScheduledDirectPeriodicTaskTest.java | 3 +- .../schedulers/ScheduledRunnableTest.java | 3 +- .../SchedulerMultiWorkerSupportTest.java | 3 +- .../schedulers/SchedulerPoolFactoryTest.java | 3 +- .../schedulers/SchedulerWhenTest.java | 4 +- .../schedulers/SingleSchedulerTest.java | 6 +- .../TrampolineSchedulerInternalTest.java | 5 +- ...asicFuseableConditionalSubscriberTest.java | 3 +- .../BasicFuseableSubscriberTest.java | 3 +- .../subscribers/BlockingSubscriberTest.java | 7 +- .../subscribers/BoundedSubscriberTest.java | 3 +- .../DeferredScalarSubscriberTest.java | 2 +- .../subscribers/EmptyComponentTest.java | 3 +- .../subscribers/FutureSubscriberTest.java | 3 +- .../InnerQueuedSubscriberTest.java | 4 +- .../subscribers/LambdaSubscriberTest.java | 2 +- .../subscribers/QueueDrainSubscriberTest.java | 3 +- .../SinglePostCompleteSubscriberTest.java | 3 +- .../subscribers/StrictSubscriberTest.java | 3 +- .../SubscriberResourceWrapperTest.java | 2 +- .../ArrayCompositeSubscriptionTest.java | 3 +- .../subscriptions/AsyncSubscriptionTest.java | 3 +- .../DeferredScalarSubscriptionTest.java | 3 +- .../subscriptions/QueueSubscriptionTest.java | 3 +- .../subscriptions/ScalarSubscriptionTest.java | 3 +- .../SubscriptionArbiterTest.java | 3 +- .../subscriptions/SubscriptionHelperTest.java | 3 +- .../internal/util/AtomicThrowableTest.java | 3 +- .../internal/util/BackpressureHelperTest.java | 4 +- .../internal/util/BlockingHelperTest.java | 3 +- .../internal/util/EndConsumerHelperTest.java | 2 +- .../internal/util/ExceptionHelperTest.java | 3 +- .../util/HalfSerializerObserverTest.java | 3 +- .../util/HalfSerializerSubscriberTest.java | 3 +- .../internal/util/MergerBiFunctionTest.java | 3 +- .../reactivex/internal/util/MiscUtilTest.java | 3 +- .../internal/util/NotificationLiteTest.java | 3 +- .../internal/util/OpenHashSetTest.java | 4 +- .../internal/util/QueueDrainHelperTest.java | 3 +- .../util/VolatileSizeArrayListTest.java | 3 +- .../schedulers/AbstractSchedulerTests.java | 16 +- .../io/reactivex/single/SingleCacheTest.java | 3 +- .../io/reactivex/single/SingleNullTests.java | 2 +- .../io/reactivex/single/SingleRetryTest.java | 3 +- .../reactivex/single/SingleSubscribeTest.java | 2 +- .../java/io/reactivex/single/SingleTest.java | 6 +- .../io/reactivex/single/SingleTimerTest.java | 3 +- .../reactivex/subjects/AsyncSubjectTest.java | 64 +--- .../subjects/BehaviorSubjectTest.java | 48 +-- .../subjects/CompletableSubjectTest.java | 2 +- .../reactivex/subjects/MaybeSubjectTest.java | 2 +- .../subjects/PublishSubjectTest.java | 69 +--- .../ReplaySubjectBoundedConcurrencyTest.java | 12 +- .../ReplaySubjectConcurrencyTest.java | 8 +- .../reactivex/subjects/ReplaySubjectTest.java | 50 +-- .../subjects/SerializedSubjectTest.java | 3 +- .../reactivex/subjects/SingleSubjectTest.java | 2 +- .../io/reactivex/subjects/SubjectTest.java | 3 +- .../subscribers/DefaultSubscriberTest.java | 3 +- .../subscribers/DisposableSubscriberTest.java | 2 +- .../subscribers/ResourceSubscriberTest.java | 2 +- .../subscribers/SafeSubscriberTest.java | 277 +--------------- .../SafeSubscriberWithPluginTest.java | 301 ------------------ .../subscribers/SerializedSubscriberTest.java | 124 +------- .../subscribers/TestSubscriberTest.java | 8 +- .../testsupport/TestObserverExTest.java | 5 +- .../testsupport/TestSubscriberExTest.java | 8 +- 142 files changed, 256 insertions(+), 1090 deletions(-) delete mode 100644 src/test/java/io/reactivex/subscribers/SafeSubscriberWithPluginTest.java diff --git a/src/test/java/io/reactivex/BackpressureEnumTest.java b/src/test/java/io/reactivex/BackpressureEnumTest.java index 785efce18a..ca8c58475e 100644 --- a/src/test/java/io/reactivex/BackpressureEnumTest.java +++ b/src/test/java/io/reactivex/BackpressureEnumTest.java @@ -21,7 +21,7 @@ import io.reactivex.annotations.BackpressureKind; -public class BackpressureEnumTest { +public class BackpressureEnumTest extends RxJavaTest { @Test public void backpressureOverflowStrategy() { diff --git a/src/test/java/io/reactivex/ConverterTest.java b/src/test/java/io/reactivex/ConverterTest.java index 16810e47c0..d2a77cc36c 100644 --- a/src/test/java/io/reactivex/ConverterTest.java +++ b/src/test/java/io/reactivex/ConverterTest.java @@ -20,7 +20,7 @@ import io.reactivex.exceptions.TestException; import io.reactivex.parallel.*; -public final class ConverterTest { +public final class ConverterTest extends RxJavaTest { @Test public void flowableConverterThrows() { diff --git a/src/test/java/io/reactivex/NotificationTest.java b/src/test/java/io/reactivex/NotificationTest.java index 504c0425bc..3ee7d488b9 100644 --- a/src/test/java/io/reactivex/NotificationTest.java +++ b/src/test/java/io/reactivex/NotificationTest.java @@ -19,7 +19,7 @@ import io.reactivex.exceptions.TestException; -public class NotificationTest { +public class NotificationTest extends RxJavaTest { @Test public void valueOfOnErrorIsNull() { diff --git a/src/test/java/io/reactivex/TransformerTest.java b/src/test/java/io/reactivex/TransformerTest.java index a3c7fc8d2c..0c388be535 100644 --- a/src/test/java/io/reactivex/TransformerTest.java +++ b/src/test/java/io/reactivex/TransformerTest.java @@ -19,7 +19,7 @@ import static org.junit.Assert.*; -public class TransformerTest { +public class TransformerTest extends RxJavaTest { @Test public void flowableTransformerThrows() { diff --git a/src/test/java/io/reactivex/XFlatMapTest.java b/src/test/java/io/reactivex/XFlatMapTest.java index 03a0fb4712..811e4590ad 100644 --- a/src/test/java/io/reactivex/XFlatMapTest.java +++ b/src/test/java/io/reactivex/XFlatMapTest.java @@ -29,7 +29,7 @@ import io.reactivex.subscribers.TestSubscriber; import io.reactivex.testsupport.TestHelper; -public class XFlatMapTest { +public class XFlatMapTest extends RxJavaTest { @Rule public Retry retry = new Retry(5, 1000, true); diff --git a/src/test/java/io/reactivex/internal/SubscribeWithTest.java b/src/test/java/io/reactivex/internal/SubscribeWithTest.java index 942762009c..6d53bc2dfa 100644 --- a/src/test/java/io/reactivex/internal/SubscribeWithTest.java +++ b/src/test/java/io/reactivex/internal/SubscribeWithTest.java @@ -21,7 +21,7 @@ import io.reactivex.observers.TestObserver; import io.reactivex.subscribers.TestSubscriber; -public class SubscribeWithTest { +public class SubscribeWithTest extends RxJavaTest { @Test public void withFlowable() { diff --git a/src/test/java/io/reactivex/internal/disposables/ArrayCompositeDisposableTest.java b/src/test/java/io/reactivex/internal/disposables/ArrayCompositeDisposableTest.java index fcd2b59d86..dec35cd142 100644 --- a/src/test/java/io/reactivex/internal/disposables/ArrayCompositeDisposableTest.java +++ b/src/test/java/io/reactivex/internal/disposables/ArrayCompositeDisposableTest.java @@ -15,12 +15,13 @@ import static org.junit.Assert.*; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.disposables.*; import io.reactivex.testsupport.TestHelper; -public class ArrayCompositeDisposableTest { +public class ArrayCompositeDisposableTest extends RxJavaTest { @Test public void normal() { diff --git a/src/test/java/io/reactivex/internal/disposables/CancellableDisposableTest.java b/src/test/java/io/reactivex/internal/disposables/CancellableDisposableTest.java index face72ed53..b1ee91966d 100644 --- a/src/test/java/io/reactivex/internal/disposables/CancellableDisposableTest.java +++ b/src/test/java/io/reactivex/internal/disposables/CancellableDisposableTest.java @@ -18,6 +18,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.exceptions.TestException; @@ -25,7 +26,7 @@ import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.TestHelper; -public class CancellableDisposableTest { +public class CancellableDisposableTest extends RxJavaTest { @Test public void normal() { diff --git a/src/test/java/io/reactivex/internal/disposables/DisposableHelperTest.java b/src/test/java/io/reactivex/internal/disposables/DisposableHelperTest.java index 8f25db16ae..948eaa8440 100644 --- a/src/test/java/io/reactivex/internal/disposables/DisposableHelperTest.java +++ b/src/test/java/io/reactivex/internal/disposables/DisposableHelperTest.java @@ -18,13 +18,14 @@ import java.util.List; import java.util.concurrent.atomic.AtomicReference; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.disposables.*; import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.TestHelper; -public class DisposableHelperTest { +public class DisposableHelperTest extends RxJavaTest { @Test public void enumMethods() { assertEquals(1, DisposableHelper.values().length); diff --git a/src/test/java/io/reactivex/internal/disposables/EmptyDisposableTest.java b/src/test/java/io/reactivex/internal/disposables/EmptyDisposableTest.java index 6b1daf47f7..7c50e030aa 100644 --- a/src/test/java/io/reactivex/internal/disposables/EmptyDisposableTest.java +++ b/src/test/java/io/reactivex/internal/disposables/EmptyDisposableTest.java @@ -15,12 +15,13 @@ import static org.junit.Assert.*; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.internal.fuseable.*; import io.reactivex.testsupport.TestHelper; -public class EmptyDisposableTest { +public class EmptyDisposableTest extends RxJavaTest { @Test public void noOffer() { diff --git a/src/test/java/io/reactivex/internal/disposables/ListCompositeDisposableTest.java b/src/test/java/io/reactivex/internal/disposables/ListCompositeDisposableTest.java index e83dcb7ef2..849d0874f1 100644 --- a/src/test/java/io/reactivex/internal/disposables/ListCompositeDisposableTest.java +++ b/src/test/java/io/reactivex/internal/disposables/ListCompositeDisposableTest.java @@ -17,13 +17,14 @@ import java.util.*; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.disposables.*; import io.reactivex.exceptions.*; import io.reactivex.testsupport.TestHelper; -public class ListCompositeDisposableTest { +public class ListCompositeDisposableTest extends RxJavaTest { @Test public void constructorAndAddVarargs() { diff --git a/src/test/java/io/reactivex/internal/functions/FunctionsTest.java b/src/test/java/io/reactivex/internal/functions/FunctionsTest.java index 6f3213566e..9c278666c7 100644 --- a/src/test/java/io/reactivex/internal/functions/FunctionsTest.java +++ b/src/test/java/io/reactivex/internal/functions/FunctionsTest.java @@ -18,6 +18,7 @@ import java.lang.reflect.Method; import java.util.List; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.exceptions.TestException; @@ -27,7 +28,7 @@ import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.TestHelper; -public class FunctionsTest { +public class FunctionsTest extends RxJavaTest { @Test public void utilityClass() { TestHelper.checkUtilityClass(Functions.class); diff --git a/src/test/java/io/reactivex/internal/functions/ObjectHelperTest.java b/src/test/java/io/reactivex/internal/functions/ObjectHelperTest.java index da5f576913..89ef9f27c0 100644 --- a/src/test/java/io/reactivex/internal/functions/ObjectHelperTest.java +++ b/src/test/java/io/reactivex/internal/functions/ObjectHelperTest.java @@ -13,13 +13,14 @@ package io.reactivex.internal.functions; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.testsupport.TestHelper; import static org.junit.Assert.*; -public class ObjectHelperTest { +public class ObjectHelperTest extends RxJavaTest { @Test public void utilityClass() { diff --git a/src/test/java/io/reactivex/internal/observers/BasicFuseableObserverTest.java b/src/test/java/io/reactivex/internal/observers/BasicFuseableObserverTest.java index eba4babcfa..8b02f4d15e 100644 --- a/src/test/java/io/reactivex/internal/observers/BasicFuseableObserverTest.java +++ b/src/test/java/io/reactivex/internal/observers/BasicFuseableObserverTest.java @@ -13,6 +13,7 @@ package io.reactivex.internal.observers; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.annotations.Nullable; @@ -20,7 +21,7 @@ import io.reactivex.observers.TestObserver; import io.reactivex.testsupport.TestObserverEx; -public class BasicFuseableObserverTest { +public class BasicFuseableObserverTest extends RxJavaTest { @Test(expected = UnsupportedOperationException.class) public void offer() { diff --git a/src/test/java/io/reactivex/internal/observers/BasicQueueDisposableTest.java b/src/test/java/io/reactivex/internal/observers/BasicQueueDisposableTest.java index c98b080ae4..1b56ee3d31 100644 --- a/src/test/java/io/reactivex/internal/observers/BasicQueueDisposableTest.java +++ b/src/test/java/io/reactivex/internal/observers/BasicQueueDisposableTest.java @@ -13,10 +13,11 @@ package io.reactivex.internal.observers; +import io.reactivex.RxJavaTest; import io.reactivex.annotations.Nullable; import org.junit.Test; -public class BasicQueueDisposableTest { +public class BasicQueueDisposableTest extends RxJavaTest { BasicQueueDisposable q = new BasicQueueDisposable() { diff --git a/src/test/java/io/reactivex/internal/observers/BlockingFirstObserverTest.java b/src/test/java/io/reactivex/internal/observers/BlockingFirstObserverTest.java index 6f69e1fd73..5cc644ba55 100644 --- a/src/test/java/io/reactivex/internal/observers/BlockingFirstObserverTest.java +++ b/src/test/java/io/reactivex/internal/observers/BlockingFirstObserverTest.java @@ -15,12 +15,13 @@ import static org.junit.Assert.*; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.disposables.*; import io.reactivex.exceptions.TestException; -public class BlockingFirstObserverTest { +public class BlockingFirstObserverTest extends RxJavaTest { @Test public void firstValueOnly() { diff --git a/src/test/java/io/reactivex/internal/observers/BlockingMultiObserverTest.java b/src/test/java/io/reactivex/internal/observers/BlockingMultiObserverTest.java index 2e486fe67a..438bcb0d6d 100644 --- a/src/test/java/io/reactivex/internal/observers/BlockingMultiObserverTest.java +++ b/src/test/java/io/reactivex/internal/observers/BlockingMultiObserverTest.java @@ -17,12 +17,13 @@ import java.util.concurrent.TimeUnit; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.disposables.*; import io.reactivex.schedulers.Schedulers; -public class BlockingMultiObserverTest { +public class BlockingMultiObserverTest extends RxJavaTest { @Test public void dispose() { diff --git a/src/test/java/io/reactivex/internal/observers/BlockingObserverTest.java b/src/test/java/io/reactivex/internal/observers/BlockingObserverTest.java index 72f2ab6bd6..fba743e053 100644 --- a/src/test/java/io/reactivex/internal/observers/BlockingObserverTest.java +++ b/src/test/java/io/reactivex/internal/observers/BlockingObserverTest.java @@ -17,9 +17,10 @@ import java.util.*; +import io.reactivex.RxJavaTest; import org.junit.Test; -public class BlockingObserverTest { +public class BlockingObserverTest extends RxJavaTest { @Test public void dispose() { diff --git a/src/test/java/io/reactivex/internal/observers/CallbackCompletableObserverTest.java b/src/test/java/io/reactivex/internal/observers/CallbackCompletableObserverTest.java index 10b59b35d2..f5a2228607 100644 --- a/src/test/java/io/reactivex/internal/observers/CallbackCompletableObserverTest.java +++ b/src/test/java/io/reactivex/internal/observers/CallbackCompletableObserverTest.java @@ -13,12 +13,13 @@ package io.reactivex.internal.observers; +import io.reactivex.RxJavaTest; import io.reactivex.internal.functions.Functions; import org.junit.Test; import static org.junit.Assert.*; -public final class CallbackCompletableObserverTest { +public final class CallbackCompletableObserverTest extends RxJavaTest { @Test public void emptyActionShouldReportNoCustomOnError() { diff --git a/src/test/java/io/reactivex/internal/observers/ConsumerSingleObserverTest.java b/src/test/java/io/reactivex/internal/observers/ConsumerSingleObserverTest.java index 5499bf3243..5a8f82093d 100644 --- a/src/test/java/io/reactivex/internal/observers/ConsumerSingleObserverTest.java +++ b/src/test/java/io/reactivex/internal/observers/ConsumerSingleObserverTest.java @@ -13,12 +13,13 @@ package io.reactivex.internal.observers; +import io.reactivex.RxJavaTest; import io.reactivex.internal.functions.Functions; import org.junit.Test; import static org.junit.Assert.*; -public final class ConsumerSingleObserverTest { +public final class ConsumerSingleObserverTest extends RxJavaTest { @Test public void onErrorMissingShouldReportNoCustomOnError() { diff --git a/src/test/java/io/reactivex/internal/observers/DeferredScalarObserverTest.java b/src/test/java/io/reactivex/internal/observers/DeferredScalarObserverTest.java index a92271ee2f..6bdacd6334 100644 --- a/src/test/java/io/reactivex/internal/observers/DeferredScalarObserverTest.java +++ b/src/test/java/io/reactivex/internal/observers/DeferredScalarObserverTest.java @@ -17,6 +17,7 @@ import java.util.List; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Observer; @@ -27,7 +28,7 @@ import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.*; -public class DeferredScalarObserverTest { +public class DeferredScalarObserverTest extends RxJavaTest { static final class TakeFirst extends DeferredScalarObserver { diff --git a/src/test/java/io/reactivex/internal/observers/DisposableLambdaObserverTest.java b/src/test/java/io/reactivex/internal/observers/DisposableLambdaObserverTest.java index 49f0d10da2..35ac2f72b7 100644 --- a/src/test/java/io/reactivex/internal/observers/DisposableLambdaObserverTest.java +++ b/src/test/java/io/reactivex/internal/observers/DisposableLambdaObserverTest.java @@ -17,6 +17,7 @@ import java.util.List; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.disposables.Disposables; @@ -27,7 +28,7 @@ import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.TestHelper; -public class DisposableLambdaObserverTest { +public class DisposableLambdaObserverTest extends RxJavaTest { @Test public void doubleOnSubscribe() { diff --git a/src/test/java/io/reactivex/internal/observers/EmptyCompletableObserverTest.java b/src/test/java/io/reactivex/internal/observers/EmptyCompletableObserverTest.java index 9e9085c41e..7e91d16f7a 100644 --- a/src/test/java/io/reactivex/internal/observers/EmptyCompletableObserverTest.java +++ b/src/test/java/io/reactivex/internal/observers/EmptyCompletableObserverTest.java @@ -13,11 +13,12 @@ package io.reactivex.internal.observers; +import io.reactivex.RxJavaTest; import org.junit.Test; import static org.junit.Assert.assertFalse; -public final class EmptyCompletableObserverTest { +public final class EmptyCompletableObserverTest extends RxJavaTest { @Test public void defaultShouldReportNoCustomOnError() { diff --git a/src/test/java/io/reactivex/internal/observers/FutureObserverTest.java b/src/test/java/io/reactivex/internal/observers/FutureObserverTest.java index 761015a26d..fb1939ddd1 100644 --- a/src/test/java/io/reactivex/internal/observers/FutureObserverTest.java +++ b/src/test/java/io/reactivex/internal/observers/FutureObserverTest.java @@ -19,6 +19,7 @@ import java.util.*; import java.util.concurrent.*; +import io.reactivex.RxJavaTest; import org.junit.*; import io.reactivex.disposables.*; @@ -30,7 +31,7 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.TestHelper; -public class FutureObserverTest { +public class FutureObserverTest extends RxJavaTest { FutureObserver fo; @Before diff --git a/src/test/java/io/reactivex/internal/observers/FutureSingleObserverTest.java b/src/test/java/io/reactivex/internal/observers/FutureSingleObserverTest.java index 2e44b97cc5..be8d16f1e3 100644 --- a/src/test/java/io/reactivex/internal/observers/FutureSingleObserverTest.java +++ b/src/test/java/io/reactivex/internal/observers/FutureSingleObserverTest.java @@ -28,7 +28,7 @@ import io.reactivex.subjects.PublishSubject; import io.reactivex.testsupport.TestHelper; -public class FutureSingleObserverTest { +public class FutureSingleObserverTest extends RxJavaTest { @Test public void cancel() { diff --git a/src/test/java/io/reactivex/internal/observers/LambdaObserverTest.java b/src/test/java/io/reactivex/internal/observers/LambdaObserverTest.java index 69a272da5e..7e0bbe4c35 100644 --- a/src/test/java/io/reactivex/internal/observers/LambdaObserverTest.java +++ b/src/test/java/io/reactivex/internal/observers/LambdaObserverTest.java @@ -18,6 +18,7 @@ import java.io.IOException; import java.util.*; +import io.reactivex.RxJavaTest; import io.reactivex.internal.functions.Functions; import org.junit.Test; @@ -30,7 +31,7 @@ import io.reactivex.subjects.PublishSubject; import io.reactivex.testsupport.TestHelper; -public class LambdaObserverTest { +public class LambdaObserverTest extends RxJavaTest { @Test public void onSubscribeThrows() { diff --git a/src/test/java/io/reactivex/internal/observers/QueueDrainObserverTest.java b/src/test/java/io/reactivex/internal/observers/QueueDrainObserverTest.java index b12b84a6b5..a93c535430 100644 --- a/src/test/java/io/reactivex/internal/observers/QueueDrainObserverTest.java +++ b/src/test/java/io/reactivex/internal/observers/QueueDrainObserverTest.java @@ -21,7 +21,7 @@ import io.reactivex.observers.TestObserver; import io.reactivex.testsupport.TestHelper; -public class QueueDrainObserverTest { +public class QueueDrainObserverTest extends RxJavaTest { static final QueueDrainObserver createUnordered(TestObserver to, final Disposable d) { return new QueueDrainObserver(to, new SpscArrayQueue(4)) { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableAmbTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableAmbTest.java index 7d37862574..333b9e26c0 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableAmbTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableAmbTest.java @@ -34,7 +34,7 @@ import io.reactivex.subjects.*; import io.reactivex.testsupport.TestHelper; -public class CompletableAmbTest { +public class CompletableAmbTest extends RxJavaTest { @Test public void ambLots() { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableAndThenCompletableabTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableAndThenCompletableabTest.java index 956134c0da..c0179595b0 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableAndThenCompletableabTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableAndThenCompletableabTest.java @@ -27,7 +27,7 @@ import static org.junit.Assert.*; -public class CompletableAndThenCompletableabTest { +public class CompletableAndThenCompletableabTest extends RxJavaTest { @Test(expected = NullPointerException.class) public void andThenCompletableCompleteNull() { Completable.complete() diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableAndThenTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableAndThenTest.java index 228cf4d2c3..16120790f3 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableAndThenTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableAndThenTest.java @@ -18,7 +18,7 @@ import io.reactivex.*; import io.reactivex.testsupport.TestHelper; -public class CompletableAndThenTest { +public class CompletableAndThenTest extends RxJavaTest { @Test(expected = NullPointerException.class) public void andThenMaybeNull() { Completable.complete() diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableAwaitTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableAwaitTest.java index 1a80afbebd..2fe472dce0 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableAwaitTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableAwaitTest.java @@ -17,11 +17,12 @@ import java.util.concurrent.TimeUnit; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.processors.PublishProcessor; -public class CompletableAwaitTest { +public class CompletableAwaitTest extends RxJavaTest { @Test public void awaitInterrupted() { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableCacheTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableCacheTest.java index 95522e9bbf..f8d969a40c 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableCacheTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableCacheTest.java @@ -26,7 +26,7 @@ import io.reactivex.subjects.PublishSubject; import io.reactivex.testsupport.TestHelper; -public class CompletableCacheTest implements Consumer, Action { +public class CompletableCacheTest extends RxJavaTest implements Consumer, Action { volatile int count; diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableConcatTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableConcatTest.java index 6351988b15..a336aeec51 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableConcatTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableConcatTest.java @@ -32,7 +32,7 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.TestHelper; -public class CompletableConcatTest { +public class CompletableConcatTest extends RxJavaTest { @Test public void overflowReported() { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableCreateTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableCreateTest.java index 3ca72ec8f0..38eaebdd1b 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableCreateTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableCreateTest.java @@ -27,7 +27,7 @@ import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.TestHelper; -public class CompletableCreateTest { +public class CompletableCreateTest extends RxJavaTest { @Test(expected = NullPointerException.class) public void nullArgument() { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableDelaySubscriptionTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableDelaySubscriptionTest.java index 7148233f9d..210b83b43d 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableDelaySubscriptionTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableDelaySubscriptionTest.java @@ -18,6 +18,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Completable; @@ -27,7 +28,7 @@ import io.reactivex.schedulers.TestScheduler; import io.reactivex.subjects.CompletableSubject; -public class CompletableDelaySubscriptionTest { +public class CompletableDelaySubscriptionTest extends RxJavaTest { @Test public void normal() { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableDelayTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableDelayTest.java index 2200b6ecb9..5309af1fcb 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableDelayTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableDelayTest.java @@ -28,7 +28,7 @@ import io.reactivex.schedulers.TestScheduler; import io.reactivex.testsupport.TestHelper; -public class CompletableDelayTest { +public class CompletableDelayTest extends RxJavaTest { @Test public void delayCustomScheduler() { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableDetachTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableDetachTest.java index fd9cea35be..2a2c6646b6 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableDetachTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableDetachTest.java @@ -28,7 +28,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.TestHelper; -public class CompletableDetachTest { +public class CompletableDetachTest extends RxJavaTest { @Test public void doubleSubscribe() { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableDisposeOnTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableDisposeOnTest.java index c4ee5dd623..ebe5b708e9 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableDisposeOnTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableDisposeOnTest.java @@ -29,7 +29,7 @@ import io.reactivex.subjects.PublishSubject; import io.reactivex.testsupport.TestHelper; -public class CompletableDisposeOnTest { +public class CompletableDisposeOnTest extends RxJavaTest { @Test public void cancelDelayed() { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableDoFinallyTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableDoFinallyTest.java index 96d58a36d3..e362b1d812 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableDoFinallyTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableDoFinallyTest.java @@ -26,7 +26,7 @@ import io.reactivex.subjects.PublishSubject; import io.reactivex.testsupport.TestHelper; -public class CompletableDoFinallyTest implements Action { +public class CompletableDoFinallyTest extends RxJavaTest implements Action { int calls; diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableDoOnTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableDoOnTest.java index 86e955fc4f..59b8582a4a 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableDoOnTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableDoOnTest.java @@ -27,7 +27,7 @@ import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.*; -public class CompletableDoOnTest { +public class CompletableDoOnTest extends RxJavaTest { @Test public void successAcceptThrows() { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromActionTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableFromActionTest.java index 42b7025dcf..269ead502e 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromActionTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableFromActionTest.java @@ -17,13 +17,14 @@ import java.util.concurrent.atomic.AtomicInteger; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Completable; import io.reactivex.exceptions.TestException; import io.reactivex.functions.Action; -public class CompletableFromActionTest { +public class CompletableFromActionTest extends RxJavaTest { @Test(expected = NullPointerException.class) public void fromActionNull() { Completable.fromAction(null); diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromCallableTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableFromCallableTest.java index d700cc6b1c..87072652d1 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromCallableTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableFromCallableTest.java @@ -30,7 +30,7 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.TestHelper; -public class CompletableFromCallableTest { +public class CompletableFromCallableTest extends RxJavaTest { @Test(expected = NullPointerException.class) public void fromCallableNull() { Completable.fromCallable(null); diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromMaybeTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableFromMaybeTest.java index 46f62d0b7a..02d966af5a 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromMaybeTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableFromMaybeTest.java @@ -15,9 +15,10 @@ import io.reactivex.Completable; import io.reactivex.Maybe; +import io.reactivex.RxJavaTest; import org.junit.Test; -public class CompletableFromMaybeTest { +public class CompletableFromMaybeTest extends RxJavaTest { @Test(expected = NullPointerException.class) public void fromMaybeNull() { Completable.fromMaybe(null); diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromObservableTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableFromObservableTest.java index c593e1f4ca..255487c14d 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromObservableTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableFromObservableTest.java @@ -15,9 +15,10 @@ import io.reactivex.Completable; import io.reactivex.Observable; +import io.reactivex.RxJavaTest; import org.junit.Test; -public class CompletableFromObservableTest { +public class CompletableFromObservableTest extends RxJavaTest { @Test(expected = NullPointerException.class) public void fromObservableNull() { Completable.fromObservable(null); diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromPublisherTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableFromPublisherTest.java index 526bae5f74..0fffa272a8 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromPublisherTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableFromPublisherTest.java @@ -19,7 +19,7 @@ import io.reactivex.functions.Function; import io.reactivex.testsupport.TestHelper; -public class CompletableFromPublisherTest { +public class CompletableFromPublisherTest extends RxJavaTest { @Test(expected = NullPointerException.class) public void fromPublisherNull() { Completable.fromPublisher(null); diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromRunnableTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableFromRunnableTest.java index 849fd9a81b..dc930d74c7 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromRunnableTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableFromRunnableTest.java @@ -17,12 +17,13 @@ import java.util.concurrent.atomic.AtomicInteger; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Completable; import io.reactivex.exceptions.TestException; -public class CompletableFromRunnableTest { +public class CompletableFromRunnableTest extends RxJavaTest { @Test(expected = NullPointerException.class) public void fromRunnableNull() { Completable.fromRunnable(null); diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromSingleTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableFromSingleTest.java index f19fa3d964..ba8a4fabb7 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromSingleTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableFromSingleTest.java @@ -14,10 +14,11 @@ package io.reactivex.internal.operators.completable; import io.reactivex.Completable; +import io.reactivex.RxJavaTest; import io.reactivex.Single; import org.junit.Test; -public class CompletableFromSingleTest { +public class CompletableFromSingleTest extends RxJavaTest { @Test(expected = NullPointerException.class) public void fromSingleNull() { Completable.fromSingle(null); diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromSupplierTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableFromSupplierTest.java index 2fbe320f72..119ad643f0 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableFromSupplierTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableFromSupplierTest.java @@ -31,7 +31,7 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.TestHelper; -public class CompletableFromSupplierTest { +public class CompletableFromSupplierTest extends RxJavaTest { @Test(expected = NullPointerException.class) public void fromSupplierNull() { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableHideTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableHideTest.java index 4a04787c35..943f6a2464 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableHideTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableHideTest.java @@ -24,7 +24,7 @@ import static org.junit.Assert.assertFalse; -public class CompletableHideTest { +public class CompletableHideTest extends RxJavaTest { @Test public void never() { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableLiftTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableLiftTest.java index b5c7255041..5d1e434edd 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableLiftTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableLiftTest.java @@ -22,7 +22,7 @@ import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.TestHelper; -public class CompletableLiftTest { +public class CompletableLiftTest extends RxJavaTest { @Test public void callbackThrows() { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableMaterializeTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableMaterializeTest.java index f4f728adb5..06075c8809 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableMaterializeTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableMaterializeTest.java @@ -21,7 +21,7 @@ import io.reactivex.subjects.CompletableSubject; import io.reactivex.testsupport.TestHelper; -public class CompletableMaterializeTest { +public class CompletableMaterializeTest extends RxJavaTest { @Test @SuppressWarnings("unchecked") diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableMergeIterableTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableMergeIterableTest.java index c0fdec6a2b..3476a76f72 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableMergeIterableTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableMergeIterableTest.java @@ -24,7 +24,7 @@ import io.reactivex.subjects.PublishSubject; import io.reactivex.testsupport.TestHelper; -public class CompletableMergeIterableTest { +public class CompletableMergeIterableTest extends RxJavaTest { @Test public void errorRace() { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableMergeTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableMergeTest.java index 1331467bf1..54716b58ec 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableMergeTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableMergeTest.java @@ -30,7 +30,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.*; -public class CompletableMergeTest { +public class CompletableMergeTest extends RxJavaTest { @Test public void invalidPrefetch() { try { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableObserveOnTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableObserveOnTest.java index 45acb2464c..de0ffd9a6b 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableObserveOnTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableObserveOnTest.java @@ -20,7 +20,7 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.TestHelper; -public class CompletableObserveOnTest { +public class CompletableObserveOnTest extends RxJavaTest { @Test public void dispose() { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableOnErrorXTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableOnErrorXTest.java index ad6327b415..c740b0c2d8 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableOnErrorXTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableOnErrorXTest.java @@ -19,7 +19,7 @@ import io.reactivex.*; import io.reactivex.functions.Function; -public class CompletableOnErrorXTest { +public class CompletableOnErrorXTest extends RxJavaTest { @Test public void normalReturn() { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletablePeekTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletablePeekTest.java index a915e5a5ec..f3d146b856 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletablePeekTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletablePeekTest.java @@ -25,7 +25,7 @@ import io.reactivex.subjects.CompletableSubject; import io.reactivex.testsupport.TestHelper; -public class CompletablePeekTest { +public class CompletablePeekTest extends RxJavaTest { @Test public void onAfterTerminateCrashes() { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableRepeatWhenTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableRepeatWhenTest.java index 3de1c0d010..87c1465cfb 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableRepeatWhenTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableRepeatWhenTest.java @@ -20,7 +20,7 @@ import io.reactivex.*; import io.reactivex.functions.*; -public class CompletableRepeatWhenTest { +public class CompletableRepeatWhenTest extends RxJavaTest { @Test public void whenCounted() { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableResumeNextTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableResumeNextTest.java index b03423d2b8..8c1b5173c7 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableResumeNextTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableResumeNextTest.java @@ -21,7 +21,7 @@ import io.reactivex.internal.functions.Functions; import io.reactivex.testsupport.TestHelper; -public class CompletableResumeNextTest { +public class CompletableResumeNextTest extends RxJavaTest { @Test public void resumeWithError() { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableSubscribeOnTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableSubscribeOnTest.java index 9c18afbe17..f29df8b02c 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableSubscribeOnTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableSubscribeOnTest.java @@ -28,7 +28,7 @@ import io.reactivex.subjects.PublishSubject; import io.reactivex.testsupport.TestHelper; -public class CompletableSubscribeOnTest { +public class CompletableSubscribeOnTest extends RxJavaTest { @Test public void normal() { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableSubscribeTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableSubscribeTest.java index 4f546e548f..859dc7fc74 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableSubscribeTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableSubscribeTest.java @@ -14,12 +14,14 @@ package io.reactivex.internal.operators.completable; import static org.junit.Assert.*; + +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.processors.PublishProcessor; import io.reactivex.subjects.PublishSubject; -public class CompletableSubscribeTest { +public class CompletableSubscribeTest extends RxJavaTest { @Test public void subscribeAlreadyCancelled() { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableTakeUntilTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableTakeUntilTest.java index 1b90be2207..1ac2f733f0 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableTakeUntilTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableTakeUntilTest.java @@ -28,7 +28,7 @@ import io.reactivex.subjects.CompletableSubject; import io.reactivex.testsupport.TestHelper; -public class CompletableTakeUntilTest { +public class CompletableTakeUntilTest extends RxJavaTest { @Test public void consumerDisposes() { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableTimeoutTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableTimeoutTest.java index 094dd459bf..cf13103e45 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableTimeoutTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableTimeoutTest.java @@ -20,6 +20,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Completable; @@ -33,7 +34,7 @@ import io.reactivex.subjects.PublishSubject; import io.reactivex.testsupport.*; -public class CompletableTimeoutTest { +public class CompletableTimeoutTest extends RxJavaTest { @Test public void timeoutException() throws Exception { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableTimerTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableTimerTest.java index 5081dcb8fd..717f76d5e4 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableTimerTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableTimerTest.java @@ -26,7 +26,7 @@ import io.reactivex.schedulers.*; import io.reactivex.testsupport.TestHelper; -public class CompletableTimerTest { +public class CompletableTimerTest extends RxJavaTest { @Test public void dispose() { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableToFlowableTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableToFlowableTest.java index 96b5b5040f..6b709751d2 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableToFlowableTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableToFlowableTest.java @@ -20,7 +20,7 @@ import io.reactivex.functions.Function; import io.reactivex.testsupport.TestHelper; -public class CompletableToFlowableTest { +public class CompletableToFlowableTest extends RxJavaTest { @Test public void doubleOnSubscribe() { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableToObservableTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableToObservableTest.java index 3141aee55e..4e652a6d4c 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableToObservableTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableToObservableTest.java @@ -25,7 +25,7 @@ import io.reactivex.observers.TestObserver; import io.reactivex.testsupport.TestHelper; -public class CompletableToObservableTest { +public class CompletableToObservableTest extends RxJavaTest { @Test public void doubleOnSubscribe() { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableUnsafeTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableUnsafeTest.java index 40dea73a75..c08dd05c55 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableUnsafeTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableUnsafeTest.java @@ -24,7 +24,7 @@ import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.TestHelper; -public class CompletableUnsafeTest { +public class CompletableUnsafeTest extends RxJavaTest { @Test(expected = IllegalArgumentException.class) public void unsafeCreateRejectsCompletable() { diff --git a/src/test/java/io/reactivex/internal/operators/completable/CompletableUsingTest.java b/src/test/java/io/reactivex/internal/operators/completable/CompletableUsingTest.java index 3d5a580e30..5056b7617a 100644 --- a/src/test/java/io/reactivex/internal/operators/completable/CompletableUsingTest.java +++ b/src/test/java/io/reactivex/internal/operators/completable/CompletableUsingTest.java @@ -29,7 +29,7 @@ import io.reactivex.subjects.PublishSubject; import io.reactivex.testsupport.*; -public class CompletableUsingTest { +public class CompletableUsingTest extends RxJavaTest { @Test public void resourceSupplierThrows() { diff --git a/src/test/java/io/reactivex/internal/queue/SimpleQueueTest.java b/src/test/java/io/reactivex/internal/queue/SimpleQueueTest.java index 2a8583e0b4..b7c01db392 100644 --- a/src/test/java/io/reactivex/internal/queue/SimpleQueueTest.java +++ b/src/test/java/io/reactivex/internal/queue/SimpleQueueTest.java @@ -22,9 +22,10 @@ import java.util.concurrent.atomic.*; +import io.reactivex.RxJavaTest; import org.junit.Test; -public class SimpleQueueTest { +public class SimpleQueueTest extends RxJavaTest { @Test(expected = NullPointerException.class) public void spscArrayQueueNull() { diff --git a/src/test/java/io/reactivex/internal/schedulers/AbstractDirectTaskTest.java b/src/test/java/io/reactivex/internal/schedulers/AbstractDirectTaskTest.java index 6af5b6df28..b7b1731e22 100644 --- a/src/test/java/io/reactivex/internal/schedulers/AbstractDirectTaskTest.java +++ b/src/test/java/io/reactivex/internal/schedulers/AbstractDirectTaskTest.java @@ -17,12 +17,13 @@ import java.util.concurrent.FutureTask; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.internal.functions.Functions; import io.reactivex.testsupport.TestHelper; -public class AbstractDirectTaskTest { +public class AbstractDirectTaskTest extends RxJavaTest { @Test public void cancelSetFuture() { diff --git a/src/test/java/io/reactivex/internal/schedulers/ComputationSchedulerInternalTest.java b/src/test/java/io/reactivex/internal/schedulers/ComputationSchedulerInternalTest.java index ddb4fbe18f..4e5c3ef0e9 100644 --- a/src/test/java/io/reactivex/internal/schedulers/ComputationSchedulerInternalTest.java +++ b/src/test/java/io/reactivex/internal/schedulers/ComputationSchedulerInternalTest.java @@ -16,9 +16,11 @@ package io.reactivex.internal.schedulers; import static org.junit.Assert.*; + +import io.reactivex.RxJavaTest; import org.junit.Test; -public class ComputationSchedulerInternalTest { +public class ComputationSchedulerInternalTest extends RxJavaTest { @Test public void capPoolSize() { diff --git a/src/test/java/io/reactivex/internal/schedulers/DisposeOnCancelTest.java b/src/test/java/io/reactivex/internal/schedulers/DisposeOnCancelTest.java index 40463a5941..579485db51 100644 --- a/src/test/java/io/reactivex/internal/schedulers/DisposeOnCancelTest.java +++ b/src/test/java/io/reactivex/internal/schedulers/DisposeOnCancelTest.java @@ -17,11 +17,12 @@ import java.util.concurrent.TimeUnit; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.disposables.*; -public class DisposeOnCancelTest { +public class DisposeOnCancelTest extends RxJavaTest { @Test public void basicCoverage() throws Exception { diff --git a/src/test/java/io/reactivex/internal/schedulers/ExecutorSchedulerDelayedRunnableTest.java b/src/test/java/io/reactivex/internal/schedulers/ExecutorSchedulerDelayedRunnableTest.java index a8f61daeab..2ce9137742 100644 --- a/src/test/java/io/reactivex/internal/schedulers/ExecutorSchedulerDelayedRunnableTest.java +++ b/src/test/java/io/reactivex/internal/schedulers/ExecutorSchedulerDelayedRunnableTest.java @@ -17,12 +17,13 @@ import java.util.concurrent.atomic.AtomicInteger; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.exceptions.TestException; import io.reactivex.internal.schedulers.ExecutorScheduler.DelayedRunnable; -public class ExecutorSchedulerDelayedRunnableTest { +public class ExecutorSchedulerDelayedRunnableTest extends RxJavaTest { @Test(expected = TestException.class) public void delayedRunnableCrash() { diff --git a/src/test/java/io/reactivex/internal/schedulers/ImmediateThinSchedulerTest.java b/src/test/java/io/reactivex/internal/schedulers/ImmediateThinSchedulerTest.java index 507ebd32d0..67da7183c4 100644 --- a/src/test/java/io/reactivex/internal/schedulers/ImmediateThinSchedulerTest.java +++ b/src/test/java/io/reactivex/internal/schedulers/ImmediateThinSchedulerTest.java @@ -17,12 +17,13 @@ import java.util.concurrent.TimeUnit; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Scheduler.Worker; import io.reactivex.internal.functions.Functions; -public class ImmediateThinSchedulerTest { +public class ImmediateThinSchedulerTest extends RxJavaTest { @Test public void scheduleDirect() { diff --git a/src/test/java/io/reactivex/internal/schedulers/InstantPeriodicTaskTest.java b/src/test/java/io/reactivex/internal/schedulers/InstantPeriodicTaskTest.java index 2b8d6ca0d4..e3dedfbd29 100644 --- a/src/test/java/io/reactivex/internal/schedulers/InstantPeriodicTaskTest.java +++ b/src/test/java/io/reactivex/internal/schedulers/InstantPeriodicTaskTest.java @@ -21,6 +21,7 @@ import java.util.List; import java.util.concurrent.*; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.exceptions.TestException; @@ -28,7 +29,7 @@ import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.TestHelper; -public class InstantPeriodicTaskTest { +public class InstantPeriodicTaskTest extends RxJavaTest { @Test public void taskCrash() throws Exception { diff --git a/src/test/java/io/reactivex/internal/schedulers/RxThreadFactoryTest.java b/src/test/java/io/reactivex/internal/schedulers/RxThreadFactoryTest.java index 58acdd62a2..d53a82bd2c 100644 --- a/src/test/java/io/reactivex/internal/schedulers/RxThreadFactoryTest.java +++ b/src/test/java/io/reactivex/internal/schedulers/RxThreadFactoryTest.java @@ -14,11 +14,13 @@ package io.reactivex.internal.schedulers; import static org.junit.Assert.*; + +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.internal.functions.Functions; -public class RxThreadFactoryTest { +public class RxThreadFactoryTest extends RxJavaTest { @Test public void normal() { diff --git a/src/test/java/io/reactivex/internal/schedulers/ScheduledDirectPeriodicTaskTest.java b/src/test/java/io/reactivex/internal/schedulers/ScheduledDirectPeriodicTaskTest.java index b5ee68cbc5..55398b690e 100644 --- a/src/test/java/io/reactivex/internal/schedulers/ScheduledDirectPeriodicTaskTest.java +++ b/src/test/java/io/reactivex/internal/schedulers/ScheduledDirectPeriodicTaskTest.java @@ -15,13 +15,14 @@ import java.util.List; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.exceptions.TestException; import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.TestHelper; -public class ScheduledDirectPeriodicTaskTest { +public class ScheduledDirectPeriodicTaskTest extends RxJavaTest { @Test public void runnableThrows() { diff --git a/src/test/java/io/reactivex/internal/schedulers/ScheduledRunnableTest.java b/src/test/java/io/reactivex/internal/schedulers/ScheduledRunnableTest.java index 6e3f8e554d..c168562035 100644 --- a/src/test/java/io/reactivex/internal/schedulers/ScheduledRunnableTest.java +++ b/src/test/java/io/reactivex/internal/schedulers/ScheduledRunnableTest.java @@ -20,6 +20,7 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.atomic.*; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.disposables.CompositeDisposable; @@ -28,7 +29,7 @@ import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.TestHelper; -public class ScheduledRunnableTest { +public class ScheduledRunnableTest extends RxJavaTest { @Test public void dispose() { diff --git a/src/test/java/io/reactivex/internal/schedulers/SchedulerMultiWorkerSupportTest.java b/src/test/java/io/reactivex/internal/schedulers/SchedulerMultiWorkerSupportTest.java index a54e9bdf31..873c9ddc2c 100644 --- a/src/test/java/io/reactivex/internal/schedulers/SchedulerMultiWorkerSupportTest.java +++ b/src/test/java/io/reactivex/internal/schedulers/SchedulerMultiWorkerSupportTest.java @@ -18,6 +18,7 @@ import java.util.*; import java.util.concurrent.*; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Scheduler.Worker; @@ -26,7 +27,7 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.TestHelper; -public class SchedulerMultiWorkerSupportTest { +public class SchedulerMultiWorkerSupportTest extends RxJavaTest { final int max = ComputationScheduler.MAX_THREADS; diff --git a/src/test/java/io/reactivex/internal/schedulers/SchedulerPoolFactoryTest.java b/src/test/java/io/reactivex/internal/schedulers/SchedulerPoolFactoryTest.java index 9f7ee75022..c13757eeaa 100644 --- a/src/test/java/io/reactivex/internal/schedulers/SchedulerPoolFactoryTest.java +++ b/src/test/java/io/reactivex/internal/schedulers/SchedulerPoolFactoryTest.java @@ -20,13 +20,14 @@ import java.util.Properties; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.internal.schedulers.SchedulerPoolFactory.PurgeProperties; import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.TestHelper; -public class SchedulerPoolFactoryTest { +public class SchedulerPoolFactoryTest extends RxJavaTest { @Test public void utilityClass() { diff --git a/src/test/java/io/reactivex/internal/schedulers/SchedulerWhenTest.java b/src/test/java/io/reactivex/internal/schedulers/SchedulerWhenTest.java index 5e56aaa6c0..4596c624b2 100644 --- a/src/test/java/io/reactivex/internal/schedulers/SchedulerWhenTest.java +++ b/src/test/java/io/reactivex/internal/schedulers/SchedulerWhenTest.java @@ -33,7 +33,7 @@ import io.reactivex.subscribers.TestSubscriber; import io.reactivex.testsupport.TestHelper; -public class SchedulerWhenTest { +public class SchedulerWhenTest extends RxJavaTest { @Test public void asyncMaxConcurrent() { TestScheduler tSched = new TestScheduler(); @@ -211,7 +211,7 @@ public Completable apply(Completable worker) { return sched; } - @Test(timeout = 1000) + @Test public void raceConditions() { Scheduler comp = Schedulers.computation(); Scheduler limited = comp.when(new Function>, Completable>() { diff --git a/src/test/java/io/reactivex/internal/schedulers/SingleSchedulerTest.java b/src/test/java/io/reactivex/internal/schedulers/SingleSchedulerTest.java index 5eb8dbcfad..d42d8b7f0d 100644 --- a/src/test/java/io/reactivex/internal/schedulers/SingleSchedulerTest.java +++ b/src/test/java/io/reactivex/internal/schedulers/SingleSchedulerTest.java @@ -83,7 +83,7 @@ public void run() { } } - @Test(timeout = 1000) + @Test public void runnableDisposedAsync() throws Exception { final Scheduler s = Schedulers.single(); Disposable d = s.scheduleDirect(Functions.EMPTY_RUNNABLE); @@ -93,7 +93,7 @@ public void runnableDisposedAsync() throws Exception { } } - @Test(timeout = 1000) + @Test public void runnableDisposedAsyncCrash() throws Exception { final Scheduler s = Schedulers.single(); @@ -109,7 +109,7 @@ public void run() { } } - @Test(timeout = 1000) + @Test public void runnableDisposedAsyncTimed() throws Exception { final Scheduler s = Schedulers.single(); diff --git a/src/test/java/io/reactivex/internal/schedulers/TrampolineSchedulerInternalTest.java b/src/test/java/io/reactivex/internal/schedulers/TrampolineSchedulerInternalTest.java index 2b76b3067a..42e031f791 100644 --- a/src/test/java/io/reactivex/internal/schedulers/TrampolineSchedulerInternalTest.java +++ b/src/test/java/io/reactivex/internal/schedulers/TrampolineSchedulerInternalTest.java @@ -20,6 +20,7 @@ import java.util.concurrent.TimeUnit; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Scheduler.Worker; @@ -29,7 +30,7 @@ import io.reactivex.schedulers.Schedulers; import static org.mockito.Mockito.*; -public class TrampolineSchedulerInternalTest { +public class TrampolineSchedulerInternalTest extends RxJavaTest { @Test public void scheduleDirectInterrupt() { @@ -142,7 +143,7 @@ public void run() { } } - @Test(timeout = 5000) + @Test public void reentrantScheduleInterrupt() { final Worker w = Schedulers.trampoline().createWorker(); try { diff --git a/src/test/java/io/reactivex/internal/subscribers/BasicFuseableConditionalSubscriberTest.java b/src/test/java/io/reactivex/internal/subscribers/BasicFuseableConditionalSubscriberTest.java index c8cc7cc40a..b9fd51a13c 100644 --- a/src/test/java/io/reactivex/internal/subscribers/BasicFuseableConditionalSubscriberTest.java +++ b/src/test/java/io/reactivex/internal/subscribers/BasicFuseableConditionalSubscriberTest.java @@ -15,6 +15,7 @@ import static org.junit.Assert.*; +import io.reactivex.RxJavaTest; import io.reactivex.annotations.Nullable; import org.junit.Test; import org.reactivestreams.Subscription; @@ -23,7 +24,7 @@ import io.reactivex.internal.subscriptions.ScalarSubscription; import io.reactivex.testsupport.TestHelper; -public class BasicFuseableConditionalSubscriberTest { +public class BasicFuseableConditionalSubscriberTest extends RxJavaTest { @Test public void offerThrows() { diff --git a/src/test/java/io/reactivex/internal/subscribers/BasicFuseableSubscriberTest.java b/src/test/java/io/reactivex/internal/subscribers/BasicFuseableSubscriberTest.java index ae0f402b3c..e3a9f22caf 100644 --- a/src/test/java/io/reactivex/internal/subscribers/BasicFuseableSubscriberTest.java +++ b/src/test/java/io/reactivex/internal/subscribers/BasicFuseableSubscriberTest.java @@ -15,6 +15,7 @@ import static org.junit.Assert.*; +import io.reactivex.RxJavaTest; import io.reactivex.annotations.Nullable; import org.junit.Test; @@ -22,7 +23,7 @@ import io.reactivex.subscribers.TestSubscriber; import io.reactivex.testsupport.TestHelper; -public class BasicFuseableSubscriberTest { +public class BasicFuseableSubscriberTest extends RxJavaTest { @Test public void offerThrows() { diff --git a/src/test/java/io/reactivex/internal/subscribers/BlockingSubscriberTest.java b/src/test/java/io/reactivex/internal/subscribers/BlockingSubscriberTest.java index e407a18a1e..97afd2f416 100644 --- a/src/test/java/io/reactivex/internal/subscribers/BlockingSubscriberTest.java +++ b/src/test/java/io/reactivex/internal/subscribers/BlockingSubscriberTest.java @@ -18,13 +18,14 @@ import java.util.ArrayDeque; import java.util.concurrent.atomic.AtomicBoolean; +import io.reactivex.RxJavaTest; import org.junit.Test; import org.reactivestreams.Subscription; import io.reactivex.internal.subscriptions.BooleanSubscription; import io.reactivex.testsupport.TestHelper; -public class BlockingSubscriberTest { +public class BlockingSubscriberTest extends RxJavaTest { @Test public void doubleOnSubscribe() { @@ -51,7 +52,7 @@ public void blockingFirstDoubleOnSubscribe() { TestHelper.doubleOnSubscribe(new BlockingFirstSubscriber()); } - @Test(timeout = 5000) + @Test public void blockingFirstTimeout() { BlockingFirstSubscriber bf = new BlockingFirstSubscriber(); @@ -65,7 +66,7 @@ public void blockingFirstTimeout() { } } - @Test(timeout = 5000) + @Test public void blockingFirstTimeout2() { BlockingFirstSubscriber bf = new BlockingFirstSubscriber(); diff --git a/src/test/java/io/reactivex/internal/subscribers/BoundedSubscriberTest.java b/src/test/java/io/reactivex/internal/subscribers/BoundedSubscriberTest.java index db54a05bae..003bb2f68d 100644 --- a/src/test/java/io/reactivex/internal/subscribers/BoundedSubscriberTest.java +++ b/src/test/java/io/reactivex/internal/subscribers/BoundedSubscriberTest.java @@ -14,6 +14,7 @@ package io.reactivex.internal.subscribers; import io.reactivex.Flowable; +import io.reactivex.RxJavaTest; import io.reactivex.exceptions.CompositeException; import io.reactivex.exceptions.TestException; import io.reactivex.functions.Action; @@ -37,7 +38,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -public class BoundedSubscriberTest { +public class BoundedSubscriberTest extends RxJavaTest { @Test public void onSubscribeThrows() { diff --git a/src/test/java/io/reactivex/internal/subscribers/DeferredScalarSubscriberTest.java b/src/test/java/io/reactivex/internal/subscribers/DeferredScalarSubscriberTest.java index 013be4bf83..43ae7b9846 100644 --- a/src/test/java/io/reactivex/internal/subscribers/DeferredScalarSubscriberTest.java +++ b/src/test/java/io/reactivex/internal/subscribers/DeferredScalarSubscriberTest.java @@ -35,7 +35,7 @@ import io.reactivex.subscribers.TestSubscriber; import io.reactivex.testsupport.TestHelper; -public class DeferredScalarSubscriberTest { +public class DeferredScalarSubscriberTest extends RxJavaTest { @Test public void completeFirst() { diff --git a/src/test/java/io/reactivex/internal/subscribers/EmptyComponentTest.java b/src/test/java/io/reactivex/internal/subscribers/EmptyComponentTest.java index f14f9706ce..a8f79b7193 100644 --- a/src/test/java/io/reactivex/internal/subscribers/EmptyComponentTest.java +++ b/src/test/java/io/reactivex/internal/subscribers/EmptyComponentTest.java @@ -17,6 +17,7 @@ import java.util.List; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.disposables.*; @@ -26,7 +27,7 @@ import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.TestHelper; -public class EmptyComponentTest { +public class EmptyComponentTest extends RxJavaTest { @Test public void normal() { diff --git a/src/test/java/io/reactivex/internal/subscribers/FutureSubscriberTest.java b/src/test/java/io/reactivex/internal/subscribers/FutureSubscriberTest.java index 6f9f9a9436..19bb89a356 100644 --- a/src/test/java/io/reactivex/internal/subscribers/FutureSubscriberTest.java +++ b/src/test/java/io/reactivex/internal/subscribers/FutureSubscriberTest.java @@ -19,6 +19,7 @@ import java.util.*; import java.util.concurrent.*; +import io.reactivex.RxJavaTest; import org.junit.*; import io.reactivex.exceptions.TestException; @@ -28,7 +29,7 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.TestHelper; -public class FutureSubscriberTest { +public class FutureSubscriberTest extends RxJavaTest { FutureSubscriber fs; diff --git a/src/test/java/io/reactivex/internal/subscribers/InnerQueuedSubscriberTest.java b/src/test/java/io/reactivex/internal/subscribers/InnerQueuedSubscriberTest.java index f71ad289d0..cfbe3214b8 100644 --- a/src/test/java/io/reactivex/internal/subscribers/InnerQueuedSubscriberTest.java +++ b/src/test/java/io/reactivex/internal/subscribers/InnerQueuedSubscriberTest.java @@ -16,10 +16,12 @@ import java.util.*; import static org.junit.Assert.*; + +import io.reactivex.RxJavaTest; import org.junit.Test; import org.reactivestreams.Subscription; -public class InnerQueuedSubscriberTest { +public class InnerQueuedSubscriberTest extends RxJavaTest { @Test public void requestInBatches() { diff --git a/src/test/java/io/reactivex/internal/subscribers/LambdaSubscriberTest.java b/src/test/java/io/reactivex/internal/subscribers/LambdaSubscriberTest.java index 5e25125950..26f313cdf7 100644 --- a/src/test/java/io/reactivex/internal/subscribers/LambdaSubscriberTest.java +++ b/src/test/java/io/reactivex/internal/subscribers/LambdaSubscriberTest.java @@ -30,7 +30,7 @@ import static org.junit.Assert.*; -public class LambdaSubscriberTest { +public class LambdaSubscriberTest extends RxJavaTest { @Test public void onSubscribeThrows() { diff --git a/src/test/java/io/reactivex/internal/subscribers/QueueDrainSubscriberTest.java b/src/test/java/io/reactivex/internal/subscribers/QueueDrainSubscriberTest.java index bb2b7e46a4..0cdfcaeec6 100644 --- a/src/test/java/io/reactivex/internal/subscribers/QueueDrainSubscriberTest.java +++ b/src/test/java/io/reactivex/internal/subscribers/QueueDrainSubscriberTest.java @@ -17,6 +17,7 @@ import java.util.List; +import io.reactivex.RxJavaTest; import org.junit.Test; import org.reactivestreams.*; @@ -28,7 +29,7 @@ import io.reactivex.subscribers.TestSubscriber; import io.reactivex.testsupport.TestHelper; -public class QueueDrainSubscriberTest { +public class QueueDrainSubscriberTest extends RxJavaTest { static final QueueDrainSubscriber createUnordered(TestSubscriber ts, final Disposable d) { return new QueueDrainSubscriber(ts, new SpscArrayQueue(4)) { diff --git a/src/test/java/io/reactivex/internal/subscribers/SinglePostCompleteSubscriberTest.java b/src/test/java/io/reactivex/internal/subscribers/SinglePostCompleteSubscriberTest.java index d09e4d7f5a..424a56af35 100644 --- a/src/test/java/io/reactivex/internal/subscribers/SinglePostCompleteSubscriberTest.java +++ b/src/test/java/io/reactivex/internal/subscribers/SinglePostCompleteSubscriberTest.java @@ -13,13 +13,14 @@ package io.reactivex.internal.subscribers; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.internal.subscriptions.BooleanSubscription; import io.reactivex.subscribers.TestSubscriber; import io.reactivex.testsupport.TestHelper; -public class SinglePostCompleteSubscriberTest { +public class SinglePostCompleteSubscriberTest extends RxJavaTest { @Test public void requestCompleteRace() { diff --git a/src/test/java/io/reactivex/internal/subscribers/StrictSubscriberTest.java b/src/test/java/io/reactivex/internal/subscribers/StrictSubscriberTest.java index 07ca7ef9b2..038a61a058 100644 --- a/src/test/java/io/reactivex/internal/subscribers/StrictSubscriberTest.java +++ b/src/test/java/io/reactivex/internal/subscribers/StrictSubscriberTest.java @@ -17,6 +17,7 @@ import java.util.*; +import io.reactivex.RxJavaTest; import org.junit.Test; import org.reactivestreams.*; @@ -25,7 +26,7 @@ import io.reactivex.internal.subscriptions.BooleanSubscription; import io.reactivex.testsupport.TestSubscriberEx; -public class StrictSubscriberTest { +public class StrictSubscriberTest extends RxJavaTest { @Test public void strictMode() { diff --git a/src/test/java/io/reactivex/internal/subscribers/SubscriberResourceWrapperTest.java b/src/test/java/io/reactivex/internal/subscribers/SubscriberResourceWrapperTest.java index 879517fbde..206ddaee8e 100644 --- a/src/test/java/io/reactivex/internal/subscribers/SubscriberResourceWrapperTest.java +++ b/src/test/java/io/reactivex/internal/subscribers/SubscriberResourceWrapperTest.java @@ -26,7 +26,7 @@ import io.reactivex.subscribers.TestSubscriber; import io.reactivex.testsupport.TestHelper; -public class SubscriberResourceWrapperTest { +public class SubscriberResourceWrapperTest extends RxJavaTest { TestSubscriber ts = new TestSubscriber(); diff --git a/src/test/java/io/reactivex/internal/subscriptions/ArrayCompositeSubscriptionTest.java b/src/test/java/io/reactivex/internal/subscriptions/ArrayCompositeSubscriptionTest.java index 44d2bf06fa..a0d967d67b 100644 --- a/src/test/java/io/reactivex/internal/subscriptions/ArrayCompositeSubscriptionTest.java +++ b/src/test/java/io/reactivex/internal/subscriptions/ArrayCompositeSubscriptionTest.java @@ -15,11 +15,12 @@ import static org.junit.Assert.*; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.testsupport.TestHelper; -public class ArrayCompositeSubscriptionTest { +public class ArrayCompositeSubscriptionTest extends RxJavaTest { @Test public void set() { diff --git a/src/test/java/io/reactivex/internal/subscriptions/AsyncSubscriptionTest.java b/src/test/java/io/reactivex/internal/subscriptions/AsyncSubscriptionTest.java index 870c0b6cea..bc31fde7d9 100644 --- a/src/test/java/io/reactivex/internal/subscriptions/AsyncSubscriptionTest.java +++ b/src/test/java/io/reactivex/internal/subscriptions/AsyncSubscriptionTest.java @@ -16,12 +16,13 @@ import static org.junit.Assert.*; import static org.mockito.Mockito.*; +import io.reactivex.RxJavaTest; import org.junit.Test; import org.reactivestreams.Subscription; import io.reactivex.disposables.Disposable; -public class AsyncSubscriptionTest { +public class AsyncSubscriptionTest extends RxJavaTest { @Test public void noResource() { AsyncSubscription as = new AsyncSubscription(); diff --git a/src/test/java/io/reactivex/internal/subscriptions/DeferredScalarSubscriptionTest.java b/src/test/java/io/reactivex/internal/subscriptions/DeferredScalarSubscriptionTest.java index 1aa7cb6ef0..15772bf7a8 100644 --- a/src/test/java/io/reactivex/internal/subscriptions/DeferredScalarSubscriptionTest.java +++ b/src/test/java/io/reactivex/internal/subscriptions/DeferredScalarSubscriptionTest.java @@ -15,13 +15,14 @@ import static org.junit.Assert.*; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.internal.fuseable.QueueFuseable; import io.reactivex.subscribers.TestSubscriber; import io.reactivex.testsupport.TestHelper; -public class DeferredScalarSubscriptionTest { +public class DeferredScalarSubscriptionTest extends RxJavaTest { @Test public void queueSubscriptionSyncRejected() { diff --git a/src/test/java/io/reactivex/internal/subscriptions/QueueSubscriptionTest.java b/src/test/java/io/reactivex/internal/subscriptions/QueueSubscriptionTest.java index b99f29605a..6cd747d4c2 100644 --- a/src/test/java/io/reactivex/internal/subscriptions/QueueSubscriptionTest.java +++ b/src/test/java/io/reactivex/internal/subscriptions/QueueSubscriptionTest.java @@ -13,6 +13,7 @@ package io.reactivex.internal.subscriptions; +import io.reactivex.RxJavaTest; import io.reactivex.annotations.Nullable; import io.reactivex.testsupport.TestHelper; @@ -20,7 +21,7 @@ import static org.junit.Assert.*; -public class QueueSubscriptionTest { +public class QueueSubscriptionTest extends RxJavaTest { static final class EmptyQS extends BasicQueueSubscription { private static final long serialVersionUID = -5312809687598840520L; diff --git a/src/test/java/io/reactivex/internal/subscriptions/ScalarSubscriptionTest.java b/src/test/java/io/reactivex/internal/subscriptions/ScalarSubscriptionTest.java index 8ca273f0a1..c7893cf432 100644 --- a/src/test/java/io/reactivex/internal/subscriptions/ScalarSubscriptionTest.java +++ b/src/test/java/io/reactivex/internal/subscriptions/ScalarSubscriptionTest.java @@ -15,13 +15,14 @@ import java.util.List; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.subscribers.TestSubscriber; import io.reactivex.testsupport.TestHelper; -public class ScalarSubscriptionTest { +public class ScalarSubscriptionTest extends RxJavaTest { @Test public void badRequest() { diff --git a/src/test/java/io/reactivex/internal/subscriptions/SubscriptionArbiterTest.java b/src/test/java/io/reactivex/internal/subscriptions/SubscriptionArbiterTest.java index 8e1a08830c..0b1cb35dbd 100644 --- a/src/test/java/io/reactivex/internal/subscriptions/SubscriptionArbiterTest.java +++ b/src/test/java/io/reactivex/internal/subscriptions/SubscriptionArbiterTest.java @@ -17,12 +17,13 @@ import java.util.List; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.TestHelper; -public class SubscriptionArbiterTest { +public class SubscriptionArbiterTest extends RxJavaTest { @Test public void setSubscriptionMissed() { diff --git a/src/test/java/io/reactivex/internal/subscriptions/SubscriptionHelperTest.java b/src/test/java/io/reactivex/internal/subscriptions/SubscriptionHelperTest.java index 0750605baa..225d589ebc 100644 --- a/src/test/java/io/reactivex/internal/subscriptions/SubscriptionHelperTest.java +++ b/src/test/java/io/reactivex/internal/subscriptions/SubscriptionHelperTest.java @@ -18,6 +18,7 @@ import java.util.List; import java.util.concurrent.atomic.*; +import io.reactivex.RxJavaTest; import org.junit.Test; import org.reactivestreams.Subscription; @@ -25,7 +26,7 @@ import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.TestHelper; -public class SubscriptionHelperTest { +public class SubscriptionHelperTest extends RxJavaTest { @Test public void checkEnum() { diff --git a/src/test/java/io/reactivex/internal/util/AtomicThrowableTest.java b/src/test/java/io/reactivex/internal/util/AtomicThrowableTest.java index 696d183e4f..6c0e674aeb 100644 --- a/src/test/java/io/reactivex/internal/util/AtomicThrowableTest.java +++ b/src/test/java/io/reactivex/internal/util/AtomicThrowableTest.java @@ -17,13 +17,14 @@ import java.util.List; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.exceptions.TestException; import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.TestHelper; -public class AtomicThrowableTest { +public class AtomicThrowableTest extends RxJavaTest { @Test public void isTerminated() { diff --git a/src/test/java/io/reactivex/internal/util/BackpressureHelperTest.java b/src/test/java/io/reactivex/internal/util/BackpressureHelperTest.java index d6e7d225d8..d5a9cf6129 100644 --- a/src/test/java/io/reactivex/internal/util/BackpressureHelperTest.java +++ b/src/test/java/io/reactivex/internal/util/BackpressureHelperTest.java @@ -20,13 +20,13 @@ import java.util.List; import java.util.concurrent.atomic.AtomicLong; +import io.reactivex.RxJavaTest; import org.junit.*; import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.TestHelper; -public class BackpressureHelperTest { - @Ignore("BackpressureHelper is an enum") +public class BackpressureHelperTest extends RxJavaTest { @Test public void constructorShouldBePrivate() { TestHelper.checkUtilityClass(BackpressureHelper.class); diff --git a/src/test/java/io/reactivex/internal/util/BlockingHelperTest.java b/src/test/java/io/reactivex/internal/util/BlockingHelperTest.java index c03505c35b..774699edd0 100644 --- a/src/test/java/io/reactivex/internal/util/BlockingHelperTest.java +++ b/src/test/java/io/reactivex/internal/util/BlockingHelperTest.java @@ -17,13 +17,14 @@ import java.util.concurrent.*; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.disposables.*; import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.TestHelper; -public class BlockingHelperTest { +public class BlockingHelperTest extends RxJavaTest { @Test public void emptyEnum() { diff --git a/src/test/java/io/reactivex/internal/util/EndConsumerHelperTest.java b/src/test/java/io/reactivex/internal/util/EndConsumerHelperTest.java index fb7f0107f8..22c0914e48 100644 --- a/src/test/java/io/reactivex/internal/util/EndConsumerHelperTest.java +++ b/src/test/java/io/reactivex/internal/util/EndConsumerHelperTest.java @@ -30,7 +30,7 @@ import io.reactivex.subscribers.*; import io.reactivex.testsupport.TestHelper; -public class EndConsumerHelperTest { +public class EndConsumerHelperTest extends RxJavaTest { List errors; diff --git a/src/test/java/io/reactivex/internal/util/ExceptionHelperTest.java b/src/test/java/io/reactivex/internal/util/ExceptionHelperTest.java index 6dccb955dc..b36d733ef7 100644 --- a/src/test/java/io/reactivex/internal/util/ExceptionHelperTest.java +++ b/src/test/java/io/reactivex/internal/util/ExceptionHelperTest.java @@ -17,12 +17,13 @@ import java.util.concurrent.atomic.AtomicReference; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.exceptions.TestException; import io.reactivex.testsupport.TestHelper; -public class ExceptionHelperTest { +public class ExceptionHelperTest extends RxJavaTest { @Test public void utilityClass() { TestHelper.checkUtilityClass(ExceptionHelper.class); diff --git a/src/test/java/io/reactivex/internal/util/HalfSerializerObserverTest.java b/src/test/java/io/reactivex/internal/util/HalfSerializerObserverTest.java index b200a461eb..a07a3b8cf3 100644 --- a/src/test/java/io/reactivex/internal/util/HalfSerializerObserverTest.java +++ b/src/test/java/io/reactivex/internal/util/HalfSerializerObserverTest.java @@ -17,6 +17,7 @@ import java.io.IOException; import java.util.concurrent.atomic.AtomicInteger; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Observer; @@ -25,7 +26,7 @@ import io.reactivex.observers.TestObserver; import io.reactivex.testsupport.*; -public class HalfSerializerObserverTest { +public class HalfSerializerObserverTest extends RxJavaTest { @Test @SuppressWarnings({ "rawtypes", "unchecked" }) diff --git a/src/test/java/io/reactivex/internal/util/HalfSerializerSubscriberTest.java b/src/test/java/io/reactivex/internal/util/HalfSerializerSubscriberTest.java index 966db81692..147d4227b1 100644 --- a/src/test/java/io/reactivex/internal/util/HalfSerializerSubscriberTest.java +++ b/src/test/java/io/reactivex/internal/util/HalfSerializerSubscriberTest.java @@ -17,6 +17,7 @@ import java.io.IOException; import java.util.concurrent.atomic.AtomicInteger; +import io.reactivex.RxJavaTest; import org.junit.Test; import org.reactivestreams.*; @@ -26,7 +27,7 @@ import io.reactivex.subscribers.TestSubscriber; import io.reactivex.testsupport.*; -public class HalfSerializerSubscriberTest { +public class HalfSerializerSubscriberTest extends RxJavaTest { @Test public void utilityClass() { diff --git a/src/test/java/io/reactivex/internal/util/MergerBiFunctionTest.java b/src/test/java/io/reactivex/internal/util/MergerBiFunctionTest.java index db84d4cf1a..f56f9b0445 100644 --- a/src/test/java/io/reactivex/internal/util/MergerBiFunctionTest.java +++ b/src/test/java/io/reactivex/internal/util/MergerBiFunctionTest.java @@ -17,9 +17,10 @@ import java.util.*; +import io.reactivex.RxJavaTest; import org.junit.Test; -public class MergerBiFunctionTest { +public class MergerBiFunctionTest extends RxJavaTest { @Test public void firstEmpty() throws Exception { diff --git a/src/test/java/io/reactivex/internal/util/MiscUtilTest.java b/src/test/java/io/reactivex/internal/util/MiscUtilTest.java index d2aeb48b95..c9668ef9a0 100644 --- a/src/test/java/io/reactivex/internal/util/MiscUtilTest.java +++ b/src/test/java/io/reactivex/internal/util/MiscUtilTest.java @@ -17,13 +17,14 @@ import java.util.*; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.functions.*; import io.reactivex.internal.util.AppendOnlyLinkedArrayList.NonThrowingPredicate; import io.reactivex.testsupport.TestHelper; -public class MiscUtilTest { +public class MiscUtilTest extends RxJavaTest { @Test public void pow2UtilityClass() { TestHelper.checkUtilityClass(Pow2.class); diff --git a/src/test/java/io/reactivex/internal/util/NotificationLiteTest.java b/src/test/java/io/reactivex/internal/util/NotificationLiteTest.java index 26d36c6d64..cf12f1b5ad 100644 --- a/src/test/java/io/reactivex/internal/util/NotificationLiteTest.java +++ b/src/test/java/io/reactivex/internal/util/NotificationLiteTest.java @@ -15,13 +15,14 @@ import static org.junit.Assert.*; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.disposables.*; import io.reactivex.exceptions.TestException; import io.reactivex.testsupport.TestObserverEx; -public class NotificationLiteTest { +public class NotificationLiteTest extends RxJavaTest { @Test public void acceptFullObserver() { diff --git a/src/test/java/io/reactivex/internal/util/OpenHashSetTest.java b/src/test/java/io/reactivex/internal/util/OpenHashSetTest.java index 2fed69dda1..a17c8c0c68 100644 --- a/src/test/java/io/reactivex/internal/util/OpenHashSetTest.java +++ b/src/test/java/io/reactivex/internal/util/OpenHashSetTest.java @@ -14,9 +14,11 @@ package io.reactivex.internal.util; import static org.junit.Assert.*; + +import io.reactivex.RxJavaTest; import org.junit.Test; -public class OpenHashSetTest { +public class OpenHashSetTest extends RxJavaTest { static class Value { diff --git a/src/test/java/io/reactivex/internal/util/QueueDrainHelperTest.java b/src/test/java/io/reactivex/internal/util/QueueDrainHelperTest.java index f48e82e8a3..619166e8e2 100644 --- a/src/test/java/io/reactivex/internal/util/QueueDrainHelperTest.java +++ b/src/test/java/io/reactivex/internal/util/QueueDrainHelperTest.java @@ -19,6 +19,7 @@ import java.util.*; import java.util.concurrent.atomic.AtomicLong; +import io.reactivex.RxJavaTest; import org.junit.Test; import org.reactivestreams.*; @@ -32,7 +33,7 @@ import io.reactivex.subscribers.TestSubscriber; import io.reactivex.testsupport.TestHelper; -public class QueueDrainHelperTest { +public class QueueDrainHelperTest extends RxJavaTest { @Test public void isCancelled() { diff --git a/src/test/java/io/reactivex/internal/util/VolatileSizeArrayListTest.java b/src/test/java/io/reactivex/internal/util/VolatileSizeArrayListTest.java index 00d3119b32..162af9f43b 100644 --- a/src/test/java/io/reactivex/internal/util/VolatileSizeArrayListTest.java +++ b/src/test/java/io/reactivex/internal/util/VolatileSizeArrayListTest.java @@ -17,9 +17,10 @@ import java.util.*; +import io.reactivex.RxJavaTest; import org.junit.Test; -public class VolatileSizeArrayListTest { +public class VolatileSizeArrayListTest extends RxJavaTest { @Test public void normal() { diff --git a/src/test/java/io/reactivex/schedulers/AbstractSchedulerTests.java b/src/test/java/io/reactivex/schedulers/AbstractSchedulerTests.java index df422adcdd..9e395f471e 100644 --- a/src/test/java/io/reactivex/schedulers/AbstractSchedulerTests.java +++ b/src/test/java/io/reactivex/schedulers/AbstractSchedulerTests.java @@ -39,7 +39,7 @@ /** * Base tests for all schedulers including Immediate/Current. */ -public abstract class AbstractSchedulerTests { +public abstract class AbstractSchedulerTests extends RxJavaTest { /** * The scheduler to test. @@ -538,7 +538,7 @@ public void run() { assertTrue(cdl.await(5, TimeUnit.SECONDS)); } - @Test(timeout = 7000) + @Test public void scheduleDirectPeriodic() throws Exception { Scheduler s = getScheduler(); if (s instanceof TrampolineScheduler) { @@ -563,7 +563,7 @@ public void run() { assertTrue(d.isDisposed()); } - @Test(timeout = 10000) + @Test public void schedulePeriodicallyDirectZeroPeriod() throws Exception { Scheduler s = getScheduler(); if (s instanceof TrampolineScheduler) { @@ -596,7 +596,7 @@ public void run() { } } - @Test(timeout = 10000) + @Test public void schedulePeriodicallyZeroPeriod() throws Exception { Scheduler s = getScheduler(); if (s instanceof TrampolineScheduler) { @@ -657,7 +657,7 @@ public void run() { } } - @Test(timeout = 6000) + @Test public void scheduleDirectDecoratesRunnable() throws InterruptedException { assertRunnableDecorated(new Runnable() { @Override @@ -667,7 +667,7 @@ public void run() { }); } - @Test(timeout = 6000) + @Test public void scheduleDirectWithDelayDecoratesRunnable() throws InterruptedException { assertRunnableDecorated(new Runnable() { @Override @@ -677,7 +677,7 @@ public void run() { }); } - @Test(timeout = 6000) + @Test public void schedulePeriodicallyDirectDecoratesRunnable() throws InterruptedException { final Scheduler scheduler = getScheduler(); if (scheduler instanceof TrampolineScheduler) { @@ -699,7 +699,7 @@ public void run() { } } - @Test(timeout = 5000) + @Test public void unwrapDefaultPeriodicTask() throws InterruptedException { Scheduler s = getScheduler(); if (s instanceof TrampolineScheduler) { diff --git a/src/test/java/io/reactivex/single/SingleCacheTest.java b/src/test/java/io/reactivex/single/SingleCacheTest.java index 4b3d06e4ef..c387b380ee 100644 --- a/src/test/java/io/reactivex/single/SingleCacheTest.java +++ b/src/test/java/io/reactivex/single/SingleCacheTest.java @@ -13,6 +13,7 @@ package io.reactivex.single; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Single; @@ -21,7 +22,7 @@ import io.reactivex.subjects.PublishSubject; import io.reactivex.subscribers.TestSubscriber; -public class SingleCacheTest { +public class SingleCacheTest extends RxJavaTest { @Test public void normal() { diff --git a/src/test/java/io/reactivex/single/SingleNullTests.java b/src/test/java/io/reactivex/single/SingleNullTests.java index b023df769b..d376678945 100644 --- a/src/test/java/io/reactivex/single/SingleNullTests.java +++ b/src/test/java/io/reactivex/single/SingleNullTests.java @@ -27,7 +27,7 @@ import io.reactivex.internal.functions.Functions; import io.reactivex.schedulers.Schedulers; -public class SingleNullTests { +public class SingleNullTests extends RxJavaTest { Single just1 = Single.just(1); diff --git a/src/test/java/io/reactivex/single/SingleRetryTest.java b/src/test/java/io/reactivex/single/SingleRetryTest.java index c37f877f03..e1de4ab563 100644 --- a/src/test/java/io/reactivex/single/SingleRetryTest.java +++ b/src/test/java/io/reactivex/single/SingleRetryTest.java @@ -13,6 +13,7 @@ package io.reactivex.single; +import io.reactivex.RxJavaTest; import io.reactivex.Single; import io.reactivex.functions.Predicate; import io.reactivex.internal.functions.Functions; @@ -22,7 +23,7 @@ import static org.junit.Assert.assertEquals; -public class SingleRetryTest { +public class SingleRetryTest extends RxJavaTest { @Test public void retryTimesPredicateWithMatchingPredicate() { final AtomicInteger atomicInteger = new AtomicInteger(3); diff --git a/src/test/java/io/reactivex/single/SingleSubscribeTest.java b/src/test/java/io/reactivex/single/SingleSubscribeTest.java index 418e778290..8a4e3c5335 100644 --- a/src/test/java/io/reactivex/single/SingleSubscribeTest.java +++ b/src/test/java/io/reactivex/single/SingleSubscribeTest.java @@ -29,7 +29,7 @@ import io.reactivex.subjects.PublishSubject; import io.reactivex.testsupport.TestHelper; -public class SingleSubscribeTest { +public class SingleSubscribeTest extends RxJavaTest { @Test public void consumer() { diff --git a/src/test/java/io/reactivex/single/SingleTest.java b/src/test/java/io/reactivex/single/SingleTest.java index cad1e63182..c1eabbe306 100644 --- a/src/test/java/io/reactivex/single/SingleTest.java +++ b/src/test/java/io/reactivex/single/SingleTest.java @@ -31,7 +31,7 @@ import io.reactivex.subscribers.TestSubscriber; import io.reactivex.testsupport.*; -public class SingleTest { +public class SingleTest extends RxJavaTest { @Test public void helloWorld() { @@ -494,12 +494,12 @@ public void accept(final Object o, final Throwable throwable) throws Exception { assertEquals(1, atomicInteger.get()); } - @Test//(timeout = 5000) + @Test public void toFuture() throws Exception { assertEquals(1, Single.just(1).toFuture().get().intValue()); } - @Test(timeout = 5000) + @Test public void toFutureThrows() throws Exception { try { Single.error(new TestException()).toFuture().get(); diff --git a/src/test/java/io/reactivex/single/SingleTimerTest.java b/src/test/java/io/reactivex/single/SingleTimerTest.java index 10d739f9f3..5d75c05a4c 100644 --- a/src/test/java/io/reactivex/single/SingleTimerTest.java +++ b/src/test/java/io/reactivex/single/SingleTimerTest.java @@ -13,6 +13,7 @@ package io.reactivex.single; +import io.reactivex.RxJavaTest; import org.junit.Test; import java.util.concurrent.TimeUnit; @@ -24,7 +25,7 @@ import static org.junit.Assert.assertEquals; -public class SingleTimerTest { +public class SingleTimerTest extends RxJavaTest { @Test public void timer() { final TestScheduler testScheduler = new TestScheduler(); diff --git a/src/test/java/io/reactivex/subjects/AsyncSubjectTest.java b/src/test/java/io/reactivex/subjects/AsyncSubjectTest.java index 29ccf42f90..3bcc580a12 100644 --- a/src/test/java/io/reactivex/subjects/AsyncSubjectTest.java +++ b/src/test/java/io/reactivex/subjects/AsyncSubjectTest.java @@ -72,22 +72,6 @@ public void completed() { verify(observer, times(1)).onComplete(); } - @Test - @Ignore("Null values not allowed") - public void nullValues() { - AsyncSubject subject = AsyncSubject.create(); - - Observer observer = TestHelper.mockObserver(); - subject.subscribe(observer); - - subject.onNext(null); - subject.onComplete(); - - verify(observer, times(1)).onNext(null); - verify(observer, Mockito.never()).onError(any(Throwable.class)); - verify(observer, times(1)).onComplete(); - } - @Test public void subscribeAfterCompleted() { AsyncSubject subject = AsyncSubject.create(); @@ -190,7 +174,7 @@ public void emptySubjectCompleted() { /** * Can receive timeout if subscribe never receives an onError/onComplete ... which reveals a race condition. */ - @Test(timeout = 10000) + @Test public void subscribeCompletionRaceCondition() { /* * With non-threadsafe code this fails most of the time on my dev laptop and is non-deterministic enough @@ -276,52 +260,6 @@ public void run() { } } - // FIXME subscriber methods are not allowed to throw -// @Test -// public void testOnErrorThrowsDoesntPreventDelivery() { -// AsyncSubject ps = AsyncSubject.create(); -// -// ps.subscribe(); -// TestObserver to = new TestObserver(); -// ps.subscribe(to); -// -// try { -// ps.onError(new RuntimeException("an exception")); -// fail("expect OnErrorNotImplementedException"); -// } catch (OnErrorNotImplementedException e) { -// // ignore -// } -// // even though the onError above throws we should still receive it on the other subscriber -// assertEquals(1, to.getOnErrorEvents().size()); -// } - - // FIXME subscriber methods are not allowed to throw -// /** -// * This one has multiple failures so should get a CompositeException -// */ -// @Test -// public void testOnErrorThrowsDoesntPreventDelivery2() { -// AsyncSubject ps = AsyncSubject.create(); -// -// ps.subscribe(); -// ps.subscribe(); -// TestObserver to = new TestObserver(); -// ps.subscribe(to); -// ps.subscribe(); -// ps.subscribe(); -// ps.subscribe(); -// -// try { -// ps.onError(new RuntimeException("an exception")); -// fail("expect OnErrorNotImplementedException"); -// } catch (CompositeException e) { -// // we should have 5 of them -// assertEquals(5, e.getExceptions().size()); -// } -// // even though the onError above throws we should still receive it on the other subscriber -// assertEquals(1, to.getOnErrorEvents().size()); -// } - @Test public void currentStateMethodsNormal() { AsyncSubject as = AsyncSubject.create(); diff --git a/src/test/java/io/reactivex/subjects/BehaviorSubjectTest.java b/src/test/java/io/reactivex/subjects/BehaviorSubjectTest.java index 3263a2b854..cea0b7d090 100644 --- a/src/test/java/io/reactivex/subjects/BehaviorSubjectTest.java +++ b/src/test/java/io/reactivex/subjects/BehaviorSubjectTest.java @@ -242,7 +242,7 @@ public void completedAfterErrorIsNotSent3() { verify(observer, never()).onError(any(Throwable.class)); } - @Test(timeout = 1000) + @Test public void unsubscriptionCase() { BehaviorSubject src = BehaviorSubject.createDefault("null"); // FIXME was plain null which is not allowed @@ -362,52 +362,6 @@ public void takeOneSubscriber() { assertFalse(source.hasObservers()); } - // FIXME RS subscribers are not allowed to throw -// @Test -// public void testOnErrorThrowsDoesntPreventDelivery() { -// BehaviorSubject ps = BehaviorSubject.create(); -// -// ps.subscribe(); -// TestObserver to = new TestObserver(); -// ps.subscribe(to); -// -// try { -// ps.onError(new RuntimeException("an exception")); -// fail("expect OnErrorNotImplementedException"); -// } catch (OnErrorNotImplementedException e) { -// // ignore -// } -// // even though the onError above throws we should still receive it on the other subscriber -// assertEquals(1, to.getOnErrorEvents().size()); -// } - - // FIXME RS subscribers are not allowed to throw -// /** -// * This one has multiple failures so should get a CompositeException -// */ -// @Test -// public void testOnErrorThrowsDoesntPreventDelivery2() { -// BehaviorSubject ps = BehaviorSubject.create(); -// -// ps.subscribe(); -// ps.subscribe(); -// TestObserver to = new TestObserver(); -// ps.subscribe(to); -// ps.subscribe(); -// ps.subscribe(); -// ps.subscribe(); -// -// try { -// ps.onError(new RuntimeException("an exception")); -// fail("expect OnErrorNotImplementedException"); -// } catch (CompositeException e) { -// // we should have 5 of them -// assertEquals(5, e.getExceptions().size()); -// } -// // even though the onError above throws we should still receive it on the other subscriber -// assertEquals(1, to.getOnErrorEvents().size()); -// } - @Test public void emissionSubscriptionRace() throws Exception { Scheduler s = Schedulers.io(); diff --git a/src/test/java/io/reactivex/subjects/CompletableSubjectTest.java b/src/test/java/io/reactivex/subjects/CompletableSubjectTest.java index 759ba238c4..a23ad5bcaf 100644 --- a/src/test/java/io/reactivex/subjects/CompletableSubjectTest.java +++ b/src/test/java/io/reactivex/subjects/CompletableSubjectTest.java @@ -26,7 +26,7 @@ import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.TestHelper; -public class CompletableSubjectTest { +public class CompletableSubjectTest extends RxJavaTest { @Test public void once() { diff --git a/src/test/java/io/reactivex/subjects/MaybeSubjectTest.java b/src/test/java/io/reactivex/subjects/MaybeSubjectTest.java index ae5e9ac449..3776d19478 100644 --- a/src/test/java/io/reactivex/subjects/MaybeSubjectTest.java +++ b/src/test/java/io/reactivex/subjects/MaybeSubjectTest.java @@ -26,7 +26,7 @@ import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.TestHelper; -public class MaybeSubjectTest { +public class MaybeSubjectTest extends RxJavaTest { @Test public void success() { diff --git a/src/test/java/io/reactivex/subjects/PublishSubjectTest.java b/src/test/java/io/reactivex/subjects/PublishSubjectTest.java index 6bc732503c..01aa8d0804 100644 --- a/src/test/java/io/reactivex/subjects/PublishSubjectTest.java +++ b/src/test/java/io/reactivex/subjects/PublishSubjectTest.java @@ -296,7 +296,7 @@ public void reSubscribe() { private final Throwable testException = new Throwable(); - @Test(timeout = 1000) + @Test public void unsubscriptionCase() { PublishSubject src = PublishSubject.create(); @@ -338,52 +338,6 @@ public void onComplete() { } } - // FIXME RS subscribers are not allowed to throw -// @Test -// public void testOnErrorThrowsDoesntPreventDelivery() { -// PublishSubject ps = PublishSubject.create(); -// -// ps.subscribe(); -// TestObserver to = new TestObserver(); -// ps.subscribe(to); -// -// try { -// ps.onError(new RuntimeException("an exception")); -// fail("expect OnErrorNotImplementedException"); -// } catch (OnErrorNotImplementedException e) { -// // ignore -// } -// // even though the onError above throws we should still receive it on the other subscriber -// assertEquals(1, to.getOnErrorEvents().size()); -// } - - // FIXME RS subscribers are not allowed to throw -// /** -// * This one has multiple failures so should get a CompositeException -// */ -// @Test -// public void testOnErrorThrowsDoesntPreventDelivery2() { -// PublishSubject ps = PublishSubject.create(); -// -// ps.subscribe(); -// ps.subscribe(); -// TestObserver to = new TestObserver(); -// ps.subscribe(to); -// ps.subscribe(); -// ps.subscribe(); -// ps.subscribe(); -// -// try { -// ps.onError(new RuntimeException("an exception")); -// fail("expect OnErrorNotImplementedException"); -// } catch (CompositeException e) { -// // we should have 5 of them -// assertEquals(5, e.getExceptions().size()); -// } -// // even though the onError above throws we should still receive it on the other subscriber -// assertEquals(1, to.getOnErrorEvents().size()); -// } - @Test public void currentStateMethodsNormal() { PublishSubject as = PublishSubject.create(); @@ -435,12 +389,6 @@ public void currentStateMethodsError() { assertTrue(as.getThrowable() instanceof TestException); } - @Ignore("Observable doesn't do backpressure") - @Test - public void requestValidation() { -// TestHelper.assertBadRequestReported(PublishSubject.create()); - } - @Test public void crossCancel() { final TestObserver to1 = new TestObserver(); @@ -510,21 +458,6 @@ public void onComplete() { to1.assertNotComplete(); } - @Test - @Ignore("Observable doesn't do backpressure") - public void backpressureOverflow() { -// PublishSubject ps = PublishSubject.create(); -// -// TestObserver to = ps.test(0L); -// -// ps.onNext(1); -// -// to.assertNoValues() -// .assertNotComplete() -// .assertError(MissingBackpressureException.class) -// ; - } - @Test public void onSubscribeCancelsImmediately() { PublishSubject ps = PublishSubject.create(); diff --git a/src/test/java/io/reactivex/subjects/ReplaySubjectBoundedConcurrencyTest.java b/src/test/java/io/reactivex/subjects/ReplaySubjectBoundedConcurrencyTest.java index 9151f4b6f5..259a1efa21 100644 --- a/src/test/java/io/reactivex/subjects/ReplaySubjectBoundedConcurrencyTest.java +++ b/src/test/java/io/reactivex/subjects/ReplaySubjectBoundedConcurrencyTest.java @@ -30,9 +30,9 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.TestObserverEx; -public class ReplaySubjectBoundedConcurrencyTest { +public class ReplaySubjectBoundedConcurrencyTest extends RxJavaTest { - @Test(timeout = 4000) + @Test public void replaySubjectConcurrentSubscribersDoingReplayDontBlockEachOther() throws InterruptedException { final ReplaySubject replay = ReplaySubject.createUnbounded(); Thread source = new Thread(new Runnable() { @@ -229,7 +229,7 @@ public void run() { /** * Can receive timeout if subscribe never receives an onError/onComplete ... which reveals a race condition. */ - @Test(timeout = 10000) + @Test public void subscribeCompletionRaceCondition() { for (int i = 0; i < 50; i++) { final ReplaySubject subject = ReplaySubject.createUnbounded(); @@ -411,7 +411,7 @@ public void run() { } } - @Test(timeout = 5000) + @Test public void concurrentSizeAndHasAnyValue() throws InterruptedException { final ReplaySubject rs = ReplaySubject.createUnbounded(); final CyclicBarrier cb = new CyclicBarrier(2); @@ -466,7 +466,7 @@ public void run() { t.join(); } - @Test(timeout = 5000) + @Test public void concurrentSizeAndHasAnyValueBounded() throws InterruptedException { final ReplaySubject rs = ReplaySubject.createWithSize(3); final CyclicBarrier cb = new CyclicBarrier(2); @@ -510,7 +510,7 @@ public void run() { t.join(); } - @Test(timeout = 10000) + @Test public void concurrentSizeAndHasAnyValueTimeBounded() throws InterruptedException { final ReplaySubject rs = ReplaySubject.createWithTime(1, TimeUnit.MILLISECONDS, Schedulers.computation()); final CyclicBarrier cb = new CyclicBarrier(2); diff --git a/src/test/java/io/reactivex/subjects/ReplaySubjectConcurrencyTest.java b/src/test/java/io/reactivex/subjects/ReplaySubjectConcurrencyTest.java index eb3f8e7ccb..716fcbf452 100644 --- a/src/test/java/io/reactivex/subjects/ReplaySubjectConcurrencyTest.java +++ b/src/test/java/io/reactivex/subjects/ReplaySubjectConcurrencyTest.java @@ -30,9 +30,9 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.TestObserverEx; -public class ReplaySubjectConcurrencyTest { +public class ReplaySubjectConcurrencyTest extends RxJavaTest { - @Test(timeout = 4000) + @Test public void replaySubjectConcurrentSubscribersDoingReplayDontBlockEachOther() throws InterruptedException { final ReplaySubject replay = ReplaySubject.create(); Thread source = new Thread(new Runnable() { @@ -229,7 +229,7 @@ public void run() { /** * Can receive timeout if subscribe never receives an onError/onComplete ... which reveals a race condition. */ - @Test(timeout = 10000) + @Test public void subscribeCompletionRaceCondition() { for (int i = 0; i < 50; i++) { final ReplaySubject subject = ReplaySubject.create(); @@ -399,7 +399,7 @@ public void run() { } } - @Test(timeout = 10000) + @Test public void concurrentSizeAndHasAnyValue() throws InterruptedException { final ReplaySubject rs = ReplaySubject.create(); final CyclicBarrier cb = new CyclicBarrier(2); diff --git a/src/test/java/io/reactivex/subjects/ReplaySubjectTest.java b/src/test/java/io/reactivex/subjects/ReplaySubjectTest.java index 3afb52d171..f7f62a4807 100644 --- a/src/test/java/io/reactivex/subjects/ReplaySubjectTest.java +++ b/src/test/java/io/reactivex/subjects/ReplaySubjectTest.java @@ -253,7 +253,7 @@ private void assertObservedUntilTwo(Observer observer) { verify(observer, Mockito.never()).onComplete(); } - @Test(timeout = 2000) + @Test public void newSubscriberDoesntBlockExisting() throws InterruptedException { final AtomicReference lastValueForSubscriber1 = new AtomicReference(); @@ -364,7 +364,7 @@ public void subscriptionLeak() { assertEquals(0, subject.observerCount()); } - @Test(timeout = 1000) + @Test public void unsubscriptionCase() { ReplaySubject src = ReplaySubject.create(); @@ -541,52 +541,6 @@ public void replayTimestampedDirectly() { verify(o).onComplete(); } - // FIXME RS subscribers can't throw -// @Test -// public void testOnErrorThrowsDoesntPreventDelivery() { -// ReplaySubject ps = ReplaySubject.create(); -// -// ps.subscribe(); -// TestObserver to = new TestObserver(); -// ps.subscribe(to); -// -// try { -// ps.onError(new RuntimeException("an exception")); -// fail("expect OnErrorNotImplementedException"); -// } catch (OnErrorNotImplementedException e) { -// // ignore -// } -// // even though the onError above throws we should still receive it on the other subscriber -// assertEquals(1, to.errors().size()); -// } - - // FIXME RS subscribers can't throw -// /** -// * This one has multiple failures so should get a CompositeException -// */ -// @Test -// public void testOnErrorThrowsDoesntPreventDelivery2() { -// ReplaySubject ps = ReplaySubject.create(); -// -// ps.subscribe(); -// ps.subscribe(); -// TestObserver to = new TestObserver(); -// ps.subscribe(to); -// ps.subscribe(); -// ps.subscribe(); -// ps.subscribe(); -// -// try { -// ps.onError(new RuntimeException("an exception")); -// fail("expect OnErrorNotImplementedException"); -// } catch (CompositeException e) { -// // we should have 5 of them -// assertEquals(5, e.getExceptions().size()); -// } -// // even though the onError above throws we should still receive it on the other subscriber -// assertEquals(1, to.getOnErrorEvents().size()); -// } - @Test public void currentStateMethodsNormal() { ReplaySubject as = ReplaySubject.create(); diff --git a/src/test/java/io/reactivex/subjects/SerializedSubjectTest.java b/src/test/java/io/reactivex/subjects/SerializedSubjectTest.java index 41e67564d0..f107437a00 100644 --- a/src/test/java/io/reactivex/subjects/SerializedSubjectTest.java +++ b/src/test/java/io/reactivex/subjects/SerializedSubjectTest.java @@ -18,6 +18,7 @@ import java.util.*; import java.util.concurrent.TimeUnit; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Observable; @@ -27,7 +28,7 @@ import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.*; -public class SerializedSubjectTest { +public class SerializedSubjectTest extends RxJavaTest { @Test public void basic() { diff --git a/src/test/java/io/reactivex/subjects/SingleSubjectTest.java b/src/test/java/io/reactivex/subjects/SingleSubjectTest.java index 649dfca135..3b71ad6231 100644 --- a/src/test/java/io/reactivex/subjects/SingleSubjectTest.java +++ b/src/test/java/io/reactivex/subjects/SingleSubjectTest.java @@ -26,7 +26,7 @@ import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.TestHelper; -public class SingleSubjectTest { +public class SingleSubjectTest extends RxJavaTest { @Test public void success() { diff --git a/src/test/java/io/reactivex/subjects/SubjectTest.java b/src/test/java/io/reactivex/subjects/SubjectTest.java index ab455573a7..112bb993de 100644 --- a/src/test/java/io/reactivex/subjects/SubjectTest.java +++ b/src/test/java/io/reactivex/subjects/SubjectTest.java @@ -15,9 +15,10 @@ import static org.junit.Assert.*; +import io.reactivex.RxJavaTest; import org.junit.Test; -public abstract class SubjectTest { +public abstract class SubjectTest extends RxJavaTest { protected abstract Subject create(); diff --git a/src/test/java/io/reactivex/subscribers/DefaultSubscriberTest.java b/src/test/java/io/reactivex/subscribers/DefaultSubscriberTest.java index 99a23a5c53..8b2deaec3b 100644 --- a/src/test/java/io/reactivex/subscribers/DefaultSubscriberTest.java +++ b/src/test/java/io/reactivex/subscribers/DefaultSubscriberTest.java @@ -17,11 +17,12 @@ import java.util.*; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Flowable; -public class DefaultSubscriberTest { +public class DefaultSubscriberTest extends RxJavaTest { static final class RequestEarly extends DefaultSubscriber { diff --git a/src/test/java/io/reactivex/subscribers/DisposableSubscriberTest.java b/src/test/java/io/reactivex/subscribers/DisposableSubscriberTest.java index bda36687d8..fd5d25ae1f 100644 --- a/src/test/java/io/reactivex/subscribers/DisposableSubscriberTest.java +++ b/src/test/java/io/reactivex/subscribers/DisposableSubscriberTest.java @@ -25,7 +25,7 @@ import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.TestHelper; -public class DisposableSubscriberTest { +public class DisposableSubscriberTest extends RxJavaTest { static final class TestDisposableSubscriber extends DisposableSubscriber { diff --git a/src/test/java/io/reactivex/subscribers/ResourceSubscriberTest.java b/src/test/java/io/reactivex/subscribers/ResourceSubscriberTest.java index 6bc769a018..1af2ed065f 100644 --- a/src/test/java/io/reactivex/subscribers/ResourceSubscriberTest.java +++ b/src/test/java/io/reactivex/subscribers/ResourceSubscriberTest.java @@ -27,7 +27,7 @@ import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.TestHelper; -public class ResourceSubscriberTest { +public class ResourceSubscriberTest extends RxJavaTest { static class TestResourceSubscriber extends ResourceSubscriber { final List values = new ArrayList(); diff --git a/src/test/java/io/reactivex/subscribers/SafeSubscriberTest.java b/src/test/java/io/reactivex/subscribers/SafeSubscriberTest.java index e3330ed0b9..84b2d67b3a 100644 --- a/src/test/java/io/reactivex/subscribers/SafeSubscriberTest.java +++ b/src/test/java/io/reactivex/subscribers/SafeSubscriberTest.java @@ -29,7 +29,7 @@ import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.*; -public class SafeSubscriberTest { +public class SafeSubscriberTest extends RxJavaTest { /** * Ensure onNext can not be called after onError. @@ -208,45 +208,6 @@ public void onErrorFailure() { } } - @Test - @Ignore("Observers can't throw") - public void onErrorFailureSafe() { - try { - new SafeSubscriber(subscriberOnErrorFail()).onError(new SafeSubscriberTestException("error!")); - fail("expects exception to be thrown"); - } catch (Exception e) { - e.printStackTrace(); - assertTrue(e instanceof RuntimeException); - assertEquals("Error occurred when trying to propagate error to Subscriber.onError", e.getMessage()); - - Throwable e2 = e.getCause(); - assertTrue(e2 instanceof CompositeException); - List innerExceptions = ((CompositeException) e2).getExceptions(); - assertEquals(2, innerExceptions.size()); - - Throwable e3 = innerExceptions.get(0); - assertTrue(e3 instanceof SafeSubscriberTestException); - assertEquals("error!", e3.getMessage()); - - Throwable e4 = innerExceptions.get(1); - assertTrue(e4 instanceof SafeSubscriberTestException); - assertEquals("onErrorFail", e4.getMessage()); - } - } - - @Test - @Ignore("Observers can't throw") - public void onErrorNotImplementedFailureSafe() { - try { - new SafeSubscriber(subscriberOnErrorNotImplemented()).onError(new SafeSubscriberTestException("error!")); - fail("expects exception to be thrown"); - } catch (Exception e) { -// assertTrue(e instanceof OnErrorNotImplementedException); - assertTrue(e.getCause() instanceof SafeSubscriberTestException); - assertEquals("error!", e.getCause().getMessage()); - } - } - @Test public void onNextOnErrorFailure() { try { @@ -259,32 +220,6 @@ public void onNextOnErrorFailure() { } } - @Test - @Ignore("Observers can't throw") - public void onNextOnErrorFailureSafe() { - try { - new SafeSubscriber(OBSERVER_ONNEXT_ONERROR_FAIL()).onNext("one"); - fail("expects exception to be thrown"); - } catch (Exception e) { - e.printStackTrace(); - assertTrue(e instanceof RuntimeException); - assertEquals("Error occurred when trying to propagate error to Subscriber.onError", e.getMessage()); - - Throwable e2 = e.getCause(); - assertTrue(e2 instanceof CompositeException); - List innerExceptions = ((CompositeException) e2).getExceptions(); - assertEquals(2, innerExceptions.size()); - - Throwable e3 = innerExceptions.get(0); - assertTrue(e3 instanceof SafeSubscriberTestException); - assertEquals("onNextFail", e3.getMessage()); - - Throwable e4 = innerExceptions.get(1); - assertTrue(e4 instanceof SafeSubscriberTestException); - assertEquals("onErrorFail", e4.getMessage()); - } - } - static final Subscription THROWING_DISPOSABLE = new Subscription() { @Override @@ -299,165 +234,6 @@ public void request(long n) { } }; - @Test - @Ignore("Observers can't throw") - public void onCompleteSuccessWithUnsubscribeFailure() { - Subscriber subscriber = subscriberSuccess(); - try { - subscriber.onSubscribe(THROWING_DISPOSABLE); - new SafeSubscriber(subscriber).onComplete(); - fail("expects exception to be thrown"); - } catch (Exception e) { - e.printStackTrace(); - - // FIXME no longer assertable -// assertTrue(o.isUnsubscribed()); -// assertTrue(e instanceof UnsubscribeFailedException); - assertTrue(e.getCause() instanceof SafeSubscriberTestException); - assertEquals("failure from unsubscribe", e.getMessage()); - // expected since onError fails so SafeSubscriber can't help - } - } - - @Test - @Ignore("Observers can't throw") - public void onErrorSuccessWithUnsubscribeFailure() { - AtomicReference onError = new AtomicReference(); - Subscriber subscriber = subscriberSuccess(onError); - try { - subscriber.onSubscribe(THROWING_DISPOSABLE); - new SafeSubscriber(subscriber).onError(new SafeSubscriberTestException("failed")); - fail("we expect the unsubscribe failure to cause an exception to be thrown"); - } catch (Exception e) { - e.printStackTrace(); - - // FIXME no longer assertable -// assertTrue(o.isUnsubscribed()); - - // we still expect onError to have received something before unsubscribe blew up - assertNotNull(onError.get()); - assertTrue(onError.get() instanceof SafeSubscriberTestException); - assertEquals("failed", onError.get().getMessage()); - - // now assert the exception that was thrown - RuntimeException onErrorFailedException = (RuntimeException) e; - assertTrue(onErrorFailedException.getCause() instanceof SafeSubscriberTestException); - assertEquals("failure from unsubscribe", e.getMessage()); - } - } - - @Test - @Ignore("Observers can't throw") - public void onErrorFailureWithUnsubscribeFailure() { - Subscriber subscriber = subscriberOnErrorFail(); - try { - subscriber.onSubscribe(THROWING_DISPOSABLE); - new SafeSubscriber(subscriber).onError(new SafeSubscriberTestException("onError failure")); - fail("expects exception to be thrown"); - } catch (Exception e) { - e.printStackTrace(); - - // FIXME no longer assertable -// assertTrue(o.isUnsubscribed()); - - // assertions for what is expected for the actual failure propagated to onError which then fails - assertTrue(e instanceof RuntimeException); - assertEquals("Error occurred when trying to propagate error to Subscriber.onError and during unsubscription.", e.getMessage()); - - Throwable e2 = e.getCause(); - assertTrue(e2 instanceof CompositeException); - List innerExceptions = ((CompositeException) e2).getExceptions(); - assertEquals(3, innerExceptions.size()); - - Throwable e3 = innerExceptions.get(0); - assertTrue(e3 instanceof SafeSubscriberTestException); - assertEquals("onError failure", e3.getMessage()); - - Throwable e4 = innerExceptions.get(1); - assertTrue(e4 instanceof SafeSubscriberTestException); - assertEquals("onErrorFail", e4.getMessage()); - - Throwable e5 = innerExceptions.get(2); - assertTrue(e5 instanceof SafeSubscriberTestException); - assertEquals("failure from unsubscribe", e5.getMessage()); - } - } - - @Test - @Ignore("Observers can't throw") - public void onErrorNotImplementedFailureWithUnsubscribeFailure() { - Subscriber subscriber = subscriberOnErrorNotImplemented(); - try { - subscriber.onSubscribe(THROWING_DISPOSABLE); - new SafeSubscriber(subscriber).onError(new SafeSubscriberTestException("error!")); - fail("expects exception to be thrown"); - } catch (Exception e) { - e.printStackTrace(); - - // FIXME no longer assertable -// assertTrue(o.isUnsubscribed()); - - // assertions for what is expected for the actual failure propagated to onError which then fails - assertTrue(e instanceof RuntimeException); - assertEquals("Subscriber.onError not implemented and error while unsubscribing.", e.getMessage()); - - Throwable e2 = e.getCause(); - assertTrue(e2 instanceof CompositeException); - List innerExceptions = ((CompositeException) e2).getExceptions(); - assertEquals(2, innerExceptions.size()); - - Throwable e3 = innerExceptions.get(0); - assertTrue(e3 instanceof SafeSubscriberTestException); - assertEquals("error!", e3.getMessage()); - - Throwable e4 = innerExceptions.get(1); - assertTrue(e4 instanceof SafeSubscriberTestException); - assertEquals("failure from unsubscribe", e4.getMessage()); - } - } - - private static Subscriber subscriberSuccess() { - return new DefaultSubscriber() { - - @Override - public void onComplete() { - - } - - @Override - public void onError(Throwable e) { - - } - - @Override - public void onNext(String args) { - - } - }; - - } - - private static Subscriber subscriberSuccess(final AtomicReference onError) { - return new DefaultSubscriber() { - - @Override - public void onComplete() { - - } - - @Override - public void onError(Throwable e) { - onError.set(e); - } - - @Override - public void onNext(String args) { - - } - }; - - } - private static Subscriber OBSERVER_ONNEXT_FAIL(final AtomicReference onError) { return new DefaultSubscriber() { @@ -521,28 +297,6 @@ public void onNext(String args) { }; } - private static Subscriber subscriberOnErrorNotImplemented() { - return new DefaultSubscriber() { - - @Override - public void onComplete() { - - } - - @Override - public void onError(Throwable e) { - throw new RuntimeException(e); -// throw new OnErrorNotImplementedException(e); - } - - @Override - public void onNext(String args) { - - } - - }; - } - private static Subscriber OBSERVER_ONCOMPLETED_FAIL(final AtomicReference onError) { return new DefaultSubscriber() { @@ -571,35 +325,6 @@ private static class SafeSubscriberTestException extends RuntimeException { } } - @Test - @Ignore("Observers can't throw") - public void onCompletedThrows() { - final AtomicReference error = new AtomicReference(); - SafeSubscriber s = new SafeSubscriber(new DefaultSubscriber() { - @Override - public void onNext(Integer t) { - - } - - @Override - public void onError(Throwable e) { - error.set(e); - } - - @Override - public void onComplete() { - throw new TestException(); - } - }); - - try { - s.onComplete(); - Assert.fail(); - } catch (RuntimeException e) { - assertNull(error.get()); - } - } - @Test public void actual() { Subscriber actual = new DefaultSubscriber() { diff --git a/src/test/java/io/reactivex/subscribers/SafeSubscriberWithPluginTest.java b/src/test/java/io/reactivex/subscribers/SafeSubscriberWithPluginTest.java deleted file mode 100644 index 1f04ac4131..0000000000 --- a/src/test/java/io/reactivex/subscribers/SafeSubscriberWithPluginTest.java +++ /dev/null @@ -1,301 +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.subscribers; - -import static org.junit.Assert.*; - -import java.util.concurrent.atomic.AtomicInteger; - -import org.junit.*; -import org.reactivestreams.Subscription; - -import io.reactivex.exceptions.*; -import io.reactivex.functions.Consumer; -import io.reactivex.plugins.RxJavaPlugins; - -public class SafeSubscriberWithPluginTest { - private final class SubscriptionCancelThrows implements Subscription { - @Override - public void cancel() { - throw new RuntimeException(); - } - - @Override - public void request(long n) { - - } - } - - @Before - @After - public void resetBefore() { - RxJavaPlugins.reset(); - } - - @Test - @Ignore("Subscribers can't throw") - public void onCompletedThrows() { - TestSubscriber ts = new TestSubscriber() { - @Override - public void onComplete() { - throw new TestException(); - } - }; - SafeSubscriber safe = new SafeSubscriber(ts); - try { - safe.onComplete(); - fail(); - } catch (RuntimeException e) { - // FIXME no longer assertable - // assertTrue(safe.isUnsubscribed()); - } - } - - @Test - public void onCompletedThrows2() { - TestSubscriber ts = new TestSubscriber() { - @Override - public void onComplete() { - throw new RuntimeException(new TestException()); - } - }; - SafeSubscriber safe = new SafeSubscriber(ts); - - try { - safe.onComplete(); - } catch (RuntimeException ex) { - // expected - } - - // FIXME no longer assertable - // assertTrue(safe.isUnsubscribed()); - } - - @Test(expected = RuntimeException.class) - @Ignore("Subscribers can't throw") - public void pluginException() { - RxJavaPlugins.setErrorHandler(new Consumer() { - @Override - public void accept(Throwable e) { - throw new RuntimeException(); - } - }); - - TestSubscriber ts = new TestSubscriber() { - @Override - public void onComplete() { - throw new TestException(); - } - }; - SafeSubscriber safe = new SafeSubscriber(ts); - - safe.onComplete(); - } - - @Test(expected = RuntimeException.class) - @Ignore("Subscribers can't throw") - public void pluginExceptionWhileOnErrorUnsubscribeThrows() { - RxJavaPlugins.setErrorHandler(new Consumer() { - int calls; - @Override - public void accept(Throwable e) { - if (++calls == 2) { - throw new RuntimeException(); - } - } - }); - - TestSubscriber ts = new TestSubscriber(); - SafeSubscriber safe = new SafeSubscriber(ts); - safe.onSubscribe(new SubscriptionCancelThrows()); - - safe.onError(new TestException()); - } - - @Test(expected = RuntimeException.class) - @Ignore("Subscribers can't throw") - public void pluginExceptionWhileOnErrorThrowsNotImplAndUnsubscribeThrows() { - RxJavaPlugins.setErrorHandler(new Consumer() { - int calls; - @Override - public void accept(Throwable e) { - if (++calls == 2) { - throw new RuntimeException(); - } - } - }); - - TestSubscriber ts = new TestSubscriber() { - @Override - public void onError(Throwable e) { - throw new RuntimeException(e); - } - }; - SafeSubscriber safe = new SafeSubscriber(ts); - safe.onSubscribe(new SubscriptionCancelThrows()); - - safe.onError(new TestException()); - } - - @Test(expected = RuntimeException.class) - @Ignore("Subscribers can't throw") - public void pluginExceptionWhileOnErrorThrows() { - RxJavaPlugins.setErrorHandler(new Consumer() { - int calls; - @Override - public void accept(Throwable e) { - if (++calls == 2) { - throw new RuntimeException(); - } - } - }); - - TestSubscriber ts = new TestSubscriber() { - @Override - public void onError(Throwable e) { - throw new RuntimeException(e); - } - }; - SafeSubscriber safe = new SafeSubscriber(ts); - - safe.onError(new TestException()); - } - - @Test(expected = RuntimeException.class) - @Ignore("Subscribers can't throw") - public void pluginExceptionWhileOnErrorThrowsAndUnsubscribeThrows() { - RxJavaPlugins.setErrorHandler(new Consumer() { - int calls; - @Override - public void accept(Throwable e) { - if (++calls == 2) { - throw new RuntimeException(); - } - } - }); - - TestSubscriber ts = new TestSubscriber() { - @Override - public void onError(Throwable e) { - throw new RuntimeException(e); - } - }; - SafeSubscriber safe = new SafeSubscriber(ts); - safe.onSubscribe(new SubscriptionCancelThrows()); - - safe.onError(new TestException()); - } - - @Test(expected = RuntimeException.class) - @Ignore("Subscribers can't throw") - public void pluginExceptionWhenUnsubscribing2() { - RxJavaPlugins.setErrorHandler(new Consumer() { - int calls; - @Override - public void accept(Throwable e) { - if (++calls == 3) { - throw new RuntimeException(); - } - } - }); - - TestSubscriber ts = new TestSubscriber() { - @Override - public void onError(Throwable e) { - throw new RuntimeException(e); - } - }; - SafeSubscriber safe = new SafeSubscriber(ts); - safe.onSubscribe(new SubscriptionCancelThrows()); - - safe.onError(new TestException()); - } - - @Test - @Ignore("Subscribers can't throw") - public void pluginErrorHandlerReceivesExceptionWhenUnsubscribeAfterCompletionThrows() { - final AtomicInteger calls = new AtomicInteger(); - RxJavaPlugins.setErrorHandler(new Consumer() { - @Override - public void accept(Throwable e) { - calls.incrementAndGet(); - } - }); - - final AtomicInteger errorCount = new AtomicInteger(); - TestSubscriber ts = new TestSubscriber() { - @Override - public void onError(Throwable e) { - errorCount.incrementAndGet(); - } - }; - final RuntimeException ex = new RuntimeException(); - SafeSubscriber safe = new SafeSubscriber(ts); - safe.onSubscribe(new Subscription() { - @Override - public void cancel() { - throw ex; - } - - @Override - public void request(long n) { - - } - }); - -// try { -// safe.onComplete(); -// Assert.fail(); -// } catch(UnsubscribeFailedException e) { -// assertEquals(1, calls.get()); -// assertEquals(0, errors.get()); -// } - } - - @Test - @Ignore("Subscribers can't throw") - public void pluginErrorHandlerReceivesExceptionFromFailingUnsubscribeAfterCompletionThrows() { - final AtomicInteger calls = new AtomicInteger(); - RxJavaPlugins.setErrorHandler(new Consumer() { - @Override - public void accept(Throwable e) { - calls.incrementAndGet(); - } - }); - - final AtomicInteger errorCount = new AtomicInteger(); - TestSubscriber ts = new TestSubscriber() { - - @Override - public void onComplete() { - throw new RuntimeException(); - } - - @Override - public void onError(Throwable e) { - errorCount.incrementAndGet(); - } - }; - SafeSubscriber safe = new SafeSubscriber(ts); - safe.onSubscribe(new SubscriptionCancelThrows()); - -// try { -// safe.onComplete(); -// Assert.fail(); -// } catch(UnsubscribeFailedException e) { -// assertEquals(2, calls.get()); -// assertEquals(0, errors.get()); -// } - } -} diff --git a/src/test/java/io/reactivex/subscribers/SerializedSubscriberTest.java b/src/test/java/io/reactivex/subscribers/SerializedSubscriberTest.java index cb9ae0fc86..293af2412d 100644 --- a/src/test/java/io/reactivex/subscribers/SerializedSubscriberTest.java +++ b/src/test/java/io/reactivex/subscribers/SerializedSubscriberTest.java @@ -20,6 +20,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; +import io.reactivex.RxJavaTest; import org.junit.*; import org.reactivestreams.*; @@ -30,7 +31,7 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.*; -public class SerializedSubscriberTest { +public class SerializedSubscriberTest extends RxJavaTest { Subscriber subscriber; @@ -87,7 +88,7 @@ public void multiThreadedBasic() { assertEquals(1, busySubscriber.maxConcurrentThreads.get()); } - @Test(timeout = 1000) + @Test public void multiThreadedWithNPE() throws InterruptedException { TestMultiThreadedObservable onSubscribe = new TestMultiThreadedObservable("one", "two", "three", null); Flowable w = Flowable.unsafeCreate(onSubscribe); @@ -843,125 +844,6 @@ protected void captureMaxThreads() { } - @Test - @Ignore("Null values not permitted") - public void serializeNull() { - final AtomicReference> serial = new AtomicReference>(); - TestSubscriber ts = new TestSubscriber() { - @Override - public void onNext(Integer t) { - if (t != null && t == 0) { - serial.get().onNext(null); - } - super.onNext(t); - } - }; - - SerializedSubscriber sobs = new SerializedSubscriber(ts); - serial.set(sobs); - - sobs.onNext(0); - - ts.assertValues(0, null); - } - - @Test - @Ignore("Subscribers can't throw") - public void serializeAllowsOnError() { - TestSubscriber ts = new TestSubscriber() { - @Override - public void onNext(Integer t) { - throw new TestException(); - } - }; - - SerializedSubscriber sobs = new SerializedSubscriber(ts); - - try { - sobs.onNext(0); - } catch (TestException ex) { - sobs.onError(ex); - } - - ts.assertError(TestException.class); - } - - @Test - @Ignore("Null values no longer permitted") - public void serializeReentrantNullAndComplete() { - final AtomicReference> serial = new AtomicReference>(); - TestSubscriber ts = new TestSubscriber() { - @Override - public void onNext(Integer t) { - serial.get().onComplete(); - throw new TestException(); - } - }; - - SerializedSubscriber sobs = new SerializedSubscriber(ts); - serial.set(sobs); - - try { - sobs.onNext(0); - } catch (TestException ex) { - sobs.onError(ex); - } - - ts.assertError(TestException.class); - ts.assertNotComplete(); - } - - @Test - @Ignore("Subscribers can't throw") - public void serializeReentrantNullAndError() { - final AtomicReference> serial = new AtomicReference>(); - TestSubscriber ts = new TestSubscriber() { - @Override - public void onNext(Integer t) { - serial.get().onError(new RuntimeException()); - throw new TestException(); - } - }; - - SerializedSubscriber sobs = new SerializedSubscriber(ts); - serial.set(sobs); - - try { - sobs.onNext(0); - } catch (TestException ex) { - sobs.onError(ex); - } - - ts.assertError(TestException.class); - ts.assertNotComplete(); - } - - @Test - @Ignore("Null values no longer permitted") - public void serializeDrainPhaseThrows() { - final AtomicReference> serial = new AtomicReference>(); - TestSubscriber ts = new TestSubscriber() { - @Override - public void onNext(Integer t) { - if (t != null && t == 0) { - serial.get().onNext(null); - } else - if (t == null) { - throw new TestException(); - } - super.onNext(t); - } - }; - - SerializedSubscriber sobs = new SerializedSubscriber(ts); - serial.set(sobs); - - sobs.onNext(0); - - ts.assertError(TestException.class); - ts.assertNotComplete(); - } - @Test public void errorReentry() { List errors = TestHelper.trackPluginErrors(); diff --git a/src/test/java/io/reactivex/subscribers/TestSubscriberTest.java b/src/test/java/io/reactivex/subscribers/TestSubscriberTest.java index fd421c4cc9..f182081769 100644 --- a/src/test/java/io/reactivex/subscribers/TestSubscriberTest.java +++ b/src/test/java/io/reactivex/subscribers/TestSubscriberTest.java @@ -36,7 +36,7 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.TestHelper; -public class TestSubscriberTest { +public class TestSubscriberTest extends RxJavaTest { @Rule public ExpectedException thrown = ExpectedException.none(); @@ -660,7 +660,7 @@ public void valueCount() { } } - @Test(timeout = 1000) + @Test public void onCompletedCrashCountsDownLatch() { TestSubscriber ts0 = new TestSubscriber() { @Override @@ -679,7 +679,7 @@ public void onComplete() { ts.awaitDone(5, TimeUnit.SECONDS); } - @Test(timeout = 1000) + @Test public void onErrorCrashCountsDownLatch() { TestSubscriber ts0 = new TestSubscriber() { @Override @@ -898,7 +898,7 @@ public void assertResult() { } - @Test(timeout = 5000) + @Test public void await() throws Exception { TestSubscriber ts = TestSubscriber.create(); diff --git a/src/test/java/io/reactivex/testsupport/TestObserverExTest.java b/src/test/java/io/reactivex/testsupport/TestObserverExTest.java index 8c6ef9e522..cf7425b792 100644 --- a/src/test/java/io/reactivex/testsupport/TestObserverExTest.java +++ b/src/test/java/io/reactivex/testsupport/TestObserverExTest.java @@ -20,6 +20,7 @@ import java.util.*; import java.util.concurrent.TimeUnit; +import io.reactivex.RxJavaTest; import org.junit.*; import org.junit.rules.ExpectedException; import org.mockito.InOrder; @@ -36,7 +37,7 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.subjects.*; -public class TestObserverExTest { +public class TestObserverExTest extends RxJavaTest { @Rule public ExpectedException thrown = ExpectedException.none(); @@ -571,7 +572,7 @@ public void assertResult() { } - @Test(timeout = 5000) + @Test public void await() throws Exception { TestObserverEx to = new TestObserverEx(); diff --git a/src/test/java/io/reactivex/testsupport/TestSubscriberExTest.java b/src/test/java/io/reactivex/testsupport/TestSubscriberExTest.java index c1f655c2d9..eb3a4b0df1 100644 --- a/src/test/java/io/reactivex/testsupport/TestSubscriberExTest.java +++ b/src/test/java/io/reactivex/testsupport/TestSubscriberExTest.java @@ -36,7 +36,7 @@ import io.reactivex.processors.*; import io.reactivex.schedulers.Schedulers; -public class TestSubscriberExTest { +public class TestSubscriberExTest extends RxJavaTest { @Rule public ExpectedException thrown = ExpectedException.none(); @@ -692,7 +692,7 @@ public void valueCount() { } } - @Test(timeout = 1000) + @Test public void onCompletedCrashCountsDownLatch() { TestSubscriberEx ts0 = new TestSubscriberEx() { @Override @@ -711,7 +711,7 @@ public void onComplete() { ts.awaitDone(5, TimeUnit.SECONDS); } - @Test(timeout = 1000) + @Test public void onErrorCrashCountsDownLatch() { TestSubscriberEx ts0 = new TestSubscriberEx() { @Override @@ -1036,7 +1036,7 @@ public void assertResult() { } - @Test(timeout = 5000) + @Test public void await() throws Exception { TestSubscriberEx ts = new TestSubscriberEx();