Rename to ReduceTest

benjchristensen · benjchristensen · commit c451ce9eb3ea · 2013-12-27T13:12:42.000-08:00
diff --git a/rxjava-core/src/main/java/rx/Observable.java b/rxjava-core/src/main/java/rx/Observable.java
@@ -32,7 +32,6 @@
 import rx.observables.BlockingObservable;
 import rx.observables.ConnectableObservable;
 import rx.observables.GroupedObservable;
-import rx.operators.OperationAggregate;
 import rx.operators.OperationAll;
 import rx.operators.OperationAmb;
 import rx.operators.OperationAny;
diff --git a/rxjava-core/src/test/java/rx/operators/OperationAverageTest.java b/rxjava-core/src/test/java/rx/operators/OperationAverageTest.java
@@ -22,7 +22,7 @@
 
 import rx.Observable;
 import rx.Observer;
-import rx.operators.OperationAggregateTest.CustomException;
+import rx.operators.OperationReduceTest.CustomException;
 import rx.util.functions.Func1;
 
 public class OperationAverageTest {
diff --git a/rxjava-core/src/test/java/rx/operators/OperationReduceTest.java b/rxjava-core/src/test/java/rx/operators/OperationReduceTest.java
@@ -16,19 +16,21 @@
 
 package rx.operators;
 
+import static org.mockito.Matchers.*;
+import static org.mockito.Mockito.*;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import static org.mockito.Mockito.*;
+
 import rx.Observable;
 import rx.Observer;
 import rx.util.functions.Func1;
 import rx.util.functions.Func2;
-import rx.util.functions.Func3;
 import rx.util.functions.Functions;
 
-public class OperationAggregateTest {
+public class OperationReduceTest {
     @Mock
     Observer<Object> observer;
     @Before
diff --git a/rxjava-core/src/test/java/rx/operators/OperationSumTest.java b/rxjava-core/src/test/java/rx/operators/OperationSumTest.java
@@ -269,62 +269,62 @@ public void testIntegerSumSelectorThrows() {
         Func1<String, Integer> length = new Func1<String, Integer>() {
             @Override
             public Integer call(String t1) {
-                throw new OperationAggregateTest.CustomException();
+                throw new OperationReduceTest.CustomException();
             }
         };
         
         Observable<Integer> result = source.sumInteger(length);
         Observer<Object> o = mock(Observer.class);
         result.subscribe(o);
         
-        testThrows(o, OperationAggregateTest.CustomException.class);
+        testThrows(o, OperationReduceTest.CustomException.class);
     }
     @Test
     public void testLongSumSelectorThrows() {
         Observable<String> source = Observable.from("a");
         Func1<String, Long> length = new Func1<String, Long>() {
             @Override
             public Long call(String t1) {
-                throw new OperationAggregateTest.CustomException();
+                throw new OperationReduceTest.CustomException();
             }
         };
         
         Observable<Long> result = source.sumLong(length);
         Observer<Object> o = mock(Observer.class);
         result.subscribe(o);
         
-        testThrows(o, OperationAggregateTest.CustomException.class);
+        testThrows(o, OperationReduceTest.CustomException.class);
     }
     @Test
     public void testFloatSumSelectorThrows() {
         Observable<String> source = Observable.from("a");
         Func1<String, Float> length = new Func1<String, Float>() {
             @Override
             public Float call(String t1) {
-                throw new OperationAggregateTest.CustomException();
+                throw new OperationReduceTest.CustomException();
             }
         };
         
         Observable<Float> result = source.sumFloat(length);
         Observer<Object> o = mock(Observer.class);
         result.subscribe(o);
         
-        testThrows(o, OperationAggregateTest.CustomException.class);
+        testThrows(o, OperationReduceTest.CustomException.class);
     }
     @Test
     public void testDoubleSumSelectorThrows() {
         Observable<String> source = Observable.from("a");
         Func1<String, Double> length = new Func1<String, Double>() {
             @Override
             public Double call(String t1) {
-                throw new OperationAggregateTest.CustomException();
+                throw new OperationReduceTest.CustomException();
             }
         };
         
         Observable<Double> result = source.sumDouble(length);
         Observer<Object> o = mock(Observer.class);
         result.subscribe(o);
         
-        testThrows(o, OperationAggregateTest.CustomException.class);
+        testThrows(o, OperationReduceTest.CustomException.class);
     }
 }
