Code Review / so.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Replaced all tabs with spaces in java and pom.xml
[so.git] / asdc-controller / src / test / java / org / onap / so / asdc / client / YamlTest.java
diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/client/YamlTest.java b/asdc-controller/src/test/java/org/onap/so/asdc/client/YamlTest.java
index ed761c7..d7316e5 100644 (file)
--- a/asdc-controller/src/test/java/org/onap/so/asdc/client/YamlTest.java
+++ b/asdc-controller/src/test/java/org/onap/so/asdc/client/YamlTest.java
@@ -22,7 +22,6 @@ package org.onap.so.asdc.client;
 
 
 import static org.junit.Assert.*;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
@@ -36,118 +35,123 @@ import org.onap.so.db.catalog.beans.HeatTemplateParam;
 
 
 public class YamlTest {
-       @Test
-       public void getYamlResourceTypeTestList() throws Exception {
-  
-                       InputStream input = new FileInputStream(new File("src/test/resources/resource-examples/simpleTest.yaml"));
-                       YamlEditor decoder = new YamlEditor (IOUtils.toByteArray(input));
-                       List<String> typeList = decoder.getYamlNestedFileResourceTypeList();
-                           
-                       assertTrue(typeList.size() == 1 && typeList.get(0).equals("file:///my_test.yaml"));
-       }
-
-       @Test
-       public void getParameterListTest() throws Exception {
-  
-                       InputStream input = new FileInputStream(new File("src/test/resources/resource-examples/simpleTest.yaml"));
-                       YamlEditor decoder = new YamlEditor (IOUtils.toByteArray(input));
-                       Set <HeatTemplateParam> paramSet = decoder.getParameterList("123456");
-                           
-                       assertTrue(paramSet.size() == 5);
-
-                       for (HeatTemplateParam param : paramSet) {
-                               if ("ip_port_snmp_manager".equals(param.getParamName()) || "cor_direct_net_name".equals(param.getParamName()) || "cor_direct_net_RT".equals(param.getParamName())) {
-                                       
-                                       assertTrue(param.isRequired()==false);
-                               } else {
-                                       
-                                       assertTrue(param.isRequired()==true);
-                               }
-                               
-                               assertTrue("string".equals(param.getParamType()));
-                       }
-       }
-       
-       @Test
-       public void addParameterListWhenEmptyTest() throws Exception {
-  
-                       InputStream input = new FileInputStream(new File("src/test/resources/resource-examples/simpleTestWithoutParam.yaml"));
-                       YamlEditor decoder = new YamlEditor (IOUtils.toByteArray(input));
-                       
-                       Set <HeatTemplateParam> newParamSet = new HashSet<>();
-                       
-                       HeatTemplateParam heatParam1 = new HeatTemplateParam();
-                       heatParam1.setHeatTemplateArtifactUuid("1");
-                       heatParam1.setParamName("testos1");
-                       heatParam1.setParamType("string");
-                       
-                       HeatTemplateParam heatParam2 = new HeatTemplateParam();
-                       heatParam2.setHeatTemplateArtifactUuid("2");
-                       heatParam2.setParamName("testos2");
-                       heatParam2.setParamType("number");
-                       
-                       newParamSet.add(heatParam1);
-                       newParamSet.add(heatParam2);
-                       
-                       decoder.addParameterList(newParamSet);
-                           
-                       Set <HeatTemplateParam> paramSet = decoder.getParameterList("123456");
-                       assertTrue(paramSet.size() == 2);
-                       
-                       assertTrue(decoder.encode().contains("testos1"));
-                       assertTrue(decoder.encode().contains("string"));
-                       assertTrue(decoder.encode().contains("testos2"));
-                       assertTrue(decoder.encode().contains("number"));
-       }
-       
-       @Test
-       public void addParameterListTest() throws Exception {
-  
-                       InputStream input = new FileInputStream(new File("src/test/resources/resource-examples/simpleTest.yaml"));
-                       YamlEditor decoder = new YamlEditor (IOUtils.toByteArray(input));
-                       
-                       Set <HeatTemplateParam> newParamSet = new HashSet<>();
-                       
-                       HeatTemplateParam heatParam1 = new HeatTemplateParam();
-                       heatParam1.setHeatTemplateArtifactUuid("1");
-                       heatParam1.setParamName("testos1");
-                       heatParam1.setParamType("string");
-                       
-                       HeatTemplateParam heatParam2 = new HeatTemplateParam();
-                       heatParam2.setHeatTemplateArtifactUuid("2");
-                       heatParam2.setParamName("testos2");
-                       heatParam2.setParamType("number");
-                       
-                       newParamSet.add(heatParam1);
-                       newParamSet.add(heatParam2);
-                       
-                       decoder.addParameterList(newParamSet);
-                           
-                       Set <HeatTemplateParam> paramSet = decoder.getParameterList("123456");
-                       
-                       assertTrue(paramSet.size() == 7);
-                       
-                       Boolean check1 = Boolean.FALSE;
-                       Boolean check2 = Boolean.FALSE;
-                       
-                       for (HeatTemplateParam param : paramSet) {
-                               if ("ip_port_snmp_manager".equals(param.getParamName()) || "cor_direct_net_name".equals(param.getParamName()) || "cor_direct_net_RT".equals(param.getParamName())) {
-                                       assertFalse(param.isRequired());
-                               } else {
-                                       assertTrue(param.isRequired());
-                               }
-                               
-                               if ("testos1".equals(param.getParamName()) && "string".equals(param.getParamType())) {
-                                       check1=Boolean.TRUE;
-                               }
-
-                               if ("testos2".equals(param.getParamName()) && "number".equals(param.getParamType())) {
-                                       check2=Boolean.TRUE;
-                               }
-
-                       }
-                       
-                       assertTrue(check1);
-                       assertTrue(check2);
-       }
+    @Test
+    public void getYamlResourceTypeTestList() throws Exception {
+
+        InputStream input = new FileInputStream(new File("src/test/resources/resource-examples/simpleTest.yaml"));
+        YamlEditor decoder = new YamlEditor(IOUtils.toByteArray(input));
+        List<String> typeList = decoder.getYamlNestedFileResourceTypeList();
+
+        assertTrue(typeList.size() == 1 && typeList.get(0).equals("file:///my_test.yaml"));
+    }
+
+    @Test
+    public void getParameterListTest() throws Exception {
+
+        InputStream input = new FileInputStream(new File("src/test/resources/resource-examples/simpleTest.yaml"));
+        YamlEditor decoder = new YamlEditor(IOUtils.toByteArray(input));
+        Set<HeatTemplateParam> paramSet = decoder.getParameterList("123456");
+
+        assertTrue(paramSet.size() == 5);
+
+        for (HeatTemplateParam param : paramSet) {
+            if ("ip_port_snmp_manager".equals(param.getParamName())
+                    || "cor_direct_net_name".equals(param.getParamName())
+                    || "cor_direct_net_RT".equals(param.getParamName())) {
+
+                assertTrue(param.isRequired() == false);
+            } else {
+
+                assertTrue(param.isRequired() == true);
+            }
+
+            assertTrue("string".equals(param.getParamType()));
+        }
+    }
+
+    @Test
+    public void addParameterListWhenEmptyTest() throws Exception {
+
+        InputStream input =
+                new FileInputStream(new File("src/test/resources/resource-examples/simpleTestWithoutParam.yaml"));
+        YamlEditor decoder = new YamlEditor(IOUtils.toByteArray(input));
+
+        Set<HeatTemplateParam> newParamSet = new HashSet<>();
+
+        HeatTemplateParam heatParam1 = new HeatTemplateParam();
+        heatParam1.setHeatTemplateArtifactUuid("1");
+        heatParam1.setParamName("testos1");
+        heatParam1.setParamType("string");
+
+        HeatTemplateParam heatParam2 = new HeatTemplateParam();
+        heatParam2.setHeatTemplateArtifactUuid("2");
+        heatParam2.setParamName("testos2");
+        heatParam2.setParamType("number");
+
+        newParamSet.add(heatParam1);
+        newParamSet.add(heatParam2);
+
+        decoder.addParameterList(newParamSet);
+
+        Set<HeatTemplateParam> paramSet = decoder.getParameterList("123456");
+        assertTrue(paramSet.size() == 2);
+
+        assertTrue(decoder.encode().contains("testos1"));
+        assertTrue(decoder.encode().contains("string"));
+        assertTrue(decoder.encode().contains("testos2"));
+        assertTrue(decoder.encode().contains("number"));
+    }
+
+    @Test
+    public void addParameterListTest() throws Exception {
+
+        InputStream input = new FileInputStream(new File("src/test/resources/resource-examples/simpleTest.yaml"));
+        YamlEditor decoder = new YamlEditor(IOUtils.toByteArray(input));
+
+        Set<HeatTemplateParam> newParamSet = new HashSet<>();
+
+        HeatTemplateParam heatParam1 = new HeatTemplateParam();
+        heatParam1.setHeatTemplateArtifactUuid("1");
+        heatParam1.setParamName("testos1");
+        heatParam1.setParamType("string");
+
+        HeatTemplateParam heatParam2 = new HeatTemplateParam();
+        heatParam2.setHeatTemplateArtifactUuid("2");
+        heatParam2.setParamName("testos2");
+        heatParam2.setParamType("number");
+
+        newParamSet.add(heatParam1);
+        newParamSet.add(heatParam2);
+
+        decoder.addParameterList(newParamSet);
+
+        Set<HeatTemplateParam> paramSet = decoder.getParameterList("123456");
+
+        assertTrue(paramSet.size() == 7);
+
+        Boolean check1 = Boolean.FALSE;
+        Boolean check2 = Boolean.FALSE;
+
+        for (HeatTemplateParam param : paramSet) {
+            if ("ip_port_snmp_manager".equals(param.getParamName())
+                    || "cor_direct_net_name".equals(param.getParamName())
+                    || "cor_direct_net_RT".equals(param.getParamName())) {
+                assertFalse(param.isRequired());
+            } else {
+                assertTrue(param.isRequired());
+            }
+
+            if ("testos1".equals(param.getParamName()) && "string".equals(param.getParamType())) {
+                check1 = Boolean.TRUE;
+            }
+
+            if ("testos2".equals(param.getParamName()) && "number".equals(param.getParamType())) {
+                check2 = Boolean.TRUE;
+            }
+
+        }
+
+        assertTrue(check1);
+        assertTrue(check2);
+    }
 }
Service Orchestrator