X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fclamp%2Fclds%2Ftosca%2Fupdate%2FPropertyTest.java;h=bb1929f988f2b455ed8be5c7e0878c8f7671ff10;hb=8604d37f2f6bdd011de62ec474b6883413d30348;hp=cf183af814623fed8d1c869204f574042b09be86;hpb=f0e00e7c9ea8dd15a4aacdd880aa648539caf087;p=clamp.git

diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/PropertyTest.java b/src/test/java/org/onap/clamp/clds/tosca/update/PropertyTest.java
index cf183af8..bb1929f9 100644
--- a/src/test/java/org/onap/clamp/clds/tosca/update/PropertyTest.java
+++ b/src/test/java/org/onap/clamp/clds/tosca/update/PropertyTest.java
@@ -40,11 +40,12 @@ public class PropertyTest extends TestCase {
      * @throws IOException In case of failure
      */
     public void testParseArray() throws IOException {
-        TemplateManagement templateManagement = new TemplateManagement(
+        ToscaConverterManager toscaConverterManager = new ToscaConverterManager(
                 ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml"),
-                ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.properties"));
-        Component component = templateManagement.getComponents().get("onap.datatype.controlloop.Actor");
-        Property property = component.getProperties().get("actor");
+                ResourceFileUtil.getResourceAsString("clds/tosca_update/default-tosca-types.yaml"),
+                ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
+        ToscaElement toscaElement = toscaConverterManager.getComponents().get("onap.datatype.controlloop.Actor");
+        Property property = toscaElement.getProperties().get("actor");
         JsonArray toTest = property.parseArray((ArrayList<Object>) property.getItems().get("default"));
         assertNotNull(toTest);
     }
@@ -55,12 +56,13 @@ public class PropertyTest extends TestCase {
      * @throws IOException In case of failure
      */
     public void testAddConstraintsAsJson() throws IOException {
-        TemplateManagement templateManagement = new TemplateManagement(
+        ToscaConverterManager toscaConverterManager = new ToscaConverterManager(
                 ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
-                ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.properties"));
-        Component component = templateManagement.getComponents().get("onap.datatype.controlloop.operation.Failure");
-        Property property = component.getProperties().get("category");
-        Template template = templateManagement.getTemplates().get("string");
+                ResourceFileUtil.getResourceAsString("clds/tosca_update/default-tosca-types.yaml"),
+                ResourceFileUtil.getResourceAsString("clds/tosca_update/templates.json"));
+        ToscaElement toscaElement = toscaConverterManager.getComponents().get("onap.datatype.controlloop.operation.Failure");
+        Property property = toscaElement.getProperties().get("category");
+        Template template = toscaConverterManager.getTemplates().get("string");
         JsonObject toTest = new JsonObject();
         property.addConstraintsAsJson(toTest, (ArrayList<Object>) property.getItems().get("constraints"), template);
         String test = "{\"enum\":[\"error\",\"timeout\",\"retries\",\"guard\",\"exception\"]}";