X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=appc-config%2Fappc-config-generator%2Fprovider%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fsdnc%2Fconfig%2Fgenerator%2Ftool%2FTestDataTool.java;h=6e1d525c211e04766eec8612f8196b251b756451;hb=49f9de63c3d04a2f6ccd3a81e88a01febe185fd9;hp=85230f4722265e9a7d658c7093a28ce0f68ec438;hpb=b1c754c49e15e7fad854ee8c678d53be8d40e30e;p=appc.git

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<String> blockKeys = new ArrayList<String>();
-		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<String, String> dataMap = new HashMap<String, String>();
-		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<String> blockKeys = new ArrayList<String>();
+        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<String, String> dataMap = new HashMap<String, String>();
+        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);
+    }
 }