Skip to content

Commit e162d66

Browse files
dvolkovvakarnokd
dvolkovv
authored and
akarnokd
committed
diamond operators in unit tests, flowable package (#6787)
1 parent dba6705 commit e162d66

File tree

111 files changed

+948
-944
lines changed

Some content is hidden

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

111 files changed

+948
-944
lines changed

‎src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNextTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ public void interrupt() {
352352

353353
@Test
354354
public void nextObserverError() {
355-
NextSubscriber<Integer> no = new NextSubscriber<Integer>();
355+
NextSubscriber<Integer> no = new NextSubscriber<>();
356356

357357
List<Throwable> errors = TestHelper.trackPluginErrors();
358358
try {
@@ -366,7 +366,7 @@ public void nextObserverError() {
366366

367367
@Test
368368
public void nextObserverOnNext() throws Exception {
369-
NextSubscriber<Integer> no = new NextSubscriber<Integer>();
369+
NextSubscriber<Integer> no = new NextSubscriber<>();
370370

371371
no.setWaiting();
372372
no.onNext(Notification.createOnNext(1));
@@ -379,7 +379,7 @@ public void nextObserverOnNext() throws Exception {
379379

380380
@Test
381381
public void nextObserverOnCompleteOnNext() throws Exception {
382-
NextSubscriber<Integer> no = new NextSubscriber<Integer>();
382+
NextSubscriber<Integer> no = new NextSubscriber<>();
383383

384384
no.setWaiting();
385385
no.onNext(Notification.<Integer>createOnComplete());

‎src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableToIteratorTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,13 @@ public void remove() {
117117

118118
@Test(expected = UnsupportedOperationException.class)
119119
public void remove() {
120-
BlockingFlowableIterator<Integer> it = new BlockingFlowableIterator<Integer>(128);
120+
BlockingFlowableIterator<Integer> it = new BlockingFlowableIterator<>(128);
121121
it.remove();
122122
}
123123

124124
@Test
125125
public void dispose() {
126-
BlockingFlowableIterator<Integer> it = new BlockingFlowableIterator<Integer>(128);
126+
BlockingFlowableIterator<Integer> it = new BlockingFlowableIterator<>(128);
127127

128128
assertFalse(it.isDisposed());
129129

@@ -134,7 +134,7 @@ public void dispose() {
134134

135135
@Test
136136
public void interruptWait() {
137-
BlockingFlowableIterator<Integer> it = new BlockingFlowableIterator<Integer>(128);
137+
BlockingFlowableIterator<Integer> it = new BlockingFlowableIterator<>(128);
138138

139139
try {
140140
Thread.currentThread().interrupt();
@@ -147,7 +147,7 @@ public void interruptWait() {
147147

148148
@Test(expected = NoSuchElementException.class)
149149
public void emptyThrowsNoSuch() {
150-
BlockingFlowableIterator<Integer> it = new BlockingFlowableIterator<Integer>(128);
150+
BlockingFlowableIterator<Integer> it = new BlockingFlowableIterator<>(128);
151151
it.onComplete();
152152
it.next();
153153
}

‎src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAllTest.java

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

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

151151
Flowable.empty().all(new Predicate<Object>() {
152152
@Override
@@ -164,7 +164,7 @@ public boolean test(Object t) {
164164

165165
@Test
166166
public void predicateThrowsExceptionAndValueInCauseMessage() {
167-
TestObserverEx<Boolean> to = new TestObserverEx<Boolean>();
167+
TestObserverEx<Boolean> to = new TestObserverEx<>();
168168

169169
final IllegalArgumentException ex = new IllegalArgumentException();
170170

@@ -306,7 +306,7 @@ public Publisher<Integer> apply(Boolean t1) {
306306

307307
@Test
308308
public void backpressureIfNoneRequestedNoneShouldBeDeliveredFlowable() {
309-
TestSubscriber<Boolean> ts = new TestSubscriber<Boolean>(0L);
309+
TestSubscriber<Boolean> ts = new TestSubscriber<>(0L);
310310
Flowable.empty().all(new Predicate<Object>() {
311311
@Override
312312
public boolean test(Object t1) {
@@ -323,7 +323,7 @@ public boolean test(Object t1) {
323323

324324
@Test
325325
public void backpressureIfOneRequestedOneShouldBeDeliveredFlowable() {
326-
TestSubscriberEx<Boolean> ts = new TestSubscriberEx<Boolean>(1L);
326+
TestSubscriberEx<Boolean> ts = new TestSubscriberEx<>(1L);
327327

328328
Flowable.empty().all(new Predicate<Object>() {
329329
@Override
@@ -343,7 +343,7 @@ public boolean test(Object t) {
343343

344344
@Test
345345
public void predicateThrowsExceptionAndValueInCauseMessageFlowable() {
346-
TestSubscriberEx<Boolean> ts = new TestSubscriberEx<Boolean>();
346+
TestSubscriberEx<Boolean> ts = new TestSubscriberEx<>();
347347

348348
final IllegalArgumentException ex = new IllegalArgumentException();
349349

‎src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmbTest.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public void amb3() {
174174
@SuppressWarnings("unchecked")
175175
@Test
176176
public void producerRequestThroughAmb() {
177-
TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
177+
TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
178178
ts.request(3);
179179
final AtomicLong requested1 = new AtomicLong();
180180
final AtomicLong requested2 = new AtomicLong();
@@ -225,7 +225,7 @@ public void cancel() {
225225

226226
@Test
227227
public void backpressure() {
228-
TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
228+
TestSubscriber<Integer> ts = new TestSubscriber<>();
229229
Flowable.range(0, Flowable.bufferSize() * 2)
230230
.ambWith(Flowable.range(0, Flowable.bufferSize() * 2))
231231
.observeOn(Schedulers.computation()) // observeOn has a backpressured RxRingBuffer
@@ -254,7 +254,7 @@ public void accept(Subscription s) {
254254
//this stream emits second
255255
Flowable<Integer> f2 = Flowable.just(1).doOnSubscribe(incrementer)
256256
.delay(100, TimeUnit.MILLISECONDS).subscribeOn(Schedulers.computation());
257-
TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
257+
TestSubscriber<Integer> ts = new TestSubscriber<>();
258258
Flowable.ambArray(f1, f2).subscribe(ts);
259259
ts.request(1);
260260
ts.awaitDone(5, TimeUnit.SECONDS);
@@ -271,7 +271,7 @@ public void secondaryRequestsPropagatedToChildren() throws InterruptedException
271271
//this stream emits second
272272
Flowable<Integer> f2 = Flowable.fromArray(4, 5, 6)
273273
.delay(200, TimeUnit.MILLISECONDS).subscribeOn(Schedulers.computation());
274-
TestSubscriber<Integer> ts = new TestSubscriber<Integer>(1L);
274+
TestSubscriber<Integer> ts = new TestSubscriber<>(1L);
275275

276276
Flowable.ambArray(f1, f2).subscribe(ts);
277277
// before first emission request 20 more
@@ -309,7 +309,7 @@ public void ambCancelsOthers() {
309309
PublishProcessor<Integer> source2 = PublishProcessor.create();
310310
PublishProcessor<Integer> source3 = PublishProcessor.create();
311311

312-
TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
312+
TestSubscriber<Integer> ts = new TestSubscriber<>();
313313

314314
Flowable.ambArray(source1, source2, source3).subscribe(ts);
315315

@@ -327,8 +327,8 @@ public void ambCancelsOthers() {
327327

328328
@Test
329329
public void multipleUse() {
330-
TestSubscriber<Long> ts1 = new TestSubscriber<Long>();
331-
TestSubscriber<Long> ts2 = new TestSubscriber<Long>();
330+
TestSubscriber<Long> ts1 = new TestSubscriber<>();
331+
TestSubscriber<Long> ts2 = new TestSubscriber<>();
332332

333333
Flowable<Long> amb = Flowable.timer(100, TimeUnit.MILLISECONDS).ambWith(Flowable.timer(200, TimeUnit.MILLISECONDS));
334334

@@ -541,7 +541,7 @@ public void nullIterableElement() {
541541

542542
@Test
543543
public void iteratorThrows() {
544-
Flowable.amb(new CrashingMappedIterable<Flowable<Integer>>(1, 100, 100, new Function<Integer, Flowable<Integer>>() {
544+
Flowable.amb(new CrashingMappedIterable<>(1, 100, 100, new Function<Integer, Flowable<Integer>>() {
545545
@Override
546546
public Flowable<Integer> apply(Integer v) throws Exception {
547547
return Flowable.never();
@@ -550,7 +550,7 @@ public Flowable<Integer> apply(Integer v) throws Exception {
550550
.to(TestHelper.<Integer>testConsumer())
551551
.assertFailureAndMessage(TestException.class, "iterator()");
552552

553-
Flowable.amb(new CrashingMappedIterable<Flowable<Integer>>(100, 1, 100, new Function<Integer, Flowable<Integer>>() {
553+
Flowable.amb(new CrashingMappedIterable<>(100, 1, 100, new Function<Integer, Flowable<Integer>>() {
554554
@Override
555555
public Flowable<Integer> apply(Integer v) throws Exception {
556556
return Flowable.never();
@@ -559,7 +559,7 @@ public Flowable<Integer> apply(Integer v) throws Exception {
559559
.to(TestHelper.<Integer>testConsumer())
560560
.assertFailureAndMessage(TestException.class, "hasNext()");
561561

562-
Flowable.amb(new CrashingMappedIterable<Flowable<Integer>>(100, 100, 1, new Function<Integer, Flowable<Integer>>() {
562+
Flowable.amb(new CrashingMappedIterable<>(100, 100, 1, new Function<Integer, Flowable<Integer>>() {
563563
@Override
564564
public Flowable<Integer> apply(Integer v) throws Exception {
565565
return Flowable.never();

‎src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAnyTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ public Publisher<Integer> apply(Boolean t1) {
239239

240240
@Test
241241
public void backpressureIfOneRequestedOneShouldBeDelivered() {
242-
TestObserverEx<Boolean> to = new TestObserverEx<Boolean>();
242+
TestObserverEx<Boolean> to = new TestObserverEx<>();
243243
Flowable.just(1).any(new Predicate<Integer>() {
244244
@Override
245245
public boolean test(Integer v) {
@@ -255,7 +255,7 @@ public boolean test(Integer v) {
255255

256256
@Test
257257
public void predicateThrowsExceptionAndValueInCauseMessage() {
258-
TestObserverEx<Boolean> to = new TestObserverEx<Boolean>();
258+
TestObserverEx<Boolean> to = new TestObserverEx<>();
259259
final IllegalArgumentException ex = new IllegalArgumentException();
260260

261261
Flowable.just("Boo!").any(new Predicate<String>() {
@@ -488,7 +488,7 @@ public Publisher<Integer> apply(Boolean t1) {
488488

489489
@Test
490490
public void backpressureIfNoneRequestedNoneShouldBeDeliveredFlowable() {
491-
TestSubscriber<Boolean> ts = new TestSubscriber<Boolean>(0L);
491+
TestSubscriber<Boolean> ts = new TestSubscriber<>(0L);
492492

493493
Flowable.just(1).any(new Predicate<Integer>() {
494494
@Override
@@ -505,7 +505,7 @@ public boolean test(Integer t) {
505505

506506
@Test
507507
public void backpressureIfOneRequestedOneShouldBeDeliveredFlowable() {
508-
TestSubscriberEx<Boolean> ts = new TestSubscriberEx<Boolean>(1L);
508+
TestSubscriberEx<Boolean> ts = new TestSubscriberEx<>(1L);
509509
Flowable.just(1).any(new Predicate<Integer>() {
510510
@Override
511511
public boolean test(Integer v) {
@@ -521,7 +521,7 @@ public boolean test(Integer v) {
521521

522522
@Test
523523
public void predicateThrowsExceptionAndValueInCauseMessageFlowable() {
524-
TestSubscriberEx<Boolean> ts = new TestSubscriberEx<Boolean>();
524+
TestSubscriberEx<Boolean> ts = new TestSubscriberEx<>();
525525
final IllegalArgumentException ex = new IllegalArgumentException();
526526

527527
Flowable.just("Boo!").any(new Predicate<String>() {

0 commit comments

Comments
 (0)