From 161df8a94bb3b0c34ed16fd4fdba078bd1eeef9a Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Wed, 13 Dec 2017 11:14:21 -0800 Subject: Second part of onap rename This is the second commit of the rename. The folder structure is renamed for appc-adapters and appc-config in this commit. Change-Id: Iaa2b8c937ff1ca1b5d1178128961fb115ee65d9b Signed-off-by: Patrick Brady Issue-ID: APPC-13 --- .../sdnc/config/audit/node/TestCompareNodeCli.java | 70 ++++++++++++++++++ .../config/audit/node/TestCompareNodeJson.java | 63 ++++++++++++++++ .../sdnc/config/audit/node/TestCompareNodeXml.java | 85 ++++++++++++++++++++++ .../sdnc/config/audit/node/TestCompareNodeCli.java | 70 ------------------ .../config/audit/node/TestCompareNodeJson.java | 63 ---------------- .../sdnc/config/audit/node/TestCompareNodeXml.java | 85 ---------------------- 6 files changed, 218 insertions(+), 218 deletions(-) create mode 100644 appc-config/appc-config-audit/provider/src/test/java/org/onap/sdnc/config/audit/node/TestCompareNodeCli.java create mode 100644 appc-config/appc-config-audit/provider/src/test/java/org/onap/sdnc/config/audit/node/TestCompareNodeJson.java create mode 100644 appc-config/appc-config-audit/provider/src/test/java/org/onap/sdnc/config/audit/node/TestCompareNodeXml.java delete mode 100644 appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeCli.java delete mode 100644 appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeJson.java delete mode 100644 appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeXml.java (limited to 'appc-config/appc-config-audit/provider/src/test/java/org') diff --git a/appc-config/appc-config-audit/provider/src/test/java/org/onap/sdnc/config/audit/node/TestCompareNodeCli.java b/appc-config/appc-config-audit/provider/src/test/java/org/onap/sdnc/config/audit/node/TestCompareNodeCli.java new file mode 100644 index 000000000..a35b08632 --- /dev/null +++ b/appc-config/appc-config-audit/provider/src/test/java/org/onap/sdnc/config/audit/node/TestCompareNodeCli.java @@ -0,0 +1,70 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP : APP-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.sdnc.config.audit.node; + +import java.util.HashMap; + +import org.junit.Test; +import org.openecomp.sdnc.config.audit.node.CompareNode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; + +public class TestCompareNodeCli { + private static final Logger log = LoggerFactory.getLogger(TestCompareNodeCli.class); + + @Test + public void TestCompareCliForSamePayload() throws SvcLogicException { + SvcLogicContext ctx = new SvcLogicContext(); + HashMap testMap = new HashMap(); + 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() throws SvcLogicException { + SvcLogicContext ctx = new SvcLogicContext(); + HashMap testMap = new HashMap(); + 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() throws SvcLogicException { + SvcLogicContext ctx = new SvcLogicContext(); + HashMap testMap = new HashMap(); + 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/onap/sdnc/config/audit/node/TestCompareNodeJson.java b/appc-config/appc-config-audit/provider/src/test/java/org/onap/sdnc/config/audit/node/TestCompareNodeJson.java new file mode 100644 index 000000000..aa819dffc --- /dev/null +++ b/appc-config/appc-config-audit/provider/src/test/java/org/onap/sdnc/config/audit/node/TestCompareNodeJson.java @@ -0,0 +1,63 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP : APP-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.sdnc.config.audit.node; + +import java.util.HashMap; + +import org.junit.Test; +import org.openecomp.sdnc.config.audit.node.CompareNode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; + +public class TestCompareNodeJson { + private static final Logger log = LoggerFactory.getLogger(TestCompareNodeJson.class); + + @Test + public void TestCompareJsonForSamePayload() throws SvcLogicException { + SvcLogicContext ctx = new SvcLogicContext(); + HashMap testMap = new HashMap(); + 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() throws SvcLogicException { + SvcLogicContext ctx = new SvcLogicContext(); + HashMap testMap = new HashMap(); + 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/onap/sdnc/config/audit/node/TestCompareNodeXml.java b/appc-config/appc-config-audit/provider/src/test/java/org/onap/sdnc/config/audit/node/TestCompareNodeXml.java new file mode 100644 index 000000000..ed82da83a --- /dev/null +++ b/appc-config/appc-config-audit/provider/src/test/java/org/onap/sdnc/config/audit/node/TestCompareNodeXml.java @@ -0,0 +1,85 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP : APP-C + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.openecomp.sdnc.config.audit.node; + +import java.io.IOException; +import java.util.HashMap; +import org.junit.Test; +import org.openecomp.sdnc.config.audit.node.CompareNode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; + +public class TestCompareNodeXml { + private static final Logger log = LoggerFactory.getLogger(TestCompareNodeXml.class); + + @Test + public void TestCompareExtactXML() throws SvcLogicException { + log.debug("TestCompareNode.TestCompareExtactXML()"); + SvcLogicContext ctx = new SvcLogicContext(); + HashMap testMap = new HashMap(); + CompareNode cmp = new CompareNode(); + String s = "Test"; + + String t = "Test"; + 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, SvcLogicException { + log.debug("TestCompareNode.TestCompareforAttributeOrder()"); + SvcLogicContext ctx = new SvcLogicContext(); + HashMap testMap = new HashMap(); + CompareNode cmp = new CompareNode(); + testMap.put("compareDataType", "XML"); + testMap.put("sourceData", + "2true5060true5060"); + testMap.put("targetData", + "true5060true50602"); + cmp.compare(testMap, ctx); + assert (ctx.getAttribute("STATUS").equals("SUCCESS")); + } + + @Test + public void TestCompareForComments() throws SvcLogicException { + log.debug("TestCompareNode.TestCompareForComments()"); + SvcLogicContext ctx = new SvcLogicContext(); + HashMap testMap = new HashMap(); + CompareNode cmp = new CompareNode(); + testMap.put("compareDataType", "XML"); + testMap.put("sourceData", "2"); + testMap.put("targetData", "2"); + cmp.compare(testMap, ctx); + assert (ctx.getAttribute("STATUS").equals("SUCCESS")); + } + +} 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 deleted file mode 100644 index a35b08632..000000000 --- a/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeCli.java +++ /dev/null @@ -1,70 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP : APP-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.sdnc.config.audit.node; - -import java.util.HashMap; - -import org.junit.Test; -import org.openecomp.sdnc.config.audit.node.CompareNode; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.onap.ccsdk.sli.core.sli.SvcLogicContext; -import org.onap.ccsdk.sli.core.sli.SvcLogicException; - -public class TestCompareNodeCli { - private static final Logger log = LoggerFactory.getLogger(TestCompareNodeCli.class); - - @Test - public void TestCompareCliForSamePayload() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - HashMap testMap = new HashMap(); - 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() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - HashMap testMap = new HashMap(); - 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() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - HashMap testMap = new HashMap(); - 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 deleted file mode 100644 index aa819dffc..000000000 --- a/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeJson.java +++ /dev/null @@ -1,63 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP : APP-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.sdnc.config.audit.node; - -import java.util.HashMap; - -import org.junit.Test; -import org.openecomp.sdnc.config.audit.node.CompareNode; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.onap.ccsdk.sli.core.sli.SvcLogicContext; -import org.onap.ccsdk.sli.core.sli.SvcLogicException; - -public class TestCompareNodeJson { - private static final Logger log = LoggerFactory.getLogger(TestCompareNodeJson.class); - - @Test - public void TestCompareJsonForSamePayload() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - HashMap testMap = new HashMap(); - 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() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - HashMap testMap = new HashMap(); - 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 deleted file mode 100644 index ed82da83a..000000000 --- a/appc-config/appc-config-audit/provider/src/test/java/org/openecomp/sdnc/config/audit/node/TestCompareNodeXml.java +++ /dev/null @@ -1,85 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP : APP-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.sdnc.config.audit.node; - -import java.io.IOException; -import java.util.HashMap; -import org.junit.Test; -import org.openecomp.sdnc.config.audit.node.CompareNode; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.onap.ccsdk.sli.core.sli.SvcLogicContext; -import org.onap.ccsdk.sli.core.sli.SvcLogicException; - -public class TestCompareNodeXml { - private static final Logger log = LoggerFactory.getLogger(TestCompareNodeXml.class); - - @Test - public void TestCompareExtactXML() throws SvcLogicException { - log.debug("TestCompareNode.TestCompareExtactXML()"); - SvcLogicContext ctx = new SvcLogicContext(); - HashMap testMap = new HashMap(); - CompareNode cmp = new CompareNode(); - String s = "Test"; - - String t = "Test"; - 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, SvcLogicException { - log.debug("TestCompareNode.TestCompareforAttributeOrder()"); - SvcLogicContext ctx = new SvcLogicContext(); - HashMap testMap = new HashMap(); - CompareNode cmp = new CompareNode(); - testMap.put("compareDataType", "XML"); - testMap.put("sourceData", - "2true5060true5060"); - testMap.put("targetData", - "true5060true50602"); - cmp.compare(testMap, ctx); - assert (ctx.getAttribute("STATUS").equals("SUCCESS")); - } - - @Test - public void TestCompareForComments() throws SvcLogicException { - log.debug("TestCompareNode.TestCompareForComments()"); - SvcLogicContext ctx = new SvcLogicContext(); - HashMap testMap = new HashMap(); - CompareNode cmp = new CompareNode(); - testMap.put("compareDataType", "XML"); - testMap.put("sourceData", "2"); - testMap.put("targetData", "2"); - cmp.compare(testMap, ctx); - assert (ctx.getAttribute("STATUS").equals("SUCCESS")); - } - -} -- cgit 1.2.3-korg