svn commit: r1883551 - in /pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox: ParallelParameterized.java rendering/TestPDFToImage.java rendering/TestRendering.java

[ms...@apache.org]

Author: msahyoun
Date: Tue Nov 17 18:01:03 2020
New Revision: 1883551

URL: http://svn.apache.org/viewvc?rev=1883551&view=rev
Log:
PDFBOX-5017: move testing out of utility class; remove no longer needed class

Removed:
    pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/ParallelParameterized.java
Modified:
    pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java
    pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestRendering.java

Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java?rev=1883551&r1=1883550&r2=1883551&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java Tue Nov 17 18:01:03 2020
@@ -24,21 +24,12 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
 import javax.imageio.ImageIO;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.pdfbox.Loader;
-import org.apache.pdfbox.ParallelParameterized;
 import org.apache.pdfbox.pdmodel.PDDocument;
 
-import static org.junit.Assert.fail;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 /**
  * Test suite for rendering.
  *
@@ -63,7 +54,6 @@ import org.junit.runners.Parameterized;
  * @author Ben Litchfield
  * @author Tilman Hausherr
  */
-@RunWith(ParallelParameterized.class)
 public class TestPDFToImage
 {
 
@@ -76,26 +66,6 @@ public class TestPDFToImage
     static String outDir = "target/test-output/rendering/";
     
     String filename;
-    
-    @Parameterized.Parameters(name = "{0}")
-    public static Collection<Object[]> data()
-    {
-        File[] testFiles = new File(inDir).listFiles(new FilenameFilter()
-        {
-            @Override
-            public boolean accept(File dir, String name)
-            {
-                return (name.toLowerCase().endsWith(".pdf") || name.toLowerCase().endsWith(".ai"));
-            }
-        });
-
-        List<Object[]> params = new ArrayList<>();
-        for (File file : testFiles)
-        {
-            params.add(new Object[] { file.getName() });
-        }
-        return params;
-    }
 
     /**
      * Test class constructor.
@@ -108,22 +78,6 @@ public class TestPDFToImage
     {
         this.filename = filename;
     }
-    
-   /**
-     * Test to validate image rendering of file.
-     *
-     * @throws IOException when there is an exception
-     */
-    @Test
-    public void testRenderImage() throws IOException
-    {
-        new File(outDir).mkdirs();
-
-        if (!doTestFile(new File(inDir, filename), inDir, outDir))
-        {
-            fail("failure, see test log for details");
-        }
-    }
 
     /**
      * Create an image; the part between the smaller and the larger image is painted black, the rest

Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestRendering.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestRendering.java?rev=1883551&r1=1883550&r2=1883551&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestRendering.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestRendering.java Tue Nov 17 18:01:03 2020
@@ -23,6 +23,8 @@ import org.junit.jupiter.params.Paramete
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
+import static org.junit.jupiter.api.Assertions.fail;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
@@ -40,6 +42,7 @@ import java.util.stream.Stream;
 public class TestRendering
 {
     private static final String INPUT_DIR = "src/test/resources/input/rendering";
+    private static final String OUTPUT_DIR = "target/test-output/rendering/";
 
     public static Collection<Arguments> data()
     {
@@ -64,4 +67,18 @@ public class TestRendering
 
         document.close();
     }
+
+    // @ParameterizedTest
+	@MethodSource("data")
+    public void renderAndCompare(String fileName) throws IOException
+    {
+
+        new File(OUTPUT_DIR).mkdirs();
+        // compare rendering
+        TestPDFToImage testPDFToImage = new TestPDFToImage(TestPDFToImage.class.getName());
+        if (!testPDFToImage.doTestFile(new File(INPUT_DIR, fileName), INPUT_DIR, OUTPUT_DIR))
+        {
+            fail("Rendering of " + fileName + " failed or is not identical to expected rendering in " + INPUT_DIR + " directory");
+        }
+    }
 }