Fix multilevel insert logic.

3 files changed, 13 insertions, 34 deletions

diff --git a/src/config_tree.ml b/src/config_tree.ml
index cd2eafd..b70a8bb 100644
--- a/src/config_tree.ml
+++ b/src/config_tree.ml
@@ -36,9 +36,11 @@ let set_value node path value behaviour =
     | AddValue -> add_value node path value
     | ReplaceValue -> replace_value node path value
 
-let set node path value position behaviour =
-    if Vytree.exists node path then set_value node path value behaviour
-    else Vytree.insert ~position:position node path {default_data with values=[value]}
+let set node path value behaviour =
+    if Vytree.exists node path then set_value node path value behaviour else
+    let path_existing = Vytree.get_existent_path node path in
+    let path_remaining = Vylist.complement path path_existing in
+    Vytree.insert_multi_level default_data node path_existing path_remaining {default_data with values=[value]}
 
 let get_values node path =
     let node' = Vytree.get node path in
diff --git a/src/config_tree.mli b/src/config_tree.mli
index 1a807c2..7ce505c 100644
--- a/src/config_tree.mli
+++ b/src/config_tree.mli
@@ -14,7 +14,7 @@ val default_data : config_node_data
 
 val make : string -> t
 
-val set : t -> string list -> string -> Vytree.position -> value_behaviour -> t
+val set : t -> string list -> string -> value_behaviour -> t
 
 val get_values : t -> string list -> string list
 
diff --git a/test/config_tree_test.ml b/test/config_tree_test.ml
index 625bd2b..58a95ad 100644
--- a/test/config_tree_test.ml
+++ b/test/config_tree_test.ml
@@ -2,41 +2,18 @@ open OUnit2
 
 module VT = Vytree
 open Config_tree
-
-let test_set_value test_ctxt =
-    let node = make "root" in
-    let node = VT.insert node ["foo"] default_data in
-    let node = set_value node ["foo"] "bar" in
-    let data = VT.data_of_node (VT.get node ["foo"]) in
-    assert_equal data.values ["bar"]
-
-let test_get_values test_ctxt =
+ 
+let test_set_create_node test_ctxt =
     let node = make "root" in
-    let node = VT.insert node ["foo"] default_data in
-    let node = set_value node ["foo"] "bar" in
-    assert_equal (get_values node ["foo"]) ["bar"]
+    let node = set node ["foo"; "bar"] "baz" ReplaceValue in
+    let data = VT.get_data node ["foo"; "bar"] in
+    assert_equal data.values ["baz"]
 
-let test_add_value test_ctxt =
-    let node = make "root" in
-    let node = VT.insert node ["foo"] default_data in
-    let node = add_value node ["foo"] "bar" in
-    let node = add_value node ["foo"] "baz" in
-    assert_equal (get_values node ["foo"]) ["bar"; "baz"]
-
-let test_add_value_duplicate test_ctxt =
-    let node = make "root" in
-    let node = VT.insert node ["foo"] default_data in
-    let node = set_value node ["foo"] "bar" in
-    assert_raises Duplicate_value (fun () -> add_value node ["foo"] "bar")
 
 let suite =
     "VyConf config tree tests" >::: [
-        "test_set_value" >:: test_set_value;
-        "test_get_values" >:: test_get_values;
-        "test_add_value" >:: test_add_value;
-        "test_add_value_duplicate" >:: test_add_value_duplicate;
+        "test_set_create_node" >:: test_set_create_node;
     ]
 
 let () =
-  run_test_tt_main suite
-
+  run_test_tt_main suite