Skip to content

Commit 860956f

Browse files
committed
build: use Kotlin test abstractions instead of junit
This fixes some failing builds. The dependency is unnecessary anyway.
1 parent 2d22f52 commit 860956f

File tree

10 files changed

+8
-12
lines changed

10 files changed

+8
-12
lines changed

model-api-gen-runtime/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ kotlin {
4747
val jvmTest by getting {
4848
dependencies {
4949
implementation(kotlin("test"))
50-
implementation(kotlin("test-junit"))
5150
}
5251
}
5352
val jsMain by getting {

model-api-gen/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ dependencies {
1515
implementation(libs.kotlinpoet)
1616
implementation(kotlin("reflect"))
1717
testImplementation(kotlin("test"))
18-
testImplementation(kotlin("test-junit"))
1918
}
2019

2120
description = "Generator for Kotlin meta model classes"

model-api-gen/src/test/kotlin/org/modelix/metamodel/generator/KotlinGeneratorTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package org.modelix.metamodel.generator
22

33
import com.charleskorn.kaml.Yaml
44
import kotlinx.serialization.decodeFromString
5-
import org.junit.Test
65
import org.modelix.model.data.LanguageData
76
import java.io.File
87
import kotlin.io.path.*
8+
import kotlin.test.Test
99
import kotlin.test.assertContains
1010

1111
class KotlinGeneratorTest {

model-api-gen/src/test/kotlin/org/modelix/metamodel/generator/NameConfigTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.modelix.metamodel.generator
22

3-
import org.junit.Test
3+
import kotlin.test.Test
44
import kotlin.test.assertEquals
55
import kotlin.test.assertFailsWith
66

model-client/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ kotlin {
8989
}
9090
val jvmTest by getting {
9191
dependencies {
92-
implementation(kotlin("test-junit"))
92+
implementation(kotlin("test"))
9393
}
9494
}
9595
val jsMain by getting {

model-server-api/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ kotlin {
4949
val jvmTest by getting {
5050
dependencies {
5151
implementation(kotlin("test"))
52-
implementation(kotlin("test-junit"))
5352
}
5453
}
5554
val jsMain by getting {

model-server/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ dependencies {
6262
testImplementation(libs.cucumber.java)
6363
testImplementation(libs.ktor.server.test.host)
6464
testImplementation(kotlin("test"))
65-
implementation(kotlin("test-junit"))
6665
}
6766

6867
val cucumberRuntime by configurations.creating {

model-server/src/test/kotlin/org/modelix/model/server/ModelClientV2_Test.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import io.ktor.server.application.*
2020
import io.ktor.server.plugins.contentnegotiation.*
2121
import io.ktor.server.testing.*
2222
import io.ktor.server.websocket.*
23-
import org.junit.Test
2423
import org.modelix.authorization.installAuthentication
2524
import org.modelix.model.api.IConceptReference
2625
import org.modelix.model.api.ITree
@@ -32,6 +31,7 @@ import org.modelix.model.lazy.RepositoryId
3231
import org.modelix.model.operations.OTBranch
3332
import org.modelix.model.server.handlers.ModelReplicationServer
3433
import org.modelix.model.server.store.InMemoryStoreClient
34+
import kotlin.test.Test
3535
import kotlin.test.assertEquals
3636

3737
class ModelClientV2_Test {

model-server/src/test/kotlin/org/modelix/model/server/ModelClient_Test.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ package org.modelix.model.server
1818
import io.ktor.server.testing.*
1919
import kotlinx.coroutines.delay
2020
import kotlinx.coroutines.withTimeout
21-
import org.junit.Assert
22-
import org.junit.Test
2321
import org.modelix.authorization.installAuthentication
2422
import org.modelix.model.IKeyListener
2523
import org.modelix.model.client.RestWebModelClient
2624
import org.modelix.model.server.handlers.KeyValueLikeModelServer
2725
import org.modelix.model.server.store.InMemoryStoreClient
2826
import java.util.*
27+
import kotlin.test.Test
28+
import kotlin.test.assertEquals
2929
import kotlin.test.fail
3030
import kotlin.time.Duration.Companion.seconds
3131

@@ -79,7 +79,7 @@ class ModelClient_Test {
7979
println(" put to client $writingClientIndex")
8080
for (client in clients) {
8181
withTimeout(1.seconds) {
82-
Assert.assertEquals(expected[key], client.getA(key))
82+
assertEquals(expected[key], client.getA(key))
8383
}
8484
}
8585
println(" verified")

model-server/src/test/kotlin/org/modelix/model/server/ReplicatedRepositoryTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import io.ktor.server.plugins.contentnegotiation.*
2121
import io.ktor.server.testing.*
2222
import io.ktor.server.websocket.*
2323
import kotlinx.coroutines.delay
24-
import org.junit.Test
2524
import org.modelix.authorization.installAuthentication
2625
import org.modelix.model.api.IBranch
2726
import org.modelix.model.api.getRootNode
@@ -34,6 +33,7 @@ import org.modelix.model.server.handlers.ModelReplicationServer
3433
import org.modelix.model.server.store.InMemoryStoreClient
3534
import org.modelix.model.test.RandomModelChangeGenerator
3635
import kotlin.random.Random
36+
import kotlin.test.Test
3737
import kotlin.test.assertEquals
3838
import kotlin.time.Duration.Companion.milliseconds
3939
import kotlin.time.ExperimentalTime

0 commit comments

Comments
 (0)