Improve testability and add tests for DataSourceUrlExtrator

*

Author: jimonthebarn

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

@@ -5,17 +5,20 @@ import com.github.yusufugurozbek.testcontainers.port.updater.settings.MatchMode.
 import com.intellij.database.dataSource.LocalDataSource
 import com.intellij.database.util.common.isNotNullOrEmpty
 
-data class DataSourceUrl(val beforePort: String, val port: String, val afterPort: String?) {
+data class DataSourceUrl(val beforePort: String, val port: String, val afterPort: String?, val urlExtractor : DataSourceUrlExtractor = DataSourceUrlExtractor()) {
 
+    init {
+        extractor = urlExtractor
+    }
 
     companion object {
-        private var dataSourceUrlExtractor: DataSourceUrlExtractor = DataSourceUrlExtractor()
+        lateinit var extractor: DataSourceUrlExtractor
 
         fun from(dataSource: LocalDataSource): DataSourceUrl? = from(dataSource.url)
 
         fun from(url: String?): DataSourceUrl? {
             return url?.takeIf { it.isNotNullOrEmpty }
-                ?.let { dataSourceUrlExtractor.extract(it)?.let(::toDataSourceUrl) }
+                ?.let { extractor.extract(it)?.let(::toDataSourceUrl) }
         }
 
         private fun toDataSourceUrl(matchResult: MatchResult?): DataSourceUrl? {

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

@@ -0,0 +1,29 @@
+package com.github.yusufugurozbek.testcontainers.port.updater
+
+import com.github.yusufugurozbek.testcontainers.port.updater.settings.MatchMode
+import com.intellij.testFramework.UsefulTestCase
+import junit.framework.TestCase
+import junit.framework.TestCase.*
+
+internal class DataSourceUrlExtractorTest : UsefulTestCase() {
+
+    private val sut = DataSourceUrlExtractor()
+
+    fun `test parts can be successfully extracted from well formed input`() {
+        val result = sut.extract("jdbc:postgresql://localhost:11111/test")
+
+        assertEquals("jdbc:postgresql://localhost:11111/test", result?.groups?.get(0)?.value)
+        assertEquals("jdbc:postgresql://localhost", result?.groups?.get(1)?.value)
+        assertEquals("11111", result?.groups?.get(2)?.value)
+        assertEquals("/test", result?.groups?.get(3)?.value)
+    }
+
+    fun `test extraction of null value returns null`() {
+        assertNull(sut.extract(null))
+    }
+
+    fun `test extraction of empty value returns null`() {
+        assertNull(sut.extract(""))
+    }
+
+}