Home Explore Help
Register Sign In
lqb
/
java-wkhtmltopdf-wrapper
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Fix for the callingGetCommandFollowedByGetPdfShouldNotInfluenceTheOutput bug

Thomas van Putten 7 years ago
parent
ccb2d5fb34
commit
6f9eda86d5
2 changed files with 20 additions and 24 deletions
Split View Show Diff Stats
  1. 4 3
      src/main/java/com/github/jhonnymertz/wkhtmltopdf/wrapper/Pdf.java
  2. 16 21
      src/test/java/com/github/jhonnymertz/wkhtmltopdf/wrapper/PdfTest.java

+ 4 - 3
src/main/java/com/github/jhonnymertz/wkhtmltopdf/wrapper/Pdf.java
View File 

@@ -138,10 +138,11 @@ public class Pdf {
 
                 File temp = File.createTempFile("java-wkhtmltopdf-wrapper" + UUID.randomUUID().toString(), ".html");
 
                 FileUtils.writeStringToFile(temp, page.getSource(), "UTF-8");
 
 
-                page.setSource(temp.getAbsolutePath());
 
+                commandLine.add(temp.getAbsolutePath());
 
+            }
 
+            else {
 
+                commandLine.add(page.getSource());
 
             }
 
-
 
-            commandLine.add(page.getSource());
 
         }
 
         commandLine.add(STDINOUT);
 
         return commandLine.toArray(new String[commandLine.size()]);

+ 16 - 21
src/test/java/com/github/jhonnymertz/wkhtmltopdf/wrapper/PdfTest.java
View File 

@@ -2,6 +2,7 @@ package com.github.jhonnymertz.wkhtmltopdf.wrapper;
 
 
 import com.github.jhonnymertz.wkhtmltopdf.wrapper.configurations.WrapperConfig;
 
 import com.github.jhonnymertz.wkhtmltopdf.wrapper.params.Param;
 
+import java.io.IOException;
 
 import org.apache.pdfbox.pdfparser.PDFParser;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 
 import org.apache.pdfbox.util.PDFTextStripper;
 
@@ -40,12 +41,7 @@ public class PdfTest {
 
         // WHEN
 
         byte[] pdfBytes = pdf.getPDF();
 
 
-        PDFParser parser = new PDFParser(new ByteArrayInputStream(pdfBytes));
 
-
 
-        // that is a valid PDF (otherwise an IOException occurs)
 
-        parser.parse();
 
-        PDFTextStripper pdfTextStripper = new PDFTextStripper();
 
-        String pdfText = pdfTextStripper.getText(new PDDocument(parser.getDocument()));
 
+        String pdfText = getPdfTextFromBytes(pdfBytes);
 
 
         Assert.assertThat("document should contain the creditorName", pdfText, containsString("Müller"));
 
     }
 
@@ -61,12 +57,7 @@ public class PdfTest {
 
         // WHEN
 
         byte[] pdfBytes = pdf.getPDF();
 
 
-        PDFParser parser = new PDFParser(new ByteArrayInputStream(pdfBytes));
 
-
 
-        // that is a valid PDF (otherwise an IOException occurs)
 
-        parser.parse();
 
-        PDFTextStripper pdfTextStripper = new PDFTextStripper();
 
-        String pdfText = pdfTextStripper.getText(new PDDocument(parser.getDocument()));
 
+        String pdfText = getPdfTextFromBytes(pdfBytes);
 
 
         Assert.assertThat("document should contain the fourth page name", pdfText, containsString("Page 4"));
 
     }
 
@@ -78,16 +69,11 @@ public class PdfTest {
 
         pdf.addPageFromString("<html><head><meta charset=\"utf-8\"></head><h1>Twice</h1></html>");
 
 
         // WHEN
 
-        pdf.getCommand();//The command side effect cause the second call to getPDF to go wrong
 
-
 
-        byte[] pdfBytes = pdf.getPDF();
 
+        pdf.getCommand();
 
+        //Followed by
 
+        byte[] pdfBytes = pdf.getPDF();//Causes the page fromString's content to have become the file path
 
 
-        PDFParser parser = new PDFParser(new ByteArrayInputStream(pdfBytes));
 
-
 
-        // that is a valid PDF (otherwise an IOException occurs)
 
-        parser.parse();
 
-        PDFTextStripper pdfTextStripper = new PDFTextStripper();
 
-        String pdfText = pdfTextStripper.getText(new PDDocument(parser.getDocument()));
 
+        String pdfText = getPdfTextFromBytes(pdfBytes);
 
 
         Assert.assertThat("document should contain the string that was originally inserted", pdfText, containsString("Twice"));
 
     }
 
@@ -103,4 +89,13 @@ public class PdfTest {
 
         File savedPdf = pdf.saveAs("output.pdf");
 
         Assert.assertTrue(savedPdf.delete());
 
     }
 
+
 
+    private String getPdfTextFromBytes(byte[] pdfBytes) throws IOException {
 
+        PDFParser parser = new PDFParser(new ByteArrayInputStream(pdfBytes));
 
+
 
+        // that is a valid PDF (otherwise an IOException occurs)
 
+        parser.parse();
 
+        PDFTextStripper pdfTextStripper = new PDFTextStripper();
 
+        return pdfTextStripper.getText(new PDDocument(parser.getDocument()));
 
+    }
 
 }