fix tests by (1) not calling exists as a function and (2) ignoring all sqlite logging output during tests (which appeared to cause overflows in the binary test results)

hbmartin · hbmartin · commit d43fd29fc562 · 2023-11-03T13:52:48.000-07:00
diff --git a/sqliter-driver/src/nativeCommonMain/kotlin/co/touchlab/sqliter/DatabaseConfiguration.kt b/sqliter-driver/src/nativeCommonMain/kotlin/co/touchlab/sqliter/DatabaseConfiguration.kt
@@ -69,6 +69,18 @@ data class DatabaseConfiguration(
     }
 }
 
+internal object NoneLogger : Logger {
+    override fun trace(message: String) = Unit
+
+    override val vActive: Boolean = false
+
+    override fun vWrite(message: String) = Unit
+
+    override val eActive: Boolean = false
+
+    override fun eWrite(message: String, exception: Throwable?) = Unit
+}
+
 internal object WarningLogger : Logger {
     override fun trace(message: String) {
         println(message)
diff --git a/sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/CursorTest.kt b/sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/CursorTest.kt
@@ -22,8 +22,11 @@ import kotlin.test.assertEquals
 class CursorTest:BaseDatabaseTest(){
     @Test
     fun iterator(){
-        val manager = createDatabaseManager(DatabaseConfiguration(name = TEST_DB_NAME, version = 1,
+        val manager = createDatabaseManager(DatabaseConfiguration(
+            name = TEST_DB_NAME,
+            version = 1,
             journalMode = JournalMode.WAL,
+            loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
             create = { db ->
                 db.withStatement(TWO_COL) {
                     execute()
@@ -79,8 +82,11 @@ class CursorTest:BaseDatabaseTest(){
             }
         }
 
-        val manager = createDatabaseManager(DatabaseConfiguration(name = TEST_DB_NAME, version = 1,
+        val manager = createDatabaseManager(DatabaseConfiguration(
+            name = TEST_DB_NAME,
+            version = 1,
             journalMode = JournalMode.WAL,
+            loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
             create = { db ->
                 db.withStatement(TWO_COL) {
                     execute()
diff --git a/sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/DatabaseConfigurationTest.kt b/sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/DatabaseConfigurationTest.kt
@@ -49,7 +49,9 @@ class DatabaseConfigurationTest : BaseDatabaseTest(){
         val conf = DatabaseConfiguration(
             name = null,
             inMemory = true,
-            version = 1, create = { db ->
+            version = 1,
+            loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
+            create = { db ->
             db.withStatement(TWO_COL) {
                 execute()
             }
@@ -63,7 +65,9 @@ class DatabaseConfigurationTest : BaseDatabaseTest(){
         val conf = DatabaseConfiguration(
             name = TEST_DB_NAME,
             inMemory = true,
-            version = 1, create = { db ->
+            version = 1,
+            loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
+            create = { db ->
             db.withStatement(TWO_COL) {
                 execute()
             }
@@ -77,7 +81,9 @@ class DatabaseConfigurationTest : BaseDatabaseTest(){
         val config = DatabaseConfiguration(
             name = name,
             extendedConfig = DatabaseConfiguration.Extended(basePath = path),
-            version = 1, create = { db ->
+            version = 1,
+            loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
+            create = { db ->
             db.withStatement(TWO_COL) {
                 execute()
             }
@@ -89,7 +95,7 @@ class DatabaseConfigurationTest : BaseDatabaseTest(){
 
             conn = manager.createMultiThreadedConnection()
 
-            assertTrue(expectedPath.exists())
+            assertTrue(expectedPath.exists)
         } finally {
             conn?.close()
             DatabaseFileContext.deleteDatabase(config)
@@ -116,7 +122,8 @@ class DatabaseConfigurationTest : BaseDatabaseTest(){
     /*@Test
     fun configConnection(){
         var called = false
-        val config = DatabaseConfiguration(name = "configConnection", version = 1, create = { _ -> },
+        val config = DatabaseConfiguration(
+    loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),name = "configConnection", version = 1, create = { _ -> },
             lifecycleConfig = DatabaseConfiguration.Lifecycle(
                 onCreateConnection = {conn ->
                     assertNotNull(conn)
@@ -140,8 +147,11 @@ class DatabaseConfigurationTest : BaseDatabaseTest(){
     @Test
     fun journalModeSetting()
     {
-        val manager = createDatabaseManager(DatabaseConfiguration(name = TEST_DB_NAME, version = 1,
+        val manager = createDatabaseManager(DatabaseConfiguration(
+            name = TEST_DB_NAME,
+            version = 1,
             journalMode = JournalMode.WAL,
+            loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
             create = { db ->
                 db.withStatement(TWO_COL) {
                     execute()
@@ -167,7 +177,10 @@ class DatabaseConfigurationTest : BaseDatabaseTest(){
 
         conn.close()
 
-        val manager2 = createDatabaseManager(DatabaseConfiguration(name = TEST_DB_NAME, version = 1,
+        val manager2 = createDatabaseManager(DatabaseConfiguration(
+            name = TEST_DB_NAME,
+            version = 1,
+            loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
             journalMode = JournalMode.WAL, create = {
                 fail("Same version shouldn't run")
             }))
@@ -189,6 +202,7 @@ class DatabaseConfigurationTest : BaseDatabaseTest(){
             name = TEST_DB_NAME,
             inMemory = true,
             version = NO_VERSION_CHECK,
+            loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
             create = { throw IllegalStateException("Shouldn't be here") })
         val manager = createDatabaseManager(conf)
         val conn = manager.createMultiThreadedConnection()
@@ -218,6 +232,7 @@ class DatabaseConfigurationTest : BaseDatabaseTest(){
             version = 1,
             journalMode = JournalMode.WAL,
             extendedConfig = DatabaseConfiguration.Extended(foreignKeyConstraints = enableFK),
+            loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
             create = { db ->
                 db.withStatement(AUTHOR) {
                     execute()
diff --git a/sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/DatabaseConnectionTest.kt b/sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/DatabaseConnectionTest.kt
@@ -209,7 +209,8 @@ class DatabaseConnectionTest {
                 name = secondDbName,
                 version = 1,
                 create = {},
-                journalMode = JournalMode.DELETE
+                journalMode = JournalMode.DELETE,
+                loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
             )
         )
 
@@ -237,7 +238,8 @@ class DatabaseConnectionTest {
                     execute()
                 }
             },
-            inMemory = true
+            inMemory = true,
+            loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
         )
         val man = createDatabaseManager(
             conf
@@ -305,7 +307,8 @@ class DatabaseConnectionTest {
                         execute()
                     }
                 },
-                inMemory = true
+                inMemory = true,
+                loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
             )
         )
 
@@ -388,7 +391,8 @@ class DatabaseConnectionTest {
                             execute()
                         }
                     },
-                    inMemory = mem
+                    inMemory = mem,
+                    loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
                 )
             )
 
@@ -401,7 +405,7 @@ class DatabaseConnectionTest {
                     }
                 }
 
-                dbFileExists = DatabaseFileContext.databaseFile(checkName, null).exists()
+                dbFileExists = DatabaseFileContext.databaseFile(checkName, null).exists
             }
         } finally {
             if (!mem) {
diff --git a/sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/DatabaseManagerTest.kt b/sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/DatabaseManagerTest.kt
@@ -59,7 +59,8 @@ class DatabaseManagerTest : BaseDatabaseTest(){
             upgrade = { _, _, _ ->
                 updateCalled.increment()
                 println("updateCalled $updateCalled")
-            }
+            },
+            loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
         )
 
         val config2 = config1.copy(version = 2)
@@ -100,7 +101,8 @@ class DatabaseManagerTest : BaseDatabaseTest(){
             },
             upgrade = { _, _, _ ->
                 upgradeCalled.increment()
-            }
+            },
+            loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
         )
 
         createDatabaseManager(config1).withConnection {  }
@@ -126,7 +128,8 @@ class DatabaseManagerTest : BaseDatabaseTest(){
                     execute()
                     throw Exception("rollback")
                 }
-            }
+            },
+            loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
         )
 
         var createCalled = false
@@ -138,7 +141,8 @@ class DatabaseManagerTest : BaseDatabaseTest(){
                     execute()
                     createCalled = true
                 }
-            }
+            },
+            loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
         )
 
         var conn: DatabaseConnection? = null
@@ -170,7 +174,8 @@ class DatabaseManagerTest : BaseDatabaseTest(){
                     executeInsert()
                 }
                 throw Exception("nah")
-            }
+            },
+            loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
         )
 
         //Create db
diff --git a/sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/Helper.kt b/sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/Helper.kt
@@ -40,10 +40,11 @@ fun createTestDb(
         extended = extended.copy(busyTimeout = timeout)
 
     return createDatabaseManager(DatabaseConfiguration(
-        name,
-        version,
-        create,
-        update,
+        name = name,
+        version = version,
+        create = create,
+        upgrade = update,
+        loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
         lifecycleConfig = DatabaseConfiguration.Lifecycle(
             onCreateConnection = onCreateConnection,
             onCloseConnection = onCloseConnection
diff --git a/sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/NativeCursorTest.kt b/sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/NativeCursorTest.kt
@@ -51,15 +51,16 @@ class NativeCursorTest : BaseDatabaseTest(){
     private fun createDb() =
         createDatabaseManager(
             DatabaseConfiguration(
-                name = TEST_DB_NAME, version = 1,
+                name = TEST_DB_NAME,
+                version = 1,
                 create = { db ->
                     db.withStatement(TWO_COL) {
                         execute()
                     }
-
                 },
                 journalMode = JournalMode.WAL,
-                extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 30000)
+                extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 30000),
+                loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
             )
         )
 
diff --git a/sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/NativeDatabaseConnectionTest.kt b/sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/NativeDatabaseConnectionTest.kt
@@ -49,7 +49,8 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){
                         execute()
                     }
                 },
-                extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 30000)
+                extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 30000),
+                loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
             )
         )
 
@@ -139,7 +140,8 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){
 
                     }
                 },
-                extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 3000)
+                extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 3000),
+                loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
             )
         )
 
@@ -196,11 +198,11 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){
                         bindLong(1, 545)
                         bindString(2, "qasdfwerqwer")
                         executeInsert()
-
                     }
                 },
                 journalMode = JournalMode.DELETE,
-                extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 1500)
+                extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 1500),
+                loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
             )
         )
 
@@ -245,11 +247,11 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){
     fun testReadWhileWriting() {
         val manager = createDatabaseManager(
             DatabaseConfiguration(
-                name = TEST_DB_NAME, version = 1,
+                name = TEST_DB_NAME,
+                version = 1,
                 create = { db ->
                     db.withStatement(TWO_COL) {
                         execute()
-
                     }
                     db.withStatement("insert into test(num, str)values(?,?)") {
                         bindLong(1, 555)
@@ -259,11 +261,11 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){
                         bindLong(1, 545)
                         bindString(2, "qasdfwerqwer")
                         executeInsert()
-
                     }
                 },
                 journalMode = JournalMode.DELETE,
-                extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 3000)
+                extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 3000),
+                loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
             )
         )
 
@@ -297,11 +299,16 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){
 
 //    @Test
     fun testTimeout() {
-        val manager = createDatabaseManager(DatabaseConfiguration(name = TEST_DB_NAME, version = 1, create = { db ->
-            db.withStatement(TWO_COL) {
-                execute()
-            }
-        }, extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 4000)))
+        val manager = createDatabaseManager(DatabaseConfiguration(
+            name = TEST_DB_NAME,
+            version = 1,
+            create = { db ->
+                db.withStatement(TWO_COL) {
+                    execute()
+                }
+            },
+            extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 4000),
+            loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger)))
 
         val block: (DatabaseConnection) -> Unit = {
             it.withTransaction {
@@ -368,7 +375,8 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){
                     execute()
                 }
             },
-            extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 15000)
+            extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 15000),
+            loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
         )
     )
 
@@ -388,7 +396,8 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){
             upgrade = {_,_,_ ->
                 throw IllegalStateException("This shouldn't happen")
             },
-            extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 3000)
+            extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 3000),
+            loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
         )
 
         val manager = createDatabaseManager(config1)
@@ -460,16 +469,16 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){
     private fun createDb() =
         createDatabaseManager(
             DatabaseConfiguration(
-                name = TEST_DB_NAME, version = 1,
+                name = TEST_DB_NAME,
+                version = 1,
                 create = { db ->
                     db.withStatement(TWO_COL) {
                         execute()
-
                     }
-
                 },
                 journalMode = JournalMode.WAL,
-                extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 30000)
+                extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 30000),
+                loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),
             )
         )
 }
diff --git a/sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/cts/DatabaseStatementTest.kt b/sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/cts/DatabaseStatementTest.kt
diff --git a/sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/performance/DbPerformanceTest.kt b/sqliter-driver/src/nativeCommonTest/kotlin/co/touchlab/sqliter/performance/DbPerformanceTest.kt

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,8 @@ class DatabaseConnectionTest {`
`209`	`209`	`name = secondDbName,`
`210`	`210`	`version = 1,`
`211`	`211`	`create = {},`
`212`		`- journalMode = JournalMode.DELETE`
	`212`	`+ journalMode = JournalMode.DELETE,`
	`213`	`+ loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),`
`213`	`214`	`)`
`214`	`215`	`)`
`215`	`216`
`@@ -237,7 +238,8 @@ class DatabaseConnectionTest {`
`237`	`238`	`execute()`
`238`	`239`	`}`
`239`	`240`	`},`
`240`		`- inMemory = true`
	`241`	`+ inMemory = true,`
	`242`	`+ loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),`
`241`	`243`	`)`
`242`	`244`	`val man = createDatabaseManager(`
`243`	`245`	`conf`
`@@ -305,7 +307,8 @@ class DatabaseConnectionTest {`
`305`	`307`	`execute()`
`306`	`308`	`}`
`307`	`309`	`},`
`308`		`- inMemory = true`
	`310`	`+ inMemory = true,`
	`311`	`+ loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),`
`309`	`312`	`)`
`310`	`313`	`)`
`311`	`314`
`@@ -388,7 +391,8 @@ class DatabaseConnectionTest {`
`388`	`391`	`execute()`
`389`	`392`	`}`
`390`	`393`	`},`
`391`		`- inMemory = mem`
	`394`	`+ inMemory = mem,`
	`395`	`+ loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),`
`392`	`396`	`)`
`393`	`397`	`)`
`394`	`398`
`@@ -401,7 +405,7 @@ class DatabaseConnectionTest {`
`401`	`405`	`}`
`402`	`406`	`}`
`403`	`407`
`404`		`- dbFileExists = DatabaseFileContext.databaseFile(checkName, null).exists()`
	`408`	`+ dbFileExists = DatabaseFileContext.databaseFile(checkName, null).exists`
`405`	`409`	`}`
`406`	`410`	`} finally {`
`407`	`411`	`if (!mem) {`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,8 @@ class DatabaseManagerTest : BaseDatabaseTest(){`
`59`	`59`	`upgrade = { _, _, _ ->`
`60`	`60`	`updateCalled.increment()`
`61`	`61`	`println("updateCalled $updateCalled")`
`62`		`- }`
	`62`	`+ },`
	`63`	`+ loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),`
`63`	`64`	`)`
`64`	`65`
`65`	`66`	`val config2 = config1.copy(version = 2)`
`@@ -100,7 +101,8 @@ class DatabaseManagerTest : BaseDatabaseTest(){`
`100`	`101`	`},`
`101`	`102`	`upgrade = { _, _, _ ->`
`102`	`103`	`upgradeCalled.increment()`
`103`		`- }`
	`104`	`+ },`
	`105`	`+ loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),`
`104`	`106`	`)`
`105`	`107`
`106`	`108`	`createDatabaseManager(config1).withConnection { }`
`@@ -126,7 +128,8 @@ class DatabaseManagerTest : BaseDatabaseTest(){`
`126`	`128`	`execute()`
`127`	`129`	`throw Exception("rollback")`
`128`	`130`	`}`
`129`		`- }`
	`131`	`+ },`
	`132`	`+ loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),`
`130`	`133`	`)`
`131`	`134`
`132`	`135`	`var createCalled = false`
`@@ -138,7 +141,8 @@ class DatabaseManagerTest : BaseDatabaseTest(){`
`138`	`141`	`execute()`
`139`	`142`	`createCalled = true`
`140`	`143`	`}`
`141`		`- }`
	`144`	`+ },`
	`145`	`+ loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),`
`142`	`146`	`)`
`143`	`147`
`144`	`148`	`var conn: DatabaseConnection? = null`
`@@ -170,7 +174,8 @@ class DatabaseManagerTest : BaseDatabaseTest(){`
`170`	`174`	`executeInsert()`
`171`	`175`	`}`
`172`	`176`	`throw Exception("nah")`
`173`		`- }`
	`177`	`+ },`
	`178`	`+ loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),`
`174`	`179`	`)`
`175`	`180`
`176`	`181`	`//Create db`
Original file line number	Diff line number	Diff line change
`@@ -51,15 +51,16 @@ class NativeCursorTest : BaseDatabaseTest(){`
`51`	`51`	`private fun createDb() =`
`52`	`52`	`createDatabaseManager(`
`53`	`53`	`DatabaseConfiguration(`
`54`		`- name = TEST_DB_NAME, version = 1,`
	`54`	`+ name = TEST_DB_NAME,`
	`55`	`+ version = 1,`
`55`	`56`	`create = { db ->`
`56`	`57`	`db.withStatement(TWO_COL) {`
`57`	`58`	`execute()`
`58`	`59`	`}`
`59`		`-`
`60`	`60`	`},`
`61`	`61`	`journalMode = JournalMode.WAL,`
`62`		`- extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 30000)`
	`62`	`+ extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 30000),`
	`63`	`+ loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),`
`63`	`64`	`)`
`64`	`65`	`)`
`65`	`66`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,8 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){`
`49`	`49`	`execute()`
`50`	`50`	`}`
`51`	`51`	`},`
`52`		`- extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 30000)`
	`52`	`+ extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 30000),`
	`53`	`+ loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),`
`53`	`54`	`)`
`54`	`55`	`)`
`55`	`56`
`@@ -139,7 +140,8 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){`
`139`	`140`
`140`	`141`	`}`
`141`	`142`	`},`
`142`		`- extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 3000)`
	`143`	`+ extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 3000),`
	`144`	`+ loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),`
`143`	`145`	`)`
`144`	`146`	`)`
`145`	`147`
`@@ -196,11 +198,11 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){`
`196`	`198`	`bindLong(1, 545)`
`197`	`199`	`bindString(2, "qasdfwerqwer")`
`198`	`200`	`executeInsert()`
`199`		`-`
`200`	`201`	`}`
`201`	`202`	`},`
`202`	`203`	`journalMode = JournalMode.DELETE,`
`203`		`- extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 1500)`
	`204`	`+ extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 1500),`
	`205`	`+ loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),`
`204`	`206`	`)`
`205`	`207`	`)`
`206`	`208`
`@@ -245,11 +247,11 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){`
`245`	`247`	`fun testReadWhileWriting() {`
`246`	`248`	`val manager = createDatabaseManager(`
`247`	`249`	`DatabaseConfiguration(`
`248`		`- name = TEST_DB_NAME, version = 1,`
	`250`	`+ name = TEST_DB_NAME,`
	`251`	`+ version = 1,`
`249`	`252`	`create = { db ->`
`250`	`253`	`db.withStatement(TWO_COL) {`
`251`	`254`	`execute()`
`252`		`-`
`253`	`255`	`}`
`254`	`256`	`db.withStatement("insert into test(num, str)values(?,?)") {`
`255`	`257`	`bindLong(1, 555)`
`@@ -259,11 +261,11 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){`
`259`	`261`	`bindLong(1, 545)`
`260`	`262`	`bindString(2, "qasdfwerqwer")`
`261`	`263`	`executeInsert()`
`262`		`-`
`263`	`264`	`}`
`264`	`265`	`},`
`265`	`266`	`journalMode = JournalMode.DELETE,`
`266`		`- extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 3000)`
	`267`	`+ extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 3000),`
	`268`	`+ loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),`
`267`	`269`	`)`
`268`	`270`	`)`
`269`	`271`
`@@ -297,11 +299,16 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){`
`297`	`299`
`298`	`300`	`// @Test`
`299`	`301`	`fun testTimeout() {`
`300`		`- val manager = createDatabaseManager(DatabaseConfiguration(name = TEST_DB_NAME, version = 1, create = { db ->`
`301`		`- db.withStatement(TWO_COL) {`
`302`		`- execute()`
`303`		`- }`
`304`		`- }, extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 4000)))`
	`302`	`+ val manager = createDatabaseManager(DatabaseConfiguration(`
	`303`	`+ name = TEST_DB_NAME,`
	`304`	`+ version = 1,`
	`305`	`+ create = { db ->`
	`306`	`+ db.withStatement(TWO_COL) {`
	`307`	`+ execute()`
	`308`	`+ }`
	`309`	`+ },`
	`310`	`+ extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 4000),`
	`311`	`+ loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger)))`
`305`	`312`
`306`	`313`	`val block: (DatabaseConnection) -> Unit = {`
`307`	`314`	`it.withTransaction {`
`@@ -368,7 +375,8 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){`
`368`	`375`	`execute()`
`369`	`376`	`}`
`370`	`377`	`},`
`371`		`- extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 15000)`
	`378`	`+ extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 15000),`
	`379`	`+ loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),`
`372`	`380`	`)`
`373`	`381`	`)`
`374`	`382`
`@@ -388,7 +396,8 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){`
`388`	`396`	`upgrade = {_,_,_ ->`
`389`	`397`	`throw IllegalStateException("This shouldn't happen")`
`390`	`398`	`},`
`391`		`- extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 3000)`
	`399`	`+ extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 3000),`
	`400`	`+ loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),`
`392`	`401`	`)`
`393`	`402`
`394`	`403`	`val manager = createDatabaseManager(config1)`
`@@ -460,16 +469,16 @@ class NativeDatabaseConnectionTest : BaseDatabaseTest(){`
`460`	`469`	`private fun createDb() =`
`461`	`470`	`createDatabaseManager(`
`462`	`471`	`DatabaseConfiguration(`
`463`		`- name = TEST_DB_NAME, version = 1,`
	`472`	`+ name = TEST_DB_NAME,`
	`473`	`+ version = 1,`
`464`	`474`	`create = { db ->`
`465`	`475`	`db.withStatement(TWO_COL) {`
`466`	`476`	`execute()`
`467`		`-`
`468`	`477`	`}`
`469`		`-`
`470`	`478`	`},`
`471`	`479`	`journalMode = JournalMode.WAL,`
`472`		`- extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 30000)`
	`480`	`+ extendedConfig = DatabaseConfiguration.Extended(busyTimeout = 30000),`
	`481`	`+ loggingConfig = DatabaseConfiguration.Logging(logger = NoneLogger),`
`473`	`482`	`)`
`474`	`483`	`)`
`475`	`484`	`}`