Override ChainedImageNameSubstitutor toString (#7522)

Returns ChainedImageNameSubstitutor's getDescription Fixes #7039
testcontainers · Sep 13, 2023 · 00cc0ea · 00cc0ea
1 parent e67fc7d
commit 00cc0ea
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java b/core/src/main/java/org/testcontainers/utility/ImageNameSubstitutor.java
@@ -155,6 +155,11 @@ protected String getDescription() {
                 configuredInstance.getDescription()
             );
         }
+
+        @Override
+        public String toString() {
+            return getDescription();
+        }
     }
 
     private static class NoopImageNameSubstitutor extends ImageNameSubstitutor {

diff --git a/core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java b/core/src/test/java/org/testcontainers/utility/ImageNameSubstitutorTest.java
@@ -5,8 +5,10 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.Mockito;
+import org.testcontainers.containers.GenericContainer;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.eq;
 
 public class ImageNameSubstitutorTest {
@@ -64,4 +66,19 @@ public void testWorksWithoutConfiguredImplementation() {
             .as("the image has been substituted by default then configured implementations")
             .isEqualTo("substituted-image:latest");
     }
+
+    @Test
+    public void testImageNameSubstitutorToString() {
+        Mockito
+            .doReturn(FakeImageSubstitutor.class.getCanonicalName())
+            .when(TestcontainersConfiguration.getInstance())
+            .getImageSubstitutorClassName();
+
+        try (GenericContainer<?> container = new GenericContainer<>(DockerImageName.parse("original"))) {
+            assertThatThrownBy(container::start)
+                .hasMessageContaining(
+                    "imageNameSubstitutor=Chained substitutor of 'default implementation' and then 'test implementation'"
+                );
+        }
+    }
 }