Skip to content

Commit ad84679

Browse files
authored
Move InfluxDB tests to JUnit Jupiter (#10738)
1 parent b5869ab commit ad84679

File tree

3 files changed

+19
-12
lines changed

3 files changed

+19
-12
lines changed

modules/influxdb/build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ dependencies {
55

66
compileOnly 'org.influxdb:influxdb-java:2.25'
77

8+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
9+
10+
testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
811
testImplementation 'org.assertj:assertj-core:3.27.4'
912
testImplementation 'org.influxdb:influxdb-java:2.25'
1013
testImplementation "com.influxdb:influxdb-client-java:7.3.0"
@@ -15,3 +18,7 @@ tasks.japicmp {
1518
"org.testcontainers.containers.InfluxDBContainer"
1619
]
1720
}
21+
22+
test {
23+
useJUnitPlatform()
24+
}

modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import com.influxdb.client.write.Point;
1212
import com.influxdb.query.FluxRecord;
1313
import com.influxdb.query.FluxTable;
14-
import org.junit.Test;
14+
import org.junit.jupiter.api.Test;
1515
import org.testcontainers.utility.DockerImageName;
1616

1717
import java.time.Instant;
@@ -20,7 +20,7 @@
2020

2121
import static org.assertj.core.api.Assertions.assertThat;
2222

23-
public class InfluxDBContainerTest {
23+
class InfluxDBContainerTest {
2424

2525
private static final String USERNAME = "new-test-user";
2626

@@ -37,7 +37,7 @@ public class InfluxDBContainerTest {
3737
private static final int SECONDS_IN_WEEK = 604800;
3838

3939
@Test
40-
public void getInfluxDBClient() {
40+
void getInfluxDBClient() {
4141
try (
4242
// constructorWithDefaultVariables {
4343
final InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
@@ -55,7 +55,7 @@ public void getInfluxDBClient() {
5555
}
5656

5757
@Test
58-
public void getInfluxDBClientWithAdminToken() {
58+
void getInfluxDBClientWithAdminToken() {
5959
try (
6060
// constructorWithAdminToken {
6161
final InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
@@ -81,7 +81,7 @@ public void getInfluxDBClientWithAdminToken() {
8181
}
8282

8383
@Test
84-
public void getBucket() {
84+
void getBucket() {
8585
try (
8686
// constructorWithCustomVariables {
8787
final InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
@@ -111,7 +111,7 @@ public void getBucket() {
111111
}
112112

113113
@Test
114-
public void queryForWriteAndRead() {
114+
void queryForWriteAndRead() {
115115
try (
116116
final InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
117117
InfluxDBTestUtils.INFLUXDB_V2_TEST_IMAGE

modules/influxdb/src/test/java/org/testcontainers/containers/InfluxDBContainerV1Test.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
import org.influxdb.dto.Point;
66
import org.influxdb.dto.Query;
77
import org.influxdb.dto.QueryResult;
8-
import org.junit.Test;
8+
import org.junit.jupiter.api.Test;
99
import org.testcontainers.utility.DockerImageName;
1010

1111
import java.util.concurrent.TimeUnit;
1212

1313
import static org.assertj.core.api.Assertions.assertThat;
1414

15-
public class InfluxDBContainerV1Test {
15+
class InfluxDBContainerV1Test {
1616

1717
private static final String TEST_VERSION = InfluxDBTestUtils.INFLUXDB_V1_TEST_IMAGE.getVersionPart();
1818

@@ -23,7 +23,7 @@ public class InfluxDBContainerV1Test {
2323
private static final String PASSWORD = "new-test-password";
2424

2525
@Test
26-
public void createInfluxDBOnlyWithUrlAndCorrectVersion() {
26+
void createInfluxDBOnlyWithUrlAndCorrectVersion() {
2727
try (
2828
// constructorWithDefaultVariables {
2929
final InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
@@ -43,7 +43,7 @@ public void createInfluxDBOnlyWithUrlAndCorrectVersion() {
4343
}
4444

4545
@Test
46-
public void getNewInfluxDBWithCorrectVersion() {
46+
void getNewInfluxDBWithCorrectVersion() {
4747
try (
4848
final InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
4949
InfluxDBTestUtils.INFLUXDB_V1_TEST_IMAGE
@@ -61,7 +61,7 @@ public void getNewInfluxDBWithCorrectVersion() {
6161
}
6262

6363
@Test
64-
public void describeDatabases() {
64+
void describeDatabases() {
6565
try (
6666
// constructorWithUserPassword {
6767
final InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
@@ -82,7 +82,7 @@ public void describeDatabases() {
8282
}
8383

8484
@Test
85-
public void queryForWriteAndRead() {
85+
void queryForWriteAndRead() {
8686
try (
8787
final InfluxDBContainer<?> influxDBContainer = new InfluxDBContainer<>(
8888
InfluxDBTestUtils.INFLUXDB_V1_TEST_IMAGE

0 commit comments

Comments
 (0)