Skip to content

Commit 28034c7

Browse files
committed
refactor: reorganize test modules into a nested structure
- Rename and move `:core:test` to `:core:test:common`. - Rename and move `:core:test-ui` to `:core:test:ui`. - Rename and move `:core:test-jvm` to `:core:test:jvm`. - Update all project references in `settings.gradle.kts` and `build.gradle.kts` files across the project. - Update internal module dependencies to reflect the new paths (e.g., `:core:test:jvm` now depends on `:core:test:ui`). - Update documentation, READMEs, and script files (`build_quick.sh`) to point to the new module paths and Gradle task names. - Update package references and file paths in `CHANGELOG.md` and `TESTING_GUIDE.md`.
1 parent ebf58e9 commit 28034c7

86 files changed

Lines changed: 94 additions & 94 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

AGENTS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
## Quick Reference
99

1010
### Project Structure & Module Organization
11-
- Core: `core/domain`, `core/presentation`, `core/data/db-sqldelight` (default), `core/data/db-room` (optional), `core/test`.
11+
- Core: `core/domain`, `core/presentation`, `core/data/db-sqldelight` (default), `core/data/db-room` (optional), `core/test/common`.
1212
- Features: `feature/backup/{domain,ui}`, `feature/console/{domain,presentation,ui}`, `feature/file-explorer/data`.
13-
- UI: `core/ui` (common Compose code and resources), `core/test-ui` (multiplatform Compose UI tests), `core/test-jvm` (JVM-specific UI test utilities).
13+
- UI: `core/ui` (common Compose code and resources), `core/test/ui` (multiplatform Compose UI tests), `core/test/jvm` (JVM-specific UI test utilities).
1414
- Apps: `app/android`, `app/desktop`, `app/web`, `app/ios-kit` (CocoaPods framework), `app/iosApp` (Xcode project).
1515
- Tooling: `build-logic` (Gradle conventions), `thirdparty` (vendored modules), `gradle/libs.versions.toml` (versions).
1616
- Switch DB module via `gradle.properties` key `CORE_DATA_DB_MODULE`.

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
140140

141141
### Refactoring
142142
- Improve UI test stability and maintainability
143-
- Create multiplatform `core:test-ui` module and move UI tests
143+
- Create multiplatform `core:test:ui` module and move UI tests
144144
- Simplify navigation methods and improve null handling in RouterImpl
145145
- Improve UI test retry logic and stability
146146

app/android/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ android {
229229
}
230230

231231
dependencies {
232-
androidTestImplementation(project(":core:test-jvm"))
232+
androidTestImplementation(project(":core:test:jvm"))
233233
androidTestUtil(libs.androidx.test.orchestrator)
234234
}
235235
```
@@ -334,7 +334,7 @@ fastlane production # Deploy to production
334334
- `leakcanary.android` - Memory leak detection
335335

336336
### Testing
337-
- `core:test-jvm` - UI test framework
337+
- `core:test:jvm` - UI test framework
338338
- `androidx.test.ext.junit` - AndroidX Test
339339
- `androidx.test.runner` - Test runner
340340
- `androidx.test.orchestrator` - Test orchestrator
@@ -467,7 +467,7 @@ val permissionLauncher = rememberLauncherForActivityResult(
467467
## Related Modules
468468

469469
- **Depends on**: `core:ui`, `core:presentation`, `core:data`, `core:domain`
470-
- **Test dependencies**: `core:test-jvm`, `core:test`
470+
- **Test dependencies**: `core:test:jvm`, `core:test:common`
471471
- **Alternative apps**: `app:desktop`, `app:web`, `app:iosApp`
472472

473473
## Resources

app/android/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ dependencies {
101101
coreLibraryDesugaring(libs.desugar)
102102
testImplementation(libs.junit)
103103
testImplementation(libs.bundles.mockito)
104-
androidTestImplementation(projects.core.testUi)
105-
androidTestImplementation(projects.core.testJvm) {
104+
androidTestImplementation(projects.core.test.ui)
105+
androidTestImplementation(projects.core.test.jvm) {
106106
exclude(group = "org.jetbrains.runtime", module = "jbr-api")
107107
}
108108
androidTestImplementation(libs.commonsware.saferoom)

app/desktop/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ kotlin {
3434
implementation(libs.kermit)
3535
}
3636
jvmTest.dependencies {
37-
implementation(projects.core.testUi)
38-
implementation(projects.core.testJvm)
37+
implementation(projects.core.test.ui)
38+
implementation(projects.core.test.jvm)
3939
implementation(projects.feature.backup.ui)
4040
implementation(kotlin("test"))
4141
implementation(libs.compose.ui.test.junit4)

app/ios-kit/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ Kotlin code can be debugged from Xcode with proper symbol mapping.
362362

363363
### UI Tests
364364

365-
The iOS kit includes multiplatform Compose UI tests that extend `CommonUiTests` from the `core/test-ui` module:
365+
The iOS kit includes multiplatform Compose UI tests that extend `CommonUiTests` from the `core/test/ui` module:
366366

367367
**Location**: `app/ios-kit/src/commonTest/kotlin/IosUiTests.kt`
368368

app/ios-kit/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ kotlin {
4242
}
4343
commonTest.dependencies {
4444
implementation(kotlin("test"))
45-
implementation(projects.core.testUi)
45+
implementation(projects.core.test.ui)
4646
implementation(libs.compose.ui.test)
4747
implementation(libs.compose.material.icons.extended)
4848
implementation(libs.androidx.lifecycle.runtime.compose)
Binary file not shown.

app/web/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ self.addEventListener('install', (event) => {
401401

402402
### UI Tests
403403

404-
The web app includes multiplatform Compose UI tests that extend `CommonUiTests` from the `core/test-ui` module:
404+
The web app includes multiplatform Compose UI tests that extend `CommonUiTests` from the `core/test/ui` module:
405405

406406
**Location**: `app/web/src/wasmJsTest/kotlin/WebUiTests.kt`
407407

app/web/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ kotlin {
4848
wasmJsTest {
4949
dependencies {
5050
implementation(kotlin("test"))
51-
implementation(projects.core.testUi)
51+
implementation(projects.core.test.ui)
5252
implementation(libs.compose.ui.test)
5353
implementation(libs.compose.material3)
5454
implementation(libs.compose.material.icons.extended)

0 commit comments

Comments
 (0)