diff options
| -rw-r--r-- | src/test/java/org/onap/dcae/vestest/InputJsonValidation.java | 254 | ||||
| -rw-r--r-- | src/test/java/org/onap/dcae/vestest/TestCustomExceptionLoader.java | 74 | ||||
| -rw-r--r-- | src/test/java/org/onap/dcae/vestest/VESCollectorJunitTest.java | 120 | ||||
| -rw-r--r-- | src/test/java/org/onap/dcae/vestest/VesCollectorJunitTest.java | 95 | ||||
| -rw-r--r-- | src/test/java/org/onap/dcae/vestest/VesCollectorJunitTestRunner.java (renamed from src/test/java/org/onap/dcae/vestest/VESCollectorJunitTestRunner.java) | 38 |
5 files changed, 271 insertions, 310 deletions
diff --git a/src/test/java/org/onap/dcae/vestest/InputJsonValidation.java b/src/test/java/org/onap/dcae/vestest/InputJsonValidation.java index 336cb92f..72ebdea3 100644 --- a/src/test/java/org/onap/dcae/vestest/InputJsonValidation.java +++ b/src/test/java/org/onap/dcae/vestest/InputJsonValidation.java @@ -17,7 +17,13 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.dcae.vestest; + +import com.google.gson.JsonIOException; +import com.google.gson.JsonParser; +import com.google.gson.JsonSyntaxException; + import java.io.BufferedReader; import java.io.FileNotFoundException; import java.io.FileReader; @@ -28,144 +34,118 @@ import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.junit.Test; import org.onap.dcae.commonFunction.CommonStartup; - -import com.google.gson.JsonIOException; -import com.google.gson.JsonParser; -import com.google.gson.JsonSyntaxException; - +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class InputJsonValidation { - - static String valresult = null; - - - @Test - public void nonvalidJSONValidation(){ - - JSONObject jsonObject = null; - JSONParser parser=new JSONParser(); - Object obj=null; - //String jsonfilepath="C:/Users/vv770d/git/restfulcollector/src/test/resources/fujistu_non_valid_json.txt"; - String jsonfilepath="src/test/resources/VES_invalid.txt"; - String retValue="false"; - try{ - - obj=parser.parse(new FileReader(jsonfilepath)); - - } - catch(Exception e){ - - System.out.println("Exception while opening the file"); - - } - jsonObject=(JSONObject) obj; - - String schema=null; - try { - schema = new JsonParser().parse(new FileReader("etc/CommonEventFormat_27.2.json")).toString(); - //System.out.println("Schema value: " + schema.toString()); - } catch (JsonIOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (JsonSyntaxException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (FileNotFoundException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - if (schema!=null){ - retValue=CommonStartup.schemavalidate(jsonObject.toString(), schema); - } - //return retValue; - VESCollectorJunitTest.output = retValue; - } - - - // The below test case meant for verifying json schema on provided json file - @Test - public void validJSONValidation(){ - - JSONObject jsonObject = null; - JSONParser parser=new JSONParser(); - Object obj=null; - - String jsonfilepath="src/test/resources/VES_valid.txt"; - String retValue="false"; - try{ - - obj=parser.parse(new FileReader(jsonfilepath)); - - - } - catch(Exception e){ - System.out.println("Exception while opening the file"); - - } - jsonObject=(JSONObject) obj; - String schema=null; - try { - - System.out.println("XX debug" + VESCollectorJunitTest.schemaFile); - schema = new JsonParser().parse(new FileReader("etc/CommonEventFormat_27.2.json")).toString(); - } catch (JsonIOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (JsonSyntaxException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (FileNotFoundException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - if (schema!=null){ - retValue=CommonStartup.schemavalidate(jsonObject.toString(), schema); - } - VESCollectorJunitTest.output = retValue; - //return retValue; - } - - - - //validating valid json reception and its posting to DMAP. - @Test - public void eventReception(){ - - - String testCurlCommand = "curl -i -X POST -d @C:/Users/vv770d/git/restfulcollector/src/test/resources/fujistu-3.txt --header \"Content-Type: application/json\" http://localhost:8080/eventListener/v1"; - - //final Process terminal = curlCommand.start(); - try { - Process p = Runtime.getRuntime().exec(testCurlCommand); - BufferedReader stdInput = new BufferedReader(new - InputStreamReader(p.getInputStream())); - - BufferedReader stdError = new BufferedReader(new - InputStreamReader(p.getErrorStream())); - - // read the output from the command - - String s = null; - while ((s = stdInput.readLine()) != null) { - if (s.contains("HTTP/1.1 200 OK")){ - - //return "true"; - VESCollectorJunitTest.output = "true"; - } - - } - } catch (IOException e) { - // TODO Auto-generated catch block - - - e.printStackTrace(); - } - - //return "false"; - } - -} + private static final Logger log = LoggerFactory.getLogger(InputJsonValidation.class); + static String valresult; + + + @Test + public void nonValidJsonValidation() { + + JSONObject jsonObject; + JSONParser parser = new JSONParser(); + Object obj = null; + //String jsonfilepath="C:/Users/vv770d/git/restfulcollector/src/test/resources/fujistu_non_valid_json.txt"; + String jsonfilepath = "src/test/resources/VES_invalid.txt"; + String retValue = "false"; + try { + + obj = parser.parse(new FileReader(jsonfilepath)); + } catch (Exception e) { + + log.info("Exception while opening the file"); + } + jsonObject = (JSONObject) obj; + + String schema = null; + try { + schema = new JsonParser().parse(new FileReader("etc/CommonEventFormat_27.2.json")) + .toString(); + //log.info("Schema value: " + schema.toString()); + } catch (JsonIOException | JsonSyntaxException | FileNotFoundException e) { + // TODO Auto-generated catch block + log.error(e.getLocalizedMessage(), e); + } + + if (schema != null) { + retValue = CommonStartup.schemavalidate(jsonObject.toString(), schema); + } + //return retValue; + VesCollectorJunitTest.output = retValue; + } + + + // The below test case meant for verifying json schema on provided json file + @Test + public void validJsonValidation() { + + JSONObject jsonObject; + JSONParser parser = new JSONParser(); + Object obj = null; + + String jsonfilepath = "src/test/resources/VES_valid.txt"; + String retValue = "false"; + try { + + obj = parser.parse(new FileReader(jsonfilepath)); + } catch (Exception e) { + log.info("Exception while opening the file"); + } + jsonObject = (JSONObject) obj; + String schema = null; + try { + + log.info("XX debug" + VesCollectorJunitTest.schemaFile); + schema = new JsonParser().parse(new FileReader("etc/CommonEventFormat_27.2.json")) + .toString(); + } catch (JsonIOException | JsonSyntaxException | FileNotFoundException e) { + // TODO Auto-generated catch block + log.error(e.getLocalizedMessage(), e); + } + + if (schema != null) { + retValue = CommonStartup.schemavalidate(jsonObject.toString(), schema); + } + VesCollectorJunitTest.output = retValue; + //return retValue; + } + + + //validating valid json reception and its posting to DMAP. + @Test + public void eventReception() { + + String testCurlCommand = "curl -i -X POST -d @C:/Users/vv770d/git/restfulcollector/src/test/resources/fujistu-3.txt --header \"Content-Type: application/json\" http://localhost:8080/eventListener/v1"; + + //final Process terminal = curlCommand.start(); + try { + Process process = Runtime.getRuntime().exec(testCurlCommand); + BufferedReader stdInput = new BufferedReader(new + InputStreamReader(process.getInputStream())); + + BufferedReader stdError = new BufferedReader(new + InputStreamReader(process.getErrorStream())); + + // read the output from the command + + String str; + while ((str = stdInput.readLine()) != null) { + if (str.contains("HTTP/1.1 200 OK")) { + + //return "true"; + VesCollectorJunitTest.output = "true"; + } + } + } catch (IOException e) { + // TODO Auto-generated catch block + log.error(e.getLocalizedMessage(), e); + } + + //return "false"; + } +} diff --git a/src/test/java/org/onap/dcae/vestest/TestCustomExceptionLoader.java b/src/test/java/org/onap/dcae/vestest/TestCustomExceptionLoader.java index bf7dbda2..1cbd6c43 100644 --- a/src/test/java/org/onap/dcae/vestest/TestCustomExceptionLoader.java +++ b/src/test/java/org/onap/dcae/vestest/TestCustomExceptionLoader.java @@ -17,54 +17,56 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.dcae.vestest; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import com.att.nsa.drumlin.service.standards.HttpStatusCodes; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.onap.dcae.commonFunction.CommonStartup; import org.onap.dcae.commonFunction.CustomExceptionLoader; - -import com.att.nsa.drumlin.service.standards.HttpStatusCodes; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TestCustomExceptionLoader { - CustomExceptionLoader cl; - @Before - public void setUp() throws Exception { - cl = new CustomExceptionLoader(); - CommonStartup.exceptionConfig="./etc/ExceptionConfig.json"; - } + private static final Logger log = LoggerFactory.getLogger(TestCustomExceptionLoader.class); + private CustomExceptionLoader cl; + + @Before + public void setUp() throws Exception { + cl = new CustomExceptionLoader(); + CommonStartup.exceptionConfig = "./etc/ExceptionConfig.json"; + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testLoad() { + String op; + CustomExceptionLoader.LoadMap(); + op = "dataloaded"; + assertEquals("dataloaded", op); + } - @After - public void tearDown() throws Exception { - } + @Test + public void testLookup() { + String[] retarray; - @Test - public void testLoad() { - String op = "notloaded"; - CustomExceptionLoader.LoadMap(); - op = "dataloaded"; - assertEquals("dataloaded",op); - } - @Test - public void testLookup() { - String[] retarray = null; - - CommonStartup.exceptionConfig="./etc/ExceptionConfig.json"; - CustomExceptionLoader.LoadMap(); - retarray=CustomExceptionLoader.LookupMap(String.valueOf(HttpStatusCodes.k401_unauthorized), "Unauthorized user"); - if (retarray==null) - { - System.out.println("Lookup failed"); - } - else - { - assertEquals("\"POL2000\"",retarray[0].toString()); - } - - } + CommonStartup.exceptionConfig = "./etc/ExceptionConfig.json"; + CustomExceptionLoader.LoadMap(); + retarray = CustomExceptionLoader + .LookupMap(String.valueOf(HttpStatusCodes.k401_unauthorized), "Unauthorized user"); + if (retarray == null) { + log.info("Lookup failed"); + } else { + assertEquals("\"POL2000\"", retarray[0]); + } + } } diff --git a/src/test/java/org/onap/dcae/vestest/VESCollectorJunitTest.java b/src/test/java/org/onap/dcae/vestest/VESCollectorJunitTest.java deleted file mode 100644 index eb1ebfde..00000000 --- a/src/test/java/org/onap/dcae/vestest/VESCollectorJunitTest.java +++ /dev/null @@ -1,120 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * PROJECT - * ================================================================================ - * 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========================================================= - */ - -/* - * - * Purpose: CommonCollectorJunitTest is the wrapper class to invoke all prescribed Junit test cases. - * - */ -package org.onap.dcae.vestest; -import static org.junit.Assert.assertEquals; - -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.util.Properties; - -import org.json.JSONObject; -import org.junit.Test; - -public class VESCollectorJunitTest { - public static String schemaFile="etc/CommonEventFormat_27.2.json"; - public static String output; - - - - String message = "true"; - InputJsonValidation messageUtil = new InputJsonValidation(); - - @Test - public void validJSONValidation() { - - Properties prop = new Properties(); - InputStream input = null; - output = "true"; - try { - input = new FileInputStream("etc/collector.properties"); - try { - prop.load(input); - //schemaFile=prop.getProperty("collector.schema.file"); - - JSONObject schemaFileJson = new JSONObject(prop.getProperty("collector.schema.file")); - System.out.println("JSON Schemafile" + schemaFileJson); - //schemaFile = schemaFileJson.getString("v4"); - - System.out.println( "Schema file location: "+ schemaFile); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } catch (FileNotFoundException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - assertEquals("true",output); - } - - - @Test - public void nonvalidJSONValidation() { - output = "false"; - Properties prop = new Properties(); - InputStream input = null; - try { - input = new FileInputStream("etc/collector.properties"); - try { - prop.load(input); - - //schemaFile=prop.getProperty("collector.schema.file"); - - JSONObject schemaFileJson = new JSONObject(prop.getProperty("collector.schema.file")); - System.out.println("JSON Schemafile" + schemaFileJson); - //schemaFile = schemaFileJson.getString("v4"); - - System.out.println( "Schema file location: "+ schemaFile); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } catch (FileNotFoundException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - //assertEquals("false",messageUtil.nonvalidJSONValidation()); - assertEquals("false",output); - } - - - //The test case requires common collector running in the environment prior to start execution of JUNIT test cases - /* - @Test - public void testValidJSONObjectReception() { - - - assertEquals("true",messageUtil.eventReception()); - assertEquals("true",output); - }*/ - - - -} - diff --git a/src/test/java/org/onap/dcae/vestest/VesCollectorJunitTest.java b/src/test/java/org/onap/dcae/vestest/VesCollectorJunitTest.java new file mode 100644 index 00000000..88ea1926 --- /dev/null +++ b/src/test/java/org/onap/dcae/vestest/VesCollectorJunitTest.java @@ -0,0 +1,95 @@ +/*- + * ============LICENSE_START======================================================= + * PROJECT + * ================================================================================ + * 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========================================================= + */ + +/* + * + * Purpose: CommonCollectorJunitTest is the wrapper class to invoke all prescribed Junit test cases. + * + */ + +package org.onap.dcae.vestest; + +import static org.junit.Assert.assertEquals; + +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; +import org.json.JSONObject; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class VesCollectorJunitTest { + + private static final Logger log = LoggerFactory.getLogger(VesCollectorJunitTest.class); + + public static String schemaFile = "etc/CommonEventFormat_27.2.json"; + public static String output; + + + String message = "true"; + InputJsonValidation messageUtil = new InputJsonValidation(); + + @Test + public void validJsonValidation() { + + output = "true"; + testHelper(new Properties()); + + assertEquals("true", output); + } + + + @Test + public void nonValidJsonValidation() { + output = "false"; + testHelper(new Properties()); + //assertEquals("false",messageUtil.nonValidJsonValidation()); + assertEquals("false", output); + } + + private void testHelper(Properties prop) { + try (InputStream input = new FileInputStream("etc/collector.properties")) { + prop.load(input); + //schemaFile=prop.getProperty("collector.schema.file"); + + JSONObject schemaFileJson = new JSONObject( + prop.getProperty("collector.schema.file")); + log.info("JSON Schemafile" + schemaFileJson); + //schemaFile = schemaFileJson.getString("v4"); + + log.info("Schema file location: " + schemaFile); + } catch (IOException e) { + // TODO Auto-generated catch block + log.error(e.getLocalizedMessage(), e); + } + } + + //The test case requires common collector running in the environment prior to start execution of JUNIT test cases + /* + @Test + public void testValidJSONObjectReception() { + + assertEquals("true",messageUtil.eventReception()); + assertEquals("true",output); + }*/ +} + diff --git a/src/test/java/org/onap/dcae/vestest/VESCollectorJunitTestRunner.java b/src/test/java/org/onap/dcae/vestest/VesCollectorJunitTestRunner.java index 64a4ff3b..04f04ec8 100644 --- a/src/test/java/org/onap/dcae/vestest/VESCollectorJunitTestRunner.java +++ b/src/test/java/org/onap/dcae/vestest/VesCollectorJunitTestRunner.java @@ -19,34 +19,38 @@ */ /* - * Purpose: CommonCollectorJunitTestRunner is the main class where test suit execution starts its test cases execution - * the common collector test suit has been written in order to incorporate functional and logical testing of collector features - * + * Purpose: CommonCollectorJunitTestRunner is the main class where test suit execution starts its + * test cases execution the common collector test suit has been written in order to incorporate + * functional and logical testing of collector features. */ package org.onap.dcae.vestest; + import org.junit.runner.JUnitCore; import org.junit.runner.Result; -import org.junit.runner.RunWith; import org.junit.runner.notification.Failure; -import org.onap.dcae.commonFunction.CommonStartup; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class VESCollectorJunitTestRunner { +public class VesCollectorJunitTestRunner { + + private static final Logger log = LoggerFactory.getLogger(VesCollectorJunitTestRunner.class); + + /** + * Runner for test case. + * + * @param args command line arguments + */ + public static void main(String[] args) { - public static void main(String[] args) { + log.info("STARTING TEST SUITE EXECUTION....."); - System.out.println("STARTING TEST SUITE EXECUTION....."); - - Result result = JUnitCore.runClasses(VESCollectorJunitTest.class); + Result result = JUnitCore.runClasses(VesCollectorJunitTest.class); - for (Failure failure : result.getFailures()) { - System.out.println(failure.toString()); - } + for (Failure failure : result.getFailures()) { + log.info(failure.toString()); + } - - System.out.println("Execution Final result : "+result.wasSuccessful()); - } - + log.info("Execution Final result : " + result.wasSuccessful()); + } } |