Add tests for compose file with container name

This commit adds tests for compose files with container_name specified. A compose file was added for this purpose.

Author: reggiemcdonald

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

@@ -14,39 +14,9 @@
 public class ParsedDockerComposeFileValidationTest {
 
     @Test
-    public void shouldValidate() {
+    public void shouldAcceptContainerName() {
         File file = new File("src/test/resources/docker-compose-container-name-v1.yml");
-        Assertions
-            .assertThatThrownBy(() -> {
-                new ParsedDockerComposeFile(file);
-            })
-            .hasMessageContaining(file.getAbsolutePath())
-            .hasMessageContaining("'container_name' property set for service 'redis'");
-    }
-
-    @Test
-    public void shouldRejectContainerNameV1() {
-        Assertions
-            .assertThatThrownBy(() -> {
-                new ParsedDockerComposeFile(ImmutableMap.of(
-                    "redis", ImmutableMap.of("container_name", "redis")
-                ));
-            })
-            .hasMessageContaining("'container_name' property set for service 'redis'");
-    }
-
-    @Test
-    public void shouldRejectContainerNameV2() {
-        Assertions
-            .assertThatThrownBy(() -> {
-                new ParsedDockerComposeFile(ImmutableMap.of(
-                    "version", "2",
-                    "services", ImmutableMap.of(
-                        "redis", ImmutableMap.of("container_name", "redis")
-                    )
-                ));
-            })
-            .hasMessageContaining("'container_name' property set for service 'redis'");
+        ParsedDockerComposeFile parsedDockerComposeFile = new ParsedDockerComposeFile(file);
     }
 
     @Test
@@ -99,4 +69,5 @@ public void shouldObtainImageFromDockerfileBuildWithContext() {
         ParsedDockerComposeFile parsedFile = new ParsedDockerComposeFile(file);
         assertEquals("all defined images are found", Sets.newHashSet("redis", "mysql", "alpine:3.2"), parsedFile.getDependencyImageNames()); // redis, mysql from compose file, alpine:3.2 from Dockerfile build
     }
+
 }

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

@@ -0,0 +1,55 @@
+package org.testcontainers.junit;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.testcontainers.containers.ContainerState;
+import org.testcontainers.containers.DockerComposeContainer;
+
+import java.io.File;
+import java.util.Optional;
+
+import static org.junit.Assert.assertTrue;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;
+import static org.rnorth.visibleassertions.VisibleAssertions.assertNotNull;
+
+
+public class DockerComposeContainerWithNameTest extends BaseDockerComposeTest {
+    private final String REDIS_SERVICE_NAME = "redis";
+    private final String REDIS_INSTANCE_NAME = "redis_1";
+    private static final String DB_INSTANCE_NAME = "db_1";
+    private static final int DB_PORT = 3306;
+
+    @Rule
+    public DockerComposeContainer environment =
+        new DockerComposeContainer(new File("src/test/resources/compose-test-with-name.yml"))
+            .withExposedService(REDIS_INSTANCE_NAME, REDIS_PORT)
+            .withExposedService(DB_INSTANCE_NAME, DB_PORT);
+
+    @Override
+    public DockerComposeContainer getEnvironment() {
+        return environment;
+    }
+
+    @Test
+    public void testGetServicePort() {
+        int serviceWithInstancePort = environment.getServicePort(REDIS_INSTANCE_NAME, REDIS_PORT);
+        assertNotNull("Port is set for service with instance number", serviceWithInstancePort);
+        int serviceWithoutInstancePort = environment.getServicePort(REDIS_SERVICE_NAME, REDIS_PORT);
+        assertNotNull("Port is set for service with instance number", serviceWithoutInstancePort);
+        assertEquals("Service ports are the same", serviceWithInstancePort, serviceWithoutInstancePort);
+    }
+
+    @Test
+    public void containerNamesShouldBeCorrect() {
+        String containerName = "/redis_container";
+        Optional<ContainerState> result = environment.getContainerByServiceName(REDIS_INSTANCE_NAME);
+        assertTrue(String.format("container should be found for service %s", REDIS_INSTANCE_NAME), result.isPresent());
+        ContainerState state = result.get();
+        assertEquals("container name should be same as compose file", containerName, state.getContainerInfo().getName());
+
+        result = environment.getContainerByServiceName(DB_INSTANCE_NAME);
+        assertTrue(String.format("container should be found for service %s", DB_INSTANCE_NAME), result.isPresent());
+        state = result.get();
+        assertTrue("container name should contain service name", state.getContainerInfo().getName().contains(DB_INSTANCE_NAME));
+    }
+}

core/src/test/resources/compose-test-with-name.yml

@@ -0,0 +1,7 @@
+redis:
+  image: redis
+  container_name: redis_container
+db:
+  image: mysql:5.7.22
+  environment:
+    MYSQL_RANDOM_ROOT_PASSWORD: "true"