Skip to content

Replace never() calls in BehaviorSubjectTest with verifyNoMoreInteractions #3565

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
Dec 9, 2015
Merged
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
40 changes: 14 additions & 26 deletions src/test/java/rx/subjects/BehaviorSubjectTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;

import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicReference;
Expand Down Expand Up @@ -61,8 +62,7 @@ public void testThatObserverReceivesDefaultValueAndSubsequentEvents() {
verify(observer, times(1)).onNext("one");
verify(observer, times(1)).onNext("two");
verify(observer, times(1)).onNext("three");
verify(observer, never()).onError(testException);
verify(observer, never()).onCompleted();
verifyNoMoreInteractions(observer);
}

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

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, never()).onError(testException);
verify(observer, never()).onCompleted();
verifyNoMoreInteractions(observer);
}

@Test
Expand All @@ -99,8 +97,8 @@ public void testSubscribeThenOnComplete() {

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

@Test
Expand All @@ -113,10 +111,8 @@ public void testSubscribeToCompletedOnlyEmitsOnComplete() {
Observer<String> observer = mock(Observer.class);
subject.subscribe(observer);

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

@Test
Expand All @@ -130,10 +126,8 @@ public void testSubscribeToErrorOnlyEmitsOnError() {
Observer<String> observer = mock(Observer.class);
subject.subscribe(observer);

verify(observer, never()).onNext("default");
verify(observer, never()).onNext("one");
verify(observer, times(1)).onError(re);
verify(observer, never()).onCompleted();
verifyNoMoreInteractions(observer);
}

@Test
Expand Down Expand Up @@ -198,8 +192,7 @@ public void testCompletedAfterErrorIsNotSent() {
verify(observer, times(1)).onNext("default");
verify(observer, times(1)).onNext("one");
verify(observer, times(1)).onError(testException);
verify(observer, never()).onNext("two");
verify(observer, never()).onCompleted();
verifyNoMoreInteractions(observer);
}

@Test
Expand All @@ -218,15 +211,13 @@ public void testCompletedAfterErrorIsNotSent2() {
verify(observer, times(1)).onNext("default");
verify(observer, times(1)).onNext("one");
verify(observer, times(1)).onError(testException);
verify(observer, never()).onNext("two");
verify(observer, never()).onCompleted();
verifyNoMoreInteractions(observer);

@SuppressWarnings("unchecked")
Observer<Object> o2 = mock(Observer.class);
subject.subscribe(o2);
verify(o2, times(1)).onError(testException);
verify(o2, never()).onNext(any());
verify(o2, never()).onCompleted();
verifyNoMoreInteractions(o2);
}

@Test
Expand All @@ -245,15 +236,13 @@ public void testCompletedAfterErrorIsNotSent3() {
verify(observer, times(1)).onNext("default");
verify(observer, times(1)).onNext("one");
verify(observer, times(1)).onCompleted();
verify(observer, never()).onError(any(Throwable.class));
verify(observer, never()).onNext("two");
verifyNoMoreInteractions(observer);

@SuppressWarnings("unchecked")
Observer<Object> o2 = mock(Observer.class);
subject.subscribe(o2);
verify(o2, times(1)).onCompleted();
verify(o2, never()).onNext(any());
verify(o2, never()).onError(any(Throwable.class));
verifyNoMoreInteractions(o2);
}
@Test(timeout = 1000)
public void testUnsubscriptionCase() {
Expand Down Expand Up @@ -344,8 +333,7 @@ public void testStartEmptyCompleteWithOne() {
source.subscribe(o);

verify(o).onCompleted();
verify(o, never()).onError(any(Throwable.class));
verify(o, never()).onNext(any());
verifyNoMoreInteractions(o);
}

@Test
Expand All @@ -358,8 +346,8 @@ public void testTakeOneSubscriber() {

verify(o).onNext(1);
verify(o).onCompleted();
verify(o, never()).onError(any(Throwable.class));
verifyNoMoreInteractions(o);

assertEquals(0, source.subscriberCount());
assertFalse(source.hasObservers());
}
Expand Down