Skip to content

Commit a885e92

Browse files
emeroademeroad
committed
[#noissue] Remove junit4 dependency
1 parent adece2a commit a885e92

File tree

15 files changed

+90
-72
lines changed

15 files changed

+90
-72
lines changed

Diff for: ‎agent-module/agent-testweb/cassandra3-plugin-testweb/src/test/java/com/pinpoint/test/plugin/cassandra/CassandraTest.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@
1616

1717
package com.pinpoint.test.plugin.cassandra;
1818

19-
import org.junit.AfterClass;
20-
import org.junit.Assume;
21-
import org.junit.BeforeClass;
22-
import org.junit.Test;
19+
import org.junit.jupiter.api.AfterAll;
20+
import org.junit.jupiter.api.Assumptions;
21+
import org.junit.jupiter.api.BeforeAll;
22+
import org.junit.jupiter.api.Test;
2323
import org.testcontainers.DockerClientFactory;
2424
import org.testcontainers.containers.CassandraContainer;
2525

2626
public class CassandraTest {
2727

2828
private static CassandraContainer<?> container;
2929

30-
@BeforeClass
30+
@BeforeAll
3131
public static void beforeClass() {
32-
Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
32+
Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
3333

3434
container = new CassandraContainer<>("cassandra:3.11.6");
3535
container.start();
@@ -43,7 +43,7 @@ public static void beforeClass() {
4343
System.out.println("##password=" + container.getPassword());
4444
}
4545

46-
@AfterClass
46+
@AfterAll
4747
public static void afterClass() {
4848
if (container != null) {
4949
container.stop();

Diff for: ‎agent-module/agent-testweb/cassandra4-plugin-testweb/src/test/java/com/pinpoint/test/plugin/cassandra/CassandraTest.java

+9-7
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616

1717
package com.pinpoint.test.plugin.cassandra;
1818

19-
import org.junit.AfterClass;
20-
import org.junit.Assume;
21-
import org.junit.BeforeClass;
22-
import org.junit.Test;
19+
20+
import org.junit.jupiter.api.AfterAll;
21+
import org.junit.jupiter.api.Assumptions;
22+
import org.junit.jupiter.api.BeforeAll;
23+
import org.junit.jupiter.api.Test;
2324
import org.testcontainers.DockerClientFactory;
2425
import org.testcontainers.containers.CassandraContainer;
2526

@@ -28,9 +29,10 @@ public class CassandraTest {
2829

2930
private static CassandraContainer<?> container;
3031

31-
@BeforeClass
32+
@BeforeAll
3233
public static void beforeClass() {
33-
Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
34+
Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
35+
3436

3537
container = new CassandraContainer<>("cassandra:3.11.6");
3638
container.start();
@@ -44,7 +46,7 @@ public static void beforeClass() {
4446
System.out.println("##password=" + container.getPassword());
4547
}
4648

47-
@AfterClass
49+
@AfterAll
4850
public static void afterClass() {
4951
if (container != null) {
5052
container.stop();

Diff for: ‎agent-module/agent-testweb/kafka-plugin-testweb/src/test/java/com/pinpoint/test/plugin/kafka/KafkaTest.java

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
package com.pinpoint.test.plugin.kafka;
22

3-
import org.junit.AfterClass;
4-
import org.junit.Assume;
5-
import org.junit.BeforeClass;
6-
import org.junit.Test;
3+
4+
import org.junit.jupiter.api.AfterAll;
5+
import org.junit.jupiter.api.Assumptions;
6+
import org.junit.jupiter.api.BeforeAll;
7+
import org.junit.jupiter.api.Test;
78
import org.testcontainers.DockerClientFactory;
89
import org.testcontainers.containers.KafkaContainer;
910
import org.testcontainers.utility.DockerImageName;
1011

1112
public class KafkaTest {
1213
private static KafkaContainer container;
1314

14-
@BeforeClass
15+
@BeforeAll
1516
public static void beforeClass() {
16-
Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
17+
Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
1718

1819
container = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.7.1"));
1920

@@ -22,7 +23,7 @@ public static void beforeClass() {
2223
final int port = container.getFirstMappedPort();
2324
}
2425

25-
@AfterClass
26+
@AfterAll
2627
public static void afterClass() {
2728
if (container != null) {
2829
container.stop();

Diff for: ‎agent-module/agent-testweb/mariadb-jdbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MariaDBTest.java

+10-9
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,27 @@
1717
package com.pinpoint.test.plugin.mongo;
1818

1919

20-
import org.junit.AfterClass;
21-
import org.junit.Assume;
22-
import org.junit.BeforeClass;
23-
import org.junit.Ignore;
24-
import org.junit.Test;
20+
21+
import org.junit.jupiter.api.AfterAll;
22+
import org.junit.jupiter.api.Assumptions;
23+
import org.junit.jupiter.api.BeforeAll;
24+
import org.junit.jupiter.api.Disabled;
25+
import org.junit.jupiter.api.Test;
2526
import org.testcontainers.DockerClientFactory;
2627
import org.testcontainers.containers.MariaDBContainer;
2728
import org.testcontainers.containers.wait.strategy.Wait;
2829

29-
@Ignore
30+
@Disabled
3031
public class MariaDBTest {
3132
public static final String DATABASE_NAME = "test";
3233
public static final String USERNAME = "root";
3334
public static final String PASSWORD = "";
3435

3536
private static MariaDBContainer<?> container;
3637

37-
@BeforeClass
38+
@BeforeAll
3839
public static void beforeClass() {
39-
Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
40+
Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
4041
container = new MariaDBContainer<>("mariadb:10.6.17");
4142
container.waitingFor(Wait.forListeningPort());
4243
container.withDatabaseName(DATABASE_NAME);
@@ -49,7 +50,7 @@ public static void beforeClass() {
4950
System.out.println("##port=" + container.getFirstMappedPort());
5051
}
5152

52-
@AfterClass
53+
@AfterAll
5354
public static void select() {
5455
if (container != null) {
5556
container.stop();

Diff for: ‎agent-module/agent-testweb/mongodb-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MongodbTest.java

+11-8
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,30 @@
1717
package com.pinpoint.test.plugin.mongo;
1818

1919

20-
import org.junit.AfterClass;
21-
import org.junit.BeforeClass;
22-
import org.junit.Ignore;
23-
import org.junit.Test;
20+
import org.junit.jupiter.api.AfterAll;
21+
import org.junit.jupiter.api.Assumptions;
22+
import org.junit.jupiter.api.BeforeAll;
23+
import org.junit.jupiter.api.Disabled;
24+
import org.junit.jupiter.api.Test;
25+
import org.testcontainers.DockerClientFactory;
2426
import org.testcontainers.containers.MongoDBContainer;
2527

26-
@Ignore
28+
@Disabled
2729
public class MongodbTest {
2830
private static MongoDBContainer container;
2931

30-
@BeforeClass
32+
@BeforeAll
3133
public static void beforeClass() {
32-
// Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
34+
Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
35+
3336
container = new MongoDBContainer("mongo:4.4.29");
3437
container.start();
3538

3639
System.out.println("##host=" + container.getHost());
3740
System.out.println("##port=" + container.getFirstMappedPort());
3841
}
3942

40-
@AfterClass
43+
@AfterAll
4144
public static void select() {
4245
if (container != null) {
4346
container.stop();

Diff for: ‎agent-module/agent-testweb/mongodb-reactive-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MongodbTest.java

+9-6
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,28 @@
1717
package com.pinpoint.test.plugin.mongo;
1818

1919

20-
import org.junit.AfterClass;
21-
import org.junit.BeforeClass;
22-
import org.junit.Test;
20+
import org.junit.jupiter.api.AfterAll;
21+
import org.junit.jupiter.api.Assumptions;
22+
import org.junit.jupiter.api.BeforeAll;
23+
import org.junit.jupiter.api.Test;
24+
import org.testcontainers.DockerClientFactory;
2325
import org.testcontainers.containers.MongoDBContainer;
2426

2527
public class MongodbTest {
2628
private static MongoDBContainer container;
2729

28-
@BeforeClass
30+
@BeforeAll
2931
public static void beforeClass() {
30-
// Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
32+
Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
33+
3134
container = new MongoDBContainer("mongo:4.4.29");
3235
container.start();
3336

3437
System.out.println("##host=" + container.getHost());
3538
System.out.println("##port=" + container.getFirstMappedPort());
3639
}
3740

38-
@AfterClass
41+
@AfterAll
3942
public static void select() {
4043
if (container != null) {
4144
container.stop();

Diff for: ‎agent-module/agent-testweb/mysql-jdbc-plugin-testweb/src/test/java/com/pinpoint/test/plugin/mongo/MysqlDBTest.java

+11-9
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,28 @@
1717
package com.pinpoint.test.plugin.mongo;
1818

1919

20-
import org.junit.AfterClass;
21-
import org.junit.Assume;
22-
import org.junit.BeforeClass;
23-
import org.junit.Ignore;
24-
import org.junit.Test;
20+
21+
import org.junit.jupiter.api.AfterAll;
22+
import org.junit.jupiter.api.Assumptions;
23+
import org.junit.jupiter.api.BeforeAll;
24+
import org.junit.jupiter.api.Disabled;
25+
import org.junit.jupiter.api.Test;
2526
import org.testcontainers.DockerClientFactory;
2627
import org.testcontainers.containers.MySQLContainer;
2728
import org.testcontainers.containers.wait.strategy.Wait;
2829

29-
@Ignore
30+
@Disabled
3031
public class MysqlDBTest {
3132
public static final String DATABASE_NAME = "test";
3233
public static final String USERNAME = "root";
3334
public static final String PASSWORD = "";
3435

3536
private static MySQLContainer<?> container;
3637

37-
@BeforeClass
38+
@BeforeAll
3839
public static void beforeClass() {
39-
Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
40+
Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
41+
4042
container = new MySQLContainer<>("mysql:8.0.36");
4143
container.waitingFor(Wait.forListeningPort());
4244
container.withDatabaseName(DATABASE_NAME);
@@ -52,7 +54,7 @@ public static void beforeClass() {
5254
System.out.println("##port=" + container.getFirstMappedPort());
5355
}
5456

55-
@AfterClass
57+
@AfterAll
5658
public static void select() {
5759
if (container != null) {
5860
container.stop();

Diff for: ‎agent-module/plugins-it/elasticsearch-it/elasticsearch-7-16-it/src/test/java/com/navercorp/pinpoint/it/plugin/elasticsearch/ESServer.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycle;
44
import org.apache.logging.log4j.LogManager;
55
import org.apache.logging.log4j.Logger;
6-
import org.junit.Assume;
6+
import org.junit.jupiter.api.Assumptions;
77
import org.testcontainers.DockerClientFactory;
88
import org.testcontainers.elasticsearch.ElasticsearchContainer;
99

@@ -19,7 +19,8 @@ public ESServer() {
1919

2020
@Override
2121
public Properties beforeAll() {
22-
Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
22+
Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
23+
2324
logger.info("ElasticsearchContainer start");
2425

2526
elasticsearchContainer = ESServerContainerFactory.newESServerContainerFactory(logger.getName());

Diff for: ‎agent-module/plugins-it/jtds-it/src/test/java/com/navercorp/pinpoint/it/plugin/jdbc/jtds/MsSqlServer.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.navercorp.pinpoint.it.plugin.utils.LogOutputStream;
44
import com.navercorp.pinpoint.it.plugin.utils.jdbc.testcontainers.DatabaseContainers;
55
import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycle;
6-
import org.junit.Assume;
6+
import org.junit.jupiter.api.Assumptions;
77
import org.slf4j.Logger;
88
import org.slf4j.LoggerFactory;
99
import org.testcontainers.DockerClientFactory;
@@ -17,7 +17,8 @@ public class MsSqlServer implements SharedTestLifeCycle {
1717
private MSSQLServerContainer<?> mssqlserver;
1818
@Override
1919
public Properties beforeAll() {
20-
Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
20+
Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
21+
2122

2223
mssqlserver = new MSSQLServerContainer<>("mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04");
2324
mssqlserver.acceptLicense();

Diff for: ‎agent-module/plugins-it/kafka-it/kafka-2-it/src/test/java/test/pinpoint/plugin/kafka/Kafka3UnitServer.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycle;
2020
import org.apache.logging.log4j.LogManager;
2121
import org.apache.logging.log4j.Logger;
22-
import org.junit.Assume;
22+
import org.junit.jupiter.api.Assumptions;
2323
import org.testcontainers.DockerClientFactory;
2424
import org.testcontainers.containers.KafkaContainer;
2525
import org.testcontainers.utility.DockerImageName;
@@ -39,7 +39,8 @@ public class Kafka3UnitServer implements SharedTestLifeCycle {
3939

4040
@Override
4141
public Properties beforeAll() {
42-
Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
42+
Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
43+
4344
container = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.7.1"));
4445

4546
container.start();

Diff for: ‎agent-module/plugins-it/kafka-it/kafka-3-it/src/test/java/test/pinpoint/plugin/kafka/Kafka3UnitServer.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycle;
2020
import org.apache.logging.log4j.LogManager;
2121
import org.apache.logging.log4j.Logger;
22-
import org.junit.Assume;
22+
import org.junit.jupiter.api.Assumptions;
2323
import org.testcontainers.DockerClientFactory;
2424
import org.testcontainers.containers.KafkaContainer;
2525
import org.testcontainers.utility.DockerImageName;
@@ -39,7 +39,8 @@ public class Kafka3UnitServer implements SharedTestLifeCycle {
3939

4040
@Override
4141
public Properties beforeAll() {
42-
Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
42+
Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
43+
4344
container = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.7.1"));
4445

4546
container.start();

Diff for: ‎agent-module/plugins-it/kafka-it/kafka-3-it/src/test/java/test/pinpoint/plugin/kafka/KafkaStreamsUnitServer.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.apache.kafka.clients.admin.AdminClient;
2121
import org.apache.kafka.clients.admin.NewTopic;
2222
import org.apache.kafka.streams.errors.StreamsException;
23-
import org.junit.Assume;
23+
import org.junit.jupiter.api.Assumptions;
2424
import org.testcontainers.DockerClientFactory;
2525
import org.testcontainers.containers.KafkaContainer;
2626
import org.testcontainers.utility.DockerImageName;
@@ -45,7 +45,8 @@ public class KafkaStreamsUnitServer implements SharedTestLifeCycle {
4545

4646
@Override
4747
public Properties beforeAll() {
48-
Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
48+
Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
49+
4950
container = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.7.1"));
5051

5152
container.start();

Diff for: ‎agent-module/plugins-it/mongodb-it/mongodb-4-it/src/test/java/com/navercorp/pinpoint/it/plugin/mongodb4/MongodbServer.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import com.navercorp.pinpoint.it.plugin.utils.jdbc.testcontainers.DatabaseContainers;
2020
import com.navercorp.pinpoint.test.plugin.shared.SharedTestLifeCycle;
21-
import org.junit.Assume;
21+
import org.junit.jupiter.api.Assumptions;
2222
import org.testcontainers.DockerClientFactory;
2323
import org.testcontainers.containers.MongoDBContainer;
2424

@@ -29,7 +29,8 @@ public class MongodbServer implements SharedTestLifeCycle {
2929

3030
@Override
3131
public Properties beforeAll() {
32-
Assume.assumeTrue("Docker not enabled", DockerClientFactory.instance().isDockerAvailable());
32+
Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not enabled");
33+
3334
container = new MongoDBContainer("mongo:4.4.29");
3435
container.start();
3536

0 commit comments

Comments
 (0)