test/jdk/nio/zipfs/ZipFSTester.java

*** 19,38 ****
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
! import java.io.*;
! import java.nio.*;
! import java.nio.channels.*;
! import java.nio.file.*;
! import java.nio.file.spi.*;
! import java.nio.file.attribute.*;
! import java.net.*;
! import java.util.*;
  import java.util.concurrent.TimeUnit;
! import java.util.zip.*;
  
  import static java.nio.file.StandardOpenOption.*;
  import static java.nio.file.StandardCopyOption.*;
  
  /*
--- 19,65 ----
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
! import java.io.File;
! import java.io.IOException;
! import java.io.InputStream;
! import java.io.OutputStream;
! import java.net.URI;
! import java.nio.ByteBuffer;
! import java.nio.channels.FileChannel;
! import java.nio.channels.SeekableByteChannel;
! import java.nio.file.DirectoryStream;
! import java.nio.file.FileAlreadyExistsException;
! import java.nio.file.FileSystem;
! import java.nio.file.FileSystemAlreadyExistsException;
! import java.nio.file.FileSystemException;
! import java.nio.file.FileSystems;
! import java.nio.file.FileVisitResult;
! import java.nio.file.Files;
! import java.nio.file.OpenOption;
! import java.nio.file.Path;
! import java.nio.file.Paths;
! import java.nio.file.SimpleFileVisitor;
! import java.nio.file.attribute.BasicFileAttributeView;
! import java.nio.file.attribute.BasicFileAttributes;
! import java.nio.file.spi.FileSystemProvider;
! import java.util.ArrayList;
! import java.util.Collections;
! import java.util.Enumeration;
! import java.util.HashMap;
! import java.util.HashSet;
! import java.util.Iterator;
! import java.util.LinkedList;
! import java.util.List;
! import java.util.Map;
! import java.util.Random;
! import java.util.Set;
  import java.util.concurrent.TimeUnit;
! import java.util.zip.ZipEntry;
! import java.util.zip.ZipFile;
  
  import static java.nio.file.StandardOpenOption.*;
  import static java.nio.file.StandardCopyOption.*;
  
  /*
*** 46,65 ****
   * @run main/othervm/java.security.policy=test.policy ZipFSTester
   */
  
  public class ZipFSTester {
  
!     public static void main(String[] args) throws Throwable {
!         try (FileSystem fs = newZipFileSystem(
!                  Paths.get(System.getProperty("test.jdk"), "jre/lib/ext/zipfs.jar"),
!                  new HashMap<String, Object>()))
!         {
              test0(fs);
              test1(fs);
              test2(fs);   // more tests
          }
!         testTime(Paths.get(System.getProperty("test.jdk"), "jre/lib/ext/zipfs.jar"));
      }
  
      static void test0(FileSystem fs)
          throws Exception
      {
--- 73,96 ----
   * @run main/othervm/java.security.policy=test.policy ZipFSTester
   */
  
  public class ZipFSTester {
  
!     public static void main(String[] args) throws Exception {
! 
!         // create JAR file for test, actual contents don't matter
!         Path jarFile = Utils.createJarFile("tester.jar",
!                 "META-INF/MANIFEST.MF",
!                 "dir1/foo",
!                 "dir2/bar");
! 
!         try (FileSystem fs = newZipFileSystem(jarFile, Collections.emptyMap())) {
              test0(fs);
              test1(fs);
              test2(fs);   // more tests
          }
!         testTime(jarFile);
      }
  
      static void test0(FileSystem fs)
          throws Exception
      {
*** 100,110 ****
              try (FileSystem fsPath = provider.newFileSystem(tmpfsPath, new HashMap<String, Object>())){}
              try (FileSystem fsUri = provider.newFileSystem(
                       new URI("jar", tmpfsPath.toUri().toString(), null),
                       new HashMap<String, Object>()))
              {
!               throw new RuntimeException("newFileSystem(uri...) does not throw exception");
              } catch (FileSystemAlreadyExistsException fsaee) {}
  
              // prepare a src
              Path src = getTempPath();
              String tmpName = src.toString();
--- 131,141 ----
              try (FileSystem fsPath = provider.newFileSystem(tmpfsPath, new HashMap<String, Object>())){}
              try (FileSystem fsUri = provider.newFileSystem(
                       new URI("jar", tmpfsPath.toUri().toString(), null),
                       new HashMap<String, Object>()))
              {
!                 throw new RuntimeException("newFileSystem(URI...) does not throw exception");
              } catch (FileSystemAlreadyExistsException fsaee) {}
  
              // prepare a src
              Path src = getTempPath();
              String tmpName = src.toString();