VFS-676 : add some tests

ignore two test : testCannotDeleteWhileStreaming , testCannotDeleteWhileStreaming2 add a new test : testReadStreamAfterDeleteFile
apache · May 25, 2020 · 1955e15 · 1955e15
1 parent 24969cb
commit 1955e15
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 16 deletions.
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileObject.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileObject.java
@@ -39,7 +39,9 @@
  */
 public class JarFileObject extends AbstractFileObject<JarFileSystem> {
 
-    /** The JarEntry. */
+    /**
+     * The JarEntry.
+     */
     protected JarEntry entry;
     private final HashSet<String> children = new HashSet<>();
     private FileType type;
@@ -49,16 +51,16 @@ public class JarFileObject extends AbstractFileObject<JarFileSystem> {
     private Attributes attributes;
 
     protected JarFileObject(final AbstractFileName name, final JarEntry entry, final JarFileSystem fs,
-            final boolean jarExists) throws FileSystemException {
+                            final boolean jarExists) throws FileSystemException {
         super(name, fs);
         setJarEntry(entry);
         if (!jarExists) {
             type = FileType.IMAGINARY;
         }
         if (entry != null) {
-			// For Java 9 and up: Force the certificates to be read and cached now. This avoids an
-			// IllegalStateException in java.util.jar.JarFile.isMultiRelease() when it tries
-			// to read the certificates and the file is closed.
+            // For Java 9 and up: Force the certificates to be read and cached now. This avoids an
+            // IllegalStateException in java.util.jar.JarFile.isMultiRelease() when it tries
+            // to read the certificates and the file is closed.
             entry.getCertificates();
         }
         this.fs = fs;
@@ -118,6 +120,7 @@ public boolean isWriteable() throws FileSystemException {
 
     /**
      * Returns the file's type.
+     *
      * @since 2.7.0
      */
     @Override
@@ -127,6 +130,7 @@ protected FileType doGetType() {
 
     /**
      * Lists the children of the file.
+     *
      * @since 2.7.0
      */
     @Override
@@ -146,6 +150,7 @@ protected String[] doListChildren() {
     /**
      * Returns the size of the file content (in bytes). Is only called if {@link #doGetType} returns
      * {@link FileType#FILE}.
+     *
      * @since 2.7.0
      */
     @Override
@@ -155,6 +160,7 @@ protected long doGetContentSize() {
 
     /**
      * Returns the last modified time of this file.
+     *
      * @since 2.7.0
      */
     @Override
@@ -166,6 +172,7 @@ protected long doGetLastModifiedTime() throws Exception {
      * Creates an input stream to read the file content from. Is only called if {@link #doGetType} returns
      * {@link FileType#FILE}. The input stream returned by this method is guaranteed to be closed before this method is
      * called again.
+     *
      * @since 2.7.0
      */
     @Override
@@ -181,8 +188,8 @@ protected InputStream doGetInputStream(final int bufferSize) throws Exception {
     }
 
     /**
-    * @since 2.7.0
-    */
+     * @since 2.7.0
+     */
     @Override
     protected void doAttach() throws Exception {
         getAbstractFileSystem().getJarFile();

diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileSystem.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/jar/JarFileSystem.java
@@ -64,7 +64,7 @@ public class JarFileSystem extends AbstractFileSystem {
     private Attributes attributes;
 
     protected JarFileSystem(final AbstractFileName rootName, final FileObject parentLayer,
-            final FileSystemOptions fileSystemOptions) throws FileSystemException {
+                            final FileSystemOptions fileSystemOptions) throws FileSystemException {
         super(rootName, parentLayer, fileSystemOptions);
 
         // Make a local copy of the file
@@ -180,6 +180,7 @@ protected void doCloseCommunicationLink() {
 
     /**
      * Returns the capabilities of this file system.
+     *
      * @since 2.7.0
      */
     @Override
@@ -189,6 +190,7 @@ protected void addCapabilities(final Collection<Capability> caps) {
 
     /**
      * Creates a file object.
+     *
      * @since 2.7.0
      */
     @Override
@@ -199,6 +201,7 @@ protected FileObject createFile(final AbstractFileName name) throws FileSystemEx
 
     /**
      * Adds a file object to the cache.
+     *
      * @since 2.7.0
      */
     @Override
@@ -215,6 +218,7 @@ protected Charset getCharset() {
 
     /**
      * Returns a cached file.
+     *
      * @since 2.7.0
      */
     @Override
@@ -224,6 +228,7 @@ protected FileObject getFileFromCache(final FileName name) {
 
     /**
      * remove a cached file.
+     *
      * @since 2.7.0
      */
     @Override
@@ -232,8 +237,8 @@ protected void removeFileFromCache(final FileName name) {
     }
 
     /**
-    * @since 2.7.0
-    */
+     * @since 2.7.0
+     */
     @Override
     public String toString() {
         return super.toString() + " for " + file;

diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileObject.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileObject.java
@@ -31,13 +31,15 @@
  */
 public class ZipFileObject extends AbstractFileObject<ZipFileSystem> {
 
-    /** The ZipEntry. */
+    /**
+     * The ZipEntry.
+     */
     protected ZipArchiveEntry entry;
     private final HashSet<String> children = new HashSet<>();
     private FileType type;
 
     protected ZipFileObject(final AbstractFileName name, final ZipArchiveEntry entry, final ZipFileSystem fs,
-            final boolean zipExists) throws FileSystemException {
+                            final boolean zipExists) throws FileSystemException {
         super(name, fs);
         setZipEntry(entry);
         if (!zipExists) {

diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileSystem.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileSystem.java
@@ -58,7 +58,7 @@ public class ZipFileSystem extends AbstractFileSystem {
     private final Map<FileName, FileObject> cache = new HashMap<>();
 
     public ZipFileSystem(final AbstractFileName rootName, final FileObject parentLayer,
-            final FileSystemOptions fileSystemOptions) throws FileSystemException {
+                         final FileSystemOptions fileSystemOptions) throws FileSystemException {
         super(rootName, parentLayer, fileSystemOptions);
 
         // Make a local copy of the file
@@ -104,7 +104,7 @@ public void init() throws FileSystemException {
                 ZipFileObject parent;
                 for (AbstractFileName parentName = (AbstractFileName) name
                         .getParent(); parentName != null; fileObj = parent, parentName = (AbstractFileName) parentName
-                                .getParent()) {
+                        .getParent()) {
                     // Locate the parent
                     parent = (ZipFileObject) getFileFromCache(parentName);
                     if (parent == null) {

diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/test/FileLockTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/test/FileLockTestCase.java
@@ -17,9 +17,11 @@
 
 package org.apache.commons.vfs2.provider.zip.test;
 
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -31,6 +33,7 @@
 import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -84,7 +87,7 @@ public void setup() throws IOException {
         manager = VFS.getManager();
     }
 
-    @Test
+    @Ignore
     public void testCannotDeleteWhileStreaming() throws Exception {
         try (final FileObject zipFileObject = manager.resolveFile(zipFileUri)) {
             try (InputStream inputStream = zipFileObject.getContent().getInputStream()) {
@@ -97,7 +100,7 @@ public void testCannotDeleteWhileStreaming() throws Exception {
         assertDelete();
     }
 
-    @Test
+    @Ignore
     public void testCannotDeleteWhileStreaming2() throws Exception {
         Assume.assumeTrue(Os.isFamily(Os.OS_FAMILY_WINDOWS));
         try (final FileObject zipFileObject = manager.resolveFile(zipFileUri)) {
@@ -108,6 +111,28 @@ public void testCannotDeleteWhileStreaming2() throws Exception {
         }
     }
 
+    @Test
+    public void testReadStreamAfterDeleteFile() throws Exception {
+        // test read stream after delete file
+        try (final FileObject zipFileObject = manager.resolveFile(zipFileUri)) {
+            try (InputStream inputStream = zipFileObject.getContent().getInputStream()) {
+                // delete file after open stream
+                Assert.assertTrue("Could not delete file", newZipFile.delete());
+
+                // read file by line,count line number
+                int lineNumber = 0;
+                try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream))) {
+                    while (bufferedReader.readLine() != null) {
+                        lineNumber++;
+                    }
+                }
+
+                // check line number
+                Assert.assertTrue("Line number should be 1", (lineNumber == 1));
+            }
+        }
+    }
+
     @Test
     public void testResolveAndOpenCloseContent() throws Exception {
         resolveAndOpenCloseContent();