Upgrade mockwebserver

Wuvist · Feb 17, 2020 · e74521e · e74521e
1 parent 8e3f9d4
commit e74521e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ repositories {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
     implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.10.2'
-    implementation "com.squareup.okhttp3:mockwebserver:3.2.0"
+    implementation "com.squareup.okhttp3:mockwebserver:4.3.1"
     testImplementation "org.junit.jupiter:junit-jupiter:5.6.0"
 }
 

diff --git a/src/main/kotlin/com/blogwind/easywebmock/MockServer.kt b/src/main/kotlin/com/blogwind/easywebmock/MockServer.kt
@@ -84,17 +84,18 @@ class MockServer {
                         .setBody("Internal error")
                 }
 
-                var resp = getResponseOnce(request.path)
+                val path = request.requestUrl!!.encodedPath
+                var resp = getResponseOnce(path)
                 if (resp != null) {
                     return resp
                 }
 
-                resp = defaultResponses[request.path]
+                resp = defaultResponses[path]
                 if (resp != null) {
                     return resp
                 }
 
-                val handler = defaultHandlers[request.path]
+                val handler = defaultHandlers[path]
                 if (handler != null) {
                     return try {
                         handler(request)
@@ -112,7 +113,7 @@ class MockServer {
                     .setBody("Not Found")
             }
         }
-        server.setDispatcher(dispatcher)
+        server.dispatcher = dispatcher
         server.start()
     }
 

diff --git a/src/test/kotlin/com/blogwind/easywebmock/MockServerManagerTest.kt b/src/test/kotlin/com/blogwind/easywebmock/MockServerManagerTest.kt
@@ -151,6 +151,16 @@ class MockServerManagerTest {
         Assertions.assertEquals(client.get(toPath), "<html></html>")
     }
 
+    @Test
+    fun testPath() {
+        val server = MockServerManager.defaultServer
+        val client = UrlClient(server.getUrl())
+        val toPath = "/foobar"
+
+        server.setOneTimeResponse(toPath, "foobar")
+        Assertions.assertEquals(client.get("$toPath?user=1"), "foobar")
+    }
+
     @Test
     fun testMisc() {
         val server = MockServerManager()

diff --git a/src/test/kotlin/com/blogwind/easywebmock/UrlClient.kt b/src/test/kotlin/com/blogwind/easywebmock/UrlClient.kt
@@ -3,10 +3,11 @@ package com.blogwind.easywebmock
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
-import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
 import java.net.URL
 
 class UrlClient(baseUrl: String) {
@@ -22,15 +23,15 @@ class UrlClient(baseUrl: String) {
 
     fun post(path: String, content: String = ""): String {
         val client = OkHttpClient()
-        val contentType = MediaType.parse("application/json; charset=utf-8")
-        val body = RequestBody.create(contentType, content)
+        val contentType = "application/json; charset=utf-8".toMediaType()
+        val body = content.toRequestBody(contentType)
 
         val request: Request = Request.Builder()
             .url(baseUrl + path)
             .post(body).build()
 
         val response = client.newCall(request).execute()
-        return response.body()!!.string()
+        return response.body!!.string()
     }
 
     inline fun <reified T> postForObject(path: String, obj: Any): T {