Test default and custom constraint msgs for metaschema-framework#215

metaschema-cli/src/test/java/gov/nist/secauto/metaschema/cli/CLITest.java

@@ -8,9 +8,11 @@
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import gov.nist.secauto.metaschema.cli.processor.ExitCode;
 import gov.nist.secauto.metaschema.cli.processor.ExitStatus;
+import nl.altindag.log.LogCaptor;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -180,9 +182,9 @@ private static Stream<Arguments> providesValues() {
                 "../core/metaschema/schema/metaschema/metaschema-module-metaschema.xml",
             },
             ExitCode.OK, NO_EXCEPTION_CLASS));
+        ;
       }
     };
-
     return values.stream();
   }
 
@@ -202,13 +204,21 @@ void testAllCommands(@NonNull String[] args, @NonNull ExitCode expectedExitCode,
 
   @Test
   void test() {
-    String[] cliArgs = { "validate-content",
-        "-m",
-        "src/test/resources/content/schema-validation-module.xml",
-        "src/test/resources/content/schema-validation-module-missing-required.xml",
-        "--as=xml",
-        "--disable-schema-validation"
-    };
-    CLI.runCli(cliArgs);
+    try (LogCaptor captor = LogCaptor.forRoot()) {
+        String[] cliArgs = { "validate-content",
+            "-m",
+            "src/test/resources/content/215-module.xml",
+            "src/test/resources/content/215.xml",
+            "--disable-schema-validation"
+        };
+        CLI.runCli(cliArgs);
+        assertThat(captor.getErrorLogs().toString())
+        	.contains(new String[] {
+        		"expect-default-non-zero:  Expect constraint '. > 0' did not match the data",
+        		"expect-custom-non-zero:  No default message, custom error message for expect-custom-non-zero constraint.",
+        		"matches-default-regex-letters-only:  Value '1' did not match the pattern",
+        		"matches-custom-regex-letters-only:  No default message, custom error message for matches-custom-regex-letters-only constraint."
+        	});
+    }
   }
 }

metaschema-cli/src/test/resources/content/215-module.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<METASCHEMA xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 https://raw.githubusercontent.com/metaschema-framework/metaschema/0441e6d4c9bce5b6c40b4647148019e4f47bed08/schema/xml/metaschema.xsd">
+ <schema-name>Module for metaschema-framework/metaschema-java#215</schema-name>
+ <schema-version>0.1.0</schema-version>
+ <short-name>model215</short-name>
+ <namespace>https://github.com/metaschema-framework/metaschema-java/issues/215</namespace>
+ <json-base-uri>https://github.com/metaschema-framework/metaschema-java/issues/215</json-base-uri>
+ <define-assembly name="root">
+ 	<root-name>message-root</root-name>
+ 	<model>
+ 		<define-field name="expect-default-non-zero" as-type="integer" min-occurs="1"/>
+ 		<define-field name="expect-custom-non-zero" as-type="integer" min-occurs="1"/>
+ 		<define-field name="matches-default-regex-letters-only" as-type="string" min-occurs="1"/>
+ 		<define-field name="matches-custom-regex-letters-only" as-type="string" min-occurs="1"/>
+ 	</model>
+ 	<constraint>
+ 	<expect id="expect-default-non-zero" level="ERROR" target="expect-default-non-zero" test=". > 0"/>
+ 	<expect id="expect-custom-non-zero" level="ERROR" target="expect-custom-non-zero" test=". > 0">
+ 		<message>No default message, custom error message for expect-custom-non-zero constraint.</message>
+ 	</expect>
+ 	<matches id="matches-default-regex-letters-only" level="ERROR" target="matches-default-regex-letters-only" regex="^[a-zA-Z]$"/> 	
+ 	<matches id="matches-custom-regex-letters-only" level="ERROR" target="matches-custom-regex-letters-only" regex="^[a-zA-Z]$">
+ 		<message>No default message, custom error message for matches-custom-regex-letters-only constraint.</message>
+ 	</matches>
+ 	</constraint>
+ </define-assembly>
+</METASCHEMA>

metaschema-cli/src/test/resources/content/215.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<message-root xmlns="https://github.com/metaschema-framework/metaschema-java/issues/215">
+	<expect-default-non-zero>0</expect-default-non-zero>
+	<expect-custom-non-zero>0</expect-custom-non-zero>
+	<matches-default-regex-letters-only>1</matches-default-regex-letters-only>
+	<matches-custom-regex-letters-only>1</matches-custom-regex-letters-only>
+</message-root>