Merge pull request #319 from WhosNickDoglio/ndoglio/fix-test

Fix broken AppstoreClientTest test

Author: crc-32

android/gradle/libs.versions.toml

@@ -77,6 +77,7 @@ androidx-datastore-preferences = { module = "androidx.datastore:datastore-prefer
 koin-core = { module = "io.insert-koin:koin-core", version.ref = "koinVersion" }
 koin-android = { module = "io.insert-koin:koin-android", version.ref = "koinVersion" }
 koin-compose = { module = "io.insert-koin:koin-compose", version.ref = "koinVersion" }
+koin-test = { module = "io.insert-koin:koin-test", version.ref = "koinVersion" }
 kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutinesVersion" }
 kotlinx-coroutines-debug = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-debug", version.ref = "coroutinesVersion" }

android/shared/build.gradle.kts

@@ -87,6 +87,7 @@ kotlin {
         commonTest.dependencies {
             implementation(kotlin("test"))
             implementation(libs.ktor.client.mock)
+            implementation(libs.koin.test)
         }
     }
     room {
@@ -111,4 +112,4 @@ dependencies {
     implementation(libs.androidx.security.crypto.ktx)
     add("kspCommonMainMetadata", libs.androidx.room.compiler)
     add("kspAndroid", libs.androidx.room.compiler)
-}
+}

android/shared/src/commonTest/kotlin/io/rebble/cobble/domain/api/AppstoreClientTest.kt

@@ -1,17 +1,25 @@
 package io.rebble.cobble.domain.api
 
+import io.ktor.client.HttpClient
 import io.ktor.client.engine.mock.MockEngine
 import io.ktor.client.engine.mock.respond
+import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.http.HttpHeaders
 import io.ktor.http.HttpMethod
 import io.ktor.http.HttpStatusCode
 import io.ktor.http.headersOf
+import io.ktor.serialization.kotlinx.json.json
 import io.rebble.cobble.shared.api.AppstoreClient
 import io.rebble.libpebblecommon.util.runBlocking
+import org.koin.core.context.startKoin
+import org.koin.core.context.stopKoin
+import org.koin.dsl.module
+import org.koin.test.KoinTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
-class AppstoreClientTest {
+class AppstoreClientTest : KoinTest {
+
     @Test
     fun `Get locker data`() = runBlocking {
         val data = """
@@ -1422,29 +1430,37 @@ class AppstoreClientTest {
             when (request.url.encodedPath) {
                 "/api/v1/locker" -> {
                     if (request.headers[HttpHeaders.Authorization] != "Bearer x") {
-                        respond(
-                                "Unauthorized",
-                                status = HttpStatusCode.Unauthorized
-                        )
+                        respond("Unauthorized", status = HttpStatusCode.Unauthorized)
                     }
                     val response = when (request.method) {
                         HttpMethod.Get -> {
-                            respond(
-                                    data,
-                                    headers = headersOf(
-                                            HttpHeaders.ContentType, "application/json"
-                                    )
-                            )
+                            respond(data, headers = headersOf(HttpHeaders.ContentType, "application/json"))
                         }
+
                         else -> error("Unsupported method")
                     }
                     response
                 }
+
                 else -> error("Unhandled ${request.url.encodedPath}")
             }
         }
-        val client = AppstoreClient("https://appstore-api.rebble.io/api", "x", mockEngine)
+
+        startKoin {
+            modules(module {
+                factory {
+                    HttpClient(engine = mockEngine) {
+                        install(ContentNegotiation) {
+                            json()
+                        }
+                    }
+                }
+            })
+        }
+
+        val client = AppstoreClient("https://appstore-api.rebble.io/api", "x")
         val locker = client.getLocker()
         assertEquals(13, locker.size)
+        stopKoin()
     }
 }