From a762790041df692951d96e262708394d6c7a7bc7 Mon Sep 17 00:00:00 2001
From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com>
Date: Thu, 22 Sep 2022 17:40:53 +0100
Subject: [PATCH] Excavator:  Switch to JUnit 5 to parallelize tests and speed
 up CI (#381)

---
 human-readable-types/build.gradle                      |  3 ++-
 .../HumanReadableByteCountTests.java                   |  2 +-
 .../humanreadabletypes/HumanReadableDurationTests.java |  2 +-
 versions.lock                                          | 10 ++++++++--
 versions.props                                         |  2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/human-readable-types/build.gradle b/human-readable-types/build.gradle
index d5530bf0..367a4d98 100644
--- a/human-readable-types/build.gradle
+++ b/human-readable-types/build.gradle
@@ -21,6 +21,7 @@ dependencies {
     api 'com.fasterxml.jackson.datatype:jackson-datatype-guava'
     implementation 'com.palantir.safe-logging:preconditions'
 
-    testImplementation 'junit:junit'
     testImplementation 'org.assertj:assertj-core'
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api'
 }
diff --git a/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableByteCountTests.java b/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableByteCountTests.java
index d98b16e4..6c5e004b 100644
--- a/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableByteCountTests.java
+++ b/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableByteCountTests.java
@@ -27,7 +27,7 @@
 import java.util.Arrays;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public final class HumanReadableByteCountTests {
     private static final ObjectMapper objectMapper = new ObjectMapper();
diff --git a/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableDurationTests.java b/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableDurationTests.java
index 5cdf6ec2..d189e4cd 100644
--- a/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableDurationTests.java
+++ b/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableDurationTests.java
@@ -25,7 +25,7 @@
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public final class HumanReadableDurationTests {
     private static final ObjectMapper objectMapper = new ObjectMapper();
diff --git a/versions.lock b/versions.lock
index e4cd31e0..92b65015 100644
--- a/versions.lock
+++ b/versions.lock
@@ -14,6 +14,12 @@ com.palantir.safe-logging:safe-logging:1.20.0 (1 constraints: 2f114fd1)
 org.checkerframework:checker-qual:3.12.0 (2 constraints: 530fb196)
 
 [Test dependencies]
-junit:junit:4.13.2 (1 constraints: 3c05463b)
+org.apiguardian:apiguardian-api:1.1.2 (5 constraints: 105480ac)
 org.assertj:assertj-core:3.22.0 (1 constraints: 39053f3b)
-org.hamcrest:hamcrest-core:1.3 (1 constraints: cc05fe3f)
+org.junit.jupiter:junit-jupiter:5.9.0 (1 constraints: 10051f36)
+org.junit.jupiter:junit-jupiter-api:5.9.0 (4 constraints: 823413b9)
+org.junit.jupiter:junit-jupiter-engine:5.9.0 (1 constraints: 0b0ee03b)
+org.junit.jupiter:junit-jupiter-params:5.9.0 (1 constraints: 0b0ee03b)
+org.junit.platform:junit-platform-commons:1.9.0 (2 constraints: db20dc4a)
+org.junit.platform:junit-platform-engine:1.9.0 (1 constraints: aa1028b4)
+org.opentest4j:opentest4j:1.2.0 (2 constraints: cd205b49)
diff --git a/versions.props b/versions.props
index 57b7e10b..a1b1dede 100644
--- a/versions.props
+++ b/versions.props
@@ -4,6 +4,6 @@ com.google.code.findbugs:jsr305 = 3.0.2
 com.google.errorprone:* = 2.10.0
 com.google.guava:guava = 31.0.1-jre
 com.palantir.safe-logging:* = 1.20.0
-junit:junit = 4.13.2
 org.assertj:* = 3.22.0
+org.junit.jupiter:* = 5.9.0
 org.checkerframework:checker-qual = 2.5.3