Skip to content

Commit df05678

Browse files
committed
chore(model-server): avoid class reloading issue in DiffViewTest
1 parent 39eacea commit df05678

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,17 @@ fun runWithNettyServer(
4646
nettyServer.stop()
4747
}
4848
}
49+
50+
fun runTestApplication(block: suspend ApplicationTestBuilder.() -> Unit) {
51+
val previousDevMode = System.getProperty("io.ktor.development")
52+
System.setProperty("io.ktor.development", "false")
53+
try {
54+
io.ktor.server.testing.testApplication(block)
55+
} finally {
56+
if (previousDevMode == null) {
57+
System.clearProperty("io.ktor.development")
58+
} else {
59+
System.setProperty("io.ktor.development", previousDevMode)
60+
}
61+
}
62+
}

model-server/src/test/kotlin/org/modelix/model/server/handlers/ui/DiffViewTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import io.ktor.client.statement.HttpResponse
1717
import io.ktor.client.statement.bodyAsText
1818
import io.ktor.http.HttpStatusCode
1919
import io.ktor.server.testing.ApplicationTestBuilder
20-
import io.ktor.server.testing.testApplication
2120
import io.mockk.clearAllMocks
2221
import io.mockk.coEvery
2322
import io.mockk.every
@@ -42,6 +41,7 @@ import org.modelix.model.persistent.CPNode
4241
import org.modelix.model.persistent.CPNodeRef
4342
import org.modelix.model.server.handlers.RepositoriesManager
4443
import org.modelix.model.server.installDefaultServerPlugins
44+
import org.modelix.model.server.runTestApplication
4545
import kotlin.test.BeforeTest
4646
import kotlin.test.Test
4747

@@ -308,7 +308,7 @@ class DiffViewTest {
308308
val v1 = createCLVersion { it }
309309
val v2 = createCLVersion(v1) { it }
310310

311-
private fun runDiffViewTest(block: suspend ApplicationTestBuilder.() -> Unit) = testApplication {
311+
private fun runDiffViewTest(block: suspend ApplicationTestBuilder.() -> Unit) = runTestApplication {
312312
application {
313313
installDefaultServerPlugins()
314314
DiffView(repositoriesManager).init(this)

0 commit comments

Comments
 (0)