diff --git a/pom.xml b/pom.xml index 800e283..f1f0390 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ de.pdv.apex fop4apex - 0.10.2-SNAPSHOT + 0.10.3-SNAPSHOT fop4apex war https://www.pdv.de diff --git a/src/main/java/de/pdv/apex/PdfServlet.java b/src/main/java/de/pdv/apex/PdfServlet.java index 5395966..5aa725b 100644 --- a/src/main/java/de/pdv/apex/PdfServlet.java +++ b/src/main/java/de/pdv/apex/PdfServlet.java @@ -99,8 +99,8 @@ public class PdfServlet extends HttpServlet { if (logger.isLoggable(Level.FINEST)) { logger.log(Level.FINEST, String.format("Working directory: %s", new File("dummy1.txt").getAbsolutePath())); - logger.log(Level.FINEST, String.format("Template file: %s", templateFile)); - logger.log(Level.FINEST, String.format("Template data: %s", templateData)); + logger.log(Level.FINEST, String.format("Template file length: %s", templateFile.length())); + logger.log(Level.FINEST, String.format("Template data length: %s", templateData.length())); logger.log(Level.FINEST, String.format("Content type: %s", contentType)); } diff --git a/src/test/java/de/pdv/apex/PdfServletTest.java b/src/test/java/de/pdv/apex/PdfServletTest.java index 18c92aa..88b0063 100644 --- a/src/test/java/de/pdv/apex/PdfServletTest.java +++ b/src/test/java/de/pdv/apex/PdfServletTest.java @@ -1,7 +1,7 @@ package de.pdv.apex; import org.apache.commons.io.IOUtils; -import org.junit.jupiter.api.Assertions; +import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; @@ -53,10 +53,10 @@ class PdfServletTest extends Mockito { PdfServletTest app = new PdfServletTest(); InputStream xsltFile = app.getClass().getClassLoader().getResourceAsStream("samples/kostenblatt_2014.xsl"); assert xsltFile != null; - String xsltFileContent = IOUtils.toString(xsltFile, StandardCharsets.UTF_8.name()); + String xsltFileContent = IOUtils.toString(xsltFile, StandardCharsets.UTF_8); InputStream xmlFile = app.getClass().getClassLoader().getResourceAsStream("samples/kostenblatt_2014.xml"); assert xmlFile != null; - String xmlFileContent = IOUtils.toString(xmlFile, StandardCharsets.UTF_8.name()); + String xmlFileContent = IOUtils.toString(xmlFile, StandardCharsets.UTF_8); when(servlet.getServletConfig()).thenReturn(servletConfig); when(response.getOutputStream()).thenReturn(outputStream); when(request.getParameter("template")).thenReturn(xsltFileContent); @@ -72,13 +72,15 @@ class PdfServletTest extends Mockito { @Test void init() { when(servlet.getServletConfig()).thenReturn(servletConfig); + assertNotNull(servlet); servlet.init(); + assertDoesNotThrow( () -> servlet.init()); } @Test void getServletInfo() { when(servlet.getServletConfig()).thenReturn(servletConfig); String s = servlet.getServletInfo(); - Assertions.assertEquals("APEX FOP Server",s); + assertEquals("APEX FOP Server",s); } }