diff --git a/agent-module/agent-testweb/cassandra3-plugin-testweb/src/test/java/com/pinpoint/test/plugin/cassandra/CassandraTest.java b/agent-module/agent-testweb/cassandra3-plugin-testweb/src/test/java/com/pinpoint/test/plugin/cassandra/CassandraTest.java index 5c1962750157..7daee37006c1 100644 --- a/agent-module/agent-testweb/cassandra3-plugin-testweb/src/test/java/com/pinpoint/test/plugin/cassandra/CassandraTest.java +++ b/agent-module/agent-testweb/cassandra3-plugin-testweb/src/test/java/com/pinpoint/test/plugin/cassandra/CassandraTest.java @@ -16,10 +16,10 @@ 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; @@ -27,9 +27,9 @@ 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/agent-module/agent-testweb/cassandra4-plugin-testweb/src/test/java/com/pinpoint/test/plugin/cassandra/CassandraTest.java b/agent-module/agent-testweb/cassandra4-plugin-testweb/src/test/java/com/pinpoint/test/plugin/cassandra/CassandraTest.java index 6e17f4aef4ba..83596a3c4a96 100644 --- a/agent-module/agent-testweb/cassandra4-plugin-testweb/src/test/java/com/pinpoint/test/plugin/cassandra/CassandraTest.java +++ b/agent-module/agent-testweb/cassandra4-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/agent-module/agent-testweb/kafka-plugin-testweb/src/test/java/com/pinpoint/test/plugin/kafka/KafkaTest.java b/agent-module/agent-testweb/kafka-plugin-testweb/src/test/java/com/pinpoint/test/plugin/kafka/KafkaTest.java index ce9916d1de2f..471285c5822f 100644 --- a/agent-module/agent-testweb/kafka-plugin-testweb/src/test/java/com/pinpoint/test/plugin/kafka/KafkaTest.java +++ b/agent-module/agent-testweb/kafka-plugin-testweb/src/test/java/com/pinpoint/test/plugin/kafka/KafkaTest.java @@ -1,9 +1,10 @@ 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; @@ -11,9 +12,9 @@ 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/agent-module/agent-testweb/mariadb-jdbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MariaDBTest.java b/agent-module/agent-testweb/mariadb-jdbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MariaDBTest.java index f34b8aedc876..28ee9f9f8af3 100644 --- a/agent-module/agent-testweb/mariadb-jdbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MariaDBTest.java +++ b/agent-module/agent-testweb/mariadb-jdbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MariaDBTest.java @@ -17,16 +17,17 @@ 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"; @@ -34,9 +35,9 @@ public class MariaDBTest { 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/agent-module/agent-testweb/mongodb-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MongodbTest.java b/agent-module/agent-testweb/mongodb-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MongodbTest.java index dcae88e7bc98..f1c4de3227cf 100644 --- a/agent-module/agent-testweb/mongodb-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MongodbTest.java +++ b/agent-module/agent-testweb/mongodb-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MongodbTest.java @@ -17,19 +17,22 @@ 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(); @@ -37,7 +40,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/agent-module/agent-testweb/mongodb-reactive-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MongodbTest.java b/agent-module/agent-testweb/mongodb-reactive-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MongodbTest.java index fbd73549f03e..ba069a985172 100644 --- a/agent-module/agent-testweb/mongodb-reactive-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MongodbTest.java +++ b/agent-module/agent-testweb/mongodb-reactive-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MongodbTest.java @@ -17,17 +17,20 @@ 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(); @@ -35,7 +38,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/agent-module/agent-testweb/mysql-jdbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MysqlDBTest.java b/agent-module/agent-testweb/mysql-jdbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MysqlDBTest.java index 99a1799ed47c..255e5447f700 100644 --- a/agent-module/agent-testweb/mysql-jdbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MysqlDBTest.java +++ b/agent-module/agent-testweb/mysql-jdbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MysqlDBTest.java @@ -17,16 +17,17 @@ 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"; @@ -34,9 +35,10 @@ public class MysqlDBTest { 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/agent-module/plugins-it/elasticsearch-it/elasticsearch-7-16-it/src/test/java/com/navercorp/pinpoint/it/plugin/elasticsearch/ESServer.java b/agent-module/plugins-it/elasticsearch-it/elasticsearch-7-16-it/src/test/java/com/navercorp/pinpoint/it/plugin/elasticsearch/ESServer.java index 6309dbdac45f..9156a75dddbd 100644 --- a/agent-module/plugins-it/elasticsearch-it/elasticsearch-7-16-it/src/test/java/com/navercorp/pinpoint/it/plugin/elasticsearch/ESServer.java +++ b/agent-module/plugins-it/elasticsearch-it/elasticsearch-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/agent-module/plugins-it/jtds-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/jtds/MsSqlServer.java b/agent-module/plugins-it/jtds-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/jtds/MsSqlServer.java index 51b5b224c864..40f1d671becd 100644 --- a/agent-module/plugins-it/jtds-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/jtds/MsSqlServer.java +++ b/agent-module/plugins-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/agent-module/plugins-it/kafka-it/kafka-2-it/src/test/java/test/pinpoint/plugin/kafka/Kafka3UnitServer.java b/agent-module/plugins-it/kafka-it/kafka-2-it/src/test/java/test/pinpoint/plugin/kafka/Kafka3UnitServer.java index 37f39deab922..9d5c1efa6040 100644 --- a/agent-module/plugins-it/kafka-it/kafka-2-it/src/test/java/test/pinpoint/plugin/kafka/Kafka3UnitServer.java +++ b/agent-module/plugins-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/agent-module/plugins-it/kafka-it/kafka-3-it/src/test/java/test/pinpoint/plugin/kafka/Kafka3UnitServer.java b/agent-module/plugins-it/kafka-it/kafka-3-it/src/test/java/test/pinpoint/plugin/kafka/Kafka3UnitServer.java index 37f39deab922..9d5c1efa6040 100644 --- a/agent-module/plugins-it/kafka-it/kafka-3-it/src/test/java/test/pinpoint/plugin/kafka/Kafka3UnitServer.java +++ b/agent-module/plugins-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/agent-module/plugins-it/kafka-it/kafka-3-it/src/test/java/test/pinpoint/plugin/kafka/KafkaStreamsUnitServer.java b/agent-module/plugins-it/kafka-it/kafka-3-it/src/test/java/test/pinpoint/plugin/kafka/KafkaStreamsUnitServer.java index d65f3b89ff04..5172f5c1b9b7 100644 --- a/agent-module/plugins-it/kafka-it/kafka-3-it/src/test/java/test/pinpoint/plugin/kafka/KafkaStreamsUnitServer.java +++ b/agent-module/plugins-it/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/agent-module/plugins-it/mongodb-it/mongodb-4-it/src/test/java/com/navercorp/pinpoint/it/plugin/mongodb4/MongodbServer.java b/agent-module/plugins-it/mongodb-it/mongodb-4-it/src/test/java/com/navercorp/pinpoint/it/plugin/mongodb4/MongodbServer.java index 29033e300567..6a3d6af28ce3 100644 --- a/agent-module/plugins-it/mongodb-it/mongodb-4-it/src/test/java/com/navercorp/pinpoint/it/plugin/mongodb4/MongodbServer.java +++ b/agent-module/plugins-it/mongodb-it/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(); diff --git a/agent-module/plugins-it/postgresql-jdbc-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/postgresql/PostgreSqlServer.java b/agent-module/plugins-it/postgresql-jdbc-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/postgresql/PostgreSqlServer.java index 0a0a5efc3809..b266913ffd3b 100644 --- a/agent-module/plugins-it/postgresql-jdbc-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/postgresql/PostgreSqlServer.java +++ b/agent-module/plugins-it/postgresql-jdbc-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/postgresql/PostgreSqlServer.java @@ -4,7 +4,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.PostgreSQLContainer; @@ -17,7 +17,7 @@ public class PostgreSqlServer implements SharedTestLifeCycle { @Override public Properties beforeAll() { - Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable()); + Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled"); postgreSql = PostgreSQLContainerFactory.newContainer(logger.getName()); diff --git a/agent-module/plugins-test-module/plugins-it-utils/src/test/java/com/navercorp/pinpoint/pluginit/utils/WebServerTest.java b/agent-module/plugins-test-module/plugins-it-utils/src/test/java/com/navercorp/pinpoint/pluginit/utils/WebServerTest.java index fce4cb2eef11..0fa002ce339c 100644 --- a/agent-module/plugins-test-module/plugins-it-utils/src/test/java/com/navercorp/pinpoint/pluginit/utils/WebServerTest.java +++ b/agent-module/plugins-test-module/plugins-it-utils/src/test/java/com/navercorp/pinpoint/pluginit/utils/WebServerTest.java @@ -19,9 +19,9 @@ import com.navercorp.pinpoint.common.util.IOUtils; import com.navercorp.pinpoint.it.plugin.utils.WebServer; import fi.iki.elonen.NanoHTTPD; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.InputStream; @@ -40,12 +40,12 @@ public class WebServerTest { private static WebServer webServer; - @BeforeClass + @BeforeAll public static void newTestWebServer() throws Exception { webServer = WebServer.newTestWebServer(); } - @AfterClass + @AfterAll public static void cleanup() { WebServer.cleanup(webServer); }