Upgraded VeraPdf to 1.16.1

* #9936 Upgraded VeraPdf to 1.16.1 Changed exit code checking to allow parsing of code 1 (which now means invalid pdf) * Made exitcode2.sh executable
Codeuctivity · Mar 15, 2021 · 3ddc21a · 3ddc21a
1 parent af9a845
commit 3ddc21a
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/PdfAValidator/PdfAValidator.cs b/PdfAValidator/PdfAValidator.cs
@@ -132,7 +132,7 @@ public async Task<Report> ValidateWithDetailedReportAsync(string pathToPdfFile)
 
             process.WaitForExit();
 
-            if (process.ExitCode == 0)
+            if (process.ExitCode == 0 || process.ExitCode == 1)
             {
                 ValidateVeraPdfOutputToBeXml(outputResult, PathJava, VeraPdfStartScript);
                 var veraPdfReport = DeserializeXml<Report>(outputResult);

diff --git a/PdfAValidator/VeraPdf.Linux.zip b/PdfAValidator/VeraPdf.Linux.zip
diff --git a/PdfAValidator/VeraPdf.Windows.zip b/PdfAValidator/VeraPdf.Windows.zip
diff --git a/PdfAValidatorTest/PdfAValidatorTest.cs b/PdfAValidatorTest/PdfAValidatorTest.cs
@@ -113,23 +113,23 @@ public static async Task ShouldFailGracefullWithUnrecognicedVeraPdfOutput()
         }
 
         [Fact]
-        public static async Task ShouldFailGracefullWithExitcode1()
+        public static async Task ShouldFailGracefullWithExitcode2()
         {
-            var somethingThatReturnsExitcode1 = "./TestExecuteables/exitcode1.bat";
+            var somethingThatReturnsExitcode2 = "./TestExecuteables/exitcode2.bat";
 
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
             {
-                somethingThatReturnsExitcode1 = "./TestExecuteables/exitcode1.sh";
+                somethingThatReturnsExitcode2 = "./TestExecuteables/exitcode2.sh";
             }
 
             var veraPdfException = await Assert.ThrowsAsync<VeraPdfException>(async () =>
             {
                 // Using default ctor to get Java bins for the test
-                using var pdfAValidator = new PdfAValidator(somethingThatReturnsExitcode1, "SomeValue");
+                using var pdfAValidator = new PdfAValidator(somethingThatReturnsExitcode2, "SomeValue");
                 await pdfAValidator.ValidateAsync("./TestPdfFiles/FromLibreOffice.pdf");
             });
 
-            Assert.Equal($"Calling VeraPdf exited with 1 caused an error: \nCustom JAVACMD: SomeValue\nVeraPdfStartScript: {somethingThatReturnsExitcode1}", veraPdfException.Message);
+            Assert.Equal($"Calling VeraPdf exited with 2 caused an error: \nCustom JAVACMD: SomeValue\nVeraPdfStartScript: {somethingThatReturnsExitcode2}", veraPdfException.Message);
         }
 
         private static void AssertVeraPdfBinCreation(string? scriptPath)

diff --git a/PdfAValidatorTest/PdfAValidatorTest.csproj b/PdfAValidatorTest/PdfAValidatorTest.csproj
@@ -11,15 +11,15 @@
   <ItemGroup>
     <None Remove="TestExecuteables\exitcode0.bat" />
     <None Remove="TestExecuteables\exitcode0.sh" />
-    <None Remove="TestExecuteables\exitcode1.sh" />
+    <None Remove="TestExecuteables\exitcode2.bat" />
+    <None Remove="TestExecuteables\exitcode2.sh" />
     <None Remove="TestPdfFiles\FontsNotEmbedded.pdf" />
     <None Remove="TestPdfFiles\FromLibreOffice.pdf" />
     <None Remove="TestPdfFiles\FromLibreOfficeNonPdfA.pdf" />
-    <None Remove="TestExecuteables\exitcode1.bat" />
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="TestExecuteables\exitcode1.sh">
+    <Content Include="TestExecuteables\exitcode2.sh">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="TestExecuteables\exitcode0.sh">
@@ -34,7 +34,7 @@
     <Content Include="TestPdfFiles\FontsNotEmbedded.pdf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="TestExecuteables\exitcode1.bat">
+    <Content Include="TestExecuteables\exitcode2.bat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="TestExecuteables\exitcode0.bat">

diff --git a/...idatorTest/TestExecuteables/exitcode1.bat → ...idatorTest/TestExecuteables/exitcode2.bat b/...idatorTest/TestExecuteables/exitcode1.bat → ...idatorTest/TestExecuteables/exitcode2.bat
@@ -1,2 +1,2 @@
 @echo off
-EXIT 1
+EXIT 2
diff --git a/...lidatorTest/TestExecuteables/exitcode1.sh → ...lidatorTest/TestExecuteables/exitcode2.sh b/...lidatorTest/TestExecuteables/exitcode1.sh → ...lidatorTest/TestExecuteables/exitcode2.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-exit 1
+exit 2