added tests against multiple subscriptions, just to be on the safe side

Author: Joachim Hofer

rxjava-core/src/main/java/rx/operators/OperationDistinct.java

@@ -206,6 +206,8 @@ public void call() {
     public static class UnitTest {
         @Mock
         Observer<? super String> w;
+        @Mock
+        Observer<? super String> w2;
 
         // nulls lead to exceptions
         final Func1<String, String> TO_UPPER_WITH_EXCEPTION = new Func1<String, String>() {
@@ -310,6 +312,31 @@ public void testDistinctOfNormalSourceWithKeySelectorAndComparator() {
             verify(w, never()).onError(any(Throwable.class));
         }
 
+        @Test
+        public void testDistinctOfNormalSourceWithKeySelectorAndComparatorAndTwoSubscriptions() {
+            Observable<String> src = from("a", "x", "ab", "abc", "cba", "de", "x", "a", "abcd");
+            create(distinct(src, TO_UPPER_WITH_EXCEPTION, COMPARE_LENGTH)).subscribe(w);
+
+            InOrder inOrder = inOrder(w); 
+            inOrder.verify(w, times(1)).onNext("a");
+            inOrder.verify(w, times(1)).onNext("x");
+            create(distinct(src, TO_UPPER_WITH_EXCEPTION, COMPARE_LENGTH)).subscribe(w2);
+            inOrder.verify(w, times(1)).onNext("abc");
+            inOrder.verify(w, times(1)).onNext("abcd");
+            inOrder.verify(w, times(1)).onCompleted();
+            inOrder.verify(w, never()).onNext(anyString());
+            verify(w, never()).onError(any(Throwable.class));
+            
+            InOrder inOrder2 = inOrder(w2); 
+            inOrder2.verify(w2, times(1)).onNext("a");
+            inOrder2.verify(w2, times(1)).onNext("x");
+            inOrder2.verify(w2, times(1)).onNext("abc");
+            inOrder2.verify(w2, times(1)).onNext("abcd");
+            inOrder2.verify(w2, times(1)).onCompleted();
+            inOrder2.verify(w2, never()).onNext(anyString());
+            verify(w2, never()).onError(any(Throwable.class));
+        }
+
         @Test
         public void testDistinctOfSourceWithNulls() {
             Observable<String> src = from(null, "a", "a", null, null, "b", null);

rxjava-core/src/main/java/rx/operators/OperationDistinctUntilChanged.java

@@ -161,6 +161,8 @@ public void call() {
     public static class UnitTest {
         @Mock
         Observer<? super String> w;
+        @Mock
+        Observer<? super String> w2;
 
         // nulls lead to exceptions
         final Func1<String, String> TO_UPPER_WITH_EXCEPTION = new Func1<String, String>() {
@@ -295,5 +297,29 @@ public void testDistinctUntilChangedWithComparatorAndKeySelector() {
             inOrder.verify(w, never()).onNext(anyString());
             verify(w, never()).onError(any(Throwable.class));
         }
+
+        @Test
+        public void testDistinctUntilChangedWithComparatorAndKeySelectorandTwoSubscriptions() {
+            Observable<String> src = from("a", "b", "x", "aa", "bb", "c", "ddd");
+            create(distinctUntilChanged(src, TO_UPPER_WITH_EXCEPTION, COMPARE_LENGTH)).subscribe(w);
+            InOrder inOrder = inOrder(w); 
+            inOrder.verify(w, times(1)).onNext("a");
+            inOrder.verify(w, times(1)).onNext("x");
+            create(distinctUntilChanged(src, TO_UPPER_WITH_EXCEPTION, COMPARE_LENGTH)).subscribe(w2);
+            inOrder.verify(w, times(1)).onNext("c");
+            inOrder.verify(w, times(1)).onNext("ddd");
+            inOrder.verify(w, times(1)).onCompleted();
+            inOrder.verify(w, never()).onNext(anyString());
+            verify(w, never()).onError(any(Throwable.class));
+            
+            InOrder inOrder2 = inOrder(w2); 
+            inOrder2.verify(w2, times(1)).onNext("a");
+            inOrder2.verify(w2, times(1)).onNext("x");
+            inOrder2.verify(w2, times(1)).onNext("c");
+            inOrder2.verify(w2, times(1)).onNext("ddd");
+            inOrder2.verify(w2, times(1)).onCompleted();
+            inOrder2.verify(w2, never()).onNext(anyString());
+            verify(w2, never()).onError(any(Throwable.class));
+        }
     }
 }