1 files changed, 109 insertions, 0 deletions
diff --git a/framework/src/ant/apache-ant-1.9.6/src/tests/junit/org/apache/tools/ant/taskdefs/ZipExtraFieldTest.java b/framework/src/ant/apache-ant-1.9.6/src/tests/junit/org/apache/tools/ant/taskdefs/ZipExtraFieldTest.java
new file mode 100644
index 00000000..c5a42162
--- /dev/null
+++ b/framework/src/ant/apache-ant-1.9.6/src/tests/junit/org/apache/tools/ant/taskdefs/ZipExtraFieldTest.java
@@ -0,0 +1,109 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You 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.apache.tools.ant.taskdefs;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Iterator;
+
+import org.apache.tools.ant.types.Resource;
+
+import org.apache.tools.ant.types.ResourceCollection;
+import org.apache.tools.ant.types.resources.ZipResource;
+import org.apache.tools.zip.JarMarker;
+import org.apache.tools.zip.Zip64ExtendedInformationExtraField;
+import org.apache.tools.zip.ZipEntry;
+import org.apache.tools.zip.ZipExtraField;
+import org.apache.tools.zip.ZipFile;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class ZipExtraFieldTest {
+
+    @Test
+    public void testPreservesExtraFields() throws IOException {
+        testExtraField(new Zip(), true);
+    }
+
+    public void testDoesntCreateZip64ExtraFieldForJar() throws IOException {
+        testExtraField(new Jar(), false);
+    }
+
+    private void testExtraField(Zip testInstance, boolean expectZip64)
+        throws IOException {
+
+        File f = File.createTempFile("ziptest", ".zip");
+        f.delete();
+        ZipFile zf = null;
+        try {
+            testInstance.setDestFile(f);
+            final ZipResource r = new ZipResource() {
+                    public String getName() {
+                        return "x";
+                    }
+                    public boolean isExists() {
+                        return true;
+                    }
+                    public boolean isDirectory() {
+                        return false;
+                    }
+                    public long getLastModified() {
+                        return 1;
+                    }
+                    public InputStream getInputStream() {
+                        return new ByteArrayInputStream(new byte[0]);
+                    }
+                    public ZipExtraField[] getExtraFields() {
+                        return new ZipExtraField[] {
+                            new JarMarker()
+                        };
+                    }
+                };
+            testInstance.add(new ResourceCollection() {
+                    public boolean isFilesystemOnly() { return false; }
+                    public int size() { return 1; }
+                    public Iterator<Resource> iterator() {
+                        return Collections.<Resource>singleton(r).iterator();
+                    }
+                });
+            testInstance.execute();
+
+            zf = new ZipFile(f);
+            ZipEntry ze = zf.getEntry("x");
+            assertNotNull(ze);
+            assertEquals(expectZip64 ? 2 : 1, ze.getExtraFields().length);
+            assertTrue(ze.getExtraFields()[0] instanceof JarMarker);
+            if (expectZip64) {
+                assertTrue(ze.getExtraFields()[1]
+                           instanceof Zip64ExtendedInformationExtraField);
+            }
+        } finally {
+            ZipFile.closeQuietly(zf);
+            if (f.exists()) {
+                f.delete();
+            }
+        }
+    }
+}