Skip to content

Commit e3bcdb3

Browse files
committed
Move CockroachDB tests to JUnit Jupiter
1 parent 6e5e6e8 commit e3bcdb3

File tree

3 files changed

+17
-14
lines changed

3 files changed

+17
-14
lines changed

modules/cockroachdb/build.gradle

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ description = "Testcontainers :: JDBC :: CockroachDB"
33
dependencies {
44
api project(':testcontainers-jdbc')
55

6-
testImplementation project(':testcontainers-jdbc-test')
76
testRuntimeOnly 'org.postgresql:postgresql:42.7.7'
7+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
8+
9+
testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
10+
testImplementation project(':testcontainers-jdbc-test')
811
testImplementation 'org.assertj:assertj-core:3.27.4'
912
}
1013

@@ -13,3 +16,7 @@ tasks.japicmp {
1316
"org.testcontainers.containers.CockroachContainer"
1417
]
1518
}
19+
20+
test {
21+
useJUnitPlatform()
22+
}

modules/cockroachdb/src/test/java/org/testcontainers/jdbc/cockroachdb/CockroachDBJDBCDriverTest.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
package org.testcontainers.jdbc.cockroachdb;
22

3-
import org.junit.runner.RunWith;
4-
import org.junit.runners.Parameterized;
53
import org.testcontainers.jdbc.AbstractJDBCDriverTest;
64

75
import java.util.Arrays;
86
import java.util.EnumSet;
97

10-
@RunWith(Parameterized.class)
11-
public class CockroachDBJDBCDriverTest extends AbstractJDBCDriverTest {
8+
class CockroachDBJDBCDriverTest extends AbstractJDBCDriverTest {
129

13-
@Parameterized.Parameters(name = "{index} - {0}")
1410
public static Iterable<Object[]> data() {
1511
return Arrays.asList(
1612
new Object[][] { //

modules/cockroachdb/src/test/java/org/testcontainers/junit/cockroachdb/SimpleCockroachDBTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.testcontainers.junit.cockroachdb;
22

3-
import org.junit.Test;
3+
import org.junit.jupiter.api.Test;
44
import org.testcontainers.CockroachDBTestImages;
55
import org.testcontainers.containers.CockroachContainer;
66
import org.testcontainers.db.AbstractContainerDatabaseTest;
@@ -14,14 +14,14 @@
1414
import static org.assertj.core.api.Assertions.assertThat;
1515
import static org.assertj.core.api.Assertions.assertThatThrownBy;
1616

17-
public class SimpleCockroachDBTest extends AbstractContainerDatabaseTest {
17+
class SimpleCockroachDBTest extends AbstractContainerDatabaseTest {
1818
static {
1919
// Postgres JDBC driver uses JUL; disable it to avoid annoying, irrelevant, stderr logs during connection testing
2020
LogManager.getLogManager().getLogger("").setLevel(Level.OFF);
2121
}
2222

2323
@Test
24-
public void testSimple() throws SQLException {
24+
void testSimple() throws SQLException {
2525
try ( // container {
2626
CockroachContainer cockroach = new CockroachContainer("cockroachdb/cockroach:v22.2.3")
2727
// }
@@ -36,7 +36,7 @@ public void testSimple() throws SQLException {
3636
}
3737

3838
@Test
39-
public void testExplicitInitScript() throws SQLException {
39+
void testExplicitInitScript() throws SQLException {
4040
try (
4141
CockroachContainer cockroach = new CockroachContainer(CockroachDBTestImages.COCKROACHDB_IMAGE)
4242
.withInitScript("somepath/init_postgresql.sql")
@@ -51,7 +51,7 @@ public void testExplicitInitScript() throws SQLException {
5151
}
5252

5353
@Test
54-
public void testWithAdditionalUrlParamInJdbcUrl() {
54+
void testWithAdditionalUrlParamInJdbcUrl() {
5555
CockroachContainer cockroach = new CockroachContainer(CockroachDBTestImages.COCKROACHDB_IMAGE)
5656
.withUrlParam("sslmode", "disable")
5757
.withUrlParam("application_name", "cockroach");
@@ -70,7 +70,7 @@ public void testWithAdditionalUrlParamInJdbcUrl() {
7070
}
7171

7272
@Test
73-
public void testWithUsernamePasswordDatabase() throws SQLException {
73+
void testWithUsernamePasswordDatabase() throws SQLException {
7474
try (
7575
CockroachContainer cockroach = new CockroachContainer(
7676
CockroachDBTestImages.FIRST_COCKROACHDB_IMAGE_WITH_ENV_VARS_SUPPORT
@@ -92,7 +92,7 @@ public void testWithUsernamePasswordDatabase() throws SQLException {
9292
}
9393

9494
@Test
95-
public void testAnExceptionIsThrownWhenImageDoesNotSupportEnvVars() {
95+
void testAnExceptionIsThrownWhenImageDoesNotSupportEnvVars() {
9696
CockroachContainer cockroachContainer = new CockroachContainer(
9797
CockroachDBTestImages.COCKROACHDB_IMAGE_WITH_ENV_VARS_UNSUPPORTED
9898
);
@@ -111,7 +111,7 @@ public void testAnExceptionIsThrownWhenImageDoesNotSupportEnvVars() {
111111
}
112112

113113
@Test
114-
public void testInitializationScript() throws SQLException {
114+
void testInitializationScript() throws SQLException {
115115
String sql =
116116
"USE postgres; \n" +
117117
"CREATE TABLE bar (foo VARCHAR(255)); \n" +

0 commit comments

Comments
 (0)