Skip to content

Reorder simple response factory fields #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EranBoudjnah merged 2 commits into from
Apr 14, 2025
Merged

Reorder simple response factory fields #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49044aa
Reordered SimpleResponseFactory fields to align with MockResponse.
EranBoudjnah Apr 14, 2025
dbf0ef3
Made bodyFileName nullable.
EranBoudjnah Apr 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions app/src/androidTest/java/com/mitteloupe/whoami/server/AppResponseStore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
)
)
}
6 changes: 3 additions & 3 deletions ...on-test/src/main/java/com/mitteloupe/whoami/test/server/response/SimpleResponseFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import com.mitteloupe.whoami.test.server.MockResponse

data class SimpleResponseFactory(
private val code: Int = 200,
private val bodyFileName: String = "",
private val headers: List<Pair<String, String>> = emptyList()
private val headers: List<Pair<String, String>> = emptyList(),
private val bodyFileName: String? = null
) : MockResponseFactory {
private val body by lazy {
if (bodyFileName.isEmpty()) {
if (bodyFileName == null) {
""
} else {
assetReader.getAssetAsString(bodyFileName)
Expand Down