X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fclamp%2Fclds%2Ftosca%2Fupdate%2FJsonTemplateManagerTest.java;fp=src%2Ftest%2Fjava%2Forg%2Fonap%2Fclamp%2Fclds%2Ftosca%2Fupdate%2FToscaConverterManagerTest.java;h=693377ee0d416fb76654544716250c7265c48afa;hb=723de7f63f0951d0cfe7a23956cf9d00128809b1;hp=49384121556496276aeae6275ecd4748cf5b662e;hpb=774b4ba65f0d23ae34d3bddb63058796121c1ae3;p=clamp.git

diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterManagerTest.java b/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateManagerTest.java
similarity index 61%
rename from src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterManagerTest.java
rename to src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateManagerTest.java
index 49384121..693377ee 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaConverterManagerTest.java
+++ b/src/test/java/org/onap/clamp/clds/tosca/update/JsonTemplateManagerTest.java
@@ -28,9 +28,12 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import junit.framework.TestCase;
+import org.onap.clamp.clds.tosca.update.templates.JsonTemplate;
+import org.onap.clamp.clds.tosca.update.templates.JsonTemplateField;
+import org.onap.clamp.clds.tosca.update.templates.JsonTemplateManager;
 import org.onap.clamp.clds.util.ResourceFileUtil;
 
