Provide compatibility with 2.5 images

Address problem with 2.5-ss/2.5.x-ss images in README

Author: mrotteveel

README.md

@@ -8,6 +8,9 @@ to provide lightweight, throwaway instances of Firebird for JUnit tests.
 
 The docker image used is [jacobalberty/firebird](https://hub.docker.com/r/jacobalberty/firebird/).
 
+If you want to use 2.5, use the 2.5.x-sc (SuperClassic) variant of the image, as 
+the 2.5.x-ss (SuperServer) variant seems to be broken.
+
 Prerequisites
 -------------
 

src/main/java/org/firebirdsql/testcontainers/FirebirdContainer.java

@@ -2,6 +2,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.utility.DockerImageName;
 
 import javax.crypto.Cipher;
 import java.security.NoSuchAlgorithmException;
@@ -71,14 +72,27 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return "jdbc:firebirdsql://" + getContainerIpAddress() + ":" + getMappedPort(FIREBIRD_PORT) + "/" + databaseName;
+        return "jdbc:firebirdsql://" + getContainerIpAddress() + ":" + getMappedPort(FIREBIRD_PORT) + "/" + getDatabaseName();
     }
 
     @Override
     public String getDatabaseName() {
+        if (isRunning()) {
+            if (isFirebird25Image()) {
+                // The 2.5 images of jacobalberty/firebird require an absolute path to access the database
+                // Provide this value only when the container is running
+                String databasePath = getEnvMap().getOrDefault("DBPATH", "/firebird/data");
+                return databasePath + "/" + databaseName;
+            }
+        }
         return databaseName;
     }
 
+    private boolean isFirebird25Image() {
+        DockerImageName imageName = new DockerImageName(getDockerImageName());
+        return imageName.getUnversionedPart().equals(IMAGE) && imageName.getVersionPart().startsWith("2.5");
+    }
+
     @Override
     public String getUsername() {
         return username;
@@ -160,6 +174,7 @@ public SELF withSysdbaPassword(final String sysdbaPassword) {
     @Override
     protected void waitUntilContainerStarted() {
         getWaitStrategy().waitUntilReady(this);
+        super.waitUntilContainerStarted();
     }
 
     /**

src/test/java/org/firebirdsql/testcontainers/FirebirdContainerTest.java

@@ -6,6 +6,10 @@
 
 import java.sql.*;
 
+import static org.firebirdsql.testcontainers.FirebirdContainer.FIREBIRD_PORT;
+import static org.firebirdsql.testcontainers.FirebirdContainer.IMAGE;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.rnorth.visibleassertions.VisibleAssertions.*;
 
 public class FirebirdContainerTest {
@@ -71,4 +75,27 @@ public void testWithEnableWireCrypt() throws SQLException {
             }
         }
     }
+
+    /**
+     * The 2.5 images of jacobalberty/firebird handle FIREBIRD_DATABASE and need an absolute path to access the database
+     */
+    @Test
+    public void test258_scImage() throws Exception {
+        try (FirebirdContainer container = new FirebirdContainer(IMAGE + ":2.5.8-sc").withDatabaseName("test")) {
+            assertEquals("Expect original database name before start",
+                    "test", container.getDatabaseName());
+
+            container.start();
+
+            assertEquals("Expect modified database name after start",
+                    "/firebird/data/test", container.getDatabaseName());
+
+            try (Connection connection = DriverManager
+                    .getConnection("jdbc:firebirdsql://" + container.getContainerIpAddress() + ":" + container.getMappedPort(FIREBIRD_PORT) + "/" + container.getDatabaseName(),
+                            container.getUsername(), container.getPassword())
+            ) {
+                assertTrue(connection.isValid(1000));
+            }
+        }
+    }
 }

src/test/java/org/firebirdsql/testcontainers/JDBCDriverTest.java

@@ -25,7 +25,6 @@ public class JDBCDriverTest {
     private enum Options {
         ScriptedSchema,
         JDBCParams,
-        RequiresTable,
     }
 
     @Parameter
@@ -37,9 +36,12 @@ private enum Options {
     public static Iterable<Object[]> data() {
         return asList(
             new Object[][]{
-                {"jdbc:tc:firebird://hostname/databasename?user=someuser&password=somepwd&charSet=utf-8&TC_INITFUNCTION=org.firebirdsql.testcontainers.JDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams, Options.RequiresTable)},
-                {"jdbc:tc:firebird:3.0.4://hostname/databasename?user=someuser&password=somepwd&charSet=utf-8&TC_INITFUNCTION=org.firebirdsql.testcontainers.JDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams, Options.RequiresTable)},
-                {"jdbc:tc:firebirdsql:3.0.4://hostname/databasename?user=someuser&password=somepwd&charSet=utf-8&TC_INITFUNCTION=org.firebirdsql.testcontainers.JDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams, Options.RequiresTable)},
+                {"jdbc:tc:firebird://hostname/databasename?user=someuser&password=somepwd&charSet=utf-8&TC_INITFUNCTION=org.firebirdsql.testcontainers.JDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
+                {"jdbc:tc:firebird:3.0.4://hostname/databasename?user=someuser&password=somepwd&charSet=utf-8&TC_INITFUNCTION=org.firebirdsql.testcontainers.JDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
+                {"jdbc:tc:firebirdsql:3.0.4://hostname/databasename?user=someuser&password=somepwd&charSet=utf-8&TC_INITFUNCTION=org.firebirdsql.testcontainers.JDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
+                {"jdbc:tc:firebirdsql:2.5.8-sc://hostname/databasename?user=someuser&password=somepwd&charSet=utf-8&TC_INITFUNCTION=org.firebirdsql.testcontainers.JDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
+                // 2.5.x-ss seems to be broken, see https://github.com/jacobalberty/firebird-docker/issues/33
+                // {"jdbc:tc:firebirdsql:2.5.8-ss://hostname/databasename?user=someuser&password=somepwd&charSet=utf-8&TC_INITFUNCTION=org.firebirdsql.testcontainers.JDBCDriverTest::sampleInitFunction", EnumSet.of(Options.ScriptedSchema, Options.JDBCParams)},
             });
     }