Fix the unit tests of sqllin-dsl

Author: qiaoyuang

sqllin-dsl/src/androidInstrumentedTest/kotlin/com/ctrip/sqllin/dsl/AndroidTest.kt

@@ -75,7 +75,7 @@ class AndroidTest {
     fun testPrimitiveTypeForKSP() = commonTest.testPrimitiveTypeForKSP()
 
     @Test
-    fun testNullInsertAndSelect() = commonTest.testNullInsertAndSelect()
+    fun testNullValue() = commonTest.testNullValue()
 
     @Before
     fun setUp() {

sqllin-dsl/src/commonTest/kotlin/com/ctrip/sqllin/dsl/CommonBasicTest.kt

@@ -369,43 +369,43 @@ class CommonBasicTest(private val path: DatabasePath) {
         assertEquals(outerJoinStatementWithOn?.getResults()?.size, books.size)
     }
 
-    fun testConcurrency() = runBlocking(Dispatchers.Default) {
-        val book1 = Book(name = "The Da Vinci Code", author = "Dan Brown", pages = 454, price = 16.96)
-        val book2 = Book(name = "The Lost Symbol", author = "Dan Brown", pages = 510, price = 19.95)
-        val database = Database(getDefaultDBConfig(), true)
-        launch {
-            var statement: SelectStatement<Book>? = null
-            database suspendedScope {
-                statement = BookTable { table ->
-                    table INSERT listOf(book1, book2)
-                    table SELECT X
-                }
-            }
-
+    fun testConcurrency() = Database(getDefaultDBConfig(), true).databaseAutoClose { database ->
+        runBlocking(Dispatchers.Default) {
+            val book1 = Book(name = "The Da Vinci Code", author = "Dan Brown", pages = 454, price = 16.96)
+            val book2 = Book(name = "The Lost Symbol", author = "Dan Brown", pages = 510, price = 19.95)
             launch {
-                val book1NewPrice = 18.96
-                val book2NewPrice = 21.95
-                val newBook1 = Book(name = "The Da Vinci Code", author = "Dan Brown", pages = 454, price = book1NewPrice)
-                val newBook2 = Book(name = "The Lost Symbol", author = "Dan Brown", pages = 510, price = book2NewPrice)
-                var newResult: SelectStatement<Book>? = null
+                var statement: SelectStatement<Book>? = null
                 database suspendedScope {
-                    newResult = transaction {
-                        BookTable { table ->
-                            table UPDATE SET { price = book1NewPrice } WHERE (name EQ book1.name AND (price EQ book1.price))
-                            table UPDATE SET { price = book2NewPrice } WHERE (name EQ book2.name AND (price EQ book2.price))
-                            table SELECT X
+                    statement = BookTable { table ->
+                        table INSERT listOf(book1, book2)
+                        table SELECT X
+                    }
+                }
+
+                launch {
+                    val book1NewPrice = 18.96
+                    val book2NewPrice = 21.95
+                    val newBook1 = Book(name = "The Da Vinci Code", author = "Dan Brown", pages = 454, price = book1NewPrice)
+                    val newBook2 = Book(name = "The Lost Symbol", author = "Dan Brown", pages = 510, price = book2NewPrice)
+                    var newResult: SelectStatement<Book>? = null
+                    database suspendedScope {
+                        newResult = transaction {
+                            BookTable { table ->
+                                table UPDATE SET { price = book1NewPrice } WHERE (name EQ book1.name AND (price EQ book1.price))
+                                table UPDATE SET { price = book2NewPrice } WHERE (name EQ book2.name AND (price EQ book2.price))
+                                table SELECT X
+                            }
                         }
                     }
+
+                    assertEquals(true, newResult!!.getResults().any { it == newBook1 })
+                    assertEquals(true, newResult!!.getResults().any { it == newBook2 })
                 }
 
-                assertEquals(true, newResult!!.getResults().any { it == newBook1 })
-                assertEquals(true, newResult!!.getResults().any { it == newBook2 })
+                assertEquals(true, statement!!.getResults().any { it == book1 })
+                assertEquals(true, statement!!.getResults().any { it == book2 })
             }
-
-            assertEquals(true, statement!!.getResults().any { it == book1 })
-            assertEquals(true, statement!!.getResults().any { it == book2 })
         }
-        Unit
     }
 
     fun testPrimitiveTypeForKSP() {
@@ -428,7 +428,7 @@ class CommonBasicTest(private val path: DatabasePath) {
         }
     }
 
-    fun testNullInsertAndSelect() {
+    fun testNullValue() {
         val config = DatabaseConfiguration(
             name = DATABASE_NAME,
             path = path,
@@ -487,9 +487,9 @@ class CommonBasicTest(private val path: DatabasePath) {
             }
             val result2 = selectStatement.getResults().first()
             assertEquals(1, selectStatement.getResults().size)
-            assertEquals(8, result1.paramInt)
-            assertEquals(null, result1.paramString)
-            assertEquals(8.8, result1.paramDouble)
+            assertEquals(8, result2.paramInt)
+            assertEquals(null, result2.paramString)
+            assertEquals(8.8, result2.paramDouble)
         }
     }
 

sqllin-dsl/src/jvmTest/kotlin/com/ctrip/sqllin/dsl/JvmTest.kt

@@ -66,7 +66,7 @@ class JvmTest {
     fun testPrimitiveTypeForKSP() = commonTest.testPrimitiveTypeForKSP()
 
     @Test
-    fun testNullInsertAndSelect() = commonTest.testNullInsertAndSelect()
+    fun testNullValue() = commonTest.testNullValue()
 
     @BeforeTest
     fun setUp() {

sqllin-dsl/src/nativeTest/kotlin/com/ctrip/sqllin/dsl/NativeTest.kt

@@ -69,7 +69,7 @@ class NativeTest {
     fun testPrimitiveTypeForKSP() = commonTest.testPrimitiveTypeForKSP()
 
     @Test
-    fun testNullInsertAndSelect() = commonTest.testNullInsertAndSelect()
+    fun testNullValue() = commonTest.testNullValue()
 
     @BeforeTest
     fun setUp() {