summaryrefslogtreecommitdiff
path: root/test/reference_tree_test.ml
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2018-02-16 12:54:25 +0700
committerDaniil Baturin <daniil@baturin.org>2018-02-16 12:57:16 +0700
commit56130bfe30781c210c7459e5df9afa7d894aeec7 (patch)
tree38d599cf29172085d9b76b595162c49a1dba0104 /test/reference_tree_test.ml
parenta245e894c6f5473f3051366389d3f90a778dacbd (diff)
downloadvyconf-56130bfe30781c210c7459e5df9afa7d894aeec7.tar.gz
vyconf-56130bfe30781c210c7459e5df9afa7d894aeec7.zip
Add logging of interface definition file loading.
Move the high level load_interface_definitions function from Reference_tree to Startup.
Diffstat (limited to 'test/reference_tree_test.ml')
-rw-r--r--test/reference_tree_test.ml17
1 files changed, 1 insertions, 16 deletions
diff --git a/test/reference_tree_test.ml b/test/reference_tree_test.ml
index b95a0ac..1186130 100644
--- a/test/reference_tree_test.ml
+++ b/test/reference_tree_test.ml
@@ -162,19 +162,6 @@ let test_get_help_string_default test_ctxt =
let r = load_from_xml r (in_testdata_dir test_ctxt ["interface_definition_sample.xml"]) in
assert_equal (get_help_string r ["system"; "host-name"]) ("No help available")
-let test_load_interface_definitions_children test_ctxt =
- let interface_definitions_dir = in_testdata_dir test_ctxt ["interface_definitions"] in
- let r = ok_or_failure (load_interface_definitions interface_definitions_dir) in
- let children = Vytree.list_children r in
- assert_equal (Vylist.in_list children "system") true;
- assert_equal (Vylist.in_list children "login") true
-
-let test_load_interface_definitions_leaves test_ctxt =
- let interface_definitions_dir = in_testdata_dir test_ctxt ["interface_definitions"] in
- let r = ok_or_failure (load_interface_definitions interface_definitions_dir) in
- let has_system_leaf = is_leaf r ["system"; "login"; "user"; "full-name"] in
- let has_login_leaf = is_leaf r ["login"; "user"; "full-name"] in
- assert_equal (has_system_leaf && has_login_leaf) true
let suite =
"Util tests" >::: [
@@ -206,9 +193,7 @@ let suite =
"test_get_owner_valid" >:: test_get_owner_valid;
"test_get_owner_invalid" >:: test_get_owner_invalid;
"test_get_help_string_valid" >:: test_get_help_string_valid;
- "test_get_help_string_default" >:: test_get_help_string_default;
- "test_load_interface_definitions_children " >:: test_load_interface_definitions_children;
- "test_load_interface_definitions_leaves" >:: test_load_interface_definitions_leaves
+ "test_get_help_string_default" >:: test_get_help_string_default
]
let () =