From 49f9de63c3d04a2f6ccd3a81e88a01febe185fd9 Mon Sep 17 00:00:00 2001 From: Takamune Cho Date: Mon, 18 Dec 2017 19:39:40 -0600 Subject: Update appc-config-generator to use onap packaging Change-Id: Ia89d9eb8f56c8ac0e46cbe1b473f7cfced32228a Issue-ID: APPC-13 Signed-off-by: Takamune Cho --- .../config/generator/convert/TestConvertNode.java | 59 ++++-- .../sdnc/config/generator/merge/TestMergeNode.java | 43 ++-- .../config/generator/pattern/TestPatternNode.java | 51 +++-- .../config/generator/reader/TestReaderNode.java | 12 +- .../sdnc/config/generator/tool/TestDataTool.java | 234 +++++++++++---------- .../transform/TestXSLTTransformerNode.java | 26 ++- .../generator/writer/TestFileWriterNode.java | 19 +- .../test/resources/convert/escape/config_vdbe.xml | 8 +- .../test/resources/merge/complex/vdbe_template.xml | 8 +- .../src/test/resources/merge/vdbe_template.xml | 8 +- .../src/test/resources/pattern/xml_data.xml | 42 ++-- .../src/test/resources/transform/request.xml | 8 +- .../src/test/resources/transform/template.xsl | 8 +- 13 files changed, 302 insertions(+), 224 deletions(-) (limited to 'appc-config/appc-config-generator/provider/src/test') diff --git a/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/convert/TestConvertNode.java b/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/convert/TestConvertNode.java index 0bfb80cf1..c0d65d2d7 100644 --- a/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/convert/TestConvertNode.java +++ b/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/convert/TestConvertNode.java @@ -1,9 +1,11 @@ /*- * ============LICENSE_START======================================================= - * ONAP : APP-C + * ONAP : APPC * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. * ================================================================================ + * Copyright (C) 2017 Amdocs + * ============================================================================= * 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 @@ -15,10 +17,12 @@ * 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. + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.config.generator.convert; +package org.onap.sdnc.config.generator.convert; import static org.junit.Assert.assertEquals; import java.io.IOException; @@ -26,17 +30,18 @@ import java.util.HashMap; import java.util.Map; import org.apache.commons.io.IOUtils; import org.junit.Test; -import org.openecomp.sdnc.config.generator.ConfigGeneratorConstant; -import org.openecomp.sdnc.config.generator.merge.TestMergeNode; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.sdnc.config.generator.ConfigGeneratorConstant; +import org.onap.sdnc.config.generator.merge.TestMergeNode; import org.powermock.reflect.Whitebox; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; public class TestConvertNode { - - private static final EELFLogger log = EELFManager.getInstance().getLogger(TestConvertNode.class); + private static final EELFLogger log = + EELFManager.getInstance().getLogger(TestConvertNode.class); + @Test(expected = Exception.class) public void testPayloadParametersConfig() throws Exception { SvcLogicContext ctx = new SvcLogicContext(); @@ -45,8 +50,10 @@ public class TestConvertNode { inParams.put(ConfigGeneratorConstant.INPUT_PARAM_BLOCK_KEYS, "configuration-parameters,configuration.configuration-json,configuration.configuration-string"); convertJson2Context("convert/payload_parameters_config.json", inParams, ctx); - Whitebox.invokeMethod("convertJson2Context", "convert/payload_parameters_config.json", inParams, ctx); - log.info("testPayloadParametersConfig Result: " + ctx.getAttribute("block_configuration-parameters")); + Whitebox.invokeMethod("convertJson2Context", "convert/payload_parameters_config.json", + inParams, ctx); + log.info("testPayloadParametersConfig Result: " + + ctx.getAttribute("block_configuration-parameters")); } @Test @@ -57,8 +64,10 @@ public class TestConvertNode { inParams.put(ConfigGeneratorConstant.INPUT_PARAM_BLOCK_KEYS, "configuration-parameters,configuration.configuration-json,configuration.configuration-string"); convertJson2Context("convert/payload_cli_config.json", inParams, ctx); - log.info("testPayloadCliConfig Result: " + ctx.getAttribute("block_configuration-parameters")); - log.info("testPayloadCliConfig Result: " + ctx.getAttribute("block_configuration.configuration-string")); + log.info("testPayloadCliConfig Result: " + + ctx.getAttribute("block_configuration-parameters")); + log.info("testPayloadCliConfig Result: " + + ctx.getAttribute("block_configuration.configuration-string")); } @Test(expected = Exception.class) @@ -69,8 +78,11 @@ public class TestConvertNode { inParams.put(ConfigGeneratorConstant.INPUT_PARAM_BLOCK_KEYS, "configuration-parameters,configuration.configuration-json,configuration.configuration-string"); convertJson2Context("convert/payload_xml_config.json", inParams, ctx); - log.info("testPayloadXMLConfig Result: " + ctx.getAttribute("block_configuration-parameters")); - log.info("testPayloadXMLConfig Result: " + ctx.getAttribute("block_configuration.configuration-string")); + + log.info("testPayloadXMLConfig Result: " + + ctx.getAttribute("block_configuration-parameters")); + log.info("testPayloadXMLConfig Result: " + + ctx.getAttribute("block_configuration.configuration-string")); } @Test(expected = Exception.class) @@ -81,15 +93,18 @@ public class TestConvertNode { inParams.put(ConfigGeneratorConstant.INPUT_PARAM_BLOCK_KEYS, "configuration-parameters,configuration.configuration-json,configuration.configuration-string"); convertJson2Context("convert/payload_json_config.json", inParams, ctx); - log.info("testPayloadJsonConfig Result: " + ctx.getAttribute("block_configuration-parameters")); - log.info("testPayloadJsonConfig Result: " + ctx.getAttribute("block_configuration.configuration-json")); + log.info("testPayloadJsonConfig Result: " + + ctx.getAttribute("block_configuration-parameters")); + log.info("testPayloadJsonConfig Result: " + + ctx.getAttribute("block_configuration.configuration-json")); } - private void convertJson2Context(String jsonFile, Map inParams, SvcLogicContext ctx) - throws IOException, SvcLogicException { + private void convertJson2Context(String jsonFile, Map inParams, + SvcLogicContext ctx) throws IOException, SvcLogicException { ConvertNode convertNode = new ConvertNode(); inParams.put(ConfigGeneratorConstant.INPUT_PARAM_RESPONSE_PRIFIX, "test"); - String jsonData = IOUtils.toString(TestMergeNode.class.getClassLoader().getResourceAsStream(jsonFile)); + String jsonData = IOUtils + .toString(TestMergeNode.class.getClassLoader().getResourceAsStream(jsonFile)); log.info("TestConvertNode.testConvertJson2DGContext()" + jsonData); inParams.put(ConfigGeneratorConstant.INPUT_PARAM_JSON_DATA, jsonData); convertNode.convertJson2DGContext(inParams, ctx); @@ -101,12 +116,13 @@ public class TestConvertNode { public void testEscapeData() throws Exception { SvcLogicContext ctx = new SvcLogicContext(); Map inParams = new HashMap(); - String unescapeData = IOUtils - .toString(TestMergeNode.class.getClassLoader().getResourceAsStream("convert/escape/config_ssc.txt")); + String unescapeData = IOUtils.toString(TestMergeNode.class.getClassLoader() + .getResourceAsStream("convert/escape/config_ssc.txt")); log.info("TestConvertNode.testEscapeData() unescapeData :" + unescapeData); inParams.put(ConfigGeneratorConstant.INPUT_PARAM_RESPONSE_PRIFIX, "test"); inParams.put(ConfigGeneratorConstant.INPUT_PARAM_UNESCAPE_DATA, unescapeData); - inParams.put(ConfigGeneratorConstant.INPUT_PARAM_DATA_TYPE, ConfigGeneratorConstant.DATA_TYPE_SQL); + inParams.put(ConfigGeneratorConstant.INPUT_PARAM_DATA_TYPE, + ConfigGeneratorConstant.DATA_TYPE_SQL); ConvertNode convertNode = new ConvertNode(); convertNode.escapeData(inParams, ctx); log.info("testEscapeData Result: " @@ -131,6 +147,7 @@ public class TestConvertNode { ConfigGeneratorConstant.OUTPUT_STATUS_SUCCESS); } + @Test(expected = Exception.class) public void testunEscapeData() throws Exception { ConvertNode convertNode = new ConvertNode(); diff --git a/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/merge/TestMergeNode.java b/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/merge/TestMergeNode.java index cd7bb9e9a..1a40abd3a 100644 --- a/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/merge/TestMergeNode.java +++ b/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/merge/TestMergeNode.java @@ -1,9 +1,11 @@ /*- * ============LICENSE_START======================================================= - * ONAP : APP-C + * ONAP : APPC * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. * ================================================================================ + * Copyright (C) 2017 Amdocs + * ============================================================================= * 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 @@ -15,20 +17,21 @@ * 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. + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.config.generator.merge; +package org.onap.sdnc.config.generator.merge; +import static org.junit.Assert.assertEquals; +import java.util.HashMap; +import java.util.Map; import org.apache.commons.io.IOUtils; import org.junit.Test; -import org.openecomp.sdnc.config.generator.ConfigGeneratorConstant; -import org.openecomp.sdnc.config.generator.merge.MergeNode; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicException; -import static org.junit.Assert.assertEquals; -import java.util.HashMap; -import java.util.Map; +import org.onap.sdnc.config.generator.ConfigGeneratorConstant; public class TestMergeNode { @@ -37,11 +40,11 @@ public class TestMergeNode { MergeNode mergeNode = new MergeNode(); Map inParams = new HashMap(); inParams.put(ConfigGeneratorConstant.INPUT_PARAM_RESPONSE_PRIFIX, "test"); - String jsonData = IOUtils - .toString(TestMergeNode.class.getClassLoader().getResourceAsStream("merge/vdbe_data.json")); + String jsonData = IOUtils.toString( + TestMergeNode.class.getClassLoader().getResourceAsStream("merge/vdbe_data.json")); inParams.put(ConfigGeneratorConstant.INPUT_PARAM_JSON_DATA, jsonData); - String templateData = IOUtils - .toString(TestMergeNode.class.getClassLoader().getResourceAsStream("merge/vdbe_template.xml")); + String templateData = IOUtils.toString(TestMergeNode.class.getClassLoader() + .getResourceAsStream("merge/vdbe_template.xml")); inParams.put(ConfigGeneratorConstant.INPUT_PARAM_TEMPLATE_DATA, templateData); SvcLogicContext ctx = new SvcLogicContext(); mergeNode.mergeJsonDataOnTemplate(inParams, ctx); @@ -55,14 +58,16 @@ public class TestMergeNode { MergeNode mergeNode = new MergeNode(); Map inParams = new HashMap(); inParams.put(ConfigGeneratorConstant.INPUT_PARAM_RESPONSE_PRIFIX, "test"); - String jsonData = IOUtils - .toString(TestMergeNode.class.getClassLoader().getResourceAsStream("merge/complex/vdbe_data.json")); + + String jsonData = IOUtils.toString(TestMergeNode.class.getClassLoader() + .getResourceAsStream("merge/complex/vdbe_data.json")); System.out.println("TestMergeNode.testMergeJsonComplexDataOnTemplate()" + jsonData); inParams.put(ConfigGeneratorConstant.INPUT_PARAM_JSON_DATA, jsonData); - String templateData = IOUtils - .toString(TestMergeNode.class.getClassLoader().getResourceAsStream("merge/complex/vdbe_template.xml")); + String templateData = IOUtils.toString(TestMergeNode.class.getClassLoader() + .getResourceAsStream("merge/complex/vdbe_template.xml")); inParams.put(ConfigGeneratorConstant.INPUT_PARAM_TEMPLATE_DATA, templateData); + SvcLogicContext ctx = new SvcLogicContext(); mergeNode.mergeComplexJsonDataOnTemplate(inParams, ctx); assertEquals(ctx.getAttribute("test." + ConfigGeneratorConstant.OUTPUT_PARAM_STATUS), @@ -75,8 +80,9 @@ public class TestMergeNode { MergeNode mergeNode = new MergeNode(); Map inParams = new HashMap(); inParams.put(ConfigGeneratorConstant.INPUT_PARAM_RESPONSE_PRIFIX, "test"); - String jsonData = IOUtils - .toString(TestMergeNode.class.getClassLoader().getResourceAsStream("merge/vdbe_data.json")); + + String jsonData = IOUtils.toString( + TestMergeNode.class.getClassLoader().getResourceAsStream("merge/vdbe_data.json")); inParams.put(ConfigGeneratorConstant.INPUT_PARAM_JSON_DATA, jsonData); inParams.put(ConfigGeneratorConstant.INPUT_PARAM_TEMPLATE_FILE, "merge/vdbe_template.xml"); @@ -85,6 +91,7 @@ public class TestMergeNode { assertEquals(ctx.getAttribute("test." + ConfigGeneratorConstant.OUTPUT_PARAM_STATUS), ConfigGeneratorConstant.OUTPUT_STATUS_SUCCESS); } + @Test public void testMmergeDataOnTemplate() throws SvcLogicException { MergeNode mergeNode = new MergeNode(); diff --git a/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/pattern/TestPatternNode.java b/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/pattern/TestPatternNode.java index db3fa7149..8211e30f9 100644 --- a/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/pattern/TestPatternNode.java +++ b/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/pattern/TestPatternNode.java @@ -1,9 +1,11 @@ /*- * ============LICENSE_START======================================================= - * ONAP : APP-C + * ONAP : APPC * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. * ================================================================================ + * Copyright (C) 2017 Amdocs + * ============================================================================= * 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 @@ -15,19 +17,20 @@ * 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. + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.config.generator.pattern; +package org.onap.sdnc.config.generator.pattern; import static org.junit.Assert.assertEquals; import java.util.HashMap; import java.util.Map; import org.apache.commons.io.IOUtils; import org.junit.Test; -import org.openecomp.sdnc.config.generator.ConfigGeneratorConstant; -import org.openecomp.sdnc.config.generator.pattern.PatternNode; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.sdnc.config.generator.ConfigGeneratorConstant; public class TestPatternNode { @@ -36,46 +39,60 @@ public class TestPatternNode { PatternNode patternNode = new PatternNode(); Map inParams = new HashMap(); inParams.put(ConfigGeneratorConstant.INPUT_PARAM_RESPONSE_PRIFIX, "test"); - String logData = IOUtils.toString(TestPatternNode.class.getClassLoader().getResourceAsStream("pattern/errorlog.txt"),ConfigGeneratorConstant.STRING_ENCODING); + String logData = IOUtils.toString( + TestPatternNode.class.getClassLoader().getResourceAsStream("pattern/errorlog.txt"), + ConfigGeneratorConstant.STRING_ENCODING); inParams.put(ConfigGeneratorConstant.INPUT_PARAM_LOG_DATA, logData); SvcLogicContext ctx = new SvcLogicContext(); patternNode.parseErrorLog(inParams, ctx); - assertEquals(ctx.getAttribute("test."+ConfigGeneratorConstant.OUTPUT_PARAM_STATUS), ConfigGeneratorConstant.OUTPUT_STATUS_SUCCESS); - - } -// @Test(expected=Exception.class) + assertEquals(ctx.getAttribute("test." + ConfigGeneratorConstant.OUTPUT_PARAM_STATUS), + ConfigGeneratorConstant.OUTPUT_STATUS_SUCCESS); + + } + + // @Test(expected=Exception.class) public void checkXMLData() throws Exception { PatternNode patternNode = new PatternNode(); Map inParams = new HashMap(); inParams.put(ConfigGeneratorConstant.INPUT_PARAM_RESPONSE_PRIFIX, "test"); - String xmlData = IOUtils.toString(TestPatternNode.class.getClassLoader().getResourceAsStream("pattern/xml_data.xml"),ConfigGeneratorConstant.STRING_ENCODING); + String xmlData = IOUtils.toString( + TestPatternNode.class.getClassLoader().getResourceAsStream("pattern/xml_data.xml"), + ConfigGeneratorConstant.STRING_ENCODING); inParams.put(ConfigGeneratorConstant.INPUT_PARAM_CHECK_DATA, xmlData); SvcLogicContext ctx = new SvcLogicContext(); patternNode.checkDataType(inParams, ctx); + assertEquals(ctx.getAttribute("test." + ConfigGeneratorConstant.OUTPUT_PARAM_STATUS), + ConfigGeneratorConstant.OUTPUT_STATUS_SUCCESS); } - //@Test + // @Test public void checkJsonData() throws Exception { PatternNode patternNode = new PatternNode(); Map inParams = new HashMap(); inParams.put(ConfigGeneratorConstant.INPUT_PARAM_RESPONSE_PRIFIX, "test"); - String xmlData = IOUtils.toString(TestPatternNode.class.getClassLoader().getResourceAsStream("pattern/json_data.json"),ConfigGeneratorConstant.STRING_ENCODING); + String xmlData = + IOUtils.toString(TestPatternNode.class.getClassLoader().getResourceAsStream( + "pattern/json_data.json"), ConfigGeneratorConstant.STRING_ENCODING); inParams.put(ConfigGeneratorConstant.INPUT_PARAM_CHECK_DATA, xmlData); SvcLogicContext ctx = new SvcLogicContext(); patternNode.checkDataType(inParams, ctx); - assertEquals(ctx.getAttribute("test."+ConfigGeneratorConstant.OUTPUT_PARAM_STATUS), ConfigGeneratorConstant.OUTPUT_STATUS_SUCCESS); + assertEquals(ctx.getAttribute("test." + ConfigGeneratorConstant.OUTPUT_PARAM_STATUS), + ConfigGeneratorConstant.OUTPUT_STATUS_SUCCESS); } - @Test(expected=Exception.class) + @Test(expected = Exception.class) public void checStringData() throws Exception { PatternNode patternNode = new PatternNode(); Map inParams = new HashMap(); inParams.put(ConfigGeneratorConstant.INPUT_PARAM_RESPONSE_PRIFIX, "test"); - String stringData = IOUtils.toString(TestPatternNode.class.getClassLoader().getResourceAsStream("pattern/text_data.txt"),ConfigGeneratorConstant.STRING_ENCODING); + String stringData = IOUtils.toString( + TestPatternNode.class.getClassLoader().getResourceAsStream("pattern/text_data.txt"), + ConfigGeneratorConstant.STRING_ENCODING); inParams.put(ConfigGeneratorConstant.INPUT_PARAM_CHECK_DATA, stringData); SvcLogicContext ctx = new SvcLogicContext(); patternNode.checkDataType(inParams, ctx); - assertEquals(ctx.getAttribute("test."+ConfigGeneratorConstant.OUTPUT_PARAM_STATUS), ConfigGeneratorConstant.OUTPUT_STATUS_SUCCESS); + assertEquals(ctx.getAttribute("test." + ConfigGeneratorConstant.OUTPUT_PARAM_STATUS), + ConfigGeneratorConstant.OUTPUT_STATUS_SUCCESS); } } diff --git a/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/reader/TestReaderNode.java b/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/reader/TestReaderNode.java index cda966b60..8aeed61a6 100644 --- a/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/reader/TestReaderNode.java +++ b/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/reader/TestReaderNode.java @@ -22,18 +22,17 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.config.generator.reader; +package org.onap.sdnc.config.generator.reader; import java.io.IOException; import java.util.HashMap; import java.util.Map; import org.apache.commons.io.IOUtils; import org.junit.Test; -import org.openecomp.sdnc.config.generator.ConfigGeneratorConstant; -import org.openecomp.sdnc.config.generator.merge.TestMergeNode; -import org.openecomp.sdnc.config.generator.reader.ReaderNode; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.sdnc.config.generator.ConfigGeneratorConstant; +import org.onap.sdnc.config.generator.merge.TestMergeNode; public class TestReaderNode { @Test(expected = Exception.class) @@ -41,8 +40,9 @@ public class TestReaderNode { ReaderNode r = new ReaderNode(); Map inParams = new HashMap(); inParams.put(ConfigGeneratorConstant.INPUT_PARAM_RESPONSE_PRIFIX, "test"); - inParams.put(ConfigGeneratorConstant.INPUT_PARAM_FILE_NAME, IOUtils - .toString(TestMergeNode.class.getClassLoader().getResourceAsStream("convert/payload_cli_config.json"))); + inParams.put(ConfigGeneratorConstant.INPUT_PARAM_FILE_NAME, + IOUtils.toString(TestMergeNode.class.getClassLoader() + .getResourceAsStream("convert/payload_cli_config.json"))); SvcLogicContext ctx = new SvcLogicContext(); r.getFileData(inParams, ctx); } diff --git a/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/tool/TestDataTool.java b/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/tool/TestDataTool.java index 85230f472..6e1d525c2 100644 --- a/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/tool/TestDataTool.java +++ b/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/tool/TestDataTool.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.config.generator.tool; +package org.onap.sdnc.config.generator.tool; import java.io.IOException; import java.util.ArrayList; @@ -32,122 +32,124 @@ import java.util.Map; import org.apache.commons.io.IOUtils; import org.junit.Test; import org.mockito.Mock; -import org.openecomp.sdnc.config.generator.ConfigGeneratorConstant; -import org.openecomp.sdnc.config.generator.pattern.TestPatternNode; -import org.openecomp.sdnc.config.generator.tool.CheckDataTool; +import org.onap.sdnc.config.generator.ConfigGeneratorConstant; +import org.onap.sdnc.config.generator.pattern.TestPatternNode; import org.powermock.reflect.Whitebox; public class TestDataTool { - @Mock - LogParserTool lp = new LogParserTool(); - - @Test - public void testCheckData() throws IOException { - String data = IOUtils.toString( - TestPatternNode.class.getClassLoader().getResourceAsStream("convert/payload_cli_config.json"), - ConfigGeneratorConstant.STRING_ENCODING); - CheckDataTool.checkData(data); - } - - @Test - public void testIsJSON() throws IOException { - String data = IOUtils.toString( - TestPatternNode.class.getClassLoader().getResourceAsStream("convert/payload_cli_config.json"), - ConfigGeneratorConstant.STRING_ENCODING); - CheckDataTool.isJSON(data); - } - - @Test - public void testIsXML() throws IOException { - String data = IOUtils.toString( - TestPatternNode.class.getClassLoader().getResourceAsStream("pattern/xml_data.xml"), - ConfigGeneratorConstant.STRING_ENCODING); - CheckDataTool.isXML(data); - } - - @Test - public void testNode() { - CustomJsonNodeFactory c = new CustomJsonNodeFactory(); - String text = "test"; - c.textNode(text); - } - - @Test - public void testCustomText() { - CustomTextNode c = new CustomTextNode("test"); - c.toString(); - } - - @Test - public void testEscapeUtils() { - String s = "test\\"; - String st = "test\"test"; - String str = "test\'" + "test"; - String strng = "test\0"; - EscapeUtils.escapeSQL(s); - EscapeUtils.escapeSql(s); - EscapeUtils.escapeSQL(st); - EscapeUtils.escapeSQL(str); - EscapeUtils.escapeSQL(strng); - EscapeUtils.escapeSQL(null); - } - -// @Test(expected = Exception.class) - public void testgetData() throws Exception { - ArrayList argList = null; - String schema = "sdnctl"; - String tableName = "dual"; - String getselectData = "123"; - String getDataClasue = "123='123'"; - DbServiceUtil.getData(tableName, argList, schema, getselectData, getDataClasue); - } - -// @Test(expected = Exception.class) - public void testupdateDB() throws Exception { - String setCluase = null; - String schema = "sdnctl"; - String tableName = "dual"; - ArrayList inputArgs = null; - String whereClause = "123='123'"; - DbServiceUtil.updateDB(tableName, inputArgs, schema, whereClause, setCluase); - } - -// @Test(expected = Exception.class) - public void testinitDbLibService() throws Exception { - DbServiceUtil.initDbLibService(); - } - - @Test - public void testJSONTool() throws Exception { - String data = IOUtils.toString( - TestPatternNode.class.getClassLoader().getResourceAsStream("convert/payload_cli_config.json"), - ConfigGeneratorConstant.STRING_ENCODING); - JSONTool.convertToProperties(data); - List blockKeys = new ArrayList(); - blockKeys.add("vnf-type"); - blockKeys.add("request-parameters"); - JSONTool.convertToProperties(data, blockKeys); - } - - @Test - public void testLogParserTool() throws Exception { - String data = IOUtils.toString( - TestPatternNode.class.getClassLoader().getResourceAsStream("pattern/errorlog.txt"), - ConfigGeneratorConstant.STRING_ENCODING); - LogParserTool lpt = new LogParserTool(); - lpt.parseErrorLog(data); - } - - @Test - public void testMergeTool() throws Exception { - String template = "test"; - Map dataMap = new HashMap(); - MergeTool.mergeMap2TemplateData(template, dataMap); - } - - @Test - public void testcheckDateTime() throws Exception { - String line = "2017-08-20T17:40:23.100361+00:00"; - Whitebox.invokeMethod(lp, "checkDateTime", line); - } + @Mock + LogParserTool lp = new LogParserTool(); + + @Test + public void testCheckData() throws IOException { + String data = IOUtils.toString( + TestPatternNode.class.getClassLoader() + .getResourceAsStream("convert/payload_cli_config.json"), + ConfigGeneratorConstant.STRING_ENCODING); + CheckDataTool.checkData(data); + } + + @Test + public void testIsJSON() throws IOException { + String data = IOUtils.toString( + TestPatternNode.class.getClassLoader() + .getResourceAsStream("convert/payload_cli_config.json"), + ConfigGeneratorConstant.STRING_ENCODING); + CheckDataTool.isJSON(data); + } + + @Test + public void testIsXML() throws IOException { + String data = IOUtils.toString( + TestPatternNode.class.getClassLoader().getResourceAsStream("pattern/xml_data.xml"), + ConfigGeneratorConstant.STRING_ENCODING); + CheckDataTool.isXML(data); + } + + @Test + public void testNode() { + CustomJsonNodeFactory c = new CustomJsonNodeFactory(); + String text = "test"; + c.textNode(text); + } + + @Test + public void testCustomText() { + CustomTextNode c = new CustomTextNode("test"); + c.toString(); + } + + @Test + public void testEscapeUtils() { + String s = "test\\"; + String st = "test\"test"; + String str = "test\'" + "test"; + String strng = "test\0"; + EscapeUtils.escapeSQL(s); + EscapeUtils.escapeSql(s); + EscapeUtils.escapeSQL(st); + EscapeUtils.escapeSQL(str); + EscapeUtils.escapeSQL(strng); + EscapeUtils.escapeSQL(null); + } + + // @Test(expected = Exception.class) + public void testgetData() throws Exception { + ArrayList argList = null; + String schema = "sdnctl"; + String tableName = "dual"; + String getselectData = "123"; + String getDataClasue = "123='123'"; + DbServiceUtil.getData(tableName, argList, schema, getselectData, getDataClasue); + } + + // @Test(expected = Exception.class) + public void testupdateDB() throws Exception { + String setCluase = null; + String schema = "sdnctl"; + String tableName = "dual"; + ArrayList inputArgs = null; + String whereClause = "123='123'"; + DbServiceUtil.updateDB(tableName, inputArgs, schema, whereClause, setCluase); + } + + // @Test(expected = Exception.class) + public void testinitDbLibService() throws Exception { + DbServiceUtil.initDbLibService(); + } + + @Test + public void testJSONTool() throws Exception { + String data = IOUtils.toString( + TestPatternNode.class.getClassLoader() + .getResourceAsStream("convert/payload_cli_config.json"), + ConfigGeneratorConstant.STRING_ENCODING); + JSONTool.convertToProperties(data); + List blockKeys = new ArrayList(); + blockKeys.add("vnf-type"); + blockKeys.add("request-parameters"); + JSONTool.convertToProperties(data, blockKeys); + } + + @Test + public void testLogParserTool() throws Exception { + String data = IOUtils.toString( + TestPatternNode.class.getClassLoader().getResourceAsStream("pattern/errorlog.txt"), + ConfigGeneratorConstant.STRING_ENCODING); + LogParserTool lpt = new LogParserTool(); + lpt.parseErrorLog(data); + } + + @Test + public void testMergeTool() throws Exception { + String template = "test"; + Map dataMap = new HashMap(); + MergeTool.mergeMap2TemplateData(template, dataMap); + } + + @Test + public void testcheckDateTime() throws Exception { + String line = "2017-08-20T17:40:23.100361+00:00"; + Whitebox.invokeMethod(lp, "checkDateTime", line); + } } diff --git a/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/transform/TestXSLTTransformerNode.java b/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/transform/TestXSLTTransformerNode.java index e2e808192..d9df4d046 100644 --- a/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/transform/TestXSLTTransformerNode.java +++ b/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/transform/TestXSLTTransformerNode.java @@ -1,9 +1,11 @@ /*- * ============LICENSE_START======================================================= - * ONAP : APP-C + * ONAP : APPC * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. * ================================================================================ + * Copyright (C) 2017 Amdocs + * ============================================================================= * 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 @@ -15,26 +17,28 @@ * 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. + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.config.generator.transform; +package org.onap.sdnc.config.generator.transform; import java.nio.charset.Charset; import java.util.HashMap; import java.util.Map; import org.apache.commons.io.IOUtils; import org.junit.Test; -import org.openecomp.sdnc.config.generator.ConfigGeneratorConstant; -import org.openecomp.sdnc.config.generator.merge.TestMergeNode; -import org.openecomp.sdnc.config.generator.transform.XSLTTransformerNode; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.sdnc.config.generator.ConfigGeneratorConstant; +import org.onap.sdnc.config.generator.merge.TestMergeNode; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import org.onap.ccsdk.sli.core.sli.SvcLogicContext; public class TestXSLTTransformerNode { - - private static final EELFLogger log = EELFManager.getInstance().getLogger(TestXSLTTransformerNode.class); + + private static final EELFLogger log = + EELFManager.getInstance().getLogger(TestXSLTTransformerNode.class); @Test public void transformData() throws Exception { @@ -50,7 +54,9 @@ public class TestXSLTTransformerNode { inParams.put(ConfigGeneratorConstant.INPUT_PARAM_REQUEST_DATA, requestData); XSLTTransformerNode transformerNode = new XSLTTransformerNode(); transformerNode.transformData(inParams, ctx); - log.info("transformData Result: " + ctx.getAttribute(ConfigGeneratorConstant.OUTPUT_PARAM_TRANSFORMED_DATA)); + log.info("transformData Result: " + + ctx.getAttribute(ConfigGeneratorConstant.OUTPUT_PARAM_TRANSFORMED_DATA)); } + } diff --git a/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/writer/TestFileWriterNode.java b/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/writer/TestFileWriterNode.java index 74c17bdc6..553bc7c7b 100644 --- a/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/writer/TestFileWriterNode.java +++ b/appc-config/appc-config-generator/provider/src/test/java/org/onap/sdnc/config/generator/writer/TestFileWriterNode.java @@ -1,9 +1,11 @@ /*- * ============LICENSE_START======================================================= - * ONAP : APP-C + * ONAP : APPC * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. * ================================================================================ + * Copyright (C) 2017 Amdocs + * ============================================================================= * 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 @@ -15,18 +17,19 @@ * 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. + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.config.generator.writer; +package org.onap.sdnc.config.generator.writer; import static org.junit.Assert.assertEquals; import java.util.HashMap; import java.util.Map; import org.junit.Test; -import org.openecomp.sdnc.config.generator.ConfigGeneratorConstant; -import org.openecomp.sdnc.config.generator.writer.FileWriterNode; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.sdnc.config.generator.ConfigGeneratorConstant; public class TestFileWriterNode { @@ -34,8 +37,10 @@ public class TestFileWriterNode { public void writeFile() throws Exception { FileWriterNode FileWriterNode = new FileWriterNode(); Map inParams = new HashMap(); - inParams.put(ConfigGeneratorConstant.INPUT_PARAM_FILE_NAME, "src/test/resources/writer/testcvaas.json"); - inParams.put(ConfigGeneratorConstant.INPUT_PARAM_REQUEST_DATA, "{'name':'Name','role':'admin'}"); + inParams.put(ConfigGeneratorConstant.INPUT_PARAM_FILE_NAME, + "src/test/resources/writer/testcvaas.json"); + inParams.put(ConfigGeneratorConstant.INPUT_PARAM_REQUEST_DATA, + "{'name':'Name','role':'admin'}"); inParams.put(ConfigGeneratorConstant.INPUT_PARAM_RESPONSE_PRIFIX, "test"); SvcLogicContext ctx = new SvcLogicContext(); FileWriterNode.writeFile(inParams, ctx); diff --git a/appc-config/appc-config-generator/provider/src/test/resources/convert/escape/config_vdbe.xml b/appc-config/appc-config-generator/provider/src/test/resources/convert/escape/config_vdbe.xml index 787796704..76ebf3631 100644 --- a/appc-config/appc-config-generator/provider/src/test/resources/convert/escape/config_vdbe.xml +++ b/appc-config/appc-config-generator/provider/src/test/resources/convert/escape/config_vdbe.xml @@ -1,9 +1,11 @@ diff --git a/appc-config/appc-config-generator/provider/src/test/resources/merge/complex/vdbe_template.xml b/appc-config/appc-config-generator/provider/src/test/resources/merge/complex/vdbe_template.xml index 787796704..76ebf3631 100644 --- a/appc-config/appc-config-generator/provider/src/test/resources/merge/complex/vdbe_template.xml +++ b/appc-config/appc-config-generator/provider/src/test/resources/merge/complex/vdbe_template.xml @@ -1,9 +1,11 @@ diff --git a/appc-config/appc-config-generator/provider/src/test/resources/merge/vdbe_template.xml b/appc-config/appc-config-generator/provider/src/test/resources/merge/vdbe_template.xml index 787796704..76ebf3631 100644 --- a/appc-config/appc-config-generator/provider/src/test/resources/merge/vdbe_template.xml +++ b/appc-config/appc-config-generator/provider/src/test/resources/merge/vdbe_template.xml @@ -1,9 +1,11 @@ diff --git a/appc-config/appc-config-generator/provider/src/test/resources/pattern/xml_data.xml b/appc-config/appc-config-generator/provider/src/test/resources/pattern/xml_data.xml index 8be67ba9e..76ebf3631 100644 --- a/appc-config/appc-config-generator/provider/src/test/resources/pattern/xml_data.xml +++ b/appc-config/appc-config-generator/provider/src/test/resources/pattern/xml_data.xml @@ -1,19 +1,23 @@ -/*- - * ============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========================================================= - */ + diff --git a/appc-config/appc-config-generator/provider/src/test/resources/transform/request.xml b/appc-config/appc-config-generator/provider/src/test/resources/transform/request.xml index 9980d2035..e67ce6c75 100644 --- a/appc-config/appc-config-generator/provider/src/test/resources/transform/request.xml +++ b/appc-config/appc-config-generator/provider/src/test/resources/transform/request.xml @@ -1,10 +1,12 @@ diff --git a/appc-config/appc-config-generator/provider/src/test/resources/transform/template.xsl b/appc-config/appc-config-generator/provider/src/test/resources/transform/template.xsl index 0ce46dfea..684c782cf 100644 --- a/appc-config/appc-config-generator/provider/src/test/resources/transform/template.xsl +++ b/appc-config/appc-config-generator/provider/src/test/resources/transform/template.xsl @@ -1,10 +1,12 @@ -- cgit 1.2.3-korg