[jboss-svn-commits] JBoss Common SVN: r3251 - jzipfile/trunk/src/test/java/org/jboss/jzipfile.

[jboss-svn-commits at lists.jboss.org]

Author: alesj
Date: 2009-06-13 07:40:29 -0400 (Sat, 13 Jun 2009)
New Revision: 3251

Modified:
   jzipfile/trunk/src/test/java/org/jboss/jzipfile/SimpleZipFilesTests.java
Log:
Refactor test (also test commit).

Modified: jzipfile/trunk/src/test/java/org/jboss/jzipfile/SimpleZipFilesTests.java
===================================================================
--- jzipfile/trunk/src/test/java/org/jboss/jzipfile/SimpleZipFilesTests.java	2009-06-13 01:42:36 UTC (rev 3250)
+++ jzipfile/trunk/src/test/java/org/jboss/jzipfile/SimpleZipFilesTests.java	2009-06-13 11:40:29 UTC (rev 3251)
@@ -22,13 +22,15 @@
 
 package org.jboss.jzipfile;
 
-import org.testng.annotations.Test;
-import static org.testng.AssertJUnit.*;
-import java.io.IOException;
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.Iterator;
 
+import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertTrue;
+import org.testng.annotations.Test;
+
 @Test
 public final class SimpleZipFilesTests {
 
@@ -43,30 +45,25 @@
     }
 
     public void testStored() throws IOException {
-        final File file = testFile("single-stored.zip");
-        final ZipCatalog catalog = Zip.readCatalog(file);
-        final Iterator<ZipEntry> i = catalog.allEntries().iterator();
-        assertTrue("Missing entry", i.hasNext());
-        final ZipEntry entry = i.next();
-        assertFalse("Extra entry", i.hasNext());
-        // now open it
-        final InputStream inputStream = Zip.openEntry(file, entry);
-        // read a few bytes
-        inputStream.read(new byte[64]);
-        inputStream.close();
+       final File file = testFile("single-stored.zip");
+       testZipFile(file);
     }
 
-    public void testDeflated() throws IOException {
+   public void testDeflated() throws IOException {
         final File file = testFile("single-deflated.zip");
-        final ZipCatalog catalog = Zip.readCatalog(file);
-        final Iterator<ZipEntry> i = catalog.allEntries().iterator();
-        assertTrue("Missing entry", i.hasNext());
-        final ZipEntry entry = i.next();
-        assertFalse("Extra entry", i.hasNext());
-        // now open it
-        final InputStream inputStream = Zip.openEntry(file, entry);
-        // read a few bytes
-        inputStream.read(new byte[64]);
-        inputStream.close();
+        testZipFile(file);
     }
+
+   protected void testZipFile(File file) throws IOException {
+      final ZipCatalog catalog = Zip.readCatalog(file);
+      final Iterator<ZipEntry> i = catalog.allEntries().iterator();
+      assertTrue("Missing entry", i.hasNext());
+      final ZipEntry entry = i.next();
+      assertFalse("Extra entry", i.hasNext());
+      // now open it
+      final InputStream inputStream = Zip.openEntry(file, entry);
+      // read a few bytes
+      inputStream.read(new byte[64]);
+      inputStream.close();
+   }
 }