1 files changed, 97 insertions, 4 deletions

diff --git a/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarValidatorTest.java b/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarValidatorTest.java
index f9a8d8a..c2856d9 100644
--- a/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarValidatorTest.java
+++ b/csarvalidation/src/test/java/org/onap/validation/csarvalidationtest/CsarValidatorTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -35,7 +34,15 @@ import org.junit.Test;
 import org.onap.validation.csar.CommonConstants;
 import org.onap.validation.csar.CsarValidator;
 import org.onap.validation.csar.FileUtil;
-
+import org.onap.validation.csar.ValidationException;
+import org.junit.runner.RunWith;
+import mockit.integration.junit4.JMockit;
+import mockit.Expectations;
+import mockit.Mocked;
+import mockit.Mock;
+import mockit.MockUp;
+
+@RunWith(JMockit.class)
 public class CsarValidatorTest {
 
     String regex = "^\\/[a-zA-Z]\\:\\/";
@@ -162,6 +169,18 @@ public class CsarValidatorTest {
         assertTrue(true);
     }
 
+    @Test(expected = ValidationException.class)
+    public void testCloseInputStream2( @Mocked InputStream inputStream) throws IOException {
+        new Expectations(){
+            {
+                    inputStream.close();
+                    result = new IOException();
+            }
+        };
+        FileUtil.closeInputStream(inputStream);
+        assertTrue(true);
+    }
+
     @Test
     public void testCloseZipFile() throws ZipException, IOException {
         File file = new File(sample1);
@@ -170,10 +189,23 @@ public class CsarValidatorTest {
         assertTrue(true);
     }
 
-    @Test
-    public void testCloseFileStream() throws FileNotFoundException {
+    @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 testCloseFileStream2(@Mocked FileInputStream fileInputStream) throws IOException {
+        new Expectations(){
+            {
+                    fileInputStream.close();
+                    result = new IOException();
+            }
+        };
+        FileUtil.closeFileStream(fileInputStream);
     }
 
     @Test
@@ -186,6 +218,18 @@ public class CsarValidatorTest {
             }
         };
         FileUtil.closeOutputStream(dir4);
+        assertTrue(true);
+    }
+
+    @Test(expected = ValidationException.class)
+    public void testCloseOutptutStream2(@Mocked OutputStream outputStream) throws IOException {
+        new Expectations(){
+                {
+                        outputStream.close();
+                        result = new IOException();
+                }
+            };
+        FileUtil.closeOutputStream(outputStream);
     }
 
     private void testValidateCsarMeta(CsarValidator cv) {
@@ -219,4 +263,53 @@ public class CsarValidatorTest {
         String result = CsarValidator.r02454();
         assertEquals(true, result == CommonConstants.SUCCESS_STR);
     }
+
+    @Test
+    public void testValidateCsar() throws IOException {
+        new MockUp<CsarValidator>(){
+            @Mock
+            public String validateCsarMeta(){
+                          return "FAIL";
+            }
+            @Mock
+            public String validateAndScanToscaMeta(){
+                return "SUCCESS";
+            }
+            @Mock
+            public String validateMainService(){
+                return "FAIL";
+            }
+        };
+        String res=CsarValidator.validateCsar();
+        assertEquals("FAIL OR FAIL",res);
+
+    }
+
+    @Test
+    public void testValidateCsar2() throws IOException {
+        new MockUp<CsarValidator>(){
+            @Mock
+            public String validateCsarMeta(){
+                return "SUCCESS";
+            }
+            @Mock
+            public String validateAndScanToscaMeta(){
+                return "FAIL";
+            }
+            @Mock
+            public String validateMainService(){
+                return "SUCCESS";
+            }
+        };
+        String res=CsarValidator.validateCsar();
+        assertEquals("FAIL",res);
+    }
+
+    @Test
+    public void testDeleteDir(){
+        String dstPath = "./dstPathForTest1";
+        File dst = new File(dstPath);
+        dst.mkdir();
+        assertTrue(FileUtil.deleteFile(dstPath));
+    }
 }