Removal of useless files & bugfix

[clamp.git] / src / test / java / org / onap / clamp / clds / it / SdcIT.java

diff --git a/src/test/java/org/onap/clamp/clds/it/SdcIT.java b/src/test/java/org/onap/clamp/clds/it/SdcIT.java
index 0d8acbf..8883af2 100644 (file)
--- a/src/test/java/org/onap/clamp/clds/it/SdcIT.java
+++ b/src/test/java/org/onap/clamp/clds/it/SdcIT.java
@@ -23,65 +23,66 @@
 
 package org.onap.clamp.clds.it;
 
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import org.onap.clamp.clds.AbstractIT;
+import org.onap.clamp.clds.client.SdcCatalogServices;
 import org.onap.clamp.clds.client.req.SdcReq;
 import org.onap.clamp.clds.model.CldsEvent;
 import org.onap.clamp.clds.model.prop.ModelProperties;
-import org.onap.clamp.clds.transform.TransformUtil;
 import org.onap.clamp.clds.model.refprop.RefProp;
-import org.onap.clamp.clds.client.SdcCatalogServices;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.onap.clamp.clds.util.ResourceFileUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
-import org.junit.BeforeClass;
-import org.springframework.beans.factory.annotation.Autowired;
 
 /**
- * Test DCAE API in org.onap.clamp.ClampDesigner.client package - replicate DCAE Delegates in test.
+ * Test SDC Blueprint formater.
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest
+@TestPropertySource(locations = "classpath:application-no-camunda.properties")
 public class SdcIT extends AbstractIT {
-       @Autowired
-       private RefProp refProp;
+    @Autowired
+    private RefProp refProp;
 
-       @Autowired
-       private SdcCatalogServices sdcCatalogServices;
+    @Autowired
+    private SdcCatalogServices sdcCatalogServices;
 
     @BeforeClass
     public static void oneTimeSetUp() {
-               System.setProperty("AJSC_CONF_HOME", System.getProperty("user.dir") + "/src/test/resources/");
+        System.setProperty("AJSC_CONF_HOME", System.getProperty("user.dir") + "/src/test/resources/");
     }
 
     @Test
     public void testBlueprint() throws Exception {
-        String modelProp = TransformUtil.getResourceAsString("example/modelProp.json");
-        String modelBpmnProp = TransformUtil.getResourceAsString("example/modelBpmnProp.json");
+        String modelProp = ResourceFileUtil.getResourceAsString("example/modelProp.json");
+        String modelBpmnProp = ResourceFileUtil.getResourceAsString("example/modelBpmnProp.json");
         String modelName = "example-model06";
         String controlName = "ClosedLoop-FRWL-SIG04-1582f840-test-test-1234-005056a9d756";
-        String docText = TransformUtil.getResourceAsString("example/templateProp.json");
-        ModelProperties prop = new ModelProperties(modelName, controlName, CldsEvent.ACTION_SUBMIT, true, modelBpmnProp, modelProp);
+        String docText = ResourceFileUtil.getResourceAsString("example/templateProp.json");
+        ModelProperties prop = new ModelProperties(modelName, controlName, CldsEvent.ACTION_SUBMIT,
+                true, modelBpmnProp, modelProp);
         String blueprint = SdcReq.formatBlueprint(refProp, prop, docText);
         System.out.println("blueprint=" + blueprint);
         //assertEquals(blueprint, "");
     }
 
 
-       @Test
-       public void testTcaBlueprint() throws Exception {
-               String modelProp = TransformUtil.getResourceAsString("example/modelPropForPolicy.json");
-               String modelBpmnProp = TransformUtil.getResourceAsString("example/modelBpmnPropForPolicy.json");
-               String modelName = "example-model06";
-               String controlName = "ClosedLoop-FRWL-SIG04-1582f840-test-test-1234-005056a9d756";
-
-               String docText = TransformUtil.getResourceAsString("example/templatePropForTca.json");
-
-               ModelProperties prop = new ModelProperties(modelName, controlName, CldsEvent.ACTION_SUBMIT, true, modelBpmnProp, modelProp);
-               String blueprint = SdcReq.formatBlueprint(refProp, prop, docText);
-
-               System.out.println("blueprint=" +  blueprint);
-               //assertEquals(blueprint, "");
-       }
+    @Test
+    public void testTcaBlueprint() throws Exception {
+        String modelProp = ResourceFileUtil.getResourceAsString("example/modelPropForPolicy.json");
+        String modelBpmnProp = ResourceFileUtil.getResourceAsString("example/modelBpmnPropForPolicy.json");
+        String modelName = "example-model06";
+        String controlName = "ClosedLoop-FRWL-SIG04-1582f840-test-test-1234-005056a9d756";
+        String docText = ResourceFileUtil.getResourceAsString("example/templatePropForTca.json");
+        ModelProperties prop = new ModelProperties(modelName, controlName, CldsEvent.ACTION_SUBMIT,
+                true, modelBpmnProp, modelProp);
+        String blueprint = SdcReq.formatBlueprint(refProp, prop, docText);
+        System.out.println("blueprint=" + blueprint);
+        //assertEquals(blueprint, "");
+    }
 }