Remove dependency on ppx_expect and use alcotest instead

.nix/catala.nix

@@ -25,7 +25,6 @@
 , zarith_stubs_js
 , ocaml-crunch
 , cohttp-lwt-unix
-, ppx_expect
 }:
 
 buildDunePackage {
@@ -63,7 +62,6 @@ buildDunePackage {
     zarith
     zarith_stubs_js
     cohttp-lwt-unix
-    ppx_expect
   ];
 
   # Currently there is no unit tests in catala and Cram tests are handled by clerk

catala.opam

@@ -32,7 +32,6 @@ depends: [
   "ocamlfind" {!= "1.9.5"}
   "ocamlgraph" {>= "1.8.8"}
   "ppx_yojson_conv" {>= "0.14.0"}
-  "ppx_expect" {>= "0.14.0"}
   "re" {>= "1.9.0"}
   "sedlex" {>= "2.4"}
   "uutf" {>= "1.0.3"}

compiler/dune

@@ -28,6 +28,11 @@
   catala.runtime_ocaml
   catala.runtime_jsoo))
 
+(executable
+ (name tests)
+ (modules tests)
+ (libraries catala.driver alcotest))
+
 (rule
  (target custom_linking.sexp)
  (mode fallback)
@@ -54,3 +59,9 @@
 (alias
  (name catala)
  (deps catala.exe))
+
+(rule
+ (alias runtest)
+ (package catala)
+ (action
+  (run ./tests.exe)))

compiler/lcalc/dune

@@ -1,10 +1,9 @@
 (library
  (name lcalc)
  (public_name catala.lcalc)
- (libraries bindlib ubase dcalc scopelang catala.runtime_ocaml)
+ (libraries bindlib ubase dcalc scopelang catala.runtime_ocaml alcotest)
- (inline_tests)
  (preprocess
-  (pps visitors.ppx ppx_expect)))
+  (pps visitors.ppx)))
 
 (documentation
  (package catala)

compiler/lcalc/optimizations.ml

@@ -205,23 +205,18 @@ let optimize_program (p : 'm program) : untyped program =
            lift_optim peephole_expr;
          ])
 
-let%expect_test _ =
+let test_lcalc_optims1 () =
   Cli.call_unstyled (fun _ ->
       let x = Var.make "x" in
-
       let enumT = EnumName.fresh ("t", Pos.no_pos) in
       let consA = EnumConstructor.fresh ("A", Pos.no_pos) in
       let consB = EnumConstructor.fresh ("B", Pos.no_pos) in
       let consC = EnumConstructor.fresh ("C", Pos.no_pos) in
       let consD = EnumConstructor.fresh ("D", Pos.no_pos) in
-
       let nomark = Untyped { pos = Pos.no_pos } in
-
       let injA = Expr.einj (Expr.evar x nomark) consA enumT nomark in
-      (* let injB = Expr.einj (Expr.evar x nomark) consB enumT nomark in *)
       let injC = Expr.einj (Expr.evar x nomark) consC enumT nomark in
       let injD = Expr.einj (Expr.evar x nomark) consD enumT nomark in
-
       let cases : ('a, 't) boxed_gexpr EnumConstructor.Map.t =
         EnumConstructor.Map.of_seq
         @@ List.to_seq
@@ -230,26 +225,20 @@ let%expect_test _ =
              consB, Expr.eabs (Expr.bind [| x |] injD) [TAny, Pos.no_pos] nomark;
            ]
       in
-
       let matchA = Expr.ematch injA enumT cases nomark in
-
+      Alcotest.(check string)
-      Format.printf "before=%a\n"
+        "same string"
-        (Print.expr_debug ~debug:false)
+        "before=match (A x)\n\
-        (Expr.unbox matchA);
+        \       with\n\
-      Format.print_flush ();
+        \       | A → (λ (x: any) → C x)\n\
-      Format.printf "after=%a\n"
+        \       | B → (λ (x: any) → D x)\n\
-        (Print.expr_debug ~debug:false)
+         after=C\n\
-        (Expr.unbox (iota_expr (Expr.unbox matchA)));
+         x"
-
+        (Format.asprintf "before=%a\nafter=%a"
-      [%expect
+           (Print.expr_debug ~debug:false)
-        {|
+           (Expr.unbox matchA)
-    before=match (A x)
+           (Print.expr_debug ~debug:false)
-           with
+           (Expr.unbox (iota_expr (Expr.unbox matchA)))))
-           | A → (λ (x: any) → C x)
-           | B → (λ (x: any) → D x)
-    after=C
-    x
-    |}])
 
 let cases_of_list l : ('a, 't) boxed_gexpr EnumConstructor.Map.t =
   EnumConstructor.Map.of_seq
@@ -262,7 +251,7 @@ let cases_of_list l : ('a, 't) boxed_gexpr EnumConstructor.Map.t =
              [TAny, Pos.no_pos]
              (Untyped { pos = Pos.no_pos }) ))
 
-let%expect_test _ =
+let test_lcalc_optims2 () =
   Cli.call_unstyled (fun _ ->
       let enumT = EnumName.fresh ("t", Pos.no_pos) in
       let consA = EnumConstructor.fresh ("A", Pos.no_pos) in
@@ -297,25 +286,22 @@ let%expect_test _ =
           (cases_of_list [consA, injC; consB, injD])
           nomark
       in
-
+      Alcotest.(check string)
-      Format.printf "before=@[%a@]@."
+        "same string "
-        (Print.expr_debug ~debug:false)
+        "before=match\n\
-        (Expr.unbox matchA);
+        \         (match 1\n\
-      Format.printf "after=%a@."
+        \          with\n\
-        (Print.expr_debug ~debug:false)
+        \          | A → (λ (x: any) → A 20)\n\
-        (Expr.unbox (iota2_expr (Expr.unbox matchA)));
+        \          | B → (λ (x: any) → B B x))\n\
-
+        \       with\n\
-      [%expect
+        \       | A → (λ (x: any) → C x)\n\
-        {|
+        \       | B → (λ (x: any) → D x)\n\
-   before=match
+         after=match 1\n\
-            (match 1
+        \      with\n\
-             with
+        \      | A → (λ (x: any) → C 20)\n\
-             | A → (λ (x: any) → A 20)
+        \      | B → (λ (x: any) → D B x)\n"
-             | B → (λ (x: any) → B B x))
+        (Format.asprintf "before=@[%a@]@.after=%a@."
-          with
+           (Print.expr_debug ~debug:false)
-          | A → (λ (x: any) → C x)
+           (Expr.unbox matchA)
-          | B → (λ (x: any) → D x)
+           (Print.expr_debug ~debug:false)
-   after=match 1
+           (Expr.unbox (iota2_expr (Expr.unbox matchA)))))
-         with
-         | A → (λ (x: any) → C 20)
-         | B → (λ (x: any) → D B x) |}])

compiler/lcalc/optimizations.mli

@@ -43,3 +43,8 @@ open Ast
 val optimize_program : 'm program -> Shared_ast.untyped program
 (** Warning/todo: no effort was yet made to ensure correct propagation of type
     annotations in the typed case *)
+
+(**{1 Tests}*)
+
+val test_lcalc_optims2 : unit -> unit
+val test_lcalc_optims1 : unit -> unit

compiler/tests.ml

@@ -0,0 +1,10 @@
+let _ =
+  let open Alcotest in
+  run "Optimizations"
+    [
+      ( "Lcalc",
+        [
+          test_case "#1" `Quick Lcalc.Optimizations.test_lcalc_optims1;
+          test_case "#2" `Quick Lcalc.Optimizations.test_lcalc_optims2;
+        ] );
+    ]