Fix conflicting catalog service instance names.

Change-Id: Iec330d87f9609d42c05f8d4c7c8515fa37310a6e
Issue-ID: CCSDK-1046
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>

1 files changed, 8 insertions, 3 deletions

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<BluePrintValidatorService>()
+    @Bean(name = ["bluePrintRuntimeValidatorService"])
+    open fun bluePrintRuntimeValidatorService(): BluePrintValidatorService {
+        val bluePrintValidatorService = mockk<BluePrintValidatorService>()
+        every { bluePrintValidatorService.validateBluePrints(any<String>()) } returns true
+        every { bluePrintValidatorService.validateBluePrints(any<BluePrintRuntimeService<*>>()) } returns true
+        return bluePrintValidatorService
     }