fixed error message creation code

Codeuctivity · Apr 11, 2020 · 87b12e1 · 87b12e1
1 parent 59dafd3
commit 87b12e1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/PdfAValidator/PdfAValidator.cs b/PdfAValidator/PdfAValidator.cs
@@ -122,7 +122,6 @@ public Report ValidateWithDetailedReport(string pathToPdfFile)
             {
                 process.StartInfo.EnvironmentVariables["JAVACMD"] = PathJava;
             }
-            var currentJavaCmd = process.StartInfo.EnvironmentVariables["JAVACMD"];
             var startInfo = process.StartInfo;
             // http://docs.verapdf.org/cli/terminal/
             var arguments = new[] { maskedQuote, absolutePathToPdfFile, maskedQuote };
@@ -136,14 +135,14 @@ public Report ValidateWithDetailedReport(string pathToPdfFile)
 
             if (process.ExitCode == 0)
             {
-                validateVeraPdfOutputToBeXml(outputResult, currentJavaCmd, VeraPdfStartScript);
+                validateVeraPdfOutputToBeXml(outputResult, PathJava, VeraPdfStartScript);
                 var veraPdfReport = DeserializeXml<Report>(outputResult);
                 return veraPdfReport;
             }
-            throw new VeraPdfException($"Calling VeraPdf exited with {process.ExitCode} caused an error: {errorResult}\nJAVACMD: {currentJavaCmd}\nVeraPdfStartScript: {VeraPdfStartScript}");
+            throw new VeraPdfException($"Calling VeraPdf exited with {process.ExitCode} caused an error: {errorResult}\nCustom JAVACMD: {PathJava}\nVeraPdfStartScript: {VeraPdfStartScript}");
         }
 
-        private void validateVeraPdfOutputToBeXml(string outputResult, string currentJavaCmd, string veraPdfStartScript)
+        private void validateVeraPdfOutputToBeXml(string outputResult, string? customJavaCmd, string? veraPdfStartScript)
         {
             try
             {
@@ -152,7 +151,7 @@ private void validateVeraPdfOutputToBeXml(string outputResult, string currentJav
             }
             catch (XmlException xmlException)
             {
-                throw new VeraPdfException($"Failed to parse VeraPdf Ouput: {outputResult}\n currentJavaCmd: {currentJavaCmd}\n veraPdfStartScriptPath: {veraPdfStartScript}", xmlException);
+                throw new VeraPdfException($"Failed to parse VeraPdf Ouput: {outputResult}\nCustom JAVACMD: {customJavaCmd}\nveraPdfStartScriptPath: {veraPdfStartScript}", xmlException);
             }
         }
 

diff --git a/PdfAValidatorTest/PdfAValidatorTest.cs b/PdfAValidatorTest/PdfAValidatorTest.cs
@@ -125,7 +125,7 @@ public static void ShouldFailGracefullWithUnrecognicedVeraPdfOutput()
                   }
                   Assert.False(File.Exists(veraPdfStartScript));
               });
-            Assert.Equal($"Failed to parse VeraPdf Ouput: \n currentJavaCmd: SomeValue\n veraPdfStartScriptPath: {somethingThatReturnsExitcode0}", veraPdfException.Message);
+            Assert.Equal($"Failed to parse VeraPdf Ouput: \nCustom JAVACMD: SomeValue\nveraPdfStartScriptPath: {somethingThatReturnsExitcode0}", veraPdfException.Message);
         }
 
         [Fact]
@@ -156,7 +156,7 @@ public static void ShouldFailGracefullWithExitcode1()
                 }
                 Assert.False(File.Exists(veraPdfStartScript));
             });
-            Assert.Equal($"Calling VeraPdf exited with 1 caused an error: \nJAVACMD: SomeValue\nVeraPdfStartScript: {somethingThatReturnsExitcode1}", veraPdfException.Message);
+            Assert.Equal($"Calling VeraPdf exited with 1 caused an error: \nCustom JAVACMD: SomeValue\nVeraPdfStartScript: {somethingThatReturnsExitcode1}", veraPdfException.Message);
         }
 
         private static void AssertVeraPdfBinCreation(string? scriptPath)