Abandon the idea of default data in Vytree.insert and use explicit data list

for multilevel insert.

1 files changed, 14 insertions, 14 deletions

diff --git a/test/vyconf_tree_test.ml b/test/vyconf_tree_test.ml
index 14dd14b..26d350b 100644
--- a/test/vyconf_tree_test.ml
+++ b/test/vyconf_tree_test.ml
@@ -17,7 +17,7 @@ let test_make_node test_ctxt =
    children list *)
 let test_insert_immediate_child test_ctxt =
     let node = make () "root" in
-    let node' = insert () node ["foo"] () in
+    let node' = insert node ["foo"] [()] in
     assert_equal (children_of_node node')
                  [make () "foo"]
 
@@ -25,8 +25,8 @@ let test_insert_immediate_child test_ctxt =
    end of the children list *)
 let test_insert_multiple_children test_ctxt =
     let node = make () "root" in
-    let node' = insert () node ["foo"] () in
-    let node'' = insert () node' ["bar"] () in
+    let node' = insert node ["foo"] [()] in
+    let node'' = insert node' ["bar"] [()] in
     assert_equal (children_of_node node'')
                  [make () "bar"; make () "foo"]
 
@@ -34,7 +34,7 @@ let test_insert_multiple_children test_ctxt =
    two levels deep *)
 let test_insert_multi_level test_ctxt =
     let node = make () "root" in
-    let node' = insert () node ["foo"; "bar"] () in
+    let node' = insert node ["foo"; "bar"] [(); ()] in
     let bar = make () "bar" in
     let foo = make_full () "foo" [bar] in
     let root = make_full () "root" [foo] in
@@ -43,28 +43,28 @@ let test_insert_multi_level test_ctxt =
 (* Inserting duplicate child fails *)
 let test_insert_duplicate_child test_ctxt =
     let node = make () "root" in
-    let node' = insert () node ["foo"] () in
-    assert_raises Duplicate_child (fun () -> insert () node' ["foo"] ())
+    let node' = insert node ["foo"] [()] in
+    assert_raises Duplicate_child (fun () -> insert node' ["foo"] [()])
 
 (* list_children correctly returns a list of children names *)
 let test_list_children test_ctxt =
     let node = make () "root" in
-    let node' = insert () node ["foo"] () in
-    let node'' = insert () node' ["bar"] () in
+    let node' = insert node ["foo"] [()] in
+    let node'' = insert node' ["bar"] [()] in
     assert_equal (list_children node'') ["bar"; "foo"]
 
 (* Deleting a child, well, deletes it *)
 let test_delete_immediate_child test_ctxt =
     let node = make () "root" in
-    let node' = insert () node ["foo"] () in
+    let node' = insert node ["foo"] [()] in
     let node'' = delete node' ["foo"] in
     assert_equal node node''
 
 (* Deleting a child at multi-level path works *)
 let test_delete_multi_level test_ctxt =
     let node = make () "root" in
-    let node' = insert () node ["foo"; "bar"] () in
-    let foo_node = insert () node ["foo"] () in
+    let node' = insert node ["foo"; "bar"] [(); ()] in
+    let foo_node = insert node ["foo"] [()] in
     let node'' = delete node' ["foo"; "bar"] in
     assert_equal node'' foo_node
 
@@ -76,13 +76,13 @@ let test_delete_nonexistent test_ctxt =
 (* get_child works with immediate children *)
 let test_get_immediate_child test_ctxt =
     let node = make () "root" in
-    let node' = insert () node ["foo"] () in
+    let node' = insert node ["foo"] [()] in
     assert_equal (name_of_node (get node' ["foo"])) "foo"
 
 (* get_child works with multi-level paths *)
 let test_get_child_multilevel test_ctxt =
     let node = make () "root" in
-    let node' = insert () node ["foo"; "bar"] () in
+    let node' = insert node ["foo"; "bar"] [(); ()] in
     assert_equal (name_of_node (get node' ["foo"; "bar"])) "bar"
 
 (* get_child raises Nonexistent_path for non-existent paths *)
@@ -93,7 +93,7 @@ let test_get_child_nonexistent test_ctxt =
 (* update works *)
 let test_update test_ctxt =
     let node = make 0 "root" in
-    let node = insert 0 node ["foo"] 1 in
+    let node = insert node ["foo"] [1] in
     assert_equal (data_of_node (get (update node ["foo"] 9) ["foo"])) 9
 
 let suite =