fixup! fixup! KTOR-5410 Fix server ContentConverter not triggered

ktorio · Jan 16, 2023 · 5aebe43 · 5aebe43
1 parent d285b06
commit 5aebe43
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/...rver/ktor-server-test-host/jvmAndNix/src/io/ktor/server/testing/TestApplicationRequest.kt b/...rver/ktor-server-test-host/jvmAndNix/src/io/ktor/server/testing/TestApplicationRequest.kt
@@ -141,7 +141,11 @@ public fun TestApplicationRequest.setBody(value: ByteReadPacket) {
 /**
  * Sets a multipart HTTP request body.
  */
-public fun buildMultipart(boundary: String, parts: List<PartData>): ByteReadChannel = writer(Dispatchers.IOBridge) {
+@OptIn(DelicateCoroutinesApi::class)
+public fun buildMultipart(
+    boundary: String,
+    parts: List<PartData>
+): ByteReadChannel = GlobalScope.writer(Dispatchers.IOBridge) {
     if (parts.isEmpty()) return@writer
 
     try {

diff --git a/ktor-server/ktor-server-tests/jvm/test/io/ktor/server/testing/TestApplicationEngineTest.kt b/ktor-server/ktor-server-tests/jvm/test/io/ktor/server/testing/TestApplicationEngineTest.kt
@@ -25,10 +25,7 @@ import kotlin.test.*
 class TestApplicationEngineTest {
     @Test
     fun testCustomDispatcher() {
-        @OptIn(
-            ExperimentalCoroutinesApi::class,
-            InternalCoroutinesApi::class
-        )
+        @OptIn(InternalCoroutinesApi::class)
         fun CoroutineDispatcher.withDelay(delay: Delay): CoroutineDispatcher =
             object : CoroutineDispatcher(), Delay by delay {
                 override fun isDispatchNeeded(context: CoroutineContext): Boolean =
@@ -277,7 +274,7 @@ class TestApplicationEngineTest {
                     HttpHeaders.ContentType,
                     ContentType.MultiPart.FormData.withParameter("boundary", boundary).toString()
                 )
-                setBody(boundary, multipart)
+                bodyChannel = buildMultipart(boundary, multipart)
             }
             assertEquals(HttpStatusCode.OK, response.response.status())
         }

diff --git a/...ver/ktor-server-tests/jvmAndNix/test/io/ktor/tests/server/http/TestEngineMultipartTest.kt b/...ver/ktor-server-tests/jvmAndNix/test/io/ktor/tests/server/http/TestEngineMultipartTest.kt
@@ -70,7 +70,7 @@ class TestEngineMultipartTest {
             },
             setup = {
                 addHeader(HttpHeaders.ContentType, contentType.toString())
-                setBody(
+                bodyChannel = buildMultipart(
                     boundary,
                     listOf(
                         PartData.FileItem(
@@ -142,7 +142,7 @@ class TestEngineMultipartTest {
             },
             setup = {
                 addHeader(HttpHeaders.ContentType, contentType.toString())
-                setBody(
+                bodyChannel = buildMultipart(
                     boundary,
                     listOf(
                         PartData.FileItem(