Renamed MockRequestResponse to MockRequestResponseFactory.

Author: EranBoudjnah

app/src/androidTest/java/com/mitteloupe/whoami/server/AppResponseStore.kt

@@ -2,7 +2,7 @@ package com.mitteloupe.whoami.server
 
 import com.mitteloupe.whoami.constant.IP_ADDRESS
 import com.mitteloupe.whoami.test.server.MockRequest
-import com.mitteloupe.whoami.test.server.MockRequestResponse
+import com.mitteloupe.whoami.test.server.MockRequestResponseFactory
 import com.mitteloupe.whoami.test.server.ResponseStore
 import com.mitteloupe.whoami.test.server.response.SimpleResponseFactory
 
@@ -13,14 +13,14 @@ const val REQUEST_RESPONSE_GET_IP = "Get IP"
 const val REQUEST_RESPONSE_GET_IP_DETAILS = "Get IP Details"
 
 class AppResponseStore : ResponseStore() {
-    override val internalResponses = listOf(
-        REQUEST_RESPONSE_GET_IP to MockRequestResponse(
+    override val internalResponseFactories = listOf(
+        REQUEST_RESPONSE_GET_IP to MockRequestResponseFactory(
             request = MockRequest(IPIFY_ENDPOINT),
-            response = SimpleResponseFactory(200, "api/get_ip.json")
+            responseFactory = SimpleResponseFactory(200, "api/get_ip.json")
         ),
-        REQUEST_RESPONSE_GET_IP_DETAILS to MockRequestResponse(
+        REQUEST_RESPONSE_GET_IP_DETAILS to MockRequestResponseFactory(
             request = MockRequest("${IPINFO_ENDPOINT}$IP_ADDRESS/geo"),
-            response = SimpleResponseFactory(200, "api/get_ip_details.json")
+            responseFactory = SimpleResponseFactory(200, "api/get_ip_details.json")
         )
     )
 }

architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/rule/WebServerRule.kt

@@ -31,26 +31,27 @@ class WebServerRule(
         override fun evaluate() {
             val requestResponses = description.requestResponseIds()
                 .map { requestResponseId ->
-                    responseStore.responses[requestResponseId]
+                    responseStore.responseFactories[requestResponseId]
                         ?: throw IllegalArgumentException(
                             "Request/Response ID $requestResponseId not found."
                         )
                 }
 
             mockDispatchers.forEach { dispatcher ->
                 requestResponses.forEach { requestResponse ->
-                    dispatcher.bindResponse(requestResponse.request, requestResponse.response)
+                    dispatcher
+                        .bindResponse(requestResponse.request, requestResponse.responseFactory)
                 }
             }
-            val stubbedResponseKeys = requestResponses.map { requestResponse ->
-                requestResponse.request.url
-            }.toSet()
+            val stubbedResponseKeys = requestResponses
+                .map { requestResponse -> requestResponse.request.url }
+                .toSet()
 
             base.evaluate()
 
-            val usedResponseKeys = mockDispatchers.flatMap { dispatcher ->
-                dispatcher.usedEndpoints
-            }.toSet()
+            val usedResponseKeys = mockDispatchers
+                .flatMap { dispatcher -> dispatcher.usedEndpoints }
+                .toSet()
 
             val unusedResponseKeys = stubbedResponseKeys - usedResponseKeys
             check(unusedResponseKeys.isEmpty()) {

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

@@ -0,0 +1,8 @@
+package com.mitteloupe.whoami.test.server
+
+import com.mitteloupe.whoami.test.server.response.MockResponseFactory
+
+data class MockRequestResponseFactory(
+    val request: MockRequest,
+    val responseFactory: MockResponseFactory
+)

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

@@ -1,14 +1,14 @@
 package com.mitteloupe.whoami.test.server
 
-private typealias MockRequestResponsePairList = List<Pair<String, MockRequestResponse>>
-private typealias MockRequestResponseMap = Map<String, MockRequestResponse>
+private typealias MockRequestResponsePairList = List<Pair<String, MockRequestResponseFactory>>
+private typealias MockRequestResponseMap = Map<String, MockRequestResponseFactory>
 
 abstract class ResponseStore {
-    val responses by lazy {
-        internalResponses.toValidatedMap()
+    val responseFactories by lazy {
+        internalResponseFactories.toValidatedMap()
     }
 
-    protected abstract val internalResponses: List<Pair<String, MockRequestResponse>>
+    protected abstract val internalResponseFactories: List<Pair<String, MockRequestResponseFactory>>
 
     private fun MockRequestResponsePairList.toValidatedMap(): MockRequestResponseMap {
         val responses = toMap()