Renamed ServerResponse to MockResponse for consistency with request.

Simplified responses by removing unused argument.

Author: EranBoudjnah

architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/MockDispatcher.kt

@@ -33,7 +33,7 @@ class MockDispatcher :
     override fun dispatch(request: RecordedRequest): MockResponse {
         val endPoint = request.path!!.substringBefore("?")
         usedEndpoints.add(endPoint)
-        val response = responses[endPoint]?.mockResponse(this) ?: ServerResponse(code = 404)
+        val response = responses[endPoint]?.mockResponse() ?: MockResponse(code = 404)
         return if (response.upgradeToWebSocket) {
             MockResponse().withWebSocketUpgrade(
                 object : WebSocketListener() {

…upe/whoami/test/server/ServerResponse.kt …loupe/whoami/test/server/MockResponse.ktarchitecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/ServerResponse.kt renamed to architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/MockResponse.kt architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/ServerResponse.kt renamed to architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/MockResponse.kt

@@ -1,6 +1,6 @@
 package com.mitteloupe.whoami.test.server
 
-data class ServerResponse(
+data class MockResponse(
     val upgradeToWebSocket: Boolean = false,
     val code: Int = 200,
     val headers: List<Pair<String, String>> = emptyList(),

architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/ErrorResponse.kt

@@ -1,12 +1,9 @@
 package com.mitteloupe.whoami.test.server.response
 
-import com.mitteloupe.whoami.test.server.ResponseBinder
-import com.mitteloupe.whoami.test.server.ServerResponse
+import com.mitteloupe.whoami.test.server.MockResponse
 
 sealed class ErrorResponse {
     object NotFound : MockResponseContents {
-        override fun mockResponse(responseBinder: ResponseBinder) = ServerResponse(
-            code = 404
-        )
+        override fun mockResponse() = MockResponse(code = 404)
     }
 }

architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/MockResponseContents.kt

@@ -1,8 +1,7 @@
 package com.mitteloupe.whoami.test.server.response
 
-import com.mitteloupe.whoami.test.server.ResponseBinder
-import com.mitteloupe.whoami.test.server.ServerResponse
+import com.mitteloupe.whoami.test.server.MockResponse
 
 interface MockResponseContents {
-    fun mockResponse(responseBinder: ResponseBinder): ServerResponse
+    fun mockResponse(): MockResponse
 }

architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/SequenceResponse.kt

@@ -1,16 +1,15 @@
 package com.mitteloupe.whoami.test.server.response
 
-import com.mitteloupe.whoami.test.server.ResponseBinder
-import com.mitteloupe.whoami.test.server.ServerResponse
+import com.mitteloupe.whoami.test.server.MockResponse
 
 class SequenceResponse(private vararg val responses: MockResponseContents) : MockResponseContents {
     private var responseIndex = 0
-    override fun mockResponse(responseBinder: ResponseBinder): ServerResponse {
+    override fun mockResponse(): MockResponse {
         val mockResponse = responses[responseIndex]
         responseIndex++
         if (responseIndex == responses.size) {
             responseIndex = 0
         }
-        return mockResponse.mockResponse(responseBinder)
+        return mockResponse.mockResponse()
     }
 }

architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/SimpleResponse.kt

@@ -1,8 +1,7 @@
 package com.mitteloupe.whoami.test.server.response
 
 import com.mitteloupe.whoami.test.asset.assetReader
-import com.mitteloupe.whoami.test.server.ResponseBinder
-import com.mitteloupe.whoami.test.server.ServerResponse
+import com.mitteloupe.whoami.test.server.MockResponse
 
 data class SimpleResponse(
     private val code: Int = 200,
@@ -17,6 +16,5 @@ data class SimpleResponse(
         }
     }
 
-    override fun mockResponse(responseBinder: ResponseBinder) =
-        ServerResponse(code = code, headers = headers, body = body)
+    override fun mockResponse() = MockResponse(code = code, headers = headers, body = body)
 }