Skip to content

Commit d80a261

Browse files
JakeWhartonakarnokd
authored andcommitted
Remove test scheduler factory. (#4380)
This method is misleading in that it's a factory next to a bunch of accessor methods to shared resources. The TestScheduler constructor is public and can be used directly.
1 parent fba05ea commit d80a261

File tree

12 files changed

+22
-32
lines changed

12 files changed

+22
-32
lines changed

src/main/java/io/reactivex/schedulers/Schedulers.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,6 @@ public static Scheduler computation() {
8080
public static Scheduler io() {
8181
return RxJavaPlugins.onIoScheduler(IO);
8282
}
83-
84-
/**
85-
* Creates and returns a {@code TestScheduler}, which is useful for debugging. It allows you to test
86-
* schedules of events by manually advancing the clock at whatever pace you choose.
87-
*
88-
* @return a {@code TestScheduler} meant for debugging
89-
*/
90-
public static TestScheduler test() { // NOPMD
91-
return new TestScheduler();
92-
}
9383

9484
/**
9585
* Creates and returns a {@link Scheduler} that queues work on the current thread to be executed after the

src/test/java/io/reactivex/completable/CompletableTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1139,7 +1139,7 @@ public void timerNewThread() {
11391139

11401140
@Test(timeout = 1000)
11411141
public void timerTestScheduler() {
1142-
TestScheduler scheduler = Schedulers.test();
1142+
TestScheduler scheduler = new TestScheduler();
11431143

11441144
Completable c = Completable.timer(250, TimeUnit.MILLISECONDS, scheduler);
11451145

src/test/java/io/reactivex/internal/operators/flowable/FlowableDelayTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@ public Integer apply(Integer t) {
765765

766766
@Test
767767
public void testErrorRunsBeforeOnNext() {
768-
TestScheduler test = Schedulers.test();
768+
TestScheduler test = new TestScheduler();
769769

770770
PublishProcessor<Integer> ps = PublishProcessor.create();
771771

src/test/java/io/reactivex/internal/operators/flowable/FlowableMergeTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -427,11 +427,11 @@ public void subscribe(Subscriber<? super String> observer) {
427427

428428
@Test
429429
public void testUnsubscribeAsFlowablesComplete() {
430-
TestScheduler scheduler1 = Schedulers.test();
430+
TestScheduler scheduler1 = new TestScheduler();
431431
AtomicBoolean os1 = new AtomicBoolean(false);
432432
Flowable<Long> o1 = createFlowableOf5IntervalsOf1SecondIncrementsWithSubscriptionHook(scheduler1, os1);
433433

434-
TestScheduler scheduler2 = Schedulers.test();
434+
TestScheduler scheduler2 = new TestScheduler();
435435
AtomicBoolean os2 = new AtomicBoolean(false);
436436
Flowable<Long> o2 = createFlowableOf5IntervalsOf1SecondIncrementsWithSubscriptionHook(scheduler2, os2);
437437

@@ -469,11 +469,11 @@ public void testUnsubscribeAsFlowablesComplete() {
469469
@Test
470470
public void testEarlyUnsubscribe() {
471471
for (int i = 0; i < 10; i++) {
472-
TestScheduler scheduler1 = Schedulers.test();
472+
TestScheduler scheduler1 = new TestScheduler();
473473
AtomicBoolean os1 = new AtomicBoolean(false);
474474
Flowable<Long> o1 = createFlowableOf5IntervalsOf1SecondIncrementsWithSubscriptionHook(scheduler1, os1);
475475

476-
TestScheduler scheduler2 = Schedulers.test();
476+
TestScheduler scheduler2 = new TestScheduler();
477477
AtomicBoolean os2 = new AtomicBoolean(false);
478478
Flowable<Long> o2 = createFlowableOf5IntervalsOf1SecondIncrementsWithSubscriptionHook(scheduler2, os2);
479479

@@ -1121,7 +1121,7 @@ public void shouldCompleteAfterApplyingBackpressure_FastPath() {
11211121

11221122
@Test
11231123
public void shouldNotCompleteIfThereArePendingScalarSynchronousEmissionsWhenTheLastInnerSubscriberCompletes() {
1124-
TestScheduler scheduler = Schedulers.test();
1124+
TestScheduler scheduler = new TestScheduler();
11251125
Flowable<Long> source = Flowable.mergeDelayError(Flowable.just(1L), Flowable.timer(1, TimeUnit.SECONDS, scheduler).skip(1));
11261126
TestSubscriber<Long> subscriber = new TestSubscriber<Long>(0L);
11271127
source.subscribe(subscriber);

src/test/java/io/reactivex/internal/operators/flowable/FlowableObserveOnTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,7 @@ public void onNext(Integer t) {
793793

794794
@Test
795795
public void testErrorDelayed() {
796-
TestScheduler s = Schedulers.test();
796+
TestScheduler s = new TestScheduler();
797797

798798
Flowable<Integer> source = Flowable.just(1, 2 ,3)
799799
.concatWith(Flowable.<Integer>error(new TestException()));
@@ -845,8 +845,8 @@ public void testErrorDelayedAsync() {
845845
@Test
846846
public void requestExactCompletesImmediately() {
847847
TestSubscriber<Integer> ts = TestSubscriber.create(0);
848-
849-
TestScheduler test = Schedulers.test();
848+
849+
TestScheduler test = new TestScheduler();
850850

851851
Flowable.range(1, 10).observeOn(test).subscribe(ts);
852852

@@ -869,7 +869,7 @@ public void requestExactCompletesImmediately() {
869869
public void fixedReplenishPattern() {
870870
TestSubscriber<Integer> ts = TestSubscriber.create(0);
871871

872-
TestScheduler test = Schedulers.test();
872+
TestScheduler test = new TestScheduler();
873873

874874
final List<Long> requests = new ArrayList<Long>();
875875

src/test/java/io/reactivex/internal/operators/flowable/FlowableReplayTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,7 @@ public void testBoundedReplayBuffer() {
760760

761761
@Test
762762
public void testTimedAndSizedTruncation() {
763-
TestScheduler test = Schedulers.test();
763+
TestScheduler test = new TestScheduler();
764764
SizeAndTimeBoundReplayBuffer<Integer> buf = new SizeAndTimeBoundReplayBuffer<Integer>(2, 2000, TimeUnit.MILLISECONDS, test);
765765
List<Integer> values = new ArrayList<Integer>();
766766

src/test/java/io/reactivex/internal/operators/flowable/FlowableSubscribeOnTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ public void onNext(Integer t) {
268268

269269
@Test
270270
public void cancelBeforeActualSubscribe() {
271-
TestScheduler test = Schedulers.test();
271+
TestScheduler test = new TestScheduler();
272272

273273
TestSubscriber<Integer> ts = Flowable.just(1).hide()
274274
.subscribeOn(test).test(Long.MAX_VALUE, 0, true);

src/test/java/io/reactivex/internal/operators/flowable/FlowableTakeLastTimedTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ public void takeLastTimedWithZeroCapacity() {
204204

205205
@Test
206206
public void testContinuousDelivery() {
207-
TestScheduler scheduler = Schedulers.test();
207+
TestScheduler scheduler = new TestScheduler();
208208

209209
TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
210210

src/test/java/io/reactivex/internal/operators/observable/ObservableDelayTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -766,7 +766,7 @@ public Integer apply(Integer t) {
766766

767767
@Test
768768
public void testErrorRunsBeforeOnNext() {
769-
TestScheduler test = Schedulers.test();
769+
TestScheduler test = new TestScheduler();
770770

771771
PublishSubject<Integer> ps = PublishSubject.create();
772772

src/test/java/io/reactivex/internal/operators/observable/ObservableMergeTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -417,11 +417,11 @@ public void subscribe(Observer<? super String> NbpObserver) {
417417

418418
@Test
419419
public void testUnsubscribeAsObservablesComplete() {
420-
TestScheduler scheduler1 = Schedulers.test();
420+
TestScheduler scheduler1 = new TestScheduler();
421421
AtomicBoolean os1 = new AtomicBoolean(false);
422422
Observable<Long> o1 = createObservableOf5IntervalsOf1SecondIncrementsWithSubscriptionHook(scheduler1, os1);
423423

424-
TestScheduler scheduler2 = Schedulers.test();
424+
TestScheduler scheduler2 = new TestScheduler();
425425
AtomicBoolean os2 = new AtomicBoolean(false);
426426
Observable<Long> o2 = createObservableOf5IntervalsOf1SecondIncrementsWithSubscriptionHook(scheduler2, os2);
427427

@@ -459,11 +459,11 @@ public void testUnsubscribeAsObservablesComplete() {
459459
@Test
460460
public void testEarlyUnsubscribe() {
461461
for (int i = 0; i < 10; i++) {
462-
TestScheduler scheduler1 = Schedulers.test();
462+
TestScheduler scheduler1 = new TestScheduler();
463463
AtomicBoolean os1 = new AtomicBoolean(false);
464464
Observable<Long> o1 = createObservableOf5IntervalsOf1SecondIncrementsWithSubscriptionHook(scheduler1, os1);
465465

466-
TestScheduler scheduler2 = Schedulers.test();
466+
TestScheduler scheduler2 = new TestScheduler();
467467
AtomicBoolean os2 = new AtomicBoolean(false);
468468
Observable<Long> o2 = createObservableOf5IntervalsOf1SecondIncrementsWithSubscriptionHook(scheduler2, os2);
469469

src/test/java/io/reactivex/internal/operators/observable/ObservableReplayTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ public void testIssue2191_SchedulerUnsubscribe() throws Exception {
564564
Consumer<Integer> sourceNext = mock(Consumer.class);
565565
Action sourceCompleted = mock(Action.class);
566566
Action sourceUnsubscribed = mock(Action.class);
567-
final TestScheduler mockScheduler = Schedulers.test();
567+
final TestScheduler mockScheduler = new TestScheduler();
568568

569569
Observer<Integer> mockObserverBeforeConnect = TestHelper.mockObserver();
570570
Observer<Integer> mockObserverAfterConnect = TestHelper.mockObserver();
@@ -742,7 +742,7 @@ public void testBoundedReplayBuffer() {
742742

743743
@Test
744744
public void testTimedAndSizedTruncation() {
745-
TestScheduler test = Schedulers.test();
745+
TestScheduler test = new TestScheduler();
746746
SizeAndTimeBoundReplayBuffer<Integer> buf = new SizeAndTimeBoundReplayBuffer<Integer>(2, 2000, TimeUnit.MILLISECONDS, test);
747747
List<Integer> values = new ArrayList<Integer>();
748748

src/test/java/io/reactivex/internal/operators/observable/ObservableSubscribeOnTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public void subscribe(Observer<? super Integer> sub) {
184184

185185
@Test
186186
public void cancelBeforeActualSubscribe() {
187-
TestScheduler test = Schedulers.test();
187+
TestScheduler test = new TestScheduler();
188188

189189
TestObserver<Integer> to = new TestObserver<Integer>();
190190

0 commit comments

Comments
 (0)