This is an automated email from the ASF dual-hosted git repository.
philippus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-management.git
The following commit(s) were added to refs/heads/main by this push:
new 56c74390 Migrate scalatestplus junit tests to junit-jupiter (#713)
56c74390 is described below
commit 56c74390ae86ecea8b1c66eac882e9d5a727e5f2
Author: Philippus Baalman <[email protected]>
AuthorDate: Wed Mar 25 19:11:50 2026 +0100
Migrate scalatestplus junit tests to junit-jupiter (#713)
* Remove scalatestplus junit dependency where unused
* Migrate scalatestplus junit tests to junit-jupiter
---
build.sbt | 18 +++++++++++++++---
.../bootstrap/ClusterBootstrapJavaCompileTest.java | 2 +-
.../http/ClusterHttpManagementJavaCompileTest.java | 2 +-
.../org/apache/pekko/management/HealthCheckTest.java | 15 +++++++--------
project/Dependencies.scala | 14 ++++----------
project/plugins.sbt | 1 +
6 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/build.sbt b/build.sbt
index c617ce7f..1e97a536 100644
--- a/build.sbt
+++ b/build.sbt
@@ -114,7 +114,11 @@ lazy val management = pekkoModule("management")
.enablePlugins(AutomateHeaderPlugin, ReproducibleBuildsPlugin)
.settings(
name := "pekko-management",
- libraryDependencies := Dependencies.managementHttp,
+ libraryDependencies := Dependencies.managementHttp ++ Seq(
+ "com.github.sbt.junit" % "jupiter-interface" %
JupiterKeys.jupiterVersion.value % Test,
+ "org.junit.jupiter" % "junit-jupiter-api" %
JupiterKeys.junitJupiterVersion.value % Test,
+ "org.junit.jupiter" % "junit-jupiter-engine" %
JupiterKeys.junitJupiterVersion.value % Test,
+ "org.junit.platform" % "junit-platform-launcher" %
JupiterKeys.junitPlatformVersion.value % Test),
mimaPreviousArtifactsSet)
lazy val managementPki = pekkoModule("management-pki")
@@ -144,7 +148,11 @@ lazy val managementClusterHttp =
pekkoModule("management-cluster-http")
.enablePlugins(AutomateHeaderPlugin, ReproducibleBuildsPlugin)
.settings(
name := "pekko-management-cluster-http",
- libraryDependencies := Dependencies.managementClusterHttp,
+ libraryDependencies := Dependencies.managementClusterHttp ++ Seq(
+ "com.github.sbt.junit" % "jupiter-interface" %
JupiterKeys.jupiterVersion.value % Test,
+ "org.junit.jupiter" % "junit-jupiter-api" %
JupiterKeys.junitJupiterVersion.value % Test,
+ "org.junit.jupiter" % "junit-jupiter-engine" %
JupiterKeys.junitJupiterVersion.value % Test,
+ "org.junit.platform" % "junit-platform-launcher" %
JupiterKeys.junitPlatformVersion.value % Test),
// following is needed by Agrona lib
// https://github.com/aeron-io/agrona/wiki/Change-Log#200-2024-12-17
Test / fork := true,
@@ -156,7 +164,11 @@ lazy val managementClusterBootstrap =
pekkoModule("management-cluster-bootstrap"
.enablePlugins(AutomateHeaderPlugin, ReproducibleBuildsPlugin)
.settings(
name := "pekko-management-cluster-bootstrap",
- libraryDependencies := Dependencies.managementClusterBootstrap,
+ libraryDependencies := Dependencies.managementClusterBootstrap ++ Seq(
+ "com.github.sbt.junit" % "jupiter-interface" %
JupiterKeys.jupiterVersion.value % Test,
+ "org.junit.jupiter" % "junit-jupiter-api" %
JupiterKeys.junitJupiterVersion.value % Test,
+ "org.junit.jupiter" % "junit-jupiter-engine" %
JupiterKeys.junitJupiterVersion.value % Test,
+ "org.junit.platform" % "junit-platform-launcher" %
JupiterKeys.junitPlatformVersion.value % Test),
// following is needed by Agrona lib
// https://github.com/aeron-io/agrona/wiki/Change-Log#200-2024-12-17
Test / fork := true,
diff --git
a/management-cluster-bootstrap/src/test/java/org/apache/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrapJavaCompileTest.java
b/management-cluster-bootstrap/src/test/java/org/apache/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrapJavaCompileTest.java
index 3cb0fde6..a62a6318 100644
---
a/management-cluster-bootstrap/src/test/java/org/apache/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrapJavaCompileTest.java
+++
b/management-cluster-bootstrap/src/test/java/org/apache/org/apache/pekko/management/cluster/bootstrap/ClusterBootstrapJavaCompileTest.java
@@ -15,7 +15,7 @@ package
org.apache.org.apache.pekko.management.cluster.bootstrap;
import org.apache.pekko.actor.ActorSystem;
import org.apache.pekko.management.cluster.bootstrap.ClusterBootstrap;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class ClusterBootstrapJavaCompileTest {
diff --git
a/management-cluster-http/src/test/java/org/apache/pekko/management/http/ClusterHttpManagementJavaCompileTest.java
b/management-cluster-http/src/test/java/org/apache/pekko/management/http/ClusterHttpManagementJavaCompileTest.java
index efa34e9a..682d39c0 100644
---
a/management-cluster-http/src/test/java/org/apache/pekko/management/http/ClusterHttpManagementJavaCompileTest.java
+++
b/management-cluster-http/src/test/java/org/apache/pekko/management/http/ClusterHttpManagementJavaCompileTest.java
@@ -15,7 +15,7 @@ package org.apache.pekko.management.http;
import org.apache.pekko.actor.ActorSystem;
import org.apache.pekko.management.cluster.ClusterHttpManagementRouteProvider;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class ClusterHttpManagementJavaCompileTest {
diff --git
a/management/src/test/java/org/apache/pekko/management/HealthCheckTest.java
b/management/src/test/java/org/apache/pekko/management/HealthCheckTest.java
index ca951848..f05fc0c7 100644
--- a/management/src/test/java/org/apache/pekko/management/HealthCheckTest.java
+++ b/management/src/test/java/org/apache/pekko/management/HealthCheckTest.java
@@ -13,7 +13,7 @@
package org.apache.pekko.management;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import com.typesafe.config.ConfigFactory;
import java.util.Arrays;
@@ -32,12 +32,11 @@ import
org.apache.pekko.management.javadsl.LivenessCheckSetup;
import org.apache.pekko.management.javadsl.ReadinessCheckSetup;
import org.apache.pekko.management.javadsl.StartupCheckSetup;
import org.apache.pekko.testkit.javadsl.TestKit;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Test;
-import org.scalatestplus.junit.JUnitSuite;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
-public class HealthCheckTest extends JUnitSuite {
+public class HealthCheckTest {
private static Throwable cause = new RuntimeException("oh dear");
@SuppressWarnings("unused")
@@ -154,7 +153,7 @@ public class HealthCheckTest extends JUnitSuite {
java.time.Duration.ofSeconds(1)));
try {
checks.alive().toCompletableFuture().get();
- Assert.fail("Expected exception");
+ Assertions.fail("Expected exception");
} catch (ExecutionException re) {
assertEquals(cause, re.getCause().getCause());
}
@@ -197,7 +196,7 @@ public class HealthCheckTest extends JUnitSuite {
}
}
- @AfterClass
+ @AfterAll
public static void cleanup() {
TestKit.shutdownActorSystem(system);
}
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 4ac86d11..56168d25 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -21,7 +21,6 @@ object Dependencies {
val pekkoHttpBinaryVersion = PekkoHttpDependency.default.link
val scalaTestVersion = "3.2.19"
- val scalaTestPlusJUnitVersion = scalaTestVersion + ".0"
val awsSdkVersion = "1.12.797"
val guavaVersion = "33.5.0-jre"
@@ -94,13 +93,11 @@ object Dependencies {
"org.apache.pekko" %% "pekko-testkit" % pekkoVersion % Test,
"org.apache.pekko" %% "pekko-cluster" % pekkoVersion % Test,
"org.apache.pekko" %% "pekko-http-testkit" % pekkoHttpVersion % Test,
- "org.scalatest" %% "scalatest" % scalaTestVersion % Test,
- "org.scalatestplus" %% "junit-4-13" % scalaTestPlusJUnitVersion % Test)
+ "org.scalatest" %% "scalatest" % scalaTestVersion % Test)
val managementPki = Seq(
"org.apache.pekko" %% "pekko-pki" % pekkoVersion,
- "org.scalatest" %% "scalatest" % scalaTestVersion % Test,
- "org.scalatestplus" %% "junit-4-13" % scalaTestPlusJUnitVersion % Test)
+ "org.scalatest" %% "scalatest" % scalaTestVersion % Test)
val managementLoglevelsLogback = Seq(
"org.apache.pekko" %% "pekko-actor" % pekkoVersion,
@@ -137,8 +134,7 @@ object Dependencies {
"org.mockito" % "mockito-core" % "5.23.0" % Test,
"org.apache.pekko" %% "pekko-http-testkit" % pekkoHttpVersion % Test,
"org.apache.pekko" %% "pekko-distributed-data" % pekkoVersion % Test,
- "org.scalatest" %% "scalatest" % scalaTestVersion % Test,
- "org.scalatestplus" %% "junit-4-13" % scalaTestPlusJUnitVersion % Test)
+ "org.scalatest" %% "scalatest" % scalaTestVersion % Test)
val managementClusterBootstrap = Seq(
"org.apache.pekko" %% "pekko-discovery" % pekkoVersion,
@@ -148,8 +144,7 @@ object Dependencies {
"org.apache.pekko" %% "pekko-testkit" % pekkoVersion % Test,
"org.apache.pekko" %% "pekko-http-testkit" % pekkoHttpVersion % Test,
"org.apache.pekko" %% "pekko-distributed-data" % pekkoVersion % Test,
- "org.scalatest" %% "scalatest" % scalaTestVersion % Test,
- "org.scalatestplus" %% "junit-4-13" % scalaTestPlusJUnitVersion % Test)
+ "org.scalatest" %% "scalatest" % scalaTestVersion % Test)
val leaseKubernetes = Seq(
"org.apache.pekko" %% "pekko-actor" % pekkoVersion,
@@ -159,7 +154,6 @@ object Dependencies {
"org.apache.pekko" %% "pekko-slf4j" % pekkoVersion,
"org.apache.pekko" %% "pekko-http-spray-json" % pekkoHttpVersion,
"org.scalatest" %% "scalatest" % scalaTestVersion % Test,
- "org.scalatestplus" %% "junit-4-13" % scalaTestPlusJUnitVersion % Test,
"org.apache.pekko" %% "pekko-testkit" % pekkoVersion % Test) ++
wireMockDependencies
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 0c5bf3eb..b9beb699 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -22,6 +22,7 @@ addSbtPlugin("com.github.sbt" % "sbt-license-report" %
"1.9.0")
addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.5")
addSbtPlugin("com.lightbend.sbt" % "sbt-bill-of-materials" % "1.0.2")
+addSbtPlugin("com.github.sbt.junit" % "sbt-jupiter-interface" % "0.18.0")
addSbtPlugin("org.apache.pekko" % "pekko-sbt-paradox" % "1.0.1")
addSbtPlugin("com.github.sbt" % "sbt-site-paradox" % "1.7.0")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
