Skip to content

Commit 0bd2a01

Browse files
dvolkovvakarnokd
dvolkovv
authored and
akarnokd
committed
diamond operators in unit tests, small packages (#6789)
1 parent 75da4b5 commit 0bd2a01

File tree

106 files changed

+905
-903
lines changed

Some content is hidden

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

106 files changed

+905
-903
lines changed

‎src/test/java/io/reactivex/rxjava3/completable/CompletableTest.java‎

Lines changed: 52 additions & 52 deletions
Large diffs are not rendered by default.

‎src/test/java/io/reactivex/rxjava3/disposables/CompositeDisposableTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void run() {
7272
}));
7373
}
7474

75-
final List<Thread> threads = new ArrayList<Thread>();
75+
final List<Thread> threads = new ArrayList<>();
7676
for (int i = 0; i < count; i++) {
7777
final Thread t = new Thread() {
7878
@Override
@@ -253,7 +253,7 @@ public void run() {
253253

254254
}));
255255

256-
final List<Thread> threads = new ArrayList<Thread>();
256+
final List<Thread> threads = new ArrayList<>();
257257
for (int i = 0; i < count; i++) {
258258
final Thread t = new Thread() {
259259
@Override

‎src/test/java/io/reactivex/rxjava3/disposables/DisposableTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public void setOnceTwice() {
160160
List<Throwable> errors = TestHelper.trackPluginErrors();
161161
try {
162162

163-
AtomicReference<Disposable> target = new AtomicReference<Disposable>();
163+
AtomicReference<Disposable> target = new AtomicReference<>();
164164
Disposable d = Disposable.empty();
165165

166166
DisposableHelper.setOnce(target, d);

‎src/test/java/io/reactivex/rxjava3/disposables/FutureDisposableTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class FutureDisposableTest extends RxJavaTest {
2626

2727
@Test
2828
public void normal() {
29-
FutureTask<Object> ft = new FutureTask<Object>(Functions.EMPTY_RUNNABLE, null);
29+
FutureTask<Object> ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
3030
Disposable d = Disposable.fromFuture(ft);
3131
assertFalse(d.isDisposed());
3232

@@ -43,7 +43,7 @@ public void normal() {
4343

4444
@Test
4545
public void interruptible() {
46-
FutureTask<Object> ft = new FutureTask<Object>(Functions.EMPTY_RUNNABLE, null);
46+
FutureTask<Object> ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
4747
Disposable d = Disposable.fromFuture(ft, true);
4848
assertFalse(d.isDisposed());
4949

@@ -60,7 +60,7 @@ public void interruptible() {
6060

6161
@Test
6262
public void normalDone() {
63-
FutureTask<Object> ft = new FutureTask<Object>(Functions.EMPTY_RUNNABLE, null);
63+
FutureTask<Object> ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
6464
FutureDisposable d = new FutureDisposable(ft, false);
6565
assertFalse(d.isDisposed());
6666

‎src/test/java/io/reactivex/rxjava3/disposables/SequentialDisposableTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public void settingUnderlyingWhenUnsubscribedCausesImmediateUnsubscriptionConcur
129129
final int count = 10;
130130
final CountDownLatch end = new CountDownLatch(count);
131131

132-
final List<Thread> threads = new ArrayList<Thread>();
132+
final List<Thread> threads = new ArrayList<>();
133133
for (int i = 0; i < count; i++) {
134134
final Thread t = new Thread() {
135135
@Override
@@ -164,12 +164,12 @@ public void run() {
164164
public void concurrentSetDisposableShouldNotInterleave()
165165
throws InterruptedException {
166166
final int count = 10;
167-
final List<Disposable> subscriptions = new ArrayList<Disposable>();
167+
final List<Disposable> subscriptions = new ArrayList<>();
168168

169169
final CountDownLatch start = new CountDownLatch(1);
170170
final CountDownLatch end = new CountDownLatch(count);
171171

172-
final List<Thread> threads = new ArrayList<Thread>();
172+
final List<Thread> threads = new ArrayList<>();
173173
for (int i = 0; i < count; i++) {
174174
final Disposable subscription = mock(Disposable.class);
175175
subscriptions.add(subscription);

‎src/test/java/io/reactivex/rxjava3/disposables/SerialDisposableTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public void settingUnderlyingWhenUnsubscribedCausesImmediateUnsubscriptionConcur
129129
final int count = 10;
130130
final CountDownLatch end = new CountDownLatch(count);
131131

132-
final List<Thread> threads = new ArrayList<Thread>();
132+
final List<Thread> threads = new ArrayList<>();
133133
for (int i = 0; i < count; i++) {
134134
final Thread t = new Thread() {
135135
@Override
@@ -164,12 +164,12 @@ public void run() {
164164
public void concurrentSetDisposableShouldNotInterleave()
165165
throws InterruptedException {
166166
final int count = 10;
167-
final List<Disposable> subscriptions = new ArrayList<Disposable>();
167+
final List<Disposable> subscriptions = new ArrayList<>();
168168

169169
final CountDownLatch start = new CountDownLatch(1);
170170
final CountDownLatch end = new CountDownLatch(count);
171171

172-
final List<Thread> threads = new ArrayList<Thread>();
172+
final List<Thread> threads = new ArrayList<>();
173173
for (int i = 0; i < count; i++) {
174174
final Disposable subscription = mock(Disposable.class);
175175
subscriptions.add(subscription);

‎src/test/java/io/reactivex/rxjava3/exceptions/CompositeExceptionTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class CompositeExceptionTest extends RxJavaTest {
3131
private final Throwable ex3 = new Throwable("Ex3", ex2);
3232

3333
private CompositeException getNewCompositeExceptionWithEx123() {
34-
List<Throwable> throwables = new ArrayList<Throwable>();
34+
List<Throwable> throwables = new ArrayList<>();
3535
throwables.add(ex1);
3636
throwables.add(ex2);
3737
throwables.add(ex3);
@@ -65,7 +65,7 @@ public void emptyErrors() {
6565
assertEquals("errors is empty", e.getMessage());
6666
}
6767
try {
68-
new CompositeException(new ArrayList<Throwable>());
68+
new CompositeException(new ArrayList<>());
6969
fail("CompositeException should fail if errors is empty");
7070
} catch (IllegalArgumentException e) {
7171
assertEquals("errors is empty", e.getMessage());
@@ -134,7 +134,7 @@ public void compositeExceptionFromCompositeAndChild() {
134134

135135
@Test
136136
public void compositeExceptionFromTwoDuplicateComposites() {
137-
List<Throwable> exs = new ArrayList<Throwable>();
137+
List<Throwable> exs = new ArrayList<>();
138138
exs.add(getNewCompositeExceptionWithEx123());
139139
exs.add(getNewCompositeExceptionWithEx123());
140140
CompositeException cex = new CompositeException(exs);

‎src/test/java/io/reactivex/rxjava3/flowable/Burst.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ public static <T> Builder<T> item(T item) {
5858

5959
@SafeVarargs
6060
public static <T> Builder<T> items(T... items) {
61-
return new Builder<T>(Arrays.asList(items));
61+
return new Builder<>(Arrays.asList(items));
6262
}
6363

6464
final class BurstSubscription implements Subscription {
6565
private final Subscriber<? super T> subscriber;
66-
final Queue<T> q = new ConcurrentLinkedQueue<T>(items);
66+
final Queue<T> q = new ConcurrentLinkedQueue<>(items);
6767
final AtomicLong requested = new AtomicLong();
6868
volatile boolean cancelled;
6969

@@ -121,7 +121,7 @@ public Flowable<T> error(Throwable e) {
121121
}
122122

123123
public Flowable<T> create() {
124-
return new Burst<T>(error, items);
124+
return new Burst<>(error, items);
125125
}
126126

127127
}

‎src/test/java/io/reactivex/rxjava3/flowable/FlowableBackpressureTests.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public void doAfterTest() {
8282
public void observeOn() {
8383
int num = (int) (Flowable.bufferSize() * 2.1);
8484
AtomicInteger c = new AtomicInteger();
85-
TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
85+
TestSubscriber<Integer> ts = new TestSubscriber<>();
8686
incrementingIntegers(c).observeOn(Schedulers.computation()).take(num).subscribe(ts);
8787
ts.awaitDone(5, TimeUnit.SECONDS);
8888
ts.assertNoErrors();
@@ -95,7 +95,7 @@ public void observeOn() {
9595
public void observeOnWithSlowConsumer() {
9696
int num = (int) (Flowable.bufferSize() * 0.2);
9797
AtomicInteger c = new AtomicInteger();
98-
TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
98+
TestSubscriber<Integer> ts = new TestSubscriber<>();
9999
incrementingIntegers(c).observeOn(Schedulers.computation()).map(
100100
new Function<Integer, Integer>() {
101101
@Override
@@ -121,7 +121,7 @@ public void mergeSync() {
121121
int num = (int) (Flowable.bufferSize() * 4.1);
122122
AtomicInteger c1 = new AtomicInteger();
123123
AtomicInteger c2 = new AtomicInteger();
124-
TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
124+
TestSubscriber<Integer> ts = new TestSubscriber<>();
125125
Flowable<Integer> merged = Flowable.merge(incrementingIntegers(c1), incrementingIntegers(c2));
126126

127127
merged.take(num).subscribe(ts);
@@ -142,7 +142,7 @@ public void mergeAsync() {
142142
int num = (int) (Flowable.bufferSize() * 4.1);
143143
AtomicInteger c1 = new AtomicInteger();
144144
AtomicInteger c2 = new AtomicInteger();
145-
TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
145+
TestSubscriber<Integer> ts = new TestSubscriber<>();
146146
Flowable<Integer> merged = Flowable.merge(
147147
incrementingIntegers(c1).subscribeOn(Schedulers.computation()),
148148
incrementingIntegers(c2).subscribeOn(Schedulers.computation()));
@@ -171,7 +171,7 @@ public void mergeAsyncThenObserveOnLoop() {
171171
AtomicInteger c1 = new AtomicInteger();
172172
AtomicInteger c2 = new AtomicInteger();
173173

174-
TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
174+
TestSubscriber<Integer> ts = new TestSubscriber<>();
175175
Flowable<Integer> merged = Flowable.merge(
176176
incrementingIntegers(c1).subscribeOn(Schedulers.computation()),
177177
incrementingIntegers(c2).subscribeOn(Schedulers.computation()));
@@ -194,7 +194,7 @@ public void mergeAsyncThenObserveOn() {
194194
int num = (int) (Flowable.bufferSize() * 4.1);
195195
AtomicInteger c1 = new AtomicInteger();
196196
AtomicInteger c2 = new AtomicInteger();
197-
TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
197+
TestSubscriber<Integer> ts = new TestSubscriber<>();
198198
Flowable<Integer> merged = Flowable.merge(
199199
incrementingIntegers(c1).subscribeOn(Schedulers.computation()),
200200
incrementingIntegers(c2).subscribeOn(Schedulers.computation()));
@@ -216,7 +216,7 @@ public void mergeAsyncThenObserveOn() {
216216
public void flatMapSync() {
217217
int num = (int) (Flowable.bufferSize() * 2.1);
218218
AtomicInteger c = new AtomicInteger();
219-
TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
219+
TestSubscriber<Integer> ts = new TestSubscriber<>();
220220

221221
incrementingIntegers(c)
222222
.flatMap(new Function<Integer, Publisher<Integer>>() {
@@ -240,7 +240,7 @@ public void zipSync() {
240240
int num = (int) (Flowable.bufferSize() * 4.1);
241241
AtomicInteger c1 = new AtomicInteger();
242242
AtomicInteger c2 = new AtomicInteger();
243-
TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
243+
TestSubscriber<Integer> ts = new TestSubscriber<>();
244244

245245
Flowable<Integer> zipped = Flowable.zip(
246246
incrementingIntegers(c1),
@@ -268,7 +268,7 @@ public void zipAsync() {
268268
int num = (int) (Flowable.bufferSize() * 2.1);
269269
AtomicInteger c1 = new AtomicInteger();
270270
AtomicInteger c2 = new AtomicInteger();
271-
TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
271+
TestSubscriber<Integer> ts = new TestSubscriber<>();
272272
Flowable<Integer> zipped = Flowable.zip(
273273
incrementingIntegers(c1).subscribeOn(Schedulers.computation()),
274274
incrementingIntegers(c2).subscribeOn(Schedulers.computation()),
@@ -295,8 +295,8 @@ public void subscribeOnScheduling() {
295295
for (int i = 0; i < 100; i++) {
296296
int num = (int) (Flowable.bufferSize() * 2.1);
297297
AtomicInteger c = new AtomicInteger();
298-
ConcurrentLinkedQueue<Thread> threads = new ConcurrentLinkedQueue<Thread>();
299-
TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
298+
ConcurrentLinkedQueue<Thread> threads = new ConcurrentLinkedQueue<>();
299+
TestSubscriber<Integer> ts = new TestSubscriber<>();
300300
// observeOn is there to make it async and need backpressure
301301
incrementingIntegers(c, threads).subscribeOn(Schedulers.computation()).observeOn(Schedulers.computation()).take(num).subscribe(ts);
302302
ts.awaitDone(5, TimeUnit.SECONDS);
@@ -325,7 +325,7 @@ public void subscribeOnScheduling() {
325325
public void takeFilterSkipChainAsync() {
326326
int num = (int) (Flowable.bufferSize() * 2.1);
327327
AtomicInteger c = new AtomicInteger();
328-
TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
328+
TestSubscriber<Integer> ts = new TestSubscriber<>();
329329
incrementingIntegers(c).observeOn(Schedulers.computation())
330330
.skip(10000)
331331
.filter(new Predicate<Integer>() {
@@ -452,7 +452,7 @@ public void onNext(Integer t) {
452452
@Test
453453
public void firehoseFailsAsExpected() {
454454
AtomicInteger c = new AtomicInteger();
455-
TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
455+
TestSubscriber<Integer> ts = new TestSubscriber<>();
456456

457457
firehose(c).observeOn(Schedulers.computation())
458458
.map(new Function<Integer, Integer>() {
@@ -496,7 +496,7 @@ public void onBackpressureDrop() {
496496
}
497497
int num = (int) (Flowable.bufferSize() * 1.1); // > 1 so that take doesn't prevent buffer overflow
498498
AtomicInteger c = new AtomicInteger();
499-
TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
499+
TestSubscriber<Integer> ts = new TestSubscriber<>();
500500
firehose(c).onBackpressureDrop()
501501
.observeOn(Schedulers.computation())
502502
.map(SLOW_PASS_THRU).take(num).subscribe(ts);
@@ -521,7 +521,7 @@ public void onBackpressureDropWithAction() {
521521
final AtomicInteger dropCount = new AtomicInteger();
522522
final AtomicInteger passCount = new AtomicInteger();
523523
final int num = Flowable.bufferSize() * 3; // > 1 so that take doesn't prevent buffer overflow
524-
TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
524+
TestSubscriber<Integer> ts = new TestSubscriber<>();
525525

526526
firehose(emitCount)
527527
.onBackpressureDrop(new Consumer<Integer>() {
@@ -561,7 +561,7 @@ public void onBackpressureDropSynchronous() {
561561
for (int i = 0; i < 100; i++) {
562562
int num = (int) (Flowable.bufferSize() * 1.1); // > 1 so that take doesn't prevent buffer overflow
563563
AtomicInteger c = new AtomicInteger();
564-
TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
564+
TestSubscriber<Integer> ts = new TestSubscriber<>();
565565
firehose(c).onBackpressureDrop()
566566
.map(SLOW_PASS_THRU).take(num).subscribe(ts);
567567
ts.awaitDone(5, TimeUnit.SECONDS);
@@ -584,7 +584,7 @@ public void onBackpressureDropSynchronousWithAction() {
584584
final AtomicInteger dropCount = new AtomicInteger();
585585
int num = (int) (Flowable.bufferSize() * 1.1); // > 1 so that take doesn't prevent buffer overflow
586586
AtomicInteger c = new AtomicInteger();
587-
TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
587+
TestSubscriber<Integer> ts = new TestSubscriber<>();
588588
firehose(c).onBackpressureDrop(new Consumer<Integer>() {
589589
@Override
590590
public void accept(Integer j) {
@@ -613,7 +613,7 @@ public void accept(Integer j) {
613613
public void onBackpressureBuffer() {
614614
int num = (int) (Flowable.bufferSize() * 1.1); // > 1 so that take doesn't prevent buffer overflow
615615
AtomicInteger c = new AtomicInteger();
616-
TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
616+
TestSubscriber<Integer> ts = new TestSubscriber<>();
617617

618618
firehose(c).takeWhile(new Predicate<Integer>() {
619619
@Override

0 commit comments

Comments
 (0)