Merge pull request #101 from qiaoyuang/main

Optimize the unit tests

Author: qiaoyuang

.github/workflows/build.yml

@@ -76,24 +76,24 @@ jobs:
         if: steps.avd-cache.outputs.cache-hit != 'true'
         uses: reactivecircus/android-emulator-runner@v2
         with:
-          api-level: 34
+          api-level: 35
           target: google_apis
           arch: x86_64
           profile: pixel_6
-          emulator-build: 12265550
+          emulator-build: 12694320
           force-avd-creation: false
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
           script: echo "Generated AVD snapshot for caching."
 
-      - name: Run Android 14 Instrumented Tests
+      - name: Run Android 15 Instrumented Tests
         uses: reactivecircus/android-emulator-runner@v2
         with:
-          api-level: 34
+          api-level: 35
           target: google_apis
           arch: x86_64
           profile: pixel_6
-          emulator-build: 12265550
+          emulator-build: 12694320
           force-avd-creation: false
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
@@ -239,7 +239,7 @@ jobs:
           target: default
           arch: x86_64
           profile: pixel_2
-          emulator-build: 12265550
+          emulator-build: 12694320
           force-avd-creation: false
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
@@ -252,7 +252,7 @@ jobs:
           target: default
           arch: x86_64
           profile: pixel_2
-          emulator-build: 12265550
+          emulator-build: 12694320
           force-avd-creation: false
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true

CHANGELOG.md

@@ -6,7 +6,7 @@
 
 ### All
 
-* Update `Kotlin`'s version to `2.1.00`
+* Update `Kotlin`'s version to `2.1.0`
 
 ### sqllin-dsl
 

…in/com/ctrip/sqllin/dsl/PlatformApple.kt …in/com/ctrip/sqllin/dsl/PlatformApple.ktsqllin-dsl/src/appleMain/kotlin/com/ctrip/sqllin/dsl/PlatformApple.kt renamed to sqllin-dsl/src/appleTest/kotlin/com/ctrip/sqllin/dsl/PlatformApple.kt sqllin-dsl/src/appleMain/kotlin/com/ctrip/sqllin/dsl/PlatformApple.kt renamed to sqllin-dsl/src/appleTest/kotlin/com/ctrip/sqllin/dsl/PlatformApple.kt

@@ -30,4 +30,4 @@ import platform.Foundation.NSUserDomainMask
 internal actual fun getPlatformStringPath(): String =
     (NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, true).firstOrNull() as? String ?: "")
 
-// actual val pathSeparator: Char = '/'
+internal actual val pathSeparator: Char = '/'

…in/com/ctrip/sqllin/dsl/PlatformLinux.kt …in/com/ctrip/sqllin/dsl/PlatformLinux.ktsqllin-dsl/src/linuxMain/kotlin/com/ctrip/sqllin/dsl/PlatformLinux.kt renamed to sqllin-dsl/src/linuxTest/kotlin/com/ctrip/sqllin/dsl/PlatformLinux.kt sqllin-dsl/src/linuxMain/kotlin/com/ctrip/sqllin/dsl/PlatformLinux.kt renamed to sqllin-dsl/src/linuxTest/kotlin/com/ctrip/sqllin/dsl/PlatformLinux.kt

@@ -29,4 +29,4 @@ import platform.posix.getcwd
 internal actual fun getPlatformStringPath(): String =
     getcwd(null, 0u)?.toKString() ?: throw IllegalStateException("The temp path created error")
 
-// actual val pathSeparator: Char = '/'
+internal actual val pathSeparator: Char = '/'

…in/com/ctrip/sqllin/dsl/PlatformMingw.kt …in/com/ctrip/sqllin/dsl/PlatformMingw.ktsqllin-dsl/src/mingwMain/kotlin/com/ctrip/sqllin/dsl/PlatformMingw.kt renamed to sqllin-dsl/src/mingwTest/kotlin/com/ctrip/sqllin/dsl/PlatformMingw.kt sqllin-dsl/src/mingwMain/kotlin/com/ctrip/sqllin/dsl/PlatformMingw.kt renamed to sqllin-dsl/src/mingwTest/kotlin/com/ctrip/sqllin/dsl/PlatformMingw.kt

@@ -29,4 +29,4 @@ import platform.posix._wgetcwd
 internal actual fun getPlatformStringPath(): String =
     _wgetcwd(null, 0)?.toKString() ?: throw IllegalStateException("Get database path wrong")
 
-// actual val pathSeparator: Char = '\\'
+internal actual val pathSeparator: Char = '\\'

…/kotlin/com/ctrip/sqllin/dsl/Platform.kt …/kotlin/com/ctrip/sqllin/dsl/Platform.ktsqllin-dsl/src/nativeMain/kotlin/com/ctrip/sqllin/dsl/Platform.kt renamed to sqllin-dsl/src/nativeTest/kotlin/com/ctrip/sqllin/dsl/Platform.kt sqllin-dsl/src/nativeMain/kotlin/com/ctrip/sqllin/dsl/Platform.kt renamed to sqllin-dsl/src/nativeTest/kotlin/com/ctrip/sqllin/dsl/Platform.kt

@@ -29,4 +29,4 @@ internal expect fun getPlatformStringPath(): String
 /**
  * Get the file path separator, '\' in Windows, '/' in others
  */
-// expect val pathSeparator: Char
+internal expect val pathSeparator: Char

test_android.sh

@@ -1,5 +1,5 @@
 #Run Android instrumented tests
 ./gradlew :sqllin-driver:connectedDebugAndroidTest --stacktrace
 ./gradlew :sqllin-dsl:connectedDebugAndroidTest --stacktrace
-adb uninstall com.ctrip.sqllin.driver.test
-adb uninstall com.ctrip.sqllin.dsl.test
+#adb uninstall com.ctrip.sqllin.driver.test
+#adb uninstall com.ctrip.sqllin.dsl.test