Fix compilation errors after merge: add type casts for Neo4j tests and remove deprecated RabbitMQ test file

Author: raju.gupta

core/src/test/java/org/testcontainers/containers/ComposeOverridesTest.java

@@ -55,9 +55,7 @@ void test(boolean localMode, String expectedEnvVar, File... composeFiles) {
                 .isTrue();
         }
         try (
-            ComposeContainer compose = new ComposeContainer(composeFiles)
-                .withLocalCompose(localMode)
-                .withExposedService(SERVICE_NAME, SERVICE_PORT)
+            ComposeContainer compose = new ComposeContainer(composeFiles).withExposedService(SERVICE_NAME, SERVICE_PORT)
         ) {
             compose.start();
 

core/src/test/java/org/testcontainers/containers/DockerComposeOverridesTest.java

@@ -54,8 +54,7 @@ void test(boolean localMode, String expectedEnvVar, File... composeFiles) throws
                 .doesNotStartWith("Docker Compose version v2");
         }
         try (
-            DockerComposeContainer compose = new DockerComposeContainer(composeFiles)
-                .withLocalCompose(localMode)
+            DockerComposeContainer<?> compose = new DockerComposeContainer(composeFiles)
                 .withExposedService(SERVICE_NAME, SERVICE_PORT)
         ) {
             compose.start();

core/src/test/java/org/testcontainers/junit/DockerComposeLocalImageTest.java

@@ -13,19 +13,22 @@ class DockerComposeLocalImageTest {
 
     @Test
     void usesLocalImageEvenWhenPullFails() throws InterruptedException {
-        tagImage("redis:6-alpine", "redis-local", "latest");
+        tagImage();
 
-        DockerComposeContainer composeContainer = new DockerComposeContainer(
-            DockerImageName.parse("docker/compose:1.29.2"),
-            new File("src/test/resources/local-compose-test.yml")
-        )
-            .withExposedService("redis", 6379);
-        composeContainer.start();
+        try (
+            DockerComposeContainer<?> composeContainer = new DockerComposeContainer<>(
+                DockerImageName.parse("docker/compose:1.29.2"),
+                new File("src/test/resources/local-compose-test.yml")
+            )
+                .withExposedService("redis", 6379)
+        ) {
+            composeContainer.start();
+        }
     }
 
-    private void tagImage(String sourceImage, String targetImage, String targetTag) throws InterruptedException {
+    private void tagImage() throws InterruptedException {
         DockerClient client = DockerClientFactory.instance().client();
-        client.pullImageCmd(sourceImage).exec(new PullImageResultCallback()).awaitCompletion();
-        client.tagImageCmd(sourceImage, targetImage, targetTag).exec();
+        client.pullImageCmd("redis:6-alpine").exec(new PullImageResultCallback()).awaitCompletion();
+        client.tagImageCmd("redis:6-alpine", "redis-local", "latest").exec();
     }
 }

modules/mongodb/src/test/java/org/testcontainers/mongodb/CompatibleImageTest.java

@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.mongodb;
 
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;

modules/mongodb/src/test/java/org/testcontainers/mongodb/MongoDBContainerTest.java

@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.mongodb;
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;

modules/mssqlserver/src/test/java/org/testcontainers/mssqlserver/MSSQLServerContainerTest.java

@@ -93,9 +93,17 @@ void testSqlServerConnection() throws SQLException {
         ) {
             mssqlServerContainer.start();
 
-            ResultSet resultSet = performQuery(mssqlServerContainer, mssqlServerContainer.getTestQueryString());
-            int resultSetInt = resultSet.getInt(1);
-            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
+            performQuery(
+                mssqlServerContainer,
+                mssqlServerContainer.getTestQueryString(),
+                resultSet -> {
+                    assertThatNoException()
+                        .isThrownBy(() -> {
+                            int resultSetInt = resultSet.getInt(1);
+                            assertThat(resultSetInt).as("A basic SELECT query succeeds").isEqualTo(1);
+                        });
+                }
+            );
         }
     }
 

modules/neo4j/src/test/java/org/testcontainers/neo4j/Neo4jContainerTest.java

@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.neo4j;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
@@ -192,7 +192,10 @@ void shouldAddConfigToEnvironment() {
 
     @Test
     void shouldRespectEnvironmentAuth() {
-        try (Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").withEnv("NEO4J_AUTH", "neo4j/secret")) {
+        try (
+            Neo4jContainer neo4jContainer = (Neo4jContainer) new Neo4jContainer("neo4j:4.4")
+                .withEnv("NEO4J_AUTH", "neo4j/secret")
+        ) {
             neo4jContainer.configure();
 
             assertThat(neo4jContainer.getEnvMap()).containsEntry("NEO4J_AUTH", "neo4j/secret");
@@ -214,9 +217,9 @@ void shouldSetCustomPasswordCorrectly() {
     @Test
     void containerAdminPasswordOverrulesEnvironmentAuth() {
         try (
-            Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4")
-                .withEnv("NEO4J_AUTH", "neo4j/secret")
-                .withAdminPassword("anotherSecret")
+            Neo4jContainer neo4jContainer = (
+                (Neo4jContainer) new Neo4jContainer("neo4j:4.4").withEnv("NEO4J_AUTH", "neo4j/secret")
+            ).withAdminPassword("anotherSecret")
         ) {
             neo4jContainer.configure();
 
@@ -227,9 +230,9 @@ void containerAdminPasswordOverrulesEnvironmentAuth() {
     @Test
     void containerWithoutAuthenticationOverrulesEnvironmentAuth() {
         try (
-            Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4")
-                .withEnv("NEO4J_AUTH", "neo4j/secret")
-                .withoutAuthentication()
+            Neo4jContainer neo4jContainer = (
+                (Neo4jContainer) new Neo4jContainer("neo4j:4.4").withEnv("NEO4J_AUTH", "neo4j/secret")
+            ).withoutAuthentication()
         ) {
             neo4jContainer.configure();
 
@@ -239,7 +242,7 @@ void containerWithoutAuthenticationOverrulesEnvironmentAuth() {
 
     @Test
     void shouldRespectAlreadyDefinedPortMappingsBolt() {
-        try (Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").withExposedPorts(7687)) {
+        try (Neo4jContainer neo4jContainer = (Neo4jContainer) new Neo4jContainer("neo4j:4.4").withExposedPorts(7687)) {
             neo4jContainer.configure();
 
             assertThat(neo4jContainer.getExposedPorts()).containsExactly(7687);
@@ -248,7 +251,7 @@ void shouldRespectAlreadyDefinedPortMappingsBolt() {
 
     @Test
     void shouldRespectAlreadyDefinedPortMappingsHttp() {
-        try (Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").withExposedPorts(7474)) {
+        try (Neo4jContainer neo4jContainer = (Neo4jContainer) new Neo4jContainer("neo4j:4.4").withExposedPorts(7474)) {
             neo4jContainer.configure();
 
             assertThat(neo4jContainer.getExposedPorts()).containsExactly(7474);
@@ -257,7 +260,10 @@ void shouldRespectAlreadyDefinedPortMappingsHttp() {
 
     @Test
     void shouldRespectAlreadyDefinedPortMappingsWithoutHttps() {
-        try (Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").withExposedPorts(7687, 7474)) {
+        try (
+            Neo4jContainer neo4jContainer = (Neo4jContainer) new Neo4jContainer("neo4j:4.4")
+                .withExposedPorts(7687, 7474)
+        ) {
             neo4jContainer.configure();
 
             assertThat(neo4jContainer.getExposedPorts()).containsExactlyInAnyOrder(7474, 7687);
@@ -275,13 +281,11 @@ void shouldDefaultExportBoltHttpAndHttps() {
 
     @Test
     void shouldRespectCustomWaitStrategy() {
-        try (
-            Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").waitingFor(new CustomDummyWaitStrategy())
-        ) {
-            neo4jContainer.configure();
+        Neo4jContainer neo4jContainer = new Neo4jContainer("neo4j:4.4").waitingFor(new CustomDummyWaitStrategy());
 
-            assertThat(neo4jContainer.getWaitStrategy()).isInstanceOf(CustomDummyWaitStrategy.class);
-        }
+        neo4jContainer.configure();
+
+        assertThat(neo4jContainer).extracting("waitStrategy").isInstanceOf(CustomDummyWaitStrategy.class);
     }
 
     @Test
@@ -306,7 +310,7 @@ void shouldConfigureMultiplePluginsByName() {
             neo4jContainer.configure();
 
             assertThat(neo4jContainer.getEnvMap().get("NEO4JLABS_PLUGINS"))
-                .containsAnyOf("[\"apoc\",\"bloom\"]", "[\"bloom\",\"apoc\"]");
+                .isIn("[\"apoc\",\"bloom\"]", "[\"bloom\",\"apoc\"]");
         }
     }