Polish Cassandra tests

docs/modules/databases/cassandra.md

@@ -6,12 +6,12 @@ This example connects to the Cassandra cluster:
 
 1. Define a container:
     <!--codeinclude-->
-    [Container definition](../../../modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraDriver4Test.java) inside_block:container-definition
+    [Container definition](../../../modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java) inside_block:container-definition
     <!--/codeinclude-->
 
 2. Build a `CqlSession`:
     <!--codeinclude-->
-    [Building CqlSession](../../../modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraDriver4Test.java) inside_block:cql-session
+    [Building CqlSession](../../../modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraContainerTest.java) inside_block:cql-session
     <!--/codeinclude-->
 
 3. Define a container with custom `cassandra.yaml` located in a directory `cassandra-auth-required-configuration`:

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

@@ -1,7 +1,6 @@
 package org.testcontainers.cassandra;
 
 import com.datastax.oss.driver.api.core.CqlSession;
-import com.datastax.oss.driver.api.core.CqlSessionBuilder;
 import com.datastax.oss.driver.api.core.cql.ResultSet;
 import com.datastax.oss.driver.api.core.cql.Row;
 import org.junit.Test;
@@ -20,7 +19,10 @@ public class CassandraContainerTest {
 
     @Test
     public void testSimple() {
-        try (CassandraContainer cassandraContainer = new CassandraContainer(CASSANDRA_IMAGE)) {
+        try ( // container-definition {
+            CassandraContainer cassandraContainer = new CassandraContainer("cassandra:3.11.2")
+            // }
+        ) {
             cassandraContainer.start();
             ResultSet resultSet = performQuery(cassandraContainer, BASIC_QUERY);
             assertThat(resultSet.wasApplied()).as("Query was applied").isTrue();
@@ -115,30 +117,39 @@ public void testInitScriptWithLegacyCassandra() {
     }
 
     private void testInitScript(CassandraContainer cassandraContainer, boolean withCredentials) {
-        ResultSet resultSet = performQuery(
-            cassandraContainer,
-            "SELECT * FROM keySpaceTest.catalog_category",
-            withCredentials
-        );
+        String query = "SELECT * FROM keySpaceTest.catalog_category";
+        ResultSet resultSet;
+
+        if (withCredentials) {
+            resultSet = performQueryWithAuth(cassandraContainer, query);
+        } else {
+            resultSet = performQuery(cassandraContainer, query);
+        }
+
         assertThat(resultSet.wasApplied()).as("Query was applied").isTrue();
         Row row = resultSet.one();
         assertThat(row.getLong(0)).as("Inserted row is in expected state").isEqualTo(1);
         assertThat(row.getString(1)).as("Inserted row is in expected state").isEqualTo("test_category");
     }
 
     private ResultSet performQuery(CassandraContainer cassandraContainer, String cql) {
-        return performQuery(cassandraContainer, cql, false);
+        // cql-session {
+        final CqlSession cqlSession = CqlSession
+            .builder()
+            .addContactPoint(cassandraContainer.getContactPoint())
+            .withLocalDatacenter(cassandraContainer.getLocalDatacenter())
+            .build();
+        // }
+        return performQuery(cqlSession, cql);
     }
 
-    private ResultSet performQuery(CassandraContainer cassandraContainer, String cql, boolean withCredentials) {
-        final CqlSessionBuilder cqlSessionBuilder = CqlSession
+    private ResultSet performQueryWithAuth(CassandraContainer cassandraContainer, String cql) {
+        final CqlSession cqlSession = CqlSession
             .builder()
             .addContactPoint(cassandraContainer.getContactPoint())
-            .withLocalDatacenter(cassandraContainer.getLocalDatacenter());
-        if (withCredentials) {
-            cqlSessionBuilder.withAuthCredentials(cassandraContainer.getUsername(), cassandraContainer.getPassword());
-        }
-        final CqlSession cqlSession = cqlSessionBuilder.build();
+            .withLocalDatacenter(cassandraContainer.getLocalDatacenter())
+            .withAuthCredentials(cassandraContainer.getUsername(), cassandraContainer.getPassword())
+            .build();
         return performQuery(cqlSession, cql);
     }
 

modules/cassandra/src/test/java/org/testcontainers/cassandra/CassandraDriver4Test.java → modules/cassandra/src/test/java/org/testcontainers/cassandra/CompatibleCassandraImageTest.java

@@ -3,29 +3,38 @@
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata;
-import org.junit.Rule;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CassandraDriver4Test {
+@RunWith(Parameterized.class)
+public class CompatibleCassandraImageTest {
 
-    @Rule
-    // container-definition {
-    public CassandraContainer cassandra = new CassandraContainer("cassandra:3.11.2");
+    @Parameterized.Parameters(name = "{0}")
+    public static String[] params() {
+        return new String[] { "cassandra:3.11.2", "cassandra:4.1.1", "cassandra:5" };
+    }
 
-    // }
+    @Parameterized.Parameter
+    public String imageName;
 
     @Test
     public void testCassandraGetContactPoint() {
+        try (CassandraContainer cassandra = new CassandraContainer(this.imageName)) {
+            cassandra.start();
+            assertCassandraFunctionality(cassandra);
+        }
+    }
+
+    private void assertCassandraFunctionality(CassandraContainer cassandra) {
         try (
-            // cql-session {
             CqlSession session = CqlSession
                 .builder()
                 .addContactPoint(cassandra.getContactPoint())
                 .withLocalDatacenter(cassandra.getLocalDatacenter())
                 .build()
-            // }
         ) {
             session.execute(
                 "CREATE KEYSPACE IF NOT EXISTS test WITH replication = \n" +

modules/cassandra/src/test/java/org/testcontainers/containers/CassandraServer4Test.java → modules/cassandra/src/test/java/org/testcontainers/containers/CompatibleCassandraImageTest.java

@@ -3,23 +3,37 @@
 import com.datastax.oss.driver.api.core.CqlIdentifier;
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata;
-import org.junit.Rule;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CassandraServer4Test {
+@RunWith(Parameterized.class)
+public class CompatibleCassandraImageTest {
 
-    @Rule
-    public CassandraContainer<?> cassandra = new CassandraContainer<>("cassandra:4.1.1");
+    @Parameterized.Parameters(name = "{0}")
+    public static String[] params() {
+        return new String[] { "cassandra:3.11.2", "cassandra:4.1.1" };
+    }
+
+    @Parameterized.Parameter
+    public String imageName;
 
     @Test
     public void testCassandraGetContactPoint() {
+        try (CassandraContainer<?> cassandra = new CassandraContainer<>(this.imageName)) {
+            cassandra.start();
+            assertCassandraFunctionality(cassandra);
+        }
+    }
+
+    private void assertCassandraFunctionality(CassandraContainer<?> cassandra) {
         try (
             CqlSession session = CqlSession
                 .builder()
-                .addContactPoint(this.cassandra.getContactPoint())
-                .withLocalDatacenter(this.cassandra.getLocalDatacenter())
+                .addContactPoint(cassandra.getContactPoint())
+                .withLocalDatacenter(cassandra.getLocalDatacenter())
                 .build()
         ) {
             session.execute(