PDFBOX-5660: Sonar fix

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1924821 13f79535-47bb-0310-9956-ffa450edef68

Author: THausherr

pdfbox/src/test/java/org/apache/pdfbox/pdfwriter/ContentStreamWriterTest.java

@@ -33,10 +33,7 @@
 import org.apache.pdfbox.pdmodel.common.PDStream;
 import org.apache.pdfbox.rendering.PDFRenderer;
 import org.apache.pdfbox.rendering.TestPDFToImage;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
@@ -48,39 +45,21 @@
 @Execution(ExecutionMode.SAME_THREAD)
 class ContentStreamWriterTest
 {
-    private final File testDirIn = new File("target/test-output/contentstream/in");
-    private final File testDirOut = new File("target/test-output/contentstream/out");
-    
-    ContentStreamWriterTest()
-    {
-        testDirIn.mkdirs();
-        testDirOut.mkdirs();
-    }
+    private static final File TESTDIRIN = new File("target/test-output/contentstream/in");
+    private static final File TESTDIROUT = new File("target/test-output/contentstream/out");
 
     @BeforeAll
-    public static void setUpClass()
+    static void setUp()
     {
+        TESTDIRIN.mkdirs();
+        TESTDIROUT.mkdirs();
+
         // PDFBOX-5425: try to avoid "java.awt.color.CMMException: Unknown profile ID"
         ColorSpace csRGB = ColorSpace.getInstance(ColorSpace.CS_sRGB);
         csRGB.toRGB(new float[] { 0, 0, 0 });
         ColorSpace csXYZ = ColorSpace.getInstance(ColorSpace.CS_CIEXYZ);
         csXYZ.toRGB(new float[] { 0, 0, 0 });
     }
-    
-    @AfterAll
-    public static void tearDownClass()
-    {
-    }
-    
-    @BeforeEach
-    public void setUp()
-    {
-    }
-    
-    @AfterEach
-    public void tearDown()
-    {
-    }
 
     /**
      * Test parse content stream, write back tokens and compare rendering.
@@ -98,7 +77,7 @@ void testPDFBox4750() throws IOException
             for (int i = 0; i < doc.getNumberOfPages(); ++i)
             {
                 BufferedImage bim1 = r.renderImageWithDPI(i, 96);
-                ImageIO.write(bim1, "png", new File(testDirIn, filename + "-" + (i + 1) + ".png"));
+                ImageIO.write(bim1, "png", new File(TESTDIRIN, filename + "-" + (i + 1) + ".png"));
                 PDPage page = doc.getPage(i);
                 PDStream newContent = new PDStream(doc);
                 try (OutputStream os = newContent.createOutputStream(COSName.FLATE_DECODE))
@@ -109,12 +88,12 @@ void testPDFBox4750() throws IOException
                 }
                 page.setContents(newContent);
             }
-            doc.save(new File(testDirIn, filename));
+            doc.save(new File(TESTDIRIN, filename));
         }
-        if (!TestPDFToImage.doTestFile(new File(testDirIn, filename), testDirIn.getAbsolutePath(),
-                testDirOut.getAbsolutePath()))
+        if (!TestPDFToImage.doTestFile(new File(TESTDIRIN, filename), TESTDIRIN.getAbsolutePath(),
+                TESTDIROUT.getAbsolutePath()))
         {
-            fail("Rendering failed or is not identical, see in " + testDirOut);
+            fail("Rendering failed or is not identical, see in " + TESTDIROUT);
         }
     }
 }

pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocument.java

@@ -46,7 +46,7 @@ class TestPDDocument
     private static final File TESTRESULTSDIR = new File("target/test-output");
 
     @BeforeAll
-    public static void setUp() throws Exception
+    static void setUp() throws Exception
     {
         TESTRESULTSDIR.mkdirs();
     }

tools/src/test/java/org/apache/pdfbox/tools/PDFBoxHeadlessTest.java

@@ -41,13 +41,13 @@ class PDFBoxHeadlessTest
     final ByteArrayOutputStream err = new ByteArrayOutputStream();
 
     @BeforeAll
-    public static void setHeadless()
+    static void setUp()
     {
         System.setProperty("java.awt.headless", "true");
-    } 
+    }
 
     @BeforeEach
-    public void setUpStreams()
+    void setUpStreams()
     {
         out.reset();
         err.reset();
@@ -56,7 +56,7 @@ public void setUpStreams()
     }
 
     @AfterEach
-    public void restoreStreams()
+    void restoreStreams()
     {
         System.setOut(originalOut);
         System.setErr(originalErr);

tools/src/test/java/org/apache/pdfbox/tools/TestExtractText.java

@@ -54,15 +54,15 @@ class TestExtractText
     static String filename2 = null;
 
     @BeforeAll
-    public static void setupFilenames()
+    static void setupFilenames()
     {
         // the filename representation is platform dependent
         filename1 = Paths.get(TESTFILE1).toString();
         filename2 = Paths.get(TESTFILE2).toString();
     }
 
     @BeforeEach
-    public void setUpStreams()
+    void setUpStreams()
     {
         out.reset();
         try