3 files changed, 52 insertions, 57 deletions
diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/common/SchemaGeneratorServiceTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/common/SchemaGeneratorServiceTest.java
index 50e94df9..f846e9a1 100644
--- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/common/SchemaGeneratorServiceTest.java
+++ b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/common/SchemaGeneratorServiceTest.java
@@ -32,7 +32,7 @@ import java.nio.charset.Charset;
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class SchemaGeneratorServiceTest {
 
-    private static Logger log = LoggerFactory.getLogger(ServiceTemplateValidationTest.class);
+    private static Logger log = LoggerFactory.getLogger(SchemaGeneratorServiceTest.class);
 
     @Test
     public void test01GenerateSwaggerData() throws Exception {
diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/common/ServiceTemplateValidationTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/common/ServiceTemplateValidationTest.java
deleted file mode 100644
index af309e21..00000000
--- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/common/ServiceTemplateValidationTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.ccsdk.apps.controllerblueprints.service.common;
-
-
-import org.apache.commons.io.IOUtils;
-import org.junit.Assert;
-import org.junit.Test;
-import org.onap.ccsdk.apps.controllerblueprints.service.utils.ConfigModelUtils;
-import org.onap.ccsdk.apps.controllerblueprints.service.validator.ServiceTemplateValidator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.charset.Charset;
-import java.util.List;
-
-public class ServiceTemplateValidationTest {
-    private static Logger log = LoggerFactory.getLogger(ServiceTemplateValidationTest.class);
-
-    @Test
-    public void testBluePrintDirs(){
-        List<String> dirs = ConfigModelUtils.getBlueprintNames("load/blueprints");
-        Assert.assertNotNull("Failed to get blueprint directories", dirs );
-        Assert.assertEquals("Failed to get actual directories",2, dirs.size() );
-    }
-
-    // @Test
-    public void validateServiceTemplate() {
-        try {
-            String file = "load/service_template/vrr-201806-test/service-template.json";
-            String serviceTemplateContent =
-                    IOUtils.toString(ServiceTemplateValidationTest.class.getClassLoader().getResourceAsStream(file),
-                            Charset.defaultCharset());
-            ServiceTemplateValidator serviceTemplateValidator = new ServiceTemplateValidator();
-            serviceTemplateValidator.validateServiceTemplate(serviceTemplateContent);
-            log.info("Validated Service Template " + serviceTemplateValidator.getMetaData());
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}
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
new file mode 100644
index 00000000..557c6dd8
--- /dev/null
+++ b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/validator/ServiceTemplateValidationTest.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright © 2017-2018 AT&T Intellectual Property.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.onap.ccsdk.apps.controllerblueprints.service.validator;
+
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.junit.Assert;
+import org.junit.Test;
+import org.onap.ccsdk.apps.controllerblueprints.service.utils.ConfigModelUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.nio.charset.Charset;
+import java.util.List;
+
+public class ServiceTemplateValidationTest {
+    private static Logger log = LoggerFactory.getLogger(ServiceTemplateValidationTest.class);
+
+    @Test
+    public void testBluePrintDirs() {
+        List<String> dirs = ConfigModelUtils.getBlueprintNames("load/blueprints");
+        Assert.assertNotNull("Failed to get blueprint directories", dirs);
+        Assert.assertEquals("Failed to get actual directories", 2, dirs.size());
+    }
+
+    @Test
+    public void validateServiceTemplate() throws Exception {
+        String file = "load/blueprints/baseconfiguration/Definitions/activation-blueprint.json";
+        String serviceTemplateContent =
+                FileUtils.readFileToString(new File(file), Charset.defaultCharset());
+        ServiceTemplateValidator serviceTemplateValidator = new ServiceTemplateValidator();
+        serviceTemplateValidator.validateServiceTemplate(serviceTemplateContent);
+        Assert.assertNotNull("Failed to validate blueprints", serviceTemplateValidator);
+    }
+}