Added additional url params in JdbcDatabaseContainer

See also testcontainers/testcontainers-java#1802

Author: mrotteveel

CHANGES.md

@@ -6,7 +6,8 @@ Version History
 
 - Update org.testcontainers:jdbc to 1.14.3
 - Move static config in modules to constructor (see also https://github.com/testcontainers/testcontainers-java/pull/2473)
-- Add ContainerState#getHost as a replacement for getContainerIpAddress (see also https://github.com/testcontainers/testcontainers-java/pull/2742) 
+- Add ContainerState#getHost as a replacement for getContainerIpAddress (see also https://github.com/testcontainers/testcontainers-java/pull/2742)
+- Added additional url params in JdbcDatabaseContainer (see also https://github.com/testcontainers/testcontainers-java/issues/1802) 
 
 1.0.3
 -----

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

@@ -72,7 +72,9 @@ public String getDriverClassName() {
 
     @Override
     public String getJdbcUrl() {
-        return "jdbc:firebirdsql://" + getHost() + ":" + getMappedPort(FIREBIRD_PORT) + "/" + getDatabaseName();
+        String additionalUrlParams = constructUrlParameters("?", "&");
+        return "jdbc:firebirdsql://" + getHost() + ":" + getMappedPort(FIREBIRD_PORT)
+                + "/" + getDatabaseName() + additionalUrlParams;
     }
 
     @Override

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

@@ -8,6 +8,9 @@
 
 import static org.firebirdsql.testcontainers.FirebirdContainer.FIREBIRD_PORT;
 import static org.firebirdsql.testcontainers.FirebirdContainer.IMAGE;
+import static org.hamcrest.CoreMatchers.allOf;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.rnorth.visibleassertions.VisibleAssertions.*;
@@ -98,4 +101,20 @@ public void test258_scImage() throws Exception {
             }
         }
     }
+
+    @Test
+    public void testWithAdditionalUrlParamInJdbcUrl() {
+        try (FirebirdContainer<?> firebird = new FirebirdContainer<>()
+                .withUrlParam("charSet", "utf-8")
+                .withUrlParam("blobBufferSize", "2048")) {
+
+            firebird.start();
+            String jdbcUrl = firebird.getJdbcUrl();
+            assertThat(jdbcUrl, allOf(
+                    containsString("?"),
+                    containsString("&"),
+                    containsString("blobBufferSize=2048"),
+                    containsString("charSet=utf-8")));
+        }
+    }
 }