Add blueprint runtime service to validator

Change-Id: I0e4375e422b55002f1666ee9e61a1469482f77d2
Issue-ID: CCSDK-757
Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>

2 files changed, 4 insertions, 4 deletions

diff --git a/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationServiceTest.kt b/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationServiceTest.kt
index 87ebb700..191f568f 100644
--- a/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationServiceTest.kt
+++ b/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationServiceTest.kt
@@ -43,7 +43,7 @@ class ResourceAssignmentValidationServiceTest {
     fun testValidateSuccess() {

         log.info("**************** testValidateSuccess *****************")

         val assignments = JacksonUtils.getListFromClassPathFile("validation/success.json", ResourceAssignment::class.java)

-        val resourceAssignmentValidator = ResourceAssignmentValidationDefaultService()

+        val resourceAssignmentValidator = ResourceAssignmentValidationServiceImpl()

         val result = resourceAssignmentValidator.validate(assignments!!)

         Assert.assertTrue("Failed to Validate", result)

     }

@@ -52,7 +52,7 @@ class ResourceAssignmentValidationServiceTest {
     fun testValidateDuplicate() {

         log.info(" **************** testValidateDuplicate *****************")

         val assignments = JacksonUtils.getListFromClassPathFile("validation/duplicate.json", ResourceAssignment::class.java)

-        val resourceAssignmentValidator = ResourceAssignmentValidationDefaultService()

+        val resourceAssignmentValidator = ResourceAssignmentValidationServiceImpl()

         resourceAssignmentValidator.validate(assignments!!)

     }

 

@@ -60,7 +60,7 @@ class ResourceAssignmentValidationServiceTest {
     fun testValidateCyclic() {

         log.info(" ****************  testValidateCyclic *****************")

         val assignments = JacksonUtils.getListFromClassPathFile("validation/cyclic.json", ResourceAssignment::class.java)

-        val resourceAssignmentValidator = ResourceAssignmentValidationDefaultService()

+        val resourceAssignmentValidator = ResourceAssignmentValidationServiceImpl()

         resourceAssignmentValidator.validate(assignments!!)

     }

 }
\ No newline at end of file
diff --git a/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionValidationServiceTest.java b/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionValidationServiceTest.java
index ef305627..2b68585f 100644
--- a/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionValidationServiceTest.java
+++ b/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionValidationServiceTest.java
@@ -49,7 +49,7 @@ public class ResourceDefinitionValidationServiceTest {
         Assert.assertNotNull("Failed to populate dictionaryDefinition for  type", resourceDefinition);
 
         ResourceDefinitionValidationService resourceDictionaryValidationService =
-                new ResourceDefinitionDefaultValidationService(bluePrintRepoFileService);
+                new ResourceDefinitionValidationServiceImpl(bluePrintRepoFileService);
         resourceDictionaryValidationService.validate(resourceDefinition);
         Assert.assertNotNull(String.format("Failed to populate dictionaryDefinition for : %s", fileName), resourceDefinition);
     }