Skip to content

Commit 9180b51

Browse files
bobzhangbobzhang
authored
Merge pull request #5330 from rescript-lang/fix-test-cases-on-node-12
2 parents 45d8bbd + 442e867 commit 9180b51

File tree

2 files changed

+95
-94
lines changed

2 files changed

+95
-94
lines changed

‎jscomp/test/js_promise_basic_test.js

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ function fail(param) {
4747
RE_EXN_ID: "Assert_failure",
4848
_1: [
4949
"js_promise_basic_test.ml",
50-
19,
50+
17,
5151
2
5252
],
5353
Error: new Error()
@@ -85,7 +85,7 @@ function assertIsNotFound(x) {
8585
RE_EXN_ID: "Assert_failure",
8686
_1: [
8787
"js_promise_basic_test.ml",
88-
36,
88+
34,
8989
9
9090
],
9191
Error: new Error()
@@ -179,8 +179,8 @@ function orElseRejectedRejectTest(param) {
179179
RE_EXN_ID: "Assert_failure",
180180
_1: [
181181
"js_promise_basic_test.ml",
182-
77,
183-
18
182+
79,
183+
19
184184
],
185185
Error: new Error()
186186
};
@@ -241,6 +241,10 @@ function allResolvedTest(param) {
241241
return obj.then(arg1);
242242
}
243243

244+
function is_not_found(error) {
245+
return error.RE_EXN_ID === "Not_found";
246+
}
247+
244248
function allRejectTest(param) {
245249
var p1 = Promise.resolve(1);
246250
var p2 = Promise.resolve(3);
@@ -255,9 +259,7 @@ function allRejectTest(param) {
255259
var obj = Promise.all(promises);
256260
var obj$1 = obj.then(fail);
257261
var arg1 = function (error) {
258-
assert_bool(error === ({
259-
RE_EXN_ID: "Not_found"
260-
}));
262+
assert_bool(error.RE_EXN_ID === "Not_found");
261263
return h;
262264
};
263265
return obj$1.catch(arg1);
@@ -287,9 +289,7 @@ function createPromiseRejectTest(param) {
287289
});
288290
}));
289291
var arg1 = function (error) {
290-
assert_bool(error === ({
291-
RE_EXN_ID: "Not_found"
292-
}));
292+
assert_bool(error.RE_EXN_ID === "Not_found");
293293
return h;
294294
};
295295
return obj.catch(arg1);
@@ -343,7 +343,7 @@ var obj = Promise.all([
343343
]);
344344

