Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TakeWhile observables do not properly complete #197

Merged
merged 3 commits into from
Mar 26, 2013
Merged

TakeWhile observables do not properly complete #197

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d172fd9
Failing test case to show bug in takeWhile
thegeez Mar 17, 2013
2672b74
Call complete on take/takeWhile observables once the predicate is true.
thegeez Mar 17, 2013
414dbc4
Whitespace
thegeez Mar 19, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 34 additions & 2 deletions rxjava-core/src/main/java/rx/operators/OperationTake.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import rx.util.AtomicObservableSubscription;
import rx.util.functions.Func1;
import rx.util.functions.Func2;

import rx.subjects.Subject;
/**
* Returns a specified number of contiguous values from the start of an observable sequence.
*/
Expand Down Expand Up @@ -147,6 +147,7 @@ public void onNext(T args) {
if (predicate.call(args, counter.getAndIncrement())) {
observer.onNext(args);
} else {
observer.onCompleted();
// this will work if the sequence is asynchronous, it will have no effect on a synchronous observable
subscription.unsubscribe();
}
Expand Down Expand Up @@ -178,6 +179,37 @@ public Boolean call(Integer input) {
verify(aObserver, times(1)).onCompleted();
}

@Test
public void testTakeWhileOnSubject1() {
Subject<Integer> s = Subject.create();
Observable<Integer> w = (Observable<Integer>)s;
Observable<Integer> take = Observable.create(takeWhile(w, new Func1<Integer, Boolean>() {
@Override
public Boolean call(Integer input) {
return input < 3;
}
}));

@SuppressWarnings("unchecked")
Observer<Integer> aObserver = mock(Observer.class);
take.subscribe(aObserver);

s.onNext(1);
s.onNext(2);
s.onNext(3);
s.onNext(4);
s.onNext(5);
s.onCompleted();

verify(aObserver, times(1)).onNext(1);
verify(aObserver, times(1)).onNext(2);
verify(aObserver, never()).onNext(3);
verify(aObserver, never()).onNext(4);
verify(aObserver, never()).onNext(5);
verify(aObserver, never()).onError(any(Exception.class));
verify(aObserver, times(1)).onCompleted();
}

@Test
public void testTakeWhile2() {
Observable<String> w = Observable.toObservable("one", "two", "three");
Expand Down Expand Up @@ -293,4 +325,4 @@ public void run() {
}
}

}
}