Forward subscription of wrapped subscriber

mttkay · mttkay · commit 45afeb9fb5ce · 2014-03-13T11:14:25.000+01:00
diff --git a/rxjava-contrib/rxjava-android/src/main/java/rx/operators/OperatorWeakBinding.java b/rxjava-contrib/rxjava-android/src/main/java/rx/operators/OperatorWeakBinding.java
@@ -47,6 +47,7 @@ final class WeakSubscriber extends Subscriber<T> {
         final WeakReference<Subscriber<? super T>> subscriberRef;
 
         private WeakSubscriber(Subscriber<? super T> source) {
+            super(source);
             subscriberRef = new WeakReference<Subscriber<? super T>>(source);
         }
 
diff --git a/rxjava-contrib/rxjava-android/src/test/java/rx/operators/OperatorWeakBindingTest.java b/rxjava-contrib/rxjava-android/src/test/java/rx/operators/OperatorWeakBindingTest.java
@@ -1,24 +1,21 @@
 package rx.operators;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
-import rx.Subscriber;
 import rx.functions.Functions;
+import rx.observers.TestSubscriber;
+
+import java.util.Arrays;
 
 @RunWith(RobolectricTestRunner.class)
 public class OperatorWeakBindingTest {
 
-    @Mock
-    private Subscriber<String> subscriber;
+    private TestSubscriber<String> subscriber = new TestSubscriber<String>();
 
     @Before
     public void setUp() throws Exception {
@@ -34,10 +31,9 @@ public void shouldForwardAllNotificationsWhenSubscriberAndTargetAlive() {
         weakSub.onCompleted();
         weakSub.onError(new Exception());
 
-        verify(subscriber).onNext("one");
-        verify(subscriber).onNext("two");
-        verify(subscriber).onCompleted();
-        verify(subscriber).onError(any(Exception.class));
+        subscriber.assertReceivedOnNext(Arrays.asList("one", "two"));
+        assertEquals(1, subscriber.getOnCompletedEvents().size());
+        assertEquals(1, subscriber.getOnErrorEvents().size());
     }
 
     @Test
@@ -51,8 +47,9 @@ public void shouldUnsubscribeFromSourceSequenceWhenSubscriberReleased() {
         weakSub.onCompleted();
         weakSub.onError(new Exception());
 
-        verify(subscriber).onNext("one");
-        verifyNoMoreInteractions(subscriber);
+        subscriber.assertReceivedOnNext(Arrays.asList("one"));
+        assertEquals(0, subscriber.getOnCompletedEvents().size());
+        assertEquals(0, subscriber.getOnErrorEvents().size());
     }
 
     @Test
@@ -66,8 +63,9 @@ public void shouldUnsubscribeFromSourceSequenceWhenTargetObjectReleased() {
         weakSub.onCompleted();
         weakSub.onError(new Exception());
 
-        verify(subscriber).onNext("one");
-        verifyNoMoreInteractions(subscriber);
+        subscriber.assertReceivedOnNext(Arrays.asList("one"));
+        assertEquals(0, subscriber.getOnCompletedEvents().size());
+        assertEquals(0, subscriber.getOnErrorEvents().size());
     }
 
     @Test
@@ -81,6 +79,16 @@ public void shouldUnsubscribeFromSourceSequenceWhenPredicateFailsToPass() {
         weakSub.onCompleted();
         weakSub.onError(new Exception());
 
-        verifyZeroInteractions(subscriber);
+        assertEquals(0, subscriber.getOnNextEvents().size());
+        assertEquals(0, subscriber.getOnCompletedEvents().size());
+        assertEquals(0, subscriber.getOnErrorEvents().size());
+    }
+
+    @Test
+    public void unsubscribeWillUnsubscribeFromWrappedSubscriber() {
+        OperatorWeakBinding<String, Object> op = new OperatorWeakBinding<String, Object>(new Object());
+
+        op.call(subscriber).unsubscribe();
+        subscriber.assertUnsubscribed();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ final class WeakSubscriber extends Subscriber<T> {`
`47`	`47`	`final WeakReference<Subscriber<? super T>> subscriberRef;`
`48`	`48`
`49`	`49`	`private WeakSubscriber(Subscriber<? super T> source) {`
	`50`	`+ super(source);`
`50`	`51`	`subscriberRef = new WeakReference<Subscriber<? super T>>(source);`
`51`	`52`	`}`
`52`	`53`