Fixed case with skipUntil(empty()) == never() (matches Rx.NET)

akarnokd · akarnokd · commit a17b592387be · 2013-12-01T10:34:01.000+01:00
diff --git a/rxjava-core/src/main/java/rx/operators/OperationSkipUntil.java b/rxjava-core/src/main/java/rx/operators/OperationSkipUntil.java
@@ -113,11 +113,7 @@ public void onError(Throwable e) {
 
             @Override
             public void onCompleted() {
-                if (!running.get()) {
-                    ResultManager.this.onCompleted();
-                } else {
-                    self.unsubscribe();
-                }
+                self.unsubscribe();
             }
             
         }
diff --git a/rxjava-core/src/test/java/rx/operators/OperationSkipUntilTest.java b/rxjava-core/src/test/java/rx/operators/OperationSkipUntilTest.java
@@ -89,7 +89,7 @@ public void otherEmpty() {
         
         verify(observer, never()).onError(any(Throwable.class));
         verify(observer, never()).onNext(any());
-        verify(observer, times(1)).onCompleted();
+        verify(observer, never()).onCompleted();
     }
     @Test
     public void otherFiresAndCompletes() {

Original file line number	Diff line number	Diff line change
`@@ -113,11 +113,7 @@ public void onError(Throwable e) {`
`113`	`113`
`114`	`114`	`@Override`
`115`	`115`	`public void onCompleted() {`
`116`		`- if (!running.get()) {`
`117`		`- ResultManager.this.onCompleted();`
`118`		`- } else {`
`119`		`- self.unsubscribe();`
`120`		`- }`
	`116`	`+ self.unsubscribe();`
`121`	`117`	`}`
`122`	`118`
`123`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public void otherEmpty() {`
`89`	`89`
`90`	`90`	`verify(observer, never()).onError(any(Throwable.class));`
`91`	`91`	`verify(observer, never()).onNext(any());`
`92`		`- verify(observer, times(1)).onCompleted();`
	`92`	`+ verify(observer, never()).onCompleted();`
`93`	`93`	`}`
`94`	`94`	`@Test`
`95`	`95`	`public void otherFiresAndCompletes() {`