HackBase/fop4apex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix sonarcloud checks

Browse Source
This commit is contained in:
Oliver Warz 2022-09-09 23:02:22 +02:00
parent 06f2ba09c7
commit 7f4b91cb2d
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>de.pdv.apex</groupId> <groupId>de.pdv.apex</groupId>
<artifactId>fop4apex</artifactId> <artifactId>fop4apex</artifactId>
<version>0.10.2-SNAPSHOT</version> <version>0.10.3-SNAPSHOT</version>
<name>fop4apex</name> <name>fop4apex</name>
<packaging>war</packaging> <packaging>war</packaging>
<url>https://www.pdv.de</url> <url>https://www.pdv.de</url>

4
src/main/java/de/pdv/apex/PdfServlet.java
View File

@ -99,8 +99,8 @@ public class PdfServlet extends HttpServlet {
if (logger.isLoggable(Level.FINEST)) { 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("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 file length: %s", templateFile.length()));
logger.log(Level.FINEST, String.format("Template data: %s", templateData)); logger.log(Level.FINEST, String.format("Template data length: %s", templateData.length()));
logger.log(Level.FINEST, String.format("Content type: %s", contentType)); logger.log(Level.FINEST, String.format("Content type: %s", contentType));
} }

10
src/test/java/de/pdv/apex/PdfServletTest.java
View File

@ -1,7 +1,7 @@
package de.pdv.apex; package de.pdv.apex;
import org.apache.commons.io.IOUtils; 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.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.mockito.Mock; import org.mockito.Mock;
@ -53,10 +53,10 @@ class PdfServletTest extends Mockito {
PdfServletTest app = new PdfServletTest(); PdfServletTest app = new PdfServletTest();
InputStream xsltFile = app.getClass().getClassLoader().getResourceAsStream("samples/kostenblatt_2014.xsl"); InputStream xsltFile = app.getClass().getClassLoader().getResourceAsStream("samples/kostenblatt_2014.xsl");
assert xsltFile != null; 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"); InputStream xmlFile = app.getClass().getClassLoader().getResourceAsStream("samples/kostenblatt_2014.xml");
assert xmlFile != null; 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(servlet.getServletConfig()).thenReturn(servletConfig);
when(response.getOutputStream()).thenReturn(outputStream); when(response.getOutputStream()).thenReturn(outputStream);
when(request.getParameter("template")).thenReturn(xsltFileContent); when(request.getParameter("template")).thenReturn(xsltFileContent);
@ -72,13 +72,15 @@ class PdfServletTest extends Mockito {
@Test @Test
void init() { void init() {
when(servlet.getServletConfig()).thenReturn(servletConfig); when(servlet.getServletConfig()).thenReturn(servletConfig);
assertNotNull(servlet);
servlet.init(); servlet.init();
assertDoesNotThrow( () -> servlet.init());
} }
@Test @Test
void getServletInfo() { void getServletInfo() {
when(servlet.getServletConfig()).thenReturn(servletConfig); when(servlet.getServletConfig()).thenReturn(servletConfig);
String s = servlet.getServletInfo(); String s = servlet.getServletInfo();
Assertions.assertEquals("APEX FOP Server",s); assertEquals("APEX FOP Server",s);
} }
} }