1 files changed, 31 insertions, 9 deletions

diff --git a/test/unit/kernel/Merkle.ml b/test/unit/kernel/Merkle.ml
index f12182a..5c610bb 100644
--- a/test/unit/kernel/Merkle.ml
+++ b/test/unit/kernel/Merkle.ml
@@ -31,15 +31,16 @@ module Make (S : Abstract.Storage.STORAGE) (C : Helpers.Storage.CONFIGURATOR) =
         let* v3 = T.lookup tx "k3" node in
         let* v3' = T.lookup tx "k3" node' in
         let* bogus = T.lookup tx "fnord" node in
+        let* () = S.abort tx in
         Ok (v1, v2, v3, v3', bogus)
       end
       |> Helpers.condition_as_failure
     in
-    check (option string) "" (Some "v1") v1;
-    check (option string) "" (Some "v2") v2;
-    check (option string) "" (Some "v3") v3;
-    check (option string) "" (Some "toodles") v3';
-    check (option string) "" None bogus
+    check (option string) "that in-memory reads from the first write work properly" (Some "v1") v1;
+    check (option string) "that in-memory reads from the second write work properly" (Some "v2") v2;
+    check (option string) "that in-memory reads from the third write work properly" (Some "v3") v3;
+    check (option string) "that in-memory reads from a value replacement work properly" (Some "toodles") v3';
+    check (option string) "that in-memory reads from a non-existent key returns nothing" None bogus
 
   let persistence conn =
     let addr =
@@ -68,9 +69,29 @@ module Make (S : Abstract.Storage.STORAGE) (C : Helpers.Storage.CONFIGURATOR) =
       end
       |> Helpers.condition_as_failure
     in
-    check (option string) "" (Some "v1") v1;
-    check (option string) "" (Some "v2") v2;
-    check (option string) "" (Some "v3") v3
+    check (option string) "that on-disk reads from the first write work properly" (Some "v1") v1;
+    check (option string) "that on-disk reads from the second write work properly" (Some "v2") v2;
+    check (option string) "that on-disk reads from the third write work properly" (Some "v3") v3
+
+  let iteration conn =
+    let keys, values =
+      begin
+        let open Utilities.Result in
+        let* tx = S.start conn in
+        let* node = T.empty
+                    |> T.insert tx "k1" "v1"
+                    |> fmap (T.insert tx "k2" "v2")
+                    |> fmap (T.insert tx "k3" "v3")
+        in
+        let* keys = T.fold_left tx (fun acc k _ -> k :: acc) [] node |> Result.map List.rev in
+        let* values = T.fold_left tx (fun acc _ v -> v :: acc) [] node |> Result.map List.rev in
+        let* () = S.abort tx in
+        Ok (keys, values)
+      end
+      |> Helpers.condition_as_failure
+    in
+    check (list string) "that keys are properly enumerated from left to right" ["k1"; "k2"; "k3"] keys;
+    check (list string) "that values are properly enumerated from left to right" ["v1"; "v2"; "v3"] values
 
   (* TODO: this will need `remove` *)
   (* let determinism _conn = *)
@@ -79,7 +100,8 @@ module Make (S : Abstract.Storage.STORAGE) (C : Helpers.Storage.CONFIGURATOR) =
   let suite prefix =
     ( "merkle/" ^ prefix,
       [test_case "insert-and-lookup" `Quick (H.with_connection insert_and_lookup "merkle-test");
-       test_case "persistence" `Quick (H.with_connection persistence "merkle-test")])
+       test_case "persistence" `Quick (H.with_connection persistence "merkle-test");
+       test_case "iteration" `Quick (H.with_connection iteration "merkle-test")])
 end
 
 module LMDB = Make (Rnt.Backend.Storage.LMDB) (Helpers.Storage.LMDB_Configurator)