Move last 6 remaining unit tests out.

Author: benjchristensen

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

@@ -15,23 +15,16 @@
  */
 package rx.operators;
 
-import static org.junit.Assert.*;
-
-import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.junit.Test;
-
 import rx.Observable;
-import rx.Observable.OnSubscribeFunc;
 import rx.Observer;
 import rx.Subscription;
-import rx.subscriptions.Subscriptions;
 
 /**
  * Returns a Future representing the single value emitted by an Observable.
@@ -136,52 +129,4 @@ private T getValue() throws ExecutionException {
 
     }
 
-    @Test
-    public void testToFuture() throws InterruptedException, ExecutionException {
-        Observable<String> obs = Observable.from("one");
-        Future<String> f = toFuture(obs);
-        assertEquals("one", f.get());
-    }
-
-    @Test
-    public void testToFutureList() throws InterruptedException, ExecutionException {
-        Observable<String> obs = Observable.from("one", "two", "three");
-        Future<List<String>> f = toFuture(obs.toList());
-        assertEquals("one", f.get().get(0));
-        assertEquals("two", f.get().get(1));
-        assertEquals("three", f.get().get(2));
-    }
-
-    @Test(expected = ExecutionException.class)
-    public void testExceptionWithMoreThanOneElement() throws InterruptedException, ExecutionException {
-        Observable<String> obs = Observable.from("one", "two");
-        Future<String> f = toFuture(obs);
-        assertEquals("one", f.get());
-        // we expect an exception since there are more than 1 element
-    }
-
-    @Test
-    public void testToFutureWithException() {
-        Observable<String> obs = Observable.create(new OnSubscribeFunc<String>() {
-
-            @Override
-            public Subscription onSubscribe(Observer<? super String> observer) {
-                observer.onNext("one");
-                observer.onError(new TestException());
-                return Subscriptions.empty();
-            }
-        });
-
-        Future<String> f = toFuture(obs);
-        try {
-            f.get();
-            fail("expected exception");
-        } catch (Throwable e) {
-            assertEquals(TestException.class, e.getCause().getClass());
-        }
-    }
-
-    private static class TestException extends RuntimeException {
-        private static final long serialVersionUID = 1L;
-    }
 }

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

@@ -15,20 +15,13 @@
  */
 package rx.operators;
 
-import static org.junit.Assert.*;
-
 import java.util.Iterator;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import org.junit.Test;
-
 import rx.Notification;
 import rx.Observable;
-import rx.Observable.OnSubscribeFunc;
 import rx.Observer;
