Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optimize the unit tests #101

Merged
merged 2 commits into from
Dec 5, 2024
+14 −14
Merged

Optimize the unit tests #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36fb8b0
Update the Android instrumented tests
qiaoyuang Dec 4, 2024
4523e53
Optimize the unit tests
qiaoyuang Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

### All

* Update `Kotlin`'s version to `2.1.00`
* Update `Kotlin`'s version to `2.1.0`

### sqllin-dsl

Expand Down
2 changes: 1 addition & 1 deletion ...lin/com/ctrip/sqllin/dsl/PlatformApple.kt → ...lin/com/ctrip/sqllin/dsl/PlatformApple.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '/'
2 changes: 1 addition & 1 deletion ...lin/com/ctrip/sqllin/dsl/PlatformLinux.kt → ...lin/com/ctrip/sqllin/dsl/PlatformLinux.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '/'
2 changes: 1 addition & 1 deletion ...lin/com/ctrip/sqllin/dsl/PlatformMingw.kt → ...lin/com/ctrip/sqllin/dsl/PlatformMingw.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '\\'
2 changes: 1 addition & 1 deletion ...n/kotlin/com/ctrip/sqllin/dsl/Platform.kt → ...t/kotlin/com/ctrip/sqllin/dsl/Platform.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions test_android.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading