Skip to content

Commit d5c02be

Browse files
committed
build(model-sync-lib): moved test to commonTest source set
1 parent 3d34d38 commit d5c02be

File tree

6 files changed

+4
-14
lines changed

6 files changed

+4
-14
lines changed

model-sync-lib/build.gradle.kts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,10 @@ kotlin {
2525
dependencies {
2626
implementation(project(":model-api"))
2727
implementation(libs.kotlin.serialization.json)
28-
implementation(project(":model-client"))
28+
implementation(project(":model-client", configuration = "jvmRuntimeElements"))
2929
implementation(kotlin("test"))
3030
}
3131
}
32-
33-
val jvmMain by getting
34-
35-
val jvmTest by getting {
36-
dependencies {
37-
dependencies {
38-
implementation(project(":model-client", configuration = "jvmRuntimeElements"))
39-
}
40-
}
41-
}
4232
}
4333
}
4434

model-sync-lib/src/jvmTest/kotlin/org/modelix/model/sync/ModelExporterTest.kt renamed to model-sync-lib/src/commonTest/kotlin/org/modelix/model/sync/ModelExporterTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class ModelExporterTest {
2323
@JvmStatic
2424
@BeforeAll
2525
fun `initialize model and branch`() {
26-
model = ModelData.fromJson(File("src/jvmTest/resources/newmodel.json").readText())
26+
model = ModelData.fromJson(File("src/commonTest/resources/newmodel.json").readText())
2727

2828
val tree = CLTree(ObjectStoreCache(MapBaseStore()))
2929
branch = PBranch(tree, IdGenerator.getInstance(1))

model-sync-lib/src/jvmTest/kotlin/org/modelix/model/sync/ModelImporterTest.kt renamed to model-sync-lib/src/commonTest/kotlin/org/modelix/model/sync/ModelImporterTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ class ModelImporterTest {
2929
@JvmStatic
3030
@BeforeAll
3131
fun `load and import model`() {
32-
model = ModelData.fromJson(File("src/jvmTest/resources/model.json").readText())
33-
val newModelFile = File("src/jvmTest/resources/newmodel.json")
32+
model = ModelData.fromJson(File("src/commonTest/resources/model.json").readText())
33+
val newModelFile = File("src/commonTest/resources/newmodel.json")
3434
newModel = ModelData.fromJson(newModelFile.readText())
3535

3636
val store = ObjectStoreCache(MapBaseStore())
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)