Add path validation functionality.

2 files changed, 73 insertions, 14 deletions

diff --git a/test/data/interface_definition_sample.xml b/test/data/interface_definition_sample.xml
index b74a415..26f4c80 100644
--- a/test/data/interface_definition_sample.xml
+++ b/test/data/interface_definition_sample.xml
@@ -1,23 +1,34 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
-  <node name="login" owner="login">
+  <node name="system">
     <children>
-      <tagNode name="user">
-        <properties>
-          <help>User name</help>
-          <constraint>
-            <regex>[a-z][a-zA-Z0-9]+</regex>
-          </constraint>
-          <constraintErrorMessage>User name must start with a letter and consist of letters and digits</constraintErrorMessage>
-        </properties>
+      <node name="login" owner="login">
         <children>
-          <leafNode name="full-name">
+          <tagNode name="user">
             <properties>
-              <help>User full name</help>
+              <help>User name</help>
+              <constraint>
+                <regex>[a-zA-Z][a-zA-Z0-9\-]+</regex>
+              </constraint>
+              <constraintErrorMessage>User name must start with a letter and consist of letters and digits</constraintErrorMessage>
             </properties>
-          </leafNode>
+            <children>
+              <leafNode name="full-name">
+                <properties>
+                  <help>User full name</help>
+                </properties>
+              </leafNode>
+            </children>
+          </tagNode>
         </children>
-      </tagNode>
+      </node>
+      <leafNode name="host-name">
+        <properties>
+          <constraint>
+            <regex>[a-zA-Z][a-zA-Z0-9\-]</regex>
+          </constraint>
+        </properties>
+      </leafNode>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/test/reference_tree_test.ml b/test/reference_tree_test.ml
index 52e5a8d..8c969ab 100644
--- a/test/reference_tree_test.ml
+++ b/test/reference_tree_test.ml
@@ -1,14 +1,62 @@
 open OUnit2
 open Reference_tree
 
+let validators = Hashtbl.create 256
+let () = Hashtbl.add validators "anything" "true";
+         Hashtbl.add validators "nothing" "false"
+
+let raises_validation_error f =
+    try f (); false
+    with Validation_error _ -> true
+
 let test_load_valid_definition test_ctxt =
     let r = Vytree.make default_data "root" in
     let r = load_from_xml r (in_testdata_dir test_ctxt ["interface_definition_sample.xml"]) in
-    assert_equal (Vytree.list_children r) ["login"]
+    assert_equal (Vytree.list_children r) ["system"]
+
+(* Path validation tests *)
+let test_validate_path_leaf_valid test_ctxt =
+    let r = Vytree.make default_data "root" in
+    let r = load_from_xml r (in_testdata_dir test_ctxt ["interface_definition_sample.xml"]) in
+    assert_equal (validate_path validators r ["system"; "host-name"; "test"]) (["system"; "host-name"], Some "test")
+
+let test_validate_path_leaf_invalid test_ctxt =
+    let r = Vytree.make default_data "root" in
+    let r = load_from_xml r (in_testdata_dir test_ctxt ["interface_definition_sample.xml"]) in
+    assert_equal (raises_validation_error (fun () -> validate_path validators r ["system"; "host-name"; "1234"])) true
+
+let test_validate_path_leaf_incomplete test_ctxt =
+    let r = Vytree.make default_data "root" in
+    let r = load_from_xml r (in_testdata_dir test_ctxt ["interface_definition_sample.xml"]) in
+    assert_equal (raises_validation_error (fun () -> validate_path validators r ["system"; "host-name"])) true
+
+let test_validate_path_tag_node_complete_valid test_ctxt =
+    let r = Vytree.make default_data "root" in
+    let r = load_from_xml r (in_testdata_dir test_ctxt ["interface_definition_sample.xml"]) in
+    assert_equal (validate_path validators r ["system"; "login"; "user"; "test"; "full-name"; "test user"])
+                 (["system"; "login"; "user"; "test"; "full-name";], Some "test user")
+
+let test_validate_path_tag_node_invalid_name test_ctxt =
+    let r = Vytree.make default_data "root" in
+    let r = load_from_xml r (in_testdata_dir test_ctxt ["interface_definition_sample.xml"]) in
+    assert_equal (raises_validation_error (fun () -> validate_path validators r ["system"; "login"; "user"; "999"; "full-name"; "test user"]))
+                 true
+
+let test_validate_path_tag_node_incomplete test_ctxt =
+    let r = Vytree.make default_data "root" in
+    let r = load_from_xml r (in_testdata_dir test_ctxt ["interface_definition_sample.xml"]) in
+    assert_equal (raises_validation_error (fun () -> validate_path validators r ["system"; "login"; "user"])) true
+
 
 let suite =
     "Util tests" >::: [
         "test_load_valid_definition" >:: test_load_valid_definition;
+        "test_validate_path_leaf_valid" >:: test_validate_path_leaf_valid;
+        "test_validate_path_leaf_invalid" >:: test_validate_path_leaf_invalid;
+        "test_validate_path_leaf_incomplete" >:: test_validate_path_leaf_incomplete;
+        "test_validate_path_tag_node_complete_valid" >:: test_validate_path_tag_node_complete_valid;
+        "test_validate_path_tag_node_invalid_name" >:: test_validate_path_tag_node_invalid_name;
+        "test_validate_path_tag_node_incomplete" >:: test_validate_path_tag_node_incomplete;
     ]
 
 let () =