[jboss-cvs] JBossAS SVN: r103839 - in projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning: annotations/test and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 12 10:55:13 EDT 2010
Author: alesj
Date: 2010-04-12 10:55:11 -0400 (Mon, 12 Apr 2010)
New Revision: 103839
Added:
projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/ScanningDeployersTest.java
projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/ScanningDeployersTestDelegate.java
projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/ScanningTestSuite.java
Modified:
projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/annotations/test/AbstractAnnotationsScanningTest.java
projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.java
projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/hierarchy/test/HierarchyUnitTestCase.java
projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/metadata/test/ScanningUnitTestCase.java
Log:
Fix classloading, filter test resources in deployments.
Added: projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/ScanningDeployersTest.java
===================================================================
--- projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/ScanningDeployersTest.java (rev 0)
+++ projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/ScanningDeployersTest.java 2010-04-12 14:55:11 UTC (rev 103839)
@@ -0,0 +1,357 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.scanning;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.security.CodeSource;
+import java.security.ProtectionDomain;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.jboss.classloader.plugins.ClassLoaderUtils;
+import org.jboss.classloader.plugins.jdk.AbstractJDKChecker;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.dispatch.InvokeDispatchContext;
+import org.jboss.deployers.client.spi.DeployerClient;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.structure.spi.main.MainDeployerInternals;
+import org.jboss.deployers.structure.spi.main.MainDeployerStructure;
+import org.jboss.deployers.vfs.spi.client.VFSDeployment;
+import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.test.deployers.support.AssembledDirectory;
+import org.jboss.test.kernel.junit.MicrocontainerTest;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VirtualFileAssembly;
+
+import junit.framework.AssertionFailedError;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class ScanningDeployersTest extends MicrocontainerTest
+{
+ private static Map<VirtualFile, Closeable> assemblyHandles = new HashMap<VirtualFile, Closeable>();
+
+ public static ScanningDeployersTestDelegate getDelegate(Class<?> clazz) throws Exception
+ {
+ return new ScanningDeployersTestDelegate(clazz);
+ }
+
+ public ScanningDeployersTest(String name)
+ {
+ super(name);
+ }
+
+ protected DeployerClient getDeployerClient()
+ {
+ return getDelegate().getMainDeployer();
+ }
+
+ protected MainDeployerStructure getMainDeployerStructure()
+ {
+ return getDelegate().getMainDeployer();
+ }
+
+ protected MainDeployerInternals getMainDeployerInternals()
+ {
+ return getDelegate().getMainDeployer();
+ }
+
+ protected String getRoot(Class<?> clazz)
+ {
+ ProtectionDomain pd = clazz.getProtectionDomain();
+ CodeSource cs = pd.getCodeSource();
+ URL location = cs.getLocation();
+ return location.toString();
+ }
+
+ protected ScanningDeployersTestDelegate getDelegate()
+ {
+ return (ScanningDeployersTestDelegate) super.getDelegate();
+ }
+
+ protected VirtualFile createDeploymentRoot(String root, String child) throws IOException, URISyntaxException
+ {
+ URL resourceRoot = getClass().getResource(root);
+ if (resourceRoot == null)
+ fail("Resource not found: " + root);
+ VirtualFile deployment = VFS.getChild(resourceRoot).getChild(child);
+ if (! deployment.exists())
+ fail("Child not found " + child + " from " + resourceRoot);
+ return deployment;
+ }
+
+ protected VFSDeployment createVFSDeployment(String root, String child) throws Exception
+ {
+ VirtualFile deployment = createDeploymentRoot(root, child);
+ return createVFSDeployment(deployment);
+ }
+
+ protected VFSDeployment createVFSDeployment(VirtualFile root) throws Exception
+ {
+ VFSDeploymentFactory factory = VFSDeploymentFactory.getInstance();
+ return factory.createVFSDeployment(root);
+ }
+
+ protected VFSDeploymentUnit assertDeploy(String root, String child) throws Exception
+ {
+ VFSDeployment deployment = createVFSDeployment(root, child);
+ getDeployerClient().deploy(deployment);
+ return (VFSDeploymentUnit) getMainDeployerStructure().getDeploymentUnit(deployment.getName(), true);
+ }
+
+ protected VFSDeploymentUnit assertDeploy(VirtualFile file) throws Exception
+ {
+ VFSDeployment deployment = createVFSDeployment(file);
+ getDeployerClient().deploy(deployment);
+ return (VFSDeploymentUnit) getMainDeployerStructure().getDeploymentUnit(deployment.getName(), true);
+ }
+
+ protected VFSDeploymentUnit addDeployment(String root, String child) throws Exception
+ {
+ VFSDeployment deployment = createVFSDeployment(root, child);
+ getDeployerClient().addDeployment(deployment);
+ getDeployerClient().process();
+ return (VFSDeploymentUnit) getMainDeployerStructure().getDeploymentUnit(deployment.getName(), true);
+ }
+
+ protected void undeploy(DeploymentUnit unit)
+ {
+ try
+ {
+ undeploy(unit, false);
+ }
+ catch (Throwable t)
+ {
+ throw new RuntimeException("Unexpected", t);
+ }
+ }
+
+ protected void undeploy(DeploymentUnit unit, boolean wantError) throws Exception
+ {
+ try
+ {
+ getDeployerClient().undeploy(unit.getName());
+ }
+ catch (Exception e)
+ {
+ if (wantError)
+ throw e;
+ }
+ }
+
+ protected void assertClassLoader(Class<?> clazz, ClassLoader expected)
+ {
+ if (expected == null)
+ return;
+ ClassLoader cl = clazz.getClassLoader();
+ boolean result = expected.equals(cl);
+ assertTrue(ClassLoaderUtils.classToString(clazz) + " should have expected classloader=" + expected, result);
+ }
+
+ protected void assertClassEquality(Class<?> expected, Class<?> actual)
+ {
+ assertTrue("Should be the same " + ClassLoaderUtils.classToString(expected) +" and " + ClassLoaderUtils.classToString(actual), expected == actual);
+ }
+
+ protected void assertNoClassEquality(Class<?> expected, Class<?> actual)
+ {
+ assertTrue("Should NOT be the same " + ClassLoaderUtils.classToString(expected) +" and " + ClassLoaderUtils.classToString(actual), expected != actual);
+ }
+
+ protected URL assertGetResource(String name, ClassLoader start)
+ {
+ URL result = start.getResource(name);
+ assertNotNull("Resource not found '" + name + "' from " + start, result);
+ return result;
+ }
+
+ protected void assertNoResource(String name, ClassLoader start)
+ {
+ URL result = start.getResource(name);
+ assertNull("Did not expect resource '" + name + "' from " + start, result);
+ }
+
+ protected Class<?> assertLoadClass(Class<?> reference, ClassLoader start)
+ {
+ return assertLoadClass(reference, start, start, false);
+ }
+
+ protected Class<?> assertLoadClass(Class<?> reference, ClassLoader start, boolean isReference)
+ {
+ return assertLoadClass(reference, start, start, isReference);
+ }
+
+ protected Class<?> assertLoadClass(Class<?> reference, ClassLoader start, ClassLoader expected)
+ {
+ return assertLoadClass(reference, start, expected, false);
+ }
+
+ protected Class<?> assertLoadClass(Class<?> reference, ClassLoader start, ClassLoader expected, boolean isReference)
+ {
+ Class<?> result = assertLoadClass(reference.getName(), start, expected);
+ if (isReference)
+ assertClassEquality(reference, result);
+ else
+ assertNoClassEquality(reference, result);
+ return result;
+ }
+
+ protected Class<?> assertLoadClass(String name, ClassLoader start)
+ {
+ return assertLoadClass(name, start, start);
+ }
+
+ protected Class<?> assertLoadClass(String name, ClassLoader start, ClassLoader expected)
+ {
+ Class<?> result = null;
+ try
+ {
+ result = start.loadClass(name);
+ getLog().debug("Got class: " + ClassLoaderUtils.classToString(result) + " for " + name + " from " + start);
+ }
+ catch (ClassNotFoundException e)
+ {
+ failure("Did not expect CNFE for " + name + " from " + start, e);
+ }
+ assertClassLoader(result, expected);
+ return result;
+ }
+
+ protected void assertLoadClassFail(Class<?> reference, ClassLoader start)
+ {
+ assertLoadClassFail(reference.getName(), start);
+ }
+
+ protected void assertLoadClassFail(String name, ClassLoader start)
+ {
+ try
+ {
+ start.loadClass(name);
+ fail("Should not be here!");
+ }
+ catch (Exception expected)
+ {
+ checkThrowable(ClassNotFoundException.class, expected);
+ }
+ }
+
+ protected ClassLoader getClassLoader(DeploymentUnit unit)
+ {
+ return unit.getClassLoader();
+ }
+
+ protected void assertNoClassLoader(DeploymentUnit unit)
+ {
+ try
+ {
+ assertNull("Should not be a classloader: " + unit.getClassLoader());
+ }
+ catch (Throwable e)
+ {
+ checkThrowable(IllegalStateException.class, e);
+ }
+ }
+
+ protected ClassLoader getClassLoader(Object name)
+ {
+ ControllerContext ctx = getControllerContext(name);
+ assertNotNull(ctx);
+ InvokeDispatchContext dispatch = assertInstanceOf(ctx, InvokeDispatchContext.class, true);
+ try
+ {
+ ClassLoader result = dispatch.getClassLoader();
+ assertNotNull(result);
+ return result;
+ }
+ catch (AssertionFailedError e)
+ {
+ throw e;
+ }
+ catch (Throwable e)
+ {
+ throw new RuntimeException("Unexpected error getting classloader", e);
+ }
+ }
+
+ protected DeploymentUnit assertChild(DeploymentUnit parent, String name)
+ {
+ String parentName = parent.getName();
+ if (parentName.endsWith("/") == false)
+ parentName += "/";
+ name = parentName + name;
+ if (name.endsWith("/") == false)
+ name += "/";
+
+ List<DeploymentUnit> children = parent.getChildren();
+ for (DeploymentUnit child : children)
+ {
+ if (name.equals(child.getName()))
+ return child;
+ }
+ throw new AssertionFailedError("Child " + name + " not found in " + children);
+ }
+
+ protected AssembledDirectory createAssembledDirectory(VirtualFile mountPoint) throws Exception
+ {
+ VirtualFileAssembly assembly = new VirtualFileAssembly();
+ assemblyHandles.put(mountPoint, VFS.mountAssembly(assembly, mountPoint));
+ return new AssembledDirectory(getClass(), assembly);
+ }
+
+ protected VirtualFile getVirtualFile(String path) throws URISyntaxException
+ {
+ URL resource = getResource(path);
+ if(resource != null)
+ return VFS.getChild(resource);
+ return null;
+ }
+
+ protected void closeAssembly(VirtualFile mountPoint) throws IOException
+ {
+ if (assemblyHandles.containsKey(mountPoint))
+ assemblyHandles.get(mountPoint).close();
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ // This is a hack for a hack. ;-)
+ AbstractJDKChecker.getExcluded().add(ScanningDeployersTest.class);
+ }
+
+ protected void tearDown() throws Exception
+ {
+ for (Closeable handle : assemblyHandles.values())
+ {
+ handle.close();
+ }
+ }
+}
+
Added: projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/ScanningDeployersTestDelegate.java
===================================================================
--- projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/ScanningDeployersTestDelegate.java (rev 0)
+++ projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/ScanningDeployersTestDelegate.java 2010-04-12 14:55:11 UTC (rev 103839)
@@ -0,0 +1,127 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.scanning;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import java.net.URL;
+
+import org.jboss.classloader.plugins.ClassLoaderUtils;
+import org.jboss.classloader.plugins.filter.PatternClassFilter;
+import org.jboss.classloader.spi.ClassLoaderDomain;
+import org.jboss.classloader.spi.ClassLoaderSystem;
+import org.jboss.classloader.spi.ParentPolicy;
+import org.jboss.classloader.spi.filter.ClassFilter;
+import org.jboss.classloader.spi.filter.ClassFilterUtils;
+import org.jboss.classloading.spi.metadata.ClassLoadingMetaData10;
+import org.jboss.classloading.spi.vfs.metadata.VFSClassLoaderFactory10;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.deployers.plugins.main.MainDeployerImpl;
+import org.jboss.deployers.spi.deployer.Deployers;
+import org.jboss.test.kernel.junit.MicrocontainerTestDelegate;
+import org.jboss.xb.binding.resolver.MutableSchemaResolver;
+import org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class ScanningDeployersTestDelegate extends MicrocontainerTestDelegate
+{
+ private static ParentPolicy parentPolicy;
+
+ private MainDeployerImpl mainDeployer;
+
+ private MBeanServer server = null;
+
+ static
+ {
+ MutableSchemaResolver resolver = SingletonSchemaResolverFactory.getInstance().getSchemaBindingResolver();
+ resolver.mapURIToClass("urn:jboss:classloader:1.0", VFSClassLoaderFactory10.class);
+ resolver.mapURIToClass("urn:jboss:classloading:1.0", ClassLoadingMetaData10.class);
+
+ ClassFilter classFilter = createNegatingClassFilter();
+ parentPolicy = new ParentPolicy(classFilter, ClassFilterUtils.NOTHING, "BEFORE");
+ }
+
+ protected static ClassFilter createNegatingClassFilter()
+ {
+ return createNegatingClassFilter(ScanningDeployersTest.class);
+ }
+
+ protected static ClassFilter createNegatingClassFilter(Class<?> clazz)
+ {
+ String packageName = clazz.getPackage().getName();
+ String packagePath = ClassLoaderUtils.packageNameToPath(clazz.getName());
+ ClassFilter patternFilter = new PatternClassFilter(
+ new String[] { packageName + "\\..+" },
+ new String[] { packagePath + "/.+" },
+ new String[] { packageName, packageName + "\\..*"}
+ );
+ return ClassFilterUtils.negatingClassFilter(patternFilter);
+ }
+
+ public ScanningDeployersTestDelegate(Class<?> clazz) throws Exception
+ {
+ super(clazz);
+ }
+
+ public MBeanServer getMBeanServer()
+ {
+ return server;
+ }
+
+ public void setMBeanServer(MBeanServer server)
+ {
+ this.server = server;
+ }
+
+ protected void deploy() throws Exception
+ {
+ String common = "/bootstrap/bootstrap.xml";
+ URL url = getClass().getResource(common);
+ if (url == null)
+ throw new IllegalStateException(common + " not found");
+ deploy(url);
+
+ ClassLoaderSystem system = getBean("ClassLoaderSystem", ControllerState.INSTALLED, ClassLoaderSystem.class);
+ ClassLoaderDomain domain = system.getDefaultDomain();
+ domain.setParentPolicy(parentPolicy);
+
+ if (server != null)
+ {
+ Deployers deployers = getBean("Deployers", ControllerState.INSTALLED, Deployers.class);
+ server.registerMBean(deployers, new ObjectName("test:type=Deployers"));
+ }
+
+ super.deploy();
+ }
+
+ protected MainDeployerImpl getMainDeployer()
+ {
+ if (mainDeployer == null)
+ mainDeployer = getBean("MainDeployer", ControllerState.INSTALLED, MainDeployerImpl.class);
+ return mainDeployer;
+ }
+}
+
Added: projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/ScanningTestSuite.java
===================================================================
--- projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/ScanningTestSuite.java (rev 0)
+++ projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/ScanningTestSuite.java 2010-04-12 14:55:11 UTC (rev 103839)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.scanning;
+
+import org.jboss.test.scanning.annotations.AnnotationsTestSuite;
+import org.jboss.test.scanning.hibernate.HibernateTestSuite;
+import org.jboss.test.scanning.hierarchy.HierarchyTestSuite;
+import org.jboss.test.scanning.metadata.MetaDataTestSuite;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class ScanningTestSuite extends TestSuite
+{
+ public static void main(String[] args)
+ {
+ TestRunner.run(suite());
+ }
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite("Scanning Tests");
+
+ suite.addTest(AnnotationsTestSuite.suite());
+ suite.addTest(HibernateTestSuite.suite());
+ suite.addTest(MetaDataTestSuite.suite());
+ suite.addTest(HierarchyTestSuite.suite());
+
+ return suite;
+ }
+}
+
Modified: projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/annotations/test/AbstractAnnotationsScanningTest.java
===================================================================
--- projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/annotations/test/AbstractAnnotationsScanningTest.java 2010-04-12 14:54:20 UTC (rev 103838)
+++ projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/annotations/test/AbstractAnnotationsScanningTest.java 2010-04-12 14:55:11 UTC (rev 103839)
@@ -28,7 +28,7 @@
import org.jboss.scanning.annotations.spi.AnnotationIndex;
import org.jboss.scanning.annotations.spi.AnnotationRepository;
import org.jboss.scanning.annotations.spi.Element;
-import org.jboss.test.deployers.BootstrapDeployersTest;
+import org.jboss.test.scanning.ScanningDeployersTest;
import org.jboss.test.scanning.annotations.support.NoExtRecurseFilter;
import org.jboss.test.scanning.annotations.support.ext.External;
import org.jboss.test.scanning.annotations.support.jar.JarMarkOnClass;
@@ -43,7 +43,7 @@
/**
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
-public abstract class AbstractAnnotationsScanningTest extends BootstrapDeployersTest
+public abstract class AbstractAnnotationsScanningTest extends ScanningDeployersTest
{
protected AbstractAnnotationsScanningTest(String name)
{
Modified: projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.java
===================================================================
--- projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.java 2010-04-12 14:54:20 UTC (rev 103838)
+++ projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.java 2010-04-12 14:55:11 UTC (rev 103839)
@@ -41,7 +41,7 @@
import org.jboss.classloader.spi.filter.PackageClassFilter;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.test.deployers.BootstrapDeployersTest;
+import org.jboss.test.scanning.ScanningDeployersTest;
import org.jboss.vfs.VFS;
import org.jboss.vfs.VirtualFile;
@@ -52,7 +52,7 @@
/**
* @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
*/
-public class HibernateUnitTestCase extends BootstrapDeployersTest
+public class HibernateUnitTestCase extends ScanningDeployersTest
{
public HibernateUnitTestCase(String name)
{
Modified: projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/hierarchy/test/HierarchyUnitTestCase.java
===================================================================
--- projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/hierarchy/test/HierarchyUnitTestCase.java 2010-04-12 14:54:20 UTC (rev 103838)
+++ projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/hierarchy/test/HierarchyUnitTestCase.java 2010-04-12 14:55:11 UTC (rev 103839)
@@ -30,7 +30,7 @@
import org.jboss.reflect.spi.ClassInfo;
import org.jboss.reflect.spi.TypeInfo;
import org.jboss.scanning.hierarchy.spi.HierarchyIndex;
-import org.jboss.test.deployers.BootstrapDeployersTest;
+import org.jboss.test.scanning.ScanningDeployersTest;
import org.jboss.test.scanning.annotations.support.NoExtRecurseFilter;
import org.jboss.test.scanning.annotations.support.ext.External;
import org.jboss.test.scanning.annotations.support.jar.JarMarkOnClass;
@@ -51,7 +51,7 @@
*
* @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
*/
-public class HierarchyUnitTestCase extends BootstrapDeployersTest
+public class HierarchyUnitTestCase extends ScanningDeployersTest
{
public HierarchyUnitTestCase(String name)
{
Modified: projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/metadata/test/ScanningUnitTestCase.java
===================================================================
--- projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/metadata/test/ScanningUnitTestCase.java 2010-04-12 14:54:20 UTC (rev 103838)
+++ projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/metadata/test/ScanningUnitTestCase.java 2010-04-12 14:55:11 UTC (rev 103839)
@@ -27,7 +27,7 @@
import org.jboss.classloader.plugins.ClassLoaderUtils;
import org.jboss.classloading.spi.visitor.ResourceFilter;
import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.test.deployers.BootstrapDeployersTest;
+import org.jboss.test.scanning.ScanningDeployersTest;
import org.jboss.test.scanning.annotations.support.jar.JarMarkOnClass;
import org.jboss.test.scanning.annotations.support.jar.impl.JarMarkOnClassImpl;
import org.jboss.test.scanning.annotations.support.war.WebMarkOnClass;
@@ -44,7 +44,7 @@
*
* @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
*/
-public class ScanningUnitTestCase extends BootstrapDeployersTest
+public class ScanningUnitTestCase extends ScanningDeployersTest
{
public ScanningUnitTestCase(String name)
{
More information about the jboss-cvs-commits
mailing list