Skip to content

Commit 647cede

Browse files
benjchristensenbenjchristensen
committed
Merge pull request #3340 from Turbo87/import-cleanup
test/subjects: Use statically imported never() methods
2 parents c451491 + 17ba599 commit 647cede

File tree

4 files changed

+42
-61
lines changed

4 files changed

+42
-61
lines changed

‎src/test/java/rx/subjects/AsyncSubjectTest.java

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

3434
import org.junit.Test;
3535
import org.mockito.InOrder;
36-
import org.mockito.Mockito;
3736

3837
import rx.Observer;
3938
import rx.Subscription;
@@ -59,9 +58,9 @@ public void testNeverCompleted() {
5958
subject.onNext("two");
6059
subject.onNext("three");
6160

62-
verify(observer, Mockito.never()).onNext(anyString());
63-
verify(observer, Mockito.never()).onError(testException);
64-
verify(observer, Mockito.never()).onCompleted();
61+
verify(observer, never()).onNext(anyString());
62+
verify(observer, never()).onError(testException);
63+
verify(observer, never()).onCompleted();
6564
}
6665

6766
@Test
@@ -78,7 +77,7 @@ public void testCompleted() {
7877
subject.onCompleted();
7978

8079
verify(observer, times(1)).onNext("three");
81-
verify(observer, Mockito.never()).onError(any(Throwable.class));
80+
verify(observer, never()).onError(any(Throwable.class));
8281
verify(observer, times(1)).onCompleted();
8382
}
8483

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

9695
verify(observer, times(1)).onNext(null);
97-
verify(observer, Mockito.never()).onError(any(Throwable.class));
96+
verify(observer, never()).onError(any(Throwable.class));
9897
verify(observer, times(1)).onCompleted();
9998
}
10099

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

115114
verify(observer, times(1)).onNext("three");
116-
verify(observer, Mockito.never()).onError(any(Throwable.class));
115+
verify(observer, never()).onError(any(Throwable.class));
117116
verify(observer, times(1)).onCompleted();
118117
}
119118

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

136135
verify(observer, times(1)).onError(re);
137-
verify(observer, Mockito.never()).onNext(any(String.class));
138-
verify(observer, Mockito.never()).onCompleted();
136+
verify(observer, never()).onNext(any(String.class));
137+
verify(observer, never()).onCompleted();
139138
}
140139

141140
@Test
@@ -154,9 +153,9 @@ public void testError() {
154153
subject.onError(new Throwable());
155154
subject.onCompleted();
156155

157-
verify(observer, Mockito.never()).onNext(anyString());
156+
verify(observer, never()).onNext(anyString());
158157
verify(observer, times(1)).onError(testException);
159-
verify(observer, Mockito.never()).onCompleted();
158+
verify(observer, never()).onCompleted();
160159
}
161160

162161
@Test
@@ -172,16 +171,16 @@ public void testUnsubscribeBeforeCompleted() {
172171

173172
subscription.unsubscribe();
174173

175-
verify(observer, Mockito.never()).onNext(anyString());
176-
verify(observer, Mockito.never()).onError(any(Throwable.class));
177-
verify(observer, Mockito.never()).onCompleted();
174+
verify(observer, never()).onNext(anyString());
175+
verify(observer, never()).onError(any(Throwable.class));
176+
verify(observer, never()).onCompleted();
178177

179178
subject.onNext("three");
180179
subject.onCompleted();
181180

182-
verify(observer, Mockito.never()).onNext(anyString());
183-
verify(observer, Mockito.never()).onError(any(Throwable.class));
184-
verify(observer, Mockito.never()).onCompleted();
181+
verify(observer, never()).onNext(anyString());
182+
verify(observer, never()).onError(any(Throwable.class));
183+
verify(observer, never()).onCompleted();
185184
}
186185

187186
@Test

‎src/test/java/rx/subjects/BehaviorSubjectTest.java

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
import org.junit.*;
3434
import org.mockito.InOrder;
35-
import org.mockito.Mockito;
3635

