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

Tiny integration test change #1311

Merged
merged 1 commit into from
Jun 4, 2014
+53 −19
Merged

Tiny integration test change #1311

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
72 changes: 53 additions & 19 deletions rxjava-core/src/test/java/rx/ConcatTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
package rx;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

import java.util.Arrays;
import java.util.List;
Expand Down Expand Up @@ -57,6 +56,8 @@ public void testConcatWithObservableOfObservable() {
assertEquals("two", values.get(1));
assertEquals("three", values.get(2));
assertEquals("four", values.get(3));
assertEquals("five", values.get(4));
assertEquals("six", values.get(5));
}

@Test
Expand All @@ -74,66 +75,99 @@ public void testConcatWithIterableOfObservable() {
assertEquals("two", values.get(1));
assertEquals("three", values.get(2));
assertEquals("four", values.get(3));
assertEquals("five", values.get(4));
assertEquals("six", values.get(5));
}

@Test
public void testConcatCovariance() {
Observable<Media> o1 = Observable.<Media> from(new HorrorMovie(), new Movie());
Observable<Media> o2 = Observable.from(new Media(), new HorrorMovie());
HorrorMovie horrorMovie1 = new HorrorMovie();
Movie movie = new Movie();
Media media = new Media();
HorrorMovie horrorMovie2 = new HorrorMovie();

Observable<Media> o1 = Observable.<Media> from(horrorMovie1, movie);
Observable<Media> o2 = Observable.from(media, horrorMovie2);

Observable<Observable<Media>> os = Observable.from(o1, o2);

List<Media> values = Observable.concat(os).toList().toBlocking().single();

assertEquals(horrorMovie1, values.get(0));
assertEquals(movie, values.get(1));
assertEquals(media, values.get(2));
assertEquals(horrorMovie2, values.get(3));
assertEquals(4, values.size());
}

@Test
public void testConcatCovariance2() {
Observable<Media> o1 = Observable.from(new HorrorMovie(), new Movie(), new Media());
Observable<Media> o2 = Observable.from(new Media(), new HorrorMovie());
HorrorMovie horrorMovie1 = new HorrorMovie();
Movie movie = new Movie();
Media media1 = new Media();
Media media2 = new Media();
HorrorMovie horrorMovie2 = new HorrorMovie();

Observable<Media> o1 = Observable.from(horrorMovie1, movie, media1);
Observable<Media> o2 = Observable.from(media2, horrorMovie2);

Observable<Observable<Media>> os = Observable.from(o1, o2);

List<Media> values = Observable.concat(os).toList().toBlocking().single();

assertEquals(horrorMovie1, values.get(0));
assertEquals(movie, values.get(1));
assertEquals(media1, values.get(2));
assertEquals(media2, values.get(3));
assertEquals(horrorMovie2, values.get(4));
assertEquals(5, values.size());
}

@Test
public void testConcatCovariance3() {
Observable<Movie> o1 = Observable.from(new HorrorMovie(), new Movie());
Observable<Media> o2 = Observable.from(new Media(), new HorrorMovie());
HorrorMovie horrorMovie1 = new HorrorMovie();
Movie movie = new Movie();
Media media = new Media();
HorrorMovie horrorMovie2 = new HorrorMovie();

Observable<Movie> o1 = Observable.from(horrorMovie1, movie);
Observable<Media> o2 = Observable.from(media, horrorMovie2);

List<Media> values = Observable.concat(o1, o2).toList().toBlocking().single();

assertTrue(values.get(0) instanceof HorrorMovie);
assertTrue(values.get(1) instanceof Movie);
assertTrue(values.get(2) instanceof Media);
assertTrue(values.get(3) instanceof HorrorMovie);
assertEquals(horrorMovie1, values.get(0));
assertEquals(movie, values.get(1));
assertEquals(media, values.get(2));
assertEquals(horrorMovie2, values.get(3));
assertEquals(4, values.size());
}

@Test
public void testConcatCovariance4() {

final HorrorMovie horrorMovie1 = new HorrorMovie();
final Movie movie = new Movie();
Media media = new Media();
HorrorMovie horrorMovie2 = new HorrorMovie();

Observable<Movie> o1 = Observable.create(new OnSubscribe<Movie>() {

@Override
public void call(Subscriber<? super Movie> o) {
o.onNext(new HorrorMovie());
o.onNext(new Movie());
o.onNext(horrorMovie1);
o.onNext(movie);
// o.onNext(new Media()); // correctly doesn't compile
o.onCompleted();
}
});

Observable<Media> o2 = Observable.from(new Media(), new HorrorMovie());
Observable<Media> o2 = Observable.from(media, horrorMovie2);

List<Media> values = Observable.concat(o1, o2).toList().toBlocking().single();

assertTrue(values.get(0) instanceof HorrorMovie);
assertTrue(values.get(1) instanceof Movie);
assertTrue(values.get(2) instanceof Media);
assertTrue(values.get(3) instanceof HorrorMovie);
assertEquals(horrorMovie1, values.get(0));
assertEquals(movie, values.get(1));
assertEquals(media, values.get(2));
assertEquals(horrorMovie2, values.get(3));
assertEquals(4, values.size());
}
}