refactor: Move tests to :ychat-core

Author: osugikoji

ychat/src/commonTest/kotlin/co/yml/ychat/data/infrastructure/ApiExecutorTest.kt renamed to ychat-core/src/commonTest/kotlin/co/yml/ychat/core/network/infrastructure/ApiExecutorTest.kt

@@ -1,6 +1,5 @@
-package co.yml.ychat.data.infrastructure
+package co.yml.ychat.core.network.infrastructure
 
-import io.ktor.client.HttpClient
 import io.ktor.client.engine.mock.MockEngine
 import io.ktor.client.engine.mock.respond
 import io.ktor.http.HttpHeaders
@@ -29,7 +28,7 @@ class ApiExecutorTest {
                 headers = headersOf(HttpHeaders.ContentType, "application/json")
             )
         }
-        val httpClient = HttpClient(mockEngine)
+        val httpClient = MockHttpClient(mockEngine)
         val apiExecutor = ApiExecutor(httpClient)
 
         // act
@@ -46,6 +45,39 @@ class ApiExecutorTest {
         assertEquals("This is a test", result.body)
     }
 
+    @Test
+    fun `on execute when request is multipart type then content type should be multipart type`() = runBlocking {
+        // arrange
+        var endpoint = ""
+        var httpMethod = ""
+        var contentType: String? = null
+        val mockEngine = MockEngine { request ->
+            endpoint = request.url.toString().decodeURLPart()
+            httpMethod = request.method.value
+            contentType = request.body.contentType?.contentType
+            respond(
+                content = "This is a test",
+                status = HttpStatusCode.OK,
+                headers = headersOf(HttpHeaders.ContentType, "application/json")
+            )
+        }
+        val httpClient = MockHttpClient(mockEngine)
+        val apiExecutor = ApiExecutor(httpClient)
+
+        // act
+        apiExecutor
+            .setEndpoint("api/test")
+            .setHttpMethod(HttpMethod.Post)
+            .addFormPart("key1", "value1")
+            .addFormPart("key1", "file_mock", ByteArray(100))
+            .execute<String>()
+
+        // assert
+        assertEquals("http://localhost/api/test", endpoint)
+        assertEquals("POST", httpMethod)
+        assertEquals("multipart", contentType)
+    }
+
     @Test
     fun `on execute when occurs api error then should return error as expected`() = runBlocking {
         // arrange
@@ -56,7 +88,7 @@ class ApiExecutorTest {
                 headers = headersOf(HttpHeaders.ContentType, "application/json")
             )
         }
-        val httpClient = HttpClient(mockEngine)
+        val httpClient = MockHttpClient(mockEngine)
         val apiExecutor = ApiExecutor(httpClient)
 
         // act
