diff --git a/src/test/java/io/reactivex/rxjava3/completable/CompletableTest.java b/src/test/java/io/reactivex/rxjava3/completable/CompletableTest.java index d319e48861..904a31701a 100644 --- a/src/test/java/io/reactivex/rxjava3/completable/CompletableTest.java +++ b/src/test/java/io/reactivex/rxjava3/completable/CompletableTest.java @@ -26,7 +26,6 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.core.Observable; -import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.disposables.*; import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.*; @@ -156,11 +155,6 @@ public void complete() { c.blockingAwait(); } - @Test(expected = NullPointerException.class) - public void concatNull() { - Completable.concatArray((Completable[])null); - } - @Test public void concatEmpty() { Completable c = Completable.concatArray(); @@ -214,11 +208,6 @@ public void concatIterableEmpty() { c.blockingAwait(); } - @Test(expected = NullPointerException.class) - public void concatIterableNull() { - Completable.concat((Iterable)null); - } - @Test(expected = NullPointerException.class) public void concatIterableIteratorNull() { Completable c = Completable.concat(new Iterable() { @@ -231,13 +220,6 @@ public Iterator iterator() { c.blockingAwait(); } - @Test(expected = NullPointerException.class) - public void concatIterableWithNull() { - Completable c = Completable.concat(Arrays.asList(normal.completable, (Completable)null)); - - c.blockingAwait(); - } - @Test public void concatIterableSingle() { Completable c = Completable.concat(Collections.singleton(normal.completable)); @@ -367,11 +349,6 @@ public void accept(long v) { Assert.assertEquals(Arrays.asList(5L, 4L, 4L), requested); } - @Test(expected = NullPointerException.class) - public void createNull() { - Completable.unsafeCreate(null); - } - @Test(expected = NullPointerException.class) public void createOnSubscribeThrowsNPE() { Completable c = Completable.unsafeCreate(new CompletableSource() { @@ -424,11 +401,6 @@ public Completable get() { normal.assertSubscriptions(1); } - @Test(expected = NullPointerException.class) - public void deferNull() { - Completable.defer(null); - } - @Test(expected = NullPointerException.class) public void deferReturnsNull() { Completable c = Completable.defer(new Supplier() { @@ -463,11 +435,6 @@ public Completable get() { c.blockingAwait(); } - @Test(expected = NullPointerException.class) - public void errorSupplierNull() { - Completable.error((Supplier)null); - } - @Test(expected = TestException.class) public void errorSupplierNormal() { Completable c = Completable.error(new Supplier() { @@ -502,11 +469,6 @@ public void errorSupplierThrows() { c.blockingAwait(); } - @Test(expected = NullPointerException.class) - public void errorNull() { - Completable.error((Throwable)null); - } - @Test(expected = TestException.class) public void errorNormal() { Completable c = Completable.error(new TestException()); @@ -514,11 +476,6 @@ public void errorNormal() { c.blockingAwait(); } - @Test(expected = NullPointerException.class) - public void fromCallableNull() { - Completable.fromCallable(null); - } - @Test public void fromCallableNormal() { final AtomicInteger calls = new AtomicInteger(); @@ -545,11 +502,6 @@ public void fromCallableThrows() { c.blockingAwait(); } - @Test(expected = NullPointerException.class) - public void fromFlowableNull() { - Completable.fromPublisher(null); - } - @Test public void fromFlowableEmpty() { Completable c = Completable.fromPublisher(Flowable.empty()); @@ -578,11 +530,6 @@ public Throwable get() { c.blockingAwait(); } - @Test(expected = NullPointerException.class) - public void fromObservableNull() { - Completable.fromObservable(null); - } - @Test public void fromObservableEmpty() { Completable c = Completable.fromObservable(Observable.empty()); @@ -611,11 +558,6 @@ public Throwable get() { c.blockingAwait(); } - @Test(expected = NullPointerException.class) - public void fromActionNull() { - Completable.fromAction(null); - } - @Test public void fromActionNormal() { final AtomicInteger calls = new AtomicInteger(); @@ -642,11 +584,6 @@ public void fromActionThrows() { c.blockingAwait(); } - @Test(expected = NullPointerException.class) - public void fromSingleNull() { - Completable.fromSingle(null); - } - @Test public void fromSingleNormal() { Completable c = Completable.fromSingle(Single.just(1)); @@ -666,11 +603,6 @@ public Throwable get() { c.blockingAwait(); } - @Test(expected = NullPointerException.class) - public void mergeNull() { - Completable.mergeArray((Completable[])null); - } - @Test public void mergeEmpty() { Completable c = Completable.mergeArray(); @@ -724,11 +656,6 @@ public void mergeIterableEmpty() { c.blockingAwait(); } - @Test(expected = NullPointerException.class) - public void mergeIterableNull() { - Completable.merge((Iterable)null); - } - @Test(expected = NullPointerException.class) public void mergeIterableIteratorNull() { Completable c = Completable.merge(new Iterable() { @@ -741,13 +668,6 @@ public Iterator iterator() { c.blockingAwait(); } - @Test(expected = NullPointerException.class) - public void mergeIterableWithNull() { - Completable c = Completable.merge(Arrays.asList(normal.completable, (Completable)null)); - - c.blockingAwait(); - } - @Test public void mergeIterableSingle() { Completable c = Completable.merge(Collections.singleton(normal.completable)); @@ -878,11 +798,6 @@ public void accept(long v) { Assert.assertEquals(Arrays.asList(5L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L), requested); } - @Test(expected = NullPointerException.class) - public void mergeDelayErrorNull() { - Completable.mergeArrayDelayError((Completable[])null); - } - @Test public void mergeDelayErrorEmpty() { Completable c = Completable.mergeArrayDelayError(); @@ -940,11 +855,6 @@ public void mergeDelayErrorIterableEmpty() { c.blockingAwait(); } - @Test(expected = NullPointerException.class) - public void mergeDelayErrorIterableNull() { - Completable.mergeDelayError((Iterable)null); - } - @Test(expected = NullPointerException.class) public void mergeDelayErrorIterableIteratorNull() { Completable c = Completable.mergeDelayError(new Iterable() { @@ -957,13 +867,6 @@ public Iterator iterator() { c.blockingAwait(); } - @Test(expected = NullPointerException.class) - public void mergeDelayErrorIterableWithNull() { - Completable c = Completable.mergeDelayError(Arrays.asList(normal.completable, (Completable)null)); - - c.blockingAwait(); - } - @Test public void mergeDelayErrorIterableSingle() { Completable c = Completable.mergeDelayError(Collections.singleton(normal.completable)); @@ -1204,16 +1107,6 @@ public void onComplete() { Assert.assertEquals(0, calls.get()); } - @Test(expected = NullPointerException.class) - public void timerUnitNull() { - Completable.timer(1, null); - } - - @Test(expected = NullPointerException.class) - public void timerSchedulerNull() { - Completable.timer(1, TimeUnit.SECONDS, null); - } - @Test public void usingNormalEager() { final AtomicInteger dispose = new AtomicInteger(); @@ -1398,32 +1291,6 @@ public void onComplete() { Assert.assertFalse(complete.get()); } - @Test(expected = NullPointerException.class) - public void usingResourceSupplierNull() { - Completable.using(null, new Function() { - @Override - public Completable apply(Object v) { - return normal.completable; - } - }, new Consumer() { - @Override - public void accept(Object v) { } - }); - } - - @Test(expected = NullPointerException.class) - public void usingMapperNull() { - Completable.using(new Supplier() { - @Override - public Object get() { - return 1; - } - }, null, new Consumer() { - @Override - public void accept(Object v) { } - }); - } - @Test(expected = NullPointerException.class) public void usingMapperReturnsNull() { Completable c = Completable.using(new Supplier() { @@ -1444,21 +1311,6 @@ public void accept(Object v) { } c.blockingAwait(); } - @Test(expected = NullPointerException.class) - public void usingDisposeNull() { - Completable.using(new Supplier() { - @Override - public Object get() { - return 1; - } - }, new Function() { - @Override - public Completable apply(Object v) { - return normal.completable; - } - }, null); - } - @Test(expected = TestException.class) public void usingResourceThrows() { Completable c = Completable.using(new Supplier() { @@ -1530,11 +1382,6 @@ public Completable apply(Completable n) { c.blockingAwait(); } - @Test(expected = NullPointerException.class) - public void composeNull() { - error.completable.compose(null); - } - @Test public void concatWithNormal() { Completable c = normal.completable.concatWith(normal.completable); @@ -1551,21 +1398,6 @@ public void concatWithError() { c.blockingAwait(); } - @Test(expected = NullPointerException.class) - public void concatWithNull() { - normal.completable.concatWith(null); - } - - @Test(expected = NullPointerException.class) - public void delayUnitNull() { - normal.completable.delay(1, null); - } - - @Test(expected = NullPointerException.class) - public void delaySchedulerNull() { - normal.completable.delay(1, TimeUnit.SECONDS, null); - } - @Test public void delayNormal() throws InterruptedException { Completable c = normal.completable.delay(250, TimeUnit.MILLISECONDS); @@ -1712,11 +1544,6 @@ public void run() { Assert.assertEquals(0, calls.get()); } - @Test(expected = NullPointerException.class) - public void doOnCompleteNull() { - normal.completable.doOnComplete(null); - } - @Test(expected = TestException.class) public void doOnCompleteThrows() { Completable c = normal.completable.doOnComplete(new Action() { @@ -1794,11 +1621,6 @@ public void onComplete() { Assert.assertEquals(1, calls.get()); } - @Test(expected = NullPointerException.class) - public void doOnDisposeNull() { - normal.completable.doOnDispose(null); - } - @Test public void doOnDisposeThrows() { List errors = TestHelper.trackPluginErrors(); @@ -1868,11 +1690,6 @@ public void accept(Throwable e) { Assert.assertTrue(err.get() instanceof TestException); } - @Test(expected = NullPointerException.class) - public void doOnErrorNull() { - normal.completable.doOnError(null); - } - @Test public void doOnErrorThrows() { Completable c = error.completable.doOnError(new Consumer() { @@ -1908,11 +1725,6 @@ public void accept(Disposable d) { Assert.assertEquals(10, calls.get()); } - @Test(expected = NullPointerException.class) - public void doOnSubscribeNull() { - normal.completable.doOnSubscribe(null); - } - @Test(expected = TestException.class) public void doOnSubscribeThrows() { Completable c = normal.completable.doOnSubscribe(new Consumer() { @@ -1960,11 +1772,6 @@ public void run() { Assert.assertEquals(1, calls.get()); } - @Test(expected = NullPointerException.class) - public void liftNull() { - normal.completable.lift(null); - } - @Test(expected = NullPointerException.class) public void liftReturnsNull() { Completable c = normal.completable.lift(new CompletableOperator() { @@ -2015,11 +1822,6 @@ public void liftOnErrorComplete() { c.blockingAwait(); } - @Test(expected = NullPointerException.class) - public void mergeWithNull() { - normal.completable.mergeWith(null); - } - @Test public void mergeWithNormal() { Completable c = normal.completable.mergeWith(normal.completable); @@ -2029,11 +1831,6 @@ public void mergeWithNormal() { normal.assertSubscriptions(2); } - @Test(expected = NullPointerException.class) - public void observeOnNull() { - normal.completable.observeOn(null); - } - @Test public void observeOnNormal() throws InterruptedException { final AtomicReference name = new AtomicReference<>(); @@ -2120,16 +1917,6 @@ public boolean test(Throwable e) { c.blockingAwait(); } - @Test(expected = NullPointerException.class) - public void onErrorCompleteNull() { - error.completable.onErrorComplete(null); - } - - @Test(expected = NullPointerException.class) - public void onErrorResumeNextNull() { - error.completable.onErrorResumeNext(null); - } - @Test public void onErrorResumeNextFunctionReturnsNull() { Completable c = error.completable.onErrorResumeNext(new Function() { @@ -2314,16 +2101,6 @@ public boolean getAsBoolean() { Assert.assertEquals(5, calls.get()); } - @Test(expected = NullPointerException.class) - public void repeatUntilNull() { - normal.completable.repeatUntil(null); - } - - @Test(expected = NullPointerException.class) - public void repeatWhenNull() { - normal.completable.repeatWhen(null); - } - @Test public void retryNormal() { Completable c = normal.completable.retry(); @@ -2402,11 +2179,6 @@ public boolean test(Throwable e) { c.blockingAwait(); } - @Test(expected = NullPointerException.class) - public void retryPredicateNull() { - error.completable.retry((Predicate)null); - } - @Test public void retryPredicate5Times() { final AtomicInteger calls = new AtomicInteger(5); @@ -2538,22 +2310,6 @@ public void accept(Throwable e) { Assert.assertFalse("Not completed", complete.get()); } - @Test(expected = NullPointerException.class) - public void subscribeTwoCallbacksFirstNull() { - normal.completable.subscribe(new Action() { - @Override - public void run() { } - }, null); - } - - @Test(expected = NullPointerException.class) - public void subscribeTwoCallbacksSecondNull() { - normal.completable.subscribe(new Action() { - @Override - public void run() { } - }, null); - } - @Test public void subscribeTwoCallbacksCompleteThrows() { List errors = TestHelper.trackPluginErrors(); @@ -2651,26 +2407,6 @@ public void run() { } } - @Test(expected = NullPointerException.class) - public void subscribeActionNull() { - normal.completable.subscribe((Action)null); - } - - @Test(expected = NullPointerException.class) - public void subscribeSubscriberNull() { - normal.completable.toFlowable().subscribe((Subscriber)null); - } - - @Test(expected = NullPointerException.class) - public void subscribeObserverNull() { - normal.completable.toObservable().subscribe((Observer)null); - } - - @Test(expected = NullPointerException.class) - public void subscribeCompletableSubscriberNull() { - normal.completable.subscribe((CompletableObserver)null); - } - @Test public void subscribeSubscriberNormal() { TestSubscriber ts = new TestSubscriber<>(); @@ -2693,11 +2429,6 @@ public void subscribeSubscriberError() { ts.assertError(TestException.class); } - @Test(expected = NullPointerException.class) - public void subscribeOnNull() { - normal.completable.subscribeOn(null); - } - @Test public void subscribeOnNormal() { final AtomicReference name = new AtomicReference<>(); @@ -2763,21 +2494,6 @@ public Object call() throws Exception { normal.assertSubscriptions(0); } - @Test(expected = NullPointerException.class) - public void timeoutUnitNull() { - normal.completable.timeout(1, null); - } - - @Test(expected = NullPointerException.class) - public void timeoutSchedulerNull() { - normal.completable.timeout(1, TimeUnit.SECONDS, (Scheduler)null); - } - - @Test(expected = NullPointerException.class) - public void timeoutOtherNull() { - normal.completable.timeout(1, TimeUnit.SECONDS, (Completable)null); - } - @Test public void toNormal() { normal.completable @@ -2818,11 +2534,6 @@ public Flowable apply(Completable v) { .assertComplete(); } - @Test(expected = NullPointerException.class) - public void toNull() { - normal.completable.to(null); - } - @Test public void toFlowableNormal() { normal.completable.toFlowable().blockingForEach(Functions.emptyConsumer()); @@ -2863,11 +2574,6 @@ public Object get() { }).blockingGet(); } - @Test(expected = NullPointerException.class) - public void toSingleSupplierNull() { - normal.completable.toSingle(null); - } - @Test(expected = NullPointerException.class) public void toSingleSupplierReturnsNull() { normal.completable.toSingle(new Supplier() { @@ -2896,11 +2602,6 @@ public void toSingleDefaultNormal() { Assert.assertEquals((Integer)1, normal.completable.toSingleDefault(1).blockingGet()); } - @Test(expected = NullPointerException.class) - public void toSingleDefaultNull() { - normal.completable.toSingleDefault(null); - } - @Test public void unsubscribeOnNormal() throws InterruptedException { final AtomicReference name = new AtomicReference<>(); @@ -2942,11 +2643,6 @@ public void onComplete() { Assert.assertTrue(name.get().startsWith("RxComputation")); } - @Test(expected = NullPointerException.class) - public void ambArrayNull() { - Completable.ambArray((Completable[])null); - } - @Test public void ambArrayEmpty() { Completable c = Completable.ambArray(); @@ -3106,11 +2802,6 @@ public void ambIterableEmpty() { c.blockingAwait(); } - @Test(expected = NullPointerException.class) - public void ambIterableNull() { - Completable.amb((Iterable)null); - } - @Test public void ambIterableIteratorNull() { Completable.amb(new Iterable() { @@ -3184,11 +2875,6 @@ public void ambIterableIteratorNextThrows() { .assertError(TestException.class); } - @Test(expected = NullPointerException.class) - public void ambWithNull() { - normal.completable.ambWith(null); - } - @Test public void ambWithArrayOneFires() { PublishProcessor pp1 = PublishProcessor.create(); @@ -3424,21 +3110,6 @@ public void startWithObservableError() { to.assertNotComplete(); } - @Test(expected = NullPointerException.class) - public void startWithCompletableNull() { - normal.completable.startWith((Completable)null); - } - - @Test(expected = NullPointerException.class) - public void startWithFlowableNull() { - normal.completable.startWith((Flowable)null); - } - - @Test(expected = NullPointerException.class) - public void startWithObservableNull() { - normal.completable.startWith((Observable)null); - } - @Test public void andThen() { TestSubscriber ts = new TestSubscriber<>(0); @@ -3830,11 +3501,6 @@ public void run() { Assert.assertEquals(0, calls.get()); } - @Test(expected = NullPointerException.class) - public void doOnCompletedNull() { - normal.completable.doOnComplete(null); - } - @Test(expected = TestException.class) public void doOnCompletedThrows() { Completable c = normal.completable.doOnComplete(new Action() { @@ -3901,11 +3567,6 @@ public void run() { Assert.assertTrue("Closure not called", doneAfter.get()); } - @Test(expected = NullPointerException.class) - public void doAfterTerminateNull() { - normal.completable.doAfterTerminate(null); - } - @Test public void subscribeEmptyOnError() { expectUncaughtTestException(new Action() { @@ -3939,16 +3600,6 @@ public void run() { }); } - @Test(expected = NullPointerException.class) - public void andThenCompletableNull() { - normal.completable.andThen((Completable)null); - } - - @Test(expected = NullPointerException.class) - public void andThenFlowableNull() { - normal.completable.andThen((Observable)null); - } - @Test public void andThenCompletableNormal() { final AtomicBoolean run = new AtomicBoolean(); @@ -4286,11 +3937,6 @@ public void andThenSingle() { ts.assertNoErrors(); } - @Test(expected = NullPointerException.class) - public void fromFutureNull() { - Completable.fromFuture(null); - } - @Test public void fromFutureNormal() { ExecutorService exec = Executors.newSingleThreadExecutor(); @@ -4333,11 +3979,6 @@ public void run() { } } - @Test(expected = NullPointerException.class) - public void fromRunnableNull() { - Completable.fromRunnable(null); - } - @Test public void fromRunnableNormal() { final AtomicInteger calls = new AtomicInteger(); @@ -4364,41 +4005,6 @@ public void fromRunnableThrows() { c.blockingAwait(); } - @Test(expected = NullPointerException.class) - public void doOnErrorNullValue() { - Completable.complete().doOnError(null); - } - - @Test(expected = NullPointerException.class) - public void doOnSubscribeNullValue() { - Completable.complete().doOnSubscribe(null); - } - - @Test(expected = NullPointerException.class) - public void doAfterTerminateNullValue() { - Completable.complete().doAfterTerminate(null); - } - - @Test(expected = NullPointerException.class) - public void doOnTerminateNullValue() { - Completable.complete().doOnTerminate(null); - } - - @Test(expected = NullPointerException.class) - public void doOnCompleteNullValue() { - Completable.complete().doOnComplete(null); - } - - @Test(expected = NullPointerException.class) - public void doOnDisposeNullValue() { - Completable.complete().doOnDispose(null); - } - - @Test(expected = NullPointerException.class) - public void doOnEventNullValue() { - Completable.complete().doOnEvent(null); - } - @Test public void doOnEventComplete() { final AtomicInteger atomicInteger = new AtomicInteger(0); diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java index d76b90de70..b08d6824e5 100644 --- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java +++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java @@ -42,21 +42,11 @@ public class FlowableNullTests extends RxJavaTest { // Static methods //*********************************************************** - @Test(expected = NullPointerException.class) - public void ambVarargsNull() { - Flowable.ambArray((Publisher[])null); - } - @Test(expected = NullPointerException.class) public void ambVarargsOneIsNull() { Flowable.ambArray(Flowable.never(), null).blockingLast(); } - @Test(expected = NullPointerException.class) - public void ambIterableNull() { - Flowable.amb((Iterable>)null); - } - @Test public void ambIterableIteratorNull() { Flowable.amb(new Iterable>() { @@ -74,16 +64,6 @@ public void ambIterableOneIsNull() { .assertError(NullPointerException.class); } - @Test(expected = NullPointerException.class) - public void combineLatestIterableNull() { - Flowable.combineLatestDelayError((Iterable>)null, new Function() { - @Override - public Object apply(Object[] v) { - return 1; - } - }); - } - @Test(expected = NullPointerException.class) public void combineLatestIterableIteratorNull() { Flowable.combineLatestDelayError(new Iterable>() { @@ -109,11 +89,6 @@ public Object apply(Object[] v) { }).blockingLast(); } - @Test(expected = NullPointerException.class) - public void combineLatestIterableFunctionNull() { - Flowable.combineLatestDelayError(Arrays.asList(just1), null); - } - @Test(expected = NullPointerException.class) public void combineLatestIterableFunctionReturnsNull() { Flowable.combineLatestDelayError(Arrays.asList(just1), new Function() { @@ -124,11 +99,6 @@ public Object apply(Object[] v) { }).blockingLast(); } - @Test(expected = NullPointerException.class) - public void concatIterableNull() { - Flowable.concat((Iterable>)null); - } - @Test(expected = NullPointerException.class) public void concatIterableIteratorNull() { Flowable.concat(new Iterable>() { @@ -144,32 +114,11 @@ public void concatIterableOneIsNull() { Flowable.concat(Arrays.asList(just1, null)).blockingLast(); } - @Test(expected = NullPointerException.class) - public void concatPublisherNull() { - Flowable.concat((Publisher>)null); - - } - - @Test(expected = NullPointerException.class) - public void concatArrayNull() { - Flowable.concatArray((Publisher[])null); - } - @Test(expected = NullPointerException.class) public void concatArrayOneIsNull() { Flowable.concatArray(just1, null).blockingLast(); } - @Test(expected = NullPointerException.class) - public void createNull() { - Flowable.unsafeCreate(null); - } - - @Test(expected = NullPointerException.class) - public void deferFunctionNull() { - Flowable.defer(null); - } - @Test(expected = NullPointerException.class) public void deferFunctionReturnsNull() { Flowable.defer(new Supplier>() { @@ -180,11 +129,6 @@ public Publisher get() { }).blockingLast(); } - @Test(expected = NullPointerException.class) - public void errorFunctionNull() { - Flowable.error((Supplier)null); - } - @Test(expected = NullPointerException.class) public void errorFunctionReturnsNull() { Flowable.error(new Supplier() { @@ -195,26 +139,11 @@ public Throwable get() { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void errorThrowableNull() { - Flowable.error((Throwable)null); - } - - @Test(expected = NullPointerException.class) - public void fromArrayNull() { - Flowable.fromArray((Object[])null); - } - @Test(expected = NullPointerException.class) public void fromArrayOneIsNull() { Flowable.fromArray(1, null).blockingLast(); } - @Test(expected = NullPointerException.class) - public void fromCallableNull() { - Flowable.fromCallable(null); - } - @Test(expected = NullPointerException.class) public void fromCallableReturnsNull() { Flowable.fromCallable(new Callable() { @@ -225,11 +154,6 @@ public Object call() throws Exception { }).blockingLast(); } - @Test(expected = NullPointerException.class) - public void fromFutureNull() { - Flowable.fromFuture(null); - } - @Test public void fromFutureReturnsNull() { FutureTask f = new FutureTask<>(Functions.EMPTY_RUNNABLE, null); @@ -242,16 +166,6 @@ public void fromFutureReturnsNull() { ts.assertError(NullPointerException.class); } - @Test(expected = NullPointerException.class) - public void fromFutureTimedFutureNull() { - Flowable.fromFuture(null, 1, TimeUnit.SECONDS); - } - - @Test(expected = NullPointerException.class) - public void fromFutureTimedUnitNull() { - Flowable.fromFuture(new FutureTask<>(Functions.EMPTY_RUNNABLE, null), 1, null); - } - @Test(expected = NullPointerException.class) public void fromFutureTimedReturnsNull() { FutureTask f = new FutureTask<>(Functions.EMPTY_RUNNABLE, null); @@ -259,11 +173,6 @@ public void fromFutureTimedReturnsNull() { Flowable.fromFuture(f, 1, TimeUnit.SECONDS).blockingLast(); } - @Test(expected = NullPointerException.class) - public void fromIterableNull() { - Flowable.fromIterable(null); - } - @Test(expected = NullPointerException.class) public void fromIterableIteratorNull() { Flowable.fromIterable(new Iterable() { @@ -279,16 +188,6 @@ public void fromIterableValueNull() { Flowable.fromIterable(Arrays.asList(1, null)).blockingLast(); } - @Test(expected = NullPointerException.class) - public void fromPublisherNull() { - Flowable.fromPublisher(null); - } - - @Test(expected = NullPointerException.class) - public void generateConsumerNull() { - Flowable.generate(null); - } - @Test(expected = NullPointerException.class) public void generateConsumerEmitsNull() { Flowable.generate(new Consumer>() { @@ -361,66 +260,6 @@ public Object apply(Object s, Emitter o) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void generateConsumerDisposeNull() { - BiConsumer> generator = new BiConsumer>() { - @Override - public void accept(Integer s, Emitter o) { - o.onNext(1); - } - }; - Flowable.generate(new Supplier() { - @Override - public Integer get() { - return 1; - } - }, generator, null); - } - - @Test(expected = NullPointerException.class) - public void generateFunctionDisposeNull() { - Flowable.generate(new Supplier() { - @Override - public Object get() { - return 1; - } - }, new BiFunction, Object>() { - @Override - public Object apply(Object s, Emitter o) { - o.onNext(1); return s; - } - }, null); - } - - @Test(expected = NullPointerException.class) - public void intervalUnitNull() { - Flowable.interval(1, null); - } - - public void intervalSchedulerNull() { - Flowable.interval(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void intervalPeriodUnitNull() { - Flowable.interval(1, 1, null); - } - - @Test(expected = NullPointerException.class) - public void intervalPeriodSchedulerNull() { - Flowable.interval(1, 1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void intervalRangeUnitNull() { - Flowable.intervalRange(1, 1, 1, 1, null); - } - - @Test(expected = NullPointerException.class) - public void intervalRangeSchedulerNull() { - Flowable.intervalRange(1, 1, 1, 1, TimeUnit.SECONDS, null); - } - @Test public void justNull() throws Exception { @SuppressWarnings("rawtypes") @@ -448,11 +287,6 @@ public void justNull() throws Exception { } } - @Test(expected = NullPointerException.class) - public void mergeIterableNull() { - Flowable.merge((Iterable>)null, 128, 128); - } - @Test(expected = NullPointerException.class) public void mergeIterableIteratorNull() { Flowable.merge(new Iterable>() { @@ -468,21 +302,11 @@ public void mergeIterableOneIsNull() { Flowable.merge(Arrays.asList(just1, null), 128, 128).blockingLast(); } - @Test(expected = NullPointerException.class) - public void mergeArrayNull() { - Flowable.mergeArray(128, 128, (Publisher[])null); - } - @Test(expected = NullPointerException.class) public void mergeArrayOneIsNull() { Flowable.mergeArray(128, 128, just1, null).blockingLast(); } - @Test(expected = NullPointerException.class) - public void mergeDelayErrorIterableNull() { - Flowable.mergeDelayError((Iterable>)null, 128, 128); - } - @Test(expected = NullPointerException.class) public void mergeDelayErrorIterableIteratorNull() { Flowable.mergeDelayError(new Iterable>() { @@ -498,66 +322,11 @@ public void mergeDelayErrorIterableOneIsNull() { Flowable.mergeDelayError(Arrays.asList(just1, null), 128, 128).blockingLast(); } - @Test(expected = NullPointerException.class) - public void mergeDelayErrorArrayNull() { - Flowable.mergeArrayDelayError(128, 128, (Publisher[])null); - } - @Test(expected = NullPointerException.class) public void mergeDelayErrorArrayOneIsNull() { Flowable.mergeArrayDelayError(128, 128, just1, null).blockingLast(); } - @Test(expected = NullPointerException.class) - public void sequenceEqualFirstNull() { - Flowable.sequenceEqual(null, just1); - } - - @Test(expected = NullPointerException.class) - public void sequenceEqualSecondNull() { - Flowable.sequenceEqual(just1, null); - } - - @Test(expected = NullPointerException.class) - public void sequenceEqualComparatorNull() { - Flowable.sequenceEqual(just1, just1, null); - } - - @Test(expected = NullPointerException.class) - public void switchOnNextNull() { - Flowable.switchOnNext(null); - } - - @Test(expected = NullPointerException.class) - public void timerUnitNull() { - Flowable.timer(1, null); - } - - @Test(expected = NullPointerException.class) - public void timerSchedulerNull() { - Flowable.timer(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void usingResourceSupplierNull() { - Flowable.using(null, new Function>() { - @Override - public Publisher apply(Object d) { - return just1; - } - }, Functions.emptyConsumer()); - } - - @Test(expected = NullPointerException.class) - public void usingFlowableSupplierNull() { - Flowable.using(new Supplier() { - @Override - public Object get() { - return 1; - } - }, null, Functions.emptyConsumer()); - } - @Test(expected = NullPointerException.class) public void usingFlowableSupplierReturnsNull() { Flowable.using(new Supplier() { @@ -573,31 +342,6 @@ public Publisher apply(Object d) { }, Functions.emptyConsumer()).blockingLast(); } - @Test(expected = NullPointerException.class) - public void usingDisposeNull() { - Flowable.using(new Supplier() { - @Override - public Object get() { - return 1; - } - }, new Function>() { - @Override - public Publisher apply(Object d) { - return just1; - } - }, null); - } - - @Test(expected = NullPointerException.class) - public void zipIterableNull() { - Flowable.zip((Iterable>)null, new Function() { - @Override - public Object apply(Object[] v) { - return 1; - } - }); - } - @Test(expected = NullPointerException.class) public void zipIterableIteratorNull() { Flowable.zip(new Iterable>() { @@ -613,11 +357,6 @@ public Object apply(Object[] v) { }).blockingLast(); } - @Test(expected = NullPointerException.class) - public void zipIterableFunctionNull() { - Flowable.zip(Arrays.asList(just1, just1), null); - } - @Test(expected = NullPointerException.class) public void zipIterableFunctionReturnsNull() { Flowable.zip(Arrays.asList(just1, just1), new Function() { @@ -653,11 +392,6 @@ public Object apply(Object[] a) { }, true, 128).blockingLast(); } - @Test(expected = NullPointerException.class) - public void zipIterable2FunctionNull() { - Flowable.zip(Arrays.asList(just1, just1), null, true, 128); - } - @Test(expected = NullPointerException.class) public void zipIterable2FunctionReturnsNull() { Flowable.zip(Arrays.asList(just1, just1), new Function() { @@ -672,26 +406,6 @@ public Object apply(Object[] a) { // Instance methods //************************************************************* - @Test(expected = NullPointerException.class) - public void allPredicateNull() { - just1.all(null); - } - - @Test(expected = NullPointerException.class) - public void ambWithNull() { - just1.ambWith(null); - } - - @Test(expected = NullPointerException.class) - public void anyPredicateNull() { - just1.any(null); - } - - @Test(expected = NullPointerException.class) - public void bufferSupplierNull() { - just1.buffer(1, 1, (Supplier>)null); - } - @Test(expected = NullPointerException.class) public void bufferSupplierReturnsNull() { just1.buffer(1, 1, new Supplier>() { @@ -702,21 +416,6 @@ public Collection get() { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void bufferTimedUnitNull() { - just1.buffer(1L, 1L, null); - } - - @Test(expected = NullPointerException.class) - public void bufferTimedSchedulerNull() { - just1.buffer(1L, 1L, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void bufferTimedSupplierNull() { - just1.buffer(1L, 1L, TimeUnit.SECONDS, Schedulers.single(), null); - } - @Test(expected = NullPointerException.class) public void bufferTimedSupplierReturnsNull() { just1.buffer(1L, 1L, TimeUnit.SECONDS, Schedulers.single(), new Supplier>() { @@ -727,21 +426,6 @@ public Collection get() { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void bufferOpenCloseOpenNull() { - just1.buffer(null, new Function>() { - @Override - public Publisher apply(Object o) { - return just1; - } - }); - } - - @Test(expected = NullPointerException.class) - public void bufferOpenCloseCloseNull() { - just1.buffer(just1, (Function>)null); - } - @Test(expected = NullPointerException.class) public void bufferOpenCloseCloseReturnsNull() { just1.buffer(just1, new Function>() { @@ -752,16 +436,6 @@ public Publisher apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void bufferBoundaryNull() { - just1.buffer((Publisher)null); - } - - @Test(expected = NullPointerException.class) - public void bufferBoundarySupplierNull() { - just1.buffer(just1, (Supplier>)null); - } - @Test(expected = NullPointerException.class) public void bufferBoundarySupplierReturnsNull() { just1.buffer(just1, new Supplier>() { @@ -772,19 +446,6 @@ public Collection get() { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void castNull() { - just1.cast(null); - } - - @Test(expected = NullPointerException.class) - public void collectInitialSupplierNull() { - just1.collect((Supplier)null, new BiConsumer() { - @Override - public void accept(Integer a, Integer b) { } - }); - } - @Test(expected = NullPointerException.class) public void collectInitialSupplierReturnsNull() { just1.collect(new Supplier() { @@ -798,39 +459,6 @@ public void accept(Object a, Integer b) { } }).blockingGet(); } - @Test(expected = NullPointerException.class) - public void collectInitialCollectorNull() { - just1.collect(new Supplier() { - @Override - public Object get() { - return 1; - } - }, null); - } - - @Test(expected = NullPointerException.class) - public void collectIntoInitialNull() { - just1.collectInto(null, new BiConsumer() { - @Override - public void accept(Object a, Integer b) { } - }); - } - - @Test(expected = NullPointerException.class) - public void collectIntoCollectorNull() { - just1.collectInto(1, null); - } - - @Test(expected = NullPointerException.class) - public void composeNull() { - just1.compose(null); - } - - @Test(expected = NullPointerException.class) - public void concatMapNull() { - just1.concatMap(null); - } - @Test(expected = NullPointerException.class) public void concatMapReturnsNull() { just1.concatMap(new Function>() { @@ -841,11 +469,6 @@ public Publisher apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void concatMapIterableNull() { - just1.concatMapIterable(null); - } - @Test(expected = NullPointerException.class) public void concatMapIterableReturnNull() { just1.concatMapIterable(new Function>() { @@ -871,21 +494,6 @@ public Iterator iterator() { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void concatWithNull() { - just1.concatWith((Publisher)null); - } - - @Test(expected = NullPointerException.class) - public void containsNull() { - just1.contains(null); - } - - @Test(expected = NullPointerException.class) - public void debounceFunctionNull() { - just1.debounce(null); - } - @Test(expected = NullPointerException.class) public void debounceFunctionReturnsNull() { just1.debounce(new Function>() { @@ -896,26 +504,6 @@ public Publisher apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void debounceTimedUnitNull() { - just1.debounce(1, null); - } - - @Test(expected = NullPointerException.class) - public void debounceTimedSchedulerNull() { - just1.debounce(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void defaultIfEmptyNull() { - just1.defaultIfEmpty(null); - } - - @Test(expected = NullPointerException.class) - public void delayWithFunctionNull() { - just1.delay(null); - } - @Test(expected = NullPointerException.class) public void delayWithFunctionReturnsNull() { just1.delay(new Function>() { @@ -926,61 +514,6 @@ public Publisher apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void delayTimedUnitNull() { - just1.delay(1, null); - } - - @Test(expected = NullPointerException.class) - public void delayTimedSchedulerNull() { - just1.delay(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void delaySubscriptionTimedUnitNull() { - just1.delaySubscription(1, null); - } - - @Test(expected = NullPointerException.class) - public void delaySubscriptionTimedSchedulerNull() { - just1.delaySubscription(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void delaySubscriptionSupplierNull() { - just1.delaySubscription((Publisher)null); - } - - @Test(expected = NullPointerException.class) - public void delaySubscriptionFunctionNull() { - just1.delaySubscription((Publisher)null); - } - - @Test(expected = NullPointerException.class) - public void delayBothInitialSupplierNull() { - just1.delay(null, new Function>() { - @Override - public Publisher apply(Integer v) { - return just1; - } - }); - } - - @Test(expected = NullPointerException.class) - public void delayBothInitialSupplierReturnsNull() { - just1.delay(null, new Function>() { - @Override - public Publisher apply(Integer v) { - return just1; - } - }).blockingSubscribe(); - } - - @Test(expected = NullPointerException.class) - public void delayBothItemSupplierNull() { - just1.delay(just1, null); - } - @Test(expected = NullPointerException.class) public void delayBothItemSupplierReturnsNull() { just1.delay(just1, new Function>() { @@ -991,21 +524,6 @@ public Publisher apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void distinctFunctionNull() { - just1.distinct(null); - } - - @Test(expected = NullPointerException.class) - public void distinctSupplierNull() { - just1.distinct(new Function() { - @Override - public Object apply(Integer v) { - return v; - } - }, null); - } - @Test(expected = NullPointerException.class) public void distinctSupplierReturnsNull() { just1.distinct(new Function() { @@ -1031,16 +549,6 @@ public Object apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void distinctUntilChangedFunctionNull() { - just1.distinctUntilChanged((Function)null); - } - - @Test(expected = NullPointerException.class) - public void distinctUntilChangedBiPredicateNull() { - just1.distinctUntilChanged((BiPredicate)null); - } - @Test public void distinctUntilChangedFunctionReturnsNull() { Flowable.range(1, 2).distinctUntilChanged(new Function() { @@ -1051,109 +559,6 @@ public Object apply(Integer v) { }).test().assertResult(1); } - @Test(expected = NullPointerException.class) - public void doOnCancelNull() { - just1.doOnCancel(null); - } - - @Test(expected = NullPointerException.class) - public void doOnCompleteNull() { - just1.doOnComplete(null); - } - - @Test(expected = NullPointerException.class) - public void doOnEachSupplierNull() { - just1.doOnEach((Consumer>)null); - } - - @Test(expected = NullPointerException.class) - public void doOnEachSubscriberNull() { - just1.doOnEach((Subscriber)null); - } - - @Test(expected = NullPointerException.class) - public void doOnErrorNull() { - just1.doOnError(null); - } - - @Test(expected = NullPointerException.class) - public void doOnLifecycleOnSubscribeNull() { - just1.doOnLifecycle(null, new LongConsumer() { - @Override - public void accept(long v) { } - }, new Action() { - @Override - public void run() { } - }); - } - - @Test(expected = NullPointerException.class) - public void doOnLifecycleOnRequestNull() { - just1.doOnLifecycle(new Consumer() { - @Override - public void accept(Subscription s) { } - }, null, new Action() { - @Override - public void run() { } - }); - } - - @Test(expected = NullPointerException.class) - public void doOnLifecycleOnCancelNull() { - just1.doOnLifecycle(new Consumer() { - @Override - public void accept(Subscription s) { } - }, new LongConsumer() { - @Override - public void accept(long v) { } - }, null); - } - - @Test(expected = NullPointerException.class) - public void doOnNextNull() { - just1.doOnNext(null); - } - - @Test(expected = NullPointerException.class) - public void doOnRequestNull() { - just1.doOnRequest(null); - } - - @Test(expected = NullPointerException.class) - public void doOnSubscribeNull() { - just1.doOnSubscribe(null); - } - - @Test(expected = NullPointerException.class) - public void doOnTerminatedNull() { - just1.doOnTerminate(null); - } - - @Test(expected = NullPointerException.class) - public void elementAtNull() { - just1.elementAt(1, null); - } - - @Test(expected = NullPointerException.class) - public void filterNull() { - just1.filter(null); - } - - @Test(expected = NullPointerException.class) - public void doAfterTerminateNull() { - just1.doAfterTerminate(null); - } - - @Test(expected = NullPointerException.class) - public void firstNull() { - just1.first(null); - } - - @Test(expected = NullPointerException.class) - public void flatMapNull() { - just1.flatMap(null); - } - @Test(expected = NullPointerException.class) public void flatMapFunctionReturnsNull() { just1.flatMap(new Function>() { @@ -1164,21 +569,6 @@ public Publisher apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void flatMapNotificationOnNextNull() { - just1.flatMap(null, new Function>() { - @Override - public Publisher apply(Throwable e) { - return just1; - } - }, new Supplier>() { - @Override - public Publisher get() { - return just1; - } - }); - } - @Test(expected = NullPointerException.class) public void flatMapNotificationOnNextReturnsNull() { just1.flatMap(new Function>() { @@ -1199,36 +589,6 @@ public Publisher get() { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void flatMapNotificationOnErrorNull() { - just1.flatMap(new Function>() { - @Override - public Publisher apply(Integer v) { - return just1; - } - }, null, new Supplier>() { - @Override - public Publisher get() { - return just1; - } - }); - } - - @Test(expected = NullPointerException.class) - public void flatMapNotificationOnCompleteNull() { - just1.flatMap(new Function>() { - @Override - public Publisher apply(Integer v) { - return just1; - } - }, new Function>() { - @Override - public Publisher apply(Throwable e) { - return just1; - } - }, null); - } - @Test(expected = NullPointerException.class) public void flatMapNotificationOnCompleteReturnsNull() { just1.flatMap(new Function>() { @@ -1249,16 +609,6 @@ public Publisher get() { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void flatMapCombinerMapperNull() { - just1.flatMap(null, new BiFunction() { - @Override - public Object apply(Integer a, Object b) { - return 1; - } - }); - } - @Test(expected = NullPointerException.class) public void flatMapCombinerMapperReturnsNull() { just1.flatMap(new Function>() { @@ -1274,16 +624,6 @@ public Object apply(Integer a, Object b) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void flatMapCombinerCombinerNull() { - just1.flatMap(new Function>() { - @Override - public Publisher apply(Integer v) { - return just1; - } - }, null); - } - @Test(expected = NullPointerException.class) public void flatMapCombinerCombinerReturnsNull() { just1.flatMap(new Function>() { @@ -1299,11 +639,6 @@ public Object apply(Integer a, Integer b) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void flatMapIterableMapperNull() { - just1.flatMapIterable(null); - } - @Test(expected = NullPointerException.class) public void flatMapIterableMapperReturnsNull() { just1.flatMapIterable(new Function>() { @@ -1339,16 +674,6 @@ public Iterable apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void flatMapIterableCombinerNull() { - just1.flatMapIterable(new Function>() { - @Override - public Iterable apply(Integer v) { - return Arrays.asList(1); - } - }, null); - } - @Test(expected = NullPointerException.class) public void flatMapIterableCombinerReturnsNull() { just1.flatMapIterable(new Function>() { @@ -1364,44 +689,6 @@ public Object apply(Integer a, Integer b) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void forEachNull() { - just1.forEach(null); - } - - @Test(expected = NullPointerException.class) - public void forEachWhileNull() { - just1.forEachWhile(null); - } - - @Test(expected = NullPointerException.class) - public void forEachWhileOnErrorNull() { - just1.forEachWhile(new Predicate() { - @Override - public boolean test(Integer v) { - return true; - } - }, null); - } - - @Test(expected = NullPointerException.class) - public void forEachWhileOnCompleteNull() { - just1.forEachWhile(new Predicate() { - @Override - public boolean test(Integer v) { - return true; - } - }, new Consumer() { - @Override - public void accept(Throwable e) { } - }, null); - } - - @Test(expected = NullPointerException.class) - public void groupByNull() { - just1.groupBy(null); - } - public void groupByKeyNull() { just1.groupBy(new Function() { @Override @@ -1411,16 +698,6 @@ public Object apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void groupByValueNull() { - just1.groupBy(new Function() { - @Override - public Object apply(Integer v) { - return v; - } - }, null); - } - @Test(expected = NullPointerException.class) public void groupByValueReturnsNull() { just1.groupBy(new Function() { @@ -1436,16 +713,6 @@ public Object apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void lastNull() { - just1.last(null); - } - - @Test(expected = NullPointerException.class) - public void liftNull() { - just1.lift(null); - } - @Test(expected = NullPointerException.class) public void liftReturnsNull() { just1.lift(new FlowableOperator() { @@ -1456,11 +723,6 @@ public Subscriber apply(Subscriber s) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void mapNull() { - just1.map(null); - } - @Test(expected = NullPointerException.class) public void mapReturnsNull() { just1.map(new Function() { @@ -1471,36 +733,6 @@ public Object apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void mergeWithNull() { - just1.mergeWith((Publisher)null); - } - - @Test(expected = NullPointerException.class) - public void observeOnNull() { - just1.observeOn(null); - } - - @Test(expected = NullPointerException.class) - public void ofTypeNull() { - just1.ofType(null); - } - - @Test(expected = NullPointerException.class) - public void onBackpressureBufferOverflowNull() { - just1.onBackpressureBuffer(10, null); - } - - @Test(expected = NullPointerException.class) - public void onBackpressureDropActionNull() { - just1.onBackpressureDrop(null); - } - - @Test(expected = NullPointerException.class) - public void onErrorResumeNextNull() { - just1.onErrorResumeNext(null); - } - @Test public void onErrorResumeNextFunctionReturnsNull() { try { @@ -1519,21 +751,6 @@ public Publisher apply(Throwable e) { } } - @Test(expected = NullPointerException.class) - public void onErrorResumeWithNull() { - just1.onErrorResumeWith(null); - } - - @Test(expected = NullPointerException.class) - public void onErrorReturnFunctionNull() { - just1.onErrorReturn(null); - } - - @Test(expected = NullPointerException.class) - public void onErrorReturnValueNull() { - just1.onErrorReturnItem(null); - } - @Test public void onErrorReturnFunctionReturnsNull() { try { @@ -1552,11 +769,6 @@ public Object apply(Throwable e) { } } - @Test(expected = NullPointerException.class) - public void publishFunctionNull() { - just1.publish(null); - } - @Test(expected = NullPointerException.class) public void publishFunctionReturnsNull() { just1.publish(new Function, Publisher>() { @@ -1567,11 +779,6 @@ public Publisher apply(Flowable v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void reduceFunctionNull() { - just1.reduce(null); - } - @Test(expected = NullPointerException.class) public void reduceFunctionReturnsNull() { Flowable.just(1, 1).reduce(new BiFunction() { @@ -1582,21 +789,6 @@ public Integer apply(Integer a, Integer b) { }).toFlowable().blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void reduceSeedNull() { - just1.reduce(null, new BiFunction() { - @Override - public Object apply(Object a, Integer b) { - return 1; - } - }); - } - - @Test(expected = NullPointerException.class) - public void reduceSeedFunctionNull() { - just1.reduce(1, null); - } - @Test(expected = NullPointerException.class) public void reduceSeedFunctionReturnsNull() { just1.reduce(1, new BiFunction() { @@ -1632,16 +824,6 @@ public Object apply(Object a, Integer b) { }).blockingGet(); } - @Test(expected = NullPointerException.class) - public void repeatUntilNull() { - just1.repeatUntil(null); - } - - @Test(expected = NullPointerException.class) - public void repeatWhenNull() { - just1.repeatWhen(null); - } - @Test(expected = NullPointerException.class) public void repeatWhenFunctionReturnsNull() { just1.repeatWhen(new Function, Publisher>() { @@ -1667,454 +849,124 @@ public Publisher apply(Flowable f) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void replayBoundedSelectorNull() { - just1.replay((Function, Flowable>)null, 1, 1, TimeUnit.SECONDS); - } - @Test(expected = NullPointerException.class) public void replayBoundedSelectorReturnsNull() { just1.replay(new Function, Publisher>() { - @Override - public Publisher apply(Flowable v) { - return null; - } - }, 1, 1, TimeUnit.SECONDS).blockingSubscribe(); - } - - @Test(expected = NullPointerException.class) - public void replayBoundedUnitNull() { - just1.replay(new Function, Publisher>() { - @Override - public Publisher apply(Flowable v) { - return v; - } - }, 1, 1, null).blockingSubscribe(); - } - - @Test(expected = NullPointerException.class) - public void replayBoundedSchedulerNull() { - just1.replay(new Function, Publisher>() { - @Override - public Publisher apply(Flowable v) { - return v; - } - }, 1, 1, TimeUnit.SECONDS, null).blockingSubscribe(); - } - - @Test(expected = NullPointerException.class) - public void replayTimeBoundedSelectorNull() { - just1.replay(null, 1, TimeUnit.SECONDS, Schedulers.single()); - } - - @Test(expected = NullPointerException.class) - public void replayTimeBoundedSelectorReturnsNull() { - just1.replay(new Function, Publisher>() { - @Override - public Publisher apply(Flowable v) { - return null; - } - }, 1, TimeUnit.SECONDS, Schedulers.single()).blockingSubscribe(); - } - - @Test(expected = NullPointerException.class) - public void replaySelectorTimeBoundedUnitNull() { - just1.replay(new Function, Publisher>() { - @Override - public Publisher apply(Flowable v) { - return v; - } - }, 1, null, Schedulers.single()); - } - - @Test(expected = NullPointerException.class) - public void replaySelectorTimeBoundedSchedulerNull() { - just1.replay(new Function, Publisher>() { - @Override - public Publisher apply(Flowable v) { - return v; - } - }, 1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void replayTimeSizeBoundedUnitNull() { - just1.replay(1, 1, null, Schedulers.single()); - } - - @Test(expected = NullPointerException.class) - public void replayTimeSizeBoundedSchedulerNull() { - just1.replay(1, 1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void replayTimeBoundedUnitNull() { - just1.replay(1, null, Schedulers.single()); - } - - @Test(expected = NullPointerException.class) - public void replayTimeBoundedSchedulerNull() { - just1.replay(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void retryFunctionNull() { - just1.retry((BiPredicate)null); - } - - @Test(expected = NullPointerException.class) - public void retryCountFunctionNull() { - just1.retry(1, null); - } - - @Test(expected = NullPointerException.class) - public void retryPredicateNull() { - just1.retry((Predicate)null); - } - - @Test(expected = NullPointerException.class) - public void retryWhenFunctionNull() { - just1.retryWhen(null); - } - - @Test(expected = NullPointerException.class) - public void retryWhenFunctionReturnsNull() { - Flowable.error(new TestException()).retryWhen(new Function, Publisher>() { - @Override - public Publisher apply(Flowable f) { - return null; - } - }).blockingSubscribe(); - } - - @Test(expected = NullPointerException.class) - public void retryUntil() { - just1.retryUntil(null); - } - - @Test(expected = NullPointerException.class) - public void safeSubscribeNull() { - just1.safeSubscribe(null); - } - - @Test(expected = NullPointerException.class) - public void sampleUnitNull() { - just1.sample(1, null); - } - - @Test(expected = NullPointerException.class) - public void sampleSchedulerNull() { - just1.sample(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void samplePublisherNull() { - just1.sample(null); - } - - @Test(expected = NullPointerException.class) - public void scanFunctionNull() { - just1.scan(null); - } - - @Test(expected = NullPointerException.class) - public void scanFunctionReturnsNull() { - Flowable.just(1, 1).scan(new BiFunction() { - @Override - public Integer apply(Integer a, Integer b) { - return null; - } - }).blockingSubscribe(); - } - - @Test(expected = NullPointerException.class) - public void scanSeedNull() { - just1.scan(null, new BiFunction() { - @Override - public Object apply(Object a, Integer b) { - return 1; - } - }); - } - - @Test(expected = NullPointerException.class) - public void scanSeedFunctionNull() { - just1.scan(1, null); - } - - @Test(expected = NullPointerException.class) - public void scanSeedFunctionReturnsNull() { - just1.scan(1, new BiFunction() { - @Override - public Integer apply(Integer a, Integer b) { - return null; - } - }).blockingSubscribe(); - } - - @Test(expected = NullPointerException.class) - public void scanSeedSupplierNull() { - just1.scanWith(null, new BiFunction() { - @Override - public Object apply(Object a, Integer b) { - return 1; - } - }); - } - - @Test(expected = NullPointerException.class) - public void scanSeedSupplierReturnsNull() { - just1.scanWith(new Supplier() { - @Override - public Object get() { - return null; - } - }, new BiFunction() { - @Override - public Object apply(Object a, Integer b) { - return 1; - } - }).blockingSubscribe(); - } - - @Test(expected = NullPointerException.class) - public void scanSeedSupplierFunctionNull() { - just1.scanWith(new Supplier() { - @Override - public Object get() { - return 1; - } - }, null); - } - - @Test(expected = NullPointerException.class) - public void scanSeedSupplierFunctionReturnsNull() { - just1.scanWith(new Supplier() { - @Override - public Object get() { - return 1; - } - }, new BiFunction() { - @Override - public Object apply(Object a, Integer b) { - return null; - } - }).blockingSubscribe(); - } - - @Test(expected = NullPointerException.class) - public void singleNull() { - just1.single(null); - } - - @Test(expected = NullPointerException.class) - public void skipTimedUnitNull() { - just1.skip(1, null, Schedulers.single()); - } - - @Test(expected = NullPointerException.class) - public void skipTimedSchedulerNull() { - just1.skip(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void skipLastTimedUnitNull() { - just1.skipLast(1, null, Schedulers.single()); - } - - @Test(expected = NullPointerException.class) - public void skipLastTimedSchedulerNull() { - just1.skipLast(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void skipUntilNull() { - just1.skipUntil(null); - } - - @Test(expected = NullPointerException.class) - public void skipWhileNull() { - just1.skipWhile(null); - } - - @Test(expected = NullPointerException.class) - public void startWithIterableNull() { - just1.startWithIterable((Iterable)null); - } - - @Test(expected = NullPointerException.class) - public void startWithIterableIteratorNull() { - just1.startWithIterable(new Iterable() { - @Override - public Iterator iterator() { - return null; - } - }).blockingSubscribe(); - } - - @Test(expected = NullPointerException.class) - public void startWithIterableOneNull() { - just1.startWithIterable(Arrays.asList(1, null)).blockingSubscribe(); - } - - @Test(expected = NullPointerException.class) - public void startWithSingleNull() { - just1.startWithItem((Integer)null); - } - - @Test(expected = NullPointerException.class) - public void startWithPublisherNull() { - just1.startWith((Publisher)null); - } - - @Test(expected = NullPointerException.class) - public void startWithArrayNull() { - just1.startWithArray((Integer[])null); - } - - @Test(expected = NullPointerException.class) - public void startWithArrayOneNull() { - just1.startWithArray(1, null).blockingSubscribe(); - } - - @Test(expected = NullPointerException.class) - public void subscribeOnNextNull() { - just1.subscribe((Consumer)null); - } - - @Test(expected = NullPointerException.class) - public void subscribeOnErrorNull() { - just1.subscribe(Functions.emptyConsumer(), null); - } - - @Test(expected = NullPointerException.class) - public void subscribeOnCompleteNull() { - just1.subscribe(Functions.emptyConsumer(), Functions.emptyConsumer(), null); - } - - @Test(expected = NullPointerException.class) - public void subscribeNull() { - just1.subscribe((Subscriber)null); - } - - @Test(expected = NullPointerException.class) - public void subscribeNull2() { - just1.subscribe((FlowableSubscriber)null); - } - - @Test(expected = NullPointerException.class) - public void subscribeOnNull() { - just1.subscribeOn(null); - } - - @Test(expected = NullPointerException.class) - public void switchIfEmptyNull() { - just1.switchIfEmpty(null); - } - - @Test(expected = NullPointerException.class) - public void switchMapNull() { - just1.switchMap(null); - } - - @Test(expected = NullPointerException.class) - public void switchMapFunctionReturnsNull() { - just1.switchMap(new Function>() { - @Override - public Publisher apply(Integer v) { - return null; - } - }).blockingSubscribe(); - } - - @Test(expected = NullPointerException.class) - public void takeTimedUnitNull() { - just1.take(1, null, Schedulers.single()); - } - - @Test(expected = NullPointerException.class) - public void takeTimedSchedulerNull() { - just1.take(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void takeLastTimedUnitNull() { - just1.takeLast(1, null, Schedulers.single()); - } - - @Test(expected = NullPointerException.class) - public void takeLastSizeTimedUnitNull() { - just1.takeLast(1, 1, null, Schedulers.single()); - } - - @Test(expected = NullPointerException.class) - public void takeLastTimedSchedulerNull() { - just1.takeLast(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void takeLastSizeTimedSchedulerNull() { - just1.takeLast(1, 1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void takeUntilPredicateNull() { - just1.takeUntil((Predicate)null); + @Override + public Publisher apply(Flowable v) { + return null; + } + }, 1, 1, TimeUnit.SECONDS).blockingSubscribe(); } @Test(expected = NullPointerException.class) - public void takeUntilPublisherNull() { - just1.takeUntil((Publisher)null); + public void replayTimeBoundedSelectorReturnsNull() { + just1.replay(new Function, Publisher>() { + @Override + public Publisher apply(Flowable v) { + return null; + } + }, 1, TimeUnit.SECONDS, Schedulers.single()).blockingSubscribe(); } @Test(expected = NullPointerException.class) - public void takeWhileNull() { - just1.takeWhile(null); + public void retryWhenFunctionReturnsNull() { + Flowable.error(new TestException()).retryWhen(new Function, Publisher>() { + @Override + public Publisher apply(Flowable f) { + return null; + } + }).blockingSubscribe(); } @Test(expected = NullPointerException.class) - public void throttleFirstUnitNull() { - just1.throttleFirst(1, null, Schedulers.single()); + public void scanFunctionReturnsNull() { + Flowable.just(1, 1).scan(new BiFunction() { + @Override + public Integer apply(Integer a, Integer b) { + return null; + } + }).blockingSubscribe(); } @Test(expected = NullPointerException.class) - public void throttleFirstSchedulerNull() { - just1.throttleFirst(1, TimeUnit.SECONDS, null); + public void scanSeedNull() { + just1.scan(null, new BiFunction() { + @Override + public Object apply(Object a, Integer b) { + return 1; + } + }); } @Test(expected = NullPointerException.class) - public void throttleLastUnitNull() { - just1.throttleLast(1, null, Schedulers.single()); + public void scanSeedFunctionReturnsNull() { + just1.scan(1, new BiFunction() { + @Override + public Integer apply(Integer a, Integer b) { + return null; + } + }).blockingSubscribe(); } @Test(expected = NullPointerException.class) - public void throttleLastSchedulerNull() { - just1.throttleLast(1, TimeUnit.SECONDS, null); + public void scanSeedSupplierReturnsNull() { + just1.scanWith(new Supplier() { + @Override + public Object get() { + return null; + } + }, new BiFunction() { + @Override + public Object apply(Object a, Integer b) { + return 1; + } + }).blockingSubscribe(); } @Test(expected = NullPointerException.class) - public void throttleWithTimeoutUnitNull() { - just1.throttleWithTimeout(1, null, Schedulers.single()); + public void scanSeedSupplierFunctionReturnsNull() { + just1.scanWith(new Supplier() { + @Override + public Object get() { + return 1; + } + }, new BiFunction() { + @Override + public Object apply(Object a, Integer b) { + return null; + } + }).blockingSubscribe(); } @Test(expected = NullPointerException.class) - public void throttleWithTimeoutSchedulerNull() { - just1.throttleWithTimeout(1, TimeUnit.SECONDS, null); + public void startWithIterableIteratorNull() { + just1.startWithIterable(new Iterable() { + @Override + public Iterator iterator() { + return null; + } + }).blockingSubscribe(); } @Test(expected = NullPointerException.class) - public void timeIntervalUnitNull() { - just1.timeInterval(null, Schedulers.single()); + public void startWithIterableOneNull() { + just1.startWithIterable(Arrays.asList(1, null)).blockingSubscribe(); } @Test(expected = NullPointerException.class) - public void timeIntervalSchedulerNull() { - just1.timeInterval(TimeUnit.SECONDS, null); + public void startWithArrayOneNull() { + just1.startWithArray(1, null).blockingSubscribe(); } @Test(expected = NullPointerException.class) - public void timeoutSelectorNull() { - just1.timeout(null); + public void switchMapFunctionReturnsNull() { + just1.switchMap(new Function>() { + @Override + public Publisher apply(Integer v) { + return null; + } + }).blockingSubscribe(); } @Test(expected = NullPointerException.class) @@ -2137,36 +989,6 @@ public Publisher apply(Integer v) { }, null); } - @Test(expected = NullPointerException.class) - public void timeoutUnitNull() { - just1.timeout(1, null, Schedulers.single(), just1); - } - - @Test(expected = NullPointerException.class) - public void timeouOtherNull() { - just1.timeout(1, TimeUnit.SECONDS, Schedulers.single(), null); - } - - @Test(expected = NullPointerException.class) - public void timeouSchedulerNull() { - just1.timeout(1, TimeUnit.SECONDS, null, just1); - } - - @Test(expected = NullPointerException.class) - public void timeoutFirstNull() { - just1.timeout((Publisher)null, new Function>() { - @Override - public Publisher apply(Integer v) { - return just1; - } - }); - } - - @Test(expected = NullPointerException.class) - public void timeoutFirstItemNull() { - just1.timeout(just1, null); - } - @Test(expected = NullPointerException.class) public void timeoutFirstItemReturnsNull() { just1.timeout(Flowable.never(), new Function>() { @@ -2187,16 +1009,6 @@ public void timestampSchedulerNull() { just1.timestamp(TimeUnit.SECONDS, null); } - @Test(expected = NullPointerException.class) - public void toNull() { - just1.to(null); - } - - @Test(expected = NullPointerException.class) - public void toListNull() { - just1.toList(null); - } - @Test(expected = NullPointerException.class) public void toListSupplierReturnsNull() { just1.toList(new Supplier>() { @@ -2217,26 +1029,6 @@ public Collection get() { }).blockingGet(); } - @Test(expected = NullPointerException.class) - public void toSortedListNull() { - just1.toSortedList(null); - } - - @Test(expected = NullPointerException.class) - public void toMapKeyNullAllowed() { - just1.toMap(null); - } - - @Test(expected = NullPointerException.class) - public void toMapValueNull() { - just1.toMap(new Function() { - @Override - public Object apply(Integer v) { - return v; - } - }, null); - } - @Test public void toMapValueSelectorReturnsNull() { just1.toMap(new Function() { @@ -2252,21 +1044,6 @@ public Object apply(Integer v) { }).blockingGet(); } - @Test(expected = NullPointerException.class) - public void toMapMapSupplierNull() { - just1.toMap(new Function() { - @Override - public Object apply(Integer v) { - return v; - } - }, new Function() { - @Override - public Object apply(Integer v) { - return v; - } - }, null); - } - @Test(expected = NullPointerException.class) public void toMapMapSupplierReturnsNull() { just1.toMap(new Function() { @@ -2287,21 +1064,6 @@ public Map get() { }).blockingGet(); } - @Test(expected = NullPointerException.class) - public void toMultimapKeyNull() { - just1.toMultimap(null); - } - - @Test(expected = NullPointerException.class) - public void toMultimapValueNull() { - just1.toMultimap(new Function() { - @Override - public Object apply(Integer v) { - return v; - } - }, null); - } - @Test public void toMultiMapValueSelectorReturnsNullAllowed() { just1.toMap(new Function() { @@ -2317,21 +1079,6 @@ public Object apply(Integer v) { }).blockingGet(); } - @Test(expected = NullPointerException.class) - public void toMultimapMapMapSupplierNull() { - just1.toMultimap(new Function() { - @Override - public Object apply(Integer v) { - return v; - } - }, new Function() { - @Override - public Object apply(Integer v) { - return v; - } - }, null); - } - @Test(expected = NullPointerException.class) public void toMultimapMapSupplierReturnsNull() { just1.toMultimap(new Function() { @@ -2352,26 +1099,6 @@ public Map> get() { }).blockingGet(); } - @Test(expected = NullPointerException.class) - public void toMultimapMapMapCollectionSupplierNull() { - just1.toMultimap(new Function() { - @Override - public Integer apply(Integer v) { - return v; - } - }, new Function() { - @Override - public Integer apply(Integer v) { - return v; - } - }, new Supplier>>() { - @Override - public Map> get() { - return new HashMap<>(); - } - }, null); - } - @Test(expected = NullPointerException.class) public void toMultimapMapCollectionSupplierReturnsNull() { just1.toMultimap(new Function() { @@ -2397,36 +1124,6 @@ public Collection apply(Integer v) { }).blockingGet(); } - @Test(expected = NullPointerException.class) - public void unsubscribeOnNull() { - just1.unsubscribeOn(null); - } - - @Test(expected = NullPointerException.class) - public void windowTimedUnitNull() { - just1.window(1, null, Schedulers.single()); - } - - @Test(expected = NullPointerException.class) - public void windowSizeTimedUnitNull() { - just1.window(1, null, Schedulers.single(), 1); - } - - @Test(expected = NullPointerException.class) - public void windowTimedSchedulerNull() { - just1.window(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void windowSizeTimedSchedulerNull() { - just1.window(1, TimeUnit.SECONDS, null, 1); - } - - @Test(expected = NullPointerException.class) - public void windowBoundaryNull() { - just1.window((Publisher)null); - } - @Test(expected = NullPointerException.class) public void windowOpenCloseOpenNull() { just1.window(null, new Function>() { @@ -2437,11 +1134,6 @@ public Publisher apply(Object v) { }); } - @Test(expected = NullPointerException.class) - public void windowOpenCloseCloseNull() { - just1.window(just1, null); - } - @Test(expected = NullPointerException.class) public void windowOpenCloseCloseReturnsNull() { Flowable.never().window(just1, new Function>() { @@ -2462,11 +1154,6 @@ public Object apply(Integer a, Object b) { }); } - @Test(expected = NullPointerException.class) - public void withLatestFromCombinerNull() { - just1.withLatestFrom(just1, null); - } - @Test(expected = NullPointerException.class) public void withLatestFromCombinerReturnsNull() { just1.withLatestFrom(just1, new BiFunction() { @@ -2487,11 +1174,6 @@ public Object apply(Integer a, Integer b) { }); } - @Test(expected = NullPointerException.class) - public void zipWithIterableCombinerNull() { - just1.zipWith(Arrays.asList(1), null); - } - @Test(expected = NullPointerException.class) public void zipWithIterableCombinerReturnsNull() { just1.zipWith(Arrays.asList(1), new BiFunction() { @@ -2537,11 +1219,6 @@ public Object apply(Integer a, Integer b) { }); } - @Test(expected = NullPointerException.class) - public void zipWithCombinerNull() { - just1.zipWith(just1, null); - } - @Test(expected = NullPointerException.class) public void zipWithCombinerReturnsNull() { just1.zipWith(just1, new BiFunction() { @@ -2626,34 +1303,6 @@ public void serializedSubjectOnErrorNull() { processor.blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void doOnLifecycleOnDisposeNull() { - just1.doOnLifecycle(new Consumer() { - @Override - public void accept(Subscription s) { } - }, - new LongConsumer() { - @Override - public void accept(long v) throws Exception { } - }, - null); - } - - @Test(expected = NullPointerException.class) - public void zipWithFlowableNull() { - just1.zipWith((Flowable)null, new BiFunction() { - @Override - public Object apply(Integer a, Integer b) { - return 1; - } - }); - } - - @Test(expected = NullPointerException.class) - public void unsafeSubscribeNull() { - just1.subscribe((FlowableSubscriber)null); - } - @Test(expected = NullPointerException.class) public void combineLatestDelayErrorIterableFunctionReturnsNull() { Flowable.combineLatestDelayError(Arrays.asList(just1), new Function() { @@ -2664,26 +1313,6 @@ public Object apply(Object[] v) { }, 128).blockingLast(); } - @Test(expected = NullPointerException.class) - public void combineLatestDelayErrorIterableFunctionNull() { - Flowable.combineLatestDelayError(Arrays.asList(just1), null, 128); - } - - @Test(expected = NullPointerException.class) - public void concatFlowableNull() { - Flowable.concat((Flowable>)null); - } - - @Test(expected = NullPointerException.class) - public void combineLatestDelayErrorIterableNull() { - Flowable.combineLatestDelayError((Iterable>)null, new Function() { - @Override - public Object apply(Object[] v) { - return 1; - } - }, 128); - } - @Test(expected = NullPointerException.class) public void combineLatestDelayErrorIterableIteratorNull() { Flowable.combineLatestDelayError(new Iterable>() { @@ -2699,11 +1328,6 @@ public Object apply(Object[] v) { }, 128).blockingLast(); } - @Test(expected = NullPointerException.class) - public void doOnDisposeNull() { - just1.doOnCancel(null); - } - @Test(expected = NullPointerException.class) public void combineLatestDelayErrorIterableOneIsNull() { Flowable.combineLatestDelayError(Arrays.asList(Flowable.never(), null), new Function() { @@ -2713,24 +1337,4 @@ public Object apply(Object[] v) { } }, 128).blockingLast(); } - - @Test(expected = NullPointerException.class) - public void takeUntilFlowableNull() { - just1.takeUntil((Flowable)null); - } - - @Test(expected = NullPointerException.class) - public void startWithFlowableNull() { - just1.startWith((Flowable)null); - } - - @Test(expected = NullPointerException.class) - public void delaySubscriptionOtherNull() { - just1.delaySubscription((Flowable)null); - } - - @Test(expected = NullPointerException.class) - public void sampleFlowableNull() { - just1.sample(null); - } } diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableTests.java index 3d462efe0b..7662f3ebdf 100644 --- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableTests.java +++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableTests.java @@ -999,13 +999,6 @@ public void emptyIsEmpty() { verify(w, never()).onError(any(Throwable.class)); } - @Test(expected = NullPointerException.class) - public void forEachWithNull() { - Flowable.error(new Exception("boo")) - // - .forEach(null); - } - @Test public void extend() { final TestSubscriber subscriber = new TestSubscriber<>(); diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableabTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableabTest.java index c6b201be51..a98f3b5abb 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableabTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableabTest.java @@ -28,12 +28,6 @@ import io.reactivex.rxjava3.testsupport.TestHelper; public class CompletableAndThenCompletableabTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void andThenCompletableCompleteNull() { - Completable.complete() - .andThen((Completable) null); - } - @Test public void andThenCompletableCompleteComplete() { Completable.complete() diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenTest.java index 41656dbf33..b72fda422c 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenTest.java @@ -19,12 +19,6 @@ import io.reactivex.rxjava3.testsupport.TestHelper; public class CompletableAndThenTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void andThenMaybeNull() { - Completable.complete() - .andThen((Maybe) null); - } - @Test public void andThenMaybeCompleteValue() { Completable.complete() diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreateTest.java index 2ee2550872..d0323011fb 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreateTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreateTest.java @@ -29,11 +29,6 @@ public class CompletableCreateTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void nullArgument() { - Completable.create(null); - } - @Test public void basic() { List errors = TestHelper.trackPluginErrors(); diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoFinallyTest.java index cd0df19aaf..815482b02f 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoFinallyTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoFinallyTest.java @@ -65,11 +65,6 @@ public Completable apply(Completable f) throws Exception { }); } - @Test(expected = NullPointerException.class) - public void nullAction() { - Completable.complete().doFinally(null); - } - @Test public void actionThrows() { List errors = TestHelper.trackPluginErrors(); diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromActionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromActionTest.java index fb45fc3bad..56354fc448 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromActionTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromActionTest.java @@ -24,11 +24,6 @@ import io.reactivex.rxjava3.functions.Action; public class CompletableFromActionTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void fromActionNull() { - Completable.fromAction(null); - } - @Test public void fromAction() { final AtomicInteger atomicInteger = new AtomicInteger(); diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallableTest.java index 6cf88ce667..7bd5011ca7 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallableTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallableTest.java @@ -32,11 +32,6 @@ import io.reactivex.rxjava3.testsupport.TestHelper; public class CompletableFromCallableTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void fromCallableNull() { - Completable.fromCallable(null); - } - @Test public void fromCallable() { final AtomicInteger atomicInteger = new AtomicInteger(); diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromMaybeTest.java index 9158d449c3..2651f04f2c 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromMaybeTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromMaybeTest.java @@ -18,11 +18,6 @@ import io.reactivex.rxjava3.core.*; public class CompletableFromMaybeTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void fromMaybeNull() { - Completable.fromMaybe(null); - } - @Test public void fromMaybe() { Completable.fromMaybe(Maybe.just(1)) diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservableTest.java index 9869ed04db..ab72061437 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservableTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservableTest.java @@ -18,11 +18,6 @@ import io.reactivex.rxjava3.core.*; public class CompletableFromObservableTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void fromObservableNull() { - Completable.fromObservable(null); - } - @Test public void fromObservable() { Completable.fromObservable(Observable.just(1)) diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisherTest.java index 7cfd899262..c6d37d738d 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisherTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisherTest.java @@ -20,11 +20,6 @@ import io.reactivex.rxjava3.testsupport.TestHelper; public class CompletableFromPublisherTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void fromPublisherNull() { - Completable.fromPublisher(null); - } - @Test public void fromPublisher() { Completable.fromPublisher(Flowable.just(1)) diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnableTest.java index 276ae320b6..5d6473077f 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnableTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnableTest.java @@ -23,11 +23,6 @@ import io.reactivex.rxjava3.exceptions.TestException; public class CompletableFromRunnableTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void fromRunnableNull() { - Completable.fromRunnable(null); - } - @Test public void fromRunnable() { final AtomicInteger atomicInteger = new AtomicInteger(); diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingleTest.java index f9c6e82676..e8595f299e 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingleTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingleTest.java @@ -18,11 +18,6 @@ import io.reactivex.rxjava3.core.*; public class CompletableFromSingleTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void fromSingleNull() { - Completable.fromSingle(null); - } - @Test public void fromSingle() { Completable.fromSingle(Single.just(1)) diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplierTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplierTest.java index 73dda447c8..bcad666785 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplierTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplierTest.java @@ -34,11 +34,6 @@ public class CompletableFromSupplierTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void fromSupplierNull() { - Completable.fromSupplier(null); - } - @Test public void fromSupplier() { final AtomicInteger atomicInteger = new AtomicInteger(); diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java index d0c0adfb70..38b05b0920 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java @@ -31,19 +31,6 @@ public class FlowableCreateTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void sourceNull() { - Flowable.create(null, BackpressureStrategy.BUFFER); - } - - @Test(expected = NullPointerException.class) - public void modeNull() { - Flowable.create(new FlowableOnSubscribe() { - @Override - public void subscribe(FlowableEmitter s) throws Exception { } - }, null); - } - @Test public void basic() { List errors = TestHelper.trackPluginErrors(); @@ -767,11 +754,6 @@ public void subscribe(FlowableEmitter e) throws Exception { } } - @Test(expected = NullPointerException.class) - public void nullArgument() { - Flowable.create(null, BackpressureStrategy.MISSING); - } - @Test public void onErrorCrash() { for (BackpressureStrategy m : BackpressureStrategy.values()) { diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java index fde11b5ea1..bb9faa4bca 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java @@ -308,11 +308,6 @@ public void accept(Subscription s) { Assert.assertFalse(subscribed.get()); } - @Test(expected = NullPointerException.class) - public void otherNull() { - Flowable.just(1).delaySubscription((Flowable)null); - } - @Test public void badSourceOther() { TestHelper.checkBadSourceFlowable(new Function, Object>() { diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNextTest.java index 47f0d74e0b..2ef5d0e082 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNextTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNextTest.java @@ -133,11 +133,6 @@ public void asyncFused() { assertEquals(Arrays.asList(-1, -2, -3, -4, -5), values); } - @Test(expected = NullPointerException.class) - public void consumerNull() { - Flowable.just(1).doAfterNext(null); - } - @Test public void justConditional() { Flowable.just(1) diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java index 8249383dca..850c531203 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java @@ -297,11 +297,6 @@ public void asyncFusedBoundaryConditional() { assertEquals(1, calls); } - @Test(expected = NullPointerException.class) - public void nullAction() { - Flowable.just(1).doFinally(null); - } - @Test public void actionThrows() { List errors = TestHelper.trackPluginErrors(); diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java index 6385d58d95..d49111c25b 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java @@ -38,11 +38,6 @@ public class FlowableFromIterableTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void nullValue() { - Flowable.fromIterable(null); - } - @Test public void listIterable() { Flowable flowable = Flowable.fromIterable(Arrays. asList("one", "two", "three")); diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java index a877b1a390..cc5992862b 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java @@ -215,14 +215,6 @@ public void fixBackpressureBufferZeroCapacity2() throws InterruptedException { Flowable.empty().onBackpressureBuffer(0); } - @Test(expected = NullPointerException.class) - public void fixBackpressureBufferNullStrategy() throws InterruptedException { - Flowable.empty().onBackpressureBuffer(10, new Action() { - @Override - public void run() { } - }, null); - } - @Test public void noDelayError() { diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayTest.java index da75df361c..747b96faf1 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayTest.java @@ -53,16 +53,6 @@ public void complete() { .assertResult(); } - @Test(expected = NullPointerException.class) - public void nullUnit() { - Maybe.just(1).delay(1, null); - } - - @Test(expected = NullPointerException.class) - public void nullScheduler() { - Maybe.just(1).delay(1, TimeUnit.MILLISECONDS, null); - } - @Test public void disposeDuringDelay() { TestScheduler scheduler = new TestScheduler(); diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccessTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccessTest.java index d772193241..045f23de64 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccessTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccessTest.java @@ -77,11 +77,6 @@ public void empty() { assertTrue(values.isEmpty()); } - @Test(expected = NullPointerException.class) - public void consumerNull() { - Maybe.just(1).doAfterSuccess(null); - } - @Test public void justConditional() { Maybe.just(1) diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinallyTest.java index 1be982960e..fe54a5a299 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinallyTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinallyTest.java @@ -115,11 +115,6 @@ public void normalErrorConditional() { assertEquals(1, calls); } - @Test(expected = NullPointerException.class) - public void nullAction() { - Maybe.just(1).doFinally(null); - } - @Test public void actionThrows() { List errors = TestHelper.trackPluginErrors(); diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnTerminateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnTerminateTest.java index 8f93185207..cfcb6a548f 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnTerminateTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnTerminateTest.java @@ -27,11 +27,6 @@ public class MaybeDoOnTerminateTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void doOnTerminate() { - Maybe.just(1).doOnTerminate(null); - } - @Test public void doOnTerminateSuccess() { final AtomicBoolean atomicBoolean = new AtomicBoolean(); diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElementTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElementTest.java index c3409aed66..3d85785add 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElementTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElementTest.java @@ -21,12 +21,6 @@ import io.reactivex.rxjava3.testsupport.TestHelper; public class MaybeFlatMapSingleElementTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void flatMapSingleElementNull() { - Maybe.just(1) - .flatMapSingleElement(null); - } - @Test public void flatMapSingleElementValue() { Maybe.just(1).flatMapSingleElement(new Function>() { diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleTest.java index 60b1a98f3b..c4cef0d351 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleTest.java @@ -23,12 +23,6 @@ import io.reactivex.rxjava3.testsupport.TestHelper; public class MaybeFlatMapSingleTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void flatMapSingleNull() { - Maybe.just(1) - .flatMapSingle(null); - } - @Test public void flatMapSingleValue() { Maybe.just(1).flatMapSingle(new Function>() { diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromActionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromActionTest.java index ccd87877cd..4f1cc27355 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromActionTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromActionTest.java @@ -30,11 +30,6 @@ import io.reactivex.rxjava3.testsupport.TestHelper; public class MaybeFromActionTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void fromActionNull() { - Maybe.fromAction(null); - } - @Test public void fromAction() { final AtomicInteger atomicInteger = new AtomicInteger(); diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallableTest.java index b934f98fdf..70c432f5ae 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallableTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallableTest.java @@ -34,11 +34,6 @@ import io.reactivex.rxjava3.testsupport.TestHelper; public class MaybeFromCallableTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void fromCallableNull() { - Maybe.fromCallable(null); - } - @Test public void fromCallable() { final AtomicInteger atomicInteger = new AtomicInteger(); diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletableTest.java index 3549901863..c891714b69 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletableTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletableTest.java @@ -24,11 +24,6 @@ import io.reactivex.rxjava3.testsupport.TestHelper; public class MaybeFromCompletableTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void fromCompletableNull() { - Maybe.fromCompletable(null); - } - @Test public void fromCompletable() { Maybe.fromCompletable(Completable.complete()) diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnableTest.java index b5bc8d9727..37325c69c8 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnableTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnableTest.java @@ -30,11 +30,6 @@ import io.reactivex.rxjava3.testsupport.TestHelper; public class MaybeFromRunnableTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void fromRunnableNull() { - Maybe.fromRunnable(null); - } - @Test public void fromRunnable() { final AtomicInteger atomicInteger = new AtomicInteger(); diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingleTest.java index 989bb78985..108c38d30f 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingleTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingleTest.java @@ -24,11 +24,6 @@ import io.reactivex.rxjava3.testsupport.TestHelper; public class MaybeFromSingleTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void fromSingleNull() { - Maybe.fromSingle(null); - } - @Test public void fromSingle() { Maybe.fromSingle(Single.just(1)) diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplierTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplierTest.java index b8196e3917..247021b12b 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplierTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplierTest.java @@ -35,11 +35,6 @@ public class MaybeFromSupplierTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void fromSupplierNull() { - Maybe.fromSupplier(null); - } - @Test public void fromSupplier() { final AtomicInteger atomicInteger = new AtomicInteger(); diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java index f5be343b40..a0faf3179b 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java @@ -29,11 +29,6 @@ public class ObservableCreateTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void nullArgument() { - Observable.create(null); - } - @Test public void basic() { final Disposable d = Disposable.empty(); diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java index 411989a0f1..9c750bba88 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java @@ -145,11 +145,6 @@ public void asyncFused() { assertEquals(Arrays.asList(-1, -2, -3, -4, -5), values); } - @Test(expected = NullPointerException.class) - public void consumerNull() { - Observable.just(1).doAfterNext(null); - } - @Test public void justConditional() { Observable.just(1) diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java index 0cc21b8f13..6328a1ba4f 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java @@ -299,11 +299,6 @@ public void asyncFusedBoundaryConditional() { assertEquals(1, calls); } - @Test(expected = NullPointerException.class) - public void nullAction() { - Observable.just(1).doFinally(null); - } - @Test public void actionThrows() { List errors = TestHelper.trackPluginErrors(); diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java index d744472b66..a3c546933a 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java @@ -36,11 +36,6 @@ public class ObservableFromIterableTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void nullValue() { - Observable.fromIterable(null); - } - @Test public void listIterable() { Observable o = Observable.fromIterable(Arrays. asList("one", "two", "three")); diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java index 88f43e7452..2a1b1dad6e 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java @@ -651,12 +651,6 @@ public SingleSource apply(Object v) throws Exception { .assertError(NullPointerException.class); } - @Test(expected = NullPointerException.class) - public void switchMapSingleMapperIsNull() { - Observable.just(0) - .switchMapSingle(null); - } - @Test public void switchMapSingleFunctionDoesntReturnSingle() { Observable.just(0) diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCreateTest.java index 489744b708..79cb58c63b 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCreateTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCreateTest.java @@ -29,11 +29,6 @@ public class SingleCreateTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void nullArgument() { - Single.create(null); - } - @Test public void basic() { final Disposable d = Disposable.empty(); diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccessTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccessTest.java index 2090015950..8c2070f736 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccessTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccessTest.java @@ -67,11 +67,6 @@ public void error() { assertTrue(values.isEmpty()); } - @Test(expected = NullPointerException.class) - public void consumerNull() { - Single.just(1).doAfterSuccess(null); - } - @Test public void justConditional() { Single.just(1) diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminateTest.java index b4c8c1e7ca..f4c3adb720 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminateTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminateTest.java @@ -61,11 +61,6 @@ public void error() { assertAfterTerminateCalledOnce(); } - @Test(expected = NullPointerException.class) - public void afterTerminateActionNull() { - Single.just(1).doAfterTerminate(null); - } - @Test public void justConditional() { Single.just(1) diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinallyTest.java index 22f6e45c29..365b34f185 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinallyTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinallyTest.java @@ -65,11 +65,6 @@ public Single apply(Single f) throws Exception { }); } - @Test(expected = NullPointerException.class) - public void nullAction() { - Single.just(1).doFinally(null); - } - @Test public void actionThrows() { List errors = TestHelper.trackPluginErrors(); diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTerminateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTerminateTest.java index 58ba686e81..584c976d41 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTerminateTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTerminateTest.java @@ -27,11 +27,6 @@ public class SingleDoOnTerminateTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void doOnTerminate() { - Single.just(1).doOnTerminate(null); - } - @Test public void doOnTerminateSuccess() { final AtomicBoolean atomicBoolean = new AtomicBoolean(); diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybeTest.java index b98bf5537f..c11780324f 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybeTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybeTest.java @@ -21,12 +21,6 @@ import io.reactivex.rxjava3.testsupport.TestHelper; public class SingleFlatMapMaybeTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void flatMapMaybeNull() { - Single.just(1) - .flatMapMaybe(null); - } - @Test public void flatMapMaybeValue() { Single.just(1).flatMapMaybe(new Function>() { diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapTest.java index 1845a4967d..ea02529556 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapTest.java @@ -129,11 +129,6 @@ public Publisher apply(Integer v) throws Exception { .assertResult(1, 2, 3, 4, 5); } - @Test(expected = NullPointerException.class) - public void flatMapPublisherMapperNull() { - Single.just(1).flatMapPublisher(null); - } - @Test public void flatMapPublisherMapperThrows() { final TestException ex = new TestException(); @@ -215,12 +210,6 @@ public void run() throws Exception { ts.assertNotTerminated(); } - @Test(expected = NullPointerException.class) - public void flatMapNull() { - Single.just(1) - .flatMap(null); - } - @Test public void flatMapValue() { Single.just(1).flatMap(new Function>() { diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMapTest.java index 1ae83e9158..625c4f1f5b 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMapTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMapTest.java @@ -21,11 +21,6 @@ public class SingleMapTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void mapNull() { - Single.just(1).map(null); - } - @Test public void mapValue() { Single.just(1).map(new Function() { diff --git a/src/test/java/io/reactivex/rxjava3/maybe/MaybeCreateTest.java b/src/test/java/io/reactivex/rxjava3/maybe/MaybeCreateTest.java index ee97e25015..152a297e8d 100644 --- a/src/test/java/io/reactivex/rxjava3/maybe/MaybeCreateTest.java +++ b/src/test/java/io/reactivex/rxjava3/maybe/MaybeCreateTest.java @@ -27,11 +27,6 @@ import io.reactivex.rxjava3.testsupport.TestHelper; public class MaybeCreateTest extends RxJavaTest { - @Test(expected = NullPointerException.class) - public void nullArgument() { - Maybe.create(null); - } - @Test public void basic() { List errors = TestHelper.trackPluginErrors(); diff --git a/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java index b5a03ede3b..7a0fe1ae7d 100644 --- a/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java +++ b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java @@ -172,11 +172,6 @@ public void just() { .assertResult(1); } - @Test(expected = NullPointerException.class) - public void justNull() { - Maybe.just(null); - } - @Test public void empty() { Maybe.empty() @@ -194,16 +189,6 @@ public void never() { .assertNotComplete(); } - @Test(expected = NullPointerException.class) - public void errorNull() { - Maybe.error((Throwable)null); - } - - @Test(expected = NullPointerException.class) - public void errorSupplierNull() { - Maybe.error((Supplier)null); - } - @Test public void error() { Maybe.error(new TestException()) @@ -243,11 +228,6 @@ public void wrapMaybe() { assertSame(Maybe.empty(), Maybe.wrap(Maybe.empty())); } - @Test(expected = NullPointerException.class) - public void wrapNull() { - Maybe.wrap(null); - } - @Test public void emptySingleton() { assertSame(Maybe.empty(), Maybe.empty()); @@ -258,11 +238,6 @@ public void neverSingleton() { assertSame(Maybe.never(), Maybe.never()); } - @Test(expected = NullPointerException.class) - public void liftNull() { - Maybe.just(1).lift(null); - } - @Test public void liftJust() { Maybe.just(1).lift(new MaybeOperator() { @@ -287,11 +262,6 @@ public MaybeObserver apply(MaybeObserver t) th .assertFailure(TestException.class); } - @Test(expected = NullPointerException.class) - public void deferNull() { - Maybe.defer(null); - } - @Test public void deferThrows() { Maybe.defer(new Supplier>() { @@ -364,11 +334,6 @@ public void subscribe(MaybeObserver observer) { .assertResult(1); } - @Test(expected = NullPointerException.class) - public void unsafeCreateNull() { - Maybe.unsafeCreate(null); - } - @Test public void to() { Maybe.just(1).to(new MaybeConverter>() { @@ -393,16 +358,6 @@ public Flowable apply(Maybe v) { .assertResult(1); } - @Test(expected = NullPointerException.class) - public void toNull() { - Maybe.just(1).to(null); - } - - @Test(expected = NullPointerException.class) - public void asNull() { - Maybe.just(1).to(null); - } - @Test public void compose() { Maybe.just(1).compose(new MaybeTransformer() { @@ -420,16 +375,6 @@ public Integer apply(Integer w) throws Exception { .assertResult(2); } - @Test(expected = NullPointerException.class) - public void composeNull() { - Maybe.just(1).compose(null); - } - - @Test(expected = NullPointerException.class) - public void mapNull() { - Maybe.just(1).map(null); - } - @Test public void mapReturnNull() { Maybe.just(1).map(new Function() { @@ -460,11 +405,6 @@ public String apply(Integer v) throws Exception { }).test().assertResult("1"); } - @Test(expected = NullPointerException.class) - public void filterNull() { - Maybe.just(1).filter(null); - } - @Test public void filterThrows() { Maybe.just(1).filter(new Predicate() { @@ -505,11 +445,6 @@ public boolean test(Integer v) throws Exception { }).test().assertResult(); } - @Test(expected = NullPointerException.class) - public void singleFilterNull() { - Single.just(1).filter(null); - } - @Test public void singleFilterThrows() { Single.just(1).filter(new Predicate() { @@ -547,16 +482,6 @@ public void cast() { to.assertResult((Number)1); } - @Test(expected = NullPointerException.class) - public void observeOnNull() { - Maybe.just(1).observeOn(null); - } - - @Test(expected = NullPointerException.class) - public void subscribeOnNull() { - Maybe.just(1).observeOn(null); - } - @Test public void observeOnSuccess() { String main = Thread.currentThread().getName(); @@ -1488,11 +1413,6 @@ public void concatPublisherPrefetch() { Maybe.concat(Flowable.just(Maybe.just(1), Maybe.just(2)), 1).test().assertResult(1, 2); } - @Test(expected = NullPointerException.class) - public void nullArgument() { - Maybe.create(null); - } - @Test public void basic() { List errors = TestHelper.trackPluginErrors(); @@ -1928,11 +1848,6 @@ public void ambIterable2SignalsComplete() { to.assertResult(); } - @Test(expected = NullPointerException.class) - public void ambIterableNull() { - Maybe.amb((Iterable>)null); - } - @Test public void ambIterableIteratorNull() { Maybe.amb(new Iterable>() { @@ -2392,11 +2307,6 @@ public void accept(Integer v, Throwable e) throws Exception { assertEquals(Arrays.asList(null, null), list); } - @Test(expected = NullPointerException.class) - public void doOnEventNull() { - Maybe.just(1).doOnEvent(null); - } - @Test public void doOnEventSuccessThrows() { Maybe.just(1) diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java index d4bcd85cc9..4189438e32 100644 --- a/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java +++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java @@ -22,7 +22,6 @@ import io.reactivex.rxjava3.core.*; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.core.Observer; -import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.exceptions.TestException; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.functions.Functions; @@ -40,21 +39,6 @@ public class ObservableNullTests extends RxJavaTest { // Static methods //*********************************************************** - @Test(expected = NullPointerException.class) - public void ambVarargsNull() { - Observable.ambArray((Observable[])null); - } - - @Test(expected = NullPointerException.class) - public void ambVarargsOneIsNull() { - Observable.ambArray(Observable.never(), null).blockingLast(); - } - - @Test(expected = NullPointerException.class) - public void ambIterableNull() { - Observable.amb((Iterable>)null); - } - @Test public void ambIterableIteratorNull() { Observable.amb(new Iterable>() { @@ -72,16 +56,6 @@ public void ambIterableOneIsNull() { .assertError(NullPointerException.class); } - @Test(expected = NullPointerException.class) - public void combineLatestIterableNull() { - Observable.combineLatest((Iterable>)null, new Function() { - @Override - public Object apply(Object[] v) { - return 1; - } - }, 128); - } - @Test(expected = NullPointerException.class) public void combineLatestIterableIteratorNull() { Observable.combineLatest(new Iterable>() { @@ -107,11 +81,6 @@ public Object apply(Object[] v) { }, 128).blockingLast(); } - @Test(expected = NullPointerException.class) - public void combineLatestIterableFunctionNull() { - Observable.combineLatest(Arrays.asList(just1), null, 128); - } - @Test(expected = NullPointerException.class) public void combineLatestIterableFunctionReturnsNull() { Observable.combineLatest(Arrays.asList(just1), new Function() { @@ -122,16 +91,6 @@ public Object apply(Object[] v) { }, 128).blockingLast(); } - @Test(expected = NullPointerException.class) - public void combineLatestDelayErrorIterableNull() { - Observable.combineLatestDelayError((Iterable>)null, new Function() { - @Override - public Object apply(Object[] v) { - return 1; - } - }, 128); - } - @Test(expected = NullPointerException.class) public void combineLatestDelayErrorIterableIteratorNull() { Observable.combineLatestDelayError(new Iterable>() { @@ -157,11 +116,6 @@ public Object apply(Object[] v) { }, 128).blockingLast(); } - @Test(expected = NullPointerException.class) - public void combineLatestDelayErrorIterableFunctionNull() { - Observable.combineLatestDelayError(Arrays.asList(just1), null, 128); - } - @Test(expected = NullPointerException.class) public void combineLatestDelayErrorIterableFunctionReturnsNull() { Observable.combineLatestDelayError(Arrays.asList(just1), new Function() { @@ -172,11 +126,6 @@ public Object apply(Object[] v) { }, 128).blockingLast(); } - @Test(expected = NullPointerException.class) - public void concatIterableNull() { - Observable.concat((Iterable>)null); - } - @Test(expected = NullPointerException.class) public void concatIterableIteratorNull() { Observable.concat(new Iterable>() { @@ -192,31 +141,11 @@ public void concatIterableOneIsNull() { Observable.concat(Arrays.asList(just1, null)).blockingLast(); } - @Test(expected = NullPointerException.class) - public void concatObservableNull() { - Observable.concat((Observable>)null); - } - - @Test(expected = NullPointerException.class) - public void concatArrayNull() { - Observable.concatArray((Observable[])null); - } - @Test(expected = NullPointerException.class) public void concatArrayOneIsNull() { Observable.concatArray(just1, null).blockingLast(); } - @Test(expected = NullPointerException.class) - public void createNull() { - Observable.unsafeCreate(null); - } - - @Test(expected = NullPointerException.class) - public void deferFunctionNull() { - Observable.defer(null); - } - @Test(expected = NullPointerException.class) public void deferFunctionReturnsNull() { Observable.defer(new Supplier>() { @@ -227,11 +156,6 @@ public Observable get() { }).blockingLast(); } - @Test(expected = NullPointerException.class) - public void errorFunctionNull() { - Observable.error((Supplier)null); - } - @Test(expected = NullPointerException.class) public void errorFunctionReturnsNull() { Observable.error(new Supplier() { @@ -242,26 +166,11 @@ public Throwable get() { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void errorThrowableNull() { - Observable.error((Throwable)null); - } - - @Test(expected = NullPointerException.class) - public void fromArrayNull() { - Observable.fromArray((Object[])null); - } - @Test(expected = NullPointerException.class) public void fromArrayOneIsNull() { Observable.fromArray(1, null).blockingLast(); } - @Test(expected = NullPointerException.class) - public void fromCallableNull() { - Observable.fromCallable(null); - } - @Test(expected = NullPointerException.class) public void fromCallableReturnsNull() { Observable.fromCallable(new Callable() { @@ -272,11 +181,6 @@ public Object call() throws Exception { }).blockingLast(); } - @Test(expected = NullPointerException.class) - public void fromFutureNull() { - Observable.fromFuture(null); - } - @Test public void fromFutureReturnsNull() { FutureTask f = new FutureTask<>(Functions.EMPTY_RUNNABLE, null); @@ -289,16 +193,6 @@ public void fromFutureReturnsNull() { to.assertError(NullPointerException.class); } - @Test(expected = NullPointerException.class) - public void fromFutureTimedFutureNull() { - Observable.fromFuture(null, 1, TimeUnit.SECONDS); - } - - @Test(expected = NullPointerException.class) - public void fromFutureTimedUnitNull() { - Observable.fromFuture(new FutureTask<>(Functions.EMPTY_RUNNABLE, null), 1, null); - } - @Test(expected = NullPointerException.class) public void fromFutureTimedReturnsNull() { FutureTask f = new FutureTask<>(Functions.EMPTY_RUNNABLE, null); @@ -306,11 +200,6 @@ public void fromFutureTimedReturnsNull() { Observable.fromFuture(f, 1, TimeUnit.SECONDS).blockingLast(); } - @Test(expected = NullPointerException.class) - public void fromIterableNull() { - Observable.fromIterable(null); - } - @Test(expected = NullPointerException.class) public void fromIterableIteratorNull() { Observable.fromIterable(new Iterable() { @@ -326,11 +215,6 @@ public void fromIterableValueNull() { Observable.fromIterable(Arrays.asList(1, null)).blockingLast(); } - @Test(expected = NullPointerException.class) - public void generateConsumerNull() { - Observable.generate(null); - } - @Test(expected = NullPointerException.class) public void generateConsumerEmitsNull() { Observable.generate(new Consumer>() { @@ -341,35 +225,6 @@ public void accept(Emitter s) { }).blockingLast(); } - @Test(expected = NullPointerException.class) - public void generateStateConsumerInitialStateNull() { - BiConsumer> generator = new BiConsumer>() { - @Override - public void accept(Integer s, Emitter o) { - o.onNext(1); - } - }; - Observable.generate(null, generator); - } - - @Test(expected = NullPointerException.class) - public void generateStateFunctionInitialStateNull() { - Observable.generate(null, new BiFunction, Object>() { - @Override - public Object apply(Object s, Emitter o) { o.onNext(1); return s; } - }); - } - - @Test(expected = NullPointerException.class) - public void generateStateConsumerNull() { - Observable.generate(new Supplier() { - @Override - public Integer get() { - return 1; - } - }, (BiConsumer>)null); - } - @Test public void generateConsumerStateNullAllowed() { BiConsumer> generator = new BiConsumer>() { @@ -399,64 +254,10 @@ public Object get() { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void generateConsumerDisposeNull() { - BiConsumer> generator = new BiConsumer>() { - @Override - public void accept(Integer s, Emitter o) { - o.onNext(1); - } - }; - Observable.generate(new Supplier() { - @Override - public Integer get() { - return 1; - } - }, generator, null); - } - - @Test(expected = NullPointerException.class) - public void generateFunctionDisposeNull() { - Observable.generate(new Supplier() { - @Override - public Object get() { - return 1; - } - }, new BiFunction, Object>() { - @Override - public Object apply(Object s, Emitter o) { o.onNext(1); return s; } - }, null); - } - - @Test(expected = NullPointerException.class) - public void intervalUnitNull() { - Observable.interval(1, null); - } - public void intervalSchedulerNull() { Observable.interval(1, TimeUnit.SECONDS, null); } - @Test(expected = NullPointerException.class) - public void intervalPeriodUnitNull() { - Observable.interval(1, 1, null); - } - - @Test(expected = NullPointerException.class) - public void intervalPeriodSchedulerNull() { - Observable.interval(1, 1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void intervalRangeUnitNull() { - Observable.intervalRange(1, 1, 1, 1, null); - } - - @Test(expected = NullPointerException.class) - public void intervalRangeSchedulerNull() { - Observable.intervalRange(1, 1, 1, 1, TimeUnit.SECONDS, null); - } - @Test public void justNull() throws Exception { @SuppressWarnings("rawtypes") @@ -484,11 +285,6 @@ public void justNull() throws Exception { } } - @Test(expected = NullPointerException.class) - public void mergeIterableNull() { - Observable.merge((Iterable>)null, 128, 128); - } - @Test(expected = NullPointerException.class) public void mergeIterableIteratorNull() { Observable.merge(new Iterable>() { @@ -504,21 +300,6 @@ public void mergeIterableOneIsNull() { Observable.merge(Arrays.asList(just1, null), 128, 128).blockingLast(); } - @Test(expected = NullPointerException.class) - public void mergeArrayNull() { - Observable.mergeArray(128, 128, (Observable[])null); - } - - @Test(expected = NullPointerException.class) - public void mergeArrayOneIsNull() { - Observable.mergeArray(128, 128, just1, null).blockingLast(); - } - - @Test(expected = NullPointerException.class) - public void mergeDelayErrorIterableNull() { - Observable.mergeDelayError((Iterable>)null, 128, 128); - } - @Test(expected = NullPointerException.class) public void mergeDelayErrorIterableIteratorNull() { Observable.mergeDelayError(new Iterable>() { @@ -534,72 +315,6 @@ public void mergeDelayErrorIterableOneIsNull() { Observable.mergeDelayError(Arrays.asList(just1, null), 128, 128).blockingLast(); } - @Test(expected = NullPointerException.class) - public void mergeDelayErrorArrayNull() { - Observable.mergeArrayDelayError(128, 128, (Observable[])null); - } - - @Test(expected = NullPointerException.class) - public void mergeDelayErrorArrayOneIsNull() { - Observable.mergeArrayDelayError(128, 128, just1, null).blockingLast(); - } - - @Test(expected = NullPointerException.class) - public void sequenceEqualFirstNull() { - Observable.sequenceEqual(null, just1); - } - - @Test(expected = NullPointerException.class) - public void sequenceEqualSecondNull() { - Observable.sequenceEqual(just1, null); - } - - @Test(expected = NullPointerException.class) - public void sequenceEqualComparatorNull() { - Observable.sequenceEqual(just1, just1, null); - } - - @Test(expected = NullPointerException.class) - public void switchOnNextNull() { - Observable.switchOnNext(null); - } - - @Test(expected = NullPointerException.class) - public void timerUnitNull() { - Observable.timer(1, null); - } - - @Test(expected = NullPointerException.class) - public void timerSchedulerNull() { - Observable.timer(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void usingResourceSupplierNull() { - Observable.using(null, new Function>() { - @Override - public Observable apply(Object d) { - return just1; - } - }, new Consumer() { - @Override - public void accept(Object d) { } - }); - } - - @Test(expected = NullPointerException.class) - public void usingObservableSupplierNull() { - Observable.using(new Supplier() { - @Override - public Object get() { - return 1; - } - }, null, new Consumer() { - @Override - public void accept(Object d) { } - }); - } - @Test(expected = NullPointerException.class) public void usingObservableSupplierReturnsNull() { Observable.using(new Supplier() { @@ -618,31 +333,6 @@ public void accept(Object d) { } }).blockingLast(); } - @Test(expected = NullPointerException.class) - public void usingDisposeNull() { - Observable.using(new Supplier() { - @Override - public Object get() { - return 1; - } - }, new Function>() { - @Override - public Observable apply(Object d) { - return just1; - } - }, null); - } - - @Test(expected = NullPointerException.class) - public void zipIterableNull() { - Observable.zip((Iterable>)null, new Function() { - @Override - public Object apply(Object[] v) { - return 1; - } - }); - } - @Test(expected = NullPointerException.class) public void zipIterableIteratorNull() { Observable.zip(new Iterable>() { @@ -658,11 +348,6 @@ public Object apply(Object[] v) { }).blockingLast(); } - @Test(expected = NullPointerException.class) - public void zipIterableFunctionNull() { - Observable.zip(Arrays.asList(just1, just1), null); - } - @Test(expected = NullPointerException.class) public void zipIterableFunctionReturnsNull() { Observable.zip(Arrays.asList(just1, just1), new Function() { @@ -673,16 +358,6 @@ public Object apply(Object[] a) { }).blockingLast(); } - @Test(expected = NullPointerException.class) - public void zipIterable2Null() { - Observable.zip((Iterable>)null, new Function() { - @Override - public Object apply(Object[] a) { - return 1; - } - }, true, 128); - } - @Test(expected = NullPointerException.class) public void zipIterable2IteratorNull() { Observable.zip(new Iterable>() { @@ -698,11 +373,6 @@ public Object apply(Object[] a) { }, true, 128).blockingLast(); } - @Test(expected = NullPointerException.class) - public void zipIterable2FunctionNull() { - Observable.zip(Arrays.asList(just1, just1), null, true, 128); - } - @Test(expected = NullPointerException.class) public void zipIterable2FunctionReturnsNull() { Observable.zip(Arrays.asList(just1, just1), new Function() { @@ -717,26 +387,6 @@ public Object apply(Object[] a) { // Instance methods //************************************************************* - @Test(expected = NullPointerException.class) - public void allPredicateNull() { - just1.all(null); - } - - @Test(expected = NullPointerException.class) - public void ambWithNull() { - just1.ambWith(null); - } - - @Test(expected = NullPointerException.class) - public void anyPredicateNull() { - just1.any(null); - } - - @Test(expected = NullPointerException.class) - public void bufferSupplierNull() { - just1.buffer(1, 1, (Supplier>)null); - } - @Test(expected = NullPointerException.class) public void bufferSupplierReturnsNull() { just1.buffer(1, 1, new Supplier>() { @@ -747,21 +397,6 @@ public Collection get() { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void bufferTimedUnitNull() { - just1.buffer(1L, 1L, null); - } - - @Test(expected = NullPointerException.class) - public void bufferTimedSchedulerNull() { - just1.buffer(1L, 1L, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void bufferTimedSupplierNull() { - just1.buffer(1L, 1L, TimeUnit.SECONDS, Schedulers.single(), null); - } - @Test(expected = NullPointerException.class) public void bufferTimedSupplierReturnsNull() { just1.buffer(1L, 1L, TimeUnit.SECONDS, Schedulers.single(), new Supplier>() { @@ -772,21 +407,6 @@ public Collection get() { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void bufferOpenCloseOpenNull() { - just1.buffer(null, new Function>() { - @Override - public Observable apply(Object o) { - return just1; - } - }); - } - - @Test(expected = NullPointerException.class) - public void bufferOpenCloseCloseNull() { - just1.buffer(just1, (Function>)null); - } - @Test(expected = NullPointerException.class) public void bufferOpenCloseCloseReturnsNull() { just1.buffer(just1, new Function>() { @@ -797,16 +417,6 @@ public Observable apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void bufferBoundaryNull() { - just1.buffer((Observable)null); - } - - @Test(expected = NullPointerException.class) - public void bufferBoundarySupplierNull() { - just1.buffer(just1, (Supplier>)null); - } - @Test(expected = NullPointerException.class) public void bufferBoundarySupplierReturnsNull() { just1.buffer(just1, new Supplier>() { @@ -817,19 +427,6 @@ public Collection get() { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void castNull() { - just1.cast(null); - } - - @Test(expected = NullPointerException.class) - public void collectInitialSupplierNull() { - just1.collect((Supplier)null, new BiConsumer() { - @Override - public void accept(Integer a, Integer b) { } - }); - } - @Test(expected = NullPointerException.class) public void collectInitialSupplierReturnsNull() { just1.collect(new Supplier() { @@ -853,29 +450,6 @@ public Object get() { }, null); } - @Test(expected = NullPointerException.class) - public void collectIntoInitialNull() { - just1.collectInto(null, new BiConsumer() { - @Override - public void accept(Object a, Integer b) { } - }); - } - - @Test(expected = NullPointerException.class) - public void collectIntoCollectorNull() { - just1.collectInto(1, null); - } - - @Test(expected = NullPointerException.class) - public void composeNull() { - just1.compose(null); - } - - @Test(expected = NullPointerException.class) - public void concatMapNull() { - just1.concatMap(null); - } - @Test(expected = NullPointerException.class) public void concatMapReturnsNull() { just1.concatMap(new Function>() { @@ -886,11 +460,6 @@ public Observable apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void concatMapIterableNull() { - just1.concatMapIterable(null); - } - @Test(expected = NullPointerException.class) public void concatMapIterableReturnNull() { just1.concatMapIterable(new Function>() { @@ -916,21 +485,6 @@ public Iterator iterator() { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void concatWithNull() { - just1.concatWith((ObservableSource)null); - } - - @Test(expected = NullPointerException.class) - public void containsNull() { - just1.contains(null); - } - - @Test(expected = NullPointerException.class) - public void debounceFunctionNull() { - just1.debounce(null); - } - @Test(expected = NullPointerException.class) public void debounceFunctionReturnsNull() { just1.debounce(new Function>() { @@ -941,26 +495,6 @@ public Observable apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void debounceTimedUnitNull() { - just1.debounce(1, null); - } - - @Test(expected = NullPointerException.class) - public void debounceTimedSchedulerNull() { - just1.debounce(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void defaultIfEmptyNull() { - just1.defaultIfEmpty(null); - } - - @Test(expected = NullPointerException.class) - public void delayWithFunctionNull() { - just1.delay(null); - } - @Test(expected = NullPointerException.class) public void delayWithFunctionReturnsNull() { just1.delay(new Function>() { @@ -971,61 +505,6 @@ public Observable apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void delayTimedUnitNull() { - just1.delay(1, null); - } - - @Test(expected = NullPointerException.class) - public void delayTimedSchedulerNull() { - just1.delay(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void delaySubscriptionTimedUnitNull() { - just1.delaySubscription(1, null); - } - - @Test(expected = NullPointerException.class) - public void delaySubscriptionTimedSchedulerNull() { - just1.delaySubscription(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void delaySubscriptionOtherNull() { - just1.delaySubscription((Observable)null); - } - - @Test(expected = NullPointerException.class) - public void delaySubscriptionFunctionNull() { - just1.delaySubscription((Observable)null); - } - - @Test(expected = NullPointerException.class) - public void delayBothInitialSupplierNull() { - just1.delay(null, new Function>() { - @Override - public Observable apply(Integer v) { - return just1; - } - }); - } - - @Test(expected = NullPointerException.class) - public void delayBothInitialSupplierReturnsNull() { - just1.delay(null, new Function>() { - @Override - public Observable apply(Integer v) { - return just1; - } - }).blockingSubscribe(); - } - - @Test(expected = NullPointerException.class) - public void delayBothItemSupplierNull() { - just1.delay(just1, null); - } - @Test(expected = NullPointerException.class) public void delayBothItemSupplierReturnsNull() { just1.delay(just1 @@ -1037,21 +516,6 @@ public Observable apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void distinctFunctionNull() { - just1.distinct(null); - } - - @Test(expected = NullPointerException.class) - public void distinctSupplierNull() { - just1.distinct(new Function() { - @Override - public Object apply(Integer v) { - return v; - } - }, null); - } - @Test(expected = NullPointerException.class) public void distinctSupplierReturnsNull() { just1.distinct(new Function() { @@ -1077,16 +541,6 @@ public Object apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void distinctUntilChangedFunctionNull() { - just1.distinctUntilChanged((Function)null); - } - - @Test(expected = NullPointerException.class) - public void distinctUntilChangedBiPredicateNull() { - just1.distinctUntilChanged((BiPredicate)null); - } - @Test public void distinctUntilChangedFunctionReturnsNull() { Observable.range(1, 2).distinctUntilChanged(new Function() { @@ -1097,84 +551,6 @@ public Object apply(Integer v) { }).test().assertResult(1); } - @Test(expected = NullPointerException.class) - public void doOnDisposeNull() { - just1.doOnDispose(null); - } - - @Test(expected = NullPointerException.class) - public void doOnCompleteNull() { - just1.doOnComplete(null); - } - - @Test(expected = NullPointerException.class) - public void doOnEachSupplierNull() { - just1.doOnEach((Consumer>)null); - } - - @Test(expected = NullPointerException.class) - public void doOnEachSubscriberNull() { - just1.doOnEach((Observer)null); - } - - @Test(expected = NullPointerException.class) - public void doOnErrorNull() { - just1.doOnError(null); - } - - @Test(expected = NullPointerException.class) - public void doOnLifecycleOnSubscribeNull() { - just1.doOnLifecycle(null, Functions.EMPTY_ACTION); - } - - @Test(expected = NullPointerException.class) - public void doOnLifecycleOnDisposeNull() { - just1.doOnLifecycle(new Consumer() { - @Override - public void accept(Disposable d) { } - }, null); - } - - @Test(expected = NullPointerException.class) - public void doOnNextNull() { - just1.doOnNext(null); - } - - @Test(expected = NullPointerException.class) - public void doOnSubscribeNull() { - just1.doOnSubscribe(null); - } - - @Test(expected = NullPointerException.class) - public void doOnTerminatedNull() { - just1.doOnTerminate(null); - } - - @Test(expected = NullPointerException.class) - public void elementAtNull() { - just1.elementAt(1, null); - } - - @Test(expected = NullPointerException.class) - public void filterNull() { - just1.filter(null); - } - - @Test(expected = NullPointerException.class) - public void doAfterTerminateNull() { - just1.doAfterTerminate(null); - } - - @Test(expected = NullPointerException.class) - public void firstNull() { - just1.first(null); - } - - @Test(expected = NullPointerException.class) - public void flatMapNull() { - just1.flatMap(null); - } - @Test(expected = NullPointerException.class) public void flatMapFunctionReturnsNull() { just1.flatMap(new Function>() { @@ -1185,21 +561,6 @@ public Observable apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void flatMapNotificationOnNextNull() { - just1.flatMap(null, new Function>() { - @Override - public Observable apply(Throwable e) { - return just1; - } - }, new Supplier>() { - @Override - public Observable get() { - return just1; - } - }); - } - @Test(expected = NullPointerException.class) public void flatMapNotificationOnNextReturnsNull() { just1.flatMap(new Function>() { @@ -1220,36 +581,6 @@ public Observable get() { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void flatMapNotificationOnErrorNull() { - just1.flatMap(new Function>() { - @Override - public Observable apply(Integer v) { - return just1; - } - }, null, new Supplier>() { - @Override - public Observable get() { - return just1; - } - }); - } - - @Test(expected = NullPointerException.class) - public void flatMapNotificationOnCompleteNull() { - just1.flatMap(new Function>() { - @Override - public Observable apply(Integer v) { - return just1; - } - }, new Function>() { - @Override - public Observable apply(Throwable e) { - return just1; - } - }, null); - } - @Test(expected = NullPointerException.class) public void flatMapNotificationOnCompleteReturnsNull() { just1.flatMap(new Function>() { @@ -1270,16 +601,6 @@ public Observable get() { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void flatMapCombinerMapperNull() { - just1.flatMap(null, new BiFunction() { - @Override - public Object apply(Integer a, Object b) { - return 1; - } - }); - } - @Test(expected = NullPointerException.class) public void flatMapCombinerMapperReturnsNull() { just1.flatMap(new Function>() { @@ -1295,16 +616,6 @@ public Object apply(Integer a, Object b) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void flatMapCombinerCombinerNull() { - just1.flatMap(new Function>() { - @Override - public Observable apply(Integer v) { - return just1; - } - }, null); - } - @Test(expected = NullPointerException.class) public void flatMapCombinerCombinerReturnsNull() { just1.flatMap(new Function>() { @@ -1320,11 +631,6 @@ public Object apply(Integer a, Integer b) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void flatMapIterableMapperNull() { - just1.flatMapIterable(null); - } - @Test(expected = NullPointerException.class) public void flatMapIterableMapperReturnsNull() { just1.flatMapIterable(new Function>() { @@ -1360,16 +666,6 @@ public Iterable apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void flatMapIterableCombinerNull() { - just1.flatMapIterable(new Function>() { - @Override - public Iterable apply(Integer v) { - return Arrays.asList(1); - } - }, null); - } - @Test(expected = NullPointerException.class) public void flatMapIterableCombinerReturnsNull() { just1.flatMapIterable(new Function>() { @@ -1385,44 +681,6 @@ public Object apply(Integer a, Integer b) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void forEachNull() { - just1.forEach(null); - } - - @Test(expected = NullPointerException.class) - public void forEachWhileNull() { - just1.forEachWhile(null); - } - - @Test(expected = NullPointerException.class) - public void forEachWhileOnErrorNull() { - just1.forEachWhile(new Predicate() { - @Override - public boolean test(Integer v) { - return true; - } - }, null); - } - - @Test(expected = NullPointerException.class) - public void forEachWhileOnCompleteNull() { - just1.forEachWhile(new Predicate() { - @Override - public boolean test(Integer v) { - return true; - } - }, new Consumer() { - @Override - public void accept(Throwable e) { } - }, null); - } - - @Test(expected = NullPointerException.class) - public void groupByNull() { - just1.groupBy(null); - } - public void groupByKeyNull() { just1.groupBy(new Function() { @Override @@ -1432,16 +690,6 @@ public Object apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void groupByValueNull() { - just1.groupBy(new Function() { - @Override - public Object apply(Integer v) { - return v; - } - }, null); - } - @Test(expected = NullPointerException.class) public void groupByValueReturnsNull() { just1.groupBy(new Function() { @@ -1457,16 +705,6 @@ public Object apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void lastNull() { - just1.last(null); - } - - @Test(expected = NullPointerException.class) - public void liftNull() { - just1.lift(null); - } - @Test(expected = NullPointerException.class) public void liftReturnsNull() { just1.lift(new ObservableOperator() { @@ -1477,11 +715,6 @@ public Observer apply(Observer observer) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void mapNull() { - just1.map(null); - } - @Test(expected = NullPointerException.class) public void mapReturnsNull() { just1.map(new Function() { @@ -1493,48 +726,13 @@ public Object apply(Integer v) { } @Test(expected = NullPointerException.class) - public void mergeWithNull() { - just1.mergeWith((ObservableSource)null); - } - - @Test(expected = NullPointerException.class) - public void observeOnNull() { - just1.observeOn(null); - } - - @Test(expected = NullPointerException.class) - public void ofTypeNull() { - just1.ofType(null); - } - - @Test(expected = NullPointerException.class) - public void onErrorResumeNextFunctionNull() { - just1.onErrorResumeNext(null); - } - - @Test(expected = NullPointerException.class) - public void onErrorResumeNextFunctionReturnsNull() { - Observable.error(new TestException()).onErrorResumeNext(new Function>() { - @Override - public Observable apply(Throwable e) { - return null; - } - }).blockingSubscribe(); - } - - @Test(expected = NullPointerException.class) - public void onErrorResumeNextObservableNull() { - just1.onErrorResumeWith(null); - } - - @Test(expected = NullPointerException.class) - public void onErrorReturnFunctionNull() { - just1.onErrorReturn(null); - } - - @Test(expected = NullPointerException.class) - public void onErrorReturnValueNull() { - just1.onErrorReturnItem(null); + public void onErrorResumeNextFunctionReturnsNull() { + Observable.error(new TestException()).onErrorResumeNext(new Function>() { + @Override + public Observable apply(Throwable e) { + return null; + } + }).blockingSubscribe(); } @Test(expected = NullPointerException.class) @@ -1547,11 +745,6 @@ public Object apply(Throwable e) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void publishFunctionNull() { - just1.publish(null); - } - @Test(expected = NullPointerException.class) public void publishFunctionReturnsNull() { just1.publish(new Function, Observable>() { @@ -1562,11 +755,6 @@ public Observable apply(Observable v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void reduceFunctionNull() { - just1.reduce(null); - } - @Test(expected = NullPointerException.class) public void reduceFunctionReturnsNull() { Observable.just(1, 1).reduce(new BiFunction() { @@ -1577,21 +765,6 @@ public Integer apply(Integer a, Integer b) { }).blockingGet(); } - @Test(expected = NullPointerException.class) - public void reduceSeedNull() { - just1.reduce(null, new BiFunction() { - @Override - public Object apply(Object a, Integer b) { - return 1; - } - }); - } - - @Test(expected = NullPointerException.class) - public void reduceSeedFunctionNull() { - just1.reduce(1, null); - } - @Test(expected = NullPointerException.class) public void reduceSeedFunctionReturnsNull() { just1.reduce(1, new BiFunction() { @@ -1602,16 +775,6 @@ public Integer apply(Integer a, Integer b) { }).blockingGet(); } - @Test(expected = NullPointerException.class) - public void reduceWithSeedNull() { - just1.reduceWith(null, new BiFunction() { - @Override - public Object apply(Object a, Integer b) { - return 1; - } - }); - } - @Test(expected = NullPointerException.class) public void reduceWithSeedReturnsNull() { just1.reduceWith(new Supplier() { @@ -1627,16 +790,6 @@ public Object apply(Object a, Integer b) { }).blockingGet(); } - @Test(expected = NullPointerException.class) - public void repeatUntilNull() { - just1.repeatUntil(null); - } - - @Test(expected = NullPointerException.class) - public void repeatWhenNull() { - just1.repeatWhen(null); - } - @Test(expected = NullPointerException.class) public void repeatWhenFunctionReturnsNull() { just1.repeatWhen(new Function, Observable>() { @@ -1647,11 +800,6 @@ public Observable apply(Observable v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void replaySelectorNull() { - just1.replay((Function, Observable>)null); - } - @Test(expected = NullPointerException.class) public void replaySelectorReturnsNull() { just1.replay(new Function, Observable>() { @@ -1662,11 +810,6 @@ public Observable apply(Observable o) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void replayBoundedSelectorNull() { - just1.replay((Function, Observable>)null, 1, 1, TimeUnit.SECONDS); - } - @Test(expected = NullPointerException.class) public void replayBoundedSelectorReturnsNull() { just1.replay(new Function, Observable>() { @@ -1677,31 +820,6 @@ public Observable apply(Observable v) { }, 1, 1, TimeUnit.SECONDS).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void replayBoundedUnitNull() { - just1.replay(new Function, Observable>() { - @Override - public Observable apply(Observable v) { - return v; - } - }, 1, 1, null).blockingSubscribe(); - } - - @Test(expected = NullPointerException.class) - public void replayBoundedSchedulerNull() { - just1.replay(new Function, Observable>() { - @Override - public Observable apply(Observable v) { - return v; - } - }, 1, 1, TimeUnit.SECONDS, null).blockingSubscribe(); - } - - @Test(expected = NullPointerException.class) - public void replayTimeBoundedSelectorNull() { - just1.replay(null, 1, TimeUnit.SECONDS, Schedulers.single()); - } - @Test(expected = NullPointerException.class) public void replayTimeBoundedSelectorReturnsNull() { just1.replay(new Function, Observable>() { @@ -1712,66 +830,6 @@ public Observable apply(Observable v) { }, 1, TimeUnit.SECONDS, Schedulers.single()).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void replaySelectorTimeBoundedUnitNull() { - just1.replay(new Function, Observable>() { - @Override - public Observable apply(Observable v) { - return v; - } - }, 1, null, Schedulers.single()); - } - - @Test(expected = NullPointerException.class) - public void replaySelectorTimeBoundedSchedulerNull() { - just1.replay(new Function, Observable>() { - @Override - public Observable apply(Observable v) { - return v; - } - }, 1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void replayTimeSizeBoundedUnitNull() { - just1.replay(1, 1, null, Schedulers.single()); - } - - @Test(expected = NullPointerException.class) - public void replayTimeSizeBoundedSchedulerNull() { - just1.replay(1, 1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void replayTimeBoundedUnitNull() { - just1.replay(1, null, Schedulers.single()); - } - - @Test(expected = NullPointerException.class) - public void replayTimeBoundedSchedulerNull() { - just1.replay(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void retryFunctionNull() { - just1.retry((BiPredicate)null); - } - - @Test(expected = NullPointerException.class) - public void retryCountFunctionNull() { - just1.retry(1, null); - } - - @Test(expected = NullPointerException.class) - public void retryPredicateNull() { - just1.retry((Predicate)null); - } - - @Test(expected = NullPointerException.class) - public void retryWhenFunctionNull() { - just1.retryWhen(null); - } - @Test(expected = NullPointerException.class) public void retryWhenFunctionReturnsNull() { Observable.error(new TestException()).retryWhen(new Function, Observable>() { @@ -1782,36 +840,6 @@ public Observable apply(Observable f) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void retryUntil() { - just1.retryUntil(null); - } - - @Test(expected = NullPointerException.class) - public void safeSubscribeNull() { - just1.safeSubscribe(null); - } - - @Test(expected = NullPointerException.class) - public void sampleUnitNull() { - just1.sample(1, null); - } - - @Test(expected = NullPointerException.class) - public void sampleSchedulerNull() { - just1.sample(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void sampleObservableNull() { - just1.sample(null); - } - - @Test(expected = NullPointerException.class) - public void scanFunctionNull() { - just1.scan(null); - } - @Test(expected = NullPointerException.class) public void scanFunctionReturnsNull() { Observable.just(1, 1).scan(new BiFunction() { @@ -1822,21 +850,6 @@ public Integer apply(Integer a, Integer b) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void scanSeedNull() { - just1.scan(null, new BiFunction() { - @Override - public Object apply(Object a, Integer b) { - return 1; - } - }); - } - - @Test(expected = NullPointerException.class) - public void scanSeedFunctionNull() { - just1.scan(1, null); - } - @Test(expected = NullPointerException.class) public void scanSeedFunctionReturnsNull() { just1.scan(1, new BiFunction() { @@ -1847,16 +860,6 @@ public Integer apply(Integer a, Integer b) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void scanSeedSupplierNull() { - just1.scanWith(null, new BiFunction() { - @Override - public Object apply(Object a, Integer b) { - return 1; - } - }); - } - @Test(expected = NullPointerException.class) public void scanSeedSupplierReturnsNull() { just1.scanWith(new Supplier() { @@ -1872,16 +875,6 @@ public Object apply(Object a, Integer b) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void scanSeedSupplierFunctionNull() { - just1.scanWith(new Supplier() { - @Override - public Object get() { - return 1; - } - }, null); - } - @Test(expected = NullPointerException.class) public void scanSeedSupplierFunctionReturnsNull() { just1.scanWith(new Supplier() { @@ -1897,46 +890,6 @@ public Object apply(Object a, Integer b) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void singleNull() { - just1.single(null); - } - - @Test(expected = NullPointerException.class) - public void skipTimedUnitNull() { - just1.skip(1, null, Schedulers.single()); - } - - @Test(expected = NullPointerException.class) - public void skipTimedSchedulerNull() { - just1.skip(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void skipLastTimedUnitNull() { - just1.skipLast(1, null, Schedulers.single()); - } - - @Test(expected = NullPointerException.class) - public void skipLastTimedSchedulerNull() { - just1.skipLast(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void skipUntilNull() { - just1.skipUntil(null); - } - - @Test(expected = NullPointerException.class) - public void skipWhileNull() { - just1.skipWhile(null); - } - - @Test(expected = NullPointerException.class) - public void startWithIterableNull() { - just1.startWithIterable((Iterable)null); - } - @Test(expected = NullPointerException.class) public void startWithIterableIteratorNull() { just1.startWithIterable(new Iterable() { @@ -1952,70 +905,6 @@ public void startWithIterableOneNull() { just1.startWithIterable(Arrays.asList(1, null)).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void startWithSingleNull() { - just1.startWithItem((Integer)null); - } - - @Test(expected = NullPointerException.class) - public void startWithObservableNull() { - just1.startWith((Observable)null); - } - - @Test(expected = NullPointerException.class) - public void startWithArrayNull() { - just1.startWithArray((Integer[])null); - } - - @Test(expected = NullPointerException.class) - public void startWithArrayOneNull() { - just1.startWithArray(1, null).blockingSubscribe(); - } - - @Test(expected = NullPointerException.class) - public void subscribeOnNextNull() { - just1.subscribe((Consumer)null); - } - - @Test(expected = NullPointerException.class) - public void subscribeOnErrorNull() { - just1.subscribe(new Consumer() { - @Override - public void accept(Integer e) { } - }, null); - } - - @Test(expected = NullPointerException.class) - public void subscribeOnCompleteNull() { - just1.subscribe(new Consumer() { - @Override - public void accept(Integer e) { } - }, new Consumer() { - @Override - public void accept(Throwable e) { } - }, null); - } - - @Test(expected = NullPointerException.class) - public void subscribeNull() { - just1.subscribe((Observer)null); - } - - @Test(expected = NullPointerException.class) - public void subscribeOnNull() { - just1.subscribeOn(null); - } - - @Test(expected = NullPointerException.class) - public void switchIfEmptyNull() { - just1.switchIfEmpty(null); - } - - @Test(expected = NullPointerException.class) - public void switchMapNull() { - just1.switchMap(null); - } - @Test(expected = NullPointerException.class) public void switchMapFunctionReturnsNull() { just1.switchMap(new Function>() { @@ -2026,96 +915,6 @@ public Observable apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void takeTimedUnitNull() { - just1.take(1, null, Schedulers.single()); - } - - @Test(expected = NullPointerException.class) - public void takeTimedSchedulerNull() { - just1.take(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void takeLastTimedUnitNull() { - just1.takeLast(1, null, Schedulers.single()); - } - - @Test(expected = NullPointerException.class) - public void takeLastSizeTimedUnitNull() { - just1.takeLast(1, 1, null, Schedulers.single()); - } - - @Test(expected = NullPointerException.class) - public void takeLastTimedSchedulerNull() { - just1.takeLast(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void takeLastSizeTimedSchedulerNull() { - just1.takeLast(1, 1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void takeUntilPredicateNull() { - just1.takeUntil((Predicate)null); - } - - @Test(expected = NullPointerException.class) - public void takeUntilObservableNull() { - just1.takeUntil((Observable)null); - } - - @Test(expected = NullPointerException.class) - public void takeWhileNull() { - just1.takeWhile(null); - } - - @Test(expected = NullPointerException.class) - public void throttleFirstUnitNull() { - just1.throttleFirst(1, null, Schedulers.single()); - } - - @Test(expected = NullPointerException.class) - public void throttleFirstSchedulerNull() { - just1.throttleFirst(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void throttleLastUnitNull() { - just1.throttleLast(1, null, Schedulers.single()); - } - - @Test(expected = NullPointerException.class) - public void throttleLastSchedulerNull() { - just1.throttleLast(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void throttleWithTimeoutUnitNull() { - just1.throttleWithTimeout(1, null, Schedulers.single()); - } - - @Test(expected = NullPointerException.class) - public void throttleWithTimeoutSchedulerNull() { - just1.throttleWithTimeout(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void timeIntervalUnitNull() { - just1.timeInterval(null, Schedulers.single()); - } - - @Test(expected = NullPointerException.class) - public void timeIntervalSchedulerNull() { - just1.timeInterval(TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void timeoutSelectorNull() { - just1.timeout(null); - } - @Test(expected = NullPointerException.class) public void timeoutSelectorReturnsNull() { just1.timeout(new Function>() { @@ -2126,46 +925,6 @@ public Observable apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void timeoutSelectorOtherNull() { - just1.timeout(new Function>() { - @Override - public Observable apply(Integer v) { - return just1; - } - }, null); - } - - @Test(expected = NullPointerException.class) - public void timeoutUnitNull() { - just1.timeout(1, null, Schedulers.single(), just1); - } - - @Test(expected = NullPointerException.class) - public void timeouOtherNull() { - just1.timeout(1, TimeUnit.SECONDS, Schedulers.single(), null); - } - - @Test(expected = NullPointerException.class) - public void timeouSchedulerNull() { - just1.timeout(1, TimeUnit.SECONDS, null, just1); - } - - @Test(expected = NullPointerException.class) - public void timeoutFirstNull() { - just1.timeout((Observable)null, new Function>() { - @Override - public Observable apply(Integer v) { - return just1; - } - }); - } - - @Test(expected = NullPointerException.class) - public void timeoutFirstItemNull() { - just1.timeout(just1, null); - } - @Test(expected = NullPointerException.class) public void timeoutFirstItemReturnsNull() { Observable.just(1, 1).timeout(Observable.never(), new Function>() { @@ -2176,26 +935,6 @@ public Observable apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void timestampUnitNull() { - just1.timestamp(null, Schedulers.single()); - } - - @Test(expected = NullPointerException.class) - public void timestampSchedulerNull() { - just1.timestamp(TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void toNull() { - just1.to(null); - } - - @Test(expected = NullPointerException.class) - public void toListNull() { - just1.toList(null); - } - @Test(expected = NullPointerException.class) public void toListSupplierReturnsNull() { just1.toList(new Supplier>() { @@ -2206,26 +945,6 @@ public Collection get() { }).blockingGet(); } - @Test(expected = NullPointerException.class) - public void toSortedListNull() { - just1.toSortedList(null); - } - - @Test(expected = NullPointerException.class) - public void toMapKeyNull() { - just1.toMap(null); - } - - @Test(expected = NullPointerException.class) - public void toMapValueNull() { - just1.toMap(new Function() { - @Override - public Object apply(Integer v) { - return v; - } - }, null); - } - @Test public void toMapValueSelectorReturnsNull() { just1.toMap(new Function() { @@ -2241,21 +960,6 @@ public Object apply(Integer v) { }).blockingGet(); } - @Test(expected = NullPointerException.class) - public void toMapMapSupplierNull() { - just1.toMap(new Function() { - @Override - public Object apply(Integer v) { - return v; - } - }, new Function() { - @Override - public Object apply(Integer v) { - return v; - } - }, null); - } - @Test(expected = NullPointerException.class) public void toMapMapSupplierReturnsNull() { just1.toMap(new Function() { @@ -2276,21 +980,6 @@ public Map get() { }).blockingGet(); } - @Test(expected = NullPointerException.class) - public void toMultimapKeyNull() { - just1.toMultimap(null); - } - - @Test(expected = NullPointerException.class) - public void toMultimapValueNull() { - just1.toMultimap(new Function() { - @Override - public Object apply(Integer v) { - return v; - } - }, null); - } - @Test public void toMultiMapValueSelectorReturnsNullAllowed() { just1.toMap(new Function() { @@ -2306,21 +995,6 @@ public Object apply(Integer v) { }).blockingGet(); } - @Test(expected = NullPointerException.class) - public void toMultimapMapMapSupplierNull() { - just1.toMultimap(new Function() { - @Override - public Object apply(Integer v) { - return v; - } - }, new Function() { - @Override - public Object apply(Integer v) { - return v; - } - }, null); - } - @Test(expected = NullPointerException.class) public void toMultimapMapSupplierReturnsNull() { just1.toMultimap(new Function() { @@ -2341,26 +1015,6 @@ public Map> get() { }).blockingGet(); } - @Test(expected = NullPointerException.class) - public void toMultimapMapMapCollectionSupplierNull() { - just1.toMultimap(new Function() { - @Override - public Integer apply(Integer v) { - return v; - } - }, new Function() { - @Override - public Integer apply(Integer v) { - return v; - } - }, new Supplier>>() { - @Override - public Map> get() { - return new HashMap<>(); - } - }, null); - } - @Test(expected = NullPointerException.class) public void toMultimapMapCollectionSupplierReturnsNull() { just1.toMultimap(new Function() { @@ -2386,56 +1040,6 @@ public Collection apply(Integer v) { }).blockingGet(); } - @Test(expected = NullPointerException.class) - public void unsafeSubscribeNull() { - just1.subscribe((Observer)null); - } - - @Test(expected = NullPointerException.class) - public void unsubscribeOnNull() { - just1.unsubscribeOn(null); - } - - @Test(expected = NullPointerException.class) - public void windowTimedUnitNull() { - just1.window(1, null, Schedulers.single()); - } - - @Test(expected = NullPointerException.class) - public void windowSizeTimedUnitNull() { - just1.window(1, null, Schedulers.single(), 1); - } - - @Test(expected = NullPointerException.class) - public void windowTimedSchedulerNull() { - just1.window(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void windowSizeTimedSchedulerNull() { - just1.window(1, TimeUnit.SECONDS, null, 1); - } - - @Test(expected = NullPointerException.class) - public void windowBoundaryNull() { - just1.window((Observable)null); - } - - @Test(expected = NullPointerException.class) - public void windowOpenCloseOpenNull() { - just1.window(null, new Function>() { - @Override - public Observable apply(Object v) { - return just1; - } - }); - } - - @Test(expected = NullPointerException.class) - public void windowOpenCloseCloseNull() { - just1.window(just1, null); - } - @Test(expected = NullPointerException.class) public void windowOpenCloseCloseReturnsNull() { Observable.never().window(just1, new Function>() { @@ -2446,21 +1050,6 @@ public Observable apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void withLatestFromOtherNull() { - just1.withLatestFrom(null, new BiFunction() { - @Override - public Object apply(Integer a, Object b) { - return 1; - } - }); - } - - @Test(expected = NullPointerException.class) - public void withLatestFromCombinerNull() { - just1.withLatestFrom(just1, null); - } - @Test(expected = NullPointerException.class) public void withLatestFromCombinerReturnsNull() { just1.withLatestFrom(just1, new BiFunction() { @@ -2471,21 +1060,6 @@ public Object apply(Integer a, Integer b) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void zipWithIterableNull() { - just1.zipWith((Iterable)null, new BiFunction() { - @Override - public Object apply(Integer a, Integer b) { - return 1; - } - }); - } - - @Test(expected = NullPointerException.class) - public void zipWithIterableCombinerNull() { - just1.zipWith(Arrays.asList(1), null); - } - @Test(expected = NullPointerException.class) public void zipWithIterableCombinerReturnsNull() { just1.zipWith(Arrays.asList(1), new BiFunction() { @@ -2521,21 +1095,6 @@ public Object apply(Integer a, Integer b) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void zipWithObservableNull() { - just1.zipWith((Observable)null, new BiFunction() { - @Override - public Object apply(Integer a, Integer b) { - return 1; - } - }); - } - - @Test(expected = NullPointerException.class) - public void zipWithCombinerNull() { - just1.zipWith(just1, null); - } - @Test(expected = NullPointerException.class) public void zipWithCombinerReturnsNull() { just1.zipWith(just1, new BiFunction() { diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java index c3110eac3f..030687e989 100644 --- a/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java +++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java @@ -1039,13 +1039,6 @@ public void emptyIsEmpty() { // }}); // } - @Test(expected = NullPointerException.class) - public void forEachWithNull() { - Observable.error(new Exception("boo")) - // - .forEach(null); - } - @Test public void extend() { final TestObserver to = new TestObserver<>(); diff --git a/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java b/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java index 712d93f1aa..a6133bd720 100644 --- a/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java +++ b/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java @@ -26,7 +26,6 @@ import io.reactivex.rxjava3.exceptions.*; import io.reactivex.rxjava3.functions.*; import io.reactivex.rxjava3.internal.functions.Functions; -import io.reactivex.rxjava3.schedulers.Schedulers; public class SingleNullTests extends RxJavaTest { @@ -34,11 +33,6 @@ public class SingleNullTests extends RxJavaTest { Single error = Single.error(new TestException()); - @Test(expected = NullPointerException.class) - public void ambIterableNull() { - Single.amb((Iterable>)null); - } - @Test public void ambIterableIteratorNull() { Single.amb(new Iterable>() { @@ -56,11 +50,6 @@ public void ambIterableOneIsNull() { .assertError(NullPointerException.class); } - @Test(expected = NullPointerException.class) - public void ambArrayNull() { - Single.ambArray((Single[])null); - } - @Test public void ambArrayOneIsNull() { Single.ambArray(null, just1) @@ -68,11 +57,6 @@ public void ambArrayOneIsNull() { .assertError(NullPointerException.class); } - @Test(expected = NullPointerException.class) - public void concatIterableNull() { - Single.concat((Iterable>)null); - } - @Test(expected = NullPointerException.class) public void concatIterableIteratorNull() { Single.concat(new Iterable>() { @@ -88,11 +72,6 @@ public void concatIterableOneIsNull() { Single.concat(Arrays.asList(just1, null)).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void concatObservableNull() { - Single.concat((Flowable>)null); - } - @Test public void concatNull() throws Exception { int maxArgs = 4; @@ -122,41 +101,16 @@ public void concatNull() throws Exception { } } - @Test(expected = NullPointerException.class) - public void createNull() { - Single.unsafeCreate(null); - } - - @Test(expected = NullPointerException.class) - public void deferNull() { - Single.defer(null); - } - @Test(expected = NullPointerException.class) public void deferReturnsNull() { Single.defer(Functions.>nullSupplier()).blockingGet(); } - @Test(expected = NullPointerException.class) - public void errorSupplierNull() { - Single.error((Supplier)null); - } - @Test(expected = NullPointerException.class) public void errorSupplierReturnsNull() { Single.error(Functions.nullSupplier()).blockingGet(); } - @Test(expected = NullPointerException.class) - public void errorNull() { - Single.error((Throwable)null); - } - - @Test(expected = NullPointerException.class) - public void fromCallableNull() { - Single.fromCallable(null); - } - @Test(expected = NullPointerException.class) public void fromCallableReturnsNull() { Single.fromCallable(new Callable() { @@ -167,11 +121,6 @@ public Object call() throws Exception { }).blockingGet(); } - @Test(expected = NullPointerException.class) - public void fromFutureNull() { - Single.fromFuture((Future)null); - } - @Test(expected = NullPointerException.class) public void fromFutureReturnsNull() { FutureTask f = new FutureTask<>(Functions.EMPTY_RUNNABLE, null); @@ -179,21 +128,6 @@ public void fromFutureReturnsNull() { Single.fromFuture(f).blockingGet(); } - @Test(expected = NullPointerException.class) - public void fromFutureTimedFutureNull() { - Single.fromFuture(null, 1, TimeUnit.SECONDS); - } - - @Test(expected = NullPointerException.class) - public void fromFutureTimedUnitNull() { - Single.fromFuture(new FutureTask<>(new Callable() { - @Override - public Object call() throws Exception { - return null; - } - }), 1, null); - } - @Test(expected = NullPointerException.class) public void fromFutureTimedReturnsNull() { FutureTask f = new FutureTask<>(Functions.EMPTY_RUNNABLE, null); @@ -201,21 +135,6 @@ public void fromFutureTimedReturnsNull() { Single.fromFuture(f, 1, TimeUnit.SECONDS).blockingGet(); } - @Test(expected = NullPointerException.class) - public void fromPublisherNull() { - Single.fromPublisher(null); - } - - @Test(expected = NullPointerException.class) - public void justNull() { - Single.just(null); - } - - @Test(expected = NullPointerException.class) - public void mergeIterableNull() { - Single.merge((Iterable>)null); - } - @Test(expected = NullPointerException.class) public void mergeIterableIteratorNull() { Single.merge(new Iterable>() { @@ -231,11 +150,6 @@ public void mergeIterableOneIsNull() { Single.merge(Arrays.asList(null, just1)).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void mergeSingleNull() { - Single.merge((Single>)null); - } - @Test public void mergeNull() throws Exception { int maxArgs = 4; @@ -265,46 +179,6 @@ public void mergeNull() throws Exception { } } - @Test(expected = NullPointerException.class) - public void timerUnitNull() { - Single.timer(1, null); - } - - @Test(expected = NullPointerException.class) - public void timerSchedulerNull() { - Single.timer(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void equalsFirstNull() { - Single.equals(null, just1); - } - - @Test(expected = NullPointerException.class) - public void equalsSecondNull() { - Single.equals(just1, null); - } - - @Test(expected = NullPointerException.class) - public void usingResourceSupplierNull() { - Single.using(null, new Function>() { - @Override - public Single apply(Object d) { - return just1; - } - }, Functions.emptyConsumer()); - } - - @Test(expected = NullPointerException.class) - public void usingSingleSupplierNull() { - Single.using(new Supplier() { - @Override - public Object get() { - return 1; - } - }, null, Functions.emptyConsumer()); - } - @Test(expected = NullPointerException.class) public void usingSingleSupplierReturnsNull() { Single.using(new Supplier() { @@ -320,31 +194,6 @@ public Single apply(Object d) { }, Functions.emptyConsumer()).blockingGet(); } - @Test(expected = NullPointerException.class) - public void usingDisposeNull() { - Single.using(new Supplier() { - @Override - public Object get() { - return 1; - } - }, new Function>() { - @Override - public Single apply(Object d) { - return just1; - } - }, null); - } - - @Test(expected = NullPointerException.class) - public void zipIterableNull() { - Single.zip((Iterable>)null, new Function() { - @Override - public Object apply(Object[] v) { - return 1; - } - }); - } - @Test(expected = NullPointerException.class) public void zipIterableIteratorNull() { Single.zip(new Iterable>() { @@ -370,11 +219,6 @@ public Object apply(Object[] v) { }).blockingGet(); } - @Test(expected = NullPointerException.class) - public void zipIterableOneFunctionNull() { - Single.zip(Arrays.asList(just1, just1), null).blockingGet(); - } - @Test(expected = NullPointerException.class) public void zipIterableOneFunctionReturnsNull() { Single.zip(Arrays.asList(just1, just1), new Function() { @@ -457,51 +301,6 @@ public Object invoke(Object o, Method m1, Object[] a) throws Throwable { } } - @Test(expected = NullPointerException.class) - public void zip2FirstNull() { - Single.zip(null, just1, new BiFunction() { - @Override - public Object apply(Object a, Integer b) { - return 1; - } - }); - } - - @Test(expected = NullPointerException.class) - public void zip2SecondNull() { - Single.zip(just1, null, new BiFunction() { - @Override - public Object apply(Integer a, Object b) { - return 1; - } - }); - } - - @Test(expected = NullPointerException.class) - public void zip2ZipperNull() { - Single.zip(just1, just1, null); - } - - @Test(expected = NullPointerException.class) - public void zip2ZipperReturnsdNull() { - Single.zip(just1, null, new BiFunction() { - @Override - public Object apply(Integer a, Object b) { - return null; - } - }).blockingGet(); - } - - @Test(expected = NullPointerException.class) - public void zipArrayNull() { - Single.zipArray(new Function() { - @Override - public Object apply(Object[] v) { - return 1; - } - }, (Single[])null); - } - @Test(expected = NullPointerException.class) public void zipIterableTwoIsNull() { Single.zip(Arrays.asList(just1, null), new Function() { @@ -524,11 +323,6 @@ public Object apply(Object[] v) { .blockingGet(); } - @Test(expected = NullPointerException.class) - public void zipArrayFunctionNull() { - Single.zipArray(null, just1, just1); - } - @Test(expected = NullPointerException.class) public void zipArrayFunctionReturnsNull() { Single.zipArray(new Function() { @@ -543,61 +337,6 @@ public Object apply(Object[] v) { // Instance methods //************************************************** - @Test(expected = NullPointerException.class) - public void ambWithNull() { - just1.ambWith(null); - } - - @Test(expected = NullPointerException.class) - public void composeNull() { - just1.compose(null); - } - - @Test(expected = NullPointerException.class) - public void castNull() { - just1.cast(null); - } - - @Test(expected = NullPointerException.class) - public void concatWith() { - just1.concatWith(null); - } - - @Test(expected = NullPointerException.class) - public void delayUnitNull() { - just1.delay(1, null); - } - - @Test(expected = NullPointerException.class) - public void delaySchedulerNull() { - just1.delay(1, TimeUnit.SECONDS, null); - } - - @Test(expected = NullPointerException.class) - public void doOnSubscribeNull() { - just1.doOnSubscribe(null); - } - - @Test(expected = NullPointerException.class) - public void doOnSuccess() { - just1.doOnSuccess(null); - } - - @Test(expected = NullPointerException.class) - public void doOnError() { - error.doOnError(null); - } - - @Test(expected = NullPointerException.class) - public void doOnDisposeNull() { - just1.doOnDispose(null); - } - - @Test(expected = NullPointerException.class) - public void flatMapNull() { - just1.flatMap(null); - } - @Test(expected = NullPointerException.class) public void flatMapFunctionReturnsNull() { just1.flatMap(new Function>() { @@ -608,11 +347,6 @@ public Single apply(Integer v) { }).blockingGet(); } - @Test(expected = NullPointerException.class) - public void flatMapPublisherNull() { - just1.flatMapPublisher(null); - } - @Test(expected = NullPointerException.class) public void flatMapPublisherFunctionReturnsNull() { just1.flatMapPublisher(new Function>() { @@ -623,11 +357,6 @@ public Publisher apply(Integer v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void liftNull() { - just1.lift(null); - } - @Test(expected = NullPointerException.class) public void liftFunctionReturnsNull() { just1.lift(new SingleOperator() { @@ -638,31 +367,6 @@ public SingleObserver apply(SingleObserver obse }).blockingGet(); } - @Test(expected = NullPointerException.class) - public void containsNull() { - just1.contains(null); - } - - @Test(expected = NullPointerException.class) - public void containsComparerNull() { - just1.contains(1, null); - } - - @Test(expected = NullPointerException.class) - public void mergeWithNull() { - just1.mergeWith(null); - } - - @Test(expected = NullPointerException.class) - public void observeOnNull() { - just1.observeOn(null); - } - - @Test(expected = NullPointerException.class) - public void onErrorReturnSupplierNull() { - just1.onErrorReturn((Function)null); - } - @Test(expected = NullPointerException.class) public void onErrorReturnsSupplierReturnsNull() { error.onErrorReturn(new Function() { @@ -673,21 +377,6 @@ public Integer apply(Throwable t) throws Exception { }).blockingGet(); } - @Test(expected = NullPointerException.class) - public void onErrorReturnValueNull() { - error.onErrorReturnItem(null); - } - - @Test(expected = NullPointerException.class) - public void onErrorResumeWithSingleNull() { - error.onErrorResumeWith(null); - } - - @Test(expected = NullPointerException.class) - public void onErrorResumeNextNull() { - error.onErrorResumeNext(null); - } - @Test public void onErrorResumeNextFunctionReturnsNull() { try { @@ -702,11 +391,6 @@ public Single apply(Throwable e) { } } - @Test(expected = NullPointerException.class) - public void repeatWhenNull() { - error.repeatWhen(null); - } - @Test(expected = NullPointerException.class) public void repeatWhenFunctionReturnsNull() { error.repeatWhen(new Function, Publisher>() { @@ -717,26 +401,6 @@ public Publisher apply(Flowable v) { }).blockingSubscribe(); } - @Test(expected = NullPointerException.class) - public void repeatUntilNull() { - error.repeatUntil(null); - } - - @Test(expected = NullPointerException.class) - public void retryBiPreducateNull() { - error.retry((BiPredicate)null); - } - - @Test(expected = NullPointerException.class) - public void retryPredicateNull() { - error.retry((Predicate)null); - } - - @Test(expected = NullPointerException.class) - public void retryWhenNull() { - error.retryWhen(null); - } - @Test(expected = NullPointerException.class) public void retryWhenFunctionReturnsNull() { error.retryWhen(new Function, Publisher>() { @@ -747,21 +411,6 @@ public Publisher apply(Flowable e) { }).blockingGet(); } - @Test(expected = NullPointerException.class) - public void subscribeBiConsumerNull() { - just1.subscribe((BiConsumer)null); - } - - @Test(expected = NullPointerException.class) - public void subscribeConsumerNull() { - just1.subscribe((Consumer)null); - } - - @Test(expected = NullPointerException.class) - public void subscribeSingeSubscriberNull() { - just1.subscribe((SingleObserver)null); - } - @Test(expected = NullPointerException.class) public void subscribeOnSuccessNull() { just1.subscribe(null, new Consumer() { @@ -770,64 +419,6 @@ public void accept(Throwable e) { } }); } - @Test(expected = NullPointerException.class) - public void subscribeOnErrorNull() { - just1.subscribe(new Consumer() { - @Override - public void accept(Integer v) { } - }, null); - } - - @Test(expected = NullPointerException.class) - public void subscribeSubscriberNull() { - just1.toFlowable().subscribe((Subscriber)null); - } - - @Test(expected = NullPointerException.class) - public void subscribeOnNull() { - just1.subscribeOn(null); - } - - @Test(expected = NullPointerException.class) - public void timeoutUnitNull() { - just1.timeout(1, null); - } - - @Test(expected = NullPointerException.class) - public void timeoutSchedulerNull() { - just1.timeout(1, TimeUnit.SECONDS, (Scheduler)null); - } - - @Test(expected = NullPointerException.class) - public void timeoutOtherNull() { - just1.timeout(1, TimeUnit.SECONDS, Schedulers.single(), null); - } - - @Test(expected = NullPointerException.class) - public void timeoutOther2Null() { - just1.timeout(1, TimeUnit.SECONDS, (Single)null); - } - - @Test(expected = NullPointerException.class) - public void toNull() { - just1.to(null); - } - - @Test(expected = NullPointerException.class) - public void zipWithNull() { - just1.zipWith(null, new BiFunction() { - @Override - public Object apply(Integer a, Object b) { - return 1; - } - }); - } - - @Test(expected = NullPointerException.class) - public void zipWithFunctionNull() { - just1.zipWith(just1, null); - } - @Test(expected = NullPointerException.class) public void zipWithFunctionReturnsNull() { just1.zipWith(just1, new BiFunction() {