FIX: POL_5 level

- fixed bug in SchematronRule that hard-coded error level; - changed POL_5 tests to INFO level; and - fixed tests.
openpreserve · Dec 11, 2023 · 09569b7 · 09569b7
1 parent 1059f5a
commit 09569b7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/odf-core/src/main/java/org/openpreservation/odf/validation/rules/SchematronRule.java b/odf-core/src/main/java/org/openpreservation/odf/validation/rules/SchematronRule.java
@@ -56,7 +56,7 @@ public MessageLog check(final OdfPackage odfPackage) throws IOException {
                 for (final AbstractSVRLMessage result : SVRLHelper
                         .getAllFailedAssertionsAndSuccessfulReports(schResult)) {
                     messageLog.add(entry.getFullPath(),
-                            Messages.getMessageInstance(this.id, Message.Severity.ERROR, this.getName(),
+                            Messages.getMessageInstance(this.id, Message.Severity.valueOf(result.getRole()), this.getName(),
                                     result.getText()));
                 }
             } catch (final Exception e) {

diff --git a/odf-core/src/main/resources/org/openpreservation/odf/core/odf/validation/rules/odf-5.sch b/odf-core/src/main/resources/org/openpreservation/odf/core/odf/validation/rules/odf-5.sch
@@ -7,16 +7,16 @@
   <pattern id="POL_5">
     <title>External data check</title>
     <rule context="//office:document-content">
-      <assert id="POL_5.1" role="ERROR" test="count(//table:dde-links) &lt; 1">Table Dynamic Data Exchange link declarations detected.</assert>
-      <assert id="POL_5.2" role="ERROR" test="count(//office:dde-source) &lt; 1">Dynamic Data Exchange connection detected.</assert>
-      <assert id="POL_5.3" role="ERROR" test="count(//table:table-cell[@table:formula]) &lt; 1">Table formula detected.</assert>
-      <assert id="POL_5.4" role="ERROR" test="count(//form:connection-resource) &lt; 1">Form connection resource detected.</assert>
-      <assert id="POL_5.5" role="ERROR" test="count(//table:table-source) &lt; 1">Table source detected.</assert>
-      <assert id="POL_5.6" role="ERROR" test="count(//table:cell-range-source) &lt; 1">Table cell-range source detected.</assert>
-      <assert id="POL_5.7" role="ERROR" test="count(//table:database-source-sql) &lt; 1">SQL database source detected.</assert>
-      <assert id="POL_5.8" role="ERROR" test="count(//table:database-source-table) &lt; 1">Table database source detected.</assert>
-      <assert id="POL_5.9" role="ERROR" test="count(//table:database-source-query) &lt; 1">Query database source detected.</assert>
-      <assert id="POL_5.10" role="ERROR" test="count(//text:dde-connection-decls) &lt; 1">Dynamic Data Exchange declarations detected.</assert>
+      <assert id="POL_5.1" role="INFO" test="count(//table:dde-links) &lt; 1">Table Dynamic Data Exchange link declarations detected.</assert>
+      <assert id="POL_5.2" role="INFO" test="count(//office:dde-source) &lt; 1">Dynamic Data Exchange connection detected.</assert>
+      <assert id="POL_5.3" role="INFO" test="count(//table:table-cell[@table:formula]) &lt; 1">Table formula detected.</assert>
+      <assert id="POL_5.4" role="INFO" test="count(//form:connection-resource) &lt; 1">Form connection resource detected.</assert>
+      <assert id="POL_5.5" role="INFO" test="count(//table:table-source) &lt; 1">Table source detected.</assert>
+      <assert id="POL_5.6" role="INFO" test="count(//table:cell-range-source) &lt; 1">Table cell-range source detected.</assert>
+      <assert id="POL_5.7" role="INFO" test="count(//table:database-source-sql) &lt; 1">SQL database source detected.</assert>
+      <assert id="POL_5.8" role="INFO" test="count(//table:database-source-table) &lt; 1">Table database source detected.</assert>
+      <assert id="POL_5.9" role="INFO" test="count(//table:database-source-query) &lt; 1">Query database source detected.</assert>
+      <assert id="POL_5.10" role="INFO" test="count(//text:dde-connection-decls) &lt; 1">Dynamic Data Exchange declarations detected.</assert>
     </rule>
   </pattern>
 </schema>
diff --git a/odf-core/src/test/java/org/openpreservation/odf/validation/rules/ExternalDataTest.java b/odf-core/src/test/java/org/openpreservation/odf/validation/rules/ExternalDataTest.java
@@ -83,7 +83,8 @@ public void testPackageExternalDataFail() throws Exception {
         OdfPackage pkg = parser.parsePackage(Paths.get(new File(TestFiles.SCHEMATRON_CHECKER_ODS.toURI()).getAbsolutePath()));
         MessageLog messages = odf5.check(pkg);
         assertNotNull(messages);
-        assertEquals(1, messages.getErrors().size());
+        assertEquals(0, messages.getErrors().size());
+        assertEquals(1, messages.getInfos().size());
         assertEquals(1, messages.getMessages().values().stream().filter(m -> m.stream().filter(e -> e.getId().equals("POL_5")).count() > 0).count());
     }