Skip to content

Diamond operators in tests #6788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 22, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -27,14 +27,14 @@ public class SubscribeWithTest extends RxJavaTest {
@Test
public void withFlowable() {
Flowable.range(1, 10)
.subscribeWith(new TestSubscriber<Integer>())
.subscribeWith(new TestSubscriber<>())
.assertResult(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
}

@Test
public void withObservable() {
Observable.range(1, 10)
.subscribeWith(new TestObserver<Integer>())
.subscribeWith(new TestObserver<>())
.assertResult(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
}

Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ public void validationNull() {
@Test
public void disposeRace() {
for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
final AtomicReference<Disposable> d = new AtomicReference<Disposable>();
final AtomicReference<Disposable> d = new AtomicReference<>();

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

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

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

@Test
public void setReplaceNull() {
final AtomicReference<Disposable> d = new AtomicReference<Disposable>();
final AtomicReference<Disposable> d = new AtomicReference<>();

DisposableHelper.dispose(d);

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

DisposableHelper.dispose(d);

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

@Test
public void trySet() {
AtomicReference<Disposable> ref = new AtomicReference<Disposable>();
AtomicReference<Disposable> ref = new AtomicReference<>();

Disposable d1 = Disposable.empty();

Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ public class BasicFuseableObserverTest extends RxJavaTest {

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

@Test(expected = UnsupportedOperationException.class)
public void offer2() {
BasicFuseableObserver<Integer, Integer> o = new BasicFuseableObserver<Integer, Integer>(new TestObserver<Integer>()) {
BasicFuseableObserver<Integer, Integer> o = new BasicFuseableObserver<Integer, Integer>(new TestObserver<>()) {
@Nullable
@Override
public Integer poll() throws Exception {
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ public class BlockingFirstObserverTest extends RxJavaTest {

@Test
public void firstValueOnly() {
BlockingFirstObserver<Integer> bf = new BlockingFirstObserver<Integer>();
BlockingFirstObserver<Integer> bf = new BlockingFirstObserver<>();
Disposable d = Disposable.empty();
bf.onSubscribe(d);

Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ public class BlockingMultiObserverTest extends RxJavaTest {

@Test
public void dispose() {
BlockingMultiObserver<Integer> bmo = new BlockingMultiObserver<Integer>();
BlockingMultiObserver<Integer> bmo = new BlockingMultiObserver<>();
bmo.dispose();

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

@Test
public void blockingGetDefault() {
final BlockingMultiObserver<Integer> bmo = new BlockingMultiObserver<Integer>();
final BlockingMultiObserver<Integer> bmo = new BlockingMultiObserver<>();

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

@Test
public void blockingAwait() {
final BlockingMultiObserver<Integer> bmo = new BlockingMultiObserver<Integer>();
final BlockingMultiObserver<Integer> bmo = new BlockingMultiObserver<>();

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

@Test
public void blockingGetDefaultInterrupt() {
final BlockingMultiObserver<Integer> bmo = new BlockingMultiObserver<Integer>();
final BlockingMultiObserver<Integer> bmo = new BlockingMultiObserver<>();

Thread.currentThread().interrupt();
try {
Original file line number Diff line number Diff line change
@@ -25,9 +25,9 @@ public class BlockingObserverTest extends RxJavaTest {

@Test
public void dispose() {
Queue<Object> q = new ArrayDeque<Object>();
Queue<Object> q = new ArrayDeque<>();

BlockingObserver<Object> bo = new BlockingObserver<Object>(q);
BlockingObserver<Object> bo = new BlockingObserver<>(q);

bo.dispose();

Original file line number Diff line number Diff line change
@@ -24,15 +24,15 @@ public final class ConsumerSingleObserverTest extends RxJavaTest {

@Test
public void onErrorMissingShouldReportNoCustomOnError() {
ConsumerSingleObserver<Integer> o = new ConsumerSingleObserver<Integer>(Functions.<Integer>emptyConsumer(),
ConsumerSingleObserver<Integer> o = new ConsumerSingleObserver<>(Functions.<Integer>emptyConsumer(),
Functions.ON_ERROR_MISSING);

assertFalse(o.hasCustomOnError());
}

@Test
public void customOnErrorShouldReportCustomOnError() {
ConsumerSingleObserver<Integer> o = new ConsumerSingleObserver<Integer>(Functions.<Integer>emptyConsumer(),
ConsumerSingleObserver<Integer> o = new ConsumerSingleObserver<>(Functions.<Integer>emptyConsumer(),
Functions.<Throwable>emptyConsumer());

assertTrue(o.hasCustomOnError());
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ public void onNext(Integer value) {
public void normal() {
List<Throwable> errors = TestHelper.trackPluginErrors();
try {
TestObserver<Integer> to = new TestObserver<Integer>();
TestObserver<Integer> to = new TestObserver<>();

TakeFirst source = new TakeFirst(to);

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

@Test
public void error() {
TestObserver<Integer> to = new TestObserver<Integer>();
TestObserver<Integer> to = new TestObserver<>();

TakeFirst source = new TakeFirst(to);

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

@Test
public void complete() {
TestObserver<Integer> to = new TestObserver<Integer>();
TestObserver<Integer> to = new TestObserver<>();

TakeFirst source = new TakeFirst(to);

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

@Test
public void dispose() {
TestObserver<Integer> to = new TestObserver<Integer>();
TestObserver<Integer> to = new TestObserver<>();

TakeFirst source = new TakeFirst(to);

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

TakeFirst source = new TakeFirst(to);

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

TakeFirst source = new TakeFirst(to);

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

TakeLast source = new TakeLast(to);

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

TakeLast source = new TakeLast(to);

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

TakeLast source = new TakeLast(to);

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

TakeLast source = new TakeLast(to);

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

@Test
public void disposed() {
TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.NONE);
TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.NONE);

TakeLast source = new TakeLast(to);

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

@Test
public void disposedAfterOnNext() {
final TestObserver<Integer> to = new TestObserver<Integer>();
final TestObserver<Integer> to = new TestObserver<>();

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

@Test
public void fusedEmpty() {
TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);

TakeLast source = new TakeLast(to);

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

@Test
public void nonfusedEmpty() {
TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.NONE);
TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.NONE);

TakeLast source = new TakeLast(to);

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

@Test
public void customFusion() {
final TestObserver<Integer> to = new TestObserver<Integer>();
final TestObserver<Integer> to = new TestObserver<>();

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

@Test
public void customFusionClear() {
final TestObserver<Integer> to = new TestObserver<Integer>();
final TestObserver<Integer> to = new TestObserver<>();

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

@Test
public void offerThrow() {
TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.NONE);
TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.NONE);

TakeLast source = new TakeLast(to);

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

@Test
public void customFusionDontConsume() {
final TestObserver<Integer> to = new TestObserver<Integer>();
final TestObserver<Integer> to = new TestObserver<>();

TakeFirst source = new TakeFirst(new Observer<Integer>() {
QueueDisposable<Integer> d;
Original file line number Diff line number Diff line change
@@ -32,17 +32,17 @@ public class DisposableLambdaObserverTest extends RxJavaTest {

@Test
public void doubleOnSubscribe() {
TestHelper.doubleOnSubscribe(new DisposableLambdaObserver<Integer>(
new TestObserver<Integer>(), Functions.emptyConsumer(), Functions.EMPTY_ACTION
TestHelper.doubleOnSubscribe(new DisposableLambdaObserver<>(
new TestObserver<>(), Functions.emptyConsumer(), Functions.EMPTY_ACTION
));
}

@Test
public void disposeCrash() {
List<Throwable> errors = TestHelper.trackPluginErrors();
try {
DisposableLambdaObserver<Integer> o = new DisposableLambdaObserver<Integer>(
new TestObserver<Integer>(), Functions.emptyConsumer(),
DisposableLambdaObserver<Integer> o = new DisposableLambdaObserver<>(
new TestObserver<>(), Functions.emptyConsumer(),
new Action() {
@Override
public void run() throws Exception {
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ public class FutureObserverTest extends RxJavaTest {

@Before
public void before() {
fo = new FutureObserver<Integer>();
fo = new FutureObserver<>();
}

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

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

final TestException ex = new TestException();

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

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