Skip to content

1.x: Test adjustments to reduce problems when tests run on Android #3504

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

Merged
merged 1 commit into from
Feb 22, 2016
+86 −54
Merged

1.x: Test adjustments to reduce problems when tests run on Android #3504

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
102 changes: 52 additions & 50 deletions src/test/java/rx/ObservableTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,49 +15,25 @@
*/
package rx;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;

import org.junit.Before;
import org.junit.Test;
import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;

import rx.Observable.OnSubscribe;
import rx.Observable.Transformer;
import static org.junit.Assert.*;
import static org.mockito.Matchers.*;
import static org.mockito.Mockito.*;

import java.lang.Thread.UncaughtExceptionHandler;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;

import org.junit.*;
import org.mockito.*;

import rx.Observable.*;
import rx.exceptions.OnErrorNotImplementedException;
import rx.functions.Action1;
import rx.functions.Action2;
import rx.functions.Func0;
import rx.functions.Func1;
import rx.functions.Func2;
import rx.functions.*;
import rx.observables.ConnectableObservable;
import rx.observers.TestSubscriber;
import rx.schedulers.TestScheduler;
import rx.subjects.ReplaySubject;
import rx.subjects.Subject;
import rx.schedulers.*;
import rx.subjects.*;
import rx.subscriptions.BooleanSubscription;

public class ObservableTests {
Expand Down Expand Up @@ -1101,19 +1077,45 @@ public String call(Integer t1) {
}

@Test
public void testErrorThrownIssue1685() {
public void testErrorThrownIssue1685() throws Exception {
Subject<Object, Object> subject = ReplaySubject.create();

Observable.error(new RuntimeException("oops"))
.materialize()
.delay(1, TimeUnit.SECONDS)
.dematerialize()
.subscribe(subject);

subject.subscribe();
subject.materialize().toBlocking().first();
ExecutorService exec = Executors.newSingleThreadExecutor();

try {

final AtomicReference<Throwable> err = new AtomicReference<Throwable>();

Scheduler s = Schedulers.from(exec);
exec.submit(new Runnable() {
@Override
public void run() {
Thread.currentThread().setUncaughtExceptionHandler(new UncaughtExceptionHandler() {
@Override
public void uncaughtException(Thread t, Throwable e) {
err.set(e);
}
});
}
}).get();

Observable.error(new RuntimeException("oops"))
.materialize()
.delay(1, TimeUnit.SECONDS, s)
.dematerialize()
.subscribe(subject);

subject.subscribe();
subject.materialize().toBlocking().first();

System.out.println("Done");
Thread.sleep(1000); // the uncaught exception comes after the terminal event reaches toBlocking

assertNotNull("UncaughtExceptionHandler didn't get anything.", err.get());

System.out.println("Done");
} finally {
exec.shutdownNow();
}
}

@Test
Expand Down
1 change: 1 addition & 0 deletions src/test/java/rx/internal/operators/OnSubscribeCombineLatestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,6 +818,7 @@ public void testWithCombineLatestIssue1717() throws InterruptedException {
final AtomicInteger count = new AtomicInteger();
final int SIZE = 2000;
Observable<Long> timer = Observable.interval(0, 1, TimeUnit.MILLISECONDS)
.onBackpressureBuffer()
.observeOn(Schedulers.newThread())
.doOnEach(new Action1<Notification<? super Long>>() {

Expand Down
21 changes: 19 additions & 2 deletions src/test/java/rx/internal/operators/OnSubscribeRefCountTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@

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

import org.junit.*;
import org.mockito.*;

import rx.*;
import rx.Observable.OnSubscribe;
import rx.Observable;
import rx.Observable.OnSubscribe;
import rx.Observer;
import rx.functions.*;
import rx.observers.*;
Expand Down Expand Up @@ -528,6 +528,10 @@ public Integer call(Integer t1, Integer t2) {

@Test(timeout = 10000)
public void testUpstreamErrorAllowsRetry() throws InterruptedException {

final AtomicReference<Throwable> err1 = new AtomicReference<Throwable>();
final AtomicReference<Throwable> err2 = new AtomicReference<Throwable>();

final AtomicInteger intervalSubscribed = new AtomicInteger();
Observable<String> interval =
Observable.interval(200,TimeUnit.MILLISECONDS)
Expand Down Expand Up @@ -572,6 +576,11 @@ public void call(Throwable t1) {
public void call(String t1) {
System.out.println("Subscriber 1: " + t1);
}
}, new Action1<Throwable>() {
@Override
public void call(Throwable t) {
err1.set(t);
}
});
Thread.sleep(100);
interval
Expand All @@ -587,11 +596,19 @@ public void call(Throwable t1) {
public void call(String t1) {
System.out.println("Subscriber 2: " + t1);
}
}, new Action1<Throwable>() {
@Override
public void call(Throwable t) {
err2.set(t);
}
});

Thread.sleep(1300);

System.out.println(intervalSubscribed.get());
assertEquals(6, intervalSubscribed.get());

assertNotNull("First subscriber didn't get the error", err1);
assertNotNull("Second subscriber didn't get the error", err2);
}
}
7 changes: 6 additions & 1 deletion src/test/java/rx/internal/operators/OperatorMergeMaxConcurrentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import rx.*;
import rx.Observable;
import rx.Observer;
import rx.internal.util.PlatformDependent;
import rx.observers.TestSubscriber;
import rx.schedulers.Schedulers;

Expand Down Expand Up @@ -218,7 +219,11 @@ public void testSimpleAsync() {
}
@Test(timeout = 10000)
public void testSimpleOneLessAsyncLoop() {
for (int i = 0; i < 200; i++) {
int max = 200;
if (PlatformDependent.isAndroid()) {
max = 50;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hah :) Though, I guess it'll fail on Travis CI because emulator runs really slow on it.

}
for (int i = 0; i < max; i++) {
testSimpleOneLessAsync();
}
}
Expand Down
9 changes: 8 additions & 1 deletion src/test/java/rx/internal/operators/OperatorReplayTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import rx.internal.operators.OperatorReplay.BoundedReplayBuffer;
import rx.internal.operators.OperatorReplay.Node;
import rx.internal.operators.OperatorReplay.SizeAndTimeBoundReplayBuffer;
import rx.internal.util.PlatformDependent;
import rx.observables.ConnectableObservable;
import rx.observers.TestSubscriber;
import rx.schedulers.Schedulers;
Expand Down Expand Up @@ -1049,7 +1050,13 @@ public void testAsyncComeAndGo() {

@Test
public void testNoMissingBackpressureException() {
final int m = 4 * 1000 * 1000;
final int m;
if (PlatformDependent.isAndroid()) {
m = 500 * 1000;
} else {
m = 4 * 1000 * 1000;
}

Observable<Integer> firehose = Observable.create(new OnSubscribe<Integer>() {
@Override
public void call(Subscriber<? super Integer> t) {
Expand Down