[WIP] Model and instance for metaschema-framework#218 throw exceptions

aj-stein-gsa · Oct 31, 2024 · fc1b762 · fc1b762
1 parent 5008e3c
commit fc1b762
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/CLITest.java b/metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/CLITest.java
@@ -179,6 +179,14 @@ private static Stream<Arguments> providesValues() {
                 "../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml",
             },
             ExitCode.OK, NO_EXCEPTION_CLASS));
+        add(Arguments.of(
+            new String[] { "validate-content",
+                "-m",
+                "src/test/resources/content/constraint-validation-custom-messages-module.xml",
+                "src/test/resources/content/constraint-validation-custom-messages.xml",
+                "--disable-schema-validation"
+            },
+            ExitCode.OK, NO_EXCEPTION_CLASS));;        
       }
     };
 

diff --git a/metaschema-cli/src/test/resources/content/constraint-validation-custom-messages-module.xml b/metaschema-cli/src/test/resources/content/constraint-validation-custom-messages-module.xml
@@ -7,8 +7,10 @@
     <short-name>constraint-custom-validation-test</short-name>
     <namespace>http://metaschema.dev/ns/metaschema/test/constraint-validation-custom-messages</namespace>
     <json-base-uri>http://metaschema.dev/ns/metaschema/test/constraint-validation-custom-messages</json-base-uri>
-    <define-assembly name="parent">
-        <root-name>constraint-custom-validation-test</root-name>
+    <define-assembly name="message-test">
+    	<formal-name>Message Testing</formal-name>
+    	<description>Unit tests to address metaschema-framework/metaschema-java#215.</description>
+        <root-name>message-test</root-name>
         <model>
             <!-- 
                 There is no example-custom-allowed-values because there are

diff --git a/metaschema-cli/src/test/resources/content/constraint-validation-custom-messages.xml b/metaschema-cli/src/test/resources/content/constraint-validation-custom-messages.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<constraint-custom-validation-test xmlns="http://metaschema.dev/ns/metaschema/test/constraint-validation-custom-messages">
+<message-test xmlns="http://metaschema.dev/ns/metaschema/test/constraint-validation-custom-messages">
 	<example-custom-expect>false</example-custom-expect>
 	<example-custom-matches>not-a-number</example-custom-matches>		
 	<example-default-allowed-values>bad</example-default-allowed-values>
 	<example-default-expect>false</example-default-expect>
 	<example-default-matches>not-a-number</example-default-matches>
-</constraint-custom-validation-test>
+</message-test>