fix tests

Author: mkorolyov

modules/scylladb/build.gradle

@@ -1,11 +1,16 @@
 description = "Testcontainers :: ScyllaDB"
 
+configurations.all {
+    resolutionStrategy {
+        force 'io.dropwizard.metrics:metrics-core:3.2.6'
+    }
+}
+
 dependencies {
     api project(":database-commons")
     api "com.scylladb:java-driver-core:4.15.0.0"
     api "com.datastax.cassandra:cassandra-driver-core:3.10.0"
 
-    testImplementation 'com.scylladb:java-driver-core:4.15.0.0'
-    testImplementation 'com.datastax.oss:java-driver-core:4.17.0'
+//    testImplementation 'com.datastax.oss:java-driver-core:4.17.0'
     testImplementation 'org.assertj:assertj-core:3.24.2'
 }

modules/scylladb/src/main/java/org/testcontainers/containers/ScyllaDBContainer.java

@@ -26,13 +26,13 @@
  */
 public class ScyllaDBContainer<SELF extends ScyllaDBContainer<SELF>> extends GenericContainer<SELF> {
 
-    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("scylladb:scylladb");
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("scylladb/scylla:5.2.9");
 
     public static final Integer CQL_PORT = 9042;
 
     private static final String DEFAULT_LOCAL_DATACENTER = "datacenter1";
 
-    private static final String CONTAINER_CONFIG_LOCATION = "/etc/scylladb";
+    private static final String CONTAINER_CONFIG_LOCATION = "/etc/scylla";
 
     private static final String USERNAME = "scylladb";
 

modules/scylladb/src/test/java/org/testcontainers/containers/ScyllaDBContainerTest.java

@@ -6,14 +6,15 @@
 import com.datastax.driver.core.Session;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
+import org.testcontainers.containers.wait.ScyllaDBQueryWaitStrategy;
 import org.testcontainers.utility.DockerImageName;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 @Slf4j
 public class ScyllaDBContainerTest {
 
-    private static final DockerImageName SCYLLADB_IMAGE = DockerImageName.parse("scylladb:5.2.9");
+    private static final DockerImageName SCYLLADB_IMAGE = DockerImageName.parse("scylladb/scylla:5.2.9");
 
     private static final String TEST_CLUSTER_NAME_IN_CONF = "Test Cluster Integration Test";
 
@@ -31,22 +32,22 @@ public void testSimple() {
 
     @Test
     public void testSpecificVersion() {
-        String scyllaDBVersion = "5.2.9";
+        String scyllaDBReportedVersion = "3.0.8";
         try (
-            ScyllaDBContainer<?> ScyllaDBContainer = new ScyllaDBContainer<>(SCYLLADB_IMAGE.withTag(scyllaDBVersion))
+            ScyllaDBContainer<?> ScyllaDBContainer = new ScyllaDBContainer<>(SCYLLADB_IMAGE)
         ) {
             ScyllaDBContainer.start();
             ResultSet resultSet = performQuery(ScyllaDBContainer, BASIC_QUERY);
             assertThat(resultSet.wasApplied()).as("Query was applied").isTrue();
-            assertThat(resultSet.one().getString(0)).as("ScyllaDB has right version").isEqualTo(scyllaDBVersion);
+            assertThat(resultSet.one().getString(0)).as("ScyllaDB has right version").isEqualTo(scyllaDBReportedVersion);
         }
     }
 
     @Test
     public void testConfigurationOverride() {
         try (
             ScyllaDBContainer<?> ScyllaDBContainer = new ScyllaDBContainer<>(SCYLLADB_IMAGE)
-                .withConfigurationOverride("scylladb-test-configuration-example")
+                .withConfigurationOverride("scylla-test-configuration-example")
         ) {
             ScyllaDBContainer.start();
             ResultSet resultSet = performQuery(ScyllaDBContainer, "SELECT cluster_name FROM system.local");
@@ -78,6 +79,18 @@ public void testInitScript() {
         }
     }
 
+    @Test
+    public void testScyllaDBQueryWaitStrategy() {
+        try (
+            ScyllaDBContainer<?> scyllaDBContainer = new ScyllaDBContainer<>(SCYLLADB_IMAGE)
+                .waitingFor(new ScyllaDBQueryWaitStrategy())
+        ) {
+            scyllaDBContainer.start();
+            ResultSet resultSet = performQuery(scyllaDBContainer, BASIC_QUERY);
+            assertThat(resultSet.wasApplied()).as("Query was applied").isTrue();
+        }
+    }
+
     private void testInitScript(ScyllaDBContainer<?> ScyllaDBContainer) {
         ResultSet resultSet = performQuery(ScyllaDBContainer, "SELECT * FROM keySpaceTest.catalog_category");
         assertThat(resultSet.wasApplied()).as("Query was applied").isTrue();

modules/scylladb/src/test/java/org/testcontainers/containers/ScyllaDBDriver4Test.java

@@ -11,7 +11,7 @@
 public class ScyllaDBDriver4Test {
 
     @Rule
-    public ScyllaDBContainer<?> scyllaDB = new ScyllaDBContainer<>("scylladb:5.2.9");
+    public ScyllaDBContainer<?> scyllaDB = new ScyllaDBContainer<>("scylladb/scylla:5.2.9");
 
     @Test
     public void testCassandraGetContactPoint() {

modules/scylladb/src/test/java/org/testcontainers/containers/ScyllaDBServer5Test.java

@@ -11,10 +11,10 @@
 public class ScyllaDBServer5Test {
 
     @Rule
-    public ScyllaDBContainer<?> scylladb = new ScyllaDBContainer<>("sylladb:5.2.9");
+    public ScyllaDBContainer<?> scylladb = new ScyllaDBContainer<>("scylladb/scylla:5.2.9");
 
     @Test
-    public void testCassandraGetContactPoint() {
+    public void testScyllaDBGetContactPoint() {
         try (
             CqlSession session = CqlSession
                 .builder()