1 files changed, 30 insertions, 46 deletions

diff --git a/test/drl_test.ml b/test/drl_test.ml
index c470f96..fa36dee 100644
--- a/test/drl_test.ml
+++ b/test/drl_test.ml
@@ -1,5 +1,4 @@
 open Relational_engine
-
 module Test_Nt = Nt.Memory
 module Test_Drl = Drl.Executor.Make (Test_Nt)
 module Test_Branch = Branch.Make (Test_Nt)
@@ -7,37 +6,24 @@ module Test_Session = Session.Make (Test_Nt)
 module Test_Ctx = Sublanguage_context.Make (Test_Nt)
 
 let ( let* ) = Result.bind
-
-let with_proper_attrs tuples =
-  List.map (fun (name, value) -> (name, { Attribute.value = value })) tuples
+let with_proper_attrs tuples = List.map (fun (name, value) -> name, {Attribute.value}) tuples
 
 let tuple_from_attrs name attrs =
-  { Tuple.relation = name; attributes = Tuple.AttributeMap.of_list (with_proper_attrs attrs) }
+  {Tuple.relation= name; attributes= Tuple.AttributeMap.of_list (with_proper_attrs attrs)}
 
-let seed_fixture
-      (branch : Test_Branch.branch)
-      (multigroup : Management.Multigroup.multigroup)
-    : (unit, Condition.t) result =
+let seed_fixture (branch : Test_Branch.branch) (multigroup : Management.Multigroup.multigroup) :
+    (unit, Condition.t) result =
   let branch_handle = branch#branch_handle in
   let branch_name = branch#name in
   let mg_name = multigroup#name in
-  let relation ~name ~schema ~tuples =
-    (name, schema,
-     List.map (tuple_from_attrs name) tuples)
-  in
+  let relation ~name ~schema ~tuples = name, schema, List.map (tuple_from_attrs name) tuples in
   let fixture =
-    [
-      relation
-        ~name:"fruit"
-        ~schema:(Schema.empty
-                 |> Schema.add "name" "string"
-                 |> Schema.add "flavour" "string")
-        ~tuples:[
-          [("name", Obj.magic "peach"); ("flavour", Obj.magic "sweet")];
-          [("name", Obj.magic "grape"); ("flavour", Obj.magic "sweet")];
-          [("name", Obj.magic "lemon"); ("flavour", Obj.magic "sour")]
-        ]
-    ]
+    [ relation ~name:"fruit"
+        ~schema:(Schema.empty |> Schema.add "name" "string" |> Schema.add "flavour" "string")
+        ~tuples:
+          [ ["name", Obj.magic "peach"; "flavour", Obj.magic "sweet"];
+            ["name", Obj.magic "grape"; "flavour", Obj.magic "sweet"];
+            ["name", Obj.magic "lemon"; "flavour", Obj.magic "sour"] ] ]
   in
   let create (name, schema, tuples) =
     let* _ = Test_Nt.create_relation branch_handle multigroup ~branch_name ~name ~schema in
@@ -45,23 +31,22 @@ let seed_fixture
     Ok ()
   in
   let sequencing a b = Result.bind a (fun _ -> b) in
-  fixture
-  |> List.map create
-  |> List.fold_left sequencing (Ok ())
-  |> Result.map ignore
+  fixture |> List.map create |> List.fold_left sequencing (Ok ()) |> Result.map ignore
 
 let make_fixture () =
-  let* _ = Test_Nt.initialize () in (* FIXME: this *leaks* on the C++ side! *)
+  let* _ = Test_Nt.initialize () in
+  (* FIXME: this *leaks* on the C++ side! *)
   let branch_name = "fixture" in
   let multigroup_name = "fixture" in
   let claims = "fixture" in
   let* session = Test_Session.open_session claims ~branch_name in
   let branch = session#branch in
-  let multigroup = begin
+  let multigroup =
+    begin
       branch#add_multigroup ~name:multigroup_name;
-      branch#mg_of multigroup_name
-      |> Option.get
-    end in
+      branch#mg_of multigroup_name |> Option.get
+    end
+  in
   let* _ = seed_fixture branch multigroup in
   let ctx = Test_Ctx.make_ctx session claims in
   Ok ctx
@@ -70,25 +55,24 @@ module Error = struct
   open Condition
 
   let invalid_argument msg = condition "invalid-argument" msg empty
-  let expected_tuple tuple_expr = condition "expected-tuple" "An expected tuple is missing from the result"
-                                    ("tuple" |=| (of_sexp tuple_expr))
+
+  let expected_tuple tuple_expr =
+    condition "expected-tuple" "An expected tuple is missing from the result"
+      ("tuple" |=| of_sexp tuple_expr)
 end
 
 let assert_ok = function
   | Ok x -> x
   | Error condition -> raise (Invalid_argument (Condition.to_string condition))
 
-let drain { Sublanguage_types.rows; _ } = rows         (* TODO *)
-
-let contains tuple ts =
-  List.find_opt (Tuple.materialized_equal tuple) ts |> Option.is_some
+let drain {Sublanguage_types.rows; _} = rows (* TODO *)
+let contains tuple ts = List.find_opt (Tuple.materialized_equal tuple) ts |> Option.is_some
 
 let ensure_contains t ts =
   let tuple = tuple_from_attrs "" t in
   Result.bind ts (fun ts ->
-      if contains tuple ts
-      then Ok ts
-      else Error (Error.expected_tuple (Tuple.sexp_of_materialized tuple)))
+      if contains tuple ts then Ok ts
+      else Error (Error.expected_tuple (Tuple.sexp_of_materialized tuple)) )
 
 let with_cursor = function
   | Sublanguage_types.Cursor cursor -> Ok (drain cursor)
@@ -99,9 +83,9 @@ let%test_unit "Ensure that `base` translates to a scan over its argument" =
     let* ctx = make_fixture () in
     let* result = Test_Drl.execute ctx (Drl.Ast.Base "fixture:fruit") in
     with_cursor result
-    |> ensure_contains [("name", Obj.magic "peach"); ("flavour", Obj.magic "sweet")]
-    |> ensure_contains [("name", Obj.magic "grape"); ("flavour", Obj.magic "sweet")]
-    |> ensure_contains [("name", Obj.magic "lemon"); ("flavour", Obj.magic "sour")]
+    |> ensure_contains ["name", Obj.magic "peach"; "flavour", Obj.magic "sweet"]
+    |> ensure_contains ["name", Obj.magic "grape"; "flavour", Obj.magic "sweet"]
+    |> ensure_contains ["name", Obj.magic "lemon"; "flavour", Obj.magic "sour"]
     |> Result.map ignore
   end
   |> assert_ok