From 1fc26f45113695290d9ae252321590a253e565c4 Mon Sep 17 00:00:00 2001
From: Jan-Niclas Struewer <j.n.struewer@gmail.com>
Date: Mon, 29 Jul 2024 11:44:09 +0200
Subject: [PATCH] test: fixed test setup error due to incorrect path in mocks
---
.../kotlin/de/fraunhofer/iem/app/tools/ort/json/OrtJson.kt | 2 +-
.../de/fraunhofer/iem/app/tools/ort/service/OrtService.kt | 3 ++-
.../fraunhofer/iem/app/tools/ort/service/OrtServiceTest.kt | 5 +----
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/ort/json/OrtJson.kt b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/ort/json/OrtJson.kt
index 5a8a6835..66702371 100644
--- a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/ort/json/OrtJson.kt
+++ b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/ort/json/OrtJson.kt
@@ -8,5 +8,5 @@ data class OrtJson(
@SerialName("code")
val code: Int,
@SerialName("result")
- val result: List<de.fraunhofer.iem.app.tools.ort.json.ResultJson> = mutableListOf()
+ val result: List<ResultJson> = mutableListOf()
)
diff --git a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/ort/service/OrtService.kt b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/ort/service/OrtService.kt
index f9a4d8a5..f00015bb 100644
--- a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/ort/service/OrtService.kt
+++ b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/ort/service/OrtService.kt
@@ -4,6 +4,7 @@ import de.fraunhofer.iem.app.configuration.OpenCodeApiProperties
import de.fraunhofer.iem.app.logger.getLogger
import de.fraunhofer.iem.app.tool.dto.CreateToolDto
import de.fraunhofer.iem.app.tool.enumeration.ToolType
+import de.fraunhofer.iem.app.tools.ort.json.OrtJson
import de.fraunhofer.iem.app.tools.ort.json.ResultJson
import de.fraunhofer.iem.app.utilities.HttpClientWrapper
import de.fraunhofer.iem.kpiCalculator.model.adapter.VulnerabilityDto
@@ -60,7 +61,7 @@ class OrtService(
logger.info("Query ORT API for repo with id $projectId")
val response: HttpResponse = httpClient.get(getToolApiPath(projectId))
- val ortJson = response.body<de.fraunhofer.iem.app.tools.ort.json.OrtJson>()
+ val ortJson = response.body<OrtJson>()
if (ortJson.code != HttpStatusCode.OK.value) {
throw Exception("ORT API returned with code ${ortJson.code}")
}
diff --git a/app/backend/src/test/kotlin/de/fraunhofer/iem/app/tools/ort/service/OrtServiceTest.kt b/app/backend/src/test/kotlin/de/fraunhofer/iem/app/tools/ort/service/OrtServiceTest.kt
index 651605aa..8df956b2 100644
--- a/app/backend/src/test/kotlin/de/fraunhofer/iem/app/tools/ort/service/OrtServiceTest.kt
+++ b/app/backend/src/test/kotlin/de/fraunhofer/iem/app/tools/ort/service/OrtServiceTest.kt
@@ -14,7 +14,6 @@ import io.ktor.serialization.kotlinx.json.*
import io.ktor.utils.io.*
import io.mockk.every
import io.mockk.mockk
-import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.test.runTest
import kotlinx.serialization.json.Json
import org.junit.jupiter.api.Test
@@ -222,7 +221,7 @@ class OrtServiceTest {
private fun createOrtService(mockEngine: MockEngine): OrtService {
val openCodeApiProperties =
- OpenCodeApiProperties("testPath/", "/de/fraunhofer/iem/adapter/ort", authApiKey = "", auth = "")
+ OpenCodeApiProperties("testPath/", "/ort", authApiKey = "", auth = "")
val toolService = mockk<ToolService>()
every { toolService.findToolByName(CreateToolDto("ORT", ToolType.ORT)) } returns ToolEntity(
name = "ORT",
@@ -241,7 +240,6 @@ class OrtServiceTest {
return OrtService(openCodeApiProperties, httpClientWrapper)
}
- @OptIn(ExperimentalCoroutinesApi::class)
@Test
fun getOrtResultsEmptyResponse() = runTest {
val mockEngine = MockEngine { request ->
@@ -270,7 +268,6 @@ class OrtServiceTest {
assert(ortResultsValid.size == 3)
}
- @OptIn(ExperimentalCoroutinesApi::class)
@Test
fun getPartiallyValidOrtResultsResponse() = runTest {
val mockEngine = MockEngine { request ->
--
GitLab