Skip to content

2.x: Remove test scheduler factory. #4380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 20, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions src/main/java/io/reactivex/schedulers/Schedulers.java
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,6 @@ public static Scheduler computation() {
public static Scheduler io() {
return RxJavaPlugins.onIoScheduler(IO);
}

/**
* Creates and returns a {@code TestScheduler}, which is useful for debugging. It allows you to test
* schedules of events by manually advancing the clock at whatever pace you choose.
*
* @return a {@code TestScheduler} meant for debugging
*/
public static TestScheduler test() { // NOPMD
return new TestScheduler();
}

/**
* Creates and returns a {@link Scheduler} that queues work on the current thread to be executed after the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1139,7 +1139,7 @@ public void timerNewThread() {

@Test(timeout = 1000)
public void timerTestScheduler() {
TestScheduler scheduler = Schedulers.test();
TestScheduler scheduler = new TestScheduler();

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ public Integer apply(Integer t) {

@Test
public void testErrorRunsBeforeOnNext() {
TestScheduler test = Schedulers.test();
TestScheduler test = new TestScheduler();

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -427,11 +427,11 @@ public void subscribe(Subscriber<? super String> observer) {

@Test
public void testUnsubscribeAsFlowablesComplete() {
TestScheduler scheduler1 = Schedulers.test();
TestScheduler scheduler1 = new TestScheduler();
AtomicBoolean os1 = new AtomicBoolean(false);
Flowable<Long> o1 = createFlowableOf5IntervalsOf1SecondIncrementsWithSubscriptionHook(scheduler1, os1);

TestScheduler scheduler2 = Schedulers.test();
TestScheduler scheduler2 = new TestScheduler();
AtomicBoolean os2 = new AtomicBoolean(false);
Flowable<Long> o2 = createFlowableOf5IntervalsOf1SecondIncrementsWithSubscriptionHook(scheduler2, os2);

Expand Down Expand Up @@ -469,11 +469,11 @@ public void testUnsubscribeAsFlowablesComplete() {
@Test
public void testEarlyUnsubscribe() {
for (int i = 0; i < 10; i++) {
TestScheduler scheduler1 = Schedulers.test();
TestScheduler scheduler1 = new TestScheduler();
AtomicBoolean os1 = new AtomicBoolean(false);
Flowable<Long> o1 = createFlowableOf5IntervalsOf1SecondIncrementsWithSubscriptionHook(scheduler1, os1);

TestScheduler scheduler2 = Schedulers.test();
TestScheduler scheduler2 = new TestScheduler();
AtomicBoolean os2 = new AtomicBoolean(false);
Flowable<Long> o2 = createFlowableOf5IntervalsOf1SecondIncrementsWithSubscriptionHook(scheduler2, os2);

Expand Down Expand Up @@ -1121,7 +1121,7 @@ public void shouldCompleteAfterApplyingBackpressure_FastPath() {

@Test
public void shouldNotCompleteIfThereArePendingScalarSynchronousEmissionsWhenTheLastInnerSubscriberCompletes() {
TestScheduler scheduler = Schedulers.test();
TestScheduler scheduler = new TestScheduler();
Flowable<Long> source = Flowable.mergeDelayError(Flowable.just(1L), Flowable.timer(1, TimeUnit.SECONDS, scheduler).skip(1));
TestSubscriber<Long> subscriber = new TestSubscriber<Long>(0L);
source.subscribe(subscriber);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ public void onNext(Integer t) {

@Test
public void testErrorDelayed() {
TestScheduler s = Schedulers.test();
TestScheduler s = new TestScheduler();

Flowable<Integer> source = Flowable.just(1, 2 ,3)
.concatWith(Flowable.<Integer>error(new TestException()));
Expand Down Expand Up @@ -845,8 +845,8 @@ public void testErrorDelayedAsync() {
@Test
public void requestExactCompletesImmediately() {
TestSubscriber<Integer> ts = TestSubscriber.create(0);
TestScheduler test = Schedulers.test();

TestScheduler test = new TestScheduler();

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

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

TestScheduler test = Schedulers.test();
TestScheduler test = new TestScheduler();

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,7 @@ public void testBoundedReplayBuffer() {

@Test
public void testTimedAndSizedTruncation() {
TestScheduler test = Schedulers.test();
TestScheduler test = new TestScheduler();
SizeAndTimeBoundReplayBuffer<Integer> buf = new SizeAndTimeBoundReplayBuffer<Integer>(2, 2000, TimeUnit.MILLISECONDS, test);
List<Integer> values = new ArrayList<Integer>();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ public void onNext(Integer t) {

@Test
public void cancelBeforeActualSubscribe() {
TestScheduler test = Schedulers.test();
TestScheduler test = new TestScheduler();

TestSubscriber<Integer> ts = Flowable.just(1).hide()
.subscribeOn(test).test(Long.MAX_VALUE, 0, true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ public void takeLastTimedWithZeroCapacity() {

@Test
public void testContinuousDelivery() {
TestScheduler scheduler = Schedulers.test();
TestScheduler scheduler = new TestScheduler();

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,7 @@ public Integer apply(Integer t) {

@Test
public void testErrorRunsBeforeOnNext() {
TestScheduler test = Schedulers.test();
TestScheduler test = new TestScheduler();

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -417,11 +417,11 @@ public void subscribe(Observer<? super String> NbpObserver) {

@Test
public void testUnsubscribeAsObservablesComplete() {
TestScheduler scheduler1 = Schedulers.test();
TestScheduler scheduler1 = new TestScheduler();
AtomicBoolean os1 = new AtomicBoolean(false);
Observable<Long> o1 = createObservableOf5IntervalsOf1SecondIncrementsWithSubscriptionHook(scheduler1, os1);

TestScheduler scheduler2 = Schedulers.test();
TestScheduler scheduler2 = new TestScheduler();
AtomicBoolean os2 = new AtomicBoolean(false);
Observable<Long> o2 = createObservableOf5IntervalsOf1SecondIncrementsWithSubscriptionHook(scheduler2, os2);

Expand Down Expand Up @@ -459,11 +459,11 @@ public void testUnsubscribeAsObservablesComplete() {
@Test
public void testEarlyUnsubscribe() {
for (int i = 0; i < 10; i++) {
TestScheduler scheduler1 = Schedulers.test();
TestScheduler scheduler1 = new TestScheduler();
AtomicBoolean os1 = new AtomicBoolean(false);
Observable<Long> o1 = createObservableOf5IntervalsOf1SecondIncrementsWithSubscriptionHook(scheduler1, os1);

TestScheduler scheduler2 = Schedulers.test();
TestScheduler scheduler2 = new TestScheduler();
AtomicBoolean os2 = new AtomicBoolean(false);
Observable<Long> o2 = createObservableOf5IntervalsOf1SecondIncrementsWithSubscriptionHook(scheduler2, os2);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ public void testIssue2191_SchedulerUnsubscribe() throws Exception {
Consumer<Integer> sourceNext = mock(Consumer.class);
Action sourceCompleted = mock(Action.class);
Action sourceUnsubscribed = mock(Action.class);
final TestScheduler mockScheduler = Schedulers.test();
final TestScheduler mockScheduler = new TestScheduler();

Observer<Integer> mockObserverBeforeConnect = TestHelper.mockObserver();
Observer<Integer> mockObserverAfterConnect = TestHelper.mockObserver();
Expand Down Expand Up @@ -742,7 +742,7 @@ public void testBoundedReplayBuffer() {

@Test
public void testTimedAndSizedTruncation() {
TestScheduler test = Schedulers.test();
TestScheduler test = new TestScheduler();
SizeAndTimeBoundReplayBuffer<Integer> buf = new SizeAndTimeBoundReplayBuffer<Integer>(2, 2000, TimeUnit.MILLISECONDS, test);
List<Integer> values = new ArrayList<Integer>();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public void subscribe(Observer<? super Integer> sub) {

@Test
public void cancelBeforeActualSubscribe() {
TestScheduler test = Schedulers.test();
TestScheduler test = new TestScheduler();

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

Expand Down