Add Tree concurrency tests (#186)

* bump up libraries to latest * code clean up * Add Tree concurrency tests * make document wait for its initialization
yorkie-team · May 28, 2024 · b552be7 · b552be7
1 parent 055c318
commit b552be7
Show file tree

Hide file tree

Showing 12 changed files with 972 additions and 422 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -96,8 +96,9 @@ jobs:
           script: |
             adb shell pm list packages | grep dev.yorkie.test && adb uninstall dev.yorkie.test || true;
             ./gradlew yorkie:connectedCheck -Pandroid.testInstrumentationRunnerArguments.notAnnotation=dev.yorkie.TreeTest --no-build-cache --no-daemon --stacktrace
-            ./gradlew yorkie:connectedCheck -Pandroid.testInstrumentationRunnerArguments.annotation=dev.yorkie.TreeBasicTest --no-build-cache --no-daemon --stacktrace
-            ./gradlew yorkie:connectedCheck -Pandroid.testInstrumentationRunnerArguments.annotation=dev.yorkie.TreeSplitMergeTest --no-build-cache --no-daemon --stacktrace
+            ./gradlew yorkie:connectedCheck -Pandroid.testInstrumentationRunnerArguments.class=dev.yorkie.document.json.JsonTreeTest --no-build-cache --no-daemon --stacktrace
+            ./gradlew yorkie:connectedCheck -Pandroid.testInstrumentationRunnerArguments.class=dev.yorkie.document.json.JsonTreeSplitMergeTest --no-build-cache --no-daemon --stacktrace
+            ./gradlew yorkie:connectedCheck -Pandroid.testInstrumentationRunnerArguments.class=dev.yorkie.document.json.JsonTreeConcurrencyTest --no-build-cache --no-daemon --stacktrace
       - if: ${{ matrix.api-level == 24 }}
         run: ./gradlew yorkie:jacocoDebugTestReport
       - if: ${{ matrix.api-level == 24 }}

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,12 +7,12 @@ connectKotlin = "0.6.1"
 okhttp = "4.12.0"
 coroutines = "1.8.1"
 androidxActivity = "1.9.0"
-androidxLifecycle = "2.7.0"
+androidxLifecycle = "2.8.0"
 androidxBenchmark = "1.2.4"
 androidxComposeCompiler = "1.5.13"
 
 [libraries]
-androidx-annotation = { module = "androidx.annotation:annotation", version = "1.7.1" }
+androidx-annotation = { module = "androidx.annotation:annotation", version = "1.8.0" }
 connect-kotlin-google-javalite-ext = { module = "com.connectrpc:connect-kotlin-google-javalite-ext", version.ref = "connectKotlin" }
 connect-kotlin-okhttp = { module = "com.connectrpc:connect-kotlin-okhttp", version.ref = "connectKotlin" }
 okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }

diff --git a/yorkie/src/androidTest/kotlin/dev/yorkie/TestAnnotations.kt b/yorkie/src/androidTest/kotlin/dev/yorkie/TestAnnotations.kt
@@ -1,13 +1,7 @@
+@file:Suppress("ktlint:standard:filename")
+
 package dev.yorkie
 
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
 internal annotation class TreeTest
-
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
-internal annotation class TreeBasicTest
-
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
-internal annotation class TreeSplitMergeTest