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/vestest/TestSchemaValidation.java | 116 --------------------- 1 file changed, 116 deletions(-) delete mode 100644 src/test/java/org/onap/dcae/vestest/TestSchemaValidation.java (limited to 'src/test/java/org/onap/dcae/vestest/TestSchemaValidation.java') 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"); - - } -} - -- cgit 1.2.3-korg