3.4 Added mergeWith examples

Froussios · Froussios · commit 06a4dca17f13 · 2015-05-21T21:35:59.000+02:00
diff --git a/tests/java/itrx/chapter3/combining/MergeTest.java b/tests/java/itrx/chapter3/combining/MergeTest.java
@@ -1,18 +1,19 @@
 package itrx.chapter3.combining;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
 
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
 
 import rx.Observable;
+import rx.Subscription;
 import rx.observers.TestSubscriber;
 import rx.schedulers.Schedulers;
 import rx.schedulers.TestScheduler;
 
 public class MergeTest {
-
+	
 	public void example() {
 		Observable.merge(
 		        Observable.interval(250, TimeUnit.MILLISECONDS).map(i -> "First"),
@@ -32,6 +33,24 @@ public void example() {
 		// First
 	}
 	
+	public void exampleMergeWith() {
+		Observable.interval(250, TimeUnit.MILLISECONDS).map(i -> "First")
+			.mergeWith(Observable.interval(150, TimeUnit.MILLISECONDS).map(i -> "Second"))
+			.take(10)
+		    .subscribe(System.out::println);
+		
+		// Second
+		// First
+		// Second
+		// Second
+		// First
+		// Second
+		// First
+		// Second
+		// Second
+		// First
+	}
+	
 	
 	//
 	// Test
@@ -40,24 +59,41 @@ public void example() {
 	@Test
 	public void test() {
 		TestScheduler scheduler = Schedulers.test();
-		TestSubscriber<Integer> tester = new TestSubscriber<>();
+		TestSubscriber<String> tester = new TestSubscriber<>();
 		
-		Observable<String> values = Observable.merge(
+		Subscription subscription = Observable.merge(
 		        Observable.interval(250, TimeUnit.MILLISECONDS, scheduler).map(i -> "First"),
 		        Observable.interval(150, TimeUnit.MILLISECONDS, scheduler).map(i -> "Second"))
-		    .take(10);
-		
-		values
+		    .take(10)
 			.distinctUntilChanged()
-			.count()
 			.subscribe(tester);
+		
 		// Each time that merge switches between the two sources, 
 		// distinctUntilChanged allows one more value through.
 		// If more that 2 values comes through, merge is going back and forth
+		scheduler.advanceTimeBy(1000, TimeUnit.MILLISECONDS);
+		assertTrue(tester.getOnNextEvents().size() > 2);
 		
+		subscription.unsubscribe();
+	}
+	
+	@Test
+	public void testMergeWith() {
+		TestScheduler scheduler = Schedulers.test();
+		TestSubscriber<String> tester = new TestSubscriber<>();
+		
+		Subscription subscription = Observable.interval(250, TimeUnit.MILLISECONDS, scheduler).map(i -> "First")
+			.mergeWith(Observable.interval(150, TimeUnit.MILLISECONDS, scheduler).map(i -> "Second"))
+			.distinctUntilChanged()
+		    .subscribe(tester);
+		
+		// Each time that merge switches between the two sources, 
+		// distinctUntilChanged allows one more value through.
+		// If more that 2 values comes through, merge is going back and forth
 		scheduler.advanceTimeBy(1000, TimeUnit.MILLISECONDS);
+		assertTrue(tester.getOnNextEvents().size() > 2);
 		
-		assertTrue(tester.getOnNextEvents().get(0) > 2);
+		subscription.unsubscribe();
 	}
 
 }
