Skip to content
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.

Sign up for GitHub

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

Jump to bottom

2.x: Observable.scan, no seed - fix post-terminal behaviour #4904

Merged
merged 1 commit into from
Dec 4, 2016
Merged

2.x: Observable.scan, no seed - fix post-terminal behaviour #4904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 16 additions & 1 deletion src/main/java/io/reactivex/internal/operators/observable/ObservableScan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import io.reactivex.functions.BiFunction;
import io.reactivex.internal.disposables.DisposableHelper;
import io.reactivex.internal.functions.ObjectHelper;
import io.reactivex.plugins.RxJavaPlugins;

public final class ObservableScan<T> extends AbstractObservableWithUpstream<T, T> {
final BiFunction<T, T, T> accumulator;
Expand All @@ -39,6 +40,8 @@ static final class ScanObserver<T> implements Observer<T>, Disposable {
Disposable s;

T value;

boolean done;

ScanObserver(Observer<? super T> actual, BiFunction<T, T, T> accumulator) {
this.actual = actual;
Expand Down Expand Up @@ -67,6 +70,9 @@ public boolean isDisposed() {

@Override
public void onNext(T t) {
if (done) {
return;
}
final Observer<? super T> a = actual;
T v = value;
if (v == null) {
Expand All @@ -80,7 +86,7 @@ public void onNext(T t) {
} catch (Throwable e) {
Exceptions.throwIfFatal(e);
s.dispose();
a.onError(e);
onError(e);
return;
}

Expand All @@ -91,11 +97,20 @@ public void onNext(T t) {

@Override
public void onError(Throwable t) {
if (done) {
RxJavaPlugins.onError(t);
return;
}
done = true;
actual.onError(t);
}

@Override
public void onComplete() {
if (done) {
return;
}
done = true;
actual.onComplete();
}
}
Expand Down
85 changes: 85 additions & 0 deletions src/test/java/io/reactivex/internal/operators/observable/ObservableScanTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,20 @@

import java.util.*;
import java.util.concurrent.Callable;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicInteger;

import org.junit.Test;

import io.reactivex.*;
import io.reactivex.Observable;
import io.reactivex.Observer;
import io.reactivex.disposables.Disposable;
import io.reactivex.disposables.Disposables;
import io.reactivex.exceptions.TestException;
import io.reactivex.functions.*;
import io.reactivex.observers.*;
import io.reactivex.plugins.RxJavaPlugins;
import io.reactivex.subjects.PublishSubject;

public class ObservableScanTest {
Expand Down Expand Up @@ -300,4 +304,85 @@ public Object apply(Object a, Object b) throws Exception {
}
}, false, 1, 1, 0, 0);
}

@Test
public void testScanFunctionThrowsAndUpstreamErrorsDoesNotResultInTwoTerminalEvents() {
final RuntimeException err = new RuntimeException();
final RuntimeException err2 = new RuntimeException();
final List<Throwable> list = new CopyOnWriteArrayList<Throwable>();
final Consumer<Throwable> errorConsumer = new Consumer<Throwable>() {
@Override
public void accept(Throwable t) throws Exception {
list.add(t);
}};
try {
RxJavaPlugins.setErrorHandler(errorConsumer);
Observable.unsafeCreate(new ObservableSource<Integer>() {
@Override
public void subscribe(Observer<? super Integer> o) {
Disposable d = Disposables.empty();
o.onSubscribe(d);
o.onNext(1);
o.onNext(2);
o.onError(err2);
}})
.scan(new BiFunction<Integer,Integer,Integer>() {
@Override
public Integer apply(Integer t1, Integer t2) throws Exception {
throw err;
}})
.test()
.assertError(err)
.assertValue(1);
} finally {
RxJavaPlugins.reset();
}
}

@Test
public void testScanFunctionThrowsAndUpstreamCompletesDoesNotResultInTwoTerminalEvents() {
final RuntimeException err = new RuntimeException();
Observable.unsafeCreate(new ObservableSource<Integer>() {
@Override
public void subscribe(Observer<? super Integer> o) {
Disposable d = Disposables.empty();
o.onSubscribe(d);
o.onNext(1);
o.onNext(2);
o.onComplete();
}})
.scan(new BiFunction<Integer,Integer,Integer>() {
@Override
public Integer apply(Integer t1, Integer t2) throws Exception {
throw err;
}})
.test()
.assertError(err)
.assertValue(1);
}

@Test
public void testScanFunctionThrowsAndUpstreamEmitsOnNextResultsInScanFunctionBeingCalledOnlyOnce() {
final RuntimeException err = new RuntimeException();
final AtomicInteger count = new AtomicInteger();
Observable.unsafeCreate(new ObservableSource<Integer>() {
@Override
public void subscribe(Observer<? super Integer> o) {
Disposable d = Disposables.empty();
o.onSubscribe(d);
o.onNext(1);
o.onNext(2);
o.onNext(3);
}})
.scan(new BiFunction<Integer,Integer,Integer>() {
@Override
public Integer apply(Integer t1, Integer t2) throws Exception {
count.incrementAndGet();
throw err;
}})
.test()
.assertError(err)
.assertValue(1);
assertEquals(1, count.get());
}
}