Skip to content
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.

Sign up for GitHub

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

test/subjects: Use statically imported never() methods #3340

Merged
merged 3 commits into from
Sep 11, 2015
Merged

test/subjects: Use statically imported never() methods #3340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6564c4
test/subjects: Use statically imported never() methods
Turbo87 Sep 11, 2015
b2c0325
BehaviorSubjectTest: Fix verification in testCompletedAfterErrorIsNot…
Turbo87 Sep 11, 2015
17ba599
BehaviorSubjectTest: Simplify testUnsubscriptionCase() test
Turbo87 Sep 11, 2015
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
33 changes: 16 additions & 17 deletions src/test/java/rx/subjects/AsyncSubjectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

import org.junit.Test;
import org.mockito.InOrder;
import org.mockito.Mockito;

import rx.Observer;
import rx.Subscription;
Expand All @@ -59,9 +58,9 @@ public void testNeverCompleted() {
subject.onNext("two");
subject.onNext("three");

verify(observer, Mockito.never()).onNext(anyString());
verify(observer, Mockito.never()).onError(testException);
verify(observer, Mockito.never()).onCompleted();
verify(observer, never()).onNext(anyString());
verify(observer, never()).onError(testException);
verify(observer, never()).onCompleted();
}

@Test
Expand All @@ -78,7 +77,7 @@ public void testCompleted() {
subject.onCompleted();

verify(observer, times(1)).onNext("three");
verify(observer, Mockito.never()).onError(any(Throwable.class));
verify(observer, never()).onError(any(Throwable.class));
verify(observer, times(1)).onCompleted();
}

Expand All @@ -94,7 +93,7 @@ public void testNull() {
subject.onCompleted();

verify(observer, times(1)).onNext(null);
verify(observer, Mockito.never()).onError(any(Throwable.class));
verify(observer, never()).onError(any(Throwable.class));
verify(observer, times(1)).onCompleted();
}

Expand All @@ -113,7 +112,7 @@ public void testSubscribeAfterCompleted() {
subject.subscribe(observer);

verify(observer, times(1)).onNext("three");
verify(observer, Mockito.never()).onError(any(Throwable.class));
verify(observer, never()).onError(any(Throwable.class));
verify(observer, times(1)).onCompleted();
}

Expand All @@ -134,8 +133,8 @@ public void testSubscribeAfterError() {
subject.subscribe(observer);

verify(observer, times(1)).onError(re);
verify(observer, Mockito.never()).onNext(any(String.class));
verify(observer, Mockito.never()).onCompleted();
verify(observer, never()).onNext(any(String.class));
verify(observer, never()).onCompleted();
}

@Test
Expand All @@ -154,9 +153,9 @@ public void testError() {
subject.onError(new Throwable());
subject.onCompleted();

verify(observer, Mockito.never()).onNext(anyString());
verify(observer, never()).onNext(anyString());
verify(observer, times(1)).onError(testException);
verify(observer, Mockito.never()).onCompleted();
verify(observer, never()).onCompleted();
}

@Test
Expand All @@ -172,16 +171,16 @@ public void testUnsubscribeBeforeCompleted() {

subscription.unsubscribe();

verify(observer, Mockito.never()).onNext(anyString());
verify(observer, Mockito.never()).onError(any(Throwable.class));
verify(observer, Mockito.never()).onCompleted();
verify(observer, never()).onNext(anyString());
verify(observer, never()).onError(any(Throwable.class));
verify(observer, never()).onCompleted();

subject.onNext("three");
subject.onCompleted();

verify(observer, Mockito.never()).onNext(anyString());
verify(observer, Mockito.never()).onError(any(Throwable.class));
verify(observer, Mockito.never()).onCompleted();
verify(observer, never()).onNext(anyString());
verify(observer, never()).onError(any(Throwable.class));
verify(observer, never()).onCompleted();
}

