Conditionals: Fix all but 2 tests

benjchristensen · benjchristensen · commit f26b7b2321ba · 2014-01-24T16:36:25.000-08:00
diff --git a/rxjava-contrib/rxjava-computation-expressions/src/test/java/rx/operators/OperationConditionalsTest.java b/rxjava-contrib/rxjava-computation-expressions/src/test/java/rx/operators/OperationConditionalsTest.java
@@ -15,6 +15,7 @@
  */
 package rx.operators;
 
+import static org.junit.Assert.*;
 import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
@@ -33,8 +34,10 @@
 import rx.Observer;
 import rx.Statement;
 import rx.Subscription;
+import rx.observers.TestObserver;
 import rx.schedulers.Schedulers;
 import rx.schedulers.TestScheduler;
+import rx.util.functions.Action1;
 import rx.util.functions.Func0;
 
 public class OperationConditionalsTest {
@@ -108,7 +111,7 @@ public T call() {
     <T> void observe(Observable<? extends T> source, T... values) {
         Observer<T> o = mock(Observer.class);
 
-        Subscription s = source.subscribe(o);
+        Subscription s = source.subscribe(new TestObserver<T>(o));
 
         InOrder inOrder = inOrder(o);
 
@@ -127,7 +130,7 @@ <T> void observe(Observable<? extends T> source, T... values) {
     <T> void observeSequence(Observable<? extends T> source, Iterable<? extends T> values) {
         Observer<T> o = mock(Observer.class);
 
-        Subscription s = source.subscribe(o);
+        Subscription s = source.subscribe(new TestObserver<T>(o));
 
         InOrder inOrder = inOrder(o);
 
@@ -146,7 +149,7 @@ <T> void observeSequence(Observable<? extends T> source, Iterable<? extends T> v
     <T> void observeError(Observable<? extends T> source, Class<? extends Throwable> error, T... valuesBeforeError) {
         Observer<T> o = mock(Observer.class);
 
-        Subscription s = source.subscribe(o);
+        Subscription s = source.subscribe(new TestObserver<T>(o));
 
         InOrder inOrder = inOrder(o);
 
@@ -165,7 +168,7 @@ <T> void observeError(Observable<? extends T> source, Class<? extends Throwable>
     <T> void observeSequenceError(Observable<? extends T> source, Class<? extends Throwable> error, Iterable<? extends T> valuesBeforeError) {
         Observer<T> o = mock(Observer.class);
 
-        Subscription s = source.subscribe(o);
+        Subscription s = source.subscribe(new TestObserver<T>(o));
 
         InOrder inOrder = inOrder(o);
 
@@ -400,6 +403,7 @@ public Boolean call() {
 
     @Test
     public void testDoWhileManyTimes() {
+        fail("deadlocking");
         Observable<Integer> source1 = Observable.from(1, 2, 3).subscribeOn(Schedulers.currentThread());
 
         List<Integer> expected = new ArrayList<Integer>(numRecursion * 3);
