From e0a472f1a2146b5f007378d80e10ffd9984b6130 Mon Sep 17 00:00:00 2001 From: FyloZ Date: Fri, 28 May 2021 19:21:23 -0400 Subject: [PATCH] Correction des tests --- .../dev/fyloz/colorrecipesexplorer/model/Configuration.kt | 6 ++++++ .../service/files/TouchUpKitServiceTest.kt | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/dev/fyloz/colorrecipesexplorer/model/Configuration.kt b/src/main/kotlin/dev/fyloz/colorrecipesexplorer/model/Configuration.kt index 8f971ba..9cb732c 100644 --- a/src/main/kotlin/dev/fyloz/colorrecipesexplorer/model/Configuration.kt +++ b/src/main/kotlin/dev/fyloz/colorrecipesexplorer/model/Configuration.kt @@ -42,6 +42,12 @@ data class ConfigurationEntity( override fun equals(other: Any?) = other is ConfigurationEntity && key == other.key && content == other.content + + override fun hashCode(): Int { + var result = key.hashCode() + result = 31 * result + content.hashCode() + return result + } } data class ConfigurationDto( diff --git a/src/test/kotlin/dev/fyloz/colorrecipesexplorer/service/files/TouchUpKitServiceTest.kt b/src/test/kotlin/dev/fyloz/colorrecipesexplorer/service/files/TouchUpKitServiceTest.kt index 227cbf8..cdbebf7 100644 --- a/src/test/kotlin/dev/fyloz/colorrecipesexplorer/service/files/TouchUpKitServiceTest.kt +++ b/src/test/kotlin/dev/fyloz/colorrecipesexplorer/service/files/TouchUpKitServiceTest.kt @@ -1,7 +1,10 @@ package dev.fyloz.colorrecipesexplorer.service.files import dev.fyloz.colorrecipesexplorer.config.properties.CreProperties +import dev.fyloz.colorrecipesexplorer.model.ConfigurationType +import dev.fyloz.colorrecipesexplorer.model.configuration import dev.fyloz.colorrecipesexplorer.repository.TouchUpKitRepository +import dev.fyloz.colorrecipesexplorer.service.ConfigurationService import dev.fyloz.colorrecipesexplorer.service.touchupkit.TOUCH_UP_TEXT_EN import dev.fyloz.colorrecipesexplorer.service.touchupkit.TOUCH_UP_TEXT_FR import dev.fyloz.colorrecipesexplorer.service.touchupkit.TouchUpKitServiceImpl @@ -21,7 +24,8 @@ private class TouchUpKitServiceTestContext { val creProperties = mockk { every { cacheGeneratedFiles } returns false } - val touchUpKitService = spyk(TouchUpKitServiceImpl(fileService, mockk(), touchUpKitRepository)) + val configService = mockk(relaxed = true) + val touchUpKitService = spyk(TouchUpKitServiceImpl(fileService, configService, touchUpKitRepository)) val pdfDocumentData = mockk() val pdfDocument = mockk { mockkStatic(PdfDocument::toByteArrayResource) @@ -81,6 +85,7 @@ class TouchUpKitServiceTest { every { creProperties.cacheGeneratedFiles } returns true every { fileService.exists(any()) } returns true every { fileService.read(any()) } returns pdfDocumentData + every { configService.get(ConfigurationType.TOUCH_UP_KIT_CACHE_PDF) } returns configuration(ConfigurationType.TOUCH_UP_KIT_CACHE_PDF, "true") val redResource = touchUpKitService.generateJobPdfResource(job) @@ -109,6 +114,7 @@ class TouchUpKitServiceTest { fun `cachePdfDocument() writes the given document to the FileService when cache is enabled`() { test { every { creProperties.cacheGeneratedFiles } returns true + every { configService.get(ConfigurationType.TOUCH_UP_KIT_CACHE_PDF) } returns configuration(ConfigurationType.TOUCH_UP_KIT_CACHE_PDF, "true") with(touchUpKitService) { job.cachePdfDocument(pdfDocument)