Skip to content

Commit 7de1f9b

Browse files
benjchristensenbenjchristensen
committed
Merge pull request ReactiveX#1311 from craigmingtaozhang/master
Tiny integration test change
2 parents ea37e72 + 9be3552 commit 7de1f9b

File tree

1 file changed

+53
-19
lines changed

1 file changed

+53
-19
lines changed

‎rxjava-core/src/test/java/rx/ConcatTests.java‎

Lines changed: 53 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package rx;
1717

1818
import static org.junit.Assert.assertEquals;
19-
import static org.junit.Assert.assertTrue;
2019

2120
import java.util.Arrays;
2221
import java.util.List;
@@ -57,6 +56,8 @@ public void testConcatWithObservableOfObservable() {
5756
assertEquals("two", values.get(1));
5857
assertEquals("three", values.get(2));
5958
assertEquals("four", values.get(3));
59+
assertEquals("five", values.get(4));
60+
assertEquals("six", values.get(5));
6061
}
6162

6263
@Test
@@ -74,66 +75,99 @@ public void testConcatWithIterableOfObservable() {
7475
assertEquals("two", values.get(1));
7576
assertEquals("three", values.get(2));
7677
assertEquals("four", values.get(3));
78+
assertEquals("five", values.get(4));
79+
assertEquals("six", values.get(5));
7780
}
7881

7982
@Test
8083
public void testConcatCovariance() {
81-
Observable<Media> o1 = Observable.<Media> from(new HorrorMovie(), new Movie());
82-
Observable<Media> o2 = Observable.from(new Media(), new HorrorMovie());
84+
HorrorMovie horrorMovie1 = new HorrorMovie();
85+
Movie movie = new Movie();
86+
Media media = new Media();
87+
HorrorMovie horrorMovie2 = new HorrorMovie();
88+
89+
Observable<Media> o1 = Observable.<Media> from(horrorMovie1, movie);
90+
Observable<Media> o2 = Observable.from(media, horrorMovie2);
8391

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

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

96+
assertEquals(horrorMovie1, values.get(0));
97+
assertEquals(movie, values.get(1));
98+
assertEquals(media, values.get(2));
99+
assertEquals(horrorMovie2, values.get(3));
88100
assertEquals(4, values.size());
89101
}
90102

91103
@Test
92104
public void testConcatCovariance2() {
93-
Observable<Media> o1 = Observable.from(new HorrorMovie(), new Movie(), new Media());
94-
Observable<Media> o2 = Observable.from(new Media(), new HorrorMovie());
105+
HorrorMovie horrorMovie1 = new HorrorMovie();
106+
Movie movie = new Movie();
107+
Media media1 = new Media();
108+
Media media2 = new Media();
109+
HorrorMovie horrorMovie2 = new HorrorMovie();
110+
111+
Observable<Media> o1 = Observable.from(horrorMovie1, movie, media1);
112+
Observable<Media> o2 = Observable.from(media2, horrorMovie2);
95113

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

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

118+
assertEquals(horrorMovie1, values.get(0));
119+
assertEquals(movie, values.get(1));
120+
assertEquals(media1, values.get(2));
121+
assertEquals(media2, values.get(3));
122+
assertEquals(horrorMovie2, values.get(4));
100123
assertEquals(5, values.size());
101124
}
102125

103126
@Test
104127
public void testConcatCovariance3() {
105-
Observable<Movie> o1 = Observable.from(new HorrorMovie(), new Movie());
106-
Observable<Media> o2 = Observable.from(new Media(), new HorrorMovie());
128+
HorrorMovie horrorMovie1 = new HorrorMovie();
129+
Movie movie = new Movie();
130+
Media media = new Media();
131+
HorrorMovie horrorMovie2 = new HorrorMovie();
132+
133+
Observable<Movie> o1 = Observable.from(horrorMovie1, movie);
134+
Observable<Media> o2 = Observable.from(media, horrorMovie2);
107135

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

110-
assertTrue(values.get(0) instanceof HorrorMovie);
111-
assertTrue(values.get(1) instanceof Movie);
112-
assertTrue(values.get(2) instanceof Media);
113-
assertTrue(values.get(3) instanceof HorrorMovie);
138+
assertEquals(horrorMovie1, values.get(0));
139+
assertEquals(movie, values.get(1));
140+
assertEquals(media, values.get(2));
141+
assertEquals(horrorMovie2, values.get(3));
142+
assertEquals(4, values.size());
114143
}
115144

116145
@Test
117146
public void testConcatCovariance4() {
118-
147+
final HorrorMovie horrorMovie1 = new HorrorMovie();
148+
final Movie movie = new Movie();
149+
Media media = new Media();
150+
HorrorMovie horrorMovie2 = new HorrorMovie();
151+
119152
Observable<Movie> o1 = Observable.create(new OnSubscribe<Movie>() {
120153

121154
@Override
122155
public void call(Subscriber<? super Movie> o) {
123-
o.onNext(new HorrorMovie());
124-
o.onNext(new Movie());
156+
o.onNext(horrorMovie1);
157+
o.onNext(movie);
125158
// o.onNext(new Media()); // correctly doesn't compile
126159
o.onCompleted();
127160
}
128161
});
129162

130-
Observable<Media> o2 = Observable.from(new Media(), new HorrorMovie());
163+
Observable<Media> o2 = Observable.from(media, horrorMovie2);
131164

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

134-
assertTrue(values.get(0) instanceof HorrorMovie);
135-
assertTrue(values.get(1) instanceof Movie);
136-
assertTrue(values.get(2) instanceof Media);
137-
assertTrue(values.get(3) instanceof HorrorMovie);
167+
assertEquals(horrorMovie1, values.get(0));
168+
assertEquals(movie, values.get(1));
169+
assertEquals(media, values.get(2));
170+
assertEquals(horrorMovie2, values.get(3));
171+
assertEquals(4, values.size());
138172
}
139173
}

0 commit comments

Comments
 (0)