Update sub-modules

benjchristensen · benjchristensen · commit 8b928a8bcc07 · 2014-02-17T12:55:57.000-08:00
diff --git a/rxjava-contrib/rxjava-async-util/src/main/java/rx/util/async/operators/OperationForEachFuture.java b/rxjava-contrib/rxjava-async-util/src/main/java/rx/util/async/operators/OperationForEachFuture.java
@@ -20,7 +20,7 @@
 
 import rx.Observable;
 import rx.Subscription;
-import rx.util.Exceptions;
+import rx.exceptions.Exceptions;
 import rx.util.functions.Action0;
 import rx.util.functions.Action1;
 
diff --git a/rxjava-core/src/test/java/rx/ReduceTests.java b/rxjava-core/src/test/java/rx/ReduceTests.java
@@ -21,7 +21,6 @@
 
 import rx.CovarianceTest.HorrorMovie;
 import rx.CovarianceTest.Movie;
-import rx.operators.OperatorScan;
 import rx.util.functions.Func2;
 
 public class ReduceTests {
diff --git a/rxjava-core/src/test/java/rx/exceptions/CompositeExceptionTest.java b/rxjava-core/src/test/java/rx/exceptions/CompositeExceptionTest.java
@@ -23,10 +23,6 @@
 
 import org.junit.Test;
 
-import rx.util.CompositeException.CompositeExceptionCausalChain;
-
-import rx.exceptions.CompositeException;
-
 public class CompositeExceptionTest {
 
     private final Throwable ex1 = new Throwable("Ex1");
diff --git a/rxjava-core/src/test/java/rx/exceptions/ExceptionsTest.java b/rxjava-core/src/test/java/rx/exceptions/ExceptionsTest.java
@@ -19,8 +19,6 @@
 
 import rx.Observable;
 import rx.Observer;
-import rx.exceptions.OnErrorNotImplimport rx.util.OnErrorNotImplementedException;
-ementedException;
 import rx.subjects.PublishSubject;
 import rx.util.functions.Action1;
 
diff --git a/rxjava-core/src/test/java/rx/operators/OperatorGroupByTest.java b/rxjava-core/src/test/java/rx/operators/OperatorGroupByTest.java
@@ -28,7 +28,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 import rx.Observable;
diff --git a/rxjava-core/src/test/java/rx/operators/OperatorObserveOnTest.java b/rxjava-core/src/test/java/rx/operators/OperatorObserveOnTest.java
@@ -30,15 +30,10 @@
 import org.mockito.stubbing.Answer;
 
 import rx.Observable;
-import rx.Observable.OnSubscribeFunc;
 import rx.Observer;
 import rx.Scheduler;
-import rx.Subscription;
-import rx.schedulers.ImmediateScheduler;
 import rx.schedulers.Schedulers;
 import rx.schedulers.TestScheduler;
-import rx.schedulers.TrampolineScheduler;
-import rx.subscriptions.BooleanSubscription;
 import rx.util.functions.Action0;
 import rx.util.functions.Action1;
 import rx.util.functions.Func1;
diff --git a/rxjava-core/src/test/java/rx/operators/OperatorScanTest.java b/rxjava-core/src/test/java/rx/operators/OperatorScanTest.java
@@ -17,7 +17,6 @@
 
 import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
-import static rx.operators.OperatorScan.*;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/rxjava-core/src/test/java/rx/operators/OperatorTimeoutWithSelectorTest.java b/rxjava-core/src/test/java/rx/operators/OperatorTimeoutWithSelectorTest.java
@@ -15,14 +15,9 @@
  */
 package rx.operators;
 
-import static org.junit.Assert.assertFalse;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.isA;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.*;
 
 import java.util.Arrays;
 import java.util.concurrent.CountDownLatch;
@@ -38,13 +33,10 @@
 import rx.Observable;
 import rx.Observable.OnSubscribe;
 import rx.Observer;
-import rx.Scheduler;
 import rx.Subscriber;
 import rx.observers.TestSubscriber;
 import rx.schedulers.Schedulers;
 import rx.subjects.PublishSubject;
-import rx.subscriptions.Subscriptions;
-import rx.util.functions.Action0;
 import rx.util.functions.Func0;
 import rx.util.functions.Func1;
 
