Skip to content
This repository was archived by the owner on Apr 20, 2018. It is now read-only.

Commit 676a8a3

Browse files
mattpodwysockimattpodwysocki
committed
Fixing tests
1 parent 01114cd commit 676a8a3

16 files changed

+1813
-1727
lines changed

‎tests/core/observer-lite.js

+58-34
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,32 @@
11
(function () {
2+
/* jshint undef: true, unused: true */
3+
/* globals QUnit, test, Rx, equal, ok */
24
QUnit.module('Observer');
35

46
var Observer = Rx.Observer;
57

6-
test('Create_OnNext', function () {
7-
var next, res;
8-
next = false;
9-
res = Observer.create(function (x) {
8+
test('create onNext', function () {
9+
var next = false;
10+
11+
var res = Observer.create(function (x) {
1012
equal(42, x);
1113
next = true;
1214
});
15+
1316
res.onNext(42);
17+
1418
ok(next);
15-
return res.onCompleted();
19+
20+
res.onCompleted();
1621
});
1722

18-
test('Create_OnNext_HasError', function () {
23+
test('create onNext has error', function () {
1924
var e_;
20-
var ex = new Error();
25+
26+
var err = new Error();
27+
2128
var next = false;
29+
2230
var res = Observer.create(function (x) {
2331
equal(42, x);
2432
next = true;
@@ -28,22 +36,24 @@
2836
ok(next);
2937

3038
try {
31-
res.onError(ex);
39+
res.onError(err);
3240
ok(false);
3341
} catch (e) {
3442
e_ = e;
3543
}
36-
equal(ex, e_);
44+
equal(err, e_);
3745
});
3846

39-
test('Create_OnNextOnCompleted', function () {
47+
test('create onNext onCompleted', function () {
4048
var next = false;
49+
4150
var completed = false;
51+
4252
var res = Observer.create(function (x) {
4353
equal(42, x);
44-
return next = true;
45-
}, undefined, function () {
46-
return completed = true;
54+
next = true;
55+
}, null, function () {
56+
completed = true;
4757
});
4858

4959
res.onNext(42);
@@ -56,39 +66,46 @@
5666
ok(completed);
5767
});
5868

59-
test('Create_OnNextOnCompleted_HasError', function () {
69+
test('create onNext onCompleted has error', function () {
6070
var e_;
61-
var ex = new Error();
71+
72+
var err = new Error();
73+
6274
var next = false;
6375
var completed = false;
76+
6477
var res = Observer.create(function (x) {
6578
equal(42, x);
6679
next = true;
67-
}, undefined, function () {
80+
}, null, function () {
6881
completed = true;
6982
});
83+
7084
res.onNext(42);
85+
7186
ok(next);
7287
ok(!completed);
88+
7389
try {
74-
res.onError(ex);
90+
res.onError(err);
7591
ok(false);
7692
} catch (e) {
7793
e_ = e;
7894
}
79-
equal(ex, e_);
95+
96+
equal(err, e_);
8097
ok(!completed);
8198
});
8299

83-
test('Create_OnNextOnError', function () {
84-
var ex = new Error();
100+
test('create onNext onError', function () {
101+
var err = new Error();
85102
var next = true;
86103
var error = false;
87104
var res = Observer.create(function (x) {
88105
equal(42, x);
89106
next = true;
90107
}, function (e) {
91-
equal(ex, e);
108+
equal(err, e);
92109
error = true;
93110
});
94111

@@ -97,23 +114,26 @@
97114
ok(next);
98115
ok(!error);
99116

100-
res.onError(ex);
117+
res.onError(err);
101118
ok(error);
102119
});
103120

104-
test('Create_OnNextOnError_HitCompleted', function () {
105-
var ex = new Error();
121+
test('create onNext onError hit completed', function () {
122+
var err = new Error();
123+
106124
var next = true;
107125
var error = false;
126+
108127
var res = Observer.create(function (x) {
109128
equal(42, x);
110129
next = true;
111130
}, function (e) {
112-
equal(ex, e);
131+
equal(err, e);
113132
error = true;
114133
});
115134

116135
res.onNext(42);
136+
117137
ok(next);
118138
ok(!error);
119139

@@ -122,16 +142,18 @@
122142
ok(!error);
123143
});
124144

125-
test('Create_OnNextOnErrorOnCompleted1', function () {
126-
var ex = new Error();
127-
var next = true;
145+
test('create onNext onError onCompleted 1', function () {
146+
var err = new Error();
147+
148+
var next = false;
128149
var error = false;
129150
var completed = false;
151+
130152
var res = Observer.create(function (x) {
131153
equal(42, x);
132154
next = true;
133155
}, function (e) {
134-
equal(ex, e);
156+
equal(err, e);
135157
error = true;
136158
}, function () {
137159
completed = true;
@@ -149,16 +171,18 @@
149171
ok(!error);
150172
});
151173

152-
test('Create_OnNextOnErrorOnCompleted2', function () {
153-
var ex = new Error();
154-
var next = true;
174+
test('create onNext onError onCompleted 2', function () {
175+
var err = new Error();
176+
177+
var next = false;
155178
var error = false;
156179
var completed = false;
180+
157181
var res = Observer.create(function (x) {
158182
equal(42, x);
159183
next = true;
160184
}, function (e) {
161-
equal(ex, e);
185+
equal(err, e);
162186
error = true;
163187
}, function () {
164188
completed = true;
@@ -170,7 +194,7 @@
170194
ok(!error);
171195
ok(!completed);
172196

173-
res.onError(ex);
197+
res.onError(err);
174198

175199
ok(!completed);
176200
ok(error);

‎tests/core/observer.js

+11-9
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
res.onCompleted();
7878
});
7979

80-
test('Create_OnNext_HasError', function () {
80+
test('create OnNext has error', function () {
8181
var e_;
8282
var error = new Error();
8383
var next = false;
@@ -98,14 +98,16 @@
9898
equal(error, e_);
9999
});
100100

101-
test('Create_OnNextOnCompleted', function () {
101+
test('create OnNext OnCompleted', function () {
102102
var next = false;
103+
103104
var completed = false;
105+
104106
var res = Observer.create(function (x) {
105107
equal(42, x);
106-
return next = true;
107-
}, undefined, function () {
108-
return completed = true;
108+
next = true;
109+
}, null, function () {
110+
completed = true;
109111
});
110112

111113
res.onNext(42);
@@ -193,11 +195,11 @@
193195

194196
res.onNext(42);
195197
ok(next);
196-
ok(!error);
198+
ok(!hasError);
197199

198200
res.onCompleted();
199201

200-
ok(!error);
202+
ok(!hasError);
201203
});
202204

203205
test('Create OnNext OnError OnCompleted 1', function () {
@@ -252,13 +254,13 @@
252254
res.onNext(42);
253255

254256
ok(next);
255-
ok(!error);
257+
ok(!hasError);
256258
ok(!completed);
257259

258260
res.onError(error);
259261

260262
ok(!completed);
261-
ok(error);
263+
ok(hasError);
262264
});
263265

264266
function MyObserver() {

‎tests/observable/ignoreelements.js

+85-37
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,90 @@
1-
QUnit.module('IgnoreValues');
2-
3-
var Observable = Rx.Observable,
4-
TestScheduler = Rx.TestScheduler,
5-
onNext = Rx.ReactiveTest.onNext,
6-
onError = Rx.ReactiveTest.onError,
7-
onCompleted = Rx.ReactiveTest.onCompleted,
8-
subscribe = Rx.ReactiveTest.subscribe;
9-
10-
test('IgnoreValues_Basic', function () {
11-
var results, scheduler, xs;
12-
scheduler = new TestScheduler();
13-
xs = scheduler.createHotObservable(onNext(180, 1), onNext(210, 2), onNext(250, 3), onNext(270, 4), onNext(310, 5), onNext(360, 6), onNext(380, 7), onNext(410, 8), onNext(590, 9));
14-
results = scheduler.startWithCreate(function () {
15-
return xs.ignoreElements();
1+
(function () {
2+
/* jshint undef: true, unused: true */
3+
/* globals QUnit, test, Rx */
4+
5+
QUnit.module('ignoreElements');
6+
7+
var TestScheduler = Rx.TestScheduler,
8+
onNext = Rx.ReactiveTest.onNext,
9+
onError = Rx.ReactiveTest.onError,
10+
onCompleted = Rx.ReactiveTest.onCompleted,
11+
subscribe = Rx.ReactiveTest.subscribe;
12+
13+
test('ignoreElements Basic', function () {
14+
var scheduler = new TestScheduler();
15+
16+
var xs = scheduler.createHotObservable(
17+
onNext(180, 1),
18+
onNext(210, 2),
19+
onNext(250, 3),
20+
onNext(270, 4),
21+
onNext(310, 5),
22+
onNext(360, 6),
23+
onNext(380, 7),
24+
onNext(410, 8),
25+
onNext(590, 9));
26+
27+
var results = scheduler.startScheduler(function () {
28+
return xs.ignoreElements();
1629
});
30+
1731
results.messages.assertEqual();
32+
1833
xs.subscriptions.assertEqual(subscribe(200, 1000));
19-
});
20-
21-
test('IgnoreValues_Completed', function () {
22-
var results, scheduler, xs;
23-
scheduler = new TestScheduler();
24-
xs = scheduler.createHotObservable(onNext(180, 1), onNext(210, 2), onNext(250, 3), onNext(270, 4), onNext(310, 5), onNext(360, 6), onNext(380, 7), onNext(410, 8), onNext(590, 9), onCompleted(610));
25-
results = scheduler.startWithCreate(function () {
26-
return xs.ignoreElements();
34+
});
35+
36+
test('ignoreElements Completed', function () {
37+
var scheduler = new TestScheduler();
38+
39+
var xs = scheduler.createHotObservable(
40+
onNext(180, 1),
41+
onNext(210, 2),
42+
onNext(250, 3),
43+
onNext(270, 4),
44+
onNext(310, 5),
45+
onNext(360, 6),
46+
onNext(380, 7),
47+
onNext(410, 8),
48+
onNext(590, 9),
49+
onCompleted(610));
50+
51+
var results = scheduler.startScheduler(function () {
52+
return xs.ignoreElements();
2753
});
28-
results.messages.assertEqual(onCompleted(610));
29-
xs.subscriptions.assertEqual(subscribe(200, 610));
30-
});
31-
32-
test('IgnoreValues_Error', function () {
33-
var ex, results, scheduler, xs;
34-
ex = 'ex';
35-
scheduler = new TestScheduler();
36-
xs = scheduler.createHotObservable(onNext(180, 1), onNext(210, 2), onNext(250, 3), onNext(270, 4), onNext(310, 5), onNext(360, 6), onNext(380, 7), onNext(410, 8), onNext(590, 9), onError(610, ex));
37-
results = scheduler.startWithCreate(function () {
38-
return xs.ignoreElements();
54+
55+
results.messages.assertEqual(
56+
onCompleted(610));
57+
58+
xs.subscriptions.assertEqual(
59+
subscribe(200, 610));
60+
});
61+
62+
test('ignoreElements Error', function () {
63+
var error = new Error();
64+
65+
var scheduler = new TestScheduler();
66+
67+
var xs = scheduler.createHotObservable(
68+
onNext(180, 1),
69+
onNext(210, 2),
70+
onNext(250, 3),
71+
onNext(270, 4),
72+
onNext(310, 5),
73+
onNext(360, 6),
74+
onNext(380, 7),
75+
onNext(410, 8),
76+
onNext(590, 9),
77+
onError(610, error));
78+
79+
var results = scheduler.startScheduler(function () {
80+
return xs.ignoreElements();
3981
});
40-
results.messages.assertEqual(onError(610, ex));
41-
xs.subscriptions.assertEqual(subscribe(200, 610));
42-
});
82+
83+
results.messages.assertEqual(
84+
onError(610, error));
85+
86+
xs.subscriptions.assertEqual(
87+
subscribe(200, 610));
88+
});
89+
90+
}());

0 commit comments

Comments
 (0)