Merge pull request #3 from michallaskowski/add-stop

Add stop method

Author: michallaskowski

library/src/androidMain/kotlin/actual.kt

@@ -49,6 +49,10 @@ actual class HttpServer actual constructor() {
         mockWebServer.start(port)
     }
 
+    actual fun stop() {
+        mockWebServer.shutdown()
+    }
+
     actual var router: Router?
         get() = dispatcher.router
         set(newRouter) {

library/src/commonMain/kotlin/HttpServer.kt

@@ -20,4 +20,5 @@ interface Router {
 expect class HttpServer() {
     var router: Router?
     fun start(port: Int)
+    fun stop()
 }

library/src/commonTest/kotlin/HttpServerTest.kt

@@ -22,7 +22,7 @@ class HttpServerTest: BaseTest() {
 
     @AfterTest
     fun teardown() = runTest {
-        // todo: server close
+        server.stop()
         client.close()
     }
 
@@ -40,9 +40,29 @@ class HttpServerTest: BaseTest() {
         server.start(8080)
 
         val response = client.get<String>("http://localhost:8080/test")
-        assertEquals(response, "test")
+        assertEquals("test", response)
 
         val httpResponse = client.get<HttpResponse>("http://localhost:8080/notTest")
-        assertEquals(httpResponse.status, HttpStatusCode.NotFound)
+        assertEquals(HttpStatusCode.NotFound, httpResponse.status)
+    }
+
+    @Test
+    fun returnsHeaders() = runTest {
+        server.router = object: Router {
+            override fun handleRequest(request: Request): Response {
+                return Response(
+                    200,
+                    mapOf("customHeader" to "customHeaderValue"),
+                    Data("test"),
+                    "text/plain"
+                )
+            }
+        }
+
+        server.start(8080)
+
+        val httpResponse = client.get<HttpResponse>("http://localhost:8080/anything")
+        assertEquals( HttpStatusCode.OK, httpResponse.status)
+        assertEquals("customHeaderValue", httpResponse.headers["customHeader"])
     }
 }

library/src/iOSMain/kotlin/actual.kt

@@ -25,6 +25,10 @@ actual class HttpServer actual constructor() {
         httpServer.startWithPort(port.toULong(), null)
     }
 
+    actual fun stop() {
+        httpServer.stop()
+    }
+
     actual var router: Router? = null
         set(newRouter) {
             field = newRouter
@@ -45,13 +49,20 @@ actual class HttpServer actual constructor() {
                     val request = Request(gcdRequest.method, path, headers, body)
 
                     val response = newRouter.handleRequest(request)
+                    val gcdResponse: GCDWebServerResponse
                     if (response.body != null) {
-                        GCDWebServerDataResponse(response.body, response.contentType ?: "")
+                        gcdResponse = GCDWebServerDataResponse(response.body, response.contentType ?: "")
                     } else {
-                        val gcdResponse = GCDWebServerResponse()
+                        gcdResponse = GCDWebServerResponse()
                         gcdResponse.statusCode = response.status.toLong()
                         gcdResponse
                     }
+
+                    response.headers.forEach {
+                        gcdResponse.setValue(it.value, it.key)
+                    }
+
+                    gcdResponse
                 }
 
                 httpServer.addHandlerWithMatchBlock(