From 5e3d06ae50e01ac5a4f42cfb5e4aa44ec49d4d9b Mon Sep 17 00:00:00 2001 From: Roman Wuattier Date: Tue, 30 Jul 2019 10:57:32 +0200 Subject: [PATCH] 3.x: Have unit tests extends `RxJavaTest` - 5 This commit updates the unit tests of the following operators: * internal.operators.maybe * internal.operator.mixed * internal.operator.single Related: #6583 --- .../operators/maybe/AbstractMaybeWithUpstreamTest.java | 3 ++- .../io/reactivex/internal/operators/maybe/MaybeAmbTest.java | 2 +- .../reactivex/internal/operators/maybe/MaybeCacheTest.java | 2 +- .../internal/operators/maybe/MaybeCallbackObserverTest.java | 3 ++- .../internal/operators/maybe/MaybeConcatArrayTest.java | 2 +- .../internal/operators/maybe/MaybeConcatIterableTest.java | 2 +- .../internal/operators/maybe/MaybeConcatPublisherTest.java | 2 +- .../internal/operators/maybe/MaybeContainsTest.java | 2 +- .../reactivex/internal/operators/maybe/MaybeCountTest.java | 2 +- .../reactivex/internal/operators/maybe/MaybeCreateTest.java | 2 +- .../internal/operators/maybe/MaybeDelayOtherTest.java | 2 +- .../operators/maybe/MaybeDelaySubscriptionTest.java | 2 +- .../reactivex/internal/operators/maybe/MaybeDelayTest.java | 2 +- .../reactivex/internal/operators/maybe/MaybeDetachTest.java | 2 +- .../internal/operators/maybe/MaybeDoAfterSuccessTest.java | 2 +- .../internal/operators/maybe/MaybeDoFinallyTest.java | 2 +- .../internal/operators/maybe/MaybeDoOnEventTest.java | 2 +- .../internal/operators/maybe/MaybeDoOnTerminateTest.java | 3 ++- .../reactivex/internal/operators/maybe/MaybeEmptyTest.java | 3 ++- .../reactivex/internal/operators/maybe/MaybeEqualTest.java | 2 +- .../reactivex/internal/operators/maybe/MaybeErrorTest.java | 3 ++- .../internal/operators/maybe/MaybeFilterSingleTest.java | 2 +- .../operators/maybe/MaybeFlatMapBiSelectorTest.java | 2 +- .../operators/maybe/MaybeFlatMapCompletableTest.java | 2 +- .../operators/maybe/MaybeFlatMapIterableFlowableTest.java | 2 +- .../operators/maybe/MaybeFlatMapIterableObservableTest.java | 2 +- .../operators/maybe/MaybeFlatMapNotificationTest.java | 2 +- .../operators/maybe/MaybeFlatMapSingleElementTest.java | 2 +- .../internal/operators/maybe/MaybeFlatMapSingleTest.java | 2 +- .../internal/operators/maybe/MaybeFlattenTest.java | 2 +- .../internal/operators/maybe/MaybeFromActionTest.java | 2 +- .../internal/operators/maybe/MaybeFromCallableTest.java | 2 +- .../internal/operators/maybe/MaybeFromCompletableTest.java | 2 +- .../internal/operators/maybe/MaybeFromFutureTest.java | 3 ++- .../internal/operators/maybe/MaybeFromRunnableTest.java | 2 +- .../internal/operators/maybe/MaybeFromSingleTest.java | 2 +- .../internal/operators/maybe/MaybeFromSupplierTest.java | 2 +- .../reactivex/internal/operators/maybe/MaybeHideTest.java | 2 +- .../internal/operators/maybe/MaybeIgnoreElementTest.java | 2 +- .../internal/operators/maybe/MaybeIsEmptySingleTest.java | 4 +++- .../internal/operators/maybe/MaybeIsEmptyTest.java | 2 +- .../reactivex/internal/operators/maybe/MaybeJustTest.java | 3 ++- .../io/reactivex/internal/operators/maybe/MaybeMapTest.java | 2 +- .../internal/operators/maybe/MaybeMaterializeTest.java | 2 +- .../internal/operators/maybe/MaybeMergeArrayTest.java | 2 +- .../reactivex/internal/operators/maybe/MaybeMergeTest.java | 2 +- .../internal/operators/maybe/MaybeMergeWithTest.java | 3 ++- .../reactivex/internal/operators/maybe/MaybeOfTypeTest.java | 2 +- .../internal/operators/maybe/MaybeOnErrorXTest.java | 2 +- .../reactivex/internal/operators/maybe/MaybePeekTest.java | 2 +- .../internal/operators/maybe/MaybeSubscribeOnTest.java | 2 +- .../operators/maybe/MaybeSwitchIfEmptySingleTest.java | 2 +- .../internal/operators/maybe/MaybeSwitchIfEmptyTest.java | 2 +- .../operators/maybe/MaybeTakeUntilPublisherTest.java | 2 +- .../internal/operators/maybe/MaybeTakeUntilTest.java | 2 +- .../internal/operators/maybe/MaybeTimeoutPublisherTest.java | 2 +- .../internal/operators/maybe/MaybeTimeoutTest.java | 2 +- .../reactivex/internal/operators/maybe/MaybeTimerTest.java | 2 +- .../internal/operators/maybe/MaybeToCompletableTest.java | 2 +- .../internal/operators/maybe/MaybeToFlowableTest.java | 2 +- .../internal/operators/maybe/MaybeToObservableTest.java | 2 +- .../internal/operators/maybe/MaybeToSingleTest.java | 2 +- .../internal/operators/maybe/MaybeUnsubscribeOnTest.java | 2 +- .../reactivex/internal/operators/maybe/MaybeUsingTest.java | 2 +- .../internal/operators/maybe/MaybeZipArrayTest.java | 2 +- .../internal/operators/maybe/MaybeZipIterableTest.java | 3 ++- .../operators/mixed/CompletableAndThenObservableTest.java | 2 +- .../operators/mixed/CompletableAndThenPublisherTest.java | 2 +- .../operators/mixed/FlowableConcatMapCompletableTest.java | 2 +- .../operators/mixed/FlowableConcatMapMaybeTest.java | 4 ++-- .../operators/mixed/FlowableConcatMapSingleTest.java | 4 ++-- .../operators/mixed/FlowableSwitchMapCompletableTest.java | 2 +- .../operators/mixed/FlowableSwitchMapMaybeTest.java | 2 +- .../operators/mixed/FlowableSwitchMapSingleTest.java | 2 +- .../operators/mixed/MaybeFlatMapObservableTest.java | 2 +- .../internal/operators/mixed/MaybeFlatMapPublisherTest.java | 2 +- .../operators/mixed/ObservableConcatMapCompletableTest.java | 2 +- .../operators/mixed/ObservableConcatMapMaybeTest.java | 4 ++-- .../operators/mixed/ObservableConcatMapSingleTest.java | 4 ++-- .../operators/mixed/ObservableSwitchMapCompletableTest.java | 2 +- .../operators/mixed/ObservableSwitchMapMaybeTest.java | 2 +- .../operators/mixed/ObservableSwitchMapSingleTest.java | 2 +- .../internal/operators/mixed/ScalarXMapZHelperTest.java | 3 ++- .../operators/mixed/SingleFlatMapObservableTest.java | 2 +- .../reactivex/internal/operators/single/SingleAmbTest.java | 6 +++--- .../internal/operators/single/SingleCacheTest.java | 2 +- .../operators/single/SingleConcatPublisherTest.java | 2 +- .../internal/operators/single/SingleConcatTest.java | 2 +- .../internal/operators/single/SingleContainstTest.java | 3 ++- .../internal/operators/single/SingleCreateTest.java | 2 +- .../internal/operators/single/SingleDeferTest.java | 3 ++- .../internal/operators/single/SingleDelayTest.java | 2 +- .../internal/operators/single/SingleDematerializeTest.java | 2 +- .../internal/operators/single/SingleDetachTest.java | 2 +- .../internal/operators/single/SingleDoAfterSuccessTest.java | 2 +- .../operators/single/SingleDoAfterTerminateTest.java | 2 +- .../internal/operators/single/SingleDoFinallyTest.java | 2 +- .../internal/operators/single/SingleDoOnTerminateTest.java | 3 ++- .../reactivex/internal/operators/single/SingleDoOnTest.java | 2 +- .../internal/operators/single/SingleEqualsTest.java | 2 +- .../internal/operators/single/SingleErrorTest.java | 3 ++- .../operators/single/SingleFlatMapCompletableTest.java | 2 +- .../operators/single/SingleFlatMapIterableFlowableTest.java | 2 +- .../single/SingleFlatMapIterableObservableTest.java | 2 +- .../internal/operators/single/SingleFlatMapMaybeTest.java | 2 +- .../internal/operators/single/SingleFlatMapTest.java | 2 +- .../internal/operators/single/SingleFromCallableTest.java | 2 +- .../internal/operators/single/SingleFromPublisherTest.java | 2 +- .../internal/operators/single/SingleFromSupplierTest.java | 2 +- .../reactivex/internal/operators/single/SingleFromTest.java | 2 +- .../reactivex/internal/operators/single/SingleHideTest.java | 2 +- .../internal/operators/single/SingleInternalHelperTest.java | 2 +- .../reactivex/internal/operators/single/SingleLiftTest.java | 2 +- .../reactivex/internal/operators/single/SingleMapTest.java | 3 ++- .../internal/operators/single/SingleMaterializeTest.java | 2 +- .../internal/operators/single/SingleMergeTest.java | 2 +- .../reactivex/internal/operators/single/SingleMiscTest.java | 3 ++- .../internal/operators/single/SingleObserveOnTest.java | 2 +- .../internal/operators/single/SingleOnErrorXTest.java | 2 +- .../internal/operators/single/SingleSubscribeOnTest.java | 2 +- .../internal/operators/single/SingleTakeUntilTest.java | 2 +- .../internal/operators/single/SingleTimeoutTest.java | 2 +- .../internal/operators/single/SingleTimerTest.java | 2 +- .../internal/operators/single/SingleToFlowableTest.java | 3 ++- .../internal/operators/single/SingleToObservableTest.java | 2 +- .../internal/operators/single/SingleUnsubscribeOnTest.java | 2 +- .../internal/operators/single/SingleUsingTest.java | 2 +- .../internal/operators/single/SingleZipArrayTest.java | 2 +- .../internal/operators/single/SingleZipIterableTest.java | 2 +- .../reactivex/internal/operators/single/SingleZipTest.java | 4 +++- 130 files changed, 157 insertions(+), 136 deletions(-) diff --git a/src/test/java/io/reactivex/internal/operators/maybe/AbstractMaybeWithUpstreamTest.java b/src/test/java/io/reactivex/internal/operators/maybe/AbstractMaybeWithUpstreamTest.java index cc2a2a7d3a..fa3b9b19cd 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/AbstractMaybeWithUpstreamTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/AbstractMaybeWithUpstreamTest.java @@ -13,6 +13,7 @@ package io.reactivex.internal.operators.maybe; +import io.reactivex.RxJavaTest; import org.junit.Test; import static org.junit.Assert.*; @@ -20,7 +21,7 @@ import io.reactivex.internal.functions.Functions; import io.reactivex.internal.fuseable.HasUpstreamMaybeSource; -public class AbstractMaybeWithUpstreamTest { +public class AbstractMaybeWithUpstreamTest extends RxJavaTest { @SuppressWarnings("unchecked") @Test diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeAmbTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeAmbTest.java index a39896004c..10361a5ef3 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeAmbTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeAmbTest.java @@ -33,7 +33,7 @@ import io.reactivex.subjects.*; import io.reactivex.testsupport.TestHelper; -public class MaybeAmbTest { +public class MaybeAmbTest extends RxJavaTest { @Test public void ambLots() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeCacheTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeCacheTest.java index 58178dec6d..181c9c20ab 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeCacheTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeCacheTest.java @@ -27,7 +27,7 @@ import io.reactivex.subscribers.TestSubscriber; import io.reactivex.testsupport.TestHelper; -public class MaybeCacheTest { +public class MaybeCacheTest extends RxJavaTest { @Test public void offlineSuccess() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeCallbackObserverTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeCallbackObserverTest.java index 8c8d4b7763..ab2fd44591 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeCallbackObserverTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeCallbackObserverTest.java @@ -13,6 +13,7 @@ package io.reactivex.internal.operators.maybe; +import io.reactivex.RxJavaTest; import io.reactivex.disposables.*; import io.reactivex.exceptions.*; import io.reactivex.functions.*; @@ -26,7 +27,7 @@ import static org.junit.Assert.*; -public class MaybeCallbackObserverTest { +public class MaybeCallbackObserverTest extends RxJavaTest { @Test public void dispose() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeConcatArrayTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeConcatArrayTest.java index 4ff3f1a0de..c30aa26651 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeConcatArrayTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeConcatArrayTest.java @@ -27,7 +27,7 @@ import io.reactivex.subscribers.TestSubscriber; import io.reactivex.testsupport.TestHelper; -public class MaybeConcatArrayTest { +public class MaybeConcatArrayTest extends RxJavaTest { @SuppressWarnings("unchecked") @Test diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeConcatIterableTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeConcatIterableTest.java index 8829d83f72..2ab1322066 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeConcatIterableTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeConcatIterableTest.java @@ -27,7 +27,7 @@ import io.reactivex.subscribers.TestSubscriber; import io.reactivex.testsupport.TestHelper; -public class MaybeConcatIterableTest { +public class MaybeConcatIterableTest extends RxJavaTest { @SuppressWarnings("unchecked") @Test diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeConcatPublisherTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeConcatPublisherTest.java index a7a2c4b3e3..c2515cd292 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeConcatPublisherTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeConcatPublisherTest.java @@ -18,7 +18,7 @@ import io.reactivex.*; -public class MaybeConcatPublisherTest { +public class MaybeConcatPublisherTest extends RxJavaTest { @Test public void scalar() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeContainsTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeContainsTest.java index 3ffd1d0e7f..ae913d239f 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeContainsTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeContainsTest.java @@ -25,7 +25,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.TestHelper; -public class MaybeContainsTest { +public class MaybeContainsTest extends RxJavaTest { @Test public void doesContain() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeCountTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeCountTest.java index 04808f76e1..f280578fbf 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeCountTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeCountTest.java @@ -25,7 +25,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.TestHelper; -public class MaybeCountTest { +public class MaybeCountTest extends RxJavaTest { @Test public void one() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeCreateTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeCreateTest.java index f711ed9f05..efc8ce668d 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeCreateTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeCreateTest.java @@ -26,7 +26,7 @@ import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.TestHelper; -public class MaybeCreateTest { +public class MaybeCreateTest extends RxJavaTest { @Test public void callbackThrows() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDelayOtherTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeDelayOtherTest.java index b1723f0f70..56d204beed 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDelayOtherTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeDelayOtherTest.java @@ -28,7 +28,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.*; -public class MaybeDelayOtherTest { +public class MaybeDelayOtherTest extends RxJavaTest { @Test public void justWithOnNext() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDelaySubscriptionTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeDelaySubscriptionTest.java index c146abd252..f2b01c0f59 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDelaySubscriptionTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeDelaySubscriptionTest.java @@ -31,7 +31,7 @@ import io.reactivex.schedulers.TestScheduler; import io.reactivex.testsupport.TestHelper; -public class MaybeDelaySubscriptionTest { +public class MaybeDelaySubscriptionTest extends RxJavaTest { @Test public void normal() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDelayTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeDelayTest.java index d71b6573c8..e667205abe 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDelayTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeDelayTest.java @@ -27,7 +27,7 @@ import io.reactivex.schedulers.TestScheduler; import io.reactivex.testsupport.TestHelper; -public class MaybeDelayTest { +public class MaybeDelayTest extends RxJavaTest { @Test public void success() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDetachTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeDetachTest.java index 4cc1746e8a..6fb425e7a2 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDetachTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeDetachTest.java @@ -28,7 +28,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.TestHelper; -public class MaybeDetachTest { +public class MaybeDetachTest extends RxJavaTest { @Test public void doubleSubscribe() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDoAfterSuccessTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeDoAfterSuccessTest.java index 7ac8714d45..a11fec7da2 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDoAfterSuccessTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeDoAfterSuccessTest.java @@ -28,7 +28,7 @@ import io.reactivex.subjects.PublishSubject; import io.reactivex.testsupport.TestHelper; -public class MaybeDoAfterSuccessTest { +public class MaybeDoAfterSuccessTest extends RxJavaTest { final List values = new ArrayList(); diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDoFinallyTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeDoFinallyTest.java index e966d3f102..6fa829bbeb 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDoFinallyTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeDoFinallyTest.java @@ -27,7 +27,7 @@ import io.reactivex.subjects.PublishSubject; import io.reactivex.testsupport.TestHelper; -public class MaybeDoFinallyTest implements Action { +public class MaybeDoFinallyTest extends RxJavaTest implements Action { int calls; diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDoOnEventTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeDoOnEventTest.java index e4d718d32c..fb8797c0ed 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDoOnEventTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeDoOnEventTest.java @@ -27,7 +27,7 @@ import io.reactivex.subjects.PublishSubject; import io.reactivex.testsupport.TestHelper; -public class MaybeDoOnEventTest { +public class MaybeDoOnEventTest extends RxJavaTest { @Test public void dispose() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDoOnTerminateTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeDoOnTerminateTest.java index b4edc5e2c4..3bc66d7a76 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeDoOnTerminateTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeDoOnTerminateTest.java @@ -18,6 +18,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Maybe; @@ -25,7 +26,7 @@ import io.reactivex.functions.Action; import io.reactivex.testsupport.*; -public class MaybeDoOnTerminateTest { +public class MaybeDoOnTerminateTest extends RxJavaTest { @Test(expected = NullPointerException.class) public void doOnTerminate() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeEmptyTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeEmptyTest.java index a47dddc4f6..bda0a2b147 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeEmptyTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeEmptyTest.java @@ -15,12 +15,13 @@ import static org.junit.Assert.*; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Maybe; import io.reactivex.internal.fuseable.ScalarSupplier; -public class MaybeEmptyTest { +public class MaybeEmptyTest extends RxJavaTest { @Test public void scalarSupplier() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeEqualTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeEqualTest.java index 893e10e28d..22203fe9ed 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeEqualTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeEqualTest.java @@ -20,7 +20,7 @@ import io.reactivex.functions.BiPredicate; import io.reactivex.testsupport.TestHelper; -public class MaybeEqualTest { +public class MaybeEqualTest extends RxJavaTest { @Test public void dispose() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeErrorTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeErrorTest.java index 0b8ece45af..6d4c7aa92a 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeErrorTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeErrorTest.java @@ -13,13 +13,14 @@ package io.reactivex.internal.operators.maybe; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Maybe; import io.reactivex.exceptions.TestException; import io.reactivex.functions.Supplier; -public class MaybeErrorTest { +public class MaybeErrorTest extends RxJavaTest { @Test public void errorSupplierThrows() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFilterSingleTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFilterSingleTest.java index 272a46c771..6a7deaec12 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFilterSingleTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFilterSingleTest.java @@ -22,7 +22,7 @@ import io.reactivex.subjects.PublishSubject; import io.reactivex.testsupport.TestHelper; -public class MaybeFilterSingleTest { +public class MaybeFilterSingleTest extends RxJavaTest { @Test public void error() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapBiSelectorTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapBiSelectorTest.java index a01c747af2..b60040f33c 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapBiSelectorTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapBiSelectorTest.java @@ -24,7 +24,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.TestHelper; -public class MaybeFlatMapBiSelectorTest { +public class MaybeFlatMapBiSelectorTest extends RxJavaTest { BiFunction stringCombine() { return new BiFunction() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapCompletableTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapCompletableTest.java index e0d546c3c8..0a399926e0 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapCompletableTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapCompletableTest.java @@ -20,7 +20,7 @@ import io.reactivex.functions.Function; import io.reactivex.testsupport.TestHelper; -public class MaybeFlatMapCompletableTest { +public class MaybeFlatMapCompletableTest extends RxJavaTest { @Test public void dispose() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java index faa315d1dd..d663deccab 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java @@ -31,7 +31,7 @@ import io.reactivex.subscribers.TestSubscriber; import io.reactivex.testsupport.*; -public class MaybeFlatMapIterableFlowableTest { +public class MaybeFlatMapIterableFlowableTest extends RxJavaTest { @Test public void normal() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java index e58eeb6902..ced1a6e02a 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java @@ -30,7 +30,7 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.*; -public class MaybeFlatMapIterableObservableTest { +public class MaybeFlatMapIterableObservableTest extends RxJavaTest { @Test public void normal() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapNotificationTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapNotificationTest.java index 350e8620e8..11c95b371e 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapNotificationTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapNotificationTest.java @@ -23,7 +23,7 @@ import io.reactivex.internal.functions.Functions; import io.reactivex.testsupport.*; -public class MaybeFlatMapNotificationTest { +public class MaybeFlatMapNotificationTest extends RxJavaTest { @Test public void dispose() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapSingleElementTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapSingleElementTest.java index 8f7c025529..2651e7bb4c 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapSingleElementTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapSingleElementTest.java @@ -20,7 +20,7 @@ import io.reactivex.functions.Function; import io.reactivex.testsupport.TestHelper; -public class MaybeFlatMapSingleElementTest { +public class MaybeFlatMapSingleElementTest extends RxJavaTest { @Test(expected = NullPointerException.class) public void flatMapSingleElementNull() { Maybe.just(1) diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapSingleTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapSingleTest.java index 2cb88bbd0e..903f60f84c 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapSingleTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlatMapSingleTest.java @@ -22,7 +22,7 @@ import io.reactivex.functions.Function; import io.reactivex.testsupport.TestHelper; -public class MaybeFlatMapSingleTest { +public class MaybeFlatMapSingleTest extends RxJavaTest { @Test(expected = NullPointerException.class) public void flatMapSingleNull() { Maybe.just(1) diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlattenTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlattenTest.java index 32ff003d22..21aa2f517a 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlattenTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFlattenTest.java @@ -20,7 +20,7 @@ import io.reactivex.functions.Function; import io.reactivex.testsupport.TestHelper; -public class MaybeFlattenTest { +public class MaybeFlattenTest extends RxJavaTest { @Test public void dispose() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromActionTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromActionTest.java index 3750621548..2640aeb995 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromActionTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromActionTest.java @@ -29,7 +29,7 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.TestHelper; -public class MaybeFromActionTest { +public class MaybeFromActionTest extends RxJavaTest { @Test(expected = NullPointerException.class) public void fromActionNull() { Maybe.fromAction(null); diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromCallableTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromCallableTest.java index db77db80a6..5ff7f4f87b 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromCallableTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromCallableTest.java @@ -32,7 +32,7 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.TestHelper; -public class MaybeFromCallableTest { +public class MaybeFromCallableTest extends RxJavaTest { @Test(expected = NullPointerException.class) public void fromCallableNull() { Maybe.fromCallable(null); diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromCompletableTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromCompletableTest.java index 4b97a24993..87a3f75b22 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromCompletableTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromCompletableTest.java @@ -22,7 +22,7 @@ import static org.junit.Assert.*; import org.junit.Test; -public class MaybeFromCompletableTest { +public class MaybeFromCompletableTest extends RxJavaTest { @Test(expected = NullPointerException.class) public void fromCompletableNull() { Maybe.fromCompletable(null); diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromFutureTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromFutureTest.java index d3874db3d0..e42da8ed98 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromFutureTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromFutureTest.java @@ -17,6 +17,7 @@ import java.util.concurrent.*; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Maybe; @@ -25,7 +26,7 @@ import io.reactivex.observers.TestObserver; import io.reactivex.schedulers.Schedulers; -public class MaybeFromFutureTest { +public class MaybeFromFutureTest extends RxJavaTest { @Test public void cancelImmediately() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromRunnableTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromRunnableTest.java index c214d061e1..080c7697ea 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromRunnableTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromRunnableTest.java @@ -29,7 +29,7 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.TestHelper; -public class MaybeFromRunnableTest { +public class MaybeFromRunnableTest extends RxJavaTest { @Test(expected = NullPointerException.class) public void fromRunnableNull() { Maybe.fromRunnable(null); diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromSingleTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromSingleTest.java index ed1e90b795..d563744054 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromSingleTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromSingleTest.java @@ -23,7 +23,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.TestHelper; -public class MaybeFromSingleTest { +public class MaybeFromSingleTest extends RxJavaTest { @Test(expected = NullPointerException.class) public void fromSingleNull() { Maybe.fromSingle(null); diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromSupplierTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromSupplierTest.java index 7d507f0fb8..df58c91aab 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromSupplierTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeFromSupplierTest.java @@ -32,7 +32,7 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.TestHelper; -public class MaybeFromSupplierTest { +public class MaybeFromSupplierTest extends RxJavaTest { @Test(expected = NullPointerException.class) public void fromSupplierNull() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeHideTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeHideTest.java index 59dbaff594..48d4e1cebf 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeHideTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeHideTest.java @@ -24,7 +24,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.TestHelper; -public class MaybeHideTest { +public class MaybeHideTest extends RxJavaTest { @Test public void normal() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeIgnoreElementTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeIgnoreElementTest.java index 0df16c1493..44e3f9d192 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeIgnoreElementTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeIgnoreElementTest.java @@ -20,7 +20,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.TestHelper; -public class MaybeIgnoreElementTest { +public class MaybeIgnoreElementTest extends RxJavaTest { @Test public void dispose() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeIsEmptySingleTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeIsEmptySingleTest.java index a2c2e591e5..8a8b3bbb80 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeIsEmptySingleTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeIsEmptySingleTest.java @@ -14,12 +14,14 @@ package io.reactivex.internal.operators.maybe; import static org.junit.Assert.*; + +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Maybe; import io.reactivex.internal.fuseable.HasUpstreamMaybeSource; -public class MaybeIsEmptySingleTest { +public class MaybeIsEmptySingleTest extends RxJavaTest { @Test public void source() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeIsEmptyTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeIsEmptyTest.java index 3ead1d728b..691fe7f05e 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeIsEmptyTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeIsEmptyTest.java @@ -22,7 +22,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.TestHelper; -public class MaybeIsEmptyTest { +public class MaybeIsEmptyTest extends RxJavaTest { @Test public void normal() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeJustTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeJustTest.java index fc3d5f0d2c..e332fa9ab3 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeJustTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeJustTest.java @@ -15,12 +15,13 @@ import static org.junit.Assert.*; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Maybe; import io.reactivex.internal.fuseable.ScalarSupplier; -public class MaybeJustTest { +public class MaybeJustTest extends RxJavaTest { @SuppressWarnings("unchecked") @Test diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeMapTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeMapTest.java index 59f8fc61fe..103271a259 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeMapTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeMapTest.java @@ -20,7 +20,7 @@ import io.reactivex.internal.functions.Functions; import io.reactivex.testsupport.TestHelper; -public class MaybeMapTest { +public class MaybeMapTest extends RxJavaTest { @Test public void doubleOnSubscribe() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeMaterializeTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeMaterializeTest.java index d9684f97bb..8d3f6982e0 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeMaterializeTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeMaterializeTest.java @@ -21,7 +21,7 @@ import io.reactivex.subjects.MaybeSubject; import io.reactivex.testsupport.TestHelper; -public class MaybeMaterializeTest { +public class MaybeMaterializeTest extends RxJavaTest { @Test @SuppressWarnings("unchecked") diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeMergeArrayTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeMergeArrayTest.java index 91d00272a4..e68dd103e5 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeMergeArrayTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeMergeArrayTest.java @@ -30,7 +30,7 @@ import io.reactivex.subscribers.TestSubscriber; import io.reactivex.testsupport.*; -public class MaybeMergeArrayTest { +public class MaybeMergeArrayTest extends RxJavaTest { @SuppressWarnings("unchecked") @Test diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeMergeTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeMergeTest.java index 9855a15a7b..4b8f262584 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeMergeTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeMergeTest.java @@ -23,7 +23,7 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.TestHelper; -public class MaybeMergeTest { +public class MaybeMergeTest extends RxJavaTest { @Test public void delayErrorWithMaxConcurrency() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeMergeWithTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeMergeWithTest.java index e2deaf6641..2aa47268ae 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeMergeWithTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeMergeWithTest.java @@ -13,11 +13,12 @@ package io.reactivex.internal.operators.maybe; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Maybe; -public class MaybeMergeWithTest { +public class MaybeMergeWithTest extends RxJavaTest { @Test public void normal() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeOfTypeTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeOfTypeTest.java index 985bf395f9..4e09a9a3c1 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeOfTypeTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeOfTypeTest.java @@ -22,7 +22,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.TestHelper; -public class MaybeOfTypeTest { +public class MaybeOfTypeTest extends RxJavaTest { @Test public void normal() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeOnErrorXTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeOnErrorXTest.java index c3b58c7434..57b3b12687 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeOnErrorXTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeOnErrorXTest.java @@ -24,7 +24,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.TestHelper; -public class MaybeOnErrorXTest { +public class MaybeOnErrorXTest extends RxJavaTest { @Test public void onErrorReturnConst() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybePeekTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybePeekTest.java index 4c4fefb851..60a664963b 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybePeekTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybePeekTest.java @@ -29,7 +29,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.*; -public class MaybePeekTest { +public class MaybePeekTest extends RxJavaTest { @Test public void disposed() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeSubscribeOnTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeSubscribeOnTest.java index 0911ab398d..bee9fe6b38 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeSubscribeOnTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeSubscribeOnTest.java @@ -19,7 +19,7 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.TestHelper; -public class MaybeSubscribeOnTest { +public class MaybeSubscribeOnTest extends RxJavaTest { @Test public void dispose() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeSwitchIfEmptySingleTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeSwitchIfEmptySingleTest.java index ebd9295f7e..2038100d65 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeSwitchIfEmptySingleTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeSwitchIfEmptySingleTest.java @@ -25,7 +25,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.TestHelper; -public class MaybeSwitchIfEmptySingleTest { +public class MaybeSwitchIfEmptySingleTest extends RxJavaTest { @Test public void nonEmpty() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeSwitchIfEmptyTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeSwitchIfEmptyTest.java index 25c8d2565b..e43e4498a9 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeSwitchIfEmptyTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeSwitchIfEmptyTest.java @@ -24,7 +24,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.TestHelper; -public class MaybeSwitchIfEmptyTest { +public class MaybeSwitchIfEmptyTest extends RxJavaTest { @Test public void nonEmpty() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeTakeUntilPublisherTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeTakeUntilPublisherTest.java index b40791b435..7f56391fe2 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeTakeUntilPublisherTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeTakeUntilPublisherTest.java @@ -27,7 +27,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.TestHelper; -public class MaybeTakeUntilPublisherTest { +public class MaybeTakeUntilPublisherTest extends RxJavaTest { @Test public void disposed() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeTakeUntilTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeTakeUntilTest.java index 8d6230b96c..c764c082aa 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeTakeUntilTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeTakeUntilTest.java @@ -28,7 +28,7 @@ import io.reactivex.subjects.MaybeSubject; import io.reactivex.testsupport.TestHelper; -public class MaybeTakeUntilTest { +public class MaybeTakeUntilTest extends RxJavaTest { @Test public void normalPublisher() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeTimeoutPublisherTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeTimeoutPublisherTest.java index 13b3a80169..4b293a3883 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeTimeoutPublisherTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeTimeoutPublisherTest.java @@ -27,7 +27,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.*; -public class MaybeTimeoutPublisherTest { +public class MaybeTimeoutPublisherTest extends RxJavaTest { @Test public void mainError() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeTimeoutTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeTimeoutTest.java index 04523dff65..1baed49110 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeTimeoutTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeTimeoutTest.java @@ -27,7 +27,7 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.*; -public class MaybeTimeoutTest { +public class MaybeTimeoutTest extends RxJavaTest { @Test public void normal() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeTimerTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeTimerTest.java index 24d334b672..093985eb5b 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeTimerTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeTimerTest.java @@ -26,7 +26,7 @@ import io.reactivex.schedulers.*; import io.reactivex.testsupport.TestHelper; -public class MaybeTimerTest { +public class MaybeTimerTest extends RxJavaTest { @Test public void dispose() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeToCompletableTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeToCompletableTest.java index d40624528b..d17925be3c 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeToCompletableTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeToCompletableTest.java @@ -21,7 +21,7 @@ import io.reactivex.internal.fuseable.HasUpstreamMaybeSource; import io.reactivex.testsupport.TestHelper; -public class MaybeToCompletableTest { +public class MaybeToCompletableTest extends RxJavaTest { @SuppressWarnings("unchecked") @Test diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeToFlowableTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeToFlowableTest.java index 76c9ca4bd4..2e9cbb343a 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeToFlowableTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeToFlowableTest.java @@ -23,7 +23,7 @@ import io.reactivex.internal.fuseable.HasUpstreamMaybeSource; import io.reactivex.testsupport.TestHelper; -public class MaybeToFlowableTest { +public class MaybeToFlowableTest extends RxJavaTest { @Test public void source() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeToObservableTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeToObservableTest.java index 89c8d13804..5b57f828e1 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeToObservableTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeToObservableTest.java @@ -21,7 +21,7 @@ import io.reactivex.internal.fuseable.HasUpstreamMaybeSource; import io.reactivex.testsupport.TestHelper; -public class MaybeToObservableTest { +public class MaybeToObservableTest extends RxJavaTest { @Test public void source() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeToSingleTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeToSingleTest.java index a406c7bac3..085a3cf61a 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeToSingleTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeToSingleTest.java @@ -22,7 +22,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.TestHelper; -public class MaybeToSingleTest { +public class MaybeToSingleTest extends RxJavaTest { @Test public void source() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeUnsubscribeOnTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeUnsubscribeOnTest.java index 7d664f990a..ceabe6b9de 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeUnsubscribeOnTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeUnsubscribeOnTest.java @@ -27,7 +27,7 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.TestHelper; -public class MaybeUnsubscribeOnTest { +public class MaybeUnsubscribeOnTest extends RxJavaTest { @Test public void normal() throws Exception { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeUsingTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeUsingTest.java index 0c94e16ce1..3c480e7b11 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeUsingTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeUsingTest.java @@ -29,7 +29,7 @@ import io.reactivex.subjects.PublishSubject; import io.reactivex.testsupport.*; -public class MaybeUsingTest { +public class MaybeUsingTest extends RxJavaTest { @Test public void resourceSupplierThrows() { diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeZipArrayTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeZipArrayTest.java index df29d02cf9..5809853da8 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeZipArrayTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeZipArrayTest.java @@ -28,7 +28,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.TestHelper; -public class MaybeZipArrayTest { +public class MaybeZipArrayTest extends RxJavaTest { final BiFunction addString = new BiFunction() { @Override diff --git a/src/test/java/io/reactivex/internal/operators/maybe/MaybeZipIterableTest.java b/src/test/java/io/reactivex/internal/operators/maybe/MaybeZipIterableTest.java index c316268473..44e6cb8835 100644 --- a/src/test/java/io/reactivex/internal/operators/maybe/MaybeZipIterableTest.java +++ b/src/test/java/io/reactivex/internal/operators/maybe/MaybeZipIterableTest.java @@ -17,6 +17,7 @@ import java.util.*; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Maybe; @@ -29,7 +30,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.TestHelper; -public class MaybeZipIterableTest { +public class MaybeZipIterableTest extends RxJavaTest { final Function addString = new Function() { @Override diff --git a/src/test/java/io/reactivex/internal/operators/mixed/CompletableAndThenObservableTest.java b/src/test/java/io/reactivex/internal/operators/mixed/CompletableAndThenObservableTest.java index d10d78b135..051c2db593 100644 --- a/src/test/java/io/reactivex/internal/operators/mixed/CompletableAndThenObservableTest.java +++ b/src/test/java/io/reactivex/internal/operators/mixed/CompletableAndThenObservableTest.java @@ -23,7 +23,7 @@ import io.reactivex.subjects.*; import io.reactivex.testsupport.TestHelper; -public class CompletableAndThenObservableTest { +public class CompletableAndThenObservableTest extends RxJavaTest { @Test public void cancelMain() { diff --git a/src/test/java/io/reactivex/internal/operators/mixed/CompletableAndThenPublisherTest.java b/src/test/java/io/reactivex/internal/operators/mixed/CompletableAndThenPublisherTest.java index 0d397d0a3e..e8e182abec 100644 --- a/src/test/java/io/reactivex/internal/operators/mixed/CompletableAndThenPublisherTest.java +++ b/src/test/java/io/reactivex/internal/operators/mixed/CompletableAndThenPublisherTest.java @@ -25,7 +25,7 @@ import io.reactivex.subscribers.TestSubscriber; import io.reactivex.testsupport.TestHelper; -public class CompletableAndThenPublisherTest { +public class CompletableAndThenPublisherTest extends RxJavaTest { @Test public void cancelMain() { diff --git a/src/test/java/io/reactivex/internal/operators/mixed/FlowableConcatMapCompletableTest.java b/src/test/java/io/reactivex/internal/operators/mixed/FlowableConcatMapCompletableTest.java index 258b1b9cbc..f6f6e2c90e 100644 --- a/src/test/java/io/reactivex/internal/operators/mixed/FlowableConcatMapCompletableTest.java +++ b/src/test/java/io/reactivex/internal/operators/mixed/FlowableConcatMapCompletableTest.java @@ -32,7 +32,7 @@ import io.reactivex.subjects.CompletableSubject; import io.reactivex.testsupport.*; -public class FlowableConcatMapCompletableTest { +public class FlowableConcatMapCompletableTest extends RxJavaTest { @Test public void simple() { diff --git a/src/test/java/io/reactivex/internal/operators/mixed/FlowableConcatMapMaybeTest.java b/src/test/java/io/reactivex/internal/operators/mixed/FlowableConcatMapMaybeTest.java index cceed98137..95237924f6 100644 --- a/src/test/java/io/reactivex/internal/operators/mixed/FlowableConcatMapMaybeTest.java +++ b/src/test/java/io/reactivex/internal/operators/mixed/FlowableConcatMapMaybeTest.java @@ -37,7 +37,7 @@ import io.reactivex.subscribers.TestSubscriber; import io.reactivex.testsupport.*; -public class FlowableConcatMapMaybeTest { +public class FlowableConcatMapMaybeTest extends RxJavaTest { @Test public void simple() { @@ -366,7 +366,7 @@ public MaybeSource apply(Integer v) assertFalse(pp.hasSubscribers()); } - @Test(timeout = 10000) + @Test public void cancelNoConcurrentClean() { TestSubscriber ts = new TestSubscriber(); ConcatMapMaybeSubscriber operator = diff --git a/src/test/java/io/reactivex/internal/operators/mixed/FlowableConcatMapSingleTest.java b/src/test/java/io/reactivex/internal/operators/mixed/FlowableConcatMapSingleTest.java index 2de949ff40..f620204e9c 100644 --- a/src/test/java/io/reactivex/internal/operators/mixed/FlowableConcatMapSingleTest.java +++ b/src/test/java/io/reactivex/internal/operators/mixed/FlowableConcatMapSingleTest.java @@ -35,7 +35,7 @@ import io.reactivex.subscribers.TestSubscriber; import io.reactivex.testsupport.*; -public class FlowableConcatMapSingleTest { +public class FlowableConcatMapSingleTest extends RxJavaTest { @Test public void simple() { @@ -284,7 +284,7 @@ public SingleSource apply(Integer v) assertFalse(pp.hasSubscribers()); } - @Test(timeout = 10000) + @Test public void cancelNoConcurrentClean() { TestSubscriber ts = new TestSubscriber(); ConcatMapSingleSubscriber operator = diff --git a/src/test/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapCompletableTest.java b/src/test/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapCompletableTest.java index d6f8248f3e..3674119989 100644 --- a/src/test/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapCompletableTest.java +++ b/src/test/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapCompletableTest.java @@ -31,7 +31,7 @@ import io.reactivex.subjects.CompletableSubject; import io.reactivex.testsupport.*; -public class FlowableSwitchMapCompletableTest { +public class FlowableSwitchMapCompletableTest extends RxJavaTest { @Test public void normal() { diff --git a/src/test/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapMaybeTest.java b/src/test/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapMaybeTest.java index 8e5a460626..ce6456b23e 100644 --- a/src/test/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapMaybeTest.java +++ b/src/test/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapMaybeTest.java @@ -33,7 +33,7 @@ import io.reactivex.subscribers.TestSubscriber; import io.reactivex.testsupport.*; -public class FlowableSwitchMapMaybeTest { +public class FlowableSwitchMapMaybeTest extends RxJavaTest { @Test public void simple() { diff --git a/src/test/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapSingleTest.java b/src/test/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapSingleTest.java index 80be5e1079..44ca692f87 100644 --- a/src/test/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapSingleTest.java +++ b/src/test/java/io/reactivex/internal/operators/mixed/FlowableSwitchMapSingleTest.java @@ -33,7 +33,7 @@ import io.reactivex.subscribers.TestSubscriber; import io.reactivex.testsupport.*; -public class FlowableSwitchMapSingleTest { +public class FlowableSwitchMapSingleTest extends RxJavaTest { @Test public void simple() { diff --git a/src/test/java/io/reactivex/internal/operators/mixed/MaybeFlatMapObservableTest.java b/src/test/java/io/reactivex/internal/operators/mixed/MaybeFlatMapObservableTest.java index 31a326fd68..9cbd1db68a 100644 --- a/src/test/java/io/reactivex/internal/operators/mixed/MaybeFlatMapObservableTest.java +++ b/src/test/java/io/reactivex/internal/operators/mixed/MaybeFlatMapObservableTest.java @@ -25,7 +25,7 @@ import io.reactivex.subjects.*; import io.reactivex.testsupport.TestHelper; -public class MaybeFlatMapObservableTest { +public class MaybeFlatMapObservableTest extends RxJavaTest { @Test public void cancelMain() { diff --git a/src/test/java/io/reactivex/internal/operators/mixed/MaybeFlatMapPublisherTest.java b/src/test/java/io/reactivex/internal/operators/mixed/MaybeFlatMapPublisherTest.java index 60a703502a..32db48fde4 100644 --- a/src/test/java/io/reactivex/internal/operators/mixed/MaybeFlatMapPublisherTest.java +++ b/src/test/java/io/reactivex/internal/operators/mixed/MaybeFlatMapPublisherTest.java @@ -27,7 +27,7 @@ import io.reactivex.subscribers.TestSubscriber; import io.reactivex.testsupport.TestHelper; -public class MaybeFlatMapPublisherTest { +public class MaybeFlatMapPublisherTest extends RxJavaTest { @Test public void cancelMain() { diff --git a/src/test/java/io/reactivex/internal/operators/mixed/ObservableConcatMapCompletableTest.java b/src/test/java/io/reactivex/internal/operators/mixed/ObservableConcatMapCompletableTest.java index 50c7ea3233..8cd6d652c9 100644 --- a/src/test/java/io/reactivex/internal/operators/mixed/ObservableConcatMapCompletableTest.java +++ b/src/test/java/io/reactivex/internal/operators/mixed/ObservableConcatMapCompletableTest.java @@ -30,7 +30,7 @@ import io.reactivex.subjects.*; import io.reactivex.testsupport.*; -public class ObservableConcatMapCompletableTest { +public class ObservableConcatMapCompletableTest extends RxJavaTest { @Test public void simple() { diff --git a/src/test/java/io/reactivex/internal/operators/mixed/ObservableConcatMapMaybeTest.java b/src/test/java/io/reactivex/internal/operators/mixed/ObservableConcatMapMaybeTest.java index 888c225885..2aa377413a 100644 --- a/src/test/java/io/reactivex/internal/operators/mixed/ObservableConcatMapMaybeTest.java +++ b/src/test/java/io/reactivex/internal/operators/mixed/ObservableConcatMapMaybeTest.java @@ -34,7 +34,7 @@ import io.reactivex.subjects.*; import io.reactivex.testsupport.*; -public class ObservableConcatMapMaybeTest { +public class ObservableConcatMapMaybeTest extends RxJavaTest { @Test public void simple() { @@ -371,7 +371,7 @@ public void scalarEmptySource() { assertFalse(ms.hasObservers()); } - @Test(timeout = 10000) + @Test public void cancelNoConcurrentClean() { TestObserver to = new TestObserver(); ConcatMapMaybeMainObserver operator = diff --git a/src/test/java/io/reactivex/internal/operators/mixed/ObservableConcatMapSingleTest.java b/src/test/java/io/reactivex/internal/operators/mixed/ObservableConcatMapSingleTest.java index e22530053e..b89c846057 100644 --- a/src/test/java/io/reactivex/internal/operators/mixed/ObservableConcatMapSingleTest.java +++ b/src/test/java/io/reactivex/internal/operators/mixed/ObservableConcatMapSingleTest.java @@ -32,7 +32,7 @@ import io.reactivex.subjects.*; import io.reactivex.testsupport.*; -public class ObservableConcatMapSingleTest { +public class ObservableConcatMapSingleTest extends RxJavaTest { @Test public void simple() { @@ -311,7 +311,7 @@ public void scalarEmptySource() { assertFalse(ss.hasObservers()); } - @Test(timeout = 10000) + @Test public void cancelNoConcurrentClean() { TestObserver to = new TestObserver(); ConcatMapSingleMainObserver operator = diff --git a/src/test/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapCompletableTest.java b/src/test/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapCompletableTest.java index 6e183cc5b3..830f93c6d4 100644 --- a/src/test/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapCompletableTest.java +++ b/src/test/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapCompletableTest.java @@ -29,7 +29,7 @@ import io.reactivex.subjects.*; import io.reactivex.testsupport.*; -public class ObservableSwitchMapCompletableTest { +public class ObservableSwitchMapCompletableTest extends RxJavaTest { @Test public void normal() { diff --git a/src/test/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapMaybeTest.java b/src/test/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapMaybeTest.java index 4264af01f4..809123bad8 100644 --- a/src/test/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapMaybeTest.java +++ b/src/test/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapMaybeTest.java @@ -30,7 +30,7 @@ import io.reactivex.subjects.*; import io.reactivex.testsupport.*; -public class ObservableSwitchMapMaybeTest { +public class ObservableSwitchMapMaybeTest extends RxJavaTest { @Test public void simple() { diff --git a/src/test/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapSingleTest.java b/src/test/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapSingleTest.java index bd50bcffc0..761872045b 100644 --- a/src/test/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapSingleTest.java +++ b/src/test/java/io/reactivex/internal/operators/mixed/ObservableSwitchMapSingleTest.java @@ -30,7 +30,7 @@ import io.reactivex.subjects.*; import io.reactivex.testsupport.*; -public class ObservableSwitchMapSingleTest { +public class ObservableSwitchMapSingleTest extends RxJavaTest { @Test public void simple() { diff --git a/src/test/java/io/reactivex/internal/operators/mixed/ScalarXMapZHelperTest.java b/src/test/java/io/reactivex/internal/operators/mixed/ScalarXMapZHelperTest.java index b4b785844d..828bd99163 100644 --- a/src/test/java/io/reactivex/internal/operators/mixed/ScalarXMapZHelperTest.java +++ b/src/test/java/io/reactivex/internal/operators/mixed/ScalarXMapZHelperTest.java @@ -13,11 +13,12 @@ package io.reactivex.internal.operators.mixed; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.testsupport.TestHelper; -public class ScalarXMapZHelperTest { +public class ScalarXMapZHelperTest extends RxJavaTest { @Test public void utilityClass() { diff --git a/src/test/java/io/reactivex/internal/operators/mixed/SingleFlatMapObservableTest.java b/src/test/java/io/reactivex/internal/operators/mixed/SingleFlatMapObservableTest.java index 198fc8f3e9..fde69e9652 100644 --- a/src/test/java/io/reactivex/internal/operators/mixed/SingleFlatMapObservableTest.java +++ b/src/test/java/io/reactivex/internal/operators/mixed/SingleFlatMapObservableTest.java @@ -25,7 +25,7 @@ import io.reactivex.subjects.*; import io.reactivex.testsupport.TestHelper; -public class SingleFlatMapObservableTest { +public class SingleFlatMapObservableTest extends RxJavaTest { @Test public void cancelMain() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleAmbTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleAmbTest.java index bfa53119ff..8c8011f30e 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleAmbTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleAmbTest.java @@ -31,7 +31,7 @@ import io.reactivex.subjects.*; import io.reactivex.testsupport.TestHelper; -public class SingleAmbTest { +public class SingleAmbTest extends RxJavaTest { @Test public void ambWithFirstFires() { PublishProcessor pp1 = PublishProcessor.create(); @@ -72,7 +72,7 @@ public void ambWithSecondFires() { } @SuppressWarnings("unchecked") - @Test(timeout = 1000) + @Test public void ambIterableWithFirstFires() { PublishProcessor pp1 = PublishProcessor.create(); PublishProcessor pp2 = PublishProcessor.create(); @@ -94,7 +94,7 @@ public void ambIterableWithFirstFires() { } @SuppressWarnings("unchecked") - @Test(timeout = 1000) + @Test public void ambIterableWithSecondFires() { PublishProcessor pp1 = PublishProcessor.create(); PublishProcessor pp2 = PublishProcessor.create(); diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleCacheTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleCacheTest.java index dfbcb39f3e..4a4457cd5e 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleCacheTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleCacheTest.java @@ -21,7 +21,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.TestHelper; -public class SingleCacheTest { +public class SingleCacheTest extends RxJavaTest { @Test public void cancelImmediately() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleConcatPublisherTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleConcatPublisherTest.java index 228396081e..692a3a0cce 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleConcatPublisherTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleConcatPublisherTest.java @@ -18,7 +18,7 @@ import io.reactivex.*; -public class SingleConcatPublisherTest { +public class SingleConcatPublisherTest extends RxJavaTest { @Test public void scalar() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleConcatTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleConcatTest.java index a89f6cea03..03e22acc93 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleConcatTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleConcatTest.java @@ -26,7 +26,7 @@ import io.reactivex.*; -public class SingleConcatTest { +public class SingleConcatTest extends RxJavaTest { @Test public void concatWith() { Single.just(1).concatWith(Single.just(2)) diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleContainstTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleContainstTest.java index c817c8cb51..c8761dfeea 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleContainstTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleContainstTest.java @@ -13,13 +13,14 @@ package io.reactivex.internal.operators.single; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Single; import io.reactivex.exceptions.TestException; import io.reactivex.functions.BiPredicate; -public class SingleContainstTest { +public class SingleContainstTest extends RxJavaTest { @Test public void comparerThrows() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleCreateTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleCreateTest.java index 9740a52613..b24e469e85 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleCreateTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleCreateTest.java @@ -27,7 +27,7 @@ import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.TestHelper; -public class SingleCreateTest { +public class SingleCreateTest extends RxJavaTest { @Test(expected = NullPointerException.class) public void nullArgument() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleDeferTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleDeferTest.java index 779b094345..6c5539bcb8 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleDeferTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleDeferTest.java @@ -13,12 +13,13 @@ package io.reactivex.internal.operators.single; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Single; import io.reactivex.functions.Supplier; -public class SingleDeferTest { +public class SingleDeferTest extends RxJavaTest { @Test public void normal() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleDelayTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleDelayTest.java index 13c23321fd..c2cc05026f 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleDelayTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleDelayTest.java @@ -33,7 +33,7 @@ import io.reactivex.subjects.PublishSubject; import io.reactivex.testsupport.TestHelper; -public class SingleDelayTest { +public class SingleDelayTest extends RxJavaTest { @Test public void delayOnSuccess() { final TestScheduler scheduler = new TestScheduler(); diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleDematerializeTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleDematerializeTest.java index 5dd6463780..d9e0ca4929 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleDematerializeTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleDematerializeTest.java @@ -22,7 +22,7 @@ import io.reactivex.subjects.SingleSubject; import io.reactivex.testsupport.TestHelper; -public class SingleDematerializeTest { +public class SingleDematerializeTest extends RxJavaTest { @Test public void success() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleDetachTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleDetachTest.java index 21cf14d838..c50810bffd 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleDetachTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleDetachTest.java @@ -28,7 +28,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.TestHelper; -public class SingleDetachTest { +public class SingleDetachTest extends RxJavaTest { @Test public void doubleSubscribe() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleDoAfterSuccessTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleDoAfterSuccessTest.java index ce4854e42e..e7bc12f133 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleDoAfterSuccessTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleDoAfterSuccessTest.java @@ -28,7 +28,7 @@ import io.reactivex.subjects.PublishSubject; import io.reactivex.testsupport.TestHelper; -public class SingleDoAfterSuccessTest { +public class SingleDoAfterSuccessTest extends RxJavaTest { final List values = new ArrayList(); diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleDoAfterTerminateTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleDoAfterTerminateTest.java index b9e64f41a7..20d424b86b 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleDoAfterTerminateTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleDoAfterTerminateTest.java @@ -29,7 +29,7 @@ import static org.junit.Assert.assertEquals; -public class SingleDoAfterTerminateTest { +public class SingleDoAfterTerminateTest extends RxJavaTest { private final int[] call = { 0 }; diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleDoFinallyTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleDoFinallyTest.java index 33482bac47..85298a9268 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleDoFinallyTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleDoFinallyTest.java @@ -26,7 +26,7 @@ import io.reactivex.subjects.PublishSubject; import io.reactivex.testsupport.TestHelper; -public class SingleDoFinallyTest implements Action { +public class SingleDoFinallyTest extends RxJavaTest implements Action { int calls; diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleDoOnTerminateTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleDoOnTerminateTest.java index 0e83ac7327..c669c709a8 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleDoOnTerminateTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleDoOnTerminateTest.java @@ -18,6 +18,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Single; @@ -25,7 +26,7 @@ import io.reactivex.functions.Action; import io.reactivex.testsupport.*; -public class SingleDoOnTerminateTest { +public class SingleDoOnTerminateTest extends RxJavaTest { @Test(expected = NullPointerException.class) public void doOnTerminate() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleDoOnTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleDoOnTest.java index 5a4e70c3bc..74d3c36686 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleDoOnTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleDoOnTest.java @@ -28,7 +28,7 @@ import io.reactivex.subjects.PublishSubject; import io.reactivex.testsupport.*; -public class SingleDoOnTest { +public class SingleDoOnTest extends RxJavaTest { @Test public void doOnDispose() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleEqualsTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleEqualsTest.java index 18ba3850b3..2cb39a386e 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleEqualsTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleEqualsTest.java @@ -22,7 +22,7 @@ import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.TestHelper; -public class SingleEqualsTest { +public class SingleEqualsTest extends RxJavaTest { @Test public void bothError() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleErrorTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleErrorTest.java index dc421d5e45..d46dad784b 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleErrorTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleErrorTest.java @@ -13,13 +13,14 @@ package io.reactivex.internal.operators.single; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Single; import io.reactivex.exceptions.TestException; import io.reactivex.functions.Supplier; -public class SingleErrorTest { +public class SingleErrorTest extends RxJavaTest { @Test public void errorSupplierThrows() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapCompletableTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapCompletableTest.java index 65048d231f..ce4972f48b 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapCompletableTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapCompletableTest.java @@ -19,7 +19,7 @@ import io.reactivex.functions.Function; import io.reactivex.testsupport.TestHelper; -public class SingleFlatMapCompletableTest { +public class SingleFlatMapCompletableTest extends RxJavaTest { @Test public void dispose() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapIterableFlowableTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapIterableFlowableTest.java index 1fc2b3b56d..23ed87beb0 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapIterableFlowableTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapIterableFlowableTest.java @@ -31,7 +31,7 @@ import io.reactivex.subscribers.TestSubscriber; import io.reactivex.testsupport.*; -public class SingleFlatMapIterableFlowableTest { +public class SingleFlatMapIterableFlowableTest extends RxJavaTest { @Test public void normal() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapIterableObservableTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapIterableObservableTest.java index f58f266359..f9a12c3e78 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapIterableObservableTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapIterableObservableTest.java @@ -30,7 +30,7 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.*; -public class SingleFlatMapIterableObservableTest { +public class SingleFlatMapIterableObservableTest extends RxJavaTest { @Test public void normal() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapMaybeTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapMaybeTest.java index a03c5bde03..4f231f1120 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapMaybeTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapMaybeTest.java @@ -20,7 +20,7 @@ import io.reactivex.functions.Function; import io.reactivex.testsupport.TestHelper; -public class SingleFlatMapMaybeTest { +public class SingleFlatMapMaybeTest extends RxJavaTest { @Test(expected = NullPointerException.class) public void flatMapMaybeNull() { Single.just(1) diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapTest.java index 02492e007d..0626770d43 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleFlatMapTest.java @@ -25,7 +25,7 @@ import io.reactivex.functions.*; import io.reactivex.testsupport.*; -public class SingleFlatMapTest { +public class SingleFlatMapTest extends RxJavaTest { @Test public void normal() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleFromCallableTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleFromCallableTest.java index 61cf31d3dd..00a9b83fef 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleFromCallableTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleFromCallableTest.java @@ -34,7 +34,7 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.*; -public class SingleFromCallableTest { +public class SingleFromCallableTest extends RxJavaTest { @Test public void fromCallableValue() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleFromPublisherTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleFromPublisherTest.java index 531b37a7d7..821102fc57 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleFromPublisherTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleFromPublisherTest.java @@ -28,7 +28,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.TestHelper; -public class SingleFromPublisherTest { +public class SingleFromPublisherTest extends RxJavaTest { @Test public void just() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleFromSupplierTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleFromSupplierTest.java index 9cc4dfb9b2..abd6515c44 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleFromSupplierTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleFromSupplierTest.java @@ -32,7 +32,7 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.TestHelper; -public class SingleFromSupplierTest { +public class SingleFromSupplierTest extends RxJavaTest { @Test public void fromSupplierValue() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleFromTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleFromTest.java index 745c676800..395c8bac38 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleFromTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleFromTest.java @@ -20,7 +20,7 @@ import io.reactivex.*; import io.reactivex.schedulers.Schedulers; -public class SingleFromTest { +public class SingleFromTest extends RxJavaTest { @Test public void fromFuture() throws Exception { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleHideTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleHideTest.java index 5b5305dec5..cf12cc63db 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleHideTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleHideTest.java @@ -21,7 +21,7 @@ import io.reactivex.subjects.PublishSubject; import io.reactivex.testsupport.TestHelper; -public class SingleHideTest { +public class SingleHideTest extends RxJavaTest { @Test public void error() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleInternalHelperTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleInternalHelperTest.java index 0a815f6521..6b318966ab 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleInternalHelperTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleInternalHelperTest.java @@ -22,7 +22,7 @@ import io.reactivex.*; import io.reactivex.testsupport.TestHelper; -public class SingleInternalHelperTest { +public class SingleInternalHelperTest extends RxJavaTest { @Test public void utilityClass() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleLiftTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleLiftTest.java index cf2345de35..df96ce4f42 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleLiftTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleLiftTest.java @@ -18,7 +18,7 @@ import io.reactivex.*; import io.reactivex.disposables.Disposable; -public class SingleLiftTest { +public class SingleLiftTest extends RxJavaTest { @Test public void normal() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleMapTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleMapTest.java index aec6579b90..c4108fadd4 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleMapTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleMapTest.java @@ -13,6 +13,7 @@ package io.reactivex.internal.operators.single; +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Single; @@ -20,7 +21,7 @@ import io.reactivex.functions.Function; import io.reactivex.testsupport.TestHelper; -public class SingleMapTest { +public class SingleMapTest extends RxJavaTest { @Test(expected = NullPointerException.class) public void mapNull() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleMaterializeTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleMaterializeTest.java index 77b6c6491e..8244ce5875 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleMaterializeTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleMaterializeTest.java @@ -21,7 +21,7 @@ import io.reactivex.subjects.SingleSubject; import io.reactivex.testsupport.TestHelper; -public class SingleMaterializeTest { +public class SingleMaterializeTest extends RxJavaTest { @Test @SuppressWarnings("unchecked") diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleMergeTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleMergeTest.java index ac4b163db2..b8e65f9b21 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleMergeTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleMergeTest.java @@ -24,7 +24,7 @@ import io.reactivex.plugins.RxJavaPlugins; import io.reactivex.testsupport.TestHelper; -public class SingleMergeTest { +public class SingleMergeTest extends RxJavaTest { @Test public void mergeSingleSingle() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleMiscTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleMiscTest.java index cf9006c152..b630fcb25e 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleMiscTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleMiscTest.java @@ -13,6 +13,7 @@ package io.reactivex.internal.operators.single; +import io.reactivex.RxJavaTest; import io.reactivex.Single; import io.reactivex.SingleObserver; import io.reactivex.SingleSource; @@ -33,7 +34,7 @@ import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertSame; -public class SingleMiscTest { +public class SingleMiscTest extends RxJavaTest { @Test public void never() { Single.never() diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleObserveOnTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleObserveOnTest.java index cf992ab55a..5df83dcae0 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleObserveOnTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleObserveOnTest.java @@ -23,7 +23,7 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.TestHelper; -public class SingleObserveOnTest { +public class SingleObserveOnTest extends RxJavaTest { @Test public void dispose() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleOnErrorXTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleOnErrorXTest.java index ab34c726fe..c3030889fc 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleOnErrorXTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleOnErrorXTest.java @@ -22,7 +22,7 @@ import io.reactivex.functions.Function; import io.reactivex.testsupport.*; -public class SingleOnErrorXTest { +public class SingleOnErrorXTest extends RxJavaTest { @Test public void returnSuccess() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleSubscribeOnTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleSubscribeOnTest.java index 5d0cac8f46..96948b0362 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleSubscribeOnTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleSubscribeOnTest.java @@ -28,7 +28,7 @@ import io.reactivex.subjects.PublishSubject; import io.reactivex.testsupport.TestHelper; -public class SingleSubscribeOnTest { +public class SingleSubscribeOnTest extends RxJavaTest { @Test public void normal() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleTakeUntilTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleTakeUntilTest.java index b8feebe7d0..d43a2144e2 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleTakeUntilTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleTakeUntilTest.java @@ -30,7 +30,7 @@ import io.reactivex.subjects.*; import io.reactivex.testsupport.TestHelper; -public class SingleTakeUntilTest { +public class SingleTakeUntilTest extends RxJavaTest { @Test public void mainSuccessPublisher() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleTimeoutTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleTimeoutTest.java index 31ea633d04..7c1d5aa54f 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleTimeoutTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleTimeoutTest.java @@ -31,7 +31,7 @@ import io.reactivex.subjects.*; import io.reactivex.testsupport.TestHelper; -public class SingleTimeoutTest { +public class SingleTimeoutTest extends RxJavaTest { @Test public void shouldUnsubscribeFromUnderlyingSubscriptionOnDispose() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleTimerTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleTimerTest.java index ddb175ff2b..8d6357f164 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleTimerTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleTimerTest.java @@ -26,7 +26,7 @@ import io.reactivex.schedulers.*; import io.reactivex.testsupport.TestHelper; -public class SingleTimerTest { +public class SingleTimerTest extends RxJavaTest { @Test public void disposed() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleToFlowableTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleToFlowableTest.java index e5122da657..a09b7938df 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleToFlowableTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleToFlowableTest.java @@ -13,6 +13,7 @@ package io.reactivex.internal.operators.single; +import io.reactivex.RxJavaTest; import io.reactivex.Single; import io.reactivex.functions.Function; import io.reactivex.subjects.PublishSubject; @@ -21,7 +22,7 @@ import org.junit.Test; import org.reactivestreams.Publisher; -public class SingleToFlowableTest { +public class SingleToFlowableTest extends RxJavaTest { @Test public void dispose() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleToObservableTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleToObservableTest.java index 516d0e5861..cd2bb0ede8 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleToObservableTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleToObservableTest.java @@ -20,7 +20,7 @@ import io.reactivex.subjects.PublishSubject; import io.reactivex.testsupport.TestHelper; -public class SingleToObservableTest { +public class SingleToObservableTest extends RxJavaTest { @Test public void dispose() { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleUnsubscribeOnTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleUnsubscribeOnTest.java index 9411a6990b..a1cff56532 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleUnsubscribeOnTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleUnsubscribeOnTest.java @@ -27,7 +27,7 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.testsupport.TestHelper; -public class SingleUnsubscribeOnTest { +public class SingleUnsubscribeOnTest extends RxJavaTest { @Test public void normal() throws Exception { diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleUsingTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleUsingTest.java index d90b0377c8..6214a129b5 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleUsingTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleUsingTest.java @@ -29,7 +29,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.*; -public class SingleUsingTest { +public class SingleUsingTest extends RxJavaTest { Function> mapper = new Function>() { @Override diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleZipArrayTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleZipArrayTest.java index 78f15159dd..a01806b686 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleZipArrayTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleZipArrayTest.java @@ -28,7 +28,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.TestHelper; -public class SingleZipArrayTest { +public class SingleZipArrayTest extends RxJavaTest { final BiFunction addString = new BiFunction() { @Override diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleZipIterableTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleZipIterableTest.java index 9de30ec530..2c81453d7a 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleZipIterableTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleZipIterableTest.java @@ -29,7 +29,7 @@ import io.reactivex.processors.PublishProcessor; import io.reactivex.testsupport.TestHelper; -public class SingleZipIterableTest { +public class SingleZipIterableTest extends RxJavaTest { final Function addString = new Function() { @Override diff --git a/src/test/java/io/reactivex/internal/operators/single/SingleZipTest.java b/src/test/java/io/reactivex/internal/operators/single/SingleZipTest.java index e60e8f517e..4b8cafe8a2 100644 --- a/src/test/java/io/reactivex/internal/operators/single/SingleZipTest.java +++ b/src/test/java/io/reactivex/internal/operators/single/SingleZipTest.java @@ -17,12 +17,14 @@ import java.util.concurrent.atomic.AtomicInteger; import static org.junit.Assert.*; + +import io.reactivex.RxJavaTest; import org.junit.Test; import io.reactivex.Single; import io.reactivex.functions.*; -public class SingleZipTest { +public class SingleZipTest extends RxJavaTest { @Test public void zip2() {