[jboss-cvs] JBossAS SVN: r97707 - in projects/jboss-cl/branches/vfs3-int/classloading-vfs/src: test/java/org/jboss/test/classloading/vfs/metadata/test and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Dec 10 16:31:46 EST 2009
Author: johnbailey
Date: 2009-12-10 16:31:45 -0500 (Thu, 10 Dec 2009)
New Revision: 97707
Modified:
projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/policy/VFSClassLoaderPolicy.java
projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/test/VFSResourceVisitorUnitTestCase.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:
Updates to support VFS3 integration correctly. Mainly changing calls if(VF == null) to if(VF.exists() == false)
Modified: projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/policy/VFSClassLoaderPolicy.java
===================================================================
--- projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/policy/VFSClassLoaderPolicy.java 2009-12-10 19:55:53 UTC (rev 97706)
+++ projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/main/java/org/jboss/classloading/spi/vfs/policy/VFSClassLoaderPolicy.java 2009-12-10 21:31:45 UTC (rev 97707)
@@ -577,7 +577,7 @@
try
{
VirtualFile file = root.getChild(path);
- if (file != null)
+ if (file.exists())
{
result = new VirtualFileInfo(file, root);
vfsCache.put(path, result);
Modified: projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/test/VFSResourceVisitorUnitTestCase.java
===================================================================
--- projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/test/VFSResourceVisitorUnitTestCase.java 2009-12-10 19:55:53 UTC (rev 97706)
+++ projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/test/VFSResourceVisitorUnitTestCase.java 2009-12-10 21:31:45 UTC (rev 97707)
@@ -48,6 +48,7 @@
import org.jboss.test.classloading.vfs.metadata.support.a.A;
import org.jboss.test.classloading.vfs.metadata.support.b.B;
import org.jboss.test.classloading.vfs.metadata.support.c.C;
+import org.jboss.vfs.VFS;
/**
* VFSResourceVisitorUnitTestCase.
@@ -309,7 +310,7 @@
}
};
- URL aURL = new URL("vfs" + System.getProperty("test.dir") + "/support/a/");
+ URL aURL = new URL(System.getProperty("test.dir") + "/support/a/");
Module module = assertModule("test:0.0.0");
module.visit(visitor, visitor.getFilter(), null, aURL);
@@ -344,8 +345,8 @@
}
};
- URL aURL = new URL("vfs" + System.getProperty("test.dir") + "/support/a/");
- URL bURL = new URL("vfs" + System.getProperty("test.dir") + "/support/b/");
+ URL aURL = new URL(System.getProperty("test.dir") + "/support/a/");
+ URL bURL = new URL(System.getProperty("test.dir") + "/support/b/");
Module module = assertModule("test:0.0.0");
module.visit(visitor, visitor.getFilter(), null, aURL, bURL);
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 2009-12-10 19:55:53 UTC (rev 97706)
+++ projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/policy/test/ExportAllUnitTestCase.java 2009-12-10 21:31:45 UTC (rev 97707)
@@ -108,11 +108,11 @@
for (int i = 0; i < urls.length; ++i)
{
files[i] = base.getChild(urls[i]);
- if (files[i] == null && i > 0)
+ if (files[i].exists() == false && i > 0)
{
files[i] = files[0].getChild(urls[i]);
}
- if (files[i] == null)
+ if (files[i].exists() == false)
fail("Can't find " + urls[i]);
}
@@ -123,11 +123,11 @@
for (int i = 0; i < excluded.length; ++i)
{
excludedFiles[i] = base.getChild(excluded[i]);
- if (excludedFiles[i] == null)
+ if (excludedFiles[i].exists() == false)
{
excludedFiles[i] = files[0].getChild(excluded[i]);
}
- if (excludedFiles[i] == null)
+ if (excludedFiles[i].exists() == false)
fail("Can't find " + excluded[i]);
}
}
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 2009-12-10 19:55:53 UTC (rev 97706)
+++ projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/policy/test/PackageInfoUnitTestCase.java 2009-12-10 21:31:45 UTC (rev 97707)
@@ -21,7 +21,12 @@
*/
package org.jboss.test.classloading.vfs.policy.test;
+import java.io.Closeable;
+import java.io.IOException;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -30,7 +35,9 @@
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;
/**
@@ -41,37 +48,68 @@
public class PackageInfoUnitTestCase extends BaseTestCase
{
+ private TempFileProvider provider;
+
public PackageInfoUnitTestCase(String name)
{
super(name);
}
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ provider = TempFileProvider.create("test", new ScheduledThreadPoolExecutor(2));
+ }
+
public void testCorrectPackage()
throws Exception
{
URL testear1xURL = getResource("/classloader/testear1x.ear");
- VirtualFile testear1x = VFS.getRoot(testear1xURL);
- VirtualFile jar1 = testear1x.getChild("lib/jar1.jar");
- assertNotNull(jar1);
- VirtualFile jar2 = testear1x.getChild("lib/jar2.jar");
- assertNotNull(jar2);
- VFSClassLoaderPolicy policy = VFSClassLoaderPolicy.createVFSClassLoaderPolicy("testCorrectPackage", testear1x, jar2, jar1);
- policy.setExportAll(ExportAll.NON_EMPTY);
- policy.setImportAll(true);
+ VirtualFile testear1x = VFS.getChild(testear1xURL);
+ List<Closeable> mounts = null;
+ try {
+ mounts = recursiveMount(testear1x);
+ VirtualFile jar1 = testear1x.getChild("lib/jar1.jar");
+ assertNotNull(jar1);
+ VirtualFile jar2 = testear1x.getChild("lib/jar2.jar");
+ assertNotNull(jar2);
+ VFSClassLoaderPolicy policy = VFSClassLoaderPolicy.createVFSClassLoaderPolicy("testCorrectPackage", testear1x, jar2, jar1);
+ policy.setExportAll(ExportAll.NON_EMPTY);
+ policy.setImportAll(true);
+
+ PackageInformation utilInfo = policy.getClassPackageInformation("util.Shared", "util");
+ /*
+ Specification-Title: testear1x.ear/lib/jar1.jar
+ Specification-Version: 1.0.1.GA
+ Specification-Vendor: JBoss
+ Implementation-Title: JBoss [division of RedHat]
+ Implementation-URL: http://www.jboss.org/
+ Implementation-Version: 1.0.1.GA
+ Implementation-Vendor: JBoss.org
+ Implementation-Vendor-Id: http://www.jboss.org/
+ */
+ assertEquals("testear1x.ear/lib/jar1.jar", utilInfo.specTitle);
+ assertEquals("1.0.1.GA", utilInfo.specVersion);
+ }
+ finally
+ {
+ VFSUtils.safeClose(mounts);
+ }
+ }
+
+ public List<Closeable> recursiveMount(VirtualFile file) throws IOException
+ {
+ ArrayList<Closeable> mounts = new ArrayList<Closeable>();
- PackageInformation utilInfo = policy.getClassPackageInformation("util.Shared", "util");
- /*
- Specification-Title: testear1x.ear/lib/jar1.jar
- Specification-Version: 1.0.1.GA
- Specification-Vendor: JBoss
- Implementation-Title: JBoss [division of RedHat]
- Implementation-URL: http://www.jboss.org/
- Implementation-Version: 1.0.1.GA
- Implementation-Vendor: JBoss.org
- Implementation-Vendor-Id: http://www.jboss.org/
- */
- assertEquals("testear1x.ear/lib/jar1.jar", utilInfo.specTitle);
- assertEquals("1.0.1.GA", utilInfo.specVersion);
+ 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;
}
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 2009-12-10 19:55:53 UTC (rev 97706)
+++ projects/jboss-cl/branches/vfs3-int/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/policy/test/VFSCLPolicySignedCertsUnitTestCase.java 2009-12-10 21:31:45 UTC (rev 97707)
@@ -63,7 +63,7 @@
public void testCertificates() throws Exception
{
URL signedJarURL = getResource("/classloader/signedjar");
- VirtualFile signedJarRoot = VFS.getRoot(signedJarURL);
+ VirtualFile signedJarRoot = VFS.getChild(signedJarURL);
VirtualFile signedJar = signedJarRoot.getChild("wstx.jar");
VFSClassLoaderPolicy policy = VFSClassLoaderPolicy.createVFSClassLoaderPolicy(signedJar);
policy.setExportAll(ExportAll.ALL);
More information about the jboss-cvs-commits
mailing list