[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jakarta-commons-dev
Subject:    svn commit: r1670129 - in /commons/proper/compress/trunk/src: changes/ main/java/org/apache/commons/
From:       bodewig () apache ! org
Date:       2015-03-30 15:59:18
Message-ID: 20150330155918.3D921AC010E () hades ! apache ! org
[Download RAW message or body]

Author: bodewig
Date: Mon Mar 30 15:59:17 2015
New Revision: 1670129

URL: http://svn.apache.org/r1670129
Log:
COMPRESS-313 add auto-detection for LZMA streams

Added:
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/lzma/LZMAUtils.java
                
      - copied, changed from r1669820, \
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/xz/XZUtils.java
  commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/lzma/
  commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/lzma/LZMAUtilsTestCase.java
                
      - copied, changed from r1669820, \
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/xz/XZUtilsTestCase.java
 Modified:
    commons/proper/compress/trunk/src/changes/changes.xml
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
  commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java
  commons/proper/compress/trunk/src/site/xdoc/index.xml
    commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/LZMATestCase.java


Modified: commons/proper/compress/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/changes/changes.xml?rev=1670129&r1=1670128&r2=1670129&view=diff
 ==============================================================================
--- commons/proper/compress/trunk/src/changes/changes.xml (original)
+++ commons/proper/compress/trunk/src/changes/changes.xml Mon Mar 30 15:59:17 2015
@@ -54,6 +54,9 @@ breaks backwards compatibility for code
 This also changes the superclass of ZCompressorInputStream.    
 ">
 
+      <action issue="COMPRESS-313" type="add" date="2015-03-30">
+        CompressorStreamFactory can now auto-detect LZMA streams.
+      </action>
       <action issue="COMPRESS-312" type="fix" date="2015-03-28">
         TarArchiveEntry's constructor with a File and a String arg
         didn't normalize the name.

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
                
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apac \
he/commons/compress/compressors/CompressorStreamFactory.java?rev=1670129&r1=1670128&r2=1670129&view=diff
 ==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java \
                (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java \
Mon Mar 30 15:59:17 2015 @@ -29,6 +29,7 @@ import org.apache.commons.compress.compr
 import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
 import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream;
 import org.apache.commons.compress.compressors.lzma.LZMACompressorInputStream;
+import org.apache.commons.compress.compressors.lzma.LZMAUtils;
 import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
 import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream;
 import org.apache.commons.compress.compressors.xz.XZUtils;
@@ -241,6 +242,11 @@ public class CompressorStreamFactory {
                 return new XZCompressorInputStream(in, decompressConcatenated);
             }
 
+            if (LZMAUtils.matches(signature, signatureLength) &&
+                LZMAUtils.isLZMACompressionAvailable()) {
+                return new LZMACompressorInputStream(in);
+            }
+
         } catch (IOException e) {
             throw new CompressorException("Failed to detect Compressor from \
InputStream.", e);  }

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java
                
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apac \
he/commons/compress/compressors/lzma/LZMACompressorInputStream.java?rev=1670129&r1=1670128&r2=1670129&view=diff
 ==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java \
                (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/lzma/LZMACompressorInputStream.java \
Mon Mar 30 15:59:17 2015 @@ -81,4 +81,36 @@ public class LZMACompressorInputStream e
     public void close() throws IOException {
         in.close();
     }
+
+    /**
+     * Checks if the signature matches what is expected for an lzma file.
+     * 
+     * @param signature
+     *            the bytes to check
+     * @param length
+     *            the number of bytes to check
+     * @return true, if this stream is an lzma  compressed stream, false otherwise
+     * 
+     * @since 1.10
+     */
+    public static boolean matches(byte[] signature, int length) {
+
+        if (signature == null || length < 3) {
+            return false;
+        }
+
+        if (signature[0] != 0x5d) {
+            return false;
+        }
+
+        if (signature[1] != 0) {
+            return false;
+        }
+
+        if (signature[2] != 0) {
+            return false;
+        }
+
+        return true;
+    }
 }

Copied: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/lzma/LZMAUtils.java \
(from r1669820, commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/xz/XZUtils.java)
                
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apac \
he/commons/compress/compressors/lzma/LZMAUtils.java?p2=commons/proper/compress/trunk/s \
rc/main/java/org/apache/commons/compress/compressors/lzma/LZMAUtils.java&p1=commons/pr \
oper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/xz/XZUtils.java&r1=1669820&r2=1670129&rev=1670129&view=diff
 ==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/xz/XZUtils.java \
                (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/lzma/LZMAUtils.java \
Mon Mar 30 15:59:17 2015 @@ -16,66 +16,57 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.commons.compress.compressors.xz;
+package org.apache.commons.compress.compressors.lzma;
 
 import java.util.HashMap;
 import java.util.Map;
 import org.apache.commons.compress.compressors.FileNameUtil;
 
 /**
- * Utility code for the xz compression format.
+ * Utility code for the lzma compression format.
  * @ThreadSafe
- * @since 1.4
+ * @since 1.10
  */
-public class XZUtils {
+public class LZMAUtils {
 
     private static final FileNameUtil fileNameUtil;
 
     /**
-     * XZ Header Magic Bytes begin a XZ file.
-     *
-     * <p>This is a copy of {@code org.tukaani.xz.XZ.HEADER_MAGIC} in
-     * XZ for Java version 1.5.</p>
+     * LZMA Header Magic Bytes begin a LZMA file.
      */
     private static final byte[] HEADER_MAGIC = {
-        (byte) 0xFD, '7', 'z', 'X', 'Z', '\0'
+        (byte) 0x5D, 0, 0
     };
 
     static enum CachedAvailability {
         DONT_CACHE, CACHED_AVAILABLE, CACHED_UNAVAILABLE
     }
 
-    private static volatile CachedAvailability cachedXZAvailability;
+    private static volatile CachedAvailability cachedLZMAAvailability;
 
     static {
         Map<String, String> uncompressSuffix = new HashMap<String, String>();
-        uncompressSuffix.put(".txz", ".tar");
-        uncompressSuffix.put(".xz", "");
-        uncompressSuffix.put("-xz", "");
-        fileNameUtil = new FileNameUtil(uncompressSuffix, ".xz");
-        cachedXZAvailability = CachedAvailability.DONT_CACHE;
+        uncompressSuffix.put(".lzma", "");
+        uncompressSuffix.put("-lzma", "");
+        fileNameUtil = new FileNameUtil(uncompressSuffix, ".lzma");
+        cachedLZMAAvailability = CachedAvailability.DONT_CACHE;
         try {
             Class.forName("org.osgi.framework.BundleEvent");
         } catch (Exception ex) {
-            setCacheXZAvailablity(true);
+            setCacheLZMAAvailablity(true);
         }
     }
 
     /** Private constructor to prevent instantiation of this utility class. */
-    private XZUtils() {
+    private LZMAUtils() {
     }
 
     /**
-     * Checks if the signature matches what is expected for a .xz file.
-     *
-     * <p>This is more or less a copy of the version found in {@link
-     * XZCompressorInputStream} but doesn't depend on the presence of
-     * XZ for Java.</p>
+     * Checks if the signature matches what is expected for a .lzma file.
      *
      * @param   signature     the bytes to check
      * @param   length        the number of bytes to check
-     * @return  true if signature matches the .xz magic bytes, false otherwise
-     * @since 1.9
+     * @return  true if signature matches the .lzma magic bytes, false otherwise
      */
     public static boolean matches(byte[] signature, int length) {
         if (length < HEADER_MAGIC.length) {
@@ -92,20 +83,19 @@ public class XZUtils {
     }
 
     /**
-     * Are the classes required to support XZ compression available?
-     * @since 1.5
+     * Are the classes required to support LZMA compression available?
      */
-    public static boolean isXZCompressionAvailable() {
-        final CachedAvailability cachedResult = cachedXZAvailability;
+    public static boolean isLZMACompressionAvailable() {
+        final CachedAvailability cachedResult = cachedLZMAAvailability;
         if (cachedResult != CachedAvailability.DONT_CACHE) {
             return cachedResult == CachedAvailability.CACHED_AVAILABLE;
         }
-        return internalIsXZCompressionAvailable();
+        return internalIsLZMACompressionAvailable();
     }
 
-    private static boolean internalIsXZCompressionAvailable() {
+    private static boolean internalIsLZMACompressionAvailable() {
         try {
-            XZCompressorInputStream.matches(null, 0);
+            LZMACompressorInputStream.matches(null, 0);
             return true;
         } catch (NoClassDefFoundError error) {
             return false;
@@ -113,10 +103,10 @@ public class XZUtils {
     }
 
     /**
-     * Detects common xz suffixes in the given filename.
+     * Detects common lzma suffixes in the given filename.
      *
      * @param filename name of a file
-     * @return {@code true} if the filename has a common xz suffix,
+     * @return {@code true} if the filename has a common lzma suffix,
      *         {@code false} otherwise
      */
     public static boolean isCompressedFilename(String filename) {
@@ -124,14 +114,11 @@ public class XZUtils {
     }
 
     /**
-     * Maps the given name of a xz-compressed file to the name that the
-     * file should have after uncompression. Commonly used file type specific
-     * suffixes like ".txz" are automatically detected and
-     * correctly mapped. For example the name "package.txz" is mapped to
-     * "package.tar". And any filenames with the generic ".xz" suffix
-     * (or any other generic xz suffix) is mapped to a name without that
-     * suffix. If no xz suffix is detected, then the filename is returned
-     * unmapped.
+     * Maps the given name of a lzma-compressed file to the name that
+     * the file should have after uncompression.  Any filenames with
+     * the generic ".lzma" suffix (or any other generic lzma suffix)
+     * is mapped to a name without that suffix. If no lzma suffix is
+     * detected, then the filename is returned unmapped.
      *
      * @param filename name of a file
      * @return name of the corresponding uncompressed file
@@ -142,11 +129,7 @@ public class XZUtils {
 
     /**
      * Maps the given filename to the name that the file should have after
-     * compression with xz. Common file types with custom suffixes for
-     * compressed versions are automatically detected and correctly mapped.
-     * For example the name "package.tar" is mapped to "package.txz". If no
-     * custom mapping is applicable, then the default ".xz" suffix is appended
-     * to the filename.
+     * compression with lzma.
      *
      * @param filename name of a file
      * @return name of the corresponding compressed file
@@ -156,24 +139,23 @@ public class XZUtils {
     }
 
     /**
-     * Whether to cache the result of the XZ for Java check.
+     * Whether to cache the result of the LZMA check.
      *
      * <p>This defaults to {@code false} in an OSGi environment and {@code true} \
                otherwise.</p>
      * @param doCache whether to cache the result
-     * @since 1.9
      */
-    public static void setCacheXZAvailablity(boolean doCache) {
+    public static void setCacheLZMAAvailablity(boolean doCache) {
         if (!doCache) {
-            cachedXZAvailability = CachedAvailability.DONT_CACHE;
-        } else if (cachedXZAvailability == CachedAvailability.DONT_CACHE) {
-            final boolean hasXz = internalIsXZCompressionAvailable();
-            cachedXZAvailability = hasXz ? CachedAvailability.CACHED_AVAILABLE
+            cachedLZMAAvailability = CachedAvailability.DONT_CACHE;
+        } else if (cachedLZMAAvailability == CachedAvailability.DONT_CACHE) {
+            final boolean hasLzma = internalIsLZMACompressionAvailable();
+            cachedLZMAAvailability = hasLzma ? CachedAvailability.CACHED_AVAILABLE
                 : CachedAvailability.CACHED_UNAVAILABLE;
         }
     }
 
     // only exists to support unit tests
-    static CachedAvailability getCachedXZAvailability() {
-        return cachedXZAvailability;
+    static CachedAvailability getCachedLZMAAvailability() {
+        return cachedLZMAAvailability;
     }
 }

Modified: commons/proper/compress/trunk/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/site/xdoc/index.xml?rev=1670129&r1=1670128&r2=1670129&view=diff
 ==============================================================================
--- commons/proper/compress/trunk/src/site/xdoc/index.xml (original)
+++ commons/proper/compress/trunk/src/site/xdoc/index.xml Mon Mar 30 15:59:17 2015
@@ -68,6 +68,7 @@
               <li>Added support for parallel ZIP compression.</li>
               <li>Added support for raw transfer of entries from one ZIP file to \
                another without uncompress/compress.</li>
               <li>Performance improvements for creating ZIP files with lots of small \
entries.</li> +              <li>Added auto-detection for LZMA.</li>
             </ul>
           </subsection>
         </section>

Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/LZMATestCase.java
                
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apac \
he/commons/compress/compressors/LZMATestCase.java?rev=1670129&r1=1670128&r2=1670129&view=diff
 ==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/LZMATestCase.java \
                (original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/LZMATestCase.java \
Mon Mar 30 15:59:17 2015 @@ -18,9 +18,11 @@
  */
 package org.apache.commons.compress.compressors;
 
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 
 import org.apache.commons.compress.AbstractTestCase;
@@ -37,18 +39,36 @@ public final class LZMATestCase extends
         final InputStream is = new FileInputStream(input);
         try {
             final CompressorInputStream in = new LZMACompressorInputStream(is);
-            FileOutputStream out = null;
-            try {
-                out = new FileOutputStream(output);
-                IOUtils.copy(in, out);
-            } finally {
-                if (out != null) {
-                    out.close();
-                }
-                in.close();
-            }
+            copy(in, output);
+        } finally {
+            is.close();
+        }
+    }
+
+    @Test
+    public void testLZMAUnarchiveWithAutodetection() throws Exception {
+        final File input = getFile("bla.tar.lzma");
+        final File output = new File(dir, "bla.tar");
+        final InputStream is = new BufferedInputStream(new FileInputStream(input));
+        try {
+            final CompressorInputStream in = new CompressorStreamFactory()
+                .createCompressorInputStream(is);
+            copy(in, output);
         } finally {
             is.close();
         }
     }
+
+    private void copy(InputStream in, File output) throws IOException {
+        FileOutputStream out = null;
+        try {
+            out = new FileOutputStream(output);
+            IOUtils.copy(in, out);
+        } finally {
+            if (out != null) {
+                out.close();
+            }
+            in.close();
+        }
+    }
 }

Copied: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/lzma/LZMAUtilsTestCase.java \
(from r1669820, commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/xz/XZUtilsTestCase.java)
                
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apac \
he/commons/compress/compressors/lzma/LZMAUtilsTestCase.java?p2=commons/proper/compress \
/trunk/src/test/java/org/apache/commons/compress/compressors/lzma/LZMAUtilsTestCase.ja \
va&p1=commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/xz/XZUtilsTestCase.java&r1=1669820&r2=1670129&rev=1670129&view=diff
 ==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/xz/XZUtilsTestCase.java \
                (original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/compressors/lzma/LZMAUtilsTestCase.java \
Mon Mar 30 15:59:17 2015 @@ -16,96 +16,92 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.commons.compress.compressors.xz;
+package org.apache.commons.compress.compressors.lzma;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-public class XZUtilsTestCase {
+public class LZMAUtilsTestCase {
 
     @Test
     public void testIsCompressedFilename() {
-        assertFalse(XZUtils.isCompressedFilename(""));
-        assertFalse(XZUtils.isCompressedFilename(".xz"));
+        assertFalse(LZMAUtils.isCompressedFilename(""));
+        assertFalse(LZMAUtils.isCompressedFilename(".lzma"));
 
-        assertTrue(XZUtils.isCompressedFilename("x.txz"));
-        assertTrue(XZUtils.isCompressedFilename("x.xz"));
-        assertTrue(XZUtils.isCompressedFilename("x-xz"));
-
-        assertFalse(XZUtils.isCompressedFilename("xxgz"));
-        assertFalse(XZUtils.isCompressedFilename("xzz"));
-        assertFalse(XZUtils.isCompressedFilename("xaz"));
-
-        assertFalse(XZUtils.isCompressedFilename("x.txz "));
-        assertFalse(XZUtils.isCompressedFilename("x.txz\n"));
-        assertFalse(XZUtils.isCompressedFilename("x.txz.y"));
+        assertTrue(LZMAUtils.isCompressedFilename("x.lzma"));
+        assertTrue(LZMAUtils.isCompressedFilename("x-lzma"));
+
+        assertFalse(LZMAUtils.isCompressedFilename("xxgz"));
+        assertFalse(LZMAUtils.isCompressedFilename("lzmaz"));
+        assertFalse(LZMAUtils.isCompressedFilename("xaz"));
+
+        assertFalse(LZMAUtils.isCompressedFilename("x.lzma "));
+        assertFalse(LZMAUtils.isCompressedFilename("x.lzma\n"));
+        assertFalse(LZMAUtils.isCompressedFilename("x.lzma.y"));
     }
 
     @Test
     public void testGetUncompressedFilename() {
-        assertEquals("", XZUtils.getUncompressedFilename(""));
-        assertEquals(".xz", XZUtils.getUncompressedFilename(".xz"));
+        assertEquals("", LZMAUtils.getUncompressedFilename(""));
+        assertEquals(".lzma", LZMAUtils.getUncompressedFilename(".lzma"));
+
+        assertEquals("x", LZMAUtils.getUncompressedFilename("x.lzma"));
+        assertEquals("x", LZMAUtils.getUncompressedFilename("x-lzma"));
 
-        assertEquals("x.tar", XZUtils.getUncompressedFilename("x.txz"));
-        assertEquals("x", XZUtils.getUncompressedFilename("x.xz"));
-        assertEquals("x", XZUtils.getUncompressedFilename("x-xz"));
-
-        assertEquals("x.txz ", XZUtils.getUncompressedFilename("x.txz "));
-        assertEquals("x.txz\n", XZUtils.getUncompressedFilename("x.txz\n"));
-        assertEquals("x.txz.y", XZUtils.getUncompressedFilename("x.txz.y"));
+        assertEquals("x.lzma ", LZMAUtils.getUncompressedFilename("x.lzma "));
+        assertEquals("x.lzma\n", LZMAUtils.getUncompressedFilename("x.lzma\n"));
+        assertEquals("x.lzma.y", LZMAUtils.getUncompressedFilename("x.lzma.y"));
     }
 
     @Test
     public void testGetCompressedFilename() {
-        assertEquals(".xz", XZUtils.getCompressedFilename(""));
-        assertEquals("x.xz", XZUtils.getCompressedFilename("x"));
-
-        assertEquals("x.txz", XZUtils.getCompressedFilename("x.tar"));
+        assertEquals(".lzma", LZMAUtils.getCompressedFilename(""));
+        assertEquals("x.lzma", LZMAUtils.getCompressedFilename("x"));
 
-        assertEquals("x.wmf .xz", XZUtils.getCompressedFilename("x.wmf "));
-        assertEquals("x.wmf\n.xz", XZUtils.getCompressedFilename("x.wmf\n"));
-        assertEquals("x.wmf.y.xz", XZUtils.getCompressedFilename("x.wmf.y"));
+        assertEquals("x.wmf .lzma", LZMAUtils.getCompressedFilename("x.wmf "));
+        assertEquals("x.wmf\n.lzma", LZMAUtils.getCompressedFilename("x.wmf\n"));
+        assertEquals("x.wmf.y.lzma", LZMAUtils.getCompressedFilename("x.wmf.y"));
     }
 
     @Test
     public void testMatches() {
         byte[] data = {
-            (byte) 0xFD, '7', 'z', 'X', 'Z', '\0'
+            (byte) 0x5D, 0, 0,
         };
-        assertFalse(XZUtils.matches(data, 5));
-        assertTrue(XZUtils.matches(data, 6));
-        assertTrue(XZUtils.matches(data, 7));
-        data[5] = '0';
-        assertFalse(XZUtils.matches(data, 6));
+        assertFalse(LZMAUtils.matches(data, 2));
+        assertTrue(LZMAUtils.matches(data, 3));
+        assertTrue(LZMAUtils.matches(data, 4));
+        data[2] = '0';
+        assertFalse(LZMAUtils.matches(data, 3));
     }
 
     @Test
-    public void testCachingIsEnabledByDefaultAndXZIsPresent() {
-        assertEquals(XZUtils.CachedAvailability.CACHED_AVAILABLE, \
                XZUtils.getCachedXZAvailability());
-        assertTrue(XZUtils.isXZCompressionAvailable());
+    public void testCachingIsEnabledByDefaultAndLZMAIsPresent() {
+        assertEquals(LZMAUtils.CachedAvailability.CACHED_AVAILABLE, \
LZMAUtils.getCachedLZMAAvailability()); +        \
assertTrue(LZMAUtils.isLZMACompressionAvailable());  }
 
     @Test
     public void testCanTurnOffCaching() {
         try {
-            XZUtils.setCacheXZAvailablity(false);
-            assertEquals(XZUtils.CachedAvailability.DONT_CACHE, \
                XZUtils.getCachedXZAvailability());
-            assertTrue(XZUtils.isXZCompressionAvailable());
+            LZMAUtils.setCacheLZMAAvailablity(false);
+            assertEquals(LZMAUtils.CachedAvailability.DONT_CACHE, \
LZMAUtils.getCachedLZMAAvailability()); +            \
assertTrue(LZMAUtils.isLZMACompressionAvailable());  } finally {
-            XZUtils.setCacheXZAvailablity(true);
+            LZMAUtils.setCacheLZMAAvailablity(true);
         }
     }
 
     @Test
     public void testTurningOnCachingReEvaluatesAvailability() {
         try {
-            XZUtils.setCacheXZAvailablity(false);
-            assertEquals(XZUtils.CachedAvailability.DONT_CACHE, \
                XZUtils.getCachedXZAvailability());
-            XZUtils.setCacheXZAvailablity(true);
-            assertEquals(XZUtils.CachedAvailability.CACHED_AVAILABLE, \
XZUtils.getCachedXZAvailability()); +            \
LZMAUtils.setCacheLZMAAvailablity(false); +            \
assertEquals(LZMAUtils.CachedAvailability.DONT_CACHE, \
LZMAUtils.getCachedLZMAAvailability()); +            \
LZMAUtils.setCacheLZMAAvailablity(true); +            \
assertEquals(LZMAUtils.CachedAvailability.CACHED_AVAILABLE, \
LZMAUtils.getCachedLZMAAvailability());  } finally {
-            XZUtils.setCacheXZAvailablity(true);
+            LZMAUtils.setCacheLZMAAvailablity(true);
         }
     }
 


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic