[jboss-cvs] JBossAS SVN: r74011 - in projects/vfs/trunk/src: test/java/org/jboss/test/virtual/test and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 3 15:25:22 EDT 2008
Author: alesj
Date: 2008-06-03 15:25:22 -0400 (Tue, 03 Jun 2008)
New Revision: 74011
Modified:
projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java
projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/VFSAllTestSuite.java
projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/ZipEntryHandlerUnitTestCase.java
projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/ZipEntryVFSContextUnitTestCase.java
Log:
Include zip test in all.
Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java 2008-06-03 19:15:51 UTC (rev 74010)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/context/zip/ZipEntryContext.java 2008-06-03 19:25:22 UTC (rev 74011)
@@ -21,14 +21,6 @@
*/
package org.jboss.virtual.plugins.context.zip;
-import org.jboss.logging.Logger;
-import org.jboss.virtual.VFSUtils;
-import org.jboss.virtual.plugins.context.AbstractVFSContext;
-import org.jboss.virtual.plugins.context.AbstractVirtualFileHandler;
-import org.jboss.virtual.plugins.context.DelegatingHandler;
-import org.jboss.virtual.plugins.context.jar.JarUtils;
-import org.jboss.virtual.spi.VirtualFileHandler;
-
import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -54,6 +46,14 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.zip.ZipEntry;
+import org.jboss.logging.Logger;
+import org.jboss.virtual.VFSUtils;
+import org.jboss.virtual.plugins.context.AbstractVFSContext;
+import org.jboss.virtual.plugins.context.AbstractVirtualFileHandler;
+import org.jboss.virtual.plugins.context.DelegatingHandler;
+import org.jboss.virtual.plugins.context.jar.JarUtils;
+import org.jboss.virtual.spi.VirtualFileHandler;
+
/**
* <tt>ZipEntryContext</tt> implements a {@link org.jboss.virtual.spi.VFSContext}
* that exposes a zip archive as a virtual file system.
@@ -83,7 +83,6 @@
public class ZipEntryContext extends AbstractVFSContext
{
-
private static final Logger log = Logger.getLogger(ZipEntryContext.class);
/** Global setting for nested archive processing mode: copy or no-copy (default) */
Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/VFSAllTestSuite.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/VFSAllTestSuite.java 2008-06-03 19:15:51 UTC (rev 74010)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/VFSAllTestSuite.java 2008-06-03 19:25:22 UTC (rev 74011)
@@ -66,6 +66,8 @@
suite.addTest(CopyJARSerializationUnitTestCase.suite());
suite.addTest(JAREntryTestCase.suite());
suite.addTest(CopyJAREntryTestCase.suite());
+ suite.addTest(ZipEntryHandlerUnitTestCase.suite());
+ suite.addTest(ZipEntryVFSContextUnitTestCase.suite());
// contexts
suite.addTest(AssembledContextTestCase.suite());
suite.addTest(MemoryTestCase.suite());
Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/ZipEntryHandlerUnitTestCase.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/ZipEntryHandlerUnitTestCase.java 2008-06-03 19:15:51 UTC (rev 74010)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/ZipEntryHandlerUnitTestCase.java 2008-06-03 19:25:22 UTC (rev 74011)
@@ -21,21 +21,13 @@
*/
package org.jboss.test.virtual.test;
+import java.net.URL;
+
import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
import org.jboss.virtual.plugins.context.jar.JarUtils;
import org.jboss.virtual.plugins.context.zip.ZipEntryContext;
import org.jboss.virtual.spi.VFSContext;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.net.JarURLConnection;
-import java.net.URL;
-import java.util.jar.*;
-
/**
* ZipEntryHandlerUnitTestCase.
*
@@ -51,7 +43,7 @@
public static Test suite()
{
- return new TestSuite(ZipEntryHandlerUnitTestCase.class);
+ return suite(ZipEntryHandlerUnitTestCase.class);
}
protected VFSContext getVFSContext(String name) throws Exception
@@ -60,5 +52,4 @@
url = JarUtils.createJarURL(url);
return new ZipEntryContext(url);
}
-
}
\ No newline at end of file
Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/ZipEntryVFSContextUnitTestCase.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/ZipEntryVFSContextUnitTestCase.java 2008-06-03 19:15:51 UTC (rev 74010)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/ZipEntryVFSContextUnitTestCase.java 2008-06-03 19:25:22 UTC (rev 74011)
@@ -21,21 +21,20 @@
*/
package org.jboss.test.virtual.test;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+
import junit.framework.Test;
-import junit.framework.TestSuite;
import org.jboss.virtual.VFS;
+import org.jboss.virtual.plugins.context.file.FileSystemContext;
import org.jboss.virtual.plugins.context.jar.JarUtils;
import org.jboss.virtual.plugins.context.zip.ZipEntryContext;
-import org.jboss.virtual.plugins.context.file.FileSystemContext;
import org.jboss.virtual.spi.VFSContext;
import org.jboss.virtual.spi.VirtualFileHandler;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-
/**
* ZipEntryVFSContextUnitTestCase.
*
@@ -53,7 +52,7 @@
{
VFS.init();
System.out.println("java.protocol.handler.pkgs: " + System.getProperty("java.protocol.handler.pkgs"));
- return new TestSuite(ZipEntryVFSContextUnitTestCase.class);
+ return suite(ZipEntryVFSContextUnitTestCase.class);
}
protected VFSContext getVFSContext(String name) throws Exception
@@ -63,8 +62,6 @@
return new ZipEntryContext(url);
}
-
-
/**
* Analog to the same test in {@link JARVFSContextUnitTestCase}
*
@@ -88,7 +85,7 @@
/**
* Analog to the same test in {@link JARVFSContextUnitTestCase}
*
- * @throws Exception
+ * @throws Exception for any error
*/
public void testPathIsEmptryForJarEntryAsRoot() throws Exception
{
@@ -110,7 +107,7 @@
/**
* Test detection of underlying jar file removal through exists()
*
- * @throws Exception
+ * @throws Exception for any error
*/
public void testRootExists() throws Exception
{
@@ -146,7 +143,7 @@
* trying to handle it produces an exception. Proper behaviour
* is to ignore exception and treat the file as non-archive.
*
- * @throws Exception
+ * @throws Exception for any error
*/
public void testNotAnArchive() throws Exception
{
@@ -165,7 +162,7 @@
/**
* Handler representing a directory must return a zero leangth stream
*
- * @throws Exception
+ * @throws Exception for any error
*/
public void testDirectoryZipEntryOpenStream() throws Exception
{
@@ -176,5 +173,4 @@
InputStream is = sub.openStream();
assertTrue("input stream closed", is.read() == -1);
}
-
}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list