@@ -54,20 +54,20 @@ def class ObservableTests {
54
54
55
55
@Test
56
56
public void testFilter () {
57
- Observable . filter(Observable . toObservable (1 , 2 , 3 ), {it >= 2 }). subscribe({ result -> a. received(result)});
57
+ Observable . filter(Observable . from (1 , 2 , 3 ), {it >= 2 }). subscribe({ result -> a. received(result)});
58
58
verify(a, times(0 )). received(1 );
59
59
verify(a, times(1 )). received(2 );
60
60
verify(a, times(1 )). received(3 );
61
61
}
62
62
63
63
@Test
64
64
public void testLast () {
65
- assertEquals (" three" , Observable . toObservable (" one" , " two" , " three" ). last())
65
+ assertEquals (" three" , Observable . from (" one" , " two" , " three" ) . toBlockingObservable( ). last())
66
66
}
67
67
68
68
@Test
69
69
public void testLastWithPredicate () {
70
- assertEquals (" two" , Observable . toObservable (" one" , " two" , " three" ). last({ x -> x. length() == 3 }))
70
+ assertEquals (" two" , Observable . from (" one" , " two" , " three" ) . toBlockingObservable( ). last({ x -> x. length() == 3 }))
71
71
}
72
72
73
73
@Test
@@ -78,15 +78,15 @@ def class ObservableTests {
78
78
79
79
@Test
80
80
public void testMap2 () {
81
- Observable . map(Observable . toObservable (1 , 2 , 3 ), {' hello_' + it}). subscribe({ result -> a. received(result)});
81
+ Observable . map(Observable . from (1 , 2 , 3 ), {' hello_' + it}). subscribe({ result -> a. received(result)});
82
82
verify(a, times(1 )). received(" hello_" + 1 );
83
83
verify(a, times(1 )). received(" hello_" + 2 );
84
84
verify(a, times(1 )). received(" hello_" + 3 );
85
85
}
86
86
87
87
@Test
88
88
public void testMaterialize () {
89
- Observable . materialize(Observable . toObservable (1 , 2 , 3 )). subscribe({ result -> a. received(result)});
89
+ Observable . materialize(Observable . from (1 , 2 , 3 )). subscribe({ result -> a. received(result)});
90
90
// we expect 4 onNext calls: 3 for 1, 2, 3 ObservableNotification.OnNext and 1 for ObservableNotification.OnCompleted
91
91
verify(a, times(4 )). received(any(Notification . class));
92
92
verify(a, times(0 )). error(any(Exception . class));
@@ -95,12 +95,12 @@ def class ObservableTests {
95
95
@Test
96
96
public void testMergeDelayError () {
97
97
Observable . mergeDelayError(
98
- Observable . toObservable (1 , 2 , 3 ),
98
+ Observable . from (1 , 2 , 3 ),
99
99
Observable . merge(
100
- Observable . toObservable (6 ),
100
+ Observable . from (6 ),
101
101
Observable . error(new NullPointerException ()),
102
- Observable . toObservable (7 )),
103
- Observable . toObservable (4 , 5 ))
102
+ Observable . from (7 )),
103
+ Observable . from (4 , 5 ))
104
104
.subscribe( { result -> a. received(result)}, { exception -> a. error(exception)});
105
105
106
106
verify(a, times(1 )). received(1 );
@@ -116,12 +116,12 @@ def class ObservableTests {
116
116
@Test
117
117
public void testMerge () {
118
118
Observable . merge(
119
- Observable . toObservable (1 , 2 , 3 ),
119
+ Observable . from (1 , 2 , 3 ),
120
120
Observable . merge(
121
- Observable . toObservable (6 ),
121
+ Observable . from (6 ),
122
122
Observable . error(new NullPointerException ()),
123
- Observable . toObservable (7 )),
124
- Observable . toObservable (4 , 5 ))
123
+ Observable . from (7 )),
124
+ Observable . from (4 , 5 ))
125
125
.subscribe({ result -> a. received(result)}, { exception -> a. error(exception)});
126
126
127
127
// executing synchronously so we can deterministically know what order things will come
@@ -158,23 +158,23 @@ def class ObservableTests {
158
158
159
159
@Test
160
160
public void testSkipTake () {
161
- Observable . skip(Observable . toObservable (1 , 2 , 3 ), 1 ). take(1 ). subscribe({ result -> a. received(result)});
161
+ Observable . skip(Observable . from (1 , 2 , 3 ), 1 ). take(1 ). subscribe({ result -> a. received(result)});
162
162
verify(a, times(0 )). received(1 );
163
163
verify(a, times(1 )). received(2 );
164
164
verify(a, times(0 )). received(3 );
165
165
}
166
166
167
167
@Test
168
168
public void testSkip () {
169
- Observable . skip(Observable . toObservable (1 , 2 , 3 ), 2 ). subscribe({ result -> a. received(result)});
169
+ Observable . skip(Observable . from (1 , 2 , 3 ), 2 ). subscribe({ result -> a. received(result)});
170
170
verify(a, times(0 )). received(1 );
171
171
verify(a, times(0 )). received(2 );
172
172
verify(a, times(1 )). received(3 );
173
173
}
174
174
175
175
@Test
176
176
public void testTake () {
177
- Observable . take(Observable . toObservable (1 , 2 , 3 ), 2 ). subscribe({ result -> a. received(result)});
177
+ Observable . take(Observable . from (1 , 2 , 3 ), 2 ). subscribe({ result -> a. received(result)});
178
178
verify(a, times(1 )). received(1 );
179
179
verify(a, times(1 )). received(2 );
180
180
verify(a, times(0 )). received(3 );
@@ -188,15 +188,15 @@ def class ObservableTests {
188
188
189
189
@Test
190
190
public void testTakeWhileViaGroovy () {
191
- Observable . takeWhile(Observable . toObservable (1 , 2 , 3 ), { x -> x < 3 }). subscribe({ result -> a. received(result)});
191
+ Observable . takeWhile(Observable . from (1 , 2 , 3 ), { x -> x < 3 }). subscribe({ result -> a. received(result)});
192
192
verify(a, times(1 )). received(1 );
193
193
verify(a, times(1 )). received(2 );
194
194
verify(a, times(0 )). received(3 );
195
195
}
196
196
197
197
@Test
198
198
public void testTakeWhileWithIndexViaGroovy () {
199
- Observable . takeWhileWithIndex(Observable . toObservable (1 , 2 , 3 ), { x , i -> i < 2 }). subscribe({ result -> a. received(result)});
199
+ Observable . takeWhileWithIndex(Observable . from (1 , 2 , 3 ), { x , i -> i < 2 }). subscribe({ result -> a. received(result)});
200
200
verify(a, times(1 )). received(1 );
201
201
verify(a, times(1 )). received(2 );
202
202
verify(a, times(0 )). received(3 );
@@ -210,7 +210,7 @@ def class ObservableTests {
210
210
211
211
@Test
212
212
public void testToSortedListStatic () {
213
- Observable . toSortedList(Observable . toObservable (1 , 3 , 2 , 5 , 4 )). subscribe({ result -> a. received(result)});
213
+ Observable . toSortedList(Observable . from (1 , 3 , 2 , 5 , 4 )). subscribe({ result -> a. received(result)});
214
214
verify(a, times(1 )). received(Arrays . asList(1 , 2 , 3 , 4 , 5 ));
215
215
}
216
216
@@ -222,7 +222,7 @@ def class ObservableTests {
222
222
223
223
@Test
224
224
public void testToSortedListWithFunctionStatic () {
225
- Observable . toSortedList(Observable . toObservable (1 , 3 , 2 , 5 , 4 ), {a , b -> a - b}). subscribe({ result -> a. received(result)});
225
+ Observable . toSortedList(Observable . from (1 , 3 , 2 , 5 , 4 ), {a , b -> a - b}). subscribe({ result -> a. received(result)});
226
226
verify(a, times(1 )). received(Arrays . asList(1 , 2 , 3 , 4 , 5 ));
227
227
}
228
228
@@ -246,29 +246,29 @@ def class ObservableTests {
246
246
247
247
@Test
248
248
public void testLastOrDefault () {
249
- def val = Observable . toObservable (" one" , " two" ). lastOrDefault(" default" , { x -> x. length() == 3 })
249
+ def val = Observable . from (" one" , " two" ) . toBlockingObservable( ). lastOrDefault(" default" , { x -> x. length() == 3 })
250
250
assertEquals (" two" , val)
251
251
}
252
252
253
253
@Test
254
254
public void testLastOrDefault2 () {
255
- def val = Observable . toObservable (" one" , " two" ). lastOrDefault(" default" , { x -> x. length() > 3 })
255
+ def val = Observable . from (" one" , " two" ) . toBlockingObservable( ). lastOrDefault(" default" , { x -> x. length() > 3 })
256
256
assertEquals (" default" , val)
257
257
}
258
258
259
259
public void testSingle1 () {
260
- def s = Observable . toObservable (" one" ). single({ x -> x. length() == 3 })
260
+ def s = Observable . from (" one" ) . toBlockingObservable( ). single({ x -> x. length() == 3 })
261
261
assertEquals (" one" , s)
262
262
}
263
263
264
264
@Test (expected = IllegalStateException .class)
265
265
public void testSingle2 () {
266
- Observable . toObservable (" one" , " two" ). single({ x -> x. length() == 3 })
266
+ Observable . from (" one" , " two" ) . toBlockingObservable( ). single({ x -> x. length() == 3 })
267
267
}
268
268
269
269
@Test
270
270
public void testDefer () {
271
- def obs = Observable . toObservable (1 , 2 )
271
+ def obs = Observable . from (1 , 2 )
272
272
Observable . defer({-> obs }). subscribe({ result -> a. received(result)})
273
273
verify(a, times(1 )). received(1 );
274
274
verify(a, times(1 )). received(2 );
@@ -277,7 +277,7 @@ def class ObservableTests {
277
277
278
278
@Test
279
279
public void testAll () {
280
- Observable . toObservable (1 , 2 , 3 ). all({ x -> x > 0 }). subscribe({ result -> a. received(result) });
280
+ Observable . from (1 , 2 , 3 ). all({ x -> x > 0 }). subscribe({ result -> a. received(result) });
281
281
verify(a, times(1 )). received(true );
282
282
}
283
283
@@ -305,7 +305,7 @@ def class ObservableTests {
305
305
int counter = 1 ;
306
306
307
307
public Observable<Integer > getNumbers () {
308
- return Observable . toObservable (1 , 3 , 2 , 5 , 4 );
308
+ return Observable . from (1 , 3 , 2 , 5 , 4 );
309
309
}
310
310
311
311
public TestObservable getObservable () {
0 commit comments