From 49044aae67995a40f8bc0f0aa58b58a1815cf041 Mon Sep 17 00:00:00 2001 From: Eran Boudjnah Date: Mon, 14 Apr 2025 15:14:49 +0100 Subject: [PATCH 1/2] Reordered SimpleResponseFactory fields to align with MockResponse. --- .../java/com/mitteloupe/whoami/server/AppResponseStore.kt | 7 +++++-- .../whoami/test/server/response/SimpleResponseFactory.kt | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/androidTest/java/com/mitteloupe/whoami/server/AppResponseStore.kt b/app/src/androidTest/java/com/mitteloupe/whoami/server/AppResponseStore.kt index 50ca75a4..0ca2e460 100644 --- a/app/src/androidTest/java/com/mitteloupe/whoami/server/AppResponseStore.kt +++ b/app/src/androidTest/java/com/mitteloupe/whoami/server/AppResponseStore.kt @@ -16,11 +16,14 @@ class AppResponseStore : ResponseStore() { override val internalResponseFactories = listOf( REQUEST_RESPONSE_GET_IP to MockRequestResponseFactory( request = MockRequest(IPIFY_ENDPOINT), - responseFactory = SimpleResponseFactory(200, "api/get_ip.json") + responseFactory = SimpleResponseFactory(code = 200, bodyFileName = "api/get_ip.json") ), REQUEST_RESPONSE_GET_IP_DETAILS to MockRequestResponseFactory( request = MockRequest("${IPINFO_ENDPOINT}$IP_ADDRESS/geo"), - responseFactory = SimpleResponseFactory(200, "api/get_ip_details.json") + responseFactory = SimpleResponseFactory( + code = 200, + bodyFileName = "api/get_ip_details.json" + ) ) ) } diff --git a/architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/SimpleResponseFactory.kt b/architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/SimpleResponseFactory.kt index f95cca6b..eb3c7344 100644 --- a/architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/SimpleResponseFactory.kt +++ b/architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/SimpleResponseFactory.kt @@ -5,8 +5,8 @@ import com.mitteloupe.whoami.test.server.MockResponse data class SimpleResponseFactory( private val code: Int = 200, - private val bodyFileName: String = "", - private val headers: List> = emptyList() + private val headers: List> = emptyList(), + private val bodyFileName: String = "" ) : MockResponseFactory { private val body by lazy { if (bodyFileName.isEmpty()) { From dbf0ef3690e78bb9927e31ff9b16f1f283fddde1 Mon Sep 17 00:00:00 2001 From: Eran Boudjnah Date: Mon, 14 Apr 2025 15:17:38 +0100 Subject: [PATCH 2/2] Made bodyFileName nullable. --- .../whoami/test/server/response/SimpleResponseFactory.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/SimpleResponseFactory.kt b/architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/SimpleResponseFactory.kt index eb3c7344..28540e0f 100644 --- a/architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/SimpleResponseFactory.kt +++ b/architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/SimpleResponseFactory.kt @@ -6,10 +6,10 @@ import com.mitteloupe.whoami.test.server.MockResponse data class SimpleResponseFactory( private val code: Int = 200, private val headers: List> = emptyList(), - private val bodyFileName: String = "" + private val bodyFileName: String? = null ) : MockResponseFactory { private val body by lazy { - if (bodyFileName.isEmpty()) { + if (bodyFileName == null) { "" } else { assetReader.getAssetAsString(bodyFileName)