X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fclamp%2Fclds%2Ftosca%2Fupdate%2FToscaElementTest.java;h=ba8454bb227e7a9d22b0c4898b6dbef405c84733;hb=536db7b811eba341aef48a745b495da068d170eb;hp=7ffba4e0051824c58fe780490b10ff63234f6009;hpb=8604d37f2f6bdd011de62ec474b6883413d30348;p=clamp.git diff --git a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaElementTest.java b/src/test/java/org/onap/clamp/clds/tosca/update/ToscaElementTest.java index 7ffba4e0..ba8454bb 100644 --- a/src/test/java/org/onap/clamp/clds/tosca/update/ToscaElementTest.java +++ b/src/test/java/org/onap/clamp/clds/tosca/update/ToscaElementTest.java @@ -27,7 +27,9 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import junit.framework.TestCase; -import org.onap.clamp.clds.util.ResourceFileUtil; +import org.onap.clamp.clds.tosca.update.elements.ToscaElement; +import org.onap.clamp.clds.tosca.update.templates.JsonTemplateManager; +import org.onap.clamp.clds.util.ResourceFileUtils; public class ToscaElementTest extends TestCase { @@ -38,12 +40,12 @@ public class ToscaElementTest extends TestCase { */ public void testPropertiesNames() throws IOException { ArrayList reference = new ArrayList<>(Arrays.asList("actor", "operation", "target", "payload")); - ToscaConverterManager toscaConverterManager = - new ToscaConverterManager( - ResourceFileUtil.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"), - 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"); + JsonTemplateManager jsonTemplateManager = + new JsonTemplateManager( + ResourceFileUtils.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"), + ResourceFileUtils.getResourceAsString("clds/tosca-converter/default-tosca-types.yaml"), + ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json")); + ToscaElement toscaElement = jsonTemplateManager.getToscaElements().get("onap.datatype.controlloop.Actor"); assertEquals(reference, toscaElement.propertiesNames()); }