svn commit: r1556312 - in /commons/proper/compress/branches/compress-2.0/src: main/java/org/apache/commons/compress2/formats/ar/ test/java/org/apache/commons/compress2/formats/ test/java/org/apache/commons/compress2/formats/ar/ test/resources/

[bo...@apache.org]

Author: bodewig
Date: Tue Jan  7 18:50:04 2014
New Revision: 1556312

URL: http://svn.apache.org/r1556312
Log:
add an incomplete testcase - it isn't testing much but I've manually verified the archive is valid and the extracted files are correct

Added:
    commons/proper/compress/branches/compress-2.0/src/test/java/org/apache/commons/compress2/formats/
    commons/proper/compress/branches/compress-2.0/src/test/java/org/apache/commons/compress2/formats/ar/
    commons/proper/compress/branches/compress-2.0/src/test/java/org/apache/commons/compress2/formats/ar/RoundTripTest.java   (with props)
    commons/proper/compress/branches/compress-2.0/src/test/resources/
    commons/proper/compress/branches/compress-2.0/src/test/resources/test1.xml
      - copied unchanged from r1556168, commons/proper/compress/trunk/src/test/resources/test1.xml
    commons/proper/compress/branches/compress-2.0/src/test/resources/test2.xml
      - copied unchanged from r1556168, commons/proper/compress/trunk/src/test/resources/test2.xml
    commons/proper/compress/branches/compress-2.0/src/test/resources/test3.xml
      - copied unchanged from r1556168, commons/proper/compress/trunk/src/test/resources/test3.xml
    commons/proper/compress/branches/compress-2.0/src/test/resources/test4.xml
      - copied unchanged from r1556168, commons/proper/compress/trunk/src/test/resources/test4.xml
Modified:
    commons/proper/compress/branches/compress-2.0/src/main/java/org/apache/commons/compress2/formats/ar/IOUtils.java

