Remove ECOMP in headers

[clamp.git] / src / test / java / org / onap / clamp / clds / model / prop / CustomModelElementTest.java

diff --git a/src/test/java/org/onap/clamp/clds/model/prop/CustomModelElementTest.java b/src/test/java/org/onap/clamp/clds/model/prop/CustomModelElementTest.java
index 9c9cb4a..de3126a 100644 (file)
--- a/src/test/java/org/onap/clamp/clds/model/prop/CustomModelElementTest.java
+++ b/src/test/java/org/onap/clamp/clds/model/prop/CustomModelElementTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================\r
  * ONAP CLAMP\r
  * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights\r
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights\r
  *                             reserved.\r
  * ================================================================================\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
@@ -18,7 +18,7 @@
  * limitations under the License.\r
  * ============LICENSE_END============================================\r
  * ===================================================================\r
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
+ * \r
  */\r
 \r
 package org.onap.clamp.clds.model.prop;\r
@@ -27,7 +27,8 @@ import java.io.IOException;
 \r
 import org.junit.Assert;\r
 import org.junit.Test;\r
-import org.onap.clamp.clds.transform.TransformUtil;\r
+import org.onap.clamp.clds.model.properties.ModelProperties;\r
+import org.onap.clamp.clds.util.ResourceFileUtil;\r
 \r
 public class CustomModelElementTest {\r
 \r
@@ -35,33 +36,21 @@ public class CustomModelElementTest {
     }\r
 \r
     @Test\r
-    public void testNewElement() {\r
-\r
-        try {\r
-            String modelBpmnProp = TransformUtil.getResourceAsString("example/modelBpmnProp.json");\r
-            String modelProp = TransformUtil.getResourceAsString("example/modelProp.json");\r
-            String modName = "example-model-name";\r
-            String controlName = "example-control-name";\r
-\r
-            CustomModelElement customModelElement = null;\r
-\r
-            // Instantiate first, we should not have our CustomModelElement yet\r
-            ModelProperties prop = new ModelProperties(modName, controlName, null, true, modelBpmnProp, modelProp);\r
-\r
-            Assert.assertNotNull(prop);\r
-\r
-            customModelElement = prop.getType(CustomModelElement.class);\r
-\r
-            Assert.assertNull(customModelElement);\r
-\r
-            ModelProperties.registerModelElement(CustomModelElement.class, CustomModelElement.getType());\r
-\r
-            customModelElement = prop.getType(CustomModelElement.class);\r
-\r
-            Assert.assertNotNull(customModelElement);\r
-\r
-        } catch (IOException e) {\r
-            e.printStackTrace();\r
-        }\r
+    public void testCustomElement() throws IOException {\r
+        String modelBpmnProp = ResourceFileUtil.getResourceAsString("example/model-properties/custom/modelBpmn.json");\r
+        String modelProp = ResourceFileUtil\r
+                .getResourceAsString("example/model-properties/custom/modelBpmnProperties.json");\r
+        String modName = "example-model-name";\r
+        String controlName = "example-control-name";\r
+        CustomModelElement customModelElement = null;\r
+        // Instantiate first, we should not have our CustomModelElement yet\r
+        ModelProperties prop = new ModelProperties(modName, controlName, null, true, modelBpmnProp, modelProp);\r
+        Assert.assertNotNull(prop);\r
+        customModelElement = prop.getType(CustomModelElement.class);\r
+        Assert.assertNull(customModelElement);\r
+        ModelProperties.registerModelElement(CustomModelElement.class, CustomModelElement.getType());\r
+        customModelElement = prop.getType(CustomModelElement.class);\r
+        Assert.assertNotNull(customModelElement);\r
+        Assert.assertEquals("This is a test", customModelElement.getTest());\r
     }\r
 }\r