Skip to content

Commit 75da4b5

Browse files
dvolkovvakarnokd
dvolkovv
authored and
akarnokd
committed
Diamond operators in tests (#6788)
* diamond operators in unit tests, small packages in internal/ * diamond operators in unit tests, small packages in internal/operators
1 parent d6d6982 commit 75da4b5

File tree

92 files changed

+484
-484
lines changed

Some content is hidden

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

92 files changed

+484
-484
lines changed

Diff for: ‎src/test/java/io/reactivex/rxjava3/internal/SubscribeWithTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ public class SubscribeWithTest extends RxJavaTest {
2727
@Test
2828
public void withFlowable() {
2929
Flowable.range(1, 10)
30-
.subscribeWith(new TestSubscriber<Integer>())
30+
.subscribeWith(new TestSubscriber<>())
3131
.assertResult(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
3232
}
3333

3434
@Test
3535
public void withObservable() {
3636
Observable.range(1, 10)
37-
.subscribeWith(new TestObserver<Integer>())
37+
.subscribeWith(new TestObserver<>())
3838
.assertResult(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
3939
}
4040

Diff for: ‎src/test/java/io/reactivex/rxjava3/internal/disposables/DisposableHelperTest.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public void validationNull() {
5454
@Test
5555
public void disposeRace() {
5656
for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
57-
final AtomicReference<Disposable> d = new AtomicReference<Disposable>();
57+
final AtomicReference<Disposable> d = new AtomicReference<>();
5858

5959
Runnable r = new Runnable() {
6060
@Override
@@ -70,7 +70,7 @@ public void run() {
7070
@Test
7171
public void setReplace() {
7272
for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
73-
final AtomicReference<Disposable> d = new AtomicReference<Disposable>();
73+
final AtomicReference<Disposable> d = new AtomicReference<>();
7474

7575
Runnable r = new Runnable() {
7676
@Override
@@ -86,7 +86,7 @@ public void run() {
8686
@Test
8787
public void setRace() {
8888
for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
89-
final AtomicReference<Disposable> d = new AtomicReference<Disposable>();
89+
final AtomicReference<Disposable> d = new AtomicReference<>();
9090

9191
Runnable r = new Runnable() {
9292
@Override
@@ -101,7 +101,7 @@ public void run() {
101101

102102
@Test
103103
public void setReplaceNull() {
104-
final AtomicReference<Disposable> d = new AtomicReference<Disposable>();
104+
final AtomicReference<Disposable> d = new AtomicReference<>();
105105

106106
DisposableHelper.dispose(d);
107107

@@ -112,7 +112,7 @@ public void setReplaceNull() {
112112
@Test
113113
public void dispose() {
114114
Disposable u = Disposable.empty();
115-
final AtomicReference<Disposable> d = new AtomicReference<Disposable>(u);
115+
final AtomicReference<Disposable> d = new AtomicReference<>(u);
116116

117117
DisposableHelper.dispose(d);
118118

@@ -121,7 +121,7 @@ public void dispose() {
121121

122122
@Test
123123
public void trySet() {
124-
AtomicReference<Disposable> ref = new AtomicReference<Disposable>();
124+
AtomicReference<Disposable> ref = new AtomicReference<>();
125125

126126
Disposable d1 = Disposable.empty();
127127

Diff for: ‎src/test/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserverTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class BasicFuseableObserverTest extends RxJavaTest {
2525

2626
@Test(expected = UnsupportedOperationException.class)
2727
public void offer() {
28-
TestObserverEx<Integer> to = new TestObserverEx<Integer>();
28+
TestObserverEx<Integer> to = new TestObserverEx<>();
2929
BasicFuseableObserver<Integer, Integer> o = new BasicFuseableObserver<Integer, Integer>(to) {
3030
@Nullable
3131
@Override
@@ -57,7 +57,7 @@ protected boolean beforeDownstream() {
5757

5858
@Test(expected = UnsupportedOperationException.class)
5959
public void offer2() {
60-
BasicFuseableObserver<Integer, Integer> o = new BasicFuseableObserver<Integer, Integer>(new TestObserver<Integer>()) {
60+
BasicFuseableObserver<Integer, Integer> o = new BasicFuseableObserver<Integer, Integer>(new TestObserver<>()) {
6161
@Nullable
6262
@Override
6363
public Integer poll() throws Exception {

Diff for: ‎src/test/java/io/reactivex/rxjava3/internal/observers/BlockingFirstObserverTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class BlockingFirstObserverTest extends RxJavaTest {
2525

2626
@Test
2727
public void firstValueOnly() {
28-
BlockingFirstObserver<Integer> bf = new BlockingFirstObserver<Integer>();
28+
BlockingFirstObserver<Integer> bf = new BlockingFirstObserver<>();
2929
Disposable d = Disposable.empty();
3030
bf.onSubscribe(d);
3131

Diff for: ‎src/test/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserverTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class BlockingMultiObserverTest extends RxJavaTest {
2727

2828
@Test
2929
public void dispose() {
30-
BlockingMultiObserver<Integer> bmo = new BlockingMultiObserver<Integer>();
30+
BlockingMultiObserver<Integer> bmo = new BlockingMultiObserver<>();
3131
bmo.dispose();
3232

3333
Disposable d = Disposable.empty();
@@ -37,7 +37,7 @@ public void dispose() {
3737

3838
@Test
3939
public void blockingGetDefault() {
40-
final BlockingMultiObserver<Integer> bmo = new BlockingMultiObserver<Integer>();
40+
final BlockingMultiObserver<Integer> bmo = new BlockingMultiObserver<>();
4141

4242
Schedulers.single().scheduleDirect(new Runnable() {
4343
@Override
@@ -51,7 +51,7 @@ public void run() {
5151

5252
@Test
5353
public void blockingAwait() {
54-
final BlockingMultiObserver<Integer> bmo = new BlockingMultiObserver<Integer>();
54+
final BlockingMultiObserver<Integer> bmo = new BlockingMultiObserver<>();
5555

5656
Schedulers.single().scheduleDirect(new Runnable() {
5757
@Override
@@ -65,7 +65,7 @@ public void run() {
6565

6666
@Test
6767
public void blockingGetDefaultInterrupt() {
68-
final BlockingMultiObserver<Integer> bmo = new BlockingMultiObserver<Integer>();
68+
final BlockingMultiObserver<Integer> bmo = new BlockingMultiObserver<>();
6969

7070
Thread.currentThread().interrupt();
7171
try {

Diff for: ‎src/test/java/io/reactivex/rxjava3/internal/observers/BlockingObserverTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ public class BlockingObserverTest extends RxJavaTest {
2525

2626
@Test
2727
public void dispose() {
28-
Queue<Object> q = new ArrayDeque<Object>();
28+
Queue<Object> q = new ArrayDeque<>();
2929

30-
BlockingObserver<Object> bo = new BlockingObserver<Object>(q);
30+
BlockingObserver<Object> bo = new BlockingObserver<>(q);
3131

3232
bo.dispose();
3333

Diff for: ‎src/test/java/io/reactivex/rxjava3/internal/observers/ConsumerSingleObserverTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ public final class ConsumerSingleObserverTest extends RxJavaTest {
2424

2525
@Test
2626
public void onErrorMissingShouldReportNoCustomOnError() {
27-
ConsumerSingleObserver<Integer> o = new ConsumerSingleObserver<Integer>(Functions.<Integer>emptyConsumer(),
27+
ConsumerSingleObserver<Integer> o = new ConsumerSingleObserver<>(Functions.<Integer>emptyConsumer(),
2828
Functions.ON_ERROR_MISSING);
2929

3030
assertFalse(o.hasCustomOnError());
3131
}
3232

3333
@Test
3434
public void customOnErrorShouldReportCustomOnError() {
35-
ConsumerSingleObserver<Integer> o = new ConsumerSingleObserver<Integer>(Functions.<Integer>emptyConsumer(),
35+
ConsumerSingleObserver<Integer> o = new ConsumerSingleObserver<>(Functions.<Integer>emptyConsumer(),
3636
Functions.<Throwable>emptyConsumer());
3737

3838
assertTrue(o.hasCustomOnError());

Diff for: ‎src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserverTest.java

+18-18
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void onNext(Integer value) {
5050
public void normal() {
5151
List<Throwable> errors = TestHelper.trackPluginErrors();
5252
try {
53-
TestObserver<Integer> to = new TestObserver<Integer>();
53+
TestObserver<Integer> to = new TestObserver<>();
5454

5555
TakeFirst source = new TakeFirst(to);
5656

@@ -73,7 +73,7 @@ public void normal() {
7373

7474
@Test
7575
public void error() {
76-
TestObserver<Integer> to = new TestObserver<Integer>();
76+
TestObserver<Integer> to = new TestObserver<>();
7777

7878
TakeFirst source = new TakeFirst(to);
7979

@@ -85,7 +85,7 @@ public void error() {
8585

8686
@Test
8787
public void complete() {
88-
TestObserver<Integer> to = new TestObserver<Integer>();
88+
TestObserver<Integer> to = new TestObserver<>();
8989

9090
TakeFirst source = new TakeFirst(to);
9191

@@ -97,7 +97,7 @@ public void complete() {
9797

9898
@Test
9999
public void dispose() {
100-
TestObserver<Integer> to = new TestObserver<Integer>();
100+
TestObserver<Integer> to = new TestObserver<>();
101101

102102
TakeFirst source = new TakeFirst(to);
103103

@@ -118,7 +118,7 @@ public void dispose() {
118118
public void fused() {
119119
List<Throwable> errors = TestHelper.trackPluginErrors();
120120
try {
121-
TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
121+
TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
122122

123123
TakeFirst source = new TakeFirst(to);
124124

@@ -148,7 +148,7 @@ public void fused() {
148148
public void fusedReject() {
149149
List<Throwable> errors = TestHelper.trackPluginErrors();
150150
try {
151-
TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.SYNC);
151+
TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.SYNC);
152152

153153
TakeFirst source = new TakeFirst(to);
154154

@@ -193,7 +193,7 @@ public void onNext(Integer value) {
193193
public void nonfusedTerminateMore() {
194194
List<Throwable> errors = TestHelper.trackPluginErrors();
195195
try {
196-
TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.NONE);
196+
TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.NONE);
197197

198198
TakeLast source = new TakeLast(to);
199199

@@ -218,7 +218,7 @@ public void nonfusedTerminateMore() {
218218
public void nonfusedError() {
219219
List<Throwable> errors = TestHelper.trackPluginErrors();
220220
try {
221-
TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.NONE);
221+
TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.NONE);
222222

223223
TakeLast source = new TakeLast(to);
224224

@@ -243,7 +243,7 @@ public void nonfusedError() {
243243
public void fusedTerminateMore() {
244244
List<Throwable> errors = TestHelper.trackPluginErrors();
245245
try {
246-
TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
246+
TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
247247

248248
TakeLast source = new TakeLast(to);
249249

@@ -268,7 +268,7 @@ public void fusedTerminateMore() {
268268
public void fusedError() {
269269
List<Throwable> errors = TestHelper.trackPluginErrors();
270270
try {
271-
TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
271+
TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
272272

273273
TakeLast source = new TakeLast(to);
274274

@@ -291,7 +291,7 @@ public void fusedError() {
291291

292292
@Test
293293
public void disposed() {
294-
TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.NONE);
294+
TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.NONE);
295295

296296
TakeLast source = new TakeLast(to);
297297

@@ -309,7 +309,7 @@ public void disposed() {
309309

310310
@Test
311311
public void disposedAfterOnNext() {
312-
final TestObserver<Integer> to = new TestObserver<Integer>();
312+
final TestObserver<Integer> to = new TestObserver<>();
313313

314314
TakeLast source = new TakeLast(new Observer<Integer>() {
315315
Disposable upstream;
@@ -346,7 +346,7 @@ public void onComplete() {
346346

347347
@Test
348348
public void fusedEmpty() {
349-
TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
349+
TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
350350

351351
TakeLast source = new TakeLast(to);
352352

@@ -361,7 +361,7 @@ public void fusedEmpty() {
361361

362362
@Test
363363
public void nonfusedEmpty() {
364-
TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.NONE);
364+
TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.NONE);
365365

366366
TakeLast source = new TakeLast(to);
367367

@@ -376,7 +376,7 @@ public void nonfusedEmpty() {
376376

377377
@Test
378378
public void customFusion() {
379-
final TestObserver<Integer> to = new TestObserver<Integer>();
379+
final TestObserver<Integer> to = new TestObserver<>();
380380

381381
TakeLast source = new TakeLast(new Observer<Integer>() {
382382
QueueDisposable<Integer> d;
@@ -426,7 +426,7 @@ public void onComplete() {
426426

427427
@Test
428428
public void customFusionClear() {
429-
final TestObserver<Integer> to = new TestObserver<Integer>();
429+
final TestObserver<Integer> to = new TestObserver<>();
430430

431431
TakeLast source = new TakeLast(new Observer<Integer>() {
432432
QueueDisposable<Integer> d;
@@ -465,7 +465,7 @@ public void onComplete() {
465465

466466
@Test
467467
public void offerThrow() {
468-
TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.NONE);
468+
TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.NONE);
469469

470470
TakeLast source = new TakeLast(to);
471471

@@ -474,7 +474,7 @@ public void offerThrow() {
474474

475475
@Test
476476
public void customFusionDontConsume() {
477-
final TestObserver<Integer> to = new TestObserver<Integer>();
477+
final TestObserver<Integer> to = new TestObserver<>();
478478

479479
TakeFirst source = new TakeFirst(new Observer<Integer>() {
480480
QueueDisposable<Integer> d;

Diff for: ‎src/test/java/io/reactivex/rxjava3/internal/observers/DisposableLambdaObserverTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@ public class DisposableLambdaObserverTest extends RxJavaTest {
3232

3333
@Test
3434
public void doubleOnSubscribe() {
35-
TestHelper.doubleOnSubscribe(new DisposableLambdaObserver<Integer>(
36-
new TestObserver<Integer>(), Functions.emptyConsumer(), Functions.EMPTY_ACTION
35+
TestHelper.doubleOnSubscribe(new DisposableLambdaObserver<>(
36+
new TestObserver<>(), Functions.emptyConsumer(), Functions.EMPTY_ACTION
3737
));
3838
}
3939

4040
@Test
4141
public void disposeCrash() {
4242
List<Throwable> errors = TestHelper.trackPluginErrors();
4343
try {
44-
DisposableLambdaObserver<Integer> o = new DisposableLambdaObserver<Integer>(
45-
new TestObserver<Integer>(), Functions.emptyConsumer(),
44+
DisposableLambdaObserver<Integer> o = new DisposableLambdaObserver<>(
45+
new TestObserver<>(), Functions.emptyConsumer(),
4646
new Action() {
4747
@Override
4848
public void run() throws Exception {

Diff for: ‎src/test/java/io/reactivex/rxjava3/internal/observers/FutureObserverTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class FutureObserverTest extends RxJavaTest {
3636

3737
@Before
3838
public void before() {
39-
fo = new FutureObserver<Integer>();
39+
fo = new FutureObserver<>();
4040
}
4141

4242
@Test
@@ -157,7 +157,7 @@ public void onSubscribe() throws Exception {
157157
@Test
158158
public void cancelRace() {
159159
for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
160-
final FutureSubscriber<Integer> fo = new FutureSubscriber<Integer>();
160+
final FutureSubscriber<Integer> fo = new FutureSubscriber<>();
161161

162162
Runnable r = new Runnable() {
163163
@Override
@@ -188,7 +188,7 @@ public void onErrorCancelRace() {
188188
RxJavaPlugins.setErrorHandler(Functions.emptyConsumer());
189189
try {
190190
for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
191-
final FutureSubscriber<Integer> fo = new FutureSubscriber<Integer>();
191+
final FutureSubscriber<Integer> fo = new FutureSubscriber<>();
192192

193193
final TestException ex = new TestException();
194194

@@ -218,7 +218,7 @@ public void onCompleteCancelRace() {
218218
RxJavaPlugins.setErrorHandler(Functions.emptyConsumer());
219219
try {
220220
for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
221-
final FutureSubscriber<Integer> fo = new FutureSubscriber<Integer>();
221+
final FutureSubscriber<Integer> fo = new FutureSubscriber<>();
222222

223223
if (i % 3 == 0) {
224224
fo.onSubscribe(new BooleanSubscription());

0 commit comments

Comments
 (0)