@Test
Expand Down
33 changes: 9 additions & 24 deletions src/test/java/rx/subjects/BehaviorSubjectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@

import org.junit.*;
import org.mockito.InOrder;
import org.mockito.Mockito;

import rx.*;
import rx.exceptions.CompositeException;
Expand Down Expand Up @@ -62,8 +61,8 @@ public void testThatObserverReceivesDefaultValueAndSubsequentEvents() {
verify(observer, times(1)).onNext("one");
verify(observer, times(1)).onNext("two");
verify(observer, times(1)).onNext("three");
verify(observer, Mockito.never()).onError(testException);
verify(observer, Mockito.never()).onCompleted();
verify(observer, never()).onError(testException);
verify(observer, never()).onCompleted();
}

@Test
Expand All @@ -79,12 +78,12 @@ public void testThatObserverReceivesLatestAndThenSubsequentEvents() {
subject.onNext("two");
subject.onNext("three");

verify(observer, Mockito.never()).onNext("default");
verify(observer, never()).onNext("default");
verify(observer, times(1)).onNext("one");
verify(observer, times(1)).onNext("two");
verify(observer, times(1)).onNext("three");
verify(observer, Mockito.never()).onError(testException);
verify(observer, Mockito.never()).onCompleted();
verify(observer, never()).onError(testException);
verify(observer, never()).onCompleted();
}

@Test
Expand All @@ -100,7 +99,7 @@ public void testSubscribeThenOnComplete() {

verify(observer, times(1)).onNext("default");
verify(observer, times(1)).onNext("one");
verify(observer, Mockito.never()).onError(any(Throwable.class));
verify(observer, never()).onError(any(Throwable.class));
verify(observer, times(1)).onCompleted();
}

Expand All @@ -116,7 +115,7 @@ public void testSubscribeToCompletedOnlyEmitsOnComplete() {

verify(observer, never()).onNext("default");
verify(observer, never()).onNext("one");
verify(observer, Mockito.never()).onError(any(Throwable.class));
verify(observer, never()).onError(any(Throwable.class));
verify(observer, times(1)).onCompleted();
}

Expand Down Expand Up @@ -254,7 +253,7 @@ public void testCompletedAfterErrorIsNotSent3() {
subject.subscribe(o2);
verify(o2, times(1)).onCompleted();
verify(o2, never()).onNext(any());
verify(observer, never()).onError(any(Throwable.class));
verify(o2, never()).onError(any(Throwable.class));
}
@Test(timeout = 1000)
public void testUnsubscriptionCase() {
Expand All @@ -275,22 +274,8 @@ public Observable<String> call(String t1) {
return Observable.just(t1 + ", " + t1);
}
})
.subscribe(new Observer<String>() {
@Override
public void onNext(String t) {
o.onNext(t);
}
.subscribe(o);

@Override
public void onError(Throwable e) {
o.onError(e);
}

@Override
public void onCompleted() {
o.onCompleted();
}
});
inOrder.verify(o).onNext(v + ", " + v);
inOrder.verify(o).onCompleted();
verify(o, never()).onError(any(Throwable.class));
Expand Down
17 changes: 8 additions & 9 deletions src/test/java/rx/subjects/PublishSubjectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@

import org.junit.Test;
import org.mockito.InOrder;
import org.mockito.Mockito;

import rx.Observable;
import rx.Observer;
Expand Down Expand Up @@ -118,7 +117,7 @@ private void assertCompletedObserver(Observer<String> observer) {
verify(observer, times(1)).onNext("one");
verify(observer, times(1)).onNext("two");
verify(observer, times(1)).onNext("three");
verify(observer, Mockito.never()).onError(any(Throwable.class));
verify(observer, never()).onError(any(Throwable.class));
verify(observer, times(1)).onCompleted();
}

