[jboss-cvs] JBossAS SVN: r72778 - in projects/jboss-cl/trunk/classloading-vfs/src: resources/tests/org/jboss/test/classloading/vfs/metadata/test and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 28 07:43:48 EDT 2008
Author: alesj
Date: 2008-04-28 07:43:48 -0400 (Mon, 28 Apr 2008)
New Revision: 72778
Added:
projects/jboss-cl/trunk/classloading-vfs/src/resources/tests/org/jboss/test/classloading/vfs/metadata/test/VFSResourceVisitorTest.xml
projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/test/VFSResourceVisitorUnitTestCase.java
Modified:
projects/jboss-cl/trunk/classloading-vfs/src/main/org/jboss/classloading/spi/vfs/metadata/VFSClassLoaderFactory.java
projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/ClassLoadingVFSTestSuite.java
projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/VFSClassLoadingMicrocontainerTest.java
projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/VFSClassLoadingMicrocontainerTestDelegate.java
projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/xml/test/VFSClassLoaderFactoryXMLUnitTestCase.java
projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/policy/test/ExportAllUnitTestCase.java
Log:
Initial VFS resource visitor tests.
Modified: projects/jboss-cl/trunk/classloading-vfs/src/main/org/jboss/classloading/spi/vfs/metadata/VFSClassLoaderFactory.java
===================================================================
--- projects/jboss-cl/trunk/classloading-vfs/src/main/org/jboss/classloading/spi/vfs/metadata/VFSClassLoaderFactory.java 2008-04-28 11:36:23 UTC (rev 72777)
+++ projects/jboss-cl/trunk/classloading-vfs/src/main/org/jboss/classloading/spi/vfs/metadata/VFSClassLoaderFactory.java 2008-04-28 11:43:48 UTC (rev 72778)
@@ -177,7 +177,7 @@
// Determine some properties
String contextName = getContextName();
if (contextName == null)
- contextName = getName() + ":" + getVersion().toString();
+ contextName = getName() + ":" + getVersion();
String moduleName = contextName + "$MODULE";
// Create the module
Copied: projects/jboss-cl/trunk/classloading-vfs/src/resources/tests/org/jboss/test/classloading/vfs/metadata/test/VFSResourceVisitorTest.xml (from rev 72628, projects/jboss-cl/trunk/classloading-vfs/src/resources/tests/org/jboss/test/classloading/vfs/metadata/test/SmokeTest.xml)
===================================================================
--- projects/jboss-cl/trunk/classloading-vfs/src/resources/tests/org/jboss/test/classloading/vfs/metadata/test/VFSResourceVisitorTest.xml (rev 0)
+++ projects/jboss-cl/trunk/classloading-vfs/src/resources/tests/org/jboss/test/classloading/vfs/metadata/test/VFSResourceVisitorTest.xml 2008-04-28 11:43:48 UTC (rev 72778)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0" xmlns:cl="urn:jboss:classloader:1.0">
+
+ <classloader xmlns="urn:jboss:classloader:1.0" name="test">
+ <root>${test.dir}/support/</root>
+ </classloader>
+
+</deployment>
Modified: projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/ClassLoadingVFSTestSuite.java
===================================================================
--- projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/ClassLoadingVFSTestSuite.java 2008-04-28 11:36:23 UTC (rev 72777)
+++ projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/ClassLoadingVFSTestSuite.java 2008-04-28 11:43:48 UTC (rev 72778)
@@ -34,6 +34,7 @@
import org.jboss.test.classloading.vfs.metadata.test.ReExportPackageUnitTestCase;
import org.jboss.test.classloading.vfs.metadata.test.UsesPackageUnitTestCase;
import org.jboss.test.classloading.vfs.metadata.test.VFSClassLoaderFactoryUnitTestCase;
+import org.jboss.test.classloading.vfs.metadata.test.VFSResourceVisitorUnitTestCase;
import org.jboss.test.classloading.vfs.metadata.xml.test.VFSClassLoaderFactoryXMLUnitTestCase;
import org.jboss.test.classloading.vfs.policy.test.ExportAllUnitTestCase;
@@ -75,7 +76,8 @@
suite.addTest(ReExportModuleUnitTestCase.suite());
suite.addTest(ReExportPackageUnitTestCase.suite());
suite.addTest(UsesPackageUnitTestCase.suite());
-
+ suite.addTest(VFSResourceVisitorUnitTestCase.suite());
+
return suite;
}
}
Modified: projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/VFSClassLoadingMicrocontainerTest.java
===================================================================
--- projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/VFSClassLoadingMicrocontainerTest.java 2008-04-28 11:36:23 UTC (rev 72777)
+++ projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/VFSClassLoadingMicrocontainerTest.java 2008-04-28 11:43:48 UTC (rev 72778)
@@ -33,6 +33,7 @@
import org.jboss.classloader.spi.ClassLoaderDomain;
import org.jboss.classloader.spi.ClassLoaderSystem;
import org.jboss.classloader.spi.ParentPolicy;
+import org.jboss.classloading.spi.dependency.Module;
import org.jboss.classloading.spi.vfs.metadata.VFSClassLoaderFactory;
import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
import org.jboss.kernel.spi.deployment.KernelDeployment;
@@ -90,7 +91,7 @@
protected ClassLoader assertClassLoader(String name, String version) throws Exception
{
- String contextName = name + ":" + version.toString();
+ String contextName = name + ":" + version;
return assertClassLoader(contextName);
}
@@ -107,7 +108,7 @@
protected void assertNoClassLoader(String name, String version) throws Exception
{
- String contextName = name + ":" + version.toString();
+ String contextName = name + ":" + version;
assertNoClassLoader(contextName);
}
@@ -216,6 +217,11 @@
checkThrowable(IllegalStateException.class, t);
}
}
+
+ protected Module assertModule(String contextName)
+ {
+ return assertBean(contextName + "$MODULE", Module.class);
+ }
protected void setUp() throws Exception
{
Modified: projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/VFSClassLoadingMicrocontainerTestDelegate.java
===================================================================
--- projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/VFSClassLoadingMicrocontainerTestDelegate.java 2008-04-28 11:36:23 UTC (rev 72777)
+++ projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/VFSClassLoadingMicrocontainerTestDelegate.java 2008-04-28 11:43:48 UTC (rev 72778)
@@ -27,7 +27,7 @@
/**
*
- * An AOPMicrocontainerTestDelegate.
+ * An VFSCLMicrocontainerTestDelegate.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 63094 $
Copied: projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/test/VFSResourceVisitorUnitTestCase.java (from rev 72628, projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/test/VFSClassLoaderFactoryUnitTestCase.java)
===================================================================
--- projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/test/VFSResourceVisitorUnitTestCase.java (rev 0)
+++ projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/test/VFSResourceVisitorUnitTestCase.java 2008-04-28 11:43:48 UTC (rev 72778)
@@ -0,0 +1,114 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.classloading.vfs.metadata.test;
+
+import java.net.URL;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import junit.framework.Test;
+import org.jboss.classloading.spi.dependency.Module;
+import org.jboss.classloading.spi.vfs.metadata.VFSClassLoaderFactory;
+import org.jboss.classloading.spi.visitor.ClassVisitor;
+import org.jboss.classloading.spi.visitor.ResourceContext;
+import org.jboss.classloading.spi.visitor.ResourceVisitor;
+import org.jboss.kernel.spi.deployment.KernelDeployment;
+import org.jboss.test.classloading.vfs.metadata.VFSClassLoadingMicrocontainerTest;
+
+/**
+ * VFSResourceVisitorUnitTestCase.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public class VFSResourceVisitorUnitTestCase extends VFSClassLoadingMicrocontainerTest
+{
+ private static String[] paths = new String[] {"a/A.class", "b/B.class", "c/C.class"};
+
+ public static Test suite()
+ {
+ return suite(VFSResourceVisitorUnitTestCase.class);
+ }
+
+ public VFSResourceVisitorUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ URL url = getClass().getResource("VFSResourceVisitorUnitTestCase.class");
+ String urlString = url.toExternalForm();
+ String end = "/test/VFSResourceVisitorUnitTestCase.class";
+ int length = urlString.length() - end.length();
+ urlString = urlString.substring(0, length);
+ System.setProperty("test.dir", urlString);
+ }
+
+ public void testFromXml() throws Exception
+ {
+ KernelDeployment deployment = deploy("VFSResourceVisitorTest.xml");
+ try
+ {
+ validate();
+ visitModule();
+ }
+ finally
+ {
+ undeploy(deployment);
+ }
+ }
+
+ public void testFromAPI() throws Exception
+ {
+ VFSClassLoaderFactory factory = new VFSClassLoaderFactory("test");
+ factory.setRoots(Arrays.asList(System.getProperty("test.dir") + "/support/"));
+ install(factory);
+ try
+ {
+ visitModule();
+ }
+ finally
+ {
+ shutdown();
+ }
+ }
+
+ // TODO - test inputstream / bytes
+
+ protected void visitModule()
+ {
+ Module module = assertModule("test:0.0.0");
+ final Set<String> set = new HashSet<String>();
+ ResourceVisitor visitor = new ClassVisitor()
+ {
+ public void visit(ResourceContext resource)
+ {
+ set.add(resource.getResourceName());
+ }
+ };
+ module.visit(visitor);
+ assertEquals(new HashSet<String>(Arrays.asList(paths)), set);
+ }
+}
\ No newline at end of file
Modified: projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/xml/test/VFSClassLoaderFactoryXMLUnitTestCase.java
===================================================================
--- projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/xml/test/VFSClassLoaderFactoryXMLUnitTestCase.java 2008-04-28 11:36:23 UTC (rev 72777)
+++ projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/metadata/xml/test/VFSClassLoaderFactoryXMLUnitTestCase.java 2008-04-28 11:43:48 UTC (rev 72778)
@@ -160,7 +160,7 @@
public void testModuleRoots() throws Exception
{
VFSClassLoaderFactory result = unmarshal();
- assertEquals(Arrays.asList(new String[] { "root1", "root2", "root3" }), result.getRoots());
+ assertEquals(Arrays.asList("root1", "root2", "root3"), result.getRoots());
}
public void testExportOneModuleNoVersion() throws Exception
Modified: projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/policy/test/ExportAllUnitTestCase.java
===================================================================
--- projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/policy/test/ExportAllUnitTestCase.java 2008-04-28 11:36:23 UTC (rev 72777)
+++ projects/jboss-cl/trunk/classloading-vfs/src/tests/org/jboss/test/classloading/vfs/policy/test/ExportAllUnitTestCase.java 2008-04-28 11:43:48 UTC (rev 72778)
@@ -25,6 +25,7 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -33,7 +34,6 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-
import org.jboss.classloader.plugins.system.DefaultClassLoaderSystem;
import org.jboss.classloader.spi.ClassLoaderSystem;
import org.jboss.classloading.spi.metadata.ExportAll;
@@ -325,10 +325,7 @@
protected Set<String> makeSet(String... elements)
{
assertNotNull(elements);
- Set<String> result = new HashSet<String>();
- for (String string : elements)
- result.add(string);
- return result;
+ return new HashSet<String>(Arrays.asList(elements));
}
protected Map<String,String> makeSimpleMap(String prefix, String... elements)
More information about the jboss-cvs-commits
mailing list