Merge pull request #210 from swmuir/master

Udates for releaes
onc-healthit · Jul 29, 2024 · 6731baa · 6731baa
2 parents 5ec089d + f05bfb5
commit 6731baa
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/mvnvm.properties b/mvnvm.properties
@@ -0,0 +1 @@
+mvn_version=3.6.3
diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
         <content.validator.version>latestVersion</content.validator.version>
         <!-- MDHT SITE properties -->
        <mdht.models.groupid>mdht.openhealthtools.mdht.cda</mdht.models.groupid>
-        <mdht.models.version>3.0.0.20240624</mdht.models.version>
+        <mdht.models.version>3.0.0.20240724</mdht.models.version>
         <ds4pcontent.groupId>mdht.hl7.ds4p</ds4pcontent.groupId>
         <ds4pcontent.version>${mdht.models.version}</ds4pcontent.version>       
         <mdht.plugins.groupId>mdht.eclipse.mdht</mdht.plugins.groupId>

diff --git a/src/test/java/org/sitenv/referenceccda/test/tests/RefCCDATest.java b/src/test/java/org/sitenv/referenceccda/test/tests/RefCCDATest.java
@@ -55,7 +55,7 @@ public class RefCCDATest extends ReferenceValidationTester implements Validation
 
 	private static final boolean LOG_RESULTS_TO_CONSOLE = true;
 
-	private static final boolean SHOW_ERRORS_ONLY = true;
+	private static  boolean SHOW_ERRORS_ONLY = true;
 
 	private static final int HAS_SCHEMA_ERROR_INDEX = 1, LAST_SCHEMA_TEST_AND_NO_SCHEMA_ERROR_INDEX = 2,
 			INVALID_SNIPPET_ONLY_INDEX = 3, NON_CCDA_XML_HTML_FILE_WITH_XML_EXTENSION_INDEX = 4,
@@ -1475,7 +1475,20 @@ public void testHealthStatusSITE4084() {
 //		failIfIssueIsInResults(results, ValidationResultType.CCDA_MDHT_CONFORMANCE_WARN, "4515-16754");
 	}
 
-
+	@Test
+	public void site4095() {
+		List<RefCCDAValidationResult> results = validateDocumentAndReturnResults(
+				convertCCDAFileToString(CCDA_FILES[SDTCTEST]), CCDATypes.NON_SPECIFIC_CCDAR2);		
+//		results = getMDHTErrorsFromResults(results);
+//		SHOW_ERRORS_ONLY = false;
+
+		ReferenceValidationLogger.printResults(results);
+//		printResultsBasedOnFlags(results);
+//		SHOW_ERRORS_ONLY = true;
+		passIfIssueIsInResults(results, ValidationResultType.CCDA_MDHT_CONFORMANCE_ERROR, "CONF:1198-15350, CONF:1198-32140");
+		failIfIssueIsInResults(results, ValidationResultType.CCDA_MDHT_CONFORMANCE_ERROR, "CONF: 15350");
+		failIfIssueIsInResults(results, ValidationResultType.CCDA_MDHT_CONFORMANCE_ERROR, "CONF: 15346");
+	}	
 
 
 }