Modified: commons/proper/compress/branches/compress-2.0/src/main/java/org/apache/commons/compress2/formats/ar/IOUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/branches/compress-2.0/src/main/java/org/apache/commons/compress2/formats/ar/IOUtils.java?rev=1556312&r1=1556311&r2=1556312&view=diff
==============================================================================
--- commons/proper/compress/branches/compress-2.0/src/main/java/org/apache/commons/compress2/formats/ar/IOUtils.java (original)
+++ commons/proper/compress/branches/compress-2.0/src/main/java/org/apache/commons/compress2/formats/ar/IOUtils.java Tue Jan  7 18:50:04 2014
@@ -23,6 +23,9 @@ import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
 
 /**
  * THIS CLASS WILL CERTAINLY NOT STAY HERE.
@@ -72,6 +75,23 @@ final class IOUtils {
         return count;
     }
     
+    public static long copy(final ReadableByteChannel input, final WritableByteChannel output) throws IOException {
+        return copy(input, output, 4096);
+    }
+
+    public static long copy(final ReadableByteChannel input, final WritableByteChannel output, int buffersize) throws IOException {
+        ByteBuffer buffer = ByteBuffer.allocate(buffersize);
+        int n = 0;
+        long count=0;
+        while (-1 != (n = input.read(buffer))) {
+            buffer.flip();
+            output.write(buffer);
+            buffer.clear();
+            count += n;
+        }
+        return count;
+    }
+    
     /**
      * Skips the given number of bytes by repeatedly invoking skip on
      * the given input stream if necessary.

Added: commons/proper/compress/branches/compress-2.0/src/test/java/org/apache/commons/compress2/formats/ar/RoundTripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/branches/compress-2.0/src/test/java/org/apache/commons/compress2/formats/ar/RoundTripTest.java?rev=1556312&view=auto
==============================================================================
--- commons/proper/compress/branches/compress-2.0/src/test/java/org/apache/commons/compress2/formats/ar/RoundTripTest.java (added)
+++ commons/proper/compress/branches/compress-2.0/src/test/java/org/apache/commons/compress2/formats/ar/RoundTripTest.java Tue Jan  7 18:50:04 2014
@@ -0,0 +1,158 @@
+/*
+ * 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.commons.compress2.formats.ar;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URL;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+import java.util.Locale;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.commons.compress2.archivers.ArchiveEntryParameters;
+
+public class RoundTripTest {
+
+    private File dir;
+
+    @Before
+    public void createTempDir() throws Exception {
+        dir = mkdir("dir");
+    }
+
+    @After
+    public void removeTempDir() throws Exception {
+        rmdir(dir);
+    }
+
+    @Test
+    public void testArUnarchive() throws Exception {
+        final File output = new File(dir, "bla.ar");
+        {
+            final File file1 = getFile("test1.xml");
+            final File file2 = getFile("test2.xml");
+
+            final WritableByteChannel out = new FileOutputStream(output).getChannel();
+            final ArArchiveOutput os = new ArArchiveOutput(out);
+            os.putEntry(os.createEntry(ArchiveEntryParameters.fromFile(file1)));
+            IOUtils.copy(new FileInputStream(file1).getChannel(), os);
+            os.closeEntry();
+
+            os.putEntry(os.createEntry(ArchiveEntryParameters.fromFile(file2)));
+            IOUtils.copy(new FileInputStream(file2).getChannel(), os);
+            os.closeEntry();
+            os.close();
+            out.close();
+        }
+
+        // UnArArchive Operation
+        final File input = output;
+        final ReadableByteChannel is = new FileInputStream(input).getChannel();
+        final ArArchiveInput in = new ArArchiveInput(is);
+        final ArArchiveEntry entry = in.next();
+
+        File target = new File(dir, entry.getName());
+        final WritableByteChannel out = new FileOutputStream(target).getChannel();
+
+        IOUtils.copy(in, out);
+
+        out.close();
+        in.close();
+        is.close();
+    }
+
+    public static File mkdir(String name) throws IOException {
+        File f = File.createTempFile(name, "");
+        f.delete();
+        f.mkdir();
+        return f;
+    }
+
+    public static File getFile(String path) throws IOException {
+        URL url = RoundTripTest.class.getClassLoader().getResource(path);
+        if (url == null) {
+            throw new FileNotFoundException("couldn't find " + path);
+        }
+        URI uri = null;
+        try {
+            uri = url.toURI();
+        } catch (java.net.URISyntaxException ex) {
+//          throw new IOException(ex); // JDK 1.6+
+            IOException ioe = new IOException();
+            ioe.initCause(ex);
+            throw ioe;
+        }
+        return new File(uri);
+    }
+
+    public static void rmdir(File f) {
+        String[] s = f.list();
+        if (s != null) {
+            for (String element : s) {
+                final File file = new File(f, element);
+                if (file.isDirectory()){
+                    rmdir(file);
+                }
+                boolean ok = tryHardToDelete(file);
+                if (!ok && file.exists()){
+                    System.out.println("Failed to delete "+element+" in "+f.getPath());
+                }
+            }
+        }
+        tryHardToDelete(f); // safer to delete and check
+        if (f.exists()){
+            throw new Error("Failed to delete "+f.getPath());
+        }
+    }
+
+    private static final boolean ON_WINDOWS =
+        System.getProperty("os.name").toLowerCase(Locale.ENGLISH)
+        .indexOf("windows") > -1;
+
+    /**
+     * Accommodate Windows bug encountered in both Sun and IBM JDKs.
+     * Others possible. If the delete does not work, call System.gc(),
+     * wait a little and try again.
+     *
+     * @return whether deletion was successful
+     * @since Stolen from FileUtils in Ant 1.8.0
+     */
+    public static boolean tryHardToDelete(File f) {
+        if (f != null && f.exists() && !f.delete()) {
+            if (ON_WINDOWS) {
+                System.gc();
+            }
+            try {
+                Thread.sleep(10);
+            } catch (InterruptedException ex) {
+                // Ignore Exception
+            }
+            return f.delete();
+        }
+        return true;
+    }
+}

Propchange: commons/proper/compress/branches/compress-2.0/src/test/java/org/apache/commons/compress2/formats/ar/RoundTripTest.java
------------------------------------------------------------------------------
    svn:eol-style = native