Expand Down Expand Up @@ -152,7 +151,7 @@ private void assertErrorObserver(Observer<String> observer) {
verify(observer, times(1)).onNext("two");
verify(observer, times(1)).onNext("three");
verify(observer, times(1)).onError(testException);
verify(observer, Mockito.never()).onCompleted();
verify(observer, never()).onCompleted();
}

@Test
Expand Down Expand Up @@ -180,10 +179,10 @@ public void testSubscribeMidSequence() {
}

private void assertCompletedStartingWithThreeObserver(Observer<String> observer) {
verify(observer, Mockito.never()).onNext("one");
verify(observer, Mockito.never()).onNext("two");
verify(observer, never()).onNext("one");
verify(observer, never()).onNext("two");
verify(observer, times(1)).onNext("three");
verify(observer, Mockito.never()).onError(any(Throwable.class));
verify(observer, never()).onError(any(Throwable.class));
verify(observer, times(1)).onCompleted();
}

Expand Down Expand Up @@ -215,9 +214,9 @@ public void testUnsubscribeFirstObserver() {
private void assertObservedUntilTwo(Observer<String> observer) {
verify(observer, times(1)).onNext("one");
verify(observer, times(1)).onNext("two");
verify(observer, Mockito.never()).onNext("three");
verify(observer, Mockito.never()).onError(any(Throwable.class));
verify(observer, Mockito.never()).onCompleted();
verify(observer, never()).onNext("three");
verify(observer, never()).onError(any(Throwable.class));
verify(observer, never()).onCompleted();
}

@Test
Expand Down
20 changes: 9 additions & 11 deletions src/test/java/rx/subjects/ReplaySubjectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@

import org.junit.Test;
import org.mockito.InOrder;
import org.mockito.Mockito;

import rx.Observable;
import rx.Observer;
Expand Down Expand Up @@ -140,11 +139,10 @@ public void testCompletedStopsEmittingData() {
inOrderD.verify(observerD).onNext(4711);
inOrderD.verify(observerD).onCompleted();

Mockito.verifyNoMoreInteractions(observerA);
Mockito.verifyNoMoreInteractions(observerB);
Mockito.verifyNoMoreInteractions(observerC);
Mockito.verifyNoMoreInteractions(observerD);

verifyNoMoreInteractions(observerA);
verifyNoMoreInteractions(observerB);
verifyNoMoreInteractions(observerC);
verifyNoMoreInteractions(observerD);
}

@Test
Expand Down Expand Up @@ -172,7 +170,7 @@ private void assertCompletedObserver(Observer<String> observer) {
inOrder.verify(observer, times(1)).onNext("one");
inOrder.verify(observer, times(1)).onNext("two");
inOrder.verify(observer, times(1)).onNext("three");
inOrder.verify(observer, Mockito.never()).onError(any(Throwable.class));
inOrder.verify(observer, never()).onError(any(Throwable.class));
inOrder.verify(observer, times(1)).onCompleted();
inOrder.verifyNoMoreInteractions();
}
Expand Down Expand Up @@ -206,7 +204,7 @@ private void assertErrorObserver(Observer<String> observer) {
verify(observer, times(1)).onNext("two");
verify(observer, times(1)).onNext("three");
verify(observer, times(1)).onError(testException);
verify(observer, Mockito.never()).onCompleted();
verify(observer, never()).onCompleted();
}

@SuppressWarnings("unchecked")
Expand Down Expand Up @@ -261,9 +259,9 @@ public void testUnsubscribeFirstObserver() {
private void assertObservedUntilTwo(Observer<String> observer) {
verify(observer, times(1)).onNext("one");
verify(observer, times(1)).onNext("two");
verify(observer, Mockito.never()).onNext("three");
verify(observer, Mockito.never()).onError(any(Throwable.class));
verify(observer, Mockito.never()).onCompleted();
verify(observer, never()).onNext("three");
verify(observer, never()).onError(any(Throwable.class));
verify(observer, never()).onCompleted();
}

@Test(timeout = 2000)
Expand Down