Controller Blueprints Microservice

[ccsdk/cds.git] / ms / controllerblueprints / modules / service / src / test / java / org / onap / ccsdk / apps / controllerblueprints / service / validator / ServiceTemplateValidationTest.java

diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/validator/ServiceTemplateValidationTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/validator/ServiceTemplateValidationTest.java
index 0ef5445..26fb1d3 100644 (file)
--- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/validator/ServiceTemplateValidationTest.java
+++ b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/validator/ServiceTemplateValidationTest.java
@@ -19,30 +19,53 @@ package org.onap.ccsdk.apps.controllerblueprints.service.validator;
 \r
 import org.apache.commons.io.FileUtils;\r
 import org.junit.Assert;\r
+import org.junit.Before;\r
 import org.junit.Test;\r
+import org.onap.ccsdk.apps.controllerblueprints.core.data.ServiceTemplate;\r
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;\r
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.factory.ResourceSourceMappingFactory;\r
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.utils.ResourceDictionaryTestUtils;\r
 import org.onap.ccsdk.apps.controllerblueprints.service.utils.ConfigModelUtils;\r
-import org.slf4j.Logger;\r
-import org.slf4j.LoggerFactory;\r
+import com.att.eelf.configuration.EELFLogger;\r
+import com.att.eelf.configuration.EELFManager;\r
 \r
 import java.io.File;\r
 import java.nio.charset.Charset;\r
 import java.util.List;\r
 \r
 public class ServiceTemplateValidationTest {\r
-    private static Logger log = LoggerFactory.getLogger(ServiceTemplateValidationTest.class);\r
+    private static EELFLogger log = EELFManager.getInstance().getLogger(ServiceTemplateValidationTest.class);\r
+\r
+    @Before\r
+    public void setUp(){\r
+        // Setup dummy Source Instance Mapping\r
+        ResourceDictionaryTestUtils.setUpResourceSourceMapping();\r
+    }\r
 \r
     @Test\r
     public void testBluePrintDirs() {\r
         List<String> dirs = ConfigModelUtils.getBlueprintNames("load/blueprints");\r
         Assert.assertNotNull("Failed to get blueprint directories", dirs);\r
-        Assert.assertEquals("Failed to get actual directories", 2, dirs.size());\r
+        Assert.assertEquals("Failed to get actual directories", 1, dirs.size());\r
     }\r
 \r
     @Test\r
     public void validateServiceTemplate() throws Exception {\r
-        String file = "load/blueprints/baseconfiguration/Definitions/activation-blueprint.json";\r
+        validateServiceTemplate("load/blueprints/vrr-test/Definitions/vrr-test.json");\r
+    }\r
+\r
+    @Test\r
+    public void validateEnhancedServiceTemplate() throws Exception {\r
+        ServiceTemplate serviceTemplate = JacksonUtils\r
+                .readValueFromClassPathFile("enhance/enhanced-template.json", ServiceTemplate.class);\r
+        ServiceTemplateValidator serviceTemplateValidator = new ServiceTemplateValidator();\r
+        Boolean valid = serviceTemplateValidator.validateServiceTemplate(serviceTemplate);\r
+        Assert.assertTrue("Failed to validate blueprints", valid);\r
+    }\r
+\r
+    private void validateServiceTemplate(String fileName) throws Exception {\r
         String serviceTemplateContent =\r
-                FileUtils.readFileToString(new File(file), Charset.defaultCharset());\r
+                FileUtils.readFileToString(new File(fileName), Charset.defaultCharset());\r
         ServiceTemplateValidator serviceTemplateValidator = new ServiceTemplateValidator();\r
         serviceTemplateValidator.validateServiceTemplate(serviceTemplateContent);\r
         Assert.assertNotNull("Failed to validate blueprints", serviceTemplateValidator);\r