Skip to content

Commit 110fa07

Browse files
ManolisPapdyusufugurozbek
authored andcommitted
Add MySQL test case and modify test constant names
1 parent 3e8f403 commit 110fa07

File tree

2 files changed

+21
-10
lines changed

2 files changed

+21
-10
lines changed
Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package com.github.yusufugurozbek.testcontainers.port.updater
22

3-
import com.github.yusufugurozbek.testcontainers.port.updater.TestConstants.DATASOURCE_URL_1
4-
import com.github.yusufugurozbek.testcontainers.port.updater.TestConstants.DATASOURCE_URL_2
53
import com.github.yusufugurozbek.testcontainers.port.updater.TestConstants.DATASOURCE_URL_MSSQL_SERVER
6-
import com.github.yusufugurozbek.testcontainers.port.updater.TestConstants.LOG_ENTRY_1
7-
import com.github.yusufugurozbek.testcontainers.port.updater.TestConstants.LOG_ENTRY_2
4+
import com.github.yusufugurozbek.testcontainers.port.updater.TestConstants.DATASOURCE_URL_MYSQL
5+
import com.github.yusufugurozbek.testcontainers.port.updater.TestConstants.DATASOURCE_URL_POSTGRESQL_1
6+
import com.github.yusufugurozbek.testcontainers.port.updater.TestConstants.DATASOURCE_URL_POSTGRESQL_2
87
import com.github.yusufugurozbek.testcontainers.port.updater.TestConstants.LOG_ENTRY_MSSQL_SERVER
8+
import com.github.yusufugurozbek.testcontainers.port.updater.TestConstants.LOG_ENTRY_MYSQL
9+
import com.github.yusufugurozbek.testcontainers.port.updater.TestConstants.LOG_ENTRY_POSTGRESQL_1
10+
import com.github.yusufugurozbek.testcontainers.port.updater.TestConstants.LOG_ENTRY_POSTGRESQL_2
911
import org.junit.jupiter.api.Assertions.assertEquals
1012
import org.junit.jupiter.api.Test
1113

@@ -15,12 +17,12 @@ internal class DatasourceUrlExtractorTest {
1517

1618
@Test
1719
fun `extractDataSourceUrl successfully extracts url if present with driver part`() {
18-
assertEquals(sut.extract(LOG_ENTRY_1), DATASOURCE_URL_1)
20+
assertEquals(sut.extract(LOG_ENTRY_POSTGRESQL_1), DATASOURCE_URL_POSTGRESQL_1)
1921
}
2022

2123
@Test
2224
fun `extractDataSourceUrl successfully extracts url if present without driver part`() {
23-
assertEquals(sut.extract(LOG_ENTRY_2), DATASOURCE_URL_2)
25+
assertEquals(sut.extract(LOG_ENTRY_POSTGRESQL_2), DATASOURCE_URL_POSTGRESQL_2)
2426
}
2527

2628
@Test
@@ -32,4 +34,9 @@ internal class DatasourceUrlExtractorTest {
3234
fun `extractDataSourceUrl successfully extracts mssql server url`() {
3335
assertEquals(sut.extract(LOG_ENTRY_MSSQL_SERVER), DATASOURCE_URL_MSSQL_SERVER)
3436
}
37+
38+
@Test
39+
fun `extractDataSourceUrl successfully extracts mysql url`() {
40+
assertEquals(sut.extract(LOG_ENTRY_MYSQL), DATASOURCE_URL_MYSQL)
41+
}
3542
}
Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package com.github.yusufugurozbek.testcontainers.port.updater
22

33
object TestConstants {
4-
const val DATASOURCE_URL_1 = "jdbc:postgresql://localhost:55001/test"
5-
const val DATASOURCE_URL_2 = "jdbc:postgresql://localhost:55001/test?loggerLevel=OFF"
4+
const val DATASOURCE_URL_POSTGRESQL_1 = "jdbc:postgresql://localhost:55001/test"
5+
const val DATASOURCE_URL_POSTGRESQL_2 = "jdbc:postgresql://localhost:55001/test?loggerLevel=OFF"
66
const val DATASOURCE_URL_MSSQL_SERVER = "jdbc:sqlserver://localhost:62510;connectRetryInterval=10;" +
77
"connectRetryCount=1;maxResultBuffer=-1;" +
88
"applicationName=Microsoft JDBC Driver for SQL Server;applicationIntent=readwrite;"
9-
const val LOG_ENTRY_1 = "2021-07-16 14:05:56.360 INFO [my-application,,] 33702 --- [" +
9+
const val DATASOURCE_URL_MYSQL = "jdbc:mysql://localhost:59426/test"
10+
const val LOG_ENTRY_POSTGRESQL_1 = "2021-07-16 14:05:56.360 INFO [my-application,,] 33702 --- [" +
1011
" main] o.f.c.i.database.base.DatabaseType : " +
1112
"Database: jdbc:postgresql://localhost:55001/test (PostgreSQL 10.17)"
12-
const val LOG_ENTRY_2 = "2021-07-16 14:05:56.360 INFO [my-application,,] 33702 --- [" +
13+
const val LOG_ENTRY_POSTGRESQL_2 = "2021-07-16 14:05:56.360 INFO [my-application,,] 33702 --- [" +
1314
" main] o.f.c.i.database.base.DatabaseType : " +
1415
"Database: jdbc:postgresql://localhost:55001/test?loggerLevel=OFF"
1516
const val LOG_ENTRY_MSSQL_SERVER = "2022-09-24 17:33:36.058 INFO 26088 --- [" +
@@ -18,4 +19,7 @@ object TestConstants {
1819
"connectRetryCount=1;maxResultBuffer=-1;" +
1920
"applicationName=Microsoft JDBC Driver for SQL Server;" +
2021
"applicationIntent=readwrite; (Microsoft SQL Server 14.0)"
22+
const val LOG_ENTRY_MYSQL = "2022-10-05 19:19:06.886 INFO 16604 --- [" +
23+
" main] o.f.c.i.database.base.BaseDatabaseType : " +
24+
"Database: jdbc:mysql://localhost:59426/test (MySQL 8.0)"
2125
}

0 commit comments

Comments
 (0)