-import rx.Subscription;
-import rx.subscriptions.Subscriptions;
 import rx.util.Exceptions;
 
 /**
@@ -108,47 +101,4 @@ public void remove() {
         };
     }
 
-    @Test
-    public void testToIterator() {
-        Observable<String> obs = Observable.from("one", "two", "three");
-
-        Iterator<String> it = toIterator(obs);
-
-        assertEquals(true, it.hasNext());
-        assertEquals("one", it.next());
-
-        assertEquals(true, it.hasNext());
-        assertEquals("two", it.next());
-
-        assertEquals(true, it.hasNext());
-        assertEquals("three", it.next());
-
-        assertEquals(false, it.hasNext());
-
-    }
-
-    @Test(expected = TestException.class)
-    public void testToIteratorWithException() {
-        Observable<String> obs = Observable.create(new OnSubscribeFunc<String>() {
-
-            @Override
-            public Subscription onSubscribe(Observer<? super String> observer) {
-                observer.onNext("one");
-                observer.onError(new TestException());
-                return Subscriptions.empty();
-            }
-        });
-
-        Iterator<String> it = toIterator(obs);
-
-        assertEquals(true, it.hasNext());
-        assertEquals("one", it.next());
-
-        assertEquals(true, it.hasNext());
-        it.next();
-    }
-
-    private static class TestException extends RuntimeException {
-        private static final long serialVersionUID = 1L;
-    }
 }

rxjava-core/src/test/java/rx/operators/OperationToFutureTest.java

@@ -0,0 +1,68 @@
+package rx.operators;
+
+import static org.junit.Assert.*;
+import static rx.operators.OperationToFuture.*;
+
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+import org.junit.Test;
+
+import rx.Observable;
+import rx.Observable.OnSubscribeFunc;
+import rx.Observer;
+import rx.Subscription;
+import rx.subscriptions.Subscriptions;
+
+public class OperationToFutureTest {
+
+    @Test
+    public void testToFuture() throws InterruptedException, ExecutionException {
+        Observable<String> obs = Observable.from("one");
+        Future<String> f = toFuture(obs);
+        assertEquals("one", f.get());
+    }
+
+    @Test
+    public void testToFutureList() throws InterruptedException, ExecutionException {
+        Observable<String> obs = Observable.from("one", "two", "three");
+        Future<List<String>> f = toFuture(obs.toList());
+        assertEquals("one", f.get().get(0));
+        assertEquals("two", f.get().get(1));
+        assertEquals("three", f.get().get(2));
+    }
+
+    @Test(expected = ExecutionException.class)
+    public void testExceptionWithMoreThanOneElement() throws InterruptedException, ExecutionException {
+        Observable<String> obs = Observable.from("one", "two");
+        Future<String> f = toFuture(obs);
+        assertEquals("one", f.get());
+        // we expect an exception since there are more than 1 element
+    }
+
+    @Test
+    public void testToFutureWithException() {
+        Observable<String> obs = Observable.create(new OnSubscribeFunc<String>() {
+
+            @Override
+            public Subscription onSubscribe(Observer<? super String> observer) {
+                observer.onNext("one");
+                observer.onError(new TestException());
+                return Subscriptions.empty();
+            }
+        });
+
+        Future<String> f = toFuture(obs);
+        try {
+            f.get();
+            fail("expected exception");
+        } catch (Throwable e) {
+            assertEquals(TestException.class, e.getCause().getClass());
+        }
+    }
+
+    private static class TestException extends RuntimeException {
+        private static final long serialVersionUID = 1L;
+    }
+}

rxjava-core/src/test/java/rx/operators/OperationToIteratorTest.java

@@ -0,0 +1,62 @@
+package rx.operators;
+
+import static org.junit.Assert.*;
+import static rx.operators.OperationToIterator.*;
+
+import java.util.Iterator;
+
+import org.junit.Test;
+
+import rx.Observable;
+import rx.Observable.OnSubscribeFunc;
+import rx.Observer;
+import rx.Subscription;
+import rx.subscriptions.Subscriptions;
+
+public class OperationToIteratorTest {
+
+    @Test
+    public void testToIterator() {
+        Observable<String> obs = Observable.from("one", "two", "three");
+
+        Iterator<String> it = toIterator(obs);
+
+        assertEquals(true, it.hasNext());
+        assertEquals("one", it.next());
+
+        assertEquals(true, it.hasNext());
+        assertEquals("two", it.next());
+
+        assertEquals(true, it.hasNext());
+        assertEquals("three", it.next());
+
+        assertEquals(false, it.hasNext());
+
+    }
+
+    @Test(expected = TestException.class)
+    public void testToIteratorWithException() {
+        Observable<String> obs = Observable.create(new OnSubscribeFunc<String>() {
+
+            @Override
+            public Subscription onSubscribe(Observer<? super String> observer) {
+                observer.onNext("one");
+                observer.onError(new TestException());
+                return Subscriptions.empty();
+            }
+        });
+
+        Iterator<String> it = toIterator(obs);
+
+        assertEquals(true, it.hasNext());
+        assertEquals("one", it.next());
+
+        assertEquals(true, it.hasNext());
+        it.next();
+    }
+
+    private static class TestException extends RuntimeException {
+        private static final long serialVersionUID = 1L;
+    }
+
+}