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

Jump to bottom

Add Tree concurrency tests #186

Merged
merged 9 commits into from
May 28, 2024
Merged

Add Tree concurrency tests #186

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9a2e440
encapsulate Document
7hong13 May 27, 2024
1d36f1d
bump up libraries to latest
7hong13 May 27, 2024
873edde
code clean up
7hong13 May 27, 2024
c079ade
Add Tree concurrency tests
7hong13 May 27, 2024
6bec809
fix lint
7hong13 May 27, 2024
dcb49d4
use H2_PRIOR_KNOWLEDGE
7hong13 May 27, 2024
9f86bbf
increase timeout time
7hong13 May 27, 2024
286eca6
make document wait for its initialization
7hong13 May 28, 2024
8febcf6
Revert "encapsulate Document"
7hong13 May 28, 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
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
10 changes: 2 additions & 8 deletions yorkie/src/androidTest/kotlin/dev/yorkie/TestAnnotations.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion yorkie/src/androidTest/kotlin/dev/yorkie/core/TestUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const val GENERAL_TIMEOUT = 3_000L
fun createClient() = Client(
"http://10.0.2.2:8080",
unaryClient = OkHttpClient.Builder()
.protocols(listOf(Protocol.HTTP_1_1))
.protocols(listOf(Protocol.H2_PRIOR_KNOWLEDGE))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should stay on http 1 as http 2 is very unstable

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

using http2 is outdated code. I just tested it temporarily.

.build(),
)

Expand Down
Loading
Loading