Merge branch 'master' into evaluator

1 files changed, 13 insertions, 35 deletions

diff --git a/test/integration/Registration.ml b/test/integration/Registration.ml
index 991bafa..9eb3e4e 100644
--- a/test/integration/Registration.ml
+++ b/test/integration/Registration.ml
@@ -7,43 +7,21 @@ module Make (S : Abstract.Storage.STORAGE) (C : Helpers.Storage.CONFIGURATOR) =
   module I = Kernel.Initialization.Make (S)
   module B = Kernel.Branch.Make (S)
 
-  module Error = struct
-    open Concepts.Condition
-
-    let not_found () = condition "not-found" "An expected object was not present" empty
-  end
-
   let run conn =
     let open Utilities.Result in
-    let open Protocols in
-    let registration =
-      begin
-        let* root = I.initialize ~evaluators:["fol", Evaluators.FOL.make ()] conn in
-        let* bm = Kernel.Path.(lookup root ("branch" @/ this))
-                  |> fmap (Option.to_result ~none:(Error.not_found ())) in
-        let* bm = Registry.from bm |> Option.to_result ~none:(Error.not_found ()) in
-        let* branch = B.make conn in
-        Registry.update bm "master" None (Some branch)
-      end
-      |> Helpers.condition_as_failure in
-    let presence =
-      begin
-        let* root = I.initialize conn in
-        let* bm = Kernel.Path.(lookup root ("branch" @/ this))
-                  |> fmap (Option.to_result ~none:(Error.not_found ())) in
-        let* bm = Directory.from bm |> Option.to_result ~none:(Error.not_found ()) in
-        Directory.find bm "master" |> Result.map Option.is_some
-      end
-      |> Helpers.condition_as_failure in
-    let evaluator =
-      begin
-        let* root = I.initialize ~evaluators:["fol", Evaluators.FOL.make ()] conn in
-        Kernel.Path.(lookup root ("evaluator" @/ "fol" @/ this)) |> Result.map Option.is_some
-      end
-      |> Helpers.condition_as_failure in
-    check bool "" true registration;
-    check bool "" true presence;
-    check bool "the fol evaluator is registered" true evaluator
+    begin
+      let* root = I.initialize ~evaluators:["fol", Evaluators.FOL.make ()] conn in
+      let* branch = B.make conn in
+      Kernel.Path.(update root ("branch" @/ this) "master" None (Some branch))
+    end
+    |> Helpers.condition_as_failure |> ignore;
+    begin
+      let* root = I.initialize ~evaluators:["fol", Evaluators.FOL.make ()] conn in
+      let* _ = Kernel.Path.(lookup root ("branch" @/ "master" @/ "multigroup" @/ this)) in
+      let* _ = Kernel.Path.(lookup root ("evaluator" @/ "fol" @/ this)) in
+      Ok ()
+    end
+    |> Helpers.condition_as_failure
 
   let suite prefix =
     ( "registration/" ^ prefix,