Skip to content

Commit 9b3204b

Browse files
committed
Revert "Add new unit test to cover infinite observable being the first sequence."
This reverts commit 658d824.
1 parent 658d824 commit 9b3204b

File tree

1 file changed

+1
-33
lines changed

1 file changed

+1
-33
lines changed

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

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import rx.Subscription;
3737
import rx.subscriptions.BooleanSubscription;
3838
import rx.util.AtomicObservableSubscription;
39-
39+
import rx.util.Exceptions;
4040
import rx.util.functions.Func1;
4141

4242
public final class OperationConcat {
@@ -460,38 +460,6 @@ public void testConcatConcurrentWithInfinity() {
460460

461461
}
462462

463-
@Test
464-
public void testConcatConcurrentWithInfinityFirstSequence() {
465-
final TestObservable<String> w1 = new TestObservable<String>("one", "two", "three");
466-
//This observable will send "hello" MAX_VALUE time.
467-
final TestObservable<String> w2 = new TestObservable<String>("hello", Integer.MAX_VALUE);
468-
469-
@SuppressWarnings("unchecked")
470-
Observer<String> aObserver = mock(Observer.class);
471-
@SuppressWarnings("unchecked")
472-
TestObservable<Observable<String>> observableOfObservables = new TestObservable<Observable<String>>(w2, w1);
473-
Func1<Observer<String>, Subscription> concatF = concat(observableOfObservables);
474-
475-
Observable<String> concat = Observable.create(concatF);
476-
477-
concat.take(50).subscribe(aObserver);
478-
479-
//Wait for the thread to start up.
480-
try {
481-
Thread.sleep(25);
482-
w2.t.join();
483-
} catch (InterruptedException e) {
484-
// TODO Auto-generated catch block
485-
e.printStackTrace();
486-
}
487-
488-
InOrder inOrder = inOrder(aObserver);
489-
inOrder.verify(aObserver, times(50)).onNext("hello");
490-
verify(aObserver, times(1)).onCompleted();
491-
verify(aObserver, never()).onError(any(Exception.class));
492-
493-
}
494-
495463

496464
/**
497465
* Test unsubscribing the concatenated Observable in a single thread.

0 commit comments

Comments
 (0)