File tree Expand file tree Collapse file tree 10 files changed +8
-12
lines changed
src/test/kotlin/org/modelix/metamodel/generator
src/test/kotlin/org/modelix/model/server Expand file tree Collapse file tree 10 files changed +8
-12
lines changed Original file line number Diff line number Diff line change @@ -47,7 +47,6 @@ kotlin {
47
47
val jvmTest by getting {
48
48
dependencies {
49
49
implementation(kotlin(" test" ))
50
- implementation(kotlin(" test-junit" ))
51
50
}
52
51
}
53
52
val jsMain by getting {
Original file line number Diff line number Diff line change @@ -15,7 +15,6 @@ dependencies {
15
15
implementation(libs.kotlinpoet)
16
16
implementation(kotlin(" reflect" ))
17
17
testImplementation(kotlin(" test" ))
18
- testImplementation(kotlin(" test-junit" ))
19
18
}
20
19
21
20
description = " Generator for Kotlin meta model classes"
Original file line number Diff line number Diff line change @@ -2,10 +2,10 @@ package org.modelix.metamodel.generator
2
2
3
3
import com.charleskorn.kaml.Yaml
4
4
import kotlinx.serialization.decodeFromString
5
- import org.junit.Test
6
5
import org.modelix.model.data.LanguageData
7
6
import java.io.File
8
7
import kotlin.io.path.*
8
+ import kotlin.test.Test
9
9
import kotlin.test.assertContains
10
10
11
11
class KotlinGeneratorTest {
Original file line number Diff line number Diff line change 1
1
package org.modelix.metamodel.generator
2
2
3
- import org.junit .Test
3
+ import kotlin.test .Test
4
4
import kotlin.test.assertEquals
5
5
import kotlin.test.assertFailsWith
6
6
Original file line number Diff line number Diff line change @@ -89,7 +89,7 @@ kotlin {
89
89
}
90
90
val jvmTest by getting {
91
91
dependencies {
92
- implementation(kotlin(" test-junit " ))
92
+ implementation(kotlin(" test" ))
93
93
}
94
94
}
95
95
val jsMain by getting {
Original file line number Diff line number Diff line change @@ -49,7 +49,6 @@ kotlin {
49
49
val jvmTest by getting {
50
50
dependencies {
51
51
implementation(kotlin(" test" ))
52
- implementation(kotlin(" test-junit" ))
53
52
}
54
53
}
55
54
val jsMain by getting {
Original file line number Diff line number Diff line change @@ -62,7 +62,6 @@ dependencies {
62
62
testImplementation(libs.cucumber.java)
63
63
testImplementation(libs.ktor.server.test.host)
64
64
testImplementation(kotlin(" test" ))
65
- implementation(kotlin(" test-junit" ))
66
65
}
67
66
68
67
val cucumberRuntime by configurations.creating {
Original file line number Diff line number Diff line change @@ -20,7 +20,6 @@ import io.ktor.server.application.*
20
20
import io.ktor.server.plugins.contentnegotiation.*
21
21
import io.ktor.server.testing.*
22
22
import io.ktor.server.websocket.*
23
- import org.junit.Test
24
23
import org.modelix.authorization.installAuthentication
25
24
import org.modelix.model.api.IConceptReference
26
25
import org.modelix.model.api.ITree
@@ -32,6 +31,7 @@ import org.modelix.model.lazy.RepositoryId
32
31
import org.modelix.model.operations.OTBranch
33
32
import org.modelix.model.server.handlers.ModelReplicationServer
34
33
import org.modelix.model.server.store.InMemoryStoreClient
34
+ import kotlin.test.Test
35
35
import kotlin.test.assertEquals
36
36
37
37
class ModelClientV2_Test {
Original file line number Diff line number Diff line change @@ -18,14 +18,14 @@ package org.modelix.model.server
18
18
import io.ktor.server.testing.*
19
19
import kotlinx.coroutines.delay
20
20
import kotlinx.coroutines.withTimeout
21
- import org.junit.Assert
22
- import org.junit.Test
23
21
import org.modelix.authorization.installAuthentication
24
22
import org.modelix.model.IKeyListener
25
23
import org.modelix.model.client.RestWebModelClient
26
24
import org.modelix.model.server.handlers.KeyValueLikeModelServer
27
25
import org.modelix.model.server.store.InMemoryStoreClient
28
26
import java.util.*
27
+ import kotlin.test.Test
28
+ import kotlin.test.assertEquals
29
29
import kotlin.test.fail
30
30
import kotlin.time.Duration.Companion.seconds
31
31
@@ -79,7 +79,7 @@ class ModelClient_Test {
79
79
println (" put to client $writingClientIndex " )
80
80
for (client in clients) {
81
81
withTimeout(1 .seconds) {
82
- Assert . assertEquals(expected[key], client.getA(key))
82
+ assertEquals(expected[key], client.getA(key))
83
83
}
84
84
}
85
85
println (" verified" )
Original file line number Diff line number Diff line change @@ -21,7 +21,6 @@ import io.ktor.server.plugins.contentnegotiation.*
21
21
import io.ktor.server.testing.*
22
22
import io.ktor.server.websocket.*
23
23
import kotlinx.coroutines.delay
24
- import org.junit.Test
25
24
import org.modelix.authorization.installAuthentication
26
25
import org.modelix.model.api.IBranch
27
26
import org.modelix.model.api.getRootNode
@@ -34,6 +33,7 @@ import org.modelix.model.server.handlers.ModelReplicationServer
34
33
import org.modelix.model.server.store.InMemoryStoreClient
35
34
import org.modelix.model.test.RandomModelChangeGenerator
36
35
import kotlin.random.Random
36
+ import kotlin.test.Test
37
37
import kotlin.test.assertEquals
38
38
import kotlin.time.Duration.Companion.milliseconds
39
39
import kotlin.time.ExperimentalTime
You can’t perform that action at this time.
0 commit comments