3736
import rx.*;
3837
import rx.exceptions.CompositeException;
@@ -62,8 +61,8 @@ public void testThatObserverReceivesDefaultValueAndSubsequentEvents() {
6261
verify(observer, times(1)).onNext("one");
6362
verify(observer, times(1)).onNext("two");
6463
verify(observer, times(1)).onNext("three");
65-
verify(observer, Mockito.never()).onError(testException);
66-
verify(observer, Mockito.never()).onCompleted();
64+
verify(observer, never()).onError(testException);
65+
verify(observer, never()).onCompleted();
6766
}
6867

6968
@Test
@@ -79,12 +78,12 @@ public void testThatObserverReceivesLatestAndThenSubsequentEvents() {
7978
subject.onNext("two");
8079
subject.onNext("three");
8180

82-
verify(observer, Mockito.never()).onNext("default");
81+
verify(observer, never()).onNext("default");
8382
verify(observer, times(1)).onNext("one");
8483
verify(observer, times(1)).onNext("two");
8584
verify(observer, times(1)).onNext("three");
86-
verify(observer, Mockito.never()).onError(testException);
87-
verify(observer, Mockito.never()).onCompleted();
85+
verify(observer, never()).onError(testException);
86+
verify(observer, never()).onCompleted();
8887
}
8988

9089
@Test
@@ -100,7 +99,7 @@ public void testSubscribeThenOnComplete() {
10099

101100
verify(observer, times(1)).onNext("default");
102101
verify(observer, times(1)).onNext("one");
103-
verify(observer, Mockito.never()).onError(any(Throwable.class));
102+
verify(observer, never()).onError(any(Throwable.class));
104103
verify(observer, times(1)).onCompleted();
105104
}
106105

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

117116
verify(observer, never()).onNext("default");
118117
verify(observer, never()).onNext("one");
119-
verify(observer, Mockito.never()).onError(any(Throwable.class));
118+
verify(observer, never()).onError(any(Throwable.class));
120119
verify(observer, times(1)).onCompleted();
121120
}
122121

@@ -254,7 +253,7 @@ public void testCompletedAfterErrorIsNotSent3() {
254253
subject.subscribe(o2);
255254
verify(o2, times(1)).onCompleted();
256255
verify(o2, never()).onNext(any());
257-
verify(observer, never()).onError(any(Throwable.class));
256+
verify(o2, never()).onError(any(Throwable.class));
258257
}
259258
@Test(timeout = 1000)
260259
public void testUnsubscriptionCase() {
@@ -275,22 +274,8 @@ public Observable<String> call(String t1) {
275274
return Observable.just(t1 + ", " + t1);
276275
}
277276
})
278-
.subscribe(new Observer<String>() {
279-
@Override
280-
public void onNext(String t) {
281-
o.onNext(t);
282-
}
277+
.subscribe(o);
283278

284-
@Override
285-
public void onError(Throwable e) {
286-
o.onError(e);
287-
}
288-
289-
@Override
290-
public void onCompleted() {
291-
o.onCompleted();
292-
}
293-
});
294279
inOrder.verify(o).onNext(v + ", " + v);
295280
inOrder.verify(o).onCompleted();
296281
verify(o, never()).onError(any(Throwable.class));

‎src/test/java/rx/subjects/PublishSubjectTest.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
import org.junit.Test;
3434
import org.mockito.InOrder;
35-
import org.mockito.Mockito;
3635

3736
import rx.Observable;
3837
import rx.Observer;
@@ -118,7 +117,7 @@ private void assertCompletedObserver(Observer<String> observer) {
118117
verify(observer, times(1)).onNext("one");
119118
verify(observer, times(1)).onNext("two");
120119
verify(observer, times(1)).onNext("three");
121-
verify(observer, Mockito.never()).onError(any(Throwable.class));
120+
verify(observer, never()).onError(any(Throwable.class));
122121
verify(observer, times(1)).onCompleted();
123122
}
124123

@@ -152,7 +151,7 @@ private void assertErrorObserver(Observer<String> observer) {
152151
verify(observer, times(1)).onNext("two");
153152
verify(observer, times(1)).onNext("three");
154153
verify(observer, times(1)).onError(testException);
155-
verify(observer, Mockito.never()).onCompleted();
154+
verify(observer, never()).onCompleted();
156155
}
157156

