Author: tcurdt
Date: Fri Jan 9 16:59:11 2009
New Revision: 733212
URL: http://svn.apache.org/viewvc?rev=733212&view=rev
Log:
cleanups and nitpicking
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveInputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ArTestCase.java
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/JarTestCase.java
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/TarTestCase.java
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/compressors/BZip2TestCase.java
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveInputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveInputStream.java?rev=733212&r1=733211&r2=733212&view=diff
==============================================================================
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveInputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveInputStream.java
Fri Jan 9 16:59:11 2009
@@ -33,9 +33,9 @@
public ArchiveEntry getNextEntry() throws IOException {
ZipArchiveEntry entry = (ZipArchiveEntry)super.getNextEntry();
- if(entry == null){
+ if(entry == null) {
return null;
- }else{
+ } else {
return (ArchiveEntry)new JarArchiveEntry(entry);
}
}
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java?rev=733212&r1=733211&r2=733212&view=diff
==============================================================================
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java
Fri Jan 9 16:59:11 2009
@@ -33,6 +33,6 @@
public void putArchiveEntry(ArchiveEntry entry) throws IOException {
// TODO special jar stuff
- super.putArchiveEntry((ZipArchiveEntry) entry);
+ super.putArchiveEntry((ZipArchiveEntry) entry);
}
}
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java?rev=733212&r1=733211&r2=733212&view=diff
==============================================================================
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
Fri Jan 9 16:59:11 2009
@@ -25,7 +25,8 @@
import org.apache.commons.compress.archivers.ArchiveInputStream;
public class TarArchiveInputStream extends ArchiveInputStream {
- private final TarInputStream in;
+
+ private final TarInputStream in;
public TarArchiveInputStream( InputStream inputStream ) {
in = new TarInputStream(inputStream);
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java?rev=733212&r1=733211&r2=733212&view=diff
==============================================================================
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
Fri Jan 9 16:59:11 2009
@@ -26,7 +26,7 @@
public class TarArchiveOutputStream extends ArchiveOutputStream {
- private TarOutputStream out = null;
+ private final TarOutputStream out;
public TarArchiveOutputStream(OutputStream out) {
this.out = new TarOutputStream(out);
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarOutputStream.java?rev=733212&r1=733211&r2=733212&view=diff
==============================================================================
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarOutputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarOutputStream.java
Fri Jan 9 16:59:11 2009
@@ -20,7 +20,6 @@
import java.io.FilterOutputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.io.OutputStream;
/**
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java?rev=733212&r1=733211&r2=733212&view=diff
==============================================================================
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
Fri Jan 9 16:59:11 2009
@@ -37,19 +37,6 @@
zipOut.putNextEntry((ZipArchiveEntry) entry);
}
- public String getDefaultFileExtension() {
- return "zip";
- }
-
- public byte[] getHeader() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getName() {
- return "zip";
- }
-
public void close() throws IOException {
zipOut.close();
}
Modified:
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java?rev=733212&r1=733211&r2=733212&view=diff
==============================================================================
---
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java
(original)
+++
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/AbstractTestCase.java
Fri Jan 9 16:59:11 2009
@@ -14,6 +14,10 @@
dir.mkdir();
}
+ protected File getFile( String path ) {
+ return new
File(getClass().getClassLoader().getResource(path).getFile());
+ }
+
protected void tearDown() throws Exception {
dir.delete();
dir = null;
Modified:
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ArTestCase.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ArTestCase.java?rev=733212&r1=733211&r2=733212&view=diff
==============================================================================
---
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ArTestCase.java
(original)
+++
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ArTestCase.java
Fri Jan 9 16:59:11 2009
@@ -33,8 +33,8 @@
public void testArArchiveCreation() throws Exception {
final File output = new File(dir, "bla.ar");
- final File file1 = new
File(getClass().getClassLoader().getResource("test1.xml").getFile());
- final File file2 = new
File(getClass().getClassLoader().getResource("test2.xml").getFile());
+ final File file1 = getFile("test1.xml");
+ final File file2 = getFile("test2.xml");
final OutputStream out = new FileOutputStream(output);
final ArchiveOutputStream os = new
ArchiveStreamFactory().createArchiveOutputStream("ar", out);
@@ -52,8 +52,8 @@
public void testArUnarchive() throws Exception {
final File output = new File(dir, "bla.ar");
{
- final File file1 = new
File(getClass().getClassLoader().getResource("test1.xml").getFile());
- final File file2 = new
File(getClass().getClassLoader().getResource("test2.xml").getFile());
+ final File file1 = getFile("test1.xml");
+ final File file2 = getFile("test2.xml");
final OutputStream out = new FileOutputStream(output);
final ArchiveOutputStream os = new
ArchiveStreamFactory().createArchiveOutputStream("ar", out);
Modified:
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/JarTestCase.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/JarTestCase.java?rev=733212&r1=733211&r2=733212&view=diff
==============================================================================
---
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/JarTestCase.java
(original)
+++
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/JarTestCase.java
Fri Jan 9 16:59:11 2009
@@ -33,8 +33,8 @@
public void testJarArchiveCreation() throws Exception {
final File output = new File(dir, "bla.jar");
- final File file1 = new
File(getClass().getClassLoader().getResource("test1.xml").getFile());
- final File file2 = new
File(getClass().getClassLoader().getResource("test2.xml").getFile());
+ final File file1 = getFile("test1.xml");
+ final File file2 = getFile("test2.xml");
final OutputStream out = new FileOutputStream(output);
@@ -53,7 +53,7 @@
public void testJarUnarchive() throws Exception {
- final File input = new
File(getClass().getClassLoader().getResource("bla.jar").getFile());
+ final File input = getFile("bla.jar");
final InputStream is = new FileInputStream(input);
final ArchiveInputStream in = new
ArchiveStreamFactory().createArchiveInputStream("jar", is);
@@ -82,7 +82,7 @@
}
public void testJarUnarchiveAll() throws Exception {
- final File input = new
File(getClass().getClassLoader().getResource("bla.jar").getFile());
+ final File input = getFile("bla.jar");
final InputStream is = new FileInputStream(input);
final ArchiveInputStream in = new
ArchiveStreamFactory().createArchiveInputStream("jar", is);
Modified:
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/TarTestCase.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/TarTestCase.java?rev=733212&r1=733211&r2=733212&view=diff
==============================================================================
---
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/TarTestCase.java
(original)
+++
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/TarTestCase.java
Fri Jan 9 16:59:11 2009
@@ -32,7 +32,7 @@
public final class TarTestCase extends AbstractTestCase {
public void testTarArchiveCreation() throws Exception {
final File output = new File(dir, "bla.tar");
- final File file1 = new
File(getClass().getClassLoader().getResource("test1.xml").getFile());
+ final File file1 = getFile("test1.xml");
final OutputStream out = new FileOutputStream(output);
final ArchiveOutputStream os = new
ArchiveStreamFactory().createArchiveOutputStream("tar", out);
final TarArchiveEntry entry = new
TarArchiveEntry("testdata/test1.xml");
@@ -55,7 +55,7 @@
assertEquals(bytes.length, 99);
final File output = new File(dir, "bla.tar");
- final File file1 = new
File(getClass().getClassLoader().getResource("test1.xml").getFile());
+ final File file1 = getFile("test1.xml");
final OutputStream out = new FileOutputStream(output);
final ArchiveOutputStream os = new
ArchiveStreamFactory().createArchiveOutputStream("tar", out);
final TarArchiveEntry entry = new TarArchiveEntry(name);
@@ -96,7 +96,7 @@
}
public void testTarUnarchive() throws Exception {
- final File input = new
File(getClass().getClassLoader().getResource("bla.tar").getFile());
+ final File input = getFile("bla.tar");
final InputStream is = new FileInputStream(input);
final ArchiveInputStream in = new
ArchiveStreamFactory().createArchiveInputStream("tar", is);
final TarArchiveEntry entry = (TarArchiveEntry)in.getNextEntry();
Modified:
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java?rev=733212&r1=733211&r2=733212&view=diff
==============================================================================
---
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java
(original)
+++
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java
Fri Jan 9 16:59:11 2009
@@ -34,8 +34,8 @@
final File output = new File(dir, "bla.zip");
- final File file1 = new
File(getClass().getClassLoader().getResource("test1.xml").getFile());
- final File file2 = new
File(getClass().getClassLoader().getResource("test2.xml").getFile());
+ final File file1 = getFile("test1.xml");
+ final File file2 = getFile("test2.xml");
final OutputStream out = new FileOutputStream(output);
@@ -53,7 +53,7 @@
}
public void testZipUnarchive() throws Exception {
- final File input = new
File(getClass().getClassLoader().getResource("bla.zip").getFile());
+ final File input = getFile("bla.zip");
final InputStream is = new FileInputStream(input);
final ArchiveInputStream in = new
ArchiveStreamFactory().createArchiveInputStream("zip", is);
Modified:
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java?rev=733212&r1=733211&r2=733212&view=diff
==============================================================================
---
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java
(original)
+++
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/changes/ChangeSetTestCase.java
Fri Jan 9 16:59:11 2009
@@ -23,8 +23,7 @@
import java.io.FileOutputStream;
import java.io.InputStream;
-import junit.framework.TestCase;
-
+import org.apache.commons.compress.AbstractTestCase;
import org.apache.commons.compress.archivers.ArchiveInputStream;
import org.apache.commons.compress.archivers.ArchiveOutputStream;
import org.apache.commons.compress.archivers.ArchiveStreamFactory;
@@ -33,7 +32,7 @@
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
-public final class ChangeSetTestCase extends TestCase {
+public final class ChangeSetTestCase extends AbstractTestCase {
public void testDeleteFromZip() throws Exception {
ArchiveOutputStream out = null;
@@ -42,7 +41,7 @@
ChangeSet changes = new ChangeSet();
changes.delete("test2.xml");
- final File input = new
File(getClass().getClassLoader().getResource("bla.zip").getFile());
+ final File input = getFile("bla.zip");
final InputStream is = new FileInputStream(input);
ais = new
ArchiveStreamFactory().createArchiveInputStream("zip", is);
@@ -64,11 +63,11 @@
ChangeSet changes = new ChangeSet();
changes.delete("test2.xml");
- final File input = new
File(getClass().getClassLoader().getResource("bla.tar").getFile());
+ final File input = getFile("bla.tar");
final InputStream is = new FileInputStream(input);
ais = new
ArchiveStreamFactory().createArchiveInputStream("tar", is);
- File temp = File.createTempFile("test", ".tar");
+ File temp = new File(dir, "bla.tar");
out = new
ArchiveStreamFactory().createArchiveOutputStream("tar", new
FileOutputStream(temp));
System.out.println(temp.getAbsolutePath());
@@ -87,11 +86,11 @@
changes.delete("test2.xml");
changes.delete("META-INF/MANIFEST.MF");
- final File input = new
File(getClass().getClassLoader().getResource("bla.jar").getFile());
+ final File input = getFile("bla.jar");
final InputStream is = new FileInputStream(input);
ais = new
ArchiveStreamFactory().createArchiveInputStream("jar", is);
- File temp = File.createTempFile("test", ".jar");
+ File temp = new File(dir, "bla.jar");
out = new
ArchiveStreamFactory().createArchiveOutputStream("jar", new
FileOutputStream(temp));
System.out.println(temp.getAbsolutePath());
@@ -109,11 +108,11 @@
ChangeSet changes = new ChangeSet();
changes.delete("test2.xml");
- final File input = new
File(getClass().getClassLoader().getResource("bla.ar").getFile());
+ final File input = getFile("bla.ar");
final InputStream is = new FileInputStream(input);
ais = new
ArchiveStreamFactory().createArchiveInputStream("ar", is);
- File temp = File.createTempFile("test", ".ar");
+ File temp = new File(dir, "bla.ar");
out = new
ArchiveStreamFactory().createArchiveOutputStream("ar", new
FileOutputStream(temp));
System.out.println(temp.getAbsolutePath());
@@ -132,15 +131,15 @@
changes.delete("test2.xml");
- final File file1 = new
File(getClass().getClassLoader().getResource("test.txt").getFile());
+ final File file1 = getFile("test.txt");
ZipArchiveEntry entry = new
ZipArchiveEntry("testdata/test.txt");
changes.add(entry, new FileInputStream(file1));
- final File input = new
File(getClass().getClassLoader().getResource("bla.zip").getFile());
+ final File input = getFile("bla.zip");
final InputStream is = new FileInputStream(input);
ais = new
ArchiveStreamFactory().createArchiveInputStream("zip", is);
- File temp = File.createTempFile("test", ".zip");
+ File temp = new File(dir, "bla.zip");
out = new
ArchiveStreamFactory().createArchiveOutputStream("zip", new
FileOutputStream(temp));
System.out.println(temp.getAbsolutePath());
@@ -159,7 +158,7 @@
changes.delete("test2.xml");
- final File file1 = new
File(getClass().getClassLoader().getResource("test.txt").getFile());
+ final File file1 = getFile("test.txt");
final TarArchiveEntry entry = new
TarArchiveEntry("testdata/test.txt");
entry.setModTime(0);
@@ -172,11 +171,11 @@
changes.add(entry, new FileInputStream(file1));
- final File input = new
File(getClass().getClassLoader().getResource("bla.tar").getFile());
+ final File input = getFile("bla.tar");
final InputStream is = new FileInputStream(input);
ais = new
ArchiveStreamFactory().createArchiveInputStream("tar", is);
- File temp = File.createTempFile("test", ".tar");
+ File temp = new File(dir, "bla.tar");
out = new
ArchiveStreamFactory().createArchiveOutputStream("tar", new
FileOutputStream(temp));
System.out.println(temp.getAbsolutePath());
@@ -194,15 +193,15 @@
ChangeSet changes = new ChangeSet();
changes.delete("test2.xml");
- final File file1 = new
File(getClass().getClassLoader().getResource("test.txt").getFile());
+ final File file1 = getFile("test.txt");
JarArchiveEntry entry = new
JarArchiveEntry("testdata/test.txt");
changes.add(entry, new FileInputStream(file1));
- final File input = new
File(getClass().getClassLoader().getResource("bla.jar").getFile());
+ final File input = getFile("bla.jar");
final InputStream is = new FileInputStream(input);
ais = new
ArchiveStreamFactory().createArchiveInputStream("jar", is);
- File temp = File.createTempFile("test", ".jar");
+ File temp = new File(dir, "bla.jar");
out = new
ArchiveStreamFactory().createArchiveOutputStream("jar", new
FileOutputStream(temp));
System.out.println(temp.getAbsolutePath());
@@ -220,17 +219,17 @@
ChangeSet changes = new ChangeSet();
changes.delete("test2.xml");
- final File file1 = new
File(getClass().getClassLoader().getResource("test.txt").getFile());
+ final File file1 = getFile("test.txt");
final ArArchiveEntry entry = new
ArArchiveEntry("test.txt", file1.length());
changes.add(entry, new FileInputStream(file1));
- final File input = new
File(getClass().getClassLoader().getResource("bla.ar").getFile());
+ final File input = getFile("bla.ar");
final InputStream is = new FileInputStream(input);
ais = new
ArchiveStreamFactory().createArchiveInputStream("ar", is);
- File temp = File.createTempFile("test", ".ar");
+ File temp = new File(dir, "bla.ar");
out = new
ArchiveStreamFactory().createArchiveOutputStream("ar", new
FileOutputStream(temp));
System.out.println(temp.getAbsolutePath());
Modified:
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/compressors/BZip2TestCase.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/compressors/BZip2TestCase.java?rev=733212&r1=733211&r2=733212&view=diff
==============================================================================
---
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/compressors/BZip2TestCase.java
(original)
+++
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/compressors/BZip2TestCase.java
Fri Jan 9 16:59:11 2009
@@ -25,27 +25,24 @@
import java.io.OutputStream;
import org.apache.commons.compress.AbstractTestCase;
-import
org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
import org.apache.commons.compress.utils.IOUtils;
public final class BZip2TestCase extends AbstractTestCase {
+
public void testBzipCreation() throws Exception {
- final File output = new File(dir, "bla.txt.bz2");
- System.out.println(dir);
- final File file1 = new
File(getClass().getClassLoader().getResource("test.txt").getFile());
+ final File input = getFile("test.txt");
+ final File output = new File(dir, "test.txt.bz2");
final OutputStream out = new FileOutputStream(output);
- CompressorOutputStream cos = new
CompressorStreamFactory().createCompressorOutputStream("bzip2", out);
- IOUtils.copy(new FileInputStream(file1), cos);
+ final CompressorOutputStream cos = new
CompressorStreamFactory().createCompressorOutputStream("bzip2", out);
+ IOUtils.copy(new FileInputStream(input), cos);
cos.close();
}
public void testBzip2Unarchive() throws Exception {
- final File output = new File(dir, "test-entpackt.txt");
- System.out.println(dir);
- final File input = new
File(getClass().getClassLoader().getResource("bla.txt.bz2").getFile());
+ final File input = getFile("bla.txt.bz2");
+ final File output = new File(dir, "bla.txt");
final InputStream is = new FileInputStream(input);
- //final CompressorInputStream in = new
CompressorStreamFactory().createCompressorInputStream("bzip2", is);
- final CompressorInputStream in = new BZip2CompressorInputStream(is);
+ final CompressorInputStream in = new
CompressorStreamFactory().createCompressorInputStream("bzip2", is);
IOUtils.copy(in, new FileOutputStream(output));
in.close();
}
Modified:
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java?rev=733212&r1=733211&r2=733212&view=diff
==============================================================================
---
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java
(original)
+++
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java
Fri Jan 9 16:59:11 2009
@@ -28,18 +28,19 @@
import org.apache.commons.compress.utils.IOUtils;
public final class GZipTestCase extends AbstractTestCase {
+
public void testGzipCreation() throws Exception {
- final File output = new File(dir, "bla.gz");
- final File file1 = new
File(getClass().getClassLoader().getResource("test1.xml").getFile());
+ final File input = getFile("test1.xml");
+ final File output = new File(dir, "test1.xml.gz");
final OutputStream out = new FileOutputStream(output);
- CompressorOutputStream cos = new
CompressorStreamFactory().createCompressorOutputStream("gz", out);
- IOUtils.copy(new FileInputStream(file1), cos);
+ final CompressorOutputStream cos = new
CompressorStreamFactory().createCompressorOutputStream("gz", out);
+ IOUtils.copy(new FileInputStream(input), cos);
cos.close();
}
public void testGzipUnarchive() throws Exception {
- final File output = new File(dir, "bla-entpackt.tar");
- final File input = new
File(getClass().getClassLoader().getResource("bla.tgz").getFile());
+ final File input = getFile("bla.tgz");
+ final File output = new File(dir, "bla.tar");
final InputStream is = new FileInputStream(input);
final CompressorInputStream in = new
CompressorStreamFactory().createCompressorInputStream("gz", is);
IOUtils.copy(in, new FileOutputStream(output));
