From e550a1fe4b234423ac63ffd711f43c413c914350 Mon Sep 17 00:00:00 2001 From: PawelSzalapski Date: Wed, 6 Jun 2018 14:05:57 +0200 Subject: Simplify & remove duplicated testcases Testcases in those files were overengineered, plus there were duplicates so they got simplified. Obsolete classes that were unneeded were removed Change-Id: I9fce325aed4f1a3a6073f0c564adac1ec5a6beae Issue-ID: DCAEGEN2-524 Signed-off-by: PawelSzalapski --- .../onap/dcae/commonFunction/CommonStartup.java | 4 +- .../org/onap/dcae/vestest/InputJsonValidation.java | 151 --------------------- .../dcae/vestest/TestDefaultConfiguration.java | 48 +++++++ .../dcae/vestest/TestJsonSchemaValidation.java | 57 ++++++++ .../onap/dcae/vestest/TestSchemaValidation.java | 116 ---------------- .../onap/dcae/vestest/VesCollectorJunitTest.java | 95 ------------- .../dcae/vestest/VesCollectorJunitTestRunner.java | 56 -------- 7 files changed, 107 insertions(+), 420 deletions(-) delete mode 100644 src/test/java/org/onap/dcae/vestest/InputJsonValidation.java create mode 100644 src/test/java/org/onap/dcae/vestest/TestDefaultConfiguration.java create mode 100644 src/test/java/org/onap/dcae/vestest/TestJsonSchemaValidation.java delete mode 100644 src/test/java/org/onap/dcae/vestest/TestSchemaValidation.java delete mode 100644 src/test/java/org/onap/dcae/vestest/VesCollectorJunitTest.java delete mode 100644 src/test/java/org/onap/dcae/vestest/VesCollectorJunitTestRunner.java diff --git a/src/main/java/org/onap/dcae/commonFunction/CommonStartup.java b/src/main/java/org/onap/dcae/commonFunction/CommonStartup.java index 83c81722..f16cdbbc 100644 --- a/src/main/java/org/onap/dcae/commonFunction/CommonStartup.java +++ b/src/main/java/org/onap/dcae/commonFunction/CommonStartup.java @@ -140,7 +140,7 @@ public class CommonStartup extends NsaBaseEndpoint implements Runnable { final String keyAlias = settings.getString(KSETTING_KEYALIAS, KDEFAULT_KEYALIAS); if (securePort > 0) { - final String KSETTING_KEYSTOREPASS = readFile(keystorePasswordFile, Charset.defaultCharset()); + final String KSETTING_KEYSTOREPASS = readFile(keystorePasswordFile); connectors.add(new ApiServerConnector.Builder(securePort).secure(true) .keystorePassword(KSETTING_KEYSTOREPASS).keystoreFile(keystoreFile).keyAlias(keyAlias).build()); @@ -265,7 +265,7 @@ public class CommonStartup extends NsaBaseEndpoint implements Runnable { } } - static String readFile(String path, Charset encoding) throws IOException { + static String readFile(String path) throws IOException { byte[] encoded = Files.readAllBytes(Paths.get(path)); String pwd = new String(encoded); return pwd.substring(0, pwd.length() - 1); diff --git a/src/test/java/org/onap/dcae/vestest/InputJsonValidation.java b/src/test/java/org/onap/dcae/vestest/InputJsonValidation.java deleted file mode 100644 index 72ebdea3..00000000 --- a/src/test/java/org/onap/dcae/vestest/InputJsonValidation.java +++ /dev/null @@ -1,151 +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========================================================= - */ - -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; -import java.io.IOException; -import java.io.InputStreamReader; - -import org.json.simple.JSONObject; -import org.json.simple.parser.JSONParser; -import org.junit.Test; -import org.onap.dcae.commonFunction.CommonStartup; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class InputJsonValidation { - - 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/TestDefaultConfiguration.java b/src/test/java/org/onap/dcae/vestest/TestDefaultConfiguration.java new file mode 100644 index 00000000..826d26d5 --- /dev/null +++ b/src/test/java/org/onap/dcae/vestest/TestDefaultConfiguration.java @@ -0,0 +1,48 @@ +/*- + * ============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 java.io.BufferedReader; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.Properties; +import org.json.JSONObject; +import org.junit.Test; + +public class TestDefaultConfiguration { + + @Test + public void shouldDefaultCollectorSchemaFileBeAValidJson() throws IOException { + try (BufferedReader bufferedReader = Files.newBufferedReader(Paths.get("etc/collector.properties"))) { + Properties properties = new Properties(); + properties.load(bufferedReader); + new JSONObject(properties.getProperty("collector.schema.file")); + } + } +} + diff --git a/src/test/java/org/onap/dcae/vestest/TestJsonSchemaValidation.java b/src/test/java/org/onap/dcae/vestest/TestJsonSchemaValidation.java new file mode 100644 index 00000000..2b392067 --- /dev/null +++ b/src/test/java/org/onap/dcae/vestest/TestJsonSchemaValidation.java @@ -0,0 +1,57 @@ +/*- + * ============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========================================================= + */ + +package org.onap.dcae.vestest; + +import static java.nio.file.Files.readAllBytes; +import static junit.framework.Assert.assertEquals; + +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import java.io.IOException; +import java.nio.file.Paths; +import org.junit.Test; +import org.onap.dcae.commonFunction.CommonStartup; + +public class TestJsonSchemaValidation { + + @Test + public void shouldValidEventPassSchema_27_2() throws IOException { + String result = CommonStartup.schemavalidate( + readJSONFromFile("src/test/resources/VES_valid.txt").toString(), + readJSONFromFile("etc/CommonEventFormat_27.2.json").toString()); + assertEquals(result, "true"); + } + + + @Test + public void shouldInvalidEventDoesNotPassSchema_27_2() throws IOException { + String result = CommonStartup.schemavalidate( + readJSONFromFile("src/test/resources/VES_invalid.txt").toString(), + readJSONFromFile("etc/CommonEventFormat_27.2.json").toString()); + assertEquals(result, "false"); + } + + + private static JsonObject readJSONFromFile(String path) throws IOException { + return (JsonObject) new JsonParser().parse(new String(readAllBytes(Paths.get(path)))); + } +} + diff --git a/src/test/java/org/onap/dcae/vestest/TestSchemaValidation.java b/src/test/java/org/onap/dcae/vestest/TestSchemaValidation.java deleted file mode 100644 index 816b3283..00000000 --- a/src/test/java/org/onap/dcae/vestest/TestSchemaValidation.java +++ /dev/null @@ -1,116 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * PROJECT - * ================================================================================ - * Copyright (C) 2017-2018 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.onap.dcae.vestest; - -import java.io.ByteArrayInputStream; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; - -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.onap.dcae.commonFunction.CommonStartup; -import org.onap.dcae.restapi.endpoints.EventReceipt; - -import com.google.gson.JsonParser; - -public class TestSchemaValidation { - - CommonStartup cl; - String schema = null; - String payload = null; - String payloadinvalid = null; - - @Before - public void setUp() throws Exception { - - schema = new JsonParser().parse(new FileReader("etc/CommonEventFormat_27.2.json")).toString(); - payload = new JsonParser().parse(new FileReader("src/test/resources/VES_valid.txt")).toString(); - payloadinvalid = new JsonParser().parse(new FileReader("src/test/resources/VES_invalid.txt")).toString(); - - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testsuccessfulschemavalidation() { - - String valresult = CommonStartup.schemavalidate(payload, schema); - System.out.println("testsuccessfulschemavalidation:" + valresult); - Assert.assertEquals(valresult, "true"); - } - - @Test - public void testunsuccessfulschemavalidation() { - String valresult = null; - valresult = CommonStartup.schemavalidate(payloadinvalid, schema); - System.out.println("testunsuccessfulschemavalidation:" + valresult); - Assert.assertFalse(valresult.equals("true")); - - } - -/* - @Test - public void testeventReceipt() { - - DrumlinServlet webServlet = new DrumlinServlet(); - DrumlinRequestContext ctx = new DrumlinRequestContext(webServlet, null, null, null, null, null); - EventReceipt er= new EventReceipt(); - try { - EventReceipt.receiveVESEvent(null); - } catch ( NullPointerException e) { - - e.printStackTrace(); - } - Assert.assertEquals("true", "true"); - - }*/ - - @Test - public void testsafeclosefr() { - - - FileReader fr; - try { - fr = new FileReader("etc/CommonEventFormat_27.2.json"); - EventReceipt.safeClose(fr); - } catch (FileNotFoundException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - Assert.assertEquals("true", "true"); - - } - - @Test - public void testsafecloseis() { - - InputStream is = new ByteArrayInputStream(StandardCharsets.UTF_16.encode("randomstring").array()); - EventReceipt.safeClose(is); - Assert.assertEquals("true", "true"); - - } -} - 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 88ea1926..00000000 --- a/src/test/java/org/onap/dcae/vestest/VesCollectorJunitTest.java +++ /dev/null @@ -1,95 +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.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 deleted file mode 100644 index 04f04ec8..00000000 --- a/src/test/java/org/onap/dcae/vestest/VesCollectorJunitTestRunner.java +++ /dev/null @@ -1,56 +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: 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.notification.Failure; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -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) { - - log.info("STARTING TEST SUITE EXECUTION....."); - - Result result = JUnitCore.runClasses(VesCollectorJunitTest.class); - - for (Failure failure : result.getFailures()) { - log.info(failure.toString()); - } - - log.info("Execution Final result : " + result.wasSuccessful()); - } -} -- cgit 1.2.3-korg