From f53ca1083b69c93ad506fadfbebb693a31b8be9d Mon Sep 17 00:00:00 2001 From: Mohamad Jaara Date: Tue, 7 Jan 2025 13:08:30 +0100 Subject: [PATCH] fix tests --- .../com/wire/kalium/mocks/responses/ClientResponseJson.kt | 8 +++++--- .../com/wire/kalium/api/v0/user/client/ClientApiV0Test.kt | 8 ++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/mocks/src/commonMain/kotlin/com/wire/kalium/mocks/responses/ClientResponseJson.kt b/mocks/src/commonMain/kotlin/com/wire/kalium/mocks/responses/ClientResponseJson.kt index d3d7e0010e1..0d557d1aef8 100644 --- a/mocks/src/commonMain/kotlin/com/wire/kalium/mocks/responses/ClientResponseJson.kt +++ b/mocks/src/commonMain/kotlin/com/wire/kalium/mocks/responses/ClientResponseJson.kt @@ -22,6 +22,8 @@ import com.wire.kalium.network.api.authenticated.client.ClientCapabilityDTO import com.wire.kalium.network.api.authenticated.client.ClientDTO import com.wire.kalium.network.api.authenticated.client.ClientTypeDTO import com.wire.kalium.network.api.authenticated.client.DeviceTypeDTO +import com.wire.kalium.network.tools.KtxSerializer +import kotlinx.serialization.encodeToString object ClientResponseJson { private val jsonProvider = { serializable: ClientDTO -> @@ -36,7 +38,7 @@ object ClientResponseJson { | "cookie": "${serializable.cookie}", | "model": "${serializable.model}", | "capabilities": [ - | "${serializable.capabilities[0]}" + | ${KtxSerializer.json.encodeToString(serializable.capabilities[0])} | ], | "mls_public_keys": ${serializable.mlsPublicKeys} |} @@ -57,9 +59,9 @@ object ClientResponseJson { | "model": "${serializable.model}", | "capabilities": { | "capabilities": [ - | "${serializable.capabilities[0]}" + | ${KtxSerializer.json.encodeToString(serializable.capabilities[0])} | ] - | } + | }, | "mls_public_keys": ${serializable.mlsPublicKeys} |} """.trimMargin() diff --git a/network/src/commonTest/kotlin/com/wire/kalium/api/v0/user/client/ClientApiV0Test.kt b/network/src/commonTest/kotlin/com/wire/kalium/api/v0/user/client/ClientApiV0Test.kt index 574ef891390..59635e69549 100644 --- a/network/src/commonTest/kotlin/com/wire/kalium/api/v0/user/client/ClientApiV0Test.kt +++ b/network/src/commonTest/kotlin/com/wire/kalium/api/v0/user/client/ClientApiV0Test.kt @@ -64,8 +64,12 @@ internal class ClientApiV0Test : ApiTest() { @Test fun givenAValidRegisterClientRequest_whenCallingTheRegisterClientEndpointWithOldFormat_theRequestShouldBeConfiguredCorrectly() = runTest { + + val rowJson = VALID_REGISTER_CLIENT_OLD_RESPONSE.rawJson + val data = VALID_REGISTER_CLIENT_OLD_RESPONSE.serializableData + val networkClient = mockAuthenticatedNetworkClient( - VALID_REGISTER_CLIENT_OLD_RESPONSE.rawJson, + rowJson, statusCode = HttpStatusCode.Created, assertion = { assertPost() @@ -77,7 +81,7 @@ internal class ClientApiV0Test : ApiTest() { val clientApi: ClientApi = ClientApiV0(networkClient) val response = clientApi.registerClient(REGISTER_CLIENT_REQUEST.serializableData) assertTrue(response.isSuccessful()) - assertEquals(VALID_REGISTER_CLIENT_OLD_RESPONSE.serializableData, response.value) + assertEquals(data, response.value) } @Test