From 158248d9e2006e8e5f5c181f07b5aac57cb9ddd0 Mon Sep 17 00:00:00 2001
From: Bogumil Zebek <bogumil.zebek@nokia.com>
Date: Tue, 4 Aug 2020 12:56:12 +0200
Subject: Migrate from java 8 to java 11

Change-Id: If146dc0d99541a8a14ecc5e504c49a5c433a262f
Issue-ID: VNFSDK-631
Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com>
---
 .../onap/validation/csar/CsarValidatorTest.java    | 291 +++++++++++++++++++++
 .../validation/csar/ValidationExceptionTest.java   |  50 ++++
 .../csarvalidationtest/CsarValidatorTest.java      | 239 -----------------
 .../ValidationExceptionTest.java                   |  49 ----
 4 files changed, 341 insertions(+), 288 deletions(-)
 create mode 100644 csarvalidation/src/test/java/org/onap/validation/csar/CsarValidatorTest.java
 create mode 100644 csarvalidation/src/test/java/org/onap/validation/csar/ValidationExceptionTest.java
 delete mode 100644 csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarValidatorTest.java
 delete mode 100644 csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/ValidationExceptionTest.java

(limited to 'csarvalidation/src/test')

diff --git a/csarvalidation/src/test/java/org/onap/validation/csar/CsarValidatorTest.java b/csarvalidation/src/test/java/org/onap/validation/csar/CsarValidatorTest.java
new file mode 100644
index 0000000..bd363fc
--- /dev/null
+++ b/csarvalidation/src/test/java/org/onap/validation/csar/CsarValidatorTest.java
@@ -0,0 +1,291 @@
+/*
+ * Copyright 2017 Huawei Technologies Co., Ltd.
+ * Copyright 2020 Nokia
+ * <p>
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.
+ *
+ */
+
+package org.onap.validation.csar;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.zip.ZipException;
+import java.util.zip.ZipFile;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
+
+@RunWith(MockitoJUnitRunner.class)
+public class CsarValidatorTest {
+
+    String regex = "^\\/[a-zA-Z]\\:\\/";
+
+    ClassLoader classLoader = getClass().getClassLoader();
+
+    Pattern pattern = Pattern.compile(regex);
+
+    private String csarFile = classLoader.getResource("enterprise2DC.csar").getFile();
+
+    Matcher matcher = pattern.matcher(csarFile);
+
+    String sample1 = System.getProperty("file.separator") + csarFile.substring(1);
+
+    String packageId = UUID.randomUUID().toString();
+
+    private String csarFile2 = classLoader.getResource("vEPC_NS.csar").getFile();
+
+    String sample2 = System.getProperty("file.separator") + csarFile2.substring(1);
+
+    String packageId2 = UUID.randomUUID().toString();
+
+    private String cf = classLoader.getResource("testR02454.csar").getFile();
+
+    String sample = System.getProperty("file.separator") + cf.substring(1);
+
+    String pkgid = UUID.randomUUID().toString();
+
+    private String csarFile3 = classLoader.getResource("vIMS_NS.csar").getFile();
+
+    String sample3 = System.getProperty("file.separator") + csarFile3.substring(1);
+
+    String packageId3 = UUID.randomUUID().toString();
+
+    private String csarFile4 = classLoader.getResource("VoLTE.csar").getFile();
+
+    String sample4 = System.getProperty("file.separator") + csarFile4.substring(1);
+
+    String packageId4 = UUID.randomUUID().toString();
+
+    private String csarFile5 = classLoader.getResource("sample2.csar").getFile();
+
+    String sample5 = System.getProperty("file.separator") + csarFile5.substring(1);
+
+    String packageId5 = UUID.randomUUID().toString();
+
+    @Test
+    public void testAll() throws IOException, InterruptedException {
+        CsarValidator csarValidator = new CsarValidator(packageId, sample1);
+        testValidateCsar(csarValidator);
+        CsarValidator csarValidator2 = new CsarValidator(packageId2, sample2);
+        testValidateCsar(csarValidator2);
+        CsarValidator csarValidator3 = new CsarValidator(packageId3, sample3);
+        testValidateCsar(csarValidator3);
+        CsarValidator csarValidator4 = new CsarValidator(packageId4, sample4);
+        testValidateCsar(csarValidator4);
+        CsarValidator csarValidator5 = new CsarValidator(packageId5, sample5);
+        testValidateCsar(csarValidator5);
+        String sample1Dir = sample1.replace(".csar", "");
+        String sample2Dir = sample2.replace(".csar", "");
+        String sample3Dir = sample3.replace(".csar", "");
+        String sample4Dir = sample4.replace(".csar", "");
+        String sample5Dir = sample5.replace(".csar", "");
+        boolean result = FileUtil.deleteDirectory(sample1Dir);
+        boolean result1 = FileUtil.deleteDirectory(sample2Dir);
+        boolean result2 = FileUtil.deleteDirectory(sample3Dir);
+        boolean result3 = FileUtil.deleteDirectory(sample4Dir);
+        boolean result4 = FileUtil.deleteDirectory(sample5Dir);
+        assertEquals(true, result == true && result1 == true && result2 == true && result3 == true && result4 == true);
+    }
+
+    @Test
+    public void testIndividual() throws IOException, InterruptedException {
+        CsarValidator csarValidator = new CsarValidator(packageId, sample1);
+        testValidateCsarMeta(csarValidator);
+        testValidateCsarIntegrity(csarValidator);
+        testValidateToscaMeta(csarValidator);
+
+        CsarValidator csarValidator2 = new CsarValidator(packageId2, sample2);
+        testValidateCsarIntegrity(csarValidator2);
+        testValidateToscaMeta(csarValidator2);
+        testValidateMainService(csarValidator2);
+
+        CsarValidator csarValidator3 = new CsarValidator(packageId3, sample3);
+        testValidateCsarIntegrity(csarValidator3);
+        testValidateToscaMeta(csarValidator3);
+        testValidateMainService(csarValidator3);
+
+        CsarValidator csarValidator4 = new CsarValidator(packageId4, sample4);
+        testValidateCsarIntegrity(csarValidator4);
+        testValidateToscaMeta(csarValidator4);
+        testValidateMainService(csarValidator4);
+
+        CsarValidator csarValidator5 = new CsarValidator(packageId5, sample5);
+        testValidateCsarIntegrity(csarValidator5);
+        testValidateToscaMeta(csarValidator5);
+        testValidateMainService(csarValidator5);
+
+        CsarValidator csarValidator6 = new CsarValidator(pkgid, sample);
+        testValidateCsarIntegrity(csarValidator6);
+        testValidateToscaMeta(csarValidator6);
+        testValidateMainService(csarValidator6);
+        testR02454(csarValidator6);
+        // Rel1 specific test case
+        String sample1Dir = sample1.replace(".csar", "");
+        String sample2Dir = sample2.replace(".csar", "");
+        String sample3Dir = sample3.replace(".csar", "");
+        String sample4Dir = sample4.replace(".csar", "");
+        String sample5Dir = sample5.replace(".csar", "");
+        String sampleDir = sample.replace(".csar", "");
+        boolean result = FileUtil.deleteDirectory(sample1Dir);
+        boolean result1 = FileUtil.deleteDirectory(sample2Dir);
+        boolean result2 = FileUtil.deleteDirectory(sample3Dir);
+        boolean result3 = FileUtil.deleteDirectory(sample4Dir);
+        boolean result4 = FileUtil.deleteDirectory(sample5Dir);
+        boolean result5 = FileUtil.deleteDirectory(sampleDir);
+        assertEquals(true, result == true && result1 == true && result2 == true && result3 == true && result4 == true);
+    }
+
+    @Test
+    public void testCloseInputStreamForNonExistingDirectory() {
+        InputStream dir = null;
+        FileUtil.closeInputStream(dir);
+        assertTrue(true);
+    }
+
+    @Test(expected = ValidationException.class)
+    public void testCloseInputStream() throws IOException {
+        InputStream inputStream = mock(InputStream.class);
+        Mockito.doThrow(new IOException()).when(inputStream).close();
+        FileUtil.closeInputStream(inputStream);
+        assertTrue(true);
+    }
+
+    @Test
+    public void testCloseZipFile() throws ZipException, IOException {
+        File file = new File(sample1);
+        ZipFile dir1 = new ZipFile(file);
+        FileUtil.closeZipFile(dir1);
+        assertTrue(true);
+    }
+
+    @Test(expected = IOException.class)
+    public void testCloseFileStream() throws IOException {
+        FileInputStream dir3 = new FileInputStream(sample1);
+        FileUtil.closeFileStream(dir3);
+        dir3.available();
+
+    }
+
+    @Test(expected = ValidationException.class)
+    public void testCloseFileStream_reportErrorWhenIOExceptionOccurs() throws IOException {
+        FileInputStream fileInputStream = mock(FileInputStream.class);
+        Mockito.doThrow(new IOException()).when(fileInputStream).close();
+        FileUtil.closeFileStream(fileInputStream);
+    }
+
+    @Test
+    public void testCloseOutptutStream() {
+        OutputStream dir4 = new OutputStream() {
+
+            @Override
+            public void write(int number) throws IOException {
+
+            }
+        };
+        FileUtil.closeOutputStream(dir4);
+        assertTrue(true);
+    }
+
+    @Test(expected = ValidationException.class)
+    public void testCloseOutptutStream_reportErrorWhenIOExceptionOccurs() throws IOException {
+        OutputStream outputStream = mock(OutputStream.class);
+        Mockito.doThrow(new IOException()).when(outputStream).close();
+        FileUtil.closeOutputStream(outputStream);
+    }
+
+    private void testValidateCsarMeta(CsarValidator cv) {
+        String result = CsarValidator.validateCsarMeta();
+        assertEquals(true, result == CommonConstants.SUCCESS_STR);
+    }
+
+    private void testValidateCsarIntegrity(CsarValidator cv) {
+        boolean result = CsarValidator.validateCsarIntegrity(sample1);
+        assertEquals(true, result == true);
+    }
+
+    private void testValidateToscaMeta(CsarValidator cv) {
+        String result = CsarValidator.validateAndScanToscaMeta();
+        assertEquals(true, result == CommonConstants.SUCCESS_STR);
+    }
+
+    private void testValidateMainService(CsarValidator cv) {
+
+        String result = CsarValidator.validateMainService();
+        assertEquals(true, result == CommonConstants.SUCCESS_STR);
+    }
+
+    private void testValidateCsar(CsarValidator cv) {
+
+        String result = CsarValidator.validateCsar();
+        assertEquals(true, result == CommonConstants.SUCCESS_STR);
+    }
+
+    private void testR02454(CsarValidator cv) {
+        String result = CsarValidator.r02454();
+        assertEquals(true, result == CommonConstants.SUCCESS_STR);
+    }
+
+    @Test
+    public void testValidateCsar_csarMetaFailed() {
+        CsarValidator.CsarValidatorSeam csarValidatorSeam = mock(CsarValidator.CsarValidatorSeam.class);
+        Mockito.when(csarValidatorSeam.validateCsarMeta()).thenReturn("FAIL");
+        Mockito.when(csarValidatorSeam.validateAndScanToscaMeta()).thenReturn("SUCCESS");
+        Mockito.when(csarValidatorSeam.validateMainService()).thenReturn("FAIL");
+
+
+        String res=CsarValidator.validateCsarContent(csarValidatorSeam);
+        assertEquals("FAIL OR FAIL",res);
+
+    }
+
+    @Test
+    public void testValidateCsar_toscaMetaFailed() {
+        CsarValidator.CsarValidatorSeam csarValidatorSeam = mock(CsarValidator.CsarValidatorSeam.class);
+        Mockito.when(csarValidatorSeam.validateCsarMeta()).thenReturn("SUCCESS");
+        Mockito.when(csarValidatorSeam.validateAndScanToscaMeta()).thenReturn("FAIL");
+        Mockito.when(csarValidatorSeam.validateMainService()).thenReturn("SUCCESS");
+
+
+        String res=CsarValidator.validateCsarContent(csarValidatorSeam);
+        assertEquals("FAIL",res);
+    }
+
+    @Test
+    public void testDeleteDir(){
+        String dstPath = "./dstPathForTest1";
+        File dst = new File(dstPath);
+        dst.mkdir();
+        assertTrue(FileUtil.deleteFile(dstPath));
+    }
+
+    @Test
+    public void testCreateDirectory() {
+        String dirPath = "src//test//resources//TestDirectory";
+        boolean res = FileUtil.createDirectory(dirPath);
+        assertTrue(res);
+    }
+}
diff --git a/csarvalidation/src/test/java/org/onap/validation/csar/ValidationExceptionTest.java b/csarvalidation/src/test/java/org/onap/validation/csar/ValidationExceptionTest.java
new file mode 100644
index 0000000..fcbc439
--- /dev/null
+++ b/csarvalidation/src/test/java/org/onap/validation/csar/ValidationExceptionTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2020 Nokia
+ * <p>
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.
+ *
+ */
+
+package org.onap.validation.csar;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import org.junit.Test;
+import org.onap.validation.csar.ErrorCodes;
+import org.onap.validation.csar.ValidationException;
+
+public class ValidationExceptionTest {
+    ValidationException validationException = new ValidationException();
+
+    @Test
+    public void testWrappedInfoThrowableErrorCodes() {
+        Throwable ex = new IOException();
+        ValidationException.wrappedInfo(ex, ErrorCodes.FILE_IO);
+        assertTrue(true);
+    }
+
+    @Test
+    public void testWrappedInfoThrowableErrorCodes1() {
+        Throwable ex = new ValidationException();
+        ValidationException.wrappedInfo(ex, ErrorCodes.FILE_IO);
+        assertTrue(true);
+    }
+
+    @Test
+    public void testWrappedInfoThrowableErrorCodes2() {
+        Throwable ex = new ValidationException();
+        ValidationException.wrappedInfo(ex, null);
+        assertTrue(true);
+    }
+}
diff --git a/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarValidatorTest.java b/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarValidatorTest.java
deleted file mode 100644
index 2fe3640..0000000
--- a/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarValidatorTest.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/**
- * Copyright 2017 Huawei Technologies Co., Ltd.
- *
- * 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.
- */
-
-package org.onap.validation.csarvalidationtest;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.UUID;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-
-import org.junit.Test;
-import org.onap.validation.csar.CommonConstants;
-import org.onap.validation.csar.CsarValidator;
-import org.onap.validation.csar.FileUtil;
-
-public class CsarValidatorTest {
-
-    String regex = "^\\/[a-zA-Z]\\:\\/";
-
-    ClassLoader classLoader = getClass().getClassLoader();
-
-    Pattern pattern = Pattern.compile(regex);
-
-    private String csarFile = classLoader.getResource("enterprise2DC.csar").getFile();
-
-    Matcher matcher = pattern.matcher(csarFile);
-
-    String sample1 = System.getProperty("file.separator") + csarFile.substring(1);
-
-    String packageId = UUID.randomUUID().toString();
-
-    private String csarFile2 = classLoader.getResource("vEPC_NS.csar").getFile();
-
-    String sample2 = System.getProperty("file.separator") + csarFile2.substring(1);
-
-    String packageId2 = UUID.randomUUID().toString();
-
-    private String cf = classLoader.getResource("testR02454.csar").getFile();
-
-    String sample = System.getProperty("file.separator") + cf.substring(1);
-
-    String pkgid = UUID.randomUUID().toString();
-
-    private String csarFile3 = classLoader.getResource("vIMS_NS.csar").getFile();
-
-    String sample3 = System.getProperty("file.separator") + csarFile3.substring(1);
-
-    String packageId3 = UUID.randomUUID().toString();
-
-    private String csarFile4 = classLoader.getResource("VoLTE.csar").getFile();
-
-    String sample4 = System.getProperty("file.separator") + csarFile4.substring(1);
-
-    String packageId4 = UUID.randomUUID().toString();
-
-    private String csarFile5 = classLoader.getResource("sample2.csar").getFile();
-
-    String sample5 = System.getProperty("file.separator") + csarFile5.substring(1);
-
-    String packageId5 = UUID.randomUUID().toString();
-
-    @Test
-    public void testAll() throws IOException, InterruptedException {
-        CsarValidator csarValidator = new CsarValidator(packageId, sample1);
-        testValidateCsar(csarValidator);
-        CsarValidator csarValidator2 = new CsarValidator(packageId2, sample2);
-        testValidateCsar(csarValidator2);
-        CsarValidator csarValidator3 = new CsarValidator(packageId3, sample3);
-        testValidateCsar(csarValidator3);
-        CsarValidator csarValidator4 = new CsarValidator(packageId4, sample4);
-        testValidateCsar(csarValidator4);
-        CsarValidator csarValidator5 = new CsarValidator(packageId5, sample5);
-        testValidateCsar(csarValidator5);
-        String sample1Dir = sample1.replace(".csar", "");
-        String sample2Dir = sample2.replace(".csar", "");
-        String sample3Dir = sample3.replace(".csar", "");
-        String sample4Dir = sample4.replace(".csar", "");
-        String sample5Dir = sample5.replace(".csar", "");
-        boolean result = FileUtil.deleteDirectory(sample1Dir);
-        boolean result1 = FileUtil.deleteDirectory(sample2Dir);
-        boolean result2 = FileUtil.deleteDirectory(sample3Dir);
-        boolean result3 = FileUtil.deleteDirectory(sample4Dir);
-        boolean result4 = FileUtil.deleteDirectory(sample5Dir);
-        assertEquals(true, result == true && result1 == true && result2 == true && result3 == true && result4 == true);
-    }
-
-    @Test
-    public void testIndividual() throws IOException, InterruptedException {
-        CsarValidator csarValidator = new CsarValidator(packageId, sample1);
-        testValidateCsarMeta(csarValidator);
-        testValidateCsarIntegrity(csarValidator);
-        testValidateToscaMeta(csarValidator);
-
-        CsarValidator csarValidator2 = new CsarValidator(packageId2, sample2);
-        testValidateCsarIntegrity(csarValidator2);
-        testValidateToscaMeta(csarValidator2);
-        testValidateMainService(csarValidator2);
-
-        CsarValidator csarValidator3 = new CsarValidator(packageId3, sample3);
-        testValidateCsarIntegrity(csarValidator3);
-        testValidateToscaMeta(csarValidator3);
-        testValidateMainService(csarValidator3);
-
-        CsarValidator csarValidator4 = new CsarValidator(packageId4, sample4);
-        testValidateCsarIntegrity(csarValidator4);
-        testValidateToscaMeta(csarValidator4);
-        testValidateMainService(csarValidator4);
-
-        CsarValidator csarValidator5 = new CsarValidator(packageId5, sample5);
-        testValidateCsarIntegrity(csarValidator5);
-        testValidateToscaMeta(csarValidator5);
-        testValidateMainService(csarValidator5);
-
-        CsarValidator csarValidator6 = new CsarValidator(pkgid, sample);
-        testValidateCsarIntegrity(csarValidator6);
-        testValidateToscaMeta(csarValidator6);
-        testValidateMainService(csarValidator6);
-        testR02454(csarValidator6);
-        // Rel1 specific test case
-        String sample1Dir = sample1.replace(".csar", "");
-        String sample2Dir = sample2.replace(".csar", "");
-        String sample3Dir = sample3.replace(".csar", "");
-        String sample4Dir = sample4.replace(".csar", "");
-        String sample5Dir = sample5.replace(".csar", "");
-        String sampleDir = sample.replace(".csar", "");
-        boolean result = FileUtil.deleteDirectory(sample1Dir);
-        boolean result1 = FileUtil.deleteDirectory(sample2Dir);
-        boolean result2 = FileUtil.deleteDirectory(sample3Dir);
-        boolean result3 = FileUtil.deleteDirectory(sample4Dir);
-        boolean result4 = FileUtil.deleteDirectory(sample5Dir);
-        boolean result5 = FileUtil.deleteDirectory(sampleDir);
-        assertEquals(true, result == true && result1 == true && result2 == true && result3 == true && result4 == true);
-    }
-
-    @Test
-    public void testCloseInputStream() {
-        InputStream dir = null;
-        FileUtil.closeInputStream(dir);
-        assertTrue(true);
-    }
-
-    @Test
-    public void testCloseZipFile() throws ZipException, IOException {
-        File file = new File(sample1);
-        ZipFile dir1 = new ZipFile(file);
-        FileUtil.closeZipFile(dir1);
-        assertTrue(true);
-    }
-
-    @Test(expected = IOException.class)
-    public void testCloseFileStream() throws IOException {
-        FileInputStream dir3 = new FileInputStream(sample1);
-        FileUtil.closeFileStream(dir3);
-        dir3.available();
-
-    }
-
-    @Test
-    public void testCloseOutptutStream() {
-        OutputStream dir4 = new OutputStream() {
-
-            @Override
-            public void write(int number) throws IOException {
-
-            }
-        };
-        FileUtil.closeOutputStream(dir4);
-        assertTrue(true);
-    }
-
-    private void testValidateCsarMeta(CsarValidator cv) {
-        String result = CsarValidator.validateCsarMeta();
-        assertEquals(true, result == CommonConstants.SUCCESS_STR);
-    }
-
-    private void testValidateCsarIntegrity(CsarValidator cv) {
-        boolean result = CsarValidator.validateCsarIntegrity(sample1);
-        assertEquals(true, result == true);
-    }
-
-    private void testValidateToscaMeta(CsarValidator cv) {
-        String result = CsarValidator.validateAndScanToscaMeta();
-        assertEquals(true, result == CommonConstants.SUCCESS_STR);
-    }
-
-    private void testValidateMainService(CsarValidator cv) {
-
-        String result = CsarValidator.validateMainService();
-        assertEquals(true, result == CommonConstants.SUCCESS_STR);
-    }
-
-    private void testValidateCsar(CsarValidator cv) {
-
-        String result = CsarValidator.validateCsar();
-        assertEquals(true, result == CommonConstants.SUCCESS_STR);
-    }
-
-    private void testR02454(CsarValidator cv) {
-        String result = CsarValidator.r02454();
-        assertEquals(true, result == CommonConstants.SUCCESS_STR);
-    }
-
-    @Test
-    public void testDeleteDir(){
-        String dstPath = "./dstPathForTest1";
-        File dst = new File(dstPath);
-        dst.mkdir();
-        assertTrue(FileUtil.deleteFile(dstPath));
-    }
-
-    @Test
-    public void testCreateDirectory() {
-        String dirPath = "src//test//resources//TestDirectory";
-        boolean res = FileUtil.createDirectory(dirPath);
-        assertTrue(res);
-    }
-}
diff --git a/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/ValidationExceptionTest.java b/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/ValidationExceptionTest.java
deleted file mode 100644
index 8ab498e..0000000
--- a/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/ValidationExceptionTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Copyright 2017 Huawei Technologies Co., Ltd.
- * <p>
- * 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
- * <p>
- *     http://www.apache.org/licenses/LICENSE-2.0
- *     <p>
- * 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.
- */
-
-package org.onap.validation.csarvalidationtest;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import org.junit.Test;
-import org.onap.validation.csar.ErrorCodes;
-import org.onap.validation.csar.ValidationException;
-
-public class ValidationExceptionTest {
-    ValidationException validationException = new ValidationException();
-
-    @Test
-    public void testWrappedInfoThrowableErrorCodes() {
-        Throwable ex = new IOException();
-        ValidationException.wrappedInfo(ex, ErrorCodes.FILE_IO);
-        assertTrue(true);
-    }
-
-    @Test
-    public void testWrappedInfoThrowableErrorCodes1() {
-        Throwable ex = new ValidationException();
-        ValidationException.wrappedInfo(ex, ErrorCodes.FILE_IO);
-        assertTrue(true);
-    }
-
-    @Test
-    public void testWrappedInfoThrowableErrorCodes2() {
-        Throwable ex = new ValidationException();
-        ValidationException.wrappedInfo(ex, null);
-        assertTrue(true);
-    }
-}
-- 
cgit 1.2.3-korg