Skip to content

Commit 54e9862

Browse files
committed
Fix mistakes in observers package info, fix generics
1 parent 1b0cd2a commit 54e9862

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

src/main/java/io/reactivex/observers/package-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
/**
1818
* Default wrappers and implementations for Observer-based consumer classes and interfaces,
1919
* including disposable and resource-tracking variants and
20-
* the {@link io.reactivex.subscribers.TestObserver} that allows unit testing
20+
* the {@link io.reactivex.observers.TestObserver} that allows unit testing
2121
* {@link io.reactivex.Observable}-, {@link io.reactivex.Single}-, {@link io.reactivex.Maybe}-
2222
* and {@link io.reactivex.Completable}-based flows.
2323
*/

src/test/java/io/reactivex/internal/operators/observable/ObservableConcatMapCompletableTest.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class ObservableConcatMapCompletableTest {
3434
public void asyncFused() throws Exception {
3535
UnicastSubject<Integer> us = UnicastSubject.create();
3636

37-
TestObserver to = us.concatMapCompletable(completableComplete(), 2).test();
37+
TestObserver<Void> to = us.concatMapCompletable(completableComplete(), 2).test();
3838

3939
us.onNext(1);
4040
us.onComplete();
@@ -46,7 +46,7 @@ public void asyncFused() throws Exception {
4646
@Test
4747
public void notFused() throws Exception {
4848
UnicastSubject<Integer> us = UnicastSubject.create();
49-
TestObserver to = us.hide().concatMapCompletable(completableComplete(), 2).test();
49+
TestObserver<Void> to = us.hide().concatMapCompletable(completableComplete(), 2).test();
5050

5151
us.onNext(1);
5252
us.onNext(2);
@@ -113,7 +113,7 @@ public void onErrorRace() {
113113
final PublishSubject<Integer> ps1 = PublishSubject.create();
114114
final PublishSubject<Integer> ps2 = PublishSubject.create();
115115

116-
TestObserver to = ps1.concatMapCompletable(new Function<Integer, CompletableSource>() {
116+
TestObserver<Void> to = ps1.concatMapCompletable(new Function<Integer, CompletableSource>() {
117117
@Override
118118
public CompletableSource apply(Integer v) throws Exception {
119119
return Completable.fromObservable(ps2);
@@ -172,7 +172,6 @@ public Integer apply(Integer v) throws Exception {
172172
.assertFailure(TestException.class);
173173
}
174174

175-
@SuppressWarnings("unchecked")
176175
@Test
177176
public void concatReportsDisposedOnComplete() {
178177
final Disposable[] disposable = { null };
@@ -199,7 +198,6 @@ public void onComplete() {
199198
assertTrue(disposable[0].isDisposed());
200199
}
201200

202-
@SuppressWarnings("unchecked")
203201
@Test
204202
public void concatReportsDisposedOnError() {
205203
final Disposable[] disposable = { null };

0 commit comments

Comments
 (0)