Merge pull request #977 from benjchristensen/dematerialize

Dematerialize - handle non-materialized terminal events
ReactiveX · Mar 20, 2014 · bcded86 · bcded86
2 parents c10af94 + 75b0124
commit bcded86
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 3 deletions.
diff --git a/rxjava-core/src/main/java/rx/operators/OperationDematerialize.java b/rxjava-core/src/main/java/rx/operators/OperationDematerialize.java
@@ -57,10 +57,12 @@ public Subscription onSubscribe(final Observer<? super T> observer) {
             return sequence.subscribe(new Observer<Notification<? extends T>>() {
                 @Override
                 public void onCompleted() {
+                    observer.onCompleted();
                 }
 
                 @Override
                 public void onError(Throwable e) {
+                    observer.onError(e);
                 }
 
                 @Override

diff --git a/rxjava-core/src/test/java/rx/operators/OperationDematerializeTest.java b/rxjava-core/src/test/java/rx/operators/OperationDematerializeTest.java
@@ -15,15 +15,19 @@
  */
 package rx.operators;
 
-import static org.mockito.Matchers.*;
-import static org.mockito.Mockito.*;
-import static rx.operators.OperationDematerialize.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static rx.operators.OperationDematerialize.dematerialize;
 
 import org.junit.Test;
 
 import rx.Notification;
 import rx.Observable;
 import rx.Observer;
+import rx.observers.TestSubscriber;
 
 public class OperationDematerializeTest {
 
@@ -71,4 +75,35 @@ public void testDematerialize3() {
         verify(observer, times(0)).onCompleted();
         verify(observer, times(0)).onNext(any(Integer.class));
     }
+
+    @Test
+    public void testErrorPassThru() {
+        Exception exception = new Exception("test");
+        Observable<Integer> observable = Observable.error(exception);
+        Observable<Integer> dematerialize = observable.dematerialize();
+
+        Observer<Integer> observer = mock(Observer.class);
+        dematerialize.subscribe(observer);
+
+        verify(observer, times(1)).onError(exception);
+        verify(observer, times(0)).onCompleted();
+        verify(observer, times(0)).onNext(any(Integer.class));
+    }
+
+    @Test
+    public void testCompletePassThru() {
+        Observable<Integer> observable = Observable.empty();
+        Observable<Integer> dematerialize = observable.dematerialize();
+
+        Observer<Integer> observer = mock(Observer.class);
+        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(observer);
+        dematerialize.subscribe(ts);
+
+        System.out.println(ts.getOnErrorEvents());
+
+        verify(observer, never()).onError(any(Throwable.class));
+        verify(observer, times(1)).onCompleted();
+        verify(observer, times(0)).onNext(any(Integer.class));
+    }
+
 }