[jboss-cvs] JBossAS SVN: r99553 - in projects/jboss-cl/branches/vfs3-int/classloading-vfs/src: test/java/org/jboss/test/classloading/vfs/metadata/test and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 18 15:06:30 EST 2010
Author: johnbailey
Date: 2010-01-18 15:06:29 -0500 (Mon, 18 Jan 2010)
New Revision: 99553
Modified:
projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/main/java/org/jboss/classloading/plugins/vfs/PackageVisitor.java
projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/test/GeneratedClassesUnitTestCase.java
projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/JBossXBTestDelegate.java
projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/policy/test/ExportAllUnitTestCase.java
projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/policy/test/PackageInfoUnitTestCase.java
projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/policy/test/VFSCLPolicySignedCertsUnitTestCase.java
Log:
[JBAS-7360] - Some Test cleanup
Modified: projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/main/java/org/jboss/classloading/plugins/vfs/PackageVisitor.java
===================================================================
--- projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/main/java/org/jboss/classloading/plugins/vfs/PackageVisitor.java 2010-01-18 19:09:53 UTC (rev 99552)
+++ projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/main/java/org/jboss/classloading/plugins/vfs/PackageVisitor.java 2010-01-18 20:06:29 UTC (rev 99553)
@@ -21,7 +21,6 @@
*/
package org.jboss.classloading.plugins.vfs;
-import java.io.IOException;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -201,7 +200,7 @@
for (VirtualFile child : children)
{
// We must have a leaf to be non-empty
- if (! child.isDirectory())
+ if (child.isFile())
{
empty = false;
break;
Modified: projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/test/GeneratedClassesUnitTestCase.java
===================================================================
--- projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/test/GeneratedClassesUnitTestCase.java 2010-01-18 19:09:53 UTC (rev 99552)
+++ projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/test/GeneratedClassesUnitTestCase.java 2010-01-18 20:06:29 UTC (rev 99553)
@@ -58,6 +58,7 @@
private Closeable tempDirectoryHandle;
private VirtualFile tempDirectory;
+ private TempFileProvider tempFileProvider;
public static Test suite()
{
@@ -69,9 +70,16 @@
super(name);
}
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ tempFileProvider = TempFileProvider.create("test", Executors.newScheduledThreadPool(2));
+ }
+
protected void tearDown() throws Exception
{
- VFSUtils.safeClose(tempDirectoryHandle);
+ VFSUtils.safeClose(tempDirectoryHandle, tempFileProvider);
}
public void testImportAllGenerateClassInExistingPackage() throws Exception
@@ -149,7 +157,7 @@
VirtualFile output = dynamicClassRoot.getChild(info.getResourceName());
VFSUtils.writeFile(output, info.getClassBytes());
-
+
if (loader instanceof RealClassLoader)
{
((RealClassLoader)loader).clearBlackList(info.getResourceName());
@@ -162,11 +170,11 @@
if(tempDirectory == null)
{
tempDirectory = VFS.getChild("/" + GUID.asString());
- tempDirectoryHandle = VFS.mountTemp(tempDirectory, TempFileProvider.create("test", Executors.newScheduledThreadPool(2)));
+ tempDirectoryHandle = VFS.mountTemp(tempDirectory, tempFileProvider);
}
return tempDirectory;
}
-
+
private static class GeneratedClassInfo
{
String classname;
Modified: projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/JBossXBTestDelegate.java
===================================================================
--- projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/JBossXBTestDelegate.java 2010-01-18 19:09:53 UTC (rev 99552)
+++ projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/JBossXBTestDelegate.java 2010-01-18 20:06:29 UTC (rev 99553)
@@ -22,9 +22,7 @@
package org.jboss.test.classloading.vfs.metadata.xml;
import java.lang.reflect.Method;
-import java.net.URL;
-import org.jboss.net.protocol.URLStreamHandlerFactory;
import org.jboss.test.AbstractTestDelegate;
import org.jboss.xb.binding.Unmarshaller;
import org.jboss.xb.binding.UnmarshallerFactory;
Modified: projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/policy/test/ExportAllUnitTestCase.java
===================================================================
--- projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/policy/test/ExportAllUnitTestCase.java 2010-01-18 19:09:53 UTC (rev 99552)
+++ projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/policy/test/ExportAllUnitTestCase.java 2010-01-18 20:06:29 UTC (rev 99553)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.classloading.vfs.policy.test;
-import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
Modified: projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/policy/test/PackageInfoUnitTestCase.java
===================================================================
--- projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/policy/test/PackageInfoUnitTestCase.java 2010-01-18 19:09:53 UTC (rev 99552)
+++ projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/policy/test/PackageInfoUnitTestCase.java 2010-01-18 20:06:29 UTC (rev 99553)
@@ -58,21 +58,27 @@
protected void setUp() throws Exception
{
super.setUp();
-
provider = TempFileProvider.create("test", new ScheduledThreadPoolExecutor(2));
}
+ @Override
+ protected void tearDown() throws Exception
+ {
+ VFSUtils.safeClose(provider);
+ super.tearDown();
+ }
+
public void testCorrectPackage()
throws Exception
{
URL testear1xURL = getResource("/classloader/testear1x.ear");
- VirtualFile testear1x = VFS.getChild(testear1xURL);
- List<Closeable> mounts = null;
+ List<Closeable> mounts = new ArrayList<Closeable>();
try {
- mounts = recursiveMount(testear1x);
- VirtualFile jar1 = testear1x.getChild("lib/jar1.jar");
+ VirtualFile testear1x = mount(VFS.getChild(testear1xURL), mounts);
+
+ VirtualFile jar1 = mount(testear1x.getChild("lib/jar1.jar"), mounts);
assertNotNull(jar1);
- VirtualFile jar2 = testear1x.getChild("lib/jar2.jar");
+ VirtualFile jar2 = mount(testear1x.getChild("lib/jar2.jar"), mounts);
assertNotNull(jar2);
VFSClassLoaderPolicy policy = VFSClassLoaderPolicy.createVFSClassLoaderPolicy("testCorrectPackage", testear1x, jar2, jar1);
policy.setExportAll(ExportAll.NON_EMPTY);
@@ -98,18 +104,10 @@
}
}
- public List<Closeable> recursiveMount(VirtualFile file) throws IOException
+ public VirtualFile mount(VirtualFile file, List<Closeable> mounts) throws IOException
{
- ArrayList<Closeable> mounts = new ArrayList<Closeable>();
-
- if (!file.isDirectory() && file.getName().matches("^.*\\.([EeWwJj][Aa][Rr]|[Zz][Ii][Pp])$"))
- mounts.add(VFS.mountZip(file, file, provider));
-
- if (file.isDirectory())
- for (VirtualFile child : file.getChildren())
- mounts.addAll(recursiveMount(child));
-
- return mounts;
+ mounts.add(VFS.mountZip(file, file, provider));
+ return file;
}
public static Test suite()
Modified: projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/policy/test/VFSCLPolicySignedCertsUnitTestCase.java
===================================================================
--- projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/policy/test/VFSCLPolicySignedCertsUnitTestCase.java 2010-01-18 19:09:53 UTC (rev 99552)
+++ projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/policy/test/VFSCLPolicySignedCertsUnitTestCase.java 2010-01-18 20:06:29 UTC (rev 99553)
@@ -21,9 +21,11 @@
*/
package org.jboss.test.classloading.vfs.policy.test;
+import java.io.Closeable;
import java.net.URL;
import java.security.ProtectionDomain;
import java.security.cert.Certificate;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
import junit.framework.Test;
import org.jboss.classloader.plugins.system.DefaultClassLoaderSystem;
@@ -31,9 +33,10 @@
import org.jboss.classloading.spi.metadata.ExportAll;
import org.jboss.classloading.spi.vfs.policy.VFSClassLoaderPolicy;
import org.jboss.test.BaseTestCase;
+import org.jboss.vfs.TempFileProvider;
import org.jboss.vfs.VFS;
+import org.jboss.vfs.VFSUtils;
import org.jboss.vfs.VirtualFile;
-import org.jboss.vfs.util.automount.Automounter;
/**
* Unit test JBCL-67
@@ -44,6 +47,8 @@
*/
public class VFSCLPolicySignedCertsUnitTestCase extends BaseTestCase
{
+ private TempFileProvider provider;
+
public VFSCLPolicySignedCertsUnitTestCase(String name)
{
super(name);
@@ -53,7 +58,20 @@
{
return suite(VFSCLPolicySignedCertsUnitTestCase.class);
}
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ provider = TempFileProvider.create("test", new ScheduledThreadPoolExecutor(2));
+ }
+ @Override
+ protected void tearDown() throws Exception
+ {
+ VFSUtils.safeClose(provider);
+ super.tearDown();
+ }
+
/**
* Ensure that wstx.jar that is loaded by the base class loader
* is able to inject the certs into the protection domain held
@@ -66,9 +84,10 @@
URL signedJarURL = getResource("/classloader/signedjar");
VirtualFile signedJarRoot = VFS.getChild(signedJarURL);
VirtualFile signedJar = signedJarRoot.getChild("wstx.jar");
- Automounter.mount(signedJar);
+ Closeable handle = null;
try
{
+ handle = VFS.mountZip(signedJar, signedJar, provider);
VFSClassLoaderPolicy policy = VFSClassLoaderPolicy.createVFSClassLoaderPolicy(signedJar);
policy.setExportAll(ExportAll.ALL);
@@ -87,7 +106,7 @@
}
finally
{
- Automounter.cleanup(signedJar);
+ VFSUtils.safeClose(handle);
}
}
}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list