Skip to content

Commit 1714560

Browse files
eddumelendezeddumelendez
authored
Move Cassandra tests to JUnit Jupiter (#10728)
1 parent 1cba0c5 commit 1714560

File tree

5 files changed

+52
-53
lines changed

5 files changed

+52
-53
lines changed

‎modules/cassandra/build.gradle‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ dependencies {
1010
api project(":testcontainers-database-commons")
1111
api "com.datastax.cassandra:cassandra-driver-core:3.10.0"
1212

13-
testImplementation 'com.datastax.oss:java-driver-core:4.17.0'
13+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
14+
1415
testImplementation 'org.assertj:assertj-core:3.27.4'
16+
testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
17+
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.4'
18+
testImplementation 'com.datastax.oss:java-driver-core:4.17.0'
19+
}
20+
21+
test {
22+
useJUnitPlatform()
1523
}

‎modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
import com.datastax.oss.driver.api.core.CqlSession;
44
import com.datastax.oss.driver.api.core.cql.ResultSet;
55
import com.datastax.oss.driver.api.core.cql.Row;
6-
import org.junit.Test;
6+
import org.junit.jupiter.api.Test;
77
import org.testcontainers.containers.ContainerLaunchException;
88
import org.testcontainers.utility.DockerImageName;
99

1010
import static org.assertj.core.api.Assertions.assertThat;
11-
import static org.assertj.core.api.Assertions.catchThrowable;
11+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
1212

13-
public class CassandraContainerTest {
13+
class CassandraContainerTest {
1414

1515
private static final String CASSANDRA_IMAGE = "cassandra:3.11.2";
1616

@@ -19,7 +19,7 @@ public class CassandraContainerTest {
1919
private static final String BASIC_QUERY = "SELECT release_version FROM system.local";
2020

2121
@Test
22-
public void testSimple() {
22+
void testSimple() {
2323
try ( // container-definition {
2424
CassandraContainer cassandraContainer = new CassandraContainer("cassandra:3.11.2")
2525
// }
@@ -32,7 +32,7 @@ public void testSimple() {
3232
}
3333

3434
@Test
35-
public void testSpecificVersion() {
35+
void testSpecificVersion() {
3636
String cassandraVersion = "3.0.15";
3737
try (
3838
CassandraContainer cassandraContainer = new CassandraContainer(
@@ -47,7 +47,7 @@ public void testSpecificVersion() {
4747
}
4848

4949
@Test
50-
public void testConfigurationOverride() {
50+
void testConfigurationOverride() {
5151
try (
5252
CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)
5353
.withConfigurationOverride("cassandra-test-configuration-example")
@@ -61,18 +61,18 @@ public void testConfigurationOverride() {
6161
}
6262
}
6363

64-
@Test(expected = ContainerLaunchException.class)
65-
public void testEmptyConfigurationOverride() {
64+
@Test
65+
void testEmptyConfigurationOverride() {
6666
try (
6767
CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)
6868
.withConfigurationOverride("cassandra-empty-configuration")
6969
) {
70-
cassandraContainer.start();
70+
assertThatThrownBy(cassandraContainer::start).isInstanceOf(ContainerLaunchException.class);
7171
}
7272
}
7373

7474
@Test
75-
public void testInitScript() {
75+
void testInitScript() {
7676
try (
7777
CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)
7878
.withInitScript("initial.cql")
@@ -83,17 +83,17 @@ public void testInitScript() {
8383
}
8484

8585
@Test
86-
public void testNonexistentInitScript() {
86+
void testNonexistentInitScript() {
8787
try (
8888
CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)
8989
.withInitScript("unknown_script.cql")
9090
) {
91-
assertThat(catchThrowable(cassandraContainer::start)).isInstanceOf(ContainerLaunchException.class);
91+
assertThatThrownBy(cassandraContainer::start).isInstanceOf(ContainerLaunchException.class);
9292
}
9393
}
9494

9595
@Test
96-
public void testInitScriptWithRequiredAuthentication() {
96+
void testInitScriptWithRequiredAuthentication() {
9797
try (
9898
// init-with-auth {
9999
CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)
@@ -106,18 +106,18 @@ public void testInitScriptWithRequiredAuthentication() {
106106
}
107107
}
108108

109-
@Test(expected = ContainerLaunchException.class)
110-
public void testInitScriptWithError() {
109+
@Test
110+
void testInitScriptWithError() {
111111
try (
112112
CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)
113113
.withInitScript("initial-with-error.cql")
114114
) {
115-
cassandraContainer.start();
115+
assertThatThrownBy(cassandraContainer::start).isInstanceOf(ContainerLaunchException.class);
116116
}
117117
}
118118

119119
@Test
120-
public void testInitScriptWithLegacyCassandra() {
120+
void testInitScriptWithLegacyCassandra() {
121121
try (
122122
CassandraContainer cassandraContainer = new CassandraContainer("cassandra:2.2.11")
123123
.withInitScript("initial.cql")

‎modules/cassandra/src/test/java/org/testcontainers/cassandra/CompatibleCassandraImageTest.java‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,21 @@
33
import com.datastax.oss.driver.api.core.CqlIdentifier;
44
import com.datastax.oss.driver.api.core.CqlSession;
55
import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata;
6-
import org.junit.Test;
7-
import org.junit.runner.RunWith;
8-
import org.junit.runners.Parameterized;
6+
import org.junit.jupiter.params.ParameterizedTest;
7+
import org.junit.jupiter.params.provider.MethodSource;
98

109
import static org.assertj.core.api.Assertions.assertThat;
1110

12-
@RunWith(Parameterized.class)
13-
public class CompatibleCassandraImageTest {
11+
class CompatibleCassandraImageTest {
1412

15-
@Parameterized.Parameters(name = "{0}")
1613
public static String[] params() {
1714
return new String[] { "cassandra:3.11.2", "cassandra:4.1.1", "cassandra:5" };
1815
}
1916

20-
@Parameterized.Parameter
21-
public String imageName;
22-
23-
@Test
24-
public void testCassandraGetContactPoint() {
25-
try (CassandraContainer cassandra = new CassandraContainer(this.imageName)) {
17+
@ParameterizedTest
18+
@MethodSource("params")
19+
void testCassandraGetContactPoint(String imageName) {
20+
try (CassandraContainer cassandra = new CassandraContainer(imageName)) {
2621
cassandra.start();
2722
assertCassandraFunctionality(cassandra);
2823
}

‎modules/cassandra/src/test/java/org/testcontainers/containers/CassandraContainerTest.java‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
import com.datastax.driver.core.Row;
66
import com.datastax.driver.core.Session;
77
import lombok.extern.slf4j.Slf4j;
8-
import org.junit.Test;
8+
import org.junit.jupiter.api.Test;
99
import org.testcontainers.containers.wait.CassandraQueryWaitStrategy;
1010
import org.testcontainers.utility.DockerImageName;
1111

1212
import static org.assertj.core.api.Assertions.assertThat;
13+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
1314

1415
@Slf4j
15-
public class CassandraContainerTest {
16+
class CassandraContainerTest {
1617

1718
private static final DockerImageName CASSANDRA_IMAGE = DockerImageName.parse("cassandra:3.11.2");
1819

@@ -21,7 +22,7 @@ public class CassandraContainerTest {
2122
private static final String BASIC_QUERY = "SELECT release_version FROM system.local";
2223

2324
@Test
24-
public void testSimple() {
25+
void testSimple() {
2526
try (CassandraContainer<?> cassandraContainer = new CassandraContainer<>(CASSANDRA_IMAGE)) {
2627
cassandraContainer.start();
2728
ResultSet resultSet = performQuery(cassandraContainer, BASIC_QUERY);
@@ -31,7 +32,7 @@ public void testSimple() {
3132
}
3233

3334
@Test
34-
public void testSpecificVersion() {
35+
void testSpecificVersion() {
3536
String cassandraVersion = "3.0.15";
3637
try (
3738
CassandraContainer<?> cassandraContainer = new CassandraContainer<>(
@@ -46,7 +47,7 @@ public void testSpecificVersion() {
4647
}
4748

4849
@Test
49-
public void testConfigurationOverride() {
50+
void testConfigurationOverride() {
5051
try (
5152
CassandraContainer<?> cassandraContainer = new CassandraContainer<>(CASSANDRA_IMAGE)
5253
.withConfigurationOverride("cassandra-test-configuration-example")
@@ -60,18 +61,18 @@ public void testConfigurationOverride() {
6061
}
6162
}
6263

63-
@Test(expected = ContainerLaunchException.class)
64-
public void testEmptyConfigurationOverride() {
64+
@Test
65+
void testEmptyConfigurationOverride() {
6566
try (
6667
CassandraContainer<?> cassandraContainer = new CassandraContainer<>(CASSANDRA_IMAGE)
6768
.withConfigurationOverride("cassandra-empty-configuration")
6869
) {
69-
cassandraContainer.start();
70+
assertThatThrownBy(cassandraContainer::start).isInstanceOf(ContainerLaunchException.class);
7071
}
7172
}
7273

7374
@Test
74-
public void testInitScript() {
75+
void testInitScript() {
7576
try (
7677
CassandraContainer<?> cassandraContainer = new CassandraContainer<>(CASSANDRA_IMAGE)
7778
.withInitScript("initial.cql")
@@ -82,7 +83,7 @@ public void testInitScript() {
8283
}
8384

8485
@Test
85-
public void testInitScriptWithLegacyCassandra() {
86+
void testInitScriptWithLegacyCassandra() {
8687
try (
8788
CassandraContainer<?> cassandraContainer = new CassandraContainer<>(
8889
DockerImageName.parse("cassandra:2.2.11")
@@ -96,7 +97,7 @@ public void testInitScriptWithLegacyCassandra() {
9697

9798
@SuppressWarnings("deprecation") // Using deprecated constructor for verification of backwards compatibility
9899
@Test
99-
public void testCassandraQueryWaitStrategy() {
100+
void testCassandraQueryWaitStrategy() {
100101
try (
101102
CassandraContainer<?> cassandraContainer = new CassandraContainer<>()
102103
.waitingFor(new CassandraQueryWaitStrategy())
@@ -109,7 +110,7 @@ public void testCassandraQueryWaitStrategy() {
109110

110111
@SuppressWarnings("deprecation") // Using deprecated constructor for verification of backwards compatibility
111112
@Test
112-
public void testCassandraGetCluster() {
113+
void testCassandraGetCluster() {
113114
try (CassandraContainer<?> cassandraContainer = new CassandraContainer<>()) {
114115
cassandraContainer.start();
115116
ResultSet resultSet = performQuery(cassandraContainer.getCluster(), BASIC_QUERY);

‎modules/cassandra/src/test/java/org/testcontainers/containers/CompatibleCassandraImageTest.java‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,21 @@
33
import com.datastax.oss.driver.api.core.CqlIdentifier;
44
import com.datastax.oss.driver.api.core.CqlSession;
55
import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata;
6-
import org.junit.Test;
7-
import org.junit.runner.RunWith;
8-
import org.junit.runners.Parameterized;
6+
import org.junit.jupiter.params.ParameterizedTest;
7+
import org.junit.jupiter.params.provider.MethodSource;
98

109
import static org.assertj.core.api.Assertions.assertThat;
1110

12-
@RunWith(Parameterized.class)
1311
public class CompatibleCassandraImageTest {
1412

15-
@Parameterized.Parameters(name = "{0}")
1613
public static String[] params() {
1714
return new String[] { "cassandra:3.11.2", "cassandra:4.1.1" };
1815
}
1916

20-
@Parameterized.Parameter
21-
public String imageName;
22-
23-
@Test
24-
public void testCassandraGetContactPoint() {
25-
try (CassandraContainer<?> cassandra = new CassandraContainer<>(this.imageName)) {
17+
@ParameterizedTest
18+
@MethodSource("params")
19+
void testCassandraGetContactPoint(String imageName) {
20+
try (CassandraContainer<?> cassandra = new CassandraContainer<>(imageName)) {
2621
cassandra.start();
2722
assertCassandraFunctionality(cassandra);
2823
}

0 commit comments

Comments
 (0)