From 82753f0646ae2181baf247f51d2909058dcc3707 Mon Sep 17 00:00:00 2001 From: Brinda Santh Date: Wed, 31 Jul 2019 12:31:09 -0400 Subject: Fix conflicting catalog service instance names. Change-Id: Iec330d87f9609d42c05f8d4c7c8515fa37310a6e Issue-ID: CCSDK-1046 Signed-off-by: Brinda Santh --- .../resource/resolution/mock/MockDatabaseConfiguration.kt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'ms/blueprintsprocessor/functions') diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/mock/MockDatabaseConfiguration.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/mock/MockDatabaseConfiguration.kt index 22e043b11..7644df37a 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/mock/MockDatabaseConfiguration.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/mock/MockDatabaseConfiguration.kt @@ -15,9 +15,11 @@ */ package org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.mock +import io.mockk.every import io.mockk.mockk import org.onap.ccsdk.cds.blueprintsprocessor.db.BluePrintDBLibGenericService import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintValidatorService +import org.onap.ccsdk.cds.controllerblueprints.core.service.BluePrintRuntimeService import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration @@ -33,9 +35,12 @@ open class MockDatabaseConfiguration { @Configuration open class MockBlueprintProcessorCatalogServiceImpl { - @Bean(name = ["blueprintProcessorCatalogServiceImpl"]) - open fun createBlueprintProcessorCatalogServiceImpl(): BluePrintValidatorService { - return mockk() + @Bean(name = ["bluePrintRuntimeValidatorService"]) + open fun bluePrintRuntimeValidatorService(): BluePrintValidatorService { + val bluePrintValidatorService = mockk() + every { bluePrintValidatorService.validateBluePrints(any()) } returns true + every { bluePrintValidatorService.validateBluePrints(any>()) } returns true + return bluePrintValidatorService } -- cgit 1.2.3-korg