158157
@Test
@@ -180,10 +179,10 @@ public void testSubscribeMidSequence() {
180179
}
181180

182181
private void assertCompletedStartingWithThreeObserver(Observer<String> observer) {
183-
verify(observer, Mockito.never()).onNext("one");
184-
verify(observer, Mockito.never()).onNext("two");
182+
verify(observer, never()).onNext("one");
183+
verify(observer, never()).onNext("two");
185184
verify(observer, times(1)).onNext("three");
186-
verify(observer, Mockito.never()).onError(any(Throwable.class));
185+
verify(observer, never()).onError(any(Throwable.class));
187186
verify(observer, times(1)).onCompleted();
188187
}
189188

@@ -215,9 +214,9 @@ public void testUnsubscribeFirstObserver() {
215214
private void assertObservedUntilTwo(Observer<String> observer) {
216215
verify(observer, times(1)).onNext("one");
217216
verify(observer, times(1)).onNext("two");
218-
verify(observer, Mockito.never()).onNext("three");
219-
verify(observer, Mockito.never()).onError(any(Throwable.class));
220-
verify(observer, Mockito.never()).onCompleted();
217+
verify(observer, never()).onNext("three");
218+
verify(observer, never()).onError(any(Throwable.class));
219+
verify(observer, never()).onCompleted();
221220
}
222221

223222
@Test

‎src/test/java/rx/subjects/ReplaySubjectTest.java

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636

3737
import org.junit.Test;
3838
import org.mockito.InOrder;
39-
import org.mockito.Mockito;
4039

4140
import rx.Observable;
4241
import rx.Observer;
@@ -140,11 +139,10 @@ public void testCompletedStopsEmittingData() {
140139
inOrderD.verify(observerD).onNext(4711);
141140
inOrderD.verify(observerD).onCompleted();
142141

143-
Mockito.verifyNoMoreInteractions(observerA);
144-
Mockito.verifyNoMoreInteractions(observerB);
145-
Mockito.verifyNoMoreInteractions(observerC);
146-
Mockito.verifyNoMoreInteractions(observerD);
147-
142+
verifyNoMoreInteractions(observerA);
143+
verifyNoMoreInteractions(observerB);
144+
verifyNoMoreInteractions(observerC);
145+
verifyNoMoreInteractions(observerD);
148146
}
149147

150148
@Test
@@ -172,7 +170,7 @@ private void assertCompletedObserver(Observer<String> observer) {
172170
inOrder.verify(observer, times(1)).onNext("one");
173171
inOrder.verify(observer, times(1)).onNext("two");
174172
inOrder.verify(observer, times(1)).onNext("three");
175-
inOrder.verify(observer, Mockito.never()).onError(any(Throwable.class));
173+
inOrder.verify(observer, never()).onError(any(Throwable.class));
176174
inOrder.verify(observer, times(1)).onCompleted();
177175
inOrder.verifyNoMoreInteractions();
178176
}
@@ -206,7 +204,7 @@ private void assertErrorObserver(Observer<String> observer) {
206204
verify(observer, times(1)).onNext("two");
207205
verify(observer, times(1)).onNext("three");
208206
verify(observer, times(1)).onError(testException);
209-
verify(observer, Mockito.never()).onCompleted();
207+
verify(observer, never()).onCompleted();
210208
}
211209

212210
@SuppressWarnings("unchecked")
@@ -261,9 +259,9 @@ public void testUnsubscribeFirstObserver() {
261259
private void assertObservedUntilTwo(Observer<String> observer) {
262260
verify(observer, times(1)).onNext("one");
263261
verify(observer, times(1)).onNext("two");
264-
verify(observer, Mockito.never()).onNext("three");
265-
verify(observer, Mockito.never()).onError(any(Throwable.class));
266-
verify(observer, Mockito.never()).onCompleted();
262+
verify(observer, never()).onNext("three");
263+
verify(observer, never()).onError(any(Throwable.class));
264+
verify(observer, never()).onCompleted();
267265
}
268266

269267
@Test(timeout = 2000)

0 commit comments

Comments
 (0)