-public class ToscaConverterManagerTest extends TestCase {
+public class JsonTemplateManagerTest extends TestCase {
 
     /**
      * Test the launch translation wit operational policies.
@@ -39,17 +42,15 @@ public class ToscaConverterManagerTest extends TestCase {
      * @throws UnknownComponentException In case of failure
      */
     public void testLaunchTranslationTca() throws IOException, UnknownComponentException {
-        ToscaConverterManager toscaConverterManager =
-                new ToscaConverterManager(
+        JsonTemplateManager jsonTemplateManager =
+                new JsonTemplateManager(
                         ResourceFileUtil.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
                                 + ".policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0?"
                                 + "connectionTimeToLive=5000/.file"), ResourceFileUtil.getResourceAsString(
-                        "clds/tosca_update/default-tosca-types.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
-        assertNull(toscaConverterManager.getParseToJson());
+                        "clds/tosca-converter/default-tosca-types.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca-converter/templates.json"));
         String componentName = "onap.policies.monitoring.cdap.tca.hi.lo.app";
-        toscaConverterManager.startConversionToJson(componentName);
-        assertNotNull(toscaConverterManager.getParseToJson());
+        jsonTemplateManager.getJsonSchemaForPolicyType(componentName, null);
     }
 
     /**
@@ -59,17 +60,15 @@ public class ToscaConverterManagerTest extends TestCase {
      * @throws UnknownComponentException In case of failure
      */
     public void testLaunchTranslationFrequencyLimiter() throws IOException, UnknownComponentException {
-        ToscaConverterManager toscaConverterManager =
-                new ToscaConverterManager(
+        JsonTemplateManager jsonTemplateManager =
+                new JsonTemplateManager(
                         ResourceFileUtil.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
                                 + ".policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0?"
                                 + "connectionTimeToLive=5000/.file"), ResourceFileUtil.getResourceAsString(
-                        "clds/tosca_update/default-tosca-types.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
-        assertNull(toscaConverterManager.getParseToJson());
+                        "clds/tosca-converter/default-tosca-types.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca-converter/templates.json"));
         String componentName = "onap.policies.controlloop.guard.common.FrequencyLimiter";
-        toscaConverterManager.startConversionToJson(componentName);
-        assertNotNull(toscaConverterManager.getParseToJson());
+        jsonTemplateManager.getJsonSchemaForPolicyType(componentName, null);
     }
 
     /**
@@ -79,17 +78,15 @@ public class ToscaConverterManagerTest extends TestCase {
      * @throws UnknownComponentException In case of failure
      */
     public void testLaunchTranslationApex() throws IOException, UnknownComponentException {
-        ToscaConverterManager toscaConverterManager =
-                new ToscaConverterManager(
+        JsonTemplateManager jsonTemplateManager =
+                new JsonTemplateManager(
                         ResourceFileUtil.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
                                 + ".policies.controlloop.operational.common.Apex/versions/1.0.0?"
                                 + "connectionTimeToLive=5000/.file"), ResourceFileUtil.getResourceAsString(
-                        "clds/tosca_update/default-tosca-types.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
-        assertNull(toscaConverterManager.getParseToJson());
+                        "clds/tosca-converter/default-tosca-types.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca-converter/templates.json"));
         String componentName = "onap.policies.controlloop.operational.common.Apex";
-        toscaConverterManager.startConversionToJson(componentName);
-        assertNotNull(toscaConverterManager.getParseToJson());
+        jsonTemplateManager.getJsonSchemaForPolicyType(componentName, null);
     }
 
     /**
@@ -99,19 +96,18 @@ public class ToscaConverterManagerTest extends TestCase {
      * @throws UnknownComponentException In case of failure
      */
     public void testLaunchTranslationDrools() throws IOException, UnknownComponentException {
-        ToscaConverterManager toscaConverterManager =
-                new ToscaConverterManager(
+        JsonTemplateManager jsonTemplateManager =
+                new JsonTemplateManager(
                         ResourceFileUtil.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
                                 + ".policies.controlloop.operational.common.Drools/versions/1.0.0?"
                                 + "connectionTimeToLive=5000/.file"), ResourceFileUtil.getResourceAsString(
-                        "clds/tosca_update/default-tosca-types.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
-        assertNull(toscaConverterManager.getParseToJson());
+                        "clds/tosca-converter/default-tosca-types.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca-converter/templates.json"));
         String componentName = "onap.policies.controlloop.operational.common.Drools";
-        toscaConverterManager.startConversionToJson(componentName);
-        assertNotNull(toscaConverterManager.getParseToJson());
+        jsonTemplateManager.getJsonSchemaForPolicyType(componentName, null);
     }
 
+
     /**
      * Test the launch translation.
      *
@@ -119,15 +115,13 @@ public class ToscaConverterManagerTest extends TestCase {
      * @throws UnknownComponentException In case of failure
      */
     public void testLaunchTranslation() throws IOException, UnknownComponentException {
-        ToscaConverterManager toscaConverterManager =
-                new ToscaConverterManager(
+        JsonTemplateManager jsonTemplateManager =
+                new JsonTemplateManager(
                         ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/default-tosca-types.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
-        assertNull(toscaConverterManager.getParseToJson());
+                        ResourceFileUtil.getResourceAsString("clds/tosca-converter/default-tosca-types.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca-converter/templates.json"));
         String componentName = "onap.policies.controlloop.operational.common.Drools";
-        toscaConverterManager.startConversionToJson(componentName);
-        assertNotNull(toscaConverterManager.getParseToJson());
+        jsonTemplateManager.getJsonSchemaForPolicyType(componentName, null);
     }
 
     /**
@@ -136,18 +130,20 @@ public class ToscaConverterManagerTest extends TestCase {
      * @throws IOException In case of failure
      */
     public void testAddTemplate() throws IOException {
-        ToscaConverterManager toscaConverterManager =
-                new ToscaConverterManager(
+        JsonTemplateManager jsonTemplateManager =
+                new JsonTemplateManager(
                         ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/default-tosca-types.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
-        int count = toscaConverterManager.getTemplates().size();
-        List<TemplateField> templateFields = new ArrayList<>(Arrays.asList(new TemplateField("type"), new TemplateField("description"),
-                new TemplateField(
-                "required"),
-                new TemplateField("metadata"), new TemplateField("constraints")));
-        toscaConverterManager.addTemplate("test", templateFields);
-        assertNotSame(count, toscaConverterManager.getTemplates().size());
+                        ResourceFileUtil.getResourceAsString("clds/tosca-converter/default-tosca-types.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca-converter/templates.json"));
+        int count = jsonTemplateManager.getJsonSchemaTemplates().size();
+        List<JsonTemplateField>
+                jsonTemplateFields =
+                new ArrayList<>(Arrays.asList(new JsonTemplateField("type"), new JsonTemplateField("description"),
+                        new JsonTemplateField(
+                                "required"),
+                        new JsonTemplateField("metadata"), new JsonTemplateField("constraints")));
+        jsonTemplateManager.addTemplate("test", jsonTemplateFields);
+        assertNotSame(count, jsonTemplateManager.getJsonSchemaTemplates().size());
     }
 
     /**
@@ -156,14 +152,14 @@ public class ToscaConverterManagerTest extends TestCase {
      * @throws IOException In case of failure
      */
     public void testRemoveTemplate() throws IOException {
-        ToscaConverterManager toscaConverterManager =
-                new ToscaConverterManager(
+        JsonTemplateManager jsonTemplateManager =
+                new JsonTemplateManager(
                         ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/default-tosca-types.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
-        int count = toscaConverterManager.getTemplates().size();
-        toscaConverterManager.removeTemplate("string");
-        assertNotSame(count, toscaConverterManager.getTemplates().size());
+                        ResourceFileUtil.getResourceAsString("clds/tosca-converter/default-tosca-types.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca-converter/templates.json"));
+        int count = jsonTemplateManager.getJsonSchemaTemplates().size();
+        jsonTemplateManager.removeTemplate("string");
+        assertNotSame(count, jsonTemplateManager.getJsonSchemaTemplates().size());
     }
 
     /**
@@ -172,14 +168,15 @@ public class ToscaConverterManagerTest extends TestCase {
      * @throws IOException In case of failure
      */
     public void testUpdateTemplate() throws IOException {
-        ToscaConverterManager toscaConverterManager =
-                new ToscaConverterManager(
+        JsonTemplateManager jsonTemplateManager =
+                new JsonTemplateManager(
                         ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/default-tosca-types.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
-        int count = toscaConverterManager.getTemplates().get("integer").getTemplateFields().size();
-        toscaConverterManager.updateTemplate("integer", new TemplateField("type"), false);
-        assertNotSame(count, toscaConverterManager.getTemplates().get("integer").getTemplateFields().size());
+                        ResourceFileUtil.getResourceAsString("clds/tosca-converter/default-tosca-types.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca-converter/templates.json"));
+        int count = jsonTemplateManager.getJsonSchemaTemplates().get("integer").getJsonTemplateFields().size();
+        jsonTemplateManager.updateTemplate("integer", new JsonTemplateField("type"), false);
+        assertNotSame(count,
+                jsonTemplateManager.getJsonSchemaTemplates().get("integer").getJsonTemplateFields().size());
     }
 
     /**
@@ -188,17 +185,18 @@ public class ToscaConverterManagerTest extends TestCase {
      * @throws IOException In case of failure
      */
     public void testHasTemplate() throws IOException {
-        ToscaConverterManager toscaConverterManager =
-                new ToscaConverterManager(
+        JsonTemplateManager jsonTemplateManager =
+                new JsonTemplateManager(
                         ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/default-tosca-types.yaml"),
-                        ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
+                        ResourceFileUtil.getResourceAsString("clds/tosca-converter/default-tosca-types.yaml"),
+                        ResourceFileUtil.getResourceAsString("clds/tosca-converter/templates.json"));
         boolean has = true;
-        List<TemplateField> templateFieldsString =
-                new ArrayList<>(Arrays.asList(new TemplateField("type"), new TemplateField("description"), new TemplateField("required"),
-                        new TemplateField("metadata"), new TemplateField("constraints")));
-        Template templateTest = new Template("String", templateFieldsString);
-        has = toscaConverterManager.hasTemplate(templateTest);
+        List<JsonTemplateField> jsonTemplateFieldsString =
+                new ArrayList<>(Arrays.asList(new JsonTemplateField("type"), new JsonTemplateField("description"),
+                        new JsonTemplateField("required"),
+                        new JsonTemplateField("metadata"), new JsonTemplateField("constraints")));
+        JsonTemplate jsonTemplateTest = new JsonTemplate("String", jsonTemplateFieldsString);
+        has = jsonTemplateManager.hasTemplate(jsonTemplateTest);
         assertEquals(false, has);
     }