VarArg parameters for the assertReceivedOnNext(T... items)

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<Object> 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<T> items) {
 
             }
         }
-
     }
 
     /**

src/main/java/rx/observers/TestSubscriber.java

@@ -149,6 +149,18 @@ public List<T> 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.
      *

src/test/java/rx/ObservableTests.java

@@ -1024,21 +1024,21 @@ public void call(StringBuilder sb, Integer v) {
     public void testMergeWith() {
         TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
         Observable.just(1).mergeWith(Observable.just(2)).subscribe(ts);
-        ts.assertReceivedOnNext(Arrays.asList(1, 2));
+        ts.assertReceivedOnNext(1, 2);
     }
 
     @Test
     public void testConcatWith() {
         TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
         Observable.just(1).concatWith(Observable.just(2)).subscribe(ts);
-        ts.assertReceivedOnNext(Arrays.asList(1, 2));
+        ts.assertReceivedOnNext(1, 2);
     }
 
     @Test
     public void testAmbWith() {
         TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
         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

src/test/java/rx/internal/operators/OnBackpressureBlockTest.java

@@ -51,7 +51,7 @@ public void testSimpleBelowCapacity() {
         TestObserver<Integer> o = new TestObserver<Integer>();
         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,15 +155,15 @@ 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());
 
         o.requestMore(3);
 
         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,15 +196,15 @@ 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());
 
         o.requestMore(7);
 
         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);
     }
 }

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)

src/test/java/rx/internal/operators/OnSubscribeFromIterableTest.java

@@ -127,11 +127,11 @@ public void testBackpressureViaRequest() {
         ts.assertReceivedOnNext(Collections.<Integer> 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.<Integer> 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<Integer> o = new OnSubscribeFromIterable<Integer>(Arrays.asList(1, 2, 3));
         TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
         o.call(ts);
-        ts.assertReceivedOnNext(Arrays.asList(1, 2, 3));
+        ts.assertReceivedOnNext(1, 2, 3);
 
         ts = new TestSubscriber<Integer>();
         o.call(ts);
-        ts.assertReceivedOnNext(Arrays.asList(1, 2, 3));
+        ts.assertReceivedOnNext(1, 2, 3);
 
         ts = new TestSubscriber<Integer>();
         o.call(ts);
-        ts.assertReceivedOnNext(Arrays.asList(1, 2, 3));
+        ts.assertReceivedOnNext(1, 2, 3);
     }
 
     @Test

src/test/java/rx/internal/operators/OnSubscribeRangeTest.java

@@ -108,11 +108,11 @@ public void testBackpressureViaRequest() {
         ts.assertReceivedOnNext(Collections.<Integer> 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();
     }

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)

src/test/java/rx/internal/operators/OperatorConcatTest.java

@@ -715,7 +715,7 @@ public void call(Subscriber<? super String> s) {
         ts.awaitTerminalEvent(500, TimeUnit.MILLISECONDS);
         ts.assertTerminalEvent();
         ts.assertNoErrors();
-        ts.assertReceivedOnNext(Arrays.asList("hello", "hello"));
+        ts.assertReceivedOnNext("hello", "hello");
     }
 
 }

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();
     }
-}
+}

src/test/java/rx/internal/operators/OperatorDelayTest.java

@@ -663,7 +663,7 @@ public void call(Notification<? super Integer> 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

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();
         }
     }
-}
+}