[#noissue] Remove junit4 dependency

emeroad · Nov 12, 2024 · a885e92 · a885e92
1 parent adece2a
commit a885e92
Show file tree

Hide file tree

Showing 15 changed files with 90 additions and 72 deletions.
diff --git a/...andra3-plugin-testweb/src/test/java/com/pinpoint/test/plugin/cassandra/CassandraTest.java b/...andra3-plugin-testweb/src/test/java/com/pinpoint/test/plugin/cassandra/CassandraTest.java
@@ -16,20 +16,20 @@
 
 package com.pinpoint.test.plugin.cassandra;
 
-import org.junit.AfterClass;
-import org.junit.Assume;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.CassandraContainer;
 
 public class CassandraTest {
 
     private static CassandraContainer<?> container;
 
-    @BeforeClass
+    @BeforeAll
     public static void beforeClass() {
-        Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
+        Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
 
         container = new CassandraContainer<>("cassandra:3.11.6");
         container.start();
@@ -43,7 +43,7 @@ public static void beforeClass() {
         System.out.println("##password=" + container.getPassword());
     }
 
-    @AfterClass
+    @AfterAll
     public static void afterClass() {
         if (container != null) {
             container.stop();

diff --git a/...andra4-plugin-testweb/src/test/java/com/pinpoint/test/plugin/cassandra/CassandraTest.java b/...andra4-plugin-testweb/src/test/java/com/pinpoint/test/plugin/cassandra/CassandraTest.java
@@ -16,10 +16,11 @@
 
 package com.pinpoint.test.plugin.cassandra;
 
-import org.junit.AfterClass;
-import org.junit.Assume;
-import org.junit.BeforeClass;
-import org.junit.Test;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.CassandraContainer;
 
@@ -28,9 +29,10 @@ public class CassandraTest {
 
     private static CassandraContainer<?> container;
 
-    @BeforeClass
+    @BeforeAll
     public static void beforeClass() {
-        Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
+        Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
+
 
         container = new CassandraContainer<>("cassandra:3.11.6");
         container.start();
@@ -44,7 +46,7 @@ public static void beforeClass() {
         System.out.println("##password=" + container.getPassword());
     }
 
-    @AfterClass
+    @AfterAll
     public static void afterClass() {
         if (container != null) {
             container.stop();

diff --git a/...-testweb/kafka-plugin-testweb/src/test/java/com/pinpoint/test/plugin/kafka/KafkaTest.java b/...-testweb/kafka-plugin-testweb/src/test/java/com/pinpoint/test/plugin/kafka/KafkaTest.java
@@ -1,19 +1,20 @@
 package com.pinpoint.test.plugin.kafka;
 
-import org.junit.AfterClass;
-import org.junit.Assume;
-import org.junit.BeforeClass;
-import org.junit.Test;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.KafkaContainer;
 import org.testcontainers.utility.DockerImageName;
 
 public class KafkaTest {
     private static KafkaContainer container;
 
-    @BeforeClass
+    @BeforeAll
     public static void beforeClass() {
-        Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
+        Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
 
         container = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.7.1"));
 
@@ -22,7 +23,7 @@ public static void beforeClass() {
         final int port = container.getFirstMappedPort();
     }
 
-    @AfterClass
+    @AfterAll
     public static void afterClass() {
         if (container != null) {
             container.stop();

diff --git a/...mariadb-jdbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MariaDBTest.java b/...mariadb-jdbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MariaDBTest.java
@@ -17,26 +17,27 @@
 package com.pinpoint.test.plugin.mongo;
 
 
-import org.junit.AfterClass;
-import org.junit.Assume;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.MariaDBContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 
-@Ignore
+@Disabled
 public class MariaDBTest {
     public static final String DATABASE_NAME = "test";
     public static final String USERNAME = "root";
     public static final String PASSWORD = "";
 
     private static MariaDBContainer<?> container;
 
-    @BeforeClass
+    @BeforeAll
     public static void beforeClass() {
-        Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
+        Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
         container = new MariaDBContainer<>("mariadb:10.6.17");
         container.waitingFor(Wait.forListeningPort());
         container.withDatabaseName(DATABASE_NAME);
@@ -49,7 +50,7 @@ public static void beforeClass() {
         System.out.println("##port=" + container.getFirstMappedPort());
     }
 
-    @AfterClass
+    @AfterAll
     public static void select() {
         if (container != null) {
             container.stop();

diff --git a/...tweb/mongodb-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MongodbTest.java b/...tweb/mongodb-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MongodbTest.java
@@ -17,27 +17,30 @@
 package com.pinpoint.test.plugin.mongo;
 
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.MongoDBContainer;
 
-@Ignore
+@Disabled
 public class MongodbTest {
     private static MongoDBContainer container;
 
-    @BeforeClass
+    @BeforeAll
     public static void beforeClass() {
-//        Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
+        Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
+
         container = new MongoDBContainer("mongo:4.4.29");
         container.start();
 
         System.out.println("##host=" + container.getHost());
         System.out.println("##port=" + container.getFirstMappedPort());
     }
 
-    @AfterClass
+    @AfterAll
     public static void select() {
         if (container != null) {
             container.stop();

diff --git a/...odb-reactive-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MongodbTest.java b/...odb-reactive-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MongodbTest.java
@@ -17,25 +17,28 @@
 package com.pinpoint.test.plugin.mongo;
 
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.MongoDBContainer;
 
 public class MongodbTest {
     private static MongoDBContainer container;
 
-    @BeforeClass
+    @BeforeAll
     public static void beforeClass() {
-//        Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
+        Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
+
         container = new MongoDBContainer("mongo:4.4.29");
         container.start();
 
         System.out.println("##host=" + container.getHost());
         System.out.println("##port=" + container.getFirstMappedPort());
     }
 
-    @AfterClass
+    @AfterAll
     public static void select() {
         if (container != null) {
             container.stop();

diff --git a/...b/mysql-jdbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MysqlDBTest.java b/...b/mysql-jdbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MysqlDBTest.java
@@ -17,26 +17,28 @@
 package com.pinpoint.test.plugin.mongo;
 
 
-import org.junit.AfterClass;
-import org.junit.Assume;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.MySQLContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 
-@Ignore
+@Disabled
 public class MysqlDBTest {
     public static final String DATABASE_NAME = "test";
     public static final String USERNAME = "root";
     public static final String PASSWORD = "";
 
     private static MySQLContainer<?> container;
 
-    @BeforeClass
+    @BeforeAll
     public static void beforeClass() {
-        Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
+        Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
+
         container = new MySQLContainer<>("mysql:8.0.36");
         container.waitingFor(Wait.forListeningPort());
         container.withDatabaseName(DATABASE_NAME);
@@ -52,7 +54,7 @@ public static void beforeClass() {
         System.out.println("##port=" + container.getFirstMappedPort());
     }
 
-    @AfterClass
+    @AfterAll
     public static void select() {
         if (container != null) {
             container.stop();

diff --git a/...search-7-16-it/src/test/java/com/navercorp/pinpoint/it/plugin/elasticsearch/ESServer.java b/...search-7-16-it/src/test/java/com/navercorp/pinpoint/it/plugin/elasticsearch/ESServer.java
@@ -3,7 +3,7 @@
 import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycle;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.junit.Assume;
+import org.junit.jupiter.api.Assumptions;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.elasticsearch.ElasticsearchContainer;
 
@@ -19,7 +19,8 @@ public ESServer() {
 
     @Override
     public Properties beforeAll() {
-        Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
+        Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
+
         logger.info("ElasticsearchContainer start");
 
         elasticsearchContainer = ESServerContainerFactory.newESServerContainerFactory(logger.getName());

diff --git a/...gins-it/jtds-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/jtds/MsSqlServer.java b/...gins-it/jtds-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/jtds/MsSqlServer.java
@@ -3,7 +3,7 @@
 import com.navercorp.pinpoint.it.plugin.utils.LogOutputStream;
 import com.navercorp.pinpoint.it.plugin.utils.jdbc.testcontainers.DatabaseContainers;
 import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycle;
-import org.junit.Assume;
+import org.junit.jupiter.api.Assumptions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.DockerClientFactory;
@@ -17,7 +17,8 @@ public class MsSqlServer implements SharedTestLifeCycle {
     private MSSQLServerContainer<?> mssqlserver;
     @Override
     public Properties beforeAll() {
-        Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
+        Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
+
 
         mssqlserver = new MSSQLServerContainer<>("mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04");
         mssqlserver.acceptLicense();

diff --git a/...ins-it/kafka-it/kafka-2-it/src/test/java/test/pinpoint/plugin/kafka/Kafka3UnitServer.java b/...ins-it/kafka-it/kafka-2-it/src/test/java/test/pinpoint/plugin/kafka/Kafka3UnitServer.java
@@ -19,7 +19,7 @@
 import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycle;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.junit.Assume;
+import org.junit.jupiter.api.Assumptions;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.KafkaContainer;
 import org.testcontainers.utility.DockerImageName;
@@ -39,7 +39,8 @@ public class Kafka3UnitServer implements SharedTestLifeCycle {
 
     @Override
     public Properties beforeAll() {
-        Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
+        Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
+
         container = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.7.1"));
 
         container.start();

diff --git a/...ins-it/kafka-it/kafka-3-it/src/test/java/test/pinpoint/plugin/kafka/Kafka3UnitServer.java b/...ins-it/kafka-it/kafka-3-it/src/test/java/test/pinpoint/plugin/kafka/Kafka3UnitServer.java
@@ -19,7 +19,7 @@
 import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycle;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.junit.Assume;
+import org.junit.jupiter.api.Assumptions;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.KafkaContainer;
 import org.testcontainers.utility.DockerImageName;
@@ -39,7 +39,8 @@ public class Kafka3UnitServer implements SharedTestLifeCycle {
 
     @Override
     public Properties beforeAll() {
-        Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
+        Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
+
         container = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.7.1"));
 
         container.start();

diff --git a/.../kafka-it/kafka-3-it/src/test/java/test/pinpoint/plugin/kafka/KafkaStreamsUnitServer.java b/.../kafka-it/kafka-3-it/src/test/java/test/pinpoint/plugin/kafka/KafkaStreamsUnitServer.java
@@ -20,7 +20,7 @@
 import org.apache.kafka.clients.admin.AdminClient;
 import org.apache.kafka.clients.admin.NewTopic;
 import org.apache.kafka.streams.errors.StreamsException;
-import org.junit.Assume;
+import org.junit.jupiter.api.Assumptions;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.KafkaContainer;
 import org.testcontainers.utility.DockerImageName;
@@ -45,7 +45,8 @@ public class KafkaStreamsUnitServer implements SharedTestLifeCycle {
 
     @Override
     public Properties beforeAll() {
-        Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
+        Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
+
         container = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.7.1"));
 
         container.start();

diff --git a/...t/mongodb-4-it/src/test/java/com/navercorp/pinpoint/it/plugin/mongodb4/MongodbServer.java b/...t/mongodb-4-it/src/test/java/com/navercorp/pinpoint/it/plugin/mongodb4/MongodbServer.java
@@ -18,7 +18,7 @@
 
 import com.navercorp.pinpoint.it.plugin.utils.jdbc.testcontainers.DatabaseContainers;
 import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycle;
-import org.junit.Assume;
+import org.junit.jupiter.api.Assumptions;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.MongoDBContainer;
 
@@ -29,7 +29,8 @@ public class MongodbServer implements SharedTestLifeCycle {
 
     @Override
     public Properties beforeAll() {
-        Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
+        Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
+
         container = new MongoDBContainer("mongo:4.4.29");
         container.start();