Skip to content

Commit

Permalink
Move all test/ into melange
Browse files Browse the repository at this point in the history
  • Loading branch information
davesnx committed Oct 4, 2023
1 parent 205e860 commit 5305bd6
Show file tree
Hide file tree
Showing 18 changed files with 50 additions and 20 deletions.
1 change: 1 addition & 0 deletions src/js/dune
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
(name promise_js)
(public_name promise.melange)
(modes melange)
(wrapped false)
(libraries melange.belt)
(preprocess
(pps melange.ppx))
Expand Down
4 changes: 4 additions & 0 deletions test/bundle/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
(library
(name bundle)
(modes melange)
(libraries melange.belt promise.melange))
3 changes: 0 additions & 3 deletions test/dune

This file was deleted.

11 changes: 11 additions & 0 deletions test/ffi/js/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
(library
(name test_ffi_js)
(modes melange)
(libraries framework_js)
(wrapped false)
(preprocess
(pps melange.ppx)))

(copy_files
(mode fallback)
(files ../native/*.re))
13 changes: 4 additions & 9 deletions test/js/test_ffi.re → test/ffi/js/test_ffi.re
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@



[%%bs.raw {|
[%%mel.raw {|
function isPromise (p) {
return (p instanceof Promise);
}
Expand All @@ -14,13 +14,8 @@ function isPromiseLike(v) {
};
|}];

[@bs.val]
external isPromise: Promise.Js.t(_, _) => bool = "isPromise";

[@bs.val]
external jsPromiseIsPromise: Js.Promise.t(_) => bool = "isPromise";

[@bs.val]
external jsPromiseIsPromiseLike: Js.Promise.t(_) => bool = "isPromiseLike";


Expand Down Expand Up @@ -70,15 +65,15 @@ let interopTests = Framework.suite("interop", [
}),

test("js promise is reason-promise", () => {
let js_promise: Promise.t(int) = [%bs.raw {|Promise.resolve(1)|}];
let js_promise: Promise.t(int) = [%mel.raw {|Promise.resolve(1)|}];
js_promise
->Promise.flatMap(n => Promise.resolved(n + 1))
->Promise.flatMap(n => Promise.resolved(n == 2));
}),

test("reason-promise as js argument", () => {
module Then = {
[@bs.send.pipe: Promise.t('a)]
[@mel.send.pipe: Promise.t('a)]
external js_then: ('a => Promise.t('b)) => Promise.t('b) =
"then";
};
Expand Down Expand Up @@ -243,7 +238,7 @@ let soundnessTests = Framework.suite("soundness", [

[@ocaml.warning "-33"]
test("resolved: Almost-Promise-like", () => {
let open Js_OO;
/* let open Js_OO; */
Promise.resolved(makeAlmostPromiseLike(42))
->Promise.flatMap(x => Promise.resolved(x##_then == 42));
}),
Expand Down
3 changes: 3 additions & 0 deletions test/ffi/native/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
(library
(name test_ffi)
(libraries framework))
File renamed without changes.
3 changes: 0 additions & 3 deletions test/framework/dune

This file was deleted.

9 changes: 9 additions & 0 deletions test/framework/js/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
(library
(name framework_js)
(modes melange)
(wrapped false)
(libraries promise_js))

(copy_files
(mode fallback)
(files ../native/*.re))
2 changes: 1 addition & 1 deletion test/framework/native/dune
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
(library
(name run)
(name framework)
(libraries promise))
File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions test/isoresult/js/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(library
(name isoresult_js)
(modes melange)
(wrapped false)
(libraries melange.belt))
1 change: 0 additions & 1 deletion test/js/benchmark.re
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ let test = Framework.test;



[@bs.val]
external hrtime: unit => (int, int) = "process.hrtime";

let hrtime = () => {
Expand Down
9 changes: 9 additions & 0 deletions test/js/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
(copy_files
(mode fallback)
(files ../native/*.re))

(melange.emit
(target test)
(libraries framework_js promise_js isoresult_js test_ffi_js)
(preprocess
(pps melange.ppx)))
6 changes: 3 additions & 3 deletions test/native/dune
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
(library
(name test_ffi)
(libraries framework))
(executable
(name test_main)
(libraries isoresult promise test_ffi))
File renamed without changes.
File renamed without changes.

0 comments on commit 5305bd6

Please sign in to comment.