You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ms...@apache.org on 2020/11/17 21:33:20 UTC

svn commit: r1883565 - in /pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight: TestInvalidDirectory.java TestValidDirectory.java

Author: msahyoun
Date: Tue Nov 17 21:33:20 2020
New Revision: 1883565

URL: http://svn.apache.org/viewvc?rev=1883565&view=rev
Log:
PDFBOX-5017: avoid PreconditionViolation in parameterized test for empty list

Modified:
    pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestInvalidDirectory.java
    pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestValidDirectory.java

Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestInvalidDirectory.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestInvalidDirectory.java?rev=1883565&r1=1883564&r2=1883565&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestInvalidDirectory.java (original)
+++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestInvalidDirectory.java Tue Nov 17 21:33:20 2020
@@ -26,7 +26,6 @@ import static org.junit.jupiter.api.Asse
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 
 import org.apache.pdfbox.preflight.parser.PreflightParser;
@@ -39,10 +38,12 @@ public class TestInvalidDirectory
     @MethodSource("initializeParameters")
     public void validate(File target) throws Exception
     {
-        System.out.println(target);
-        ValidationResult result = PreflightParser.validate(target);
-        assertFalse(result.isValid(), "Test of " + target);
-
+        if (target != null)
+        {
+            System.out.println(target);
+            ValidationResult result = PreflightParser.validate(target);
+            assertFalse(result.isValid(), "Test of " + target);
+        }
     }
 
     public static Collection<File> initializeParameters() throws Exception
@@ -69,7 +70,12 @@ public class TestInvalidDirectory
         // create list
         if (directory == null)
         {
-            return Collections.emptyList();
+            // add null to signal that test can be skipped
+            // needed for parameterized test as an empty list 
+            // will lead to a PreconditionViolation
+            List<File> data = new ArrayList<>(1);
+            data.add(null);
+            return data;
         }
         else
         {

Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestValidDirectory.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestValidDirectory.java?rev=1883565&r1=1883564&r2=1883565&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestValidDirectory.java (original)
+++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestValidDirectory.java Tue Nov 17 21:33:20 2020
@@ -26,7 +26,6 @@ import static org.junit.jupiter.api.Asse
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 
 import org.apache.pdfbox.preflight.parser.PreflightParser;
@@ -39,9 +38,12 @@ public class TestValidDirectory
     @MethodSource("initializeParameters")
     public void validate(File target) throws Exception
     {
-        System.out.println(target);
-        ValidationResult result = PreflightParser.validate(target);
-        assertTrue(result.isValid(), "Validation of " + target);
+        if (target != null)
+        {
+            System.out.println(target);
+            ValidationResult result = PreflightParser.validate(target);
+            assertTrue(result.isValid(), "Validation of " + target);
+        }
     }
 
     public static Collection<File> initializeParameters() throws Exception
@@ -68,7 +70,12 @@ public class TestValidDirectory
         // create list
         if (directory == null)
         {
-            return Collections.emptyList();
+            // add null to signal that test can be skipped
+            // needed for parameterized test as an empty list 
+            // will lead to a PreconditionViolation
+            List<File> data = new ArrayList<>(1);
+            data.add(null);
+            return data;
         }
         else
         {