Create SVG in UI

[clamp.git] / src / test / java / org / onap / clamp / loop / LoopTemplatesServiceItCase.java

diff --git a/src/test/java/org/onap/clamp/loop/LoopTemplatesServiceItCase.java b/src/test/java/org/onap/clamp/loop/LoopTemplatesServiceItCase.java
index cabc778..b8b1144 100644 (file)
--- a/src/test/java/org/onap/clamp/loop/LoopTemplatesServiceItCase.java
+++ b/src/test/java/org/onap/clamp/loop/LoopTemplatesServiceItCase.java
@@ -55,7 +55,7 @@ public class LoopTemplatesServiceItCase {
     private static final String VERSION = "1.0.0";\r
 \r
     private LoopElementModel getLoopElementModel(String yaml, String name, String loopElementType,\r
-        String createdBy, PolicyModel policyModel) {\r
+                                                 String createdBy, PolicyModel policyModel) {\r
         LoopElementModel model = new LoopElementModel(name, loopElementType, yaml);\r
         model.setBlueprint("");\r
         model.setDcaeBlueprintId("");\r
@@ -64,16 +64,15 @@ public class LoopTemplatesServiceItCase {
     }\r
 \r
     private PolicyModel getPolicyModel(String policyType, String policyModelTosca, String version,\r
-        String policyAcronym, String createdBy) {\r
+                                       String policyAcronym, String createdBy) {\r
         return new PolicyModel(policyType, policyModelTosca, version, policyAcronym);\r
     }\r
 \r
-    private LoopTemplate getLoopTemplate(String name, String blueprint, String svgRepresentation,\r
-        String createdBy, Integer maxInstancesAllowed) {\r
+    private LoopTemplate getLoopTemplate(String name, String blueprint, String createdBy, Integer maxInstancesAllowed) {\r
         LoopTemplate template =\r
-            new LoopTemplate(name, blueprint, svgRepresentation, maxInstancesAllowed, null);\r
+                new LoopTemplate(name, blueprint, maxInstancesAllowed, null);\r
         template.addLoopElementModel(getLoopElementModel("yaml", "microService1", "MicroService",\r
-            createdBy, getPolicyModel(POLICY_MODEL_TYPE_1, "yaml", VERSION, "MS1", createdBy)));\r
+                createdBy, getPolicyModel(POLICY_MODEL_TYPE_1, "yaml", VERSION, "MS1", createdBy)));\r
         template.setAllowedLoopType(LoopType.OPEN);\r
         return template;\r
     }\r
@@ -81,9 +80,9 @@ public class LoopTemplatesServiceItCase {
     @Test\r
     @Transactional\r
     public void shouldSaveOrUpdateLoopTemplate() {\r
-        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "svg", "xyz", -1);\r
+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1);\r
         LoopTemplate actualLoopTemplate =\r
-            loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);\r
+                loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);\r
 \r
         assertNotNull(actualLoopTemplate);\r
         assertThat(loopTemplate.getName()).isEqualTo("TemplateName");\r
@@ -92,8 +91,8 @@ public class LoopTemplatesServiceItCase {
 \r
     @Test\r
     @Transactional\r
-    public void shouldReturnAllLoopemplates() {\r
-        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "svg", "xyz", -1);\r
+    public void shouldReturnAllLoopTemplates() {\r
+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1);\r
         loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);\r
         List<LoopTemplate> loopTemplateList = loopTemplatesService.getAllLoopTemplates();\r
 \r
@@ -102,8 +101,8 @@ public class LoopTemplatesServiceItCase {
 \r
     @Test\r
     @Transactional\r
-    public void shouldReturnLoopemplateNames() {\r
-        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "svg", "xyz", -1);\r
+    public void shouldReturnLoopTemplateNames() {\r
+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1);\r
         loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);\r
         List<String> loopTemplateNames = loopTemplatesService.getLoopTemplateNames();\r
 \r
@@ -113,8 +112,8 @@ public class LoopTemplatesServiceItCase {
 \r
     @Test\r
     @Transactional\r
-    public void shouldReturnLoopemplate() {\r
-        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "svg", "xyz", -1);\r
+    public void shouldReturnLoopTemplate() {\r
+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1);\r
         loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);\r
         LoopTemplate actualLoopTemplate = loopTemplatesService.getLoopTemplate("TemplateName");\r
 \r
@@ -122,33 +121,22 @@ public class LoopTemplatesServiceItCase {
         assertThat(loopTemplate).isEqualTo(actualLoopTemplate);\r
         assertThat(loopTemplate.getName()).isEqualTo(actualLoopTemplate.getName());\r
         assertThat(loopTemplate.getMaximumInstancesAllowed())\r
-            .isEqualTo(actualLoopTemplate.getMaximumInstancesAllowed());\r
+                .isEqualTo(actualLoopTemplate.getMaximumInstancesAllowed());\r
         SortedSet<LoopTemplateLoopElementModel> loopElementModelsUsed =\r
-            loopTemplate.getLoopElementModelsUsed();\r
+                loopTemplate.getLoopElementModelsUsed();\r
         LoopTemplateLoopElementModel loopTemplateLoopElementModel = loopElementModelsUsed.first();\r
         assertThat(loopTemplateLoopElementModel.getLoopElementModel().getName())\r
-            .isEqualTo("microService1");\r
+                .isEqualTo("microService1");\r
         assertThat(loopTemplateLoopElementModel.getLoopTemplate().getName())\r
-            .isEqualTo("TemplateName");\r
+                .isEqualTo("TemplateName");\r
         assertNull(actualLoopTemplate.getBlueprint());\r
         assertNull(actualLoopTemplate.getModelService());\r
     }\r
 \r
     @Test\r
     @Transactional\r
-    public void shouldReturnLoopemplateSvg() {\r
-        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "svg", "xyz", -1);\r
-        loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);\r
-        String svgRepresentation = loopTemplatesService.getSvgRepresentation("TemplateName");\r
-\r
-        assertNotNull(svgRepresentation);\r
-        assertThat(svgRepresentation).isEqualTo(loopTemplate.getSvgRepresentation());\r
-    }\r
-\r
-    @Test\r
-    @Transactional\r
-    public void shouldDeleteLoopemplate() {\r
-        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "svg", "xyz", -1);\r
+    public void shouldDeleteLoopTemplate() {\r
+        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1);\r
         loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);\r
         loopTemplatesService.deleteLoopTemplate("TemplateName");\r
         LoopTemplate actualLoopTemplate = loopTemplatesService.getLoopTemplate("TemplateName");\r