Skip to content

3.x: Fix Observable amb, combineLatest & zip ArrayStoreException #6756

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 1 commit into from
Dec 11, 2019
Merged
Show file tree
Hide file tree
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
Expand Up @@ -36,7 +36,7 @@ public void subscribeActual(Observer<? super T> observer) {
ObservableSource<? extends T>[] sources = this.sources;
int count = 0;
if (sources == null) {
sources = new Observable[8];
sources = new ObservableSource[8];
try {
for (ObservableSource<? extends T> p : sourcesIterable) {
if (p == null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public void subscribeActual(Observer<? super R> observer) {
ObservableSource<? extends T>[] sources = this.sources;
int count = 0;
if (sources == null) {
sources = new Observable[8];
sources = new ObservableSource[8];
for (ObservableSource<? extends T> p : sourcesIterable) {
if (count == sources.length) {
ObservableSource<? extends T>[] b = new ObservableSource[count + (count >> 2)];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public void subscribeActual(Observer<? super R> observer) {
ObservableSource<? extends T>[] sources = this.sources;
int count = 0;
if (sources == null) {
sources = new Observable[8];
sources = new ObservableSource[8];
for (ObservableSource<? extends T> p : sourcesIterable) {
if (count == sources.length) {
ObservableSource<? extends T>[] b = new ObservableSource[count + (count >> 2)];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -315,4 +315,18 @@ public void run() throws Exception {
assertFalse("Interrupted!", interrupted.get());
}
}

@Test
public void completableSourcesInIterable() {
CompletableSource source = new CompletableSource() {
@Override
public void subscribe(CompletableObserver observer) {
Completable.complete().subscribe(observer);
}
};

Completable.amb(Arrays.asList(source, source))
.test()
.assertResult();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -667,4 +667,19 @@ public void run() throws Exception {
assertFalse("Interrupted!", interrupted.get());
}
}

@SuppressWarnings("unchecked")
@Test
public void publishersInIterable() {
Publisher<Integer> source = new Publisher<Integer>() {
@Override
public void subscribe(Subscriber<? super Integer> subscriber) {
Flowable.just(1).subscribe(subscriber);
}
};

Flowable.amb(Arrays.asList(source, source))
.test()
.assertResult(1);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1551,4 +1551,24 @@ public Object apply(Object[] a) throws Exception {
.awaitDone(5, TimeUnit.SECONDS)
.assertFailure(TestException.class, 42);
}

@SuppressWarnings("unchecked")
@Test
public void publishersInIterable() {
Publisher<Integer> source = new Publisher<Integer>() {
@Override
public void subscribe(Subscriber<? super Integer> subscriber) {
Flowable.just(1).subscribe(subscriber);
}
};

Flowable.combineLatest(Arrays.asList(source, source), new Function<Object[], Integer>() {
@Override
public Integer apply(Object[] t) throws Throwable {
return 2;
}
})
.test()
.assertResult(2);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1896,4 +1896,24 @@ public Object apply(Object[] a) throws Exception {

assertEquals(0, counter.get());
}

@SuppressWarnings("unchecked")
@Test
public void publishersInIterable() {
Publisher<Integer> source = new Publisher<Integer>() {
@Override
public void subscribe(Subscriber<? super Integer> subscriber) {
Flowable.just(1).subscribe(subscriber);
}
};

Flowable.zip(Arrays.asList(source, source), new Function<Object[], Integer>() {
@Override
public Integer apply(Object[] t) throws Throwable {
return 2;
}
})
.test()
.assertResult(2);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -254,4 +254,19 @@ public void run() {
}
}
}

@SuppressWarnings("unchecked")
@Test
public void maybeSourcesInIterable() {
MaybeSource<Integer> source = new MaybeSource<Integer>() {
@Override
public void subscribe(MaybeObserver<? super Integer> observer) {
Maybe.just(1).subscribe(observer);
}
};

Maybe.amb(Arrays.asList(source, source))
.test()
.assertResult(1);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -221,4 +221,24 @@ public void singleSourceZipperReturnsNull() {
.to(TestHelper.<Object>testConsumer())
.assertFailureAndMessage(NullPointerException.class, "The zipper returned a null value");
}

@SuppressWarnings("unchecked")
@Test
public void maybeSourcesInIterable() {
MaybeSource<Integer> source = new MaybeSource<Integer>() {
@Override
public void subscribe(MaybeObserver<? super Integer> observer) {
Maybe.just(1).subscribe(observer);
}
};

Maybe.zip(Arrays.asList(source, source), new Function<Object[], Integer>() {
@Override
public Integer apply(Object[] t) throws Throwable {
return 2;
}
})
.test()
.assertResult(2);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -467,4 +467,18 @@ public void run() throws Exception {
}
}

@SuppressWarnings("unchecked")
@Test
public void observableSourcesInIterable() {
ObservableSource<Integer> source = new ObservableSource<Integer>() {
@Override
public void subscribe(Observer<? super Integer> observer) {
Observable.just(1).subscribe(observer);
}
};

Observable.amb(Arrays.asList(source, source))
.test()
.assertResult(1);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1212,4 +1212,24 @@ public Object apply(Object[] a) throws Exception {
.awaitDone(5, TimeUnit.SECONDS)
.assertFailure(TestException.class, 42);
}

@SuppressWarnings("unchecked")
@Test
public void observableSourcesInIterable() {
ObservableSource<Integer> source = new ObservableSource<Integer>() {
@Override
public void subscribe(Observer<? super Integer> observer) {
Observable.just(1).subscribe(observer);
}
};

Observable.combineLatest(Arrays.asList(source, source), new Function<Object[], Integer>() {
@Override
public Integer apply(Object[] t) throws Throwable {
return 2;
}
})
.test()
.assertResult(2);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1429,4 +1429,24 @@ public Object apply(Object[] a) throws Exception {

assertEquals(0, counter.get());
}

@SuppressWarnings("unchecked")
@Test
public void observableSourcesInIterable() {
ObservableSource<Integer> source = new ObservableSource<Integer>() {
@Override
public void subscribe(Observer<? super Integer> observer) {
Observable.just(1).subscribe(observer);
}
};

Observable.zip(Arrays.asList(source, source), new Function<Object[], Integer>() {
@Override
public Integer apply(Object[] t) throws Throwable {
return 2;
}
})
.test()
.assertResult(2);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -342,4 +342,19 @@ public void accept(Object v, Throwable e) throws Exception {
assertFalse("Interrupted!", interrupted.get());
}
}

@SuppressWarnings("unchecked")
@Test
public void singleSourcesInIterable() {
SingleSource<Integer> source = new SingleSource<Integer>() {
@Override
public void subscribe(SingleObserver<? super Integer> observer) {
Single.just(1).subscribe(observer);
}
};

Single.amb(Arrays.asList(source, source))
.test()
.assertResult(1);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -245,4 +245,24 @@ public void singleSourceZipperReturnsNull() {
.to(TestHelper.<Object>testConsumer())
.assertFailureAndMessage(NullPointerException.class, "The zipper returned a null value");
}

@SuppressWarnings("unchecked")
@Test
public void singleSourcesInIterable() {
SingleSource<Integer> source = new SingleSource<Integer>() {
@Override
public void subscribe(SingleObserver<? super Integer> observer) {
Single.just(1).subscribe(observer);
}
};

Single.zip(Arrays.asList(source, source), new Function<Object[], Integer>() {
@Override
public Integer apply(Object[] t) throws Throwable {
return 2;
}
})
.test()
.assertResult(2);
}
}