345345
function arg1(param) {
346-
eq("File \"js_promise_basic_test.ml\", line 169, characters 7-14", [
346+
eq("File \"js_promise_basic_test.ml\", line 171, characters 12-19", [
347347
param[0],
348348
param[1]
349349
], [
@@ -369,7 +369,7 @@ function re(prim) {
369369

370370
Mt.from_promise_suites("Js_promise_basic_test", {
371371
hd: [
372-
"File \"js_promise_basic_test.ml\", line 187, characters 4-11",
372+
"File \"js_promise_basic_test.ml\", line 191, characters 5-12",
373373
twop.then(function (x) {
374374
return Promise.resolve({
375375
TAG: /* Eq */0,
@@ -380,7 +380,7 @@ Mt.from_promise_suites("Js_promise_basic_test", {
380380
],
381381
tl: {
382382
hd: [
383-
"File \"js_promise_basic_test.ml\", line 190, characters 4-11",
383+
"File \"js_promise_basic_test.ml\", line 192, characters 5-12",
384384
twop.then(function (x) {
385385
return Promise.resolve({
386386
TAG: /* Neq */1,
@@ -416,6 +416,7 @@ exports.rejectTest = rejectTest;
416416
exports.thenCatchChainResolvedTest = thenCatchChainResolvedTest;
417417
exports.thenCatchChainRejectedTest = thenCatchChainRejectedTest;
418418
exports.allResolvedTest = allResolvedTest;
419+
exports.is_not_found = is_not_found;
419420
exports.allRejectTest = allRejectTest;
420421
exports.raceTest = raceTest;
421422
exports.createPromiseRejectTest = createPromiseRejectTest;

‎jscomp/test/js_promise_basic_test.ml

Lines changed: 81 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1-
let suites : Mt.pair_suites ref = ref []
1+
let suites : Mt.pair_suites ref = ref []
2+
23
let test_id = ref 0
4+
35
let eq loc x y =
4-
incr test_id ;
6+
incr test_id;
57
suites :=
6-
(loc ^" id " ^ (string_of_int !test_id), (fun _ -> Mt.Eq(x,y))) :: !suites
7-
8-
8+
(loc ^ " id " ^ string_of_int !test_id, fun _ -> Mt.Eq (x, y)) :: !suites
99

1010
open Js_promise
1111

1212
let assert_bool b =
13-
if b then ()
14-
else
15-
raise (Invalid_argument "Assertion Failure.")
13+
if b then () else raise (Invalid_argument "Assertion Failure.")
1614

1715
let fail _ =
1816
(* assert_bool false *)
@@ -24,124 +22,128 @@ let thenTest () =
2422

2523
let andThenTest () =
2624
let p = resolve 6 in
27-
p |> then_ (fun _ -> resolve (12))
28-
|> then_ (fun y -> resolve @@ assert_bool (y = 12))
25+
p
26+
|> then_ (fun _ -> resolve 12)
27+
|> then_ (fun y -> resolve @@ assert_bool (y = 12))
2928

3029
let h = resolve ()
3130

3231
let assertIsNotFound (x : Js_promise.error) =
33-
match (function [@bs.open]
34-
| Not_found -> 0) x with
32+
match (function[@bs.open] Not_found -> 0) x with
3533
| Some _ -> h
3634
| _ -> assert false
3735

3836
(** would be nice to have [%bs.open? Stack_overflow]*)
3937
let catchTest () =
4038
let p = reject Not_found in
41-
p |> then_ fail
42-
|> catch (fun error ->
43-
assertIsNotFound error
44-
)
39+
p |> then_ fail |> catch (fun error -> assertIsNotFound error)
4540

4641
let orResolvedTest () =
4742
let p = resolve 42 in
48-
p |> catch (fun _ -> resolve 22)
49-
|> then_ (fun value -> resolve @@ assert_bool (value = 42))
50-
|> catch fail
43+
p
44+
|> catch (fun _ -> resolve 22)
45+
|> then_ (fun value -> resolve @@ assert_bool (value = 42))
46+
|> catch fail
5147

5248
let orRejectedTest () =
5349
let p = reject Not_found in
54-
p |> catch (fun _ -> resolve 22)
55-
|> then_ (fun value -> resolve @@ assert_bool (value = 22))
56-
|> catch fail
50+
p
51+
|> catch (fun _ -> resolve 22)
52+
|> then_ (fun value -> resolve @@ assert_bool (value = 22))
53+
|> catch fail
5754

5855
let orElseResolvedTest () =
5956
let p = resolve 42 in
60-
p |> catch (fun _ -> resolve 22)
61-
|> then_ (fun value -> resolve @@ assert_bool (value = 42))
62-
|> catch fail
57+
p
58+
|> catch (fun _ -> resolve 22)
59+
|> then_ (fun value -> resolve @@ assert_bool (value = 42))
60+
|> catch fail
6361

6462
let orElseRejectedResolveTest () =
6563
let p = reject Not_found in
66-
p |> catch (fun _ -> resolve 22)
67-
|> then_ (fun value -> resolve @@ assert_bool (value = 22))
68-
|> catch fail
64+
p
65+
|> catch (fun _ -> resolve 22)
66+
|> then_ (fun value -> resolve @@ assert_bool (value = 22))
67+
|> catch fail
68+
6969
exception Stack_overflow
70+
7071
let orElseRejectedRejectTest () =
7172
let p = reject Not_found in
72-
p |> catch (fun _ -> reject Stack_overflow)
73-
|> then_ fail
74-
|> catch (fun error ->
75-
match (function [@bs.open] Stack_overflow -> 0) error with
76-
| Some _ -> h
77-
| None -> assert false
78-
(* resolve @@ assert_bool (Obj.magic error == Stack_overflow) *))
73+
p
74+
|> catch (fun _ -> reject Stack_overflow)
75+
|> then_ fail
76+
|> catch (fun error ->
77+
match (function[@bs.open] Stack_overflow -> 0) error with
78+
| Some _ -> h
79+
| None -> assert false
80+
(* resolve @@ assert_bool (Obj.magic error == Stack_overflow) *))
7981

8082
let resolveTest () =
8183
let p1 = resolve 10 in
8284
p1 |> then_ (fun x -> resolve @@ assert_bool (x = 10))
8385

8486
let rejectTest () =
8587
let p = reject Not_found in
86-
p |> catch
87-
(fun error ->
88-
assertIsNotFound error
89-
(* resolve @@ assert_bool (Obj.magic error == Not_found) *)
90-
)
88+
p
89+
|> catch (fun error ->
90+
assertIsNotFound error
91+
(* resolve @@ assert_bool (Obj.magic error == Not_found) *))
9192

9293
let thenCatchChainResolvedTest () =
9394
let p = resolve 20 in
94-
p |> then_ (fun value -> resolve @@ assert_bool (value = 20) )
95-
|> catch fail
95+
p |> then_ (fun value -> resolve @@ assert_bool (value = 20)) |> catch fail
9696

9797
let thenCatchChainRejectedTest () =
9898
let p = reject Not_found in
9999
p |> then_ fail
100-
|> catch (fun error ->
101-
assertIsNotFound error
102-
(* resolve @@ assert_bool (Obj.magic error == Not_found) *))
103-
100+
|> catch (fun error ->
101+
assertIsNotFound error
102+
(* resolve @@ assert_bool (Obj.magic error == Not_found) *))
104103

105104
let allResolvedTest () =
106105
let p1 = resolve 1 in
107106
let p2 = resolve 2 in
108107
let p3 = resolve 3 in
109108
let promises = [| p1; p2; p3 |] in
110109
all promises
111-
|> then_
112-
(fun resolved ->
113-
assert_bool (resolved.(0) = 1) ;
114-
assert_bool (resolved.(1) = 2) ;
115-
assert_bool (resolved.(2) = 3) ;
116-
h
117-
)
110+
|> then_ (fun resolved ->
111+
assert_bool (resolved.(0) = 1);
112+
assert_bool (resolved.(1) = 2);
113+
assert_bool (resolved.(2) = 3);
114+
h)
118115

116+
let is_not_found (error : exn) =
117+
match error with Not_found -> true | _ -> false
119118

120119
let allRejectTest () =
121120
let p1 = resolve 1 in
122121
let p2 = resolve 3 in
123122
let p3 = reject Not_found in
124123
let promises = [| p1; p2; p3 |] in
125-
all promises
126-
|> then_ fail
127-
|> catch (fun error -> assert_bool (Obj.magic error == Not_found) ; h)
124+
all promises |> then_ fail
125+
|> catch (fun error ->
126+
assert_bool (is_not_found (Obj.magic error));
127+
h)
128128

129129
let raceTest () =
130130
let p1 = resolve "first" in
131131
let p2 = resolve "second" in
132132
let p3 = resolve "third" in
133133
let promises = [| p1; p2; p3 |] in
134-
race promises
135-
|> then_ (fun resolved -> h)
136-
|> catch fail
134+
race promises |> then_ (fun resolved -> h) |> catch fail
137135

138136
let createPromiseRejectTest () =
139-
make (fun ~resolve ~reject -> reject Not_found [@bs])
140-
|> catch (fun error -> assert_bool (Obj.magic error == Not_found); h)
137+
make (fun ~resolve ~reject -> (reject Not_found [@bs]))
138+
|> catch (fun error ->
139+
assert_bool (is_not_found (Obj.magic error));
140+
h)
141141

142142
let createPromiseFulfillTest () =
143-
make (fun ~resolve ~reject:_ -> resolve "success" [@bs])
144-
|> then_ (fun resolved -> assert_bool (Obj.magic resolved = "success"); h)
143+
make (fun ~resolve ~reject:_ -> (resolve "success" [@bs]))
144+
|> then_ (fun resolved ->
145+
assert_bool (Obj.magic resolved = "success");
146+
h)
145147
|> catch fail
146148

147149
let () =
@@ -164,30 +166,28 @@ let () =
164166
(** TODO: async tests?
165167
*)
166168
let () =
167-
(Js.Promise.all2 (Js.Promise.resolve 2, Js.Promise.resolve 3))
168-
|> Js.Promise.then_ (fun (a,b) ->
169-
eq __LOC__ (a,b) (2,3);
169+
Js.Promise.all2 (Js.Promise.resolve 2, Js.Promise.resolve 3)
170+
|> Js.Promise.then_ (fun (a, b) ->
171+
eq __LOC__ (a, b) (2, 3);
170172

171-
Js.Promise.resolve ()
172-
)
173-
|> ignore
173+
Js.Promise.resolve ())
174+
|> ignore
175+
;;
174176

177+
Js.log (List.length !suites);;
175178

176-
;; Js.log (List.length !suites)
179+
Js.log "hey";;
177180

178-
;; Js.log "hey"
179-
;; Mt.from_pair_suites __MODULE__ !suites
181+
Mt.from_pair_suites __MODULE__ !suites
180182

181183
let twop = Js.Promise.resolve 2
184+
182185
let then_ = Js.Promise.then_
183-
let re = Js.Promise.resolve
184186

185-
;; Mt.from_promise_suites __MODULE__
187+
let re = Js.Promise.resolve;;
188+
189+
Mt.from_promise_suites __MODULE__
186190
[
187-
__LOC__,
188-
twop
189-
|> then_ (fun x -> re @@ Mt.Eq(x,2));
190-
__LOC__,
191-
twop
192-
|> then_ (fun x -> re @@ Mt.Neq(x,3))
193-
]
191+
(__LOC__, twop |> then_ (fun x -> re @@ Mt.Eq (x, 2)));
192+
(__LOC__, twop |> then_ (fun x -> re @@ Mt.Neq (x, 3)));
193+
]

0 commit comments

Comments
 (0)