You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2022/05/13 11:54:47 UTC

[tika] 08/10: upgrade to junit5 in tika-fuzzing

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git

commit 71c9f9f200e853c41a1d2490702d4313e541c1b1
Author: tallison <ta...@apache.org>
AuthorDate: Fri May 13 06:11:15 2022 -0400

    upgrade to junit5 in tika-fuzzing
---
 tika-fuzzing/pom.xml                            | 7 -------
 tika-fuzzing/src/test/java/TestFuzzingCLI.java  | 9 +++++----
 tika-fuzzing/src/test/java/TestTransformer.java | 6 +++---
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/tika-fuzzing/pom.xml b/tika-fuzzing/pom.xml
index 3cc998806..fa4d1fe9e 100644
--- a/tika-fuzzing/pom.xml
+++ b/tika-fuzzing/pom.xml
@@ -79,13 +79,6 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-    <!-- after we migrate everything to junit5, we can get rid of this -->
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <version>${junit5.version}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/tika-fuzzing/src/test/java/TestFuzzingCLI.java b/tika-fuzzing/src/test/java/TestFuzzingCLI.java
index b0a6f7471..9a6009e2e 100644
--- a/tika-fuzzing/src/test/java/TestFuzzingCLI.java
+++ b/tika-fuzzing/src/test/java/TestFuzzingCLI.java
@@ -20,8 +20,9 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 
 import org.apache.commons.io.FileUtils;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
 
 import org.apache.tika.fuzzing.cli.FuzzingCLI;
 import org.apache.tika.utils.ProcessUtils;
@@ -29,7 +30,7 @@ import org.apache.tika.utils.ProcessUtils;
 public class TestFuzzingCLI {
 
     @Test
-    @Ignore
+    @Disabled
     public void testBasic() throws Exception {
         //convert to actual unit test
         String inputDir = "";// fill in
@@ -42,7 +43,7 @@ public class TestFuzzingCLI {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void testMock() throws Exception {
         //convert to actual unit test
         Path inputDir = Paths.get(getClass().getResource("/test-documents").toURI());
diff --git a/tika-fuzzing/src/test/java/TestTransformer.java b/tika-fuzzing/src/test/java/TestTransformer.java
index 858413308..3adc4e3e1 100644
--- a/tika-fuzzing/src/test/java/TestTransformer.java
+++ b/tika-fuzzing/src/test/java/TestTransformer.java
@@ -22,15 +22,15 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import org.apache.tika.fuzzing.general.GeneralTransformer;
 
 public class TestTransformer {
 
     @Test
-    @Ignore
+    @Disabled
     public void testBasic() throws Exception {
         //turn into actual unit test
         Path path = Paths.get("");//put something meaningful here