Excavator: Switch to JUnit 5 to parallelize tests and speed up CI

palantir · Feb 23, 2023 · 65ecb88 · 65ecb88
1 parent bf82be5
commit 65ecb88
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 19 deletions.
diff --git a/baseline-refaster-rules/build.gradle b/baseline-refaster-rules/build.gradle
@@ -11,6 +11,10 @@ dependencies {
     testImplementation 'org.immutables:value::annotations'
 
     compileOnly 'org.immutables:value::annotations'
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine', {
+        because 'allows JUnit 3 and JUnit 4 tests to run'
+    }
 }
 
 // Do not apply refaster rules
@@ -35,4 +39,4 @@ moduleJvmArgs {
             'jdk.compiler/com.sun.tools.javac.util'
     ]
     opens = ['jdk.compiler/com.sun.tools.javac.comp']
-}
+}
diff --git a/...refaster-rules/src/test/java/com/palantir/baseline/refaster/AddAllArrayToBuilderTest.java b/...refaster-rules/src/test/java/com/palantir/baseline/refaster/AddAllArrayToBuilderTest.java
@@ -18,7 +18,7 @@
 
 import static org.assertj.core.api.Assumptions.assumeThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AddAllArrayToBuilderTest {
 

diff --git a/...e-refaster-rules/src/test/java/com/palantir/baseline/refaster/CollectionsIsEmptyTest.java b/...e-refaster-rules/src/test/java/com/palantir/baseline/refaster/CollectionsIsEmptyTest.java
@@ -16,7 +16,7 @@
 
 package com.palantir.baseline.refaster;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CollectionsIsEmptyTest {
 

diff --git a/...ules/src/test/java/com/palantir/baseline/refaster/InvocationTargetExceptionCauseTest.java b/...ules/src/test/java/com/palantir/baseline/refaster/InvocationTargetExceptionCauseTest.java
@@ -16,7 +16,7 @@
 
 package com.palantir.baseline.refaster;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class InvocationTargetExceptionCauseTest {
 

diff --git a/...faster-rules/src/test/java/com/palantir/baseline/refaster/OptionalOrElseSupplierTest.java b/...faster-rules/src/test/java/com/palantir/baseline/refaster/OptionalOrElseSupplierTest.java
@@ -16,7 +16,7 @@
 
 package com.palantir.baseline.refaster;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class OptionalOrElseSupplierTest {
 

diff --git a/...e-refaster-rules/src/test/java/com/palantir/baseline/refaster/SortedFirstNaturalTest.java b/...e-refaster-rules/src/test/java/com/palantir/baseline/refaster/SortedFirstNaturalTest.java
@@ -16,7 +16,7 @@
 
 package com.palantir.baseline.refaster;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SortedFirstNaturalTest {
 

diff --git a/baseline-refaster-rules/src/test/java/com/palantir/baseline/refaster/SortedFirstTest.java b/baseline-refaster-rules/src/test/java/com/palantir/baseline/refaster/SortedFirstTest.java
@@ -16,7 +16,7 @@
 
 package com.palantir.baseline.refaster;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SortedFirstTest {
 

diff --git a/...-refaster-rules/src/test/java/com/palantir/baseline/refaster/TritiumReplaceGaugeTest.java b/...-refaster-rules/src/test/java/com/palantir/baseline/refaster/TritiumReplaceGaugeTest.java
@@ -18,7 +18,7 @@
 
 import static org.assertj.core.api.Assumptions.assumeThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TritiumReplaceGaugeTest {
 

diff --git a/baseline-refaster-rules/src/test/java/com/palantir/baseline/refaster/Utf8LengthTest.java b/baseline-refaster-rules/src/test/java/com/palantir/baseline/refaster/Utf8LengthTest.java
@@ -16,7 +16,7 @@
 
 package com.palantir.baseline.refaster;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class Utf8LengthTest {
 

diff --git a/baseline-refaster-testing/build.gradle b/baseline-refaster-testing/build.gradle
@@ -24,6 +24,7 @@ dependencies {
     api 'com.google.guava:guava'
     api 'junit:junit'
     api 'org.assertj:assertj-core'
+    testImplementation 'org.junit.jupiter:junit-jupiter'
 }
 
 tasks.checkClassUniqueness.enabled = false
@@ -42,4 +43,4 @@ moduleJvmArgs {
             'jdk.compiler/com.sun.tools.javac.tree',
             'jdk.compiler/com.sun.tools.javac.util'
     ]
-}
+}
diff --git a/...e-junit-reports/src/test/java/com/palantir/gradle/junit/CheckstyleReportHandlerTests.java b/...e-junit-reports/src/test/java/com/palantir/gradle/junit/CheckstyleReportHandlerTests.java
@@ -22,7 +22,7 @@
 
 import java.io.IOException;
 import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CheckstyleReportHandlerTests {
 

diff --git a/...e-junit-reports/src/test/java/com/palantir/gradle/junit/FailuresReportGeneratorTests.java b/...e-junit-reports/src/test/java/com/palantir/gradle/junit/FailuresReportGeneratorTests.java
@@ -25,7 +25,7 @@
 import com.google.common.collect.ImmutableList;
 import java.io.File;
 import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public final class FailuresReportGeneratorTests {
 

diff --git a/gradle-junit-reports/src/test/java/com/palantir/gradle/junit/JavacFailuresSupplierTest.java b/gradle-junit-reports/src/test/java/com/palantir/gradle/junit/JavacFailuresSupplierTest.java
@@ -18,7 +18,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.File;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public final class JavacFailuresSupplierTest {
 

diff --git a/gradle-junit-reports/src/test/java/com/palantir/gradle/junit/JunitReportCreatorTests.java b/gradle-junit-reports/src/test/java/com/palantir/gradle/junit/JunitReportCreatorTests.java
@@ -22,7 +22,7 @@
 
 import java.io.StringWriter;
 import javax.xml.transform.TransformerException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 
 public final class JunitReportCreatorTests {

diff --git a/gradle-junit-reports/src/test/java/com/palantir/gradle/junit/JunitReportsFinalizerTests.java b/gradle-junit-reports/src/test/java/com/palantir/gradle/junit/JunitReportsFinalizerTests.java
@@ -32,14 +32,13 @@
 import org.gradle.api.plugins.quality.Checkstyle;
 import org.gradle.api.reporting.SingleFileReport;
 import org.gradle.testfixtures.ProjectBuilder;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class JunitReportsFinalizerTests {
 
-    @Rule
-    public final TemporaryFolder projectDir = new TemporaryFolder();
+    @TempDir
+    public File projectDir;
 
     @Test
     public void translatesCheckstyleReport() throws IOException, TransformerException {