Skip to content

Commit d6d6982

Browse files
dvolkovvakarnokd
authored andcommitted
diamond operators in unit tests, observable package (#6786)
1 parent e162d66 commit d6d6982

File tree

95 files changed

+675
-672
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+675
-672
lines changed

src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNextTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void run() {
6363
}
6464

6565
static <T> Iterable<T> next(ObservableSource<T> source) {
66-
return new BlockingObservableNext<T>(source);
66+
return new BlockingObservableNext<>(source);
6767
}
6868

6969
@Test
@@ -356,7 +356,7 @@ public void remove() {
356356

357357
@Test
358358
public void nextObserverError() {
359-
NextObserver<Integer> no = new NextObserver<Integer>();
359+
NextObserver<Integer> no = new NextObserver<>();
360360

361361
List<Throwable> errors = TestHelper.trackPluginErrors();
362362
try {
@@ -370,7 +370,7 @@ public void nextObserverError() {
370370

371371
@Test
372372
public void nextObserverOnNext() throws Exception {
373-
NextObserver<Integer> no = new NextObserver<Integer>();
373+
NextObserver<Integer> no = new NextObserver<>();
374374

375375
no.setWaiting();
376376
no.onNext(Notification.createOnNext(1));
@@ -383,7 +383,7 @@ public void nextObserverOnNext() throws Exception {
383383

384384
@Test
385385
public void nextObserverOnCompleteOnNext() throws Exception {
386-
NextObserver<Integer> no = new NextObserver<Integer>();
386+
NextObserver<Integer> no = new NextObserver<>();
387387

388388
no.setWaiting();
389389
no.onNext(Notification.<Integer>createOnComplete());

src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToIteratorTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void subscribe(Observer<? super String> observer) {
7373

7474
@Test
7575
public void dispose() {
76-
BlockingObservableIterator<Integer> it = new BlockingObservableIterator<Integer>(128);
76+
BlockingObservableIterator<Integer> it = new BlockingObservableIterator<>(128);
7777

7878
assertFalse(it.isDisposed());
7979

@@ -84,7 +84,7 @@ public void dispose() {
8484

8585
@Test
8686
public void interruptWait() {
87-
BlockingObservableIterator<Integer> it = new BlockingObservableIterator<Integer>(128);
87+
BlockingObservableIterator<Integer> it = new BlockingObservableIterator<>(128);
8888

8989
try {
9090
Thread.currentThread().interrupt();
@@ -97,14 +97,14 @@ public void interruptWait() {
9797

9898
@Test(expected = NoSuchElementException.class)
9999
public void emptyThrowsNoSuch() {
100-
BlockingObservableIterator<Integer> it = new BlockingObservableIterator<Integer>(128);
100+
BlockingObservableIterator<Integer> it = new BlockingObservableIterator<>(128);
101101
it.onComplete();
102102
it.next();
103103
}
104104

105105
@Test(expected = UnsupportedOperationException.class)
106106
public void remove() {
107-
BlockingObservableIterator<Integer> it = new BlockingObservableIterator<Integer>(128);
107+
BlockingObservableIterator<Integer> it = new BlockingObservableIterator<>(128);
108108
it.remove();
109109
}
110110

src/test/java/io/reactivex/rxjava3/internal/operators/observable/Burst.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public static <T> Builder<T> item(T item) {
5353

5454
@SafeVarargs
5555
public static <T> Builder<T> items(T... items) {
56-
return new Builder<T>(Arrays.asList(items));
56+
return new Builder<>(Arrays.asList(items));
5757
}
5858

5959
public static final class Builder<T> {
@@ -71,7 +71,7 @@ public Observable<T> error(Throwable e) {
7171
}
7272

7373
public Observable<T> create() {
74-
return new Burst<T>(error, items);
74+
return new Burst<>(error, items);
7575
}
7676

7777
}

src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public Observable<Integer> apply(Boolean t1) {
146146

147147
@Test
148148
public void predicateThrowsExceptionAndValueInCauseMessageObservable() {
149-
TestObserverEx<Boolean> to = new TestObserverEx<Boolean>();
149+
TestObserverEx<Boolean> to = new TestObserverEx<>();
150150

151151
final IllegalArgumentException ex = new IllegalArgumentException();
152152

@@ -277,7 +277,7 @@ public Observable<Integer> apply(Boolean t1) {
277277

278278
@Test
279279
public void predicateThrowsExceptionAndValueInCauseMessage() {
280-
TestObserverEx<Boolean> to = new TestObserverEx<Boolean>();
280+
TestObserverEx<Boolean> to = new TestObserverEx<>();
281281

282282
final IllegalArgumentException ex = new IllegalArgumentException();
283283

src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmbTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public void accept(Disposable d) {
178178
//this stream emits second
179179
Observable<Integer> o2 = Observable.just(1).doOnSubscribe(incrementer)
180180
.delay(100, TimeUnit.MILLISECONDS).subscribeOn(Schedulers.computation());
181-
TestObserver<Integer> to = new TestObserver<Integer>();
181+
TestObserver<Integer> to = new TestObserver<>();
182182
Observable.ambArray(o1, o2).subscribe(to);
183183
to.awaitDone(5, TimeUnit.SECONDS);
184184
to.assertNoErrors();
@@ -212,7 +212,7 @@ public void ambCancelsOthers() {
212212
PublishSubject<Integer> source2 = PublishSubject.create();
213213
PublishSubject<Integer> source3 = PublishSubject.create();
214214

215-
TestObserver<Integer> to = new TestObserver<Integer>();
215+
TestObserver<Integer> to = new TestObserver<>();
216216

217217
Observable.ambArray(source1, source2, source3).subscribe(to);
218218

src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnyTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public Observable<Integer> apply(Boolean t1) {
247247

248248
@Test
249249
public void predicateThrowsExceptionAndValueInCauseMessageObservable() {
250-
TestObserverEx<Boolean> to = new TestObserverEx<Boolean>();
250+
TestObserverEx<Boolean> to = new TestObserverEx<>();
251251
final IllegalArgumentException ex = new IllegalArgumentException();
252252

253253
Observable.just("Boo!").any(new Predicate<String>() {
@@ -469,7 +469,7 @@ public Observable<Integer> apply(Boolean t1) {
469469

470470
@Test
471471
public void predicateThrowsExceptionAndValueInCauseMessage() {
472-
TestObserverEx<Boolean> to = new TestObserverEx<Boolean>();
472+
TestObserverEx<Boolean> to = new TestObserverEx<>();
473473
final IllegalArgumentException ex = new IllegalArgumentException();
474474

475475
Observable.just("Boo!").any(new Predicate<String>() {

src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingTest.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void blockingFirstDefault() {
4848

4949
@Test
5050
public void blockingSubscribeConsumer() {
51-
final List<Integer> list = new ArrayList<Integer>();
51+
final List<Integer> list = new ArrayList<>();
5252

5353
Observable.range(1, 5)
5454
.subscribeOn(Schedulers.computation())
@@ -64,7 +64,7 @@ public void accept(Integer v) throws Exception {
6464

6565
@Test
6666
public void blockingSubscribeConsumerConsumer() {
67-
final List<Object> list = new ArrayList<Object>();
67+
final List<Object> list = new ArrayList<>();
6868

6969
Observable.range(1, 5)
7070
.subscribeOn(Schedulers.computation())
@@ -80,7 +80,7 @@ public void accept(Integer v) throws Exception {
8080

8181
@Test
8282
public void blockingSubscribeConsumerConsumerError() {
83-
final List<Object> list = new ArrayList<Object>();
83+
final List<Object> list = new ArrayList<>();
8484

8585
TestException ex = new TestException();
8686

@@ -100,7 +100,7 @@ public void accept(Object v) throws Exception {
100100

101101
@Test
102102
public void blockingSubscribeConsumerConsumerAction() {
103-
final List<Object> list = new ArrayList<Object>();
103+
final List<Object> list = new ArrayList<>();
104104

105105
Consumer<Object> cons = new Consumer<Object>() {
106106
@Override
@@ -123,7 +123,7 @@ public void run() throws Exception {
123123

124124
@Test
125125
public void blockingSubscribeObserver() {
126-
final List<Object> list = new ArrayList<Object>();
126+
final List<Object> list = new ArrayList<>();
127127

128128
Observable.range(1, 5)
129129
.subscribeOn(Schedulers.computation())
@@ -156,7 +156,7 @@ public void onComplete() {
156156

157157
@Test
158158
public void blockingSubscribeObserverError() {
159-
final List<Object> list = new ArrayList<Object>();
159+
final List<Object> list = new ArrayList<>();
160160

161161
final TestException ex = new TestException();
162162

@@ -232,7 +232,7 @@ public void utilityClass() {
232232

233233
@Test
234234
public void disposeUpFront() {
235-
TestObserver<Object> to = new TestObserver<Object>();
235+
TestObserver<Object> to = new TestObserver<>();
236236
to.dispose();
237237
Observable.just(1).blockingSubscribe(to);
238238

@@ -242,7 +242,7 @@ public void disposeUpFront() {
242242
@SuppressWarnings("rawtypes")
243243
@Test
244244
public void delayed() throws Exception {
245-
final TestObserver<Object> to = new TestObserver<Object>();
245+
final TestObserver<Object> to = new TestObserver<>();
246246
final Observer[] s = { null };
247247

248248
Schedulers.single().scheduleDirect(new Runnable() {
@@ -271,14 +271,14 @@ protected void subscribeActual(Observer<? super Integer> observer) {
271271

272272
@Test
273273
public void interrupt() {
274-
TestObserver<Object> to = new TestObserver<Object>();
274+
TestObserver<Object> to = new TestObserver<>();
275275
Thread.currentThread().interrupt();
276276
Observable.never().blockingSubscribe(to);
277277
}
278278

279279
@Test
280280
public void onCompleteDelayed() {
281-
TestObserver<Object> to = new TestObserver<Object>();
281+
TestObserver<Object> to = new TestObserver<>();
282282

283283
Observable.empty().delay(100, TimeUnit.MILLISECONDS)
284284
.blockingSubscribe(to);
@@ -288,7 +288,7 @@ public void onCompleteDelayed() {
288288

289289
@Test
290290
public void blockingCancelUpfront() {
291-
BlockingFirstObserver<Integer> o = new BlockingFirstObserver<Integer>();
291+
BlockingFirstObserver<Integer> o = new BlockingFirstObserver<>();
292292

293293
assertFalse(o.isDisposed());
294294
o.dispose();

0 commit comments

Comments
 (0)