@@ -75,7 +107,7 @@ class ApiExecutorTest {
         val mockEngine = MockEngine {
             throw IOException("Error")
         }
-        val httpClient = HttpClient(mockEngine)
+        val httpClient = MockHttpClient(mockEngine)
         val apiExecutor = ApiExecutor(httpClient)
 
         // act

ychat/src/commonTest/kotlin/co/yml/ychat/data/infrastructure/ApiResultTest.kt renamed to ychat-core/src/commonTest/kotlin/co/yml/ychat/core/network/infrastructure/ApiResultTest.kt

@@ -1,6 +1,6 @@
-package co.yml.ychat.data.infrastructure
+package co.yml.ychat.core.network.infrastructure
 
-import co.yml.ychat.data.exception.ChatGptException
+import co.yml.ychat.core.exceptions.YChatException
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -21,7 +21,7 @@ class ApiResultTest {
     @Test
     fun `on isSuccessful when has exception then should return false`() {
         // arrange
-        val apiResult = ApiResult<String>(exception = ChatGptException())
+        val apiResult = ApiResult<String>(exception = YChatException())
 
         // act
         val result = apiResult.isSuccessful
@@ -57,7 +57,7 @@ class ApiResultTest {
     @Test
     fun `on ensureSuccess when is not successful should throw an exception`() {
         // arrange
-        val apiResult = ApiResult<String>(exception = ChatGptException())
+        val apiResult = ApiResult<String>(exception = YChatException())
 
         // act
         val result = runCatching { apiResult.ensureSuccess() }.exceptionOrNull()

ychat-core/src/commonTest/kotlin/co/yml/ychat/core/network/infrastructure/MockHttpClient.kt

@@ -0,0 +1,11 @@
+package co.yml.ychat.core.network.infrastructure
+
+import co.yml.ychat.core.network.factories.HttpClientFactory
+import io.ktor.client.HttpClient
+import io.ktor.client.engine.mock.MockEngine
+
+class MockHttpClient(private val mockEngine: MockEngine) : HttpClientFactory {
+    override fun getHttpClient(): HttpClient {
+        return HttpClient(mockEngine)
+    }
+}

ychat/src/commonTest/kotlin/co/yml/ychat/data/storage/ChatLogStorageTest.kt renamed to ychat-core/src/commonTest/kotlin/co/yml/ychat/core/storage/ChatLogStorageTest.kt

@@ -1,4 +1,4 @@
-package co.yml.ychat.data.storage
+package co.yml.ychat.core.storage
 
 import kotlin.test.BeforeTest
 import kotlin.test.Test

ychat/src/commonTest/kotlin/co/yml/ychat/di/NetworkProviderTest.kt renamed to ychat/src/commonTest/kotlin/co/yml/ychat/data/infrastructure/OpenAiHttpClientTest.kt

@@ -1,6 +1,5 @@
-package co.yml.ychat.di
+package co.yml.ychat.data.infrastructure
 
-import co.yml.ychat.di.provider.NetworkProvider
 import io.ktor.client.engine.mock.MockEngine
 import io.ktor.client.engine.mock.respond
 import io.ktor.client.request.request
@@ -12,7 +11,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlinx.coroutines.runBlocking
 
-class NetworkProviderTest {
+class OpenAiHttpClientTest {
 
     @Test
     fun `on provideHttpClient should assert default request`() {
@@ -31,7 +30,7 @@ class NetworkProviderTest {
         }
 
         // act
-        runBlocking { NetworkProvider.provideHttpClient(mockEngine, apiKey).request() }
+        runBlocking { OpenAiHttpClient(apiKey, mockEngine).getHttpClient().request() }
 
         // assert
         assertEquals("https://api.openai.com", baseUrl)

ychat/src/commonTest/kotlin/co/yml/ychat/di/LibraryModuleTest.kt

@@ -1,8 +1,9 @@
 package co.yml.ychat.di
 
+import co.yml.ychat.core.network.factories.HttpClientFactory
+import co.yml.ychat.core.network.infrastructure.ApiExecutor
+import co.yml.ychat.core.storage.ChatLogStorage
 import co.yml.ychat.data.api.ChatGptApi
-import co.yml.ychat.data.infrastructure.ApiExecutor
-import co.yml.ychat.data.storage.ChatLogStorage
 import co.yml.ychat.di.module.LibraryModule
 import co.yml.ychat.domain.usecases.AudioUseCase
 import co.yml.ychat.domain.usecases.ChatCompletionsUseCase
@@ -16,7 +17,6 @@ import co.yml.ychat.entrypoint.features.Completion
 import co.yml.ychat.entrypoint.features.Edits
 import co.yml.ychat.entrypoint.features.ImageGenerations
 import co.yml.ychat.entrypoint.features.ListModels
-import io.ktor.client.HttpClient
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test
@@ -59,7 +59,7 @@ class LibraryModuleTest : KoinTest {
 
     @Test
     fun `should inject all data modules without throwing exception`() {
-        get<HttpClient>()
+        get<HttpClientFactory>()
         get<ChatLogStorage>()
         get<ApiExecutor>()
         get<ChatGptApi>()

ychat/src/commonTest/kotlin/co/yml/ychat/domain/usecases/AudioUseCaseTest.kt

@@ -1,11 +1,11 @@
 package co.yml.ychat.domain.usecases
 
+import co.yml.ychat.core.exceptions.YChatException
+import co.yml.ychat.core.model.FileBytes
+import co.yml.ychat.core.network.infrastructure.ApiResult
 import co.yml.ychat.data.api.ChatGptApi
 import co.yml.ychat.data.dto.AudioResultDto
-import co.yml.ychat.data.exception.ChatGptException
-import co.yml.ychat.data.infrastructure.ApiResult
 import co.yml.ychat.domain.model.AudioParams
-import co.yml.ychat.domain.model.FileBytes
 import io.mockk.coEvery
 import io.mockk.mockk
 import kotlin.test.BeforeTest
@@ -47,7 +47,7 @@ class AudioUseCaseTest {
         val fileName = "audio-test.m4a"
         val audioFile = ByteArray(1024) as FileBytes
         val audioParams = AudioParams()
-        val apiResult = ApiResult<AudioResultDto>(exception = ChatGptException())
+        val apiResult = ApiResult<AudioResultDto>(exception = YChatException())
         coEvery { chatGptApiMock.audioTranscriptions(any()) } returns apiResult
 
         // act
@@ -56,7 +56,7 @@ class AudioUseCaseTest {
         }
 
         // assert
-        assertEquals(true, result.exceptionOrNull() is ChatGptException)
+        assertEquals(true, result.exceptionOrNull() is YChatException)
     }
 
     @Test
@@ -82,7 +82,7 @@ class AudioUseCaseTest {
         val fileName = "audio-test.m4a"
         val audioFile = ByteArray(1024) as FileBytes
         val audioParams = AudioParams()
-        val apiResult = ApiResult<AudioResultDto>(exception = ChatGptException())
+        val apiResult = ApiResult<AudioResultDto>(exception = YChatException())
         coEvery { chatGptApiMock.audioTranslations(any()) } returns apiResult
 
         // act
@@ -91,6 +91,6 @@ class AudioUseCaseTest {
         }
 
         // assert
-        assertEquals(true, result.exceptionOrNull() is ChatGptException)
+        assertEquals(true, result.exceptionOrNull() is YChatException)
     }
 }

ychat/src/commonTest/kotlin/co/yml/ychat/domain/usecases/ChatCompletionsUseCaseTest.kt

@@ -1,12 +1,12 @@
 package co.yml.ychat.domain.usecases
 
+import co.yml.ychat.core.exceptions.YChatException
+import co.yml.ychat.core.network.infrastructure.ApiResult
 import co.yml.ychat.data.api.ChatGptApi
 import co.yml.ychat.data.dto.ChatCompletionsChoiceDto
 import co.yml.ychat.data.dto.ChatCompletionsDto
 import co.yml.ychat.data.dto.ChatMessageDto
 import co.yml.ychat.data.dto.UsageDto
-import co.yml.ychat.data.exception.ChatGptException
-import co.yml.ychat.data.infrastructure.ApiResult
 import co.yml.ychat.domain.model.ChatCompletionsParams
 import co.yml.ychat.domain.model.ChatMessage
 import io.mockk.coEvery
@@ -48,15 +48,15 @@ class ChatCompletionsUseCaseTest {
         // arrange
         val messages = arrayListOf(ChatMessage("user", "Say this is a test."))
         val params = ChatCompletionsParams(messages)
-        val apiResult = ApiResult<ChatCompletionsDto>(exception = ChatGptException())
+        val apiResult = ApiResult<ChatCompletionsDto>(exception = YChatException())
         coEvery { chatGptApiMock.chatCompletions(any()) } returns apiResult
 
         // act
         val result =
             runCatching { runBlocking { chatCompletionsUseCase.requestChatCompletions(params) } }
 
         // assert
-        assertEquals(true, result.exceptionOrNull() is ChatGptException)
+        assertEquals(true, result.exceptionOrNull() is YChatException)
     }
 
     private fun buildChatCompletionsDto(answer: String): ChatCompletionsDto {

ychat/src/commonTest/kotlin/co/yml/ychat/domain/usecases/CompletionUseCaseTest.kt

@@ -1,12 +1,12 @@
 package co.yml.ychat.domain.usecases
 
+import co.yml.ychat.core.exceptions.YChatException
+import co.yml.ychat.core.network.infrastructure.ApiResult
+import co.yml.ychat.core.storage.ChatLogStorage
 import co.yml.ychat.data.api.ChatGptApi
 import co.yml.ychat.data.dto.ChoiceDto
 import co.yml.ychat.data.dto.CompletionDto
 import co.yml.ychat.data.dto.UsageDto
-import co.yml.ychat.data.exception.ChatGptException
-import co.yml.ychat.data.infrastructure.ApiResult
-import co.yml.ychat.data.storage.ChatLogStorage
 import co.yml.ychat.domain.model.CompletionParams
 import io.mockk.coEvery
 import io.mockk.every
@@ -36,7 +36,7 @@ class CompletionUseCaseTest {
     fun `on completion when request not succeed then should remove last appended input and throw exception`() {
         // arrange
         val input = "Say this is a test."
-        val apiResult = ApiResult<CompletionDto>(exception = ChatGptException())
+        val apiResult = ApiResult<CompletionDto>(exception = YChatException())
         val completionParams = CompletionParams(prompt = input, enableChatStorage = true)
         every { chatLogStorageMock.buildChatInput(input) } returns input
         every { chatLogStorageMock.removeLastAppendedInput() } just runs
@@ -48,7 +48,7 @@ class CompletionUseCaseTest {
 
         // assert
         verify(exactly = 1) { chatLogStorageMock.removeLastAppendedInput() }
-        assertEquals(true, result.exceptionOrNull() is ChatGptException)
+        assertEquals(true, result.exceptionOrNull() is YChatException)
     }
 
     @Test

ychat/src/commonTest/kotlin/co/yml/ychat/domain/usecases/EditsUseCaseTest.kt

@@ -1,18 +1,18 @@
 package co.yml.ychat.domain.usecases
 
+import co.yml.ychat.core.exceptions.YChatException
+import co.yml.ychat.core.network.infrastructure.ApiResult
 import co.yml.ychat.data.api.ChatGptApi
 import co.yml.ychat.data.dto.EditsChoiceDto
 import co.yml.ychat.data.dto.EditsDto
 import co.yml.ychat.data.dto.UsageDto
-import co.yml.ychat.data.exception.ChatGptException
-import co.yml.ychat.data.infrastructure.ApiResult
 import co.yml.ychat.domain.model.EditsParams
 import io.mockk.coEvery
 import io.mockk.mockk
-import kotlinx.coroutines.runBlocking
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlinx.coroutines.runBlocking
 
 class EditsUseCaseTest {
 
@@ -46,15 +46,15 @@ class EditsUseCaseTest {
         // arrange
         val prompt = "text"
         val params = EditsParams(input = prompt)
-        val apiResult = ApiResult<EditsDto>(exception = ChatGptException())
+        val apiResult = ApiResult<EditsDto>(exception = YChatException())
         coEvery { chatGptApiMock.edits(any()) } returns apiResult
 
         // act
         val result =
             runCatching { runBlocking { editsUseCase.requestEdits(params) } }
 
         // assert
-        assertEquals(true, result.exceptionOrNull() is ChatGptException)
+        assertEquals(true, result.exceptionOrNull() is YChatException)
     }
 
     private fun buildEditsDto(texts: List<String>): EditsDto {