Skip to content

Commit c451ce9

Browse files
Rename to ReduceTest
1 parent 3bba245 commit c451ce9

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

rxjava-core/src/main/java/rx/Observable.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import rx.observables.BlockingObservable;
3333
import rx.observables.ConnectableObservable;
3434
import rx.observables.GroupedObservable;
35-
import rx.operators.OperationAggregate;
3635
import rx.operators.OperationAll;
3736
import rx.operators.OperationAmb;
3837
import rx.operators.OperationAny;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import rx.Observable;
2424
import rx.Observer;
25-
import rx.operators.OperationAggregateTest.CustomException;
25+
import rx.operators.OperationReduceTest.CustomException;
2626
import rx.util.functions.Func1;
2727

2828
public class OperationAverageTest {

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,21 @@
1616

1717
package rx.operators;
1818

19+
import static org.mockito.Matchers.*;
20+
import static org.mockito.Mockito.*;
21+
1922
import org.junit.Before;
2023
import org.junit.Test;
2124
import org.mockito.Mock;
2225
import org.mockito.MockitoAnnotations;
23-
import static org.mockito.Mockito.*;
26+
2427
import rx.Observable;
2528
import rx.Observer;
2629
import rx.util.functions.Func1;
2730
import rx.util.functions.Func2;
28-
import rx.util.functions.Func3;
2931
import rx.util.functions.Functions;
3032

31-
public class OperationAggregateTest {
33+
public class OperationReduceTest {
3234
@Mock
3335
Observer<Object> observer;
3436
@Before

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -269,62 +269,62 @@ public void testIntegerSumSelectorThrows() {
269269
Func1<String, Integer> length = new Func1<String, Integer>() {
270270
@Override
271271
public Integer call(String t1) {
272-
throw new OperationAggregateTest.CustomException();
272+
throw new OperationReduceTest.CustomException();
273273
}
274274
};
275275

276276
Observable<Integer> result = source.sumInteger(length);
277277
Observer<Object> o = mock(Observer.class);
278278
result.subscribe(o);
279279

280-
testThrows(o, OperationAggregateTest.CustomException.class);
280+
testThrows(o, OperationReduceTest.CustomException.class);
281281
}
282282
@Test
283283
public void testLongSumSelectorThrows() {
284284
Observable<String> source = Observable.from("a");
285285
Func1<String, Long> length = new Func1<String, Long>() {
286286
@Override
287287
public Long call(String t1) {
288-
throw new OperationAggregateTest.CustomException();
288+
throw new OperationReduceTest.CustomException();
289289
}
290290
};
291291

292292
Observable<Long> result = source.sumLong(length);
293293
Observer<Object> o = mock(Observer.class);
294294
result.subscribe(o);
295295

296-
testThrows(o, OperationAggregateTest.CustomException.class);
296+
testThrows(o, OperationReduceTest.CustomException.class);
297297
}
298298
@Test
299299
public void testFloatSumSelectorThrows() {
300300
Observable<String> source = Observable.from("a");
301301
Func1<String, Float> length = new Func1<String, Float>() {
302302
@Override
303303
public Float call(String t1) {
304-
throw new OperationAggregateTest.CustomException();
304+
throw new OperationReduceTest.CustomException();
305305
}
306306
};
307307

308308
Observable<Float> result = source.sumFloat(length);
309309
Observer<Object> o = mock(Observer.class);
310310
result.subscribe(o);
311311

312-
testThrows(o, OperationAggregateTest.CustomException.class);
312+
testThrows(o, OperationReduceTest.CustomException.class);
313313
}
314314
@Test
315315
public void testDoubleSumSelectorThrows() {
316316
Observable<String> source = Observable.from("a");
317317
Func1<String, Double> length = new Func1<String, Double>() {
318318
@Override
319319
public Double call(String t1) {
320-
throw new OperationAggregateTest.CustomException();
320+
throw new OperationReduceTest.CustomException();
321321
}
322322
};
323323

324324
Observable<Double> result = source.sumDouble(length);
325325
Observer<Object> o = mock(Observer.class);
326326
result.subscribe(o);
327327

328-
testThrows(o, OperationAggregateTest.CustomException.class);
328+
testThrows(o, OperationReduceTest.CustomException.class);
329329
}
330330
}

0 commit comments

Comments
 (0)