Improve regex pattern and add related tests

Author: yusufugurozbek

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Testcontainers Port Updater Changelog
 
 ## [Unreleased]
+- Improve regex pattern
 
 ## [0.1.1]
 - Support latest IntelliJ 2022.1

src/main/kotlin/com/github/yusufugurozbek/testcontainers/port/updater/DatasourceUrlExtractor.kt

@@ -2,7 +2,7 @@ package com.github.yusufugurozbek.testcontainers.port.updater
 
 class DatasourceUrlExtractor {
 
-    private val regex: Regex = "Database: (.*?) \\((.*?)\\)".toRegex()
+    private val regex: Regex = "Database: (.*?)(?!\\S)".toRegex()
 
     internal fun extract(from: String): String? {
         val find = regex.find(from)

src/test/kotlin/com/github/yusufugurozbek/testcontainers/port/updater/DatasourceUrlExtractorTest.kt

@@ -1,7 +1,9 @@
 package com.github.yusufugurozbek.testcontainers.port.updater
 
-import com.github.yusufugurozbek.testcontainers.port.updater.TestConstants.DATASOURCE_URL
-import com.github.yusufugurozbek.testcontainers.port.updater.TestConstants.LOG_ENTRY
+import com.github.yusufugurozbek.testcontainers.port.updater.TestConstants.DATASOURCE_URL_1
+import com.github.yusufugurozbek.testcontainers.port.updater.TestConstants.DATASOURCE_URL_2
+import com.github.yusufugurozbek.testcontainers.port.updater.TestConstants.LOG_ENTRY_1
+import com.github.yusufugurozbek.testcontainers.port.updater.TestConstants.LOG_ENTRY_2
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
@@ -10,8 +12,13 @@ internal class DatasourceUrlExtractorTest {
     private val sut = DatasourceUrlExtractor()
 
     @Test
-    fun `extractDataSourceUrl successfully extracts url if present`() {
-        assertEquals(sut.extract(LOG_ENTRY), DATASOURCE_URL)
+    fun `extractDataSourceUrl successfully extracts url if present with driver part`() {
+        assertEquals(sut.extract(LOG_ENTRY_1), DATASOURCE_URL_1)
+    }
+
+    @Test
+    fun `extractDataSourceUrl successfully extracts url if present without driver part`() {
+        assertEquals(sut.extract(LOG_ENTRY_2), DATASOURCE_URL_2)
     }
 
     @Test

src/test/kotlin/com/github/yusufugurozbek/testcontainers/port/updater/TestConstants.kt

@@ -1,9 +1,12 @@
 package com.github.yusufugurozbek.testcontainers.port.updater
 
 object TestConstants {
-    const val DATASOURCE_URL = "jdbc:postgresql://localhost:55001/test"
-    const val LOG_ENTRY =
-        "2021-07-16 14:05:56.360  INFO [my-application,,] 33702 --- [" +
+    const val DATASOURCE_URL_1 = "jdbc:postgresql://localhost:55001/test"
+    const val DATASOURCE_URL_2 = "jdbc:postgresql://localhost:55001/test?loggerLevel=OFF"
+    const val LOG_ENTRY_1 = "2021-07-16 14:05:56.360  INFO [my-application,,] 33702 --- [" +
             "           main] o.f.c.i.database.base.DatabaseType       : " +
             "Database: jdbc:postgresql://localhost:55001/test (PostgreSQL 10.17)"
+    const val LOG_ENTRY_2 = "2021-07-16 14:05:56.360  INFO [my-application,,] 33702 --- [" +
+            "           main] o.f.c.i.database.base.DatabaseType       : " +
+            "Database: jdbc:postgresql://localhost:55001/test?loggerLevel=OFF"
 }