summaryrefslogtreecommitdiffstats
path: root/appc-config/appc-config-audit/provider/src
diff options
context:
space:
mode:
Diffstat (limited to 'appc-config/appc-config-audit/provider/src')
-rw-r--r--appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeCli.java94
-rw-r--r--appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeJson.java65
-rw-r--r--appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeXml.java116
3 files changed, 93 insertions, 182 deletions
diff --git a/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeCli.java b/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeCli.java
index ad1112ffc..337bc6508 100644
--- a/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeCli.java
+++ b/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeCli.java
@@ -30,71 +30,41 @@ import org.slf4j.LoggerFactory;
import org.openecomp.sdnc.sli.SvcLogicContext;
import org.openecomp.sdnc.sli.SvcLogicException;
-public class TestCompareNodeCli
-{
-private static final Logger log = LoggerFactory.getLogger(TestCompareNodeCli.class);
-
+public class TestCompareNodeCli {
+ private static final Logger log = LoggerFactory.getLogger(TestCompareNodeCli.class);
-//@Test
- public void TestCompareCliForSamePayload()
- {
- SvcLogicContext ctx = new SvcLogicContext();
- HashMap<String, String> testMap = new HashMap<String, String>();
- CompareNode cmp = new CompareNode();
- try
- {
- testMap.put("compareDataType", "Cli");
- testMap.put("sourceData", "This is a Text Configuration of Device");
- testMap.put("targetData", "This is a Text Configuration of Device");
- cmp.compare(testMap, ctx);
- assert(ctx.getAttribute("STATUS").equals("SUCCESS"));
- }
- catch (SvcLogicException e)
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ @Test
+ public void TestCompareCliForSamePayload() throws SvcLogicException {
+ SvcLogicContext ctx = new SvcLogicContext();
+ HashMap<String, String> testMap = new HashMap<String, String>();
+ CompareNode cmp = new CompareNode();
+ testMap.put("compareDataType", "Cli");
+ testMap.put("sourceData", "This is a Text Configuration of Device");
+ testMap.put("targetData", "This is a Text Configuration of Device");
+ cmp.compare(testMap, ctx);
+ assert (ctx.getAttribute("STATUS").equals("SUCCESS"));
}
- //@Test
- public void TestCompareCliFordifferentPayload()
- {
- SvcLogicContext ctx = new SvcLogicContext();
- HashMap<String, String> testMap = new HashMap<String, String>();
- CompareNode cmp = new CompareNode();
- try
- {
- testMap.put("compareDataType", "Cli");
- testMap.put("sourceData", "This is a Text Negative test Configuration of Device");
- testMap.put("targetData", "This is a Text Configuration of Device");
- cmp.compare(testMap, ctx);
- assert(ctx.getAttribute("STATUS").equals("FAILURE"));
- }
- catch (SvcLogicException e)
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ @Test
+ public void TestCompareCliFordifferentPayload() throws SvcLogicException {
+ SvcLogicContext ctx = new SvcLogicContext();
+ HashMap<String, String> testMap = new HashMap<String, String>();
+ CompareNode cmp = new CompareNode();
+ testMap.put("compareDataType", "Cli");
+ testMap.put("sourceData", "This is a Text Negative test Configuration of Device");
+ testMap.put("targetData", "This is a Text Configuration of Device");
+ cmp.compare(testMap, ctx);
+ assert (ctx.getAttribute("STATUS").equals("FAILURE"));
}
-
- //@Test
- public void TestCompareForMissingInput()
- {
- SvcLogicContext ctx = new SvcLogicContext();
- HashMap<String, String> testMap = new HashMap<String, String>();
- CompareNode cmp = new CompareNode();
- try
- {
- // testMap.put("compareDataType", "Cli"); Missing compareDataType from the input
- testMap.put("sourceData", "This is a Text Negative test Configuration of Device");
- testMap.put("targetData.configuration-data", "This is a Text Configuration of Device");
- cmp.compare(testMap, ctx);
- assert(ctx.getAttribute("STATUS").equals("FAILURE"));
- }
- catch (SvcLogicException e)
- {
- assert(ctx.getAttribute("STATUS").equals("FAILURE"));
- }
+
+ @Test
+ public void TestCompareForMissingInput() throws SvcLogicException {
+ SvcLogicContext ctx = new SvcLogicContext();
+ HashMap<String, String> testMap = new HashMap<String, String>();
+ CompareNode cmp = new CompareNode();
+ testMap.put("sourceData", "This is a Text Negative test Configuration of Device");
+ testMap.put("targetData.configuration-data", "This is a Text Configuration of Device");
+ cmp.compare(testMap, ctx);
+ assert (ctx.getAttribute("STATUS").equals("FAILURE"));
}
-
}
diff --git a/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeJson.java b/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeJson.java
index cb1fd3795..19e386558 100644
--- a/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeJson.java
+++ b/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeJson.java
@@ -30,51 +30,34 @@ import org.slf4j.LoggerFactory;
import org.openecomp.sdnc.sli.SvcLogicContext;
import org.openecomp.sdnc.sli.SvcLogicException;
-public class TestCompareNodeJson
-{
-private static final Logger log = LoggerFactory.getLogger(TestCompareNodeJson.class);
+public class TestCompareNodeJson {
+ private static final Logger log = LoggerFactory.getLogger(TestCompareNodeJson.class);
- //@Test
- public void TestCompareJsonForSamePayload()
- {
- SvcLogicContext ctx = new SvcLogicContext();
+ @Test
+ public void TestCompareJsonForSamePayload() throws SvcLogicException {
+ SvcLogicContext ctx = new SvcLogicContext();
HashMap<String, String> testMap = new HashMap<String, String>();
- CompareNode cmp = new CompareNode();
- try
- {
- String controlJson = "{\n\"input\": {\n \"appc-request-header\": {\n \"svc-request-id\": \"000000000\", \n \"svc-action\": \"prepare\" \n }, \n\"request-information\": {\n \"request-id\": \"000000000\", \n\"request-action\": \"VsbgServiceActivateRequest\", \n\"request-sub-action\": \"PREPARE\", \n \"source\": \"Version2\" \n} \n} \n}";
- String testJson = "{\n\"input\": {\n \"appc-request-header\": {\n \"svc-request-id\": \"000000000\", \n \"svc-action\": \"prepare\" \n }, \n\"request-information\": {\n \"request-id\": \"000000000\", \n\"request-action\": \"VsbgServiceActivateRequest\", \n\"request-sub-action\": \"PREPARE\", \n \"source\": \"Version2\" \n} \n} \n}";
- testMap.put("compareDataType", "RestConf");
- testMap.put("sourceData", controlJson);
- testMap.put("targetData", testJson);
- cmp.compare(testMap, ctx);
- assert(ctx.getAttribute("STATUS").equals("SUCCESS"));
- }
- catch (SvcLogicException e)
- {
- e.printStackTrace();
- }
+ CompareNode cmp = new CompareNode();
+ String controlJson = "{\n\"input\": {\n \"appc-request-header\": {\n \"svc-request-id\": \"000000000\", \n \"svc-action\": \"prepare\" \n }, \n\"request-information\": {\n \"request-id\": \"000000000\", \n\"request-action\": \"VsbgServiceActivateRequest\", \n\"request-sub-action\": \"PREPARE\", \n \"source\": \"Version2\" \n} \n} \n}";
+ String testJson = "{\n\"input\": {\n \"appc-request-header\": {\n \"svc-request-id\": \"000000000\", \n \"svc-action\": \"prepare\" \n }, \n\"request-information\": {\n \"request-id\": \"000000000\", \n\"request-action\": \"VsbgServiceActivateRequest\", \n\"request-sub-action\": \"PREPARE\", \n \"source\": \"Version2\" \n} \n} \n}";
+ testMap.put("compareDataType", "RestConf");
+ testMap.put("sourceData", controlJson);
+ testMap.put("targetData", testJson);
+ cmp.compare(testMap, ctx);
+ assert (ctx.getAttribute("STATUS").equals("SUCCESS"));
}
- //@Test
- public void TestCompareJsonFordifferentPayload()
- {
- SvcLogicContext ctx = new SvcLogicContext();
+ @Test
+ public void TestCompareJsonFordifferentPayload() throws SvcLogicException {
+ SvcLogicContext ctx = new SvcLogicContext();
HashMap<String, String> testMap = new HashMap<String, String>();
- CompareNode cmp = new CompareNode();
- try
- {
- String controlJson = "{\n\"input\": {\n \"appc-request-header\": {\n \"svc-request-id\": \"000000000\", \n \"svc-action\": \"prepare\" \n }, \n\"request-information\": {\n \"request-id\": \"000000000\", \n\"request-action\": \"VsbgServiceActivateRequest\", \n\"request-sub-action\": \"PREPARE\", \n \"source\": \"Version2\" \n} \n} \n}";
- String testJson = "{\n\"input\": {\n \"appc-request-header\": { \n \"svc-action\": \"prepare\" \n }, \n\"request-information\": {\n \"request-id\": \"0000000000\", \n\"request-action\": \"VsbgServiceActivateRequest\", \n\"request-sub-action\": \"PREPARE\", \n \"source\": \"Version2\" \n} \n} \n}";
- testMap.put("compareDataType", "RestConf");
- testMap.put("sourceData", controlJson);
- testMap.put("targetData", testJson);
- cmp.compare(testMap, ctx);
- assert(ctx.getAttribute("STATUS").equals("FAILURE"));
- }
- catch (SvcLogicException e)
- {
- e.printStackTrace();
- }
+ CompareNode cmp = new CompareNode();
+ String controlJson = "{\n\"input\": {\n \"appc-request-header\": {\n \"svc-request-id\": \"000000000\", \n \"svc-action\": \"prepare\" \n }, \n\"request-information\": {\n \"request-id\": \"000000000\", \n\"request-action\": \"VsbgServiceActivateRequest\", \n\"request-sub-action\": \"PREPARE\", \n \"source\": \"Version2\" \n} \n} \n}";
+ String testJson = "{\n\"input\": {\n \"appc-request-header\": { \n \"svc-action\": \"prepare\" \n }, \n\"request-information\": {\n \"request-id\": \"0000000000\", \n\"request-action\": \"VsbgServiceActivateRequest\", \n\"request-sub-action\": \"PREPARE\", \n \"source\": \"Version2\" \n} \n} \n}";
+ testMap.put("compareDataType", "RestConf");
+ testMap.put("sourceData", controlJson);
+ testMap.put("targetData", testJson);
+ cmp.compare(testMap, ctx);
+ assert (ctx.getAttribute("STATUS").equals("FAILURE"));
}
}
diff --git a/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeXml.java b/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeXml.java
index efd23439f..0c3825bff 100644
--- a/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeXml.java
+++ b/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeXml.java
@@ -22,8 +22,6 @@ package org.openecomp.sdnc.config.audit.node;
import java.io.IOException;
import java.util.HashMap;
-import java.util.Properties;
-
import org.junit.Test;
import org.openecomp.sdnc.config.audit.node.CompareNode;
import org.slf4j.Logger;
@@ -32,96 +30,56 @@ import org.slf4j.LoggerFactory;
import org.openecomp.sdnc.sli.SvcLogicContext;
import org.openecomp.sdnc.sli.SvcLogicException;
-
-public class TestCompareNodeXml
-{
+public class TestCompareNodeXml {
private static final Logger log = LoggerFactory.getLogger(TestCompareNodeXml.class);
- //@Test
- public void TestCompareExtactXML()
- {
+ @Test
+ public void TestCompareExtactXML() throws SvcLogicException {
log.debug("TestCompareNode.TestCompareExtactXML()");
- SvcLogicContext ctx = new SvcLogicContext();
+ SvcLogicContext ctx = new SvcLogicContext();
HashMap<String, String> testMap = new HashMap<String, String>();
- CompareNode cmp = new CompareNode();
- try
- {
- String s="<configuration xmlns="
- + "\"http://xml.juniper.net/xnm/1.1/xnm\""
- + " junos:commit-seconds="
- +"\"1473957536\" "
- +"junos:commit-localtime="
- +"\"2016-09-15 16:38:56 UTC\" "
- + "junos:commit-user="
- +"\"root\""
- +"><name>Test</name></configuration>";
-
- String t ="<configuration xmlns="
- + "\"http://xml.juniper.net/xnm/1.1/xnm\""
- + " junos:commit-seconds="
- +"\"1473957536\" "
- +"junos:commit-localtime="
- +"\"2016-09-15 16:38:56 UTC\" "
- + "junos:commit-user="
- +"\"root\""
- +"><name>Test</name></configuration>";
-
- System.out.println("s=" + s);
+ CompareNode cmp = new CompareNode();
+ String s = "<configuration xmlns=" + "\"http://xml.juniper.net/xnm/1.1/xnm\"" + " junos:commit-seconds="
+ + "\"1473957536\" " + "junos:commit-localtime=" + "\"2016-09-15 16:38:56 UTC\" " + "junos:commit-user="
+ + "\"root\"" + "><name>Test</name></configuration>";
- testMap.put("compareDataType", "RESTCONF-XML");
- testMap.put("requestIdentifier", "123");
- testMap.put("sourceData", s);
- testMap.put("targetData", t);
- cmp.compare(testMap, ctx);
- assert(ctx.getAttribute("123." + "STATUS").equals("SUCCESS"));
- }
- catch (SvcLogicException e)
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ String t = "<configuration xmlns=" + "\"http://xml.juniper.net/xnm/1.1/xnm\"" + " junos:commit-seconds="
+ + "\"1473957536\" " + "junos:commit-localtime=" + "\"2016-09-15 16:38:56 UTC\" " + "junos:commit-user="
+ + "\"root\"" + "><name>Test</name></configuration>";
+ testMap.put("compareDataType", "RESTCONF-XML");
+ testMap.put("requestIdentifier", "123");
+ testMap.put("sourceData", s);
+ testMap.put("targetData", t);
+ cmp.compare(testMap, ctx);
+ assert (ctx.getAttribute("123." + "STATUS").equals("SUCCESS"));
}
- //@Test
- public void TestCompareforAttributeOrder() throws IOException
- {
+
+ @Test
+ public void TestCompareforAttributeOrder() throws IOException, SvcLogicException {
log.debug("TestCompareNode.TestCompareforAttributeOrder()");
- SvcLogicContext ctx = new SvcLogicContext();
+ SvcLogicContext ctx = new SvcLogicContext();
HashMap<String, String> testMap = new HashMap<String, String>();
- CompareNode cmp = new CompareNode();
+ CompareNode cmp = new CompareNode();
testMap.put("compareDataType", "XML");
- testMap.put("sourceData", "<SipIfTermination><id>2</id><udpPortInUse>true</udpPortInUse><udpPort>5060</udpPort><tcpPortInUse>true</tcpPortInUse><tcpPort>5060</tcpPort></SipIfTermination>");
- testMap.put("targetData", "<SipIfTermination><udpPortInUse>true</udpPortInUse><udpPort>5060</udpPort><tcpPortInUse>true</tcpPortInUse><tcpPort>5060</tcpPort><id>2</id></SipIfTermination>");
- try
- {
- cmp.compare(testMap, ctx);
- }
- catch (SvcLogicException e)
- {
- e.printStackTrace();
- }
- assert(ctx.getAttribute("STATUS").equals("SUCCESS"));
+ testMap.put("sourceData",
+ "<SipIfTermination><id>2</id><udpPortInUse>true</udpPortInUse><udpPort>5060</udpPort><tcpPortInUse>true</tcpPortInUse><tcpPort>5060</tcpPort></SipIfTermination>");
+ testMap.put("targetData",
+ "<SipIfTermination><udpPortInUse>true</udpPortInUse><udpPort>5060</udpPort><tcpPortInUse>true</tcpPortInUse><tcpPort>5060</tcpPort><id>2</id></SipIfTermination>");
+ cmp.compare(testMap, ctx);
+ assert (ctx.getAttribute("STATUS").equals("SUCCESS"));
}
- //@Test
- public void TestCompareForComments()
- {
+ @Test
+ public void TestCompareForComments() throws SvcLogicException {
log.debug("TestCompareNode.TestCompareForComments()");
- SvcLogicContext ctx = new SvcLogicContext();
+ SvcLogicContext ctx = new SvcLogicContext();
HashMap<String, String> testMap = new HashMap<String, String>();
- CompareNode cmp = new CompareNode();
-
- try
- {
- testMap.put("compareDataType", "XML");
- testMap.put("sourceData", "<SipIfTermination><id>2</id><!--this is a commnect --></SipIfTermination>");
- testMap.put("targetData", "<SipIfTermination><id>2</id></SipIfTermination>");
- cmp.compare(testMap, ctx);
- assert(ctx.getAttribute("STATUS").equals("SUCCESS"));
- }
- catch (SvcLogicException e)
- {
- e.printStackTrace();
- }
+ CompareNode cmp = new CompareNode();
+ testMap.put("compareDataType", "XML");
+ testMap.put("sourceData", "<SipIfTermination><id>2</id><!--this is a commnect --></SipIfTermination>");
+ testMap.put("targetData", "<SipIfTermination><id>2</id></SipIfTermination>");
+ cmp.compare(testMap, ctx);
+ assert (ctx.getAttribute("STATUS").equals("SUCCESS"));
}
}