Change veraPdf log mechanism, add log assert in checkValidatorLogsTest

DEVSIX-7172

Author: Andrei Stryhelski

pdftest/src/main/java/com/itextpdf/test/pdfa/VeraPdfValidator.java

@@ -44,7 +44,7 @@ This file is part of the iText (R) project.
 package com.itextpdf.test.pdfa;
 
 import java.util.logging.Level;
-import org.verapdf.component.Log;
+import java.util.stream.Collectors;
 import org.verapdf.component.LogsSummary;
 import org.verapdf.component.LogsSummaryImpl;
 import org.verapdf.core.VeraPDFException;
@@ -103,14 +103,16 @@ public String validate(String filePath) {
                 errorMessage = "VeraPDF execution failed - specified file is encrypted. See report:  " + xmlReportPath;
             } else if (summary.getValidationSummary().getNonCompliantPdfaCount() != 0) {
                 errorMessage = "VeraPDF verification failed. See verification results:  " + xmlReportPath;
-            } else if (logsSummary.getLogsCount() != 0) {
-                errorMessage = "The following warnings and errors occurred while parsing current file:";
-                for (Log log : logsSummary.getLogs()) {
-                    errorMessage += "\n" + log.getLevel() + ": " + log.getMessage();
-                }
-                errorMessage += "\nSee verification results:" + xmlReportPath;
             } else {
                 System.out.println("VeraPDF verification finished. See verification report: " + xmlReportPath);
+
+                if (logsSummary.getLogsCount() != 0) {
+                    errorMessage = "The following warnings and errors were logged during validation:";
+                    errorMessage += logsSummary.getLogs().stream()
+                            .map(log -> "\n" + log.getLevel() + ": " + log.getMessage())
+                            .sorted()
+                            .collect(Collectors.joining());
+                }
             }
         } catch (IOException | VeraPDFException exc) {
             errorMessage = "VeraPDF execution failed:\n" + exc.getMessage();

pdftest/src/test/java/com/itextpdf/test/VeraPdfLoggerValidationTest.java

@@ -72,7 +72,12 @@ public void checkValidatorLogsTest() throws IOException {
         FileUtil.copy(SOURCE_FOLDER + fileNameWithWarnings, DESTINATION_FOLDER + fileNameWithWarnings);
         FileUtil.copy(SOURCE_FOLDER + fileNameWithoutWarnings, DESTINATION_FOLDER + fileNameWithoutWarnings);
 
-        Assert.assertNotNull(new VeraPdfValidator().validate(DESTINATION_FOLDER + fileNameWithWarnings));
+        String expectedWarningsForFileWithWarnings = "The following warnings and errors were logged during validation:\n"
+                + "WARNING: Invalid embedded cff font. Charset range exceeds number of glyphs\n"
+                + "WARNING: Missing OutputConditionIdentifier in an output intent dictionary\n"
+                + "WARNING: The Top DICT does not begin with ROS operator";
+        Assert.assertEquals(expectedWarningsForFileWithWarnings, new VeraPdfValidator().validate(DESTINATION_FOLDER + fileNameWithWarnings));
+
         //We check that the logs are empty after the first check
         Assert.assertNull(new VeraPdfValidator().validate(DESTINATION_FOLDER + fileNameWithoutWarnings));
     }