From d21d8d979d823199b7a3d55edeedb6a6e172d28a Mon Sep 17 00:00:00 2001 From: Yuriy Lazarev Date: Wed, 15 Apr 2015 14:05:34 +0200 Subject: [PATCH] VarArg parameters for the assertReceivedOnNext(T... items) --- src/main/java/rx/observers/TestObserver.java | 14 ++++++- .../java/rx/observers/TestSubscriber.java | 12 ++++++ src/test/java/rx/ObservableTests.java | 8 ++-- .../operators/OnBackpressureBlockTest.java | 28 +++++++------- .../operators/OnSubscribeCacheTest.java | 2 +- .../OnSubscribeFromIterableTest.java | 14 +++---- .../operators/OnSubscribeRangeTest.java | 6 +-- .../operators/OnSubscribeRefCountTest.java | 4 +- .../operators/OperatorConcatTest.java | 2 +- .../operators/OperatorDebounceTest.java | 4 +- .../internal/operators/OperatorDelayTest.java | 2 +- .../OperatorMergeDelayErrorTest.java | 4 +- .../internal/operators/OperatorMergeTest.java | 38 +++++++++---------- .../operators/OperatorObserveOnTest.java | 4 +- ...ratorOnErrorResumeNextViaFunctionTest.java | 4 +- .../operators/OperatorPublishTest.java | 8 ++-- .../operators/OperatorRepeatTest.java | 2 +- .../internal/operators/OperatorScanTest.java | 2 +- .../operators/OperatorSubscribeOnTest.java | 2 +- .../operators/OperatorSwitchTest.java | 2 +- .../operators/OperatorTakeLastTest.java | 2 +- .../OperatorTakeUntilPredicateTest.java | 2 +- .../operators/OperatorTakeUntilTest.java | 10 ++--- .../operators/OperatorTakeWhileTest.java | 6 +-- .../operators/OperatorUnsubscribeOnTest.java | 4 +- .../operators/OperatorWindowWithSizeTest.java | 10 ++--- .../internal/operators/OperatorZipTest.java | 4 +- .../observables/AbstractOnSubscribeTest.java | 2 +- .../java/rx/observers/TestObserverTest.java | 8 ++-- .../java/rx/observers/TestSubscriberTest.java | 8 ++-- .../rx/subjects/SerializedSubjectTest.java | 2 +- 31 files changed, 122 insertions(+), 98 deletions(-) diff --git a/src/main/java/rx/observers/TestObserver.java b/src/main/java/rx/observers/TestObserver.java index e7f02131b6..3df1d72149 100644 --- a/src/main/java/rx/observers/TestObserver.java +++ b/src/main/java/rx/observers/TestObserver.java @@ -16,6 +16,7 @@ package rx.observers; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -103,6 +104,18 @@ public List getEvents() { return Collections.unmodifiableList(events); } + /** + * Assert that a particular sequence of items was received in order. + * + * @param items + * the sequence of items expected to have been observed + * @throws AssertionError + * if the sequence of items observed does not exactly match {@code items} + */ + public void assertReceivedOnNext(T... items) { + assertReceivedOnNext(Arrays.asList(items)); + } + /** * Assert that a particular sequence of items was received in order. * @@ -127,7 +140,6 @@ public void assertReceivedOnNext(List items) { } } - } /** diff --git a/src/main/java/rx/observers/TestSubscriber.java b/src/main/java/rx/observers/TestSubscriber.java index 709027ea97..3f8636c291 100644 --- a/src/main/java/rx/observers/TestSubscriber.java +++ b/src/main/java/rx/observers/TestSubscriber.java @@ -149,6 +149,18 @@ public List getOnNextEvents() { return testObserver.getOnNextEvents(); } + /** + * Assert that a particular sequence of items was received by this {@link Subscriber} in order. + * + * @param items + * the sequence of items expected to have been observed + * @throws AssertionError + * if the sequence of items observed does not exactly match {@code items} + */ + public void assertReceivedOnNext(T... items) { + testObserver.assertReceivedOnNext(items); + } + /** * Assert that a particular sequence of items was received by this {@link Subscriber} in order. * diff --git a/src/test/java/rx/ObservableTests.java b/src/test/java/rx/ObservableTests.java index badbfe262e..d4c0e5de6e 100644 --- a/src/test/java/rx/ObservableTests.java +++ b/src/test/java/rx/ObservableTests.java @@ -1024,21 +1024,21 @@ public void call(StringBuilder sb, Integer v) { public void testMergeWith() { TestSubscriber ts = new TestSubscriber(); Observable.just(1).mergeWith(Observable.just(2)).subscribe(ts); - ts.assertReceivedOnNext(Arrays.asList(1, 2)); + ts.assertReceivedOnNext(1, 2); } @Test public void testConcatWith() { TestSubscriber ts = new TestSubscriber(); Observable.just(1).concatWith(Observable.just(2)).subscribe(ts); - ts.assertReceivedOnNext(Arrays.asList(1, 2)); + ts.assertReceivedOnNext(1, 2); } @Test public void testAmbWith() { TestSubscriber ts = new TestSubscriber(); Observable.just(1).ambWith(Observable.just(2)).subscribe(ts); - ts.assertReceivedOnNext(Arrays.asList(1)); + ts.assertReceivedOnNext(1); } @Test(expected = OnErrorNotImplementedException.class) @@ -1097,7 +1097,7 @@ public String call(Integer t1) { }).subscribe(ts); ts.assertTerminalEvent(); ts.assertNoErrors(); - ts.assertReceivedOnNext(Arrays.asList("1", "2", "3")); + ts.assertReceivedOnNext("1", "2", "3"); } @Test diff --git a/src/test/java/rx/internal/operators/OnBackpressureBlockTest.java b/src/test/java/rx/internal/operators/OnBackpressureBlockTest.java index 47d3cebd71..0d23e49522 100644 --- a/src/test/java/rx/internal/operators/OnBackpressureBlockTest.java +++ b/src/test/java/rx/internal/operators/OnBackpressureBlockTest.java @@ -51,7 +51,7 @@ public void testSimpleBelowCapacity() { TestObserver o = new TestObserver(); source.subscribe(o); - o.assertReceivedOnNext(Arrays.asList(1)); + o.assertReceivedOnNext(1); o.assertTerminalEvent(); assertTrue(o.getOnErrorEvents().isEmpty()); } @@ -71,13 +71,13 @@ public void onStart() { Thread.sleep(WAIT); - o.assertReceivedOnNext(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)); + o.assertReceivedOnNext(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); o.requestMore(10); Thread.sleep(WAIT); - o.assertReceivedOnNext(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11)); + o.assertReceivedOnNext(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11); o.assertTerminalEvent(); assertTrue(o.getOnErrorEvents().isEmpty()); @@ -132,7 +132,7 @@ public void onStart() { Thread.sleep(WAIT); - o.assertReceivedOnNext(Arrays.asList(1, 2, 3, 4, 5)); + o.assertReceivedOnNext(1, 2, 3, 4, 5); o.assertNoErrors(); assertTrue(o.getOnCompletedEvents().isEmpty()); } @@ -155,7 +155,7 @@ public void onStart() { Thread.sleep(WAIT); - o.assertReceivedOnNext(Arrays.asList(1, 2, 3, 4, 5, 6, 7)); + o.assertReceivedOnNext(1, 2, 3, 4, 5, 6, 7); o.assertNoErrors(); assertTrue(o.getOnCompletedEvents().isEmpty()); @@ -163,7 +163,7 @@ public void onStart() { Thread.sleep(WAIT); - o.assertReceivedOnNext(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)); + o.assertReceivedOnNext(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); o.assertTerminalEvent(); assertEquals(1, o.getOnErrorEvents().size()); assertTrue(o.getOnErrorEvents().get(0) instanceof TestException); @@ -172,7 +172,7 @@ public void onStart() { Thread.sleep(WAIT); - o.assertReceivedOnNext(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)); + o.assertReceivedOnNext(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); o.assertTerminalEvent(); assertEquals(1, o.getOnErrorEvents().size()); assertTrue(o.getOnErrorEvents().get(0) instanceof TestException); @@ -196,7 +196,7 @@ public void onStart() { Thread.sleep(WAIT); - o.assertReceivedOnNext(Arrays.asList(1, 2, 3, 4, 5, 6, 7)); + o.assertReceivedOnNext(1, 2, 3, 4, 5, 6, 7); o.assertNoErrors(); assertTrue(o.getOnCompletedEvents().isEmpty()); @@ -204,7 +204,7 @@ public void onStart() { Thread.sleep(WAIT); - o.assertReceivedOnNext(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)); + o.assertReceivedOnNext(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); assertEquals(1, o.getOnErrorEvents().size()); assertTrue(o.getOnErrorEvents().get(0) instanceof TestException); assertTrue(o.getOnCompletedEvents().isEmpty()); @@ -228,7 +228,7 @@ public void onStart() { o.awaitTerminalEvent(); - o.assertReceivedOnNext(Arrays.asList(1, 2, 3, 4, 5, 6, 7)); + o.assertReceivedOnNext(1, 2, 3, 4, 5, 6, 7); o.assertNoErrors(); o.assertTerminalEvent(); } @@ -244,7 +244,7 @@ public void testTakeWorksSubscriberRequestUnlimited() { o.awaitTerminalEvent(); - o.assertReceivedOnNext(Arrays.asList(1, 2, 3, 4, 5, 6, 7)); + o.assertReceivedOnNext(1, 2, 3, 4, 5, 6, 7); o.assertNoErrors(); o.assertTerminalEvent(); } @@ -260,7 +260,7 @@ public void testTakeWorksSubscriberRequestUnlimitedBufferedException() { o.awaitTerminalEvent(); - o.assertReceivedOnNext(Arrays.asList(1, 2, 3, 4, 5, 6, 7)); + o.assertReceivedOnNext(1, 2, 3, 4, 5, 6, 7); o.assertNoErrors(); o.assertTerminalEvent(); } @@ -314,7 +314,7 @@ public void onNext(Integer t) { o.assertNoErrors(); o.assertTerminalEvent(); - o.assertReceivedOnNext(Arrays.asList(1)); + o.assertReceivedOnNext(1); } @Test(timeout = 10000) public void testOnCompletedDoesntWaitIfNoEvents3() { @@ -342,6 +342,6 @@ public void onNext(Integer t) { o.assertNoErrors(); o.assertTerminalEvent(); - o.assertReceivedOnNext(Arrays.asList(1, 2)); + o.assertReceivedOnNext(1, 2); } } diff --git a/src/test/java/rx/internal/operators/OnSubscribeCacheTest.java b/src/test/java/rx/internal/operators/OnSubscribeCacheTest.java index 3303106d93..548b5f6503 100644 --- a/src/test/java/rx/internal/operators/OnSubscribeCacheTest.java +++ b/src/test/java/rx/internal/operators/OnSubscribeCacheTest.java @@ -127,7 +127,7 @@ public Integer call(Integer t1, Long t2) { ts.awaitTerminalEvent(); ts.assertNoErrors(); System.out.println(ts.getOnNextEvents()); - ts.assertReceivedOnNext(Arrays.asList(expected)); + ts.assertReceivedOnNext(expected); } @Test(timeout = 10000) diff --git a/src/test/java/rx/internal/operators/OnSubscribeFromIterableTest.java b/src/test/java/rx/internal/operators/OnSubscribeFromIterableTest.java index b9f829783a..258261f673 100644 --- a/src/test/java/rx/internal/operators/OnSubscribeFromIterableTest.java +++ b/src/test/java/rx/internal/operators/OnSubscribeFromIterableTest.java @@ -127,11 +127,11 @@ public void testBackpressureViaRequest() { ts.assertReceivedOnNext(Collections. emptyList()); ts.requestMore(1); o.call(ts); - ts.assertReceivedOnNext(Arrays.asList(1)); + ts.assertReceivedOnNext(1); ts.requestMore(2); - ts.assertReceivedOnNext(Arrays.asList(1, 2, 3)); + ts.assertReceivedOnNext(1, 2, 3); ts.requestMore(3); - ts.assertReceivedOnNext(Arrays.asList(1, 2, 3, 4, 5, 6)); + ts.assertReceivedOnNext(1, 2, 3, 4, 5, 6); ts.requestMore(list.size()); ts.assertTerminalEvent(); } @@ -143,7 +143,7 @@ public void testNoBackpressure() { ts.assertReceivedOnNext(Collections. emptyList()); ts.requestMore(Long.MAX_VALUE); // infinite o.call(ts); - ts.assertReceivedOnNext(Arrays.asList(1, 2, 3, 4, 5)); + ts.assertReceivedOnNext(1, 2, 3, 4, 5); ts.assertTerminalEvent(); } @@ -152,15 +152,15 @@ public void testSubscribeMultipleTimes() { OnSubscribeFromIterable o = new OnSubscribeFromIterable(Arrays.asList(1, 2, 3)); TestSubscriber ts = new TestSubscriber(); o.call(ts); - ts.assertReceivedOnNext(Arrays.asList(1, 2, 3)); + ts.assertReceivedOnNext(1, 2, 3); ts = new TestSubscriber(); o.call(ts); - ts.assertReceivedOnNext(Arrays.asList(1, 2, 3)); + ts.assertReceivedOnNext(1, 2, 3); ts = new TestSubscriber(); o.call(ts); - ts.assertReceivedOnNext(Arrays.asList(1, 2, 3)); + ts.assertReceivedOnNext(1, 2, 3); } @Test diff --git a/src/test/java/rx/internal/operators/OnSubscribeRangeTest.java b/src/test/java/rx/internal/operators/OnSubscribeRangeTest.java index 9b06cdb4d0..5bff6a662c 100644 --- a/src/test/java/rx/internal/operators/OnSubscribeRangeTest.java +++ b/src/test/java/rx/internal/operators/OnSubscribeRangeTest.java @@ -108,11 +108,11 @@ public void testBackpressureViaRequest() { ts.assertReceivedOnNext(Collections. emptyList()); ts.requestMore(1); o.call(ts); - ts.assertReceivedOnNext(Arrays.asList(1)); + ts.assertReceivedOnNext(1); ts.requestMore(2); - ts.assertReceivedOnNext(Arrays.asList(1, 2, 3)); + ts.assertReceivedOnNext(1, 2, 3); ts.requestMore(3); - ts.assertReceivedOnNext(Arrays.asList(1, 2, 3, 4, 5, 6)); + ts.assertReceivedOnNext(1, 2, 3, 4, 5, 6); ts.requestMore(RxRingBuffer.SIZE); ts.assertTerminalEvent(); } diff --git a/src/test/java/rx/internal/operators/OnSubscribeRefCountTest.java b/src/test/java/rx/internal/operators/OnSubscribeRefCountTest.java index 59d1ee7de4..34c600efce 100644 --- a/src/test/java/rx/internal/operators/OnSubscribeRefCountTest.java +++ b/src/test/java/rx/internal/operators/OnSubscribeRefCountTest.java @@ -519,11 +519,11 @@ public Integer call(Integer t1, Integer t2) { ts1.assertTerminalEvent(); ts1.assertNoErrors(); - ts1.assertReceivedOnNext(Arrays.asList(30)); + ts1.assertReceivedOnNext(30); ts2.assertTerminalEvent(); ts2.assertNoErrors(); - ts2.assertReceivedOnNext(Arrays.asList(30)); + ts2.assertReceivedOnNext(30); } @Test(timeout = 10000) diff --git a/src/test/java/rx/internal/operators/OperatorConcatTest.java b/src/test/java/rx/internal/operators/OperatorConcatTest.java index 688b0331f2..c15a9ce878 100644 --- a/src/test/java/rx/internal/operators/OperatorConcatTest.java +++ b/src/test/java/rx/internal/operators/OperatorConcatTest.java @@ -715,7 +715,7 @@ public void call(Subscriber s) { ts.awaitTerminalEvent(500, TimeUnit.MILLISECONDS); ts.assertTerminalEvent(); ts.assertNoErrors(); - ts.assertReceivedOnNext(Arrays.asList("hello", "hello")); + ts.assertReceivedOnNext("hello", "hello"); } } diff --git a/src/test/java/rx/internal/operators/OperatorDebounceTest.java b/src/test/java/rx/internal/operators/OperatorDebounceTest.java index e43efa2f7f..f610b17472 100644 --- a/src/test/java/rx/internal/operators/OperatorDebounceTest.java +++ b/src/test/java/rx/internal/operators/OperatorDebounceTest.java @@ -301,8 +301,8 @@ public void debounceWithTimeBackpressure() throws InterruptedException { scheduler.advanceTimeBy(30, TimeUnit.MILLISECONDS); - subscriber.assertReceivedOnNext(Arrays.asList(2)); + subscriber.assertReceivedOnNext(2); subscriber.assertTerminalEvent(); subscriber.assertNoErrors(); } -} \ No newline at end of file +} diff --git a/src/test/java/rx/internal/operators/OperatorDelayTest.java b/src/test/java/rx/internal/operators/OperatorDelayTest.java index 9f80f0dc73..0b9b7380fe 100644 --- a/src/test/java/rx/internal/operators/OperatorDelayTest.java +++ b/src/test/java/rx/internal/operators/OperatorDelayTest.java @@ -663,7 +663,7 @@ public void call(Notification t1) { delayed.subscribe(observer); // all will be delivered after 500ms since range does not delay between them scheduler.advanceTimeBy(500L, TimeUnit.MILLISECONDS); - observer.assertReceivedOnNext(Arrays.asList(1, 2, 3, 4, 5)); + observer.assertReceivedOnNext(1, 2, 3, 4, 5); } @Test diff --git a/src/test/java/rx/internal/operators/OperatorMergeDelayErrorTest.java b/src/test/java/rx/internal/operators/OperatorMergeDelayErrorTest.java index 85eb84b6e9..b523a6c8de 100644 --- a/src/test/java/rx/internal/operators/OperatorMergeDelayErrorTest.java +++ b/src/test/java/rx/internal/operators/OperatorMergeDelayErrorTest.java @@ -489,7 +489,7 @@ public void testErrorInParentObservable() { ).subscribe(ts); ts.awaitTerminalEvent(); ts.assertTerminalEvent(); - ts.assertReceivedOnNext(Arrays.asList(1, 2)); + ts.assertReceivedOnNext(1, 2); assertEquals(1, ts.getOnErrorEvents().size()); } @@ -546,4 +546,4 @@ public void run() { t.start(); } } -} \ No newline at end of file +} diff --git a/src/test/java/rx/internal/operators/OperatorMergeTest.java b/src/test/java/rx/internal/operators/OperatorMergeTest.java index 7d785b4088..74a8866fb8 100644 --- a/src/test/java/rx/internal/operators/OperatorMergeTest.java +++ b/src/test/java/rx/internal/operators/OperatorMergeTest.java @@ -418,7 +418,7 @@ public void testUnsubscribeAsObservablesComplete() { scheduler1.advanceTimeBy(3, TimeUnit.SECONDS); scheduler2.advanceTimeBy(2, TimeUnit.SECONDS); - ts.assertReceivedOnNext(Arrays.asList(0L, 1L, 2L, 0L, 1L)); + ts.assertReceivedOnNext(0L, 1L, 2L, 0L, 1L); // not unsubscribed yet assertFalse(os1.get()); assertFalse(os2.get()); @@ -426,14 +426,14 @@ public void testUnsubscribeAsObservablesComplete() { // advance to the end at which point it should complete scheduler1.advanceTimeBy(3, TimeUnit.SECONDS); - ts.assertReceivedOnNext(Arrays.asList(0L, 1L, 2L, 0L, 1L, 3L, 4L)); + ts.assertReceivedOnNext(0L, 1L, 2L, 0L, 1L, 3L, 4L); assertTrue(os1.get()); assertFalse(os2.get()); // both should be completed now scheduler2.advanceTimeBy(3, TimeUnit.SECONDS); - ts.assertReceivedOnNext(Arrays.asList(0L, 1L, 2L, 0L, 1L, 3L, 4L, 2L, 3L, 4L)); + ts.assertReceivedOnNext(0L, 1L, 2L, 0L, 1L, 3L, 4L, 2L, 3L, 4L); assertTrue(os1.get()); assertTrue(os2.get()); @@ -460,7 +460,7 @@ public void testEarlyUnsubscribe() { scheduler1.advanceTimeBy(3, TimeUnit.SECONDS); scheduler2.advanceTimeBy(2, TimeUnit.SECONDS); - ts.assertReceivedOnNext(Arrays.asList(0L, 1L, 2L, 0L, 1L)); + ts.assertReceivedOnNext(0L, 1L, 2L, 0L, 1L); // not unsubscribed yet assertFalse(os1.get()); assertFalse(os2.get()); @@ -471,7 +471,7 @@ public void testEarlyUnsubscribe() { assertTrue(os1.get()); assertTrue(os2.get()); - ts.assertReceivedOnNext(Arrays.asList(0L, 1L, 2L, 0L, 1L)); + ts.assertReceivedOnNext(0L, 1L, 2L, 0L, 1L); ts.assertUnsubscribed(); } } @@ -811,7 +811,7 @@ public void mergeWithNullValues() { Observable.merge(Observable.just(null, "one"), Observable.just("two", null)).subscribe(ts); ts.assertTerminalEvent(); ts.assertNoErrors(); - ts.assertReceivedOnNext(Arrays.asList(null, "one", "two", null)); + ts.assertReceivedOnNext(null, "one", "two", null); } @Test @@ -830,7 +830,7 @@ public void call(Subscriber s) { }); Observable.merge(Observable.just(null, "one"), bad).subscribe(ts); ts.assertNoErrors(); - ts.assertReceivedOnNext(Arrays.asList(null, "one", "two")); + ts.assertReceivedOnNext(null, "one", "two"); } @Test @@ -838,7 +838,7 @@ public void mergingNullObservable() { TestSubscriber ts = new TestSubscriber(); Observable.merge(Observable.just("one"), null).subscribe(ts); ts.assertNoErrors(); - ts.assertReceivedOnNext(Arrays.asList("one")); + ts.assertReceivedOnNext("one"); } @Test @@ -1028,7 +1028,7 @@ public void shouldCompleteAfterApplyingBackpressure_NormalPath() { subscriber.requestMore(0); source.subscribe(subscriber); subscriber.requestMore(3); // 1, 2, - with requestMore(2) we get the 1 and 2 but not the - subscriber.assertReceivedOnNext(asList(1, 2)); + subscriber.assertReceivedOnNext(1, 2); subscriber.assertTerminalEvent(); } @@ -1039,7 +1039,7 @@ public void shouldCompleteAfterApplyingBackpressure_FastPath() { subscriber.requestMore(0); source.subscribe(subscriber); subscriber.requestMore(2); // 1, - should work as per .._NormalPath above - subscriber.assertReceivedOnNext(asList(1)); + subscriber.assertReceivedOnNext(1); subscriber.assertTerminalEvent(); } @@ -1054,7 +1054,7 @@ public void shouldNotCompleteIfThereArePendingScalarSynchronousEmissionsWhenTheL subscriber.assertReceivedOnNext(Collections.emptyList()); assertEquals(Collections.>emptyList(), subscriber.getOnCompletedEvents()); subscriber.requestMore(1); - subscriber.assertReceivedOnNext(asList(1L)); + subscriber.assertReceivedOnNext(1L); assertEquals(Collections.>emptyList(), subscriber.getOnCompletedEvents()); subscriber.requestMore(1); subscriber.assertTerminalEvent(); @@ -1068,7 +1068,7 @@ public void delayedErrorsShouldBeEmittedWhenCompleteAfterApplyingBackpressure_No subscriber.requestMore(0); source.subscribe(subscriber); subscriber.requestMore(3); // 1, 2, - subscriber.assertReceivedOnNext(asList(1, 2)); + subscriber.assertReceivedOnNext(1, 2); subscriber.assertTerminalEvent(); assertEquals(asList(exception), subscriber.getOnErrorEvents()); } @@ -1081,7 +1081,7 @@ public void delayedErrorsShouldBeEmittedWhenCompleteAfterApplyingBackpressure_Fa subscriber.requestMore(0); source.subscribe(subscriber); subscriber.requestMore(2); // 1, - subscriber.assertReceivedOnNext(asList(1)); + subscriber.assertReceivedOnNext(1); subscriber.assertTerminalEvent(); assertEquals(asList(exception), subscriber.getOnErrorEvents()); } @@ -1092,9 +1092,9 @@ public void shouldNotCompleteWhileThereAreStillScalarSynchronousEmissionsInTheQu TestSubscriber subscriber = new TestSubscriber(); subscriber.requestMore(1); source.subscribe(subscriber); - subscriber.assertReceivedOnNext(asList(1)); + subscriber.assertReceivedOnNext(1); subscriber.requestMore(1); - subscriber.assertReceivedOnNext(asList(1, 2)); + subscriber.assertReceivedOnNext(1, 2); } @Test @@ -1104,10 +1104,10 @@ public void shouldNotReceivedDelayedErrorWhileThereAreStillScalarSynchronousEmis TestSubscriber subscriber = new TestSubscriber(); subscriber.requestMore(1); source.subscribe(subscriber); - subscriber.assertReceivedOnNext(asList(1)); + subscriber.assertReceivedOnNext(1); assertEquals(Collections.emptyList(), subscriber.getOnErrorEvents()); subscriber.requestMore(1); - subscriber.assertReceivedOnNext(asList(1, 2)); + subscriber.assertReceivedOnNext(1, 2); assertEquals(asList(exception), subscriber.getOnErrorEvents()); } @@ -1118,10 +1118,10 @@ public void shouldNotReceivedDelayedErrorWhileThereAreStillNormalEmissionsInTheQ TestSubscriber subscriber = new TestSubscriber(); subscriber.requestMore(3); source.subscribe(subscriber); - subscriber.assertReceivedOnNext(asList(1, 2, 3)); + subscriber.assertReceivedOnNext(1, 2, 3); assertEquals(Collections.emptyList(), subscriber.getOnErrorEvents()); subscriber.requestMore(2); - subscriber.assertReceivedOnNext(asList(1, 2, 3, 4)); + subscriber.assertReceivedOnNext(1, 2, 3, 4); assertEquals(asList(exception), subscriber.getOnErrorEvents()); } diff --git a/src/test/java/rx/internal/operators/OperatorObserveOnTest.java b/src/test/java/rx/internal/operators/OperatorObserveOnTest.java index de204a82ec..765e3e7e0a 100644 --- a/src/test/java/rx/internal/operators/OperatorObserveOnTest.java +++ b/src/test/java/rx/internal/operators/OperatorObserveOnTest.java @@ -455,7 +455,7 @@ public void onNext(Integer t) { .subscribe(testSubscriber); testSubscriber.awaitTerminalEvent(); System.err.println(testSubscriber.getOnNextEvents()); - testSubscriber.assertReceivedOnNext(Arrays.asList(0, 1, 2)); + testSubscriber.assertReceivedOnNext(0, 1, 2); // it should be between the take num and requested batch size across the async boundary System.out.println("Generated: " + generated.get()); assertTrue(generated.get() >= 3 && generated.get() <= RxRingBuffer.SIZE); @@ -538,7 +538,7 @@ public boolean hasNext() { .subscribe(testSubscriber); testSubscriber.awaitTerminalEvent(); - testSubscriber.assertReceivedOnNext(Arrays.asList(0, 1, 2, 3, 4, 5, 6)); + testSubscriber.assertReceivedOnNext(0, 1, 2, 3, 4, 5, 6); assertEquals(7, generated.get()); } diff --git a/src/test/java/rx/internal/operators/OperatorOnErrorResumeNextViaFunctionTest.java b/src/test/java/rx/internal/operators/OperatorOnErrorResumeNextViaFunctionTest.java index 1aab90867d..951673ddbe 100644 --- a/src/test/java/rx/internal/operators/OperatorOnErrorResumeNextViaFunctionTest.java +++ b/src/test/java/rx/internal/operators/OperatorOnErrorResumeNextViaFunctionTest.java @@ -178,7 +178,7 @@ public Observable call(Throwable t1) { ts.assertTerminalEvent(); System.out.println(ts.getOnNextEvents()); - ts.assertReceivedOnNext(Arrays.asList("success")); + ts.assertReceivedOnNext("success"); } /** @@ -227,7 +227,7 @@ public Observable call(Throwable t1) { ts.assertTerminalEvent(); System.out.println(ts.getOnNextEvents()); - ts.assertReceivedOnNext(Arrays.asList("success")); + ts.assertReceivedOnNext("success"); } @Test diff --git a/src/test/java/rx/internal/operators/OperatorPublishTest.java b/src/test/java/rx/internal/operators/OperatorPublishTest.java index 3d8481a676..c8940b40a3 100644 --- a/src/test/java/rx/internal/operators/OperatorPublishTest.java +++ b/src/test/java/rx/internal/operators/OperatorPublishTest.java @@ -159,7 +159,7 @@ public Boolean call(Integer i) { }).subscribe(ts); ts.awaitTerminalEvent(); ts.assertNoErrors(); - ts.assertReceivedOnNext(Arrays.asList(0, 1, 2, 3)); + ts.assertReceivedOnNext(0, 1, 2, 3); assertEquals(5, emitted.get()); System.out.println(ts.getOnNextEvents()); } @@ -238,8 +238,8 @@ public void call() { assertTrue(child1Unsubscribed.get()); assertTrue(child2Unsubscribed.get()); - ts1.assertReceivedOnNext(Arrays.asList(1, 2, 3, 4, 5)); - ts2.assertReceivedOnNext(Arrays.asList(4, 5, 6, 7, 8)); + ts1.assertReceivedOnNext(1, 2, 3, 4, 5); + ts2.assertReceivedOnNext(4, 5, 6, 7, 8); assertEquals(8, sourceEmission.get()); } @@ -255,7 +255,7 @@ public void testConnectWithNoSubscriber() { co.subscribe(subscriber); // Emit 1 and 2 scheduler.advanceTimeBy(50, TimeUnit.MILLISECONDS); - subscriber.assertReceivedOnNext(Arrays.asList(1L, 2L)); + subscriber.assertReceivedOnNext(1L, 2L); subscriber.assertNoErrors(); subscriber.assertTerminalEvent(); } diff --git a/src/test/java/rx/internal/operators/OperatorRepeatTest.java b/src/test/java/rx/internal/operators/OperatorRepeatTest.java index 44371867c5..79980eb3a8 100644 --- a/src/test/java/rx/internal/operators/OperatorRepeatTest.java +++ b/src/test/java/rx/internal/operators/OperatorRepeatTest.java @@ -173,7 +173,7 @@ public void testRepeatAndDistinctUnbounded() { ts.assertNoErrors(); ts.assertTerminalEvent(); - ts.assertReceivedOnNext(Arrays.asList(1, 2, 3)); + ts.assertReceivedOnNext(1, 2, 3); } /** Issue #2844: wrong target of request. */ @Test(timeout = 3000) diff --git a/src/test/java/rx/internal/operators/OperatorScanTest.java b/src/test/java/rx/internal/operators/OperatorScanTest.java index e05d4d9bb1..0e1e9195d6 100644 --- a/src/test/java/rx/internal/operators/OperatorScanTest.java +++ b/src/test/java/rx/internal/operators/OperatorScanTest.java @@ -308,7 +308,7 @@ public Integer call(Integer t1, Integer t2) { }).take(1); TestSubscriber subscriber = new TestSubscriber(); o.subscribe(subscriber); - subscriber.assertReceivedOnNext(Arrays.asList(0)); + subscriber.assertReceivedOnNext(0); subscriber.assertTerminalEvent(); subscriber.assertNoErrors(); } diff --git a/src/test/java/rx/internal/operators/OperatorSubscribeOnTest.java b/src/test/java/rx/internal/operators/OperatorSubscribeOnTest.java index 6a87a383c9..01ab81ac13 100644 --- a/src/test/java/rx/internal/operators/OperatorSubscribeOnTest.java +++ b/src/test/java/rx/internal/operators/OperatorSubscribeOnTest.java @@ -185,7 +185,7 @@ public void call(Subscriber sub) { ts.awaitTerminalEventAndUnsubscribeOnTimeout(1000, TimeUnit.MILLISECONDS); Thread.sleep(200); // give time for the loop to continue - ts.assertReceivedOnNext(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)); + ts.assertReceivedOnNext(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); assertEquals(10, count.get()); } diff --git a/src/test/java/rx/internal/operators/OperatorSwitchTest.java b/src/test/java/rx/internal/operators/OperatorSwitchTest.java index 0efc388db1..8b7edd2fc3 100644 --- a/src/test/java/rx/internal/operators/OperatorSwitchTest.java +++ b/src/test/java/rx/internal/operators/OperatorSwitchTest.java @@ -513,7 +513,7 @@ public void onNext(String s) { } }); scheduler.advanceTimeBy(10, TimeUnit.MILLISECONDS); - testSubscriber.assertReceivedOnNext(Arrays.asList("a1", "b1", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "c10")); + testSubscriber.assertReceivedOnNext("a1", "b1", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "c10"); testSubscriber.assertNoErrors(); testSubscriber.assertTerminalEvent(); } diff --git a/src/test/java/rx/internal/operators/OperatorTakeLastTest.java b/src/test/java/rx/internal/operators/OperatorTakeLastTest.java index c2b1ef014c..60fd2f758c 100644 --- a/src/test/java/rx/internal/operators/OperatorTakeLastTest.java +++ b/src/test/java/rx/internal/operators/OperatorTakeLastTest.java @@ -121,7 +121,7 @@ public void testBackpressure1() { Observable.range(1, 100000).takeLast(1).observeOn(Schedulers.newThread()).map(newSlowProcessor()).subscribe(ts); ts.awaitTerminalEvent(); ts.assertNoErrors(); - ts.assertReceivedOnNext(Arrays.asList(100000)); + ts.assertReceivedOnNext(100000); } @Test diff --git a/src/test/java/rx/internal/operators/OperatorTakeUntilPredicateTest.java b/src/test/java/rx/internal/operators/OperatorTakeUntilPredicateTest.java index f8e83f04ff..96a3f66ecc 100644 --- a/src/test/java/rx/internal/operators/OperatorTakeUntilPredicateTest.java +++ b/src/test/java/rx/internal/operators/OperatorTakeUntilPredicateTest.java @@ -129,7 +129,7 @@ public void onStart() { Observable.range(1, 1000).takeUntil(UtilityFunctions.alwaysFalse()).subscribe(ts); ts.assertNoErrors(); - ts.assertReceivedOnNext(Arrays.asList(1, 2, 3, 4, 5)); + ts.assertReceivedOnNext(1, 2, 3, 4, 5); Assert.assertEquals(0, ts.getOnCompletedEvents().size()); } } diff --git a/src/test/java/rx/internal/operators/OperatorTakeUntilTest.java b/src/test/java/rx/internal/operators/OperatorTakeUntilTest.java index 1667d306f8..cf1ccc3d31 100644 --- a/src/test/java/rx/internal/operators/OperatorTakeUntilTest.java +++ b/src/test/java/rx/internal/operators/OperatorTakeUntilTest.java @@ -207,10 +207,10 @@ public void testUntilFires() { source.onNext(1); - ts.assertReceivedOnNext(Arrays.asList(1)); + ts.assertReceivedOnNext(1); until.onNext(1); - ts.assertReceivedOnNext(Arrays.asList(1)); + ts.assertReceivedOnNext(1); ts.assertNoErrors(); ts.assertTerminalEvent(); @@ -233,7 +233,7 @@ public void testMainCompletes() { source.onNext(1); source.onCompleted(); - ts.assertReceivedOnNext(Arrays.asList(1)); + ts.assertReceivedOnNext(1); ts.assertNoErrors(); ts.assertTerminalEvent(); @@ -255,7 +255,7 @@ public void testDownstreamUnsubscribes() { source.onNext(1); - ts.assertReceivedOnNext(Arrays.asList(1)); + ts.assertReceivedOnNext(1); ts.assertNoErrors(); ts.assertTerminalEvent(); @@ -279,7 +279,7 @@ public void onStart() { ts.requestMore(1); - ts.assertReceivedOnNext(Arrays.asList(1)); + ts.assertReceivedOnNext(1); ts.assertNoErrors(); assertTrue("TestSubscriber completed", ts.getOnCompletedEvents().isEmpty()); diff --git a/src/test/java/rx/internal/operators/OperatorTakeWhileTest.java b/src/test/java/rx/internal/operators/OperatorTakeWhileTest.java index 33e5b2c881..fe8672375e 100644 --- a/src/test/java/rx/internal/operators/OperatorTakeWhileTest.java +++ b/src/test/java/rx/internal/operators/OperatorTakeWhileTest.java @@ -236,12 +236,12 @@ public void onStart() { source.subscribe(ts); ts.assertNoErrors(); - ts.assertReceivedOnNext(Arrays.asList(1, 2, 3, 4, 5)); + ts.assertReceivedOnNext(1, 2, 3, 4, 5); ts.requestMore(5); ts.assertNoErrors(); - ts.assertReceivedOnNext(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)); + ts.assertReceivedOnNext(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); } @Test @@ -257,7 +257,7 @@ public Boolean call(Integer t1) { source.unsafeSubscribe(ts); ts.assertNoErrors(); - ts.assertReceivedOnNext(Arrays.asList(1)); + ts.assertReceivedOnNext(1); Assert.assertFalse("Unsubscribed!", ts.isUnsubscribed()); } diff --git a/src/test/java/rx/internal/operators/OperatorUnsubscribeOnTest.java b/src/test/java/rx/internal/operators/OperatorUnsubscribeOnTest.java index 08bce82609..05a93a6671 100644 --- a/src/test/java/rx/internal/operators/OperatorUnsubscribeOnTest.java +++ b/src/test/java/rx/internal/operators/OperatorUnsubscribeOnTest.java @@ -71,7 +71,7 @@ public void call(Subscriber t1) { System.out.println("subscribeThread.get(): " + subscribeThread.get()); assertTrue(unsubscribeThread == UI_EVENT_LOOP.getThread()); - observer.assertReceivedOnNext(Arrays.asList(1, 2)); + observer.assertReceivedOnNext(1, 2); observer.assertTerminalEvent(); } finally { UI_EVENT_LOOP.shutdown(); @@ -112,7 +112,7 @@ public void call(Subscriber t1) { System.out.println("subscribeThread.get(): " + subscribeThread.get()); assertTrue(unsubscribeThread == UI_EVENT_LOOP.getThread()); - observer.assertReceivedOnNext(Arrays.asList(1, 2)); + observer.assertReceivedOnNext(1, 2); observer.assertTerminalEvent(); } finally { UI_EVENT_LOOP.shutdown(); diff --git a/src/test/java/rx/internal/operators/OperatorWindowWithSizeTest.java b/src/test/java/rx/internal/operators/OperatorWindowWithSizeTest.java index f23da00145..098fd9c496 100644 --- a/src/test/java/rx/internal/operators/OperatorWindowWithSizeTest.java +++ b/src/test/java/rx/internal/operators/OperatorWindowWithSizeTest.java @@ -119,7 +119,7 @@ public void call(Integer t1) { }).window(5).take(2)).subscribe(ts); ts.awaitTerminalEvent(500, TimeUnit.MILLISECONDS); ts.assertTerminalEvent(); - ts.assertReceivedOnNext(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)); + ts.assertReceivedOnNext(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); // System.out.println(ts.getOnNextEvents()); assertEquals(10, count.get()); } @@ -143,7 +143,7 @@ public void call(Integer t1) { .subscribe(ts); ts.awaitTerminalEvent(500, TimeUnit.MILLISECONDS); ts.assertTerminalEvent(); - ts.assertReceivedOnNext(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)); + ts.assertReceivedOnNext(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); // make sure we don't emit all values ... the unsubscribe should propagate assertTrue(count.get() < 100000); } @@ -163,7 +163,7 @@ public void call(Integer t1) { ts.awaitTerminalEvent(500, TimeUnit.MILLISECONDS); ts.assertTerminalEvent(); // System.out.println(ts.getOnNextEvents()); - ts.assertReceivedOnNext(Arrays.asList(1, 2, 3, 4, 5, 5, 6, 7, 8, 9)); + ts.assertReceivedOnNext(1, 2, 3, 4, 5, 5, 6, 7, 8, 9); assertEquals(9, count.get()); } @@ -186,7 +186,7 @@ public void call(Integer t1) { .subscribe(ts); ts.awaitTerminalEvent(500, TimeUnit.MILLISECONDS); ts.assertTerminalEvent(); - ts.assertReceivedOnNext(Arrays.asList(1, 2, 3, 4, 5, 5, 6, 7, 8, 9)); + ts.assertReceivedOnNext(1, 2, 3, 4, 5, 5, 6, 7, 8, 9); // make sure we don't emit all values ... the unsubscribe should propagate assertTrue(count.get() < 100000); } @@ -199,4 +199,4 @@ private List list(String... args) { return list; } -} \ No newline at end of file +} diff --git a/src/test/java/rx/internal/operators/OperatorZipTest.java b/src/test/java/rx/internal/operators/OperatorZipTest.java index d9487c5b03..6ebb9e41e5 100644 --- a/src/test/java/rx/internal/operators/OperatorZipTest.java +++ b/src/test/java/rx/internal/operators/OperatorZipTest.java @@ -1266,7 +1266,7 @@ public void onNext(Integer t) { ts.assertNoErrors(); ts.assertTerminalEvent(); - ts.assertReceivedOnNext(Arrays.asList(11, 22)); + ts.assertReceivedOnNext(11, 22); } @Test(timeout = 10000) public void testZipRace() { @@ -1311,6 +1311,6 @@ public Integer call(Integer t1, Integer t2) { ts.awaitTerminalEvent(1, TimeUnit.SECONDS); ts.assertNoErrors(); - ts.assertReceivedOnNext(Arrays.asList(11)); + ts.assertReceivedOnNext(11); } } diff --git a/src/test/java/rx/observables/AbstractOnSubscribeTest.java b/src/test/java/rx/observables/AbstractOnSubscribeTest.java index 95e3eac011..9969daf5da 100644 --- a/src/test/java/rx/observables/AbstractOnSubscribeTest.java +++ b/src/test/java/rx/observables/AbstractOnSubscribeTest.java @@ -56,7 +56,7 @@ protected void next(SubscriptionState state) { ts.assertNoErrors(); ts.assertTerminalEvent(); - ts.assertReceivedOnNext(Arrays.asList(1)); + ts.assertReceivedOnNext(1); } @Test public void testJustMisbehaving() { diff --git a/src/test/java/rx/observers/TestObserverTest.java b/src/test/java/rx/observers/TestObserverTest.java index aa253f2cd2..93e727a267 100644 --- a/src/test/java/rx/observers/TestObserverTest.java +++ b/src/test/java/rx/observers/TestObserverTest.java @@ -42,7 +42,7 @@ public void testAssert() { TestObserver o = new TestObserver(); oi.subscribe(o); - o.assertReceivedOnNext(Arrays.asList(1, 2)); + o.assertReceivedOnNext(1, 2); assertEquals(2, o.getOnNextEvents().size()); o.assertTerminalEvent(); } @@ -56,7 +56,7 @@ public void testAssertNotMatchCount() { thrown.expect(AssertionError.class); thrown.expectMessage("Number of items does not match. Provided: 1 Actual: 2"); - o.assertReceivedOnNext(Arrays.asList(1)); + o.assertReceivedOnNext(1); assertEquals(2, o.getOnNextEvents().size()); o.assertTerminalEvent(); } @@ -70,7 +70,7 @@ public void testAssertNotMatchValue() { thrown.expect(AssertionError.class); thrown.expectMessage("Value at index: 1 expected to be [3] (Integer) but was: [2] (Integer)"); - o.assertReceivedOnNext(Arrays.asList(1, 3)); + o.assertReceivedOnNext(1, 3); assertEquals(2, o.getOnNextEvents().size()); o.assertTerminalEvent(); } @@ -87,7 +87,7 @@ public void testAssertTerminalEventNotReceived() { thrown.expect(AssertionError.class); thrown.expectMessage("No terminal events received."); - o.assertReceivedOnNext(Arrays.asList(1, 2)); + o.assertReceivedOnNext(1, 2); assertEquals(2, o.getOnNextEvents().size()); o.assertTerminalEvent(); } diff --git a/src/test/java/rx/observers/TestSubscriberTest.java b/src/test/java/rx/observers/TestSubscriberTest.java index c728e79cda..b26c80612a 100644 --- a/src/test/java/rx/observers/TestSubscriberTest.java +++ b/src/test/java/rx/observers/TestSubscriberTest.java @@ -42,7 +42,7 @@ public void testAssert() { TestSubscriber o = new TestSubscriber(); oi.subscribe(o); - o.assertReceivedOnNext(Arrays.asList(1, 2)); + o.assertReceivedOnNext(1, 2); assertEquals(2, o.getOnNextEvents().size()); o.assertTerminalEvent(); } @@ -56,7 +56,7 @@ public void testAssertNotMatchCount() { thrown.expect(AssertionError.class); thrown.expectMessage("Number of items does not match. Provided: 1 Actual: 2"); - o.assertReceivedOnNext(Arrays.asList(1)); + o.assertReceivedOnNext(1); assertEquals(2, o.getOnNextEvents().size()); o.assertTerminalEvent(); } @@ -71,7 +71,7 @@ public void testAssertNotMatchValue() { thrown.expectMessage("Value at index: 1 expected to be [3] (Integer) but was: [2] (Integer)"); - o.assertReceivedOnNext(Arrays.asList(1, 3)); + o.assertReceivedOnNext(1, 3); assertEquals(2, o.getOnNextEvents().size()); o.assertTerminalEvent(); } @@ -88,7 +88,7 @@ public void testAssertTerminalEventNotReceived() { thrown.expect(AssertionError.class); thrown.expectMessage("No terminal events received."); - o.assertReceivedOnNext(Arrays.asList(1, 2)); + o.assertReceivedOnNext(1, 2); assertEquals(2, o.getOnNextEvents().size()); o.assertTerminalEvent(); } diff --git a/src/test/java/rx/subjects/SerializedSubjectTest.java b/src/test/java/rx/subjects/SerializedSubjectTest.java index bba2ce1e5d..dd77d241f0 100644 --- a/src/test/java/rx/subjects/SerializedSubjectTest.java +++ b/src/test/java/rx/subjects/SerializedSubjectTest.java @@ -31,6 +31,6 @@ public void testBasic() { subject.onNext("hello"); subject.onCompleted(); ts.awaitTerminalEvent(); - ts.assertReceivedOnNext(Arrays.asList("hello")); + ts.assertReceivedOnNext("hello"); } }