Author: bodewig
Date: Mon Mar 30 14:41:14 2009
New Revision: 759992
URL: http://svn.apache.org/viewvc?rev=759992&view=rev
Log:
whitespace
Modified:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ArTestCase.java
Modified:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ArTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ArTestCase.java?rev=759992&r1=759991&r2=759992&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ArTestCase.java
(original)
+++
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/ArTestCase.java
Mon Mar 30 14:41:14 2009
@@ -32,146 +32,146 @@
public final class ArTestCase extends AbstractTestCase {
- public void testArArchiveCreation() throws Exception {
- final File output = new File(dir, "bla.ar");
-
- final File file1 = getFile("test1.xml");
- final File file2 = getFile("test2.xml");
-
- final OutputStream out = new FileOutputStream(output);
+ public void testArArchiveCreation() throws Exception {
+ final File output = new File(dir, "bla.ar");
+
+ 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);
- os.putArchiveEntry(new ArArchiveEntry("test1.xml",
file1.length()));
- IOUtils.copy(new FileInputStream(file1), os);
- os.closeArchiveEntry();
-
- os.putArchiveEntry(new ArArchiveEntry("test2.xml",
file2.length()));
- IOUtils.copy(new FileInputStream(file2), os);
- os.closeArchiveEntry();
-
- os.close();
- }
-
- 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 OutputStream out = new FileOutputStream(output);
- final ArchiveOutputStream os = new
ArchiveStreamFactory().createArchiveOutputStream("ar", out);
- os.putArchiveEntry(new ArArchiveEntry("test1.xml",
file1.length()));
- IOUtils.copy(new FileInputStream(file1), os);
- os.closeArchiveEntry();
-
- os.putArchiveEntry(new ArArchiveEntry("test2.xml",
file2.length()));
- IOUtils.copy(new FileInputStream(file2), os);
- os.closeArchiveEntry();
- os.close();
- out.close();
- }
-
- // UnArArchive Operation
- final File input = output;
- final InputStream is = new FileInputStream(input);
- final ArchiveInputStream in = new
ArchiveStreamFactory().createArchiveInputStream(new BufferedInputStream(is));
- final ArArchiveEntry entry = (ArArchiveEntry)in.getNextEntry();
-
- File target = new File(dir, entry.getName());
+ os.putArchiveEntry(new ArArchiveEntry("test1.xml", file1.length()));
+ IOUtils.copy(new FileInputStream(file1), os);
+ os.closeArchiveEntry();
+
+ os.putArchiveEntry(new ArArchiveEntry("test2.xml", file2.length()));
+ IOUtils.copy(new FileInputStream(file2), os);
+ os.closeArchiveEntry();
+
+ os.close();
+ }
+
+ 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 OutputStream out = new FileOutputStream(output);
+ final ArchiveOutputStream os = new
ArchiveStreamFactory().createArchiveOutputStream("ar", out);
+ os.putArchiveEntry(new ArArchiveEntry("test1.xml",
file1.length()));
+ IOUtils.copy(new FileInputStream(file1), os);
+ os.closeArchiveEntry();
+
+ os.putArchiveEntry(new ArArchiveEntry("test2.xml",
file2.length()));
+ IOUtils.copy(new FileInputStream(file2), os);
+ os.closeArchiveEntry();
+ os.close();
+ out.close();
+ }
+
+ // UnArArchive Operation
+ final File input = output;
+ final InputStream is = new FileInputStream(input);
+ final ArchiveInputStream in = new
ArchiveStreamFactory().createArchiveInputStream(new BufferedInputStream(is));
+ final ArArchiveEntry entry = (ArArchiveEntry)in.getNextEntry();
+
+ File target = new File(dir, entry.getName());
final OutputStream out = new FileOutputStream(target);
-
+
IOUtils.copy(in, out);
-
+
out.close();
in.close();
is.close();
- }
+ }
+
+ public void testArDelete() throws Exception {
+ final File output = new File(dir, "bla.ar");
+
+ {
+ // create
+ 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);
+ os.putArchiveEntry(new ArArchiveEntry("test1.xml",
file1.length()));
+ IOUtils.copy(new FileInputStream(file1), os);
+ os.closeArchiveEntry();
+
+ os.putArchiveEntry(new ArArchiveEntry("test2.xml",
file2.length()));
+ IOUtils.copy(new FileInputStream(file2), os);
+ os.closeArchiveEntry();
+ os.close();
+ out.close();
+ }
+
+ assertEquals(282, output.length());
+
+ final File output2 = new File(dir, "bla2.ar");
+
+ int copied = 0;
+ int deleted = 0;
+
+ {
+ // remove all but one file
+
+ final InputStream is = new FileInputStream(output);
+ final OutputStream os = new FileOutputStream(output2);
+ final ArchiveOutputStream aos = new
ArchiveStreamFactory().createArchiveOutputStream("ar", os);
+ final ArchiveInputStream ais = new
ArchiveStreamFactory().createArchiveInputStream(new BufferedInputStream(is));
+ while(true) {
+ final ArArchiveEntry entry =
(ArArchiveEntry)ais.getNextEntry();
+ if (entry == null) {
+ break;
+ }
+
+ if ("test1.xml".equals(entry.getName())) {
+ aos.putArchiveEntry(entry);
+ IOUtils.copy(ais, aos);
+ aos.closeArchiveEntry();
+ copied++;
+ } else {
+ IOUtils.copy(ais, new ByteArrayOutputStream());
+ deleted++;
+ }
+
+ }
+ ais.close();
+ aos.close();
+ is.close();
+ os.close();
+ }
+
+ assertEquals(1, copied);
+ assertEquals(1, deleted);
+ assertEquals(144, output2.length());
+
+ long files = 0;
+ long sum = 0;
+
+ {
+ final InputStream is = new FileInputStream(output2);
+ final ArchiveInputStream ais = new
ArchiveStreamFactory().createArchiveInputStream(new BufferedInputStream(is));
+ while(true) {
+ final ArArchiveEntry entry =
(ArArchiveEntry)ais.getNextEntry();
+ if (entry == null) {
+ break;
+ }
+
+ IOUtils.copy(ais, new ByteArrayOutputStream());
+
+ sum += entry.getLength();
+ files++;
+ }
+ ais.close();
+ is.close();
+ }
+
+ assertEquals(1, files);
+ assertEquals(76, sum);
- public void testArDelete() throws Exception {
- final File output = new File(dir, "bla.ar");
-
- {
- // create
- 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);
- os.putArchiveEntry(new ArArchiveEntry("test1.xml",
file1.length()));
- IOUtils.copy(new FileInputStream(file1), os);
- os.closeArchiveEntry();
-
- os.putArchiveEntry(new ArArchiveEntry("test2.xml",
file2.length()));
- IOUtils.copy(new FileInputStream(file2), os);
- os.closeArchiveEntry();
- os.close();
- out.close();
- }
-
- assertEquals(282, output.length());
-
- final File output2 = new File(dir, "bla2.ar");
-
- int copied = 0;
- int deleted = 0;
-
- {
- // remove all but one file
-
- final InputStream is = new FileInputStream(output);
- final OutputStream os = new FileOutputStream(output2);
- final ArchiveOutputStream aos = new
ArchiveStreamFactory().createArchiveOutputStream("ar", os);
- final ArchiveInputStream ais = new
ArchiveStreamFactory().createArchiveInputStream(new BufferedInputStream(is));
- while(true) {
- final ArArchiveEntry entry =
(ArArchiveEntry)ais.getNextEntry();
- if (entry == null) {
- break;
- }
-
- if ("test1.xml".equals(entry.getName())) {
- aos.putArchiveEntry(entry);
- IOUtils.copy(ais, aos);
- aos.closeArchiveEntry();
- copied++;
- } else {
- IOUtils.copy(ais, new ByteArrayOutputStream());
- deleted++;
- }
-
- }
- ais.close();
- aos.close();
- is.close();
- os.close();
- }
-
- assertEquals(1, copied);
- assertEquals(1, deleted);
- assertEquals(144, output2.length());
-
- long files = 0;
- long sum = 0;
-
- {
- final InputStream is = new FileInputStream(output2);
- final ArchiveInputStream ais = new
ArchiveStreamFactory().createArchiveInputStream(new BufferedInputStream(is));
- while(true) {
- final ArArchiveEntry entry =
(ArArchiveEntry)ais.getNextEntry();
- if (entry == null) {
- break;
- }
-
- IOUtils.copy(ais, new ByteArrayOutputStream());
-
- sum += entry.getLength();
- files++;
- }
- ais.close();
- is.close();
- }
-
- assertEquals(1, files);
- assertEquals(76, sum);
-
- }
+ }
}
