Skip to content

Commit bb60e9a

Browse files
authored
2.x: improve coverage of some classes (no functional changes) (#5310)
1 parent 30a206d commit bb60e9a

File tree

9 files changed

+479
-1
lines changed

9 files changed

+479
-1
lines changed

src/test/java/io/reactivex/exceptions/ExceptionsTest.java

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -491,4 +491,26 @@ public void manualPropagate() {
491491
}
492492
}
493493

494+
@Test
495+
public void errorNotImplementedNull1() {
496+
OnErrorNotImplementedException ex = new OnErrorNotImplementedException(null);
497+
498+
assertTrue("" + ex.getCause(), ex.getCause() instanceof NullPointerException);
499+
}
500+
501+
@Test
502+
public void errorNotImplementedNull2() {
503+
OnErrorNotImplementedException ex = new OnErrorNotImplementedException("Message", null);
504+
505+
assertTrue("" + ex.getCause(), ex.getCause() instanceof NullPointerException);
506+
}
507+
508+
@Test
509+
public void errorNotImplementedWithCause() {
510+
OnErrorNotImplementedException ex = new OnErrorNotImplementedException("Message", new TestException("Forced failure"));
511+
512+
assertTrue("" + ex.getCause(), ex.getCause() instanceof TestException);
513+
514+
assertEquals("" + ex.getCause(), "Forced failure", ex.getCause().getMessage());
515+
}
494516
}

src/test/java/io/reactivex/internal/functions/FunctionsTest.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@
1616
import static org.junit.Assert.*;
1717

1818
import java.lang.reflect.Method;
19+
import java.util.List;
1920

2021
import org.junit.Test;
2122

2223
import io.reactivex.TestHelper;
24+
import io.reactivex.exceptions.TestException;
2325
import io.reactivex.functions.*;
2426
import io.reactivex.internal.functions.Functions.*;
2527
import io.reactivex.internal.util.ExceptionHelper;
28+
import io.reactivex.plugins.RxJavaPlugins;
2629

2730
public class FunctionsTest {
2831
@Test
@@ -245,4 +248,16 @@ public void emptyConsumerToString() {
245248
assertEquals("EmptyConsumer", Functions.EMPTY_CONSUMER.toString());
246249
}
247250

251+
@Test
252+
public void errorConsumerEmpty() throws Exception {
253+
List<Throwable> errors = TestHelper.trackPluginErrors();
254+
try {
255+
Functions.ERROR_CONSUMER.accept(new TestException());
256+
257+
TestHelper.assertUndeliverable(errors, 0, TestException.class);
258+
assertEquals(errors.toString(), 1, errors.size());
259+
} finally {
260+
RxJavaPlugins.reset();
261+
}
262+
}
248263
}

src/test/java/io/reactivex/internal/operators/completable/CompletablePeekTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
import io.reactivex.*;
2121
import io.reactivex.exceptions.TestException;
2222
import io.reactivex.functions.Action;
23+
import io.reactivex.internal.functions.Functions;
2324
import io.reactivex.plugins.RxJavaPlugins;
25+
import io.reactivex.subjects.CompletableSubject;
2426

2527
public class CompletablePeekTest {
2628

@@ -43,4 +45,9 @@ public void run() throws Exception {
4345
RxJavaPlugins.reset();
4446
}
4547
}
48+
49+
@Test
50+
public void disposed() {
51+
TestHelper.checkDisposed(CompletableSubject.create().doOnComplete(Functions.EMPTY_ACTION));
52+
}
4653
}

src/test/java/io/reactivex/internal/operators/single/SingleInternalHelperTest.java

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,12 @@
1515

1616
import static org.junit.Assert.*;
1717

18+
import java.util.*;
19+
1820
import org.junit.Test;
1921

20-
import io.reactivex.TestHelper;
22+
import io.reactivex.*;
23+
2124

2225
public class SingleInternalHelperTest {
2326

@@ -43,4 +46,21 @@ public void toObservableEnum() {
4346
assertEquals(1, SingleInternalHelper.ToObservable.values().length);
4447
assertNotNull(SingleInternalHelper.ToObservable.valueOf("INSTANCE"));
4548
}
49+
50+
@Test
51+
public void singleIterableToFlowableIterable() {
52+
Iterable<? extends Flowable<Integer>> it = SingleInternalHelper.iterableToFlowable(
53+
Collections.singletonList(Single.just(1)));
54+
55+
Iterator<? extends Flowable<Integer>> iter = it.iterator();
56+
57+
if (iter.hasNext()) {
58+
iter.next().test().assertResult(1);
59+
if (iter.hasNext()) {
60+
fail("Iterator reports an additional element");
61+
}
62+
} else {
63+
fail("Iterator was empty");
64+
}
65+
}
4666
}

0 commit comments

Comments
 (0)