8321616: Retire binary test vectors in test/jdk/java/util/zip/ZipFile

test/jdk/java/util/zip/ZipFile/Available.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,17 +21,81 @@
  * questions.
  */
 
-import java.util.zip.*;
-import java.io.File;
-
-public class Available
-{
-    public static void main (String argv[]) throws Exception {
-        ZipFile zf = new ZipFile(new File(System.getProperty("test.src"),
-                                          "input.jar"));
-        ZipEntry e = zf.getEntry("ReleaseInflater.java");
-        if (e.getSize() != zf.getInputStream(e).available()) {
-            throw new Exception("wrong return value of available");
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipOutputStream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/*
+ * @test
+ * @bug 4401122
+ * @run junit Available
+ */
+public class Available {
+    // ZIP file produced by this test
+    private Path zip = Path.of("available.zip");
+    // The number of uncompressed bytes to write to the ZIP entry
+    private static final int EXPECTED_BYTES = 512;
+
+    /**
+     * Produce a ZIP file containing an entry with byte length
+     * @throws IOException if an unexpected IOException occurs
+     */
+    @BeforeEach
+    public void setUp() throws IOException {
+        try (ZipOutputStream zo = new ZipOutputStream(Files.newOutputStream(zip))) {
+            zo.putNextEntry(new ZipEntry("file.txt"));
+            zo.write(new byte[EXPECTED_BYTES]);
+        }
+    }
+
+    /**
+     * Clean up the ZIP file produced by this test
+     * @throws IOException if an unexpected IOException occurs
+     */
+    @AfterEach
+    public void cleanup() throws IOException {
+        Files.deleteIfExists(zip);
+    }
+
+    /**
+     * Check that the available() method overriden by the input stream returned by
+     * ZipFile.getInputStream correctly returns the number of remaining uncompressed bytes
+     *
+     * @throws IOException if an unexpected IOException occurs
+     */
+    @Test
+    public void shouldReturnRemainingUncompressedBytes() throws IOException {
+        try (ZipFile zf = new ZipFile(zip.toFile())) {
+            ZipEntry e = zf.getEntry("file.txt");
+            try (InputStream in = zf.getInputStream(e)) {
+                // Initially, available() should return the full uncompressed size of the entry
+                assertEquals(EXPECTED_BYTES, in.available(),
+                        "wrong initial return value of available");
+
+                // Reading a few bytes should reduce the number of available bytes accordingly
+                int bytesToRead = 10;
+                in.read(new byte[bytesToRead]);
+                assertEquals(EXPECTED_BYTES - bytesToRead, in.available());
+
+                // Reading all remaining bytes should reduce the number of available bytes to zero
+                in.transferTo(OutputStream.nullOutputStream());
+                assertEquals(0, in.available());
+
+                // available on a closed input stream should return zero
+                in.close();
+                assertEquals(0, in.available());
+            }
         }
     }
 }

test/jdk/java/util/zip/ZipFile/CopyJar.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,25 +24,80 @@
 /* @test 1.1 99/06/01
    @bug 4239446
    @summary Make sure the ZipEntry fields are correct.
+   @run junit CopyJar
  */
 
-import java.io.*;
-import java.util.zip.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipOutputStream;
 
 public class CopyJar {
-    public static void main(String args[]) throws Exception {
-        try (ZipFile zf = new ZipFile(new File(System.getProperty("test.src", "."),
-                                               "input.jar"))) {
-            ZipEntry ze = zf.getEntry("ReleaseInflater.java");
-            ZipOutputStream zos = new ZipOutputStream(new ByteArrayOutputStream());
-            InputStream in = zf.getInputStream(ze);
-            byte[] b = new byte[128];
-            int n;
-            zos.putNextEntry(ze);
-            while((n = in.read(b)) != -1) {
-                zos.write(b, 0, n);
+
+    // ZIP file produced by this test
+    private Path jar = Path.of("copy-jar.jar");
+
+    /**
+     * Create a sample ZIP file used by this test
+     *
+     * @throws IOException if an unexpected IOException occurs
+     */
+    @BeforeEach
+    public void setUp() throws IOException {
+        try (JarOutputStream jo = new JarOutputStream(Files.newOutputStream(jar), new Manifest())) {
+            jo.putNextEntry(new ZipEntry("file.txt"));
+            jo.write("helloworld".getBytes(StandardCharsets.UTF_8));
+        }
+    }
+
+    /**
+     * Clean up the ZIP file produced by this test
+     *
+     * @throws IOException if an unexpected IOException occurs
+     */
+    @AfterEach
+    public void cleanup() throws IOException {
+        Files.deleteIfExists(jar);
+    }
+
+    /**
+     * Check that a ZipEntry read by ZipFile.getEntry does not produce
+     * a CRC value inconsistent with the CRC computed when the entry
+     * and its content is copied over to a ZipOutputStream
+     *
+     * @throws IOException if an unexpected IOException occurs
+     */
+    @Test
+    public void copyingZipEntryShouldFailCRCValidation() throws IOException {
+        try (ZipFile zf = new ZipFile(jar.toFile())) {
+            ZipEntry ze = zf.getEntry("file.txt");
+
+            try (ZipOutputStream zos = new ZipOutputStream(OutputStream.nullOutputStream());
+                 InputStream in = zf.getInputStream(ze)) {
+                /* The original bug mentions that ZipEntry
+                 * 'loses the correct CRC value read from the CEN directory'.
+                 * Enable the code below to trigger a ZipException similar to the bug description
+                 */
+                if (false) {
+                    // Reset the CRC, as if a zero value was read from a streaming mode LOC header
+                    ze.setCrc(0);
+                    // Required to set ZipEntry.csizeSet = true
+                    ze.setCompressedSize(ze.getCompressedSize());
+                }
+                zos.putNextEntry(ze);
+                in.transferTo(zos);
             }
-            zos.close();
         }
     }
 }

test/jdk/java/util/zip/ZipFile/EnumerateAfterClose.java

@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.
+ */
+
+/* @test
+   @bug 4290060
+   @summary Check if the zip file is closed before access any
+            elements in the Enumeration.
+   @run junit EnumerateAfterClose
+ */
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Enumeration;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipOutputStream;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class EnumerateAfterClose {
+
+    // ZIP file used in this test
+    private Path zip = Path.of("enum-after-close.zip");
+
+    /**
+     * Create a sample ZIP file for use by this test
+     * @throws IOException if an unexpected IOException occurs
+     */
+    @BeforeEach
+    public void setUp() throws IOException {
+        try (OutputStream out = Files.newOutputStream(zip);
+             ZipOutputStream zo = new ZipOutputStream(out)) {
+            zo.putNextEntry(new ZipEntry("file.txt"));
+            zo.write("hello".getBytes(StandardCharsets.UTF_8));
+        }
+    }
+
+    /**
+     * Delete the ZIP file produced by this test
+     * @throws IOException if an unexpected IOException occurs
+     */
+    @AfterEach
+    public void cleanup() throws IOException {
+        Files.deleteIfExists(zip);
+    }
+
+    /**
+     * Attempting to using a ZipEntry Enumeration after its backing
+     * ZipFile is closed should throw IllegalStateException.
+     *
+     * @throws IOException if an unexpected IOException occurs
+     */
+    @Test
+    public void enumeratingAfterCloseShouldThrowISE() throws IOException {
+        // Retain a reference to an enumeration backed by a closed ZipFile
+        Enumeration e;
+        try (ZipFile zf = new ZipFile(zip.toFile())) {
+            e = zf.entries();
+        }
+        // Using the enumeration after the ZipFile is closed should throw ISE
+        assertThrows(IllegalStateException.class, () -> {
+            if (e.hasMoreElements()) {
+                ZipEntry ze = (ZipEntry)e.nextElement();
+            }
+        });
+    }
+}