[jboss-cvs] JBossAS SVN: r71490 - in projects/jboss-deployers/trunk: deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 31 12:54:30 EDT 2008
Author: alesj
Date: 2008-03-31 12:54:30 -0400 (Mon, 31 Mar 2008)
New Revision: 71490
Added:
projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/AbstractDeployerUnitTest.java
projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/DeployerClientTest.java
Removed:
projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/AbstractDeployerUnitTestCase.java
projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/jaxp/DeployerClientTestCase.java
projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/test/AbstractDeployerUnitTestCase.java
Modified:
projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractParsingDeployerWithOutput.java
projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java
projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/BeanDeployerClassLoaderUnitTestCase.java
projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/BeanDeployerUnitTestCase.java
projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/BeanManagedDeploymentUnitTestCase.java
projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/KernelDeployerUnitTestCase.java
projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/jaxp/test/JAXPDeployerUnitTestCase.java
projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/test/BeanMergeUnitTestCase.java
Log:
Removing duplicated classes.
Modified: projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractParsingDeployerWithOutput.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractParsingDeployerWithOutput.java 2008-03-31 16:50:31 UTC (rev 71489)
+++ projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractParsingDeployerWithOutput.java 2008-03-31 16:54:30 UTC (rev 71490)
@@ -211,6 +211,16 @@
return false;
}
+ /**
+ * Do we have a single name set.
+ *
+ * @return true is just one matching name is set
+ */
+ private boolean hasSingleName()
+ {
+ return names == null || names.size() == 1;
+ }
+
public void deploy(DeploymentUnit unit) throws DeploymentException
{
if (accepts(unit) == false)
@@ -288,16 +298,6 @@
}
/**
- * Do we have a single name set.
- *
- * @return true is just one matching name is set
- */
- private boolean hasSingleName()
- {
- return names == null || names.size() == 1;
- }
-
- /**
* Create some meta data. Invokes parse(unit, name, suffix) if there is not already a
* metadata
*
Added: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/AbstractDeployerUnitTest.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/AbstractDeployerUnitTest.java (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/AbstractDeployerUnitTest.java 2008-03-31 16:54:30 UTC (rev 71490)
@@ -0,0 +1,67 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.deployers.vfs.deployer;
+
+import org.jboss.deployers.vfs.plugins.structure.file.FileStructure;
+import org.jboss.deployers.vfs.plugins.structure.jar.JARStructure;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
+import org.jboss.kernel.spi.dependency.KernelController;
+
+/**
+ * AbstractDeployerUnitTestCase.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public abstract class AbstractDeployerUnitTest extends DeployerClientTest
+{
+ protected KernelController controller;
+
+ public AbstractDeployerUnitTest(String name) throws Throwable
+ {
+ super(name);
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ try
+ {
+ BasicBootstrap bootstrap = new BasicBootstrap();
+ bootstrap.run();
+ Kernel kernel = bootstrap.getKernel();
+ controller = kernel.getController();
+
+ main = createMainDeployer();
+ addStructureDeployer(main, new JARStructure());
+ addStructureDeployer(main, new FileStructure());
+
+ addDeployers(kernel);
+ }
+ catch (Throwable t)
+ {
+ throw new RuntimeException(t);
+ }
+ }
+
+ protected abstract void addDeployers(Kernel kernel);
+}
\ No newline at end of file
Added: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/DeployerClientTest.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/DeployerClientTest.java (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/DeployerClientTest.java 2008-03-31 16:54:30 UTC (rev 71490)
@@ -0,0 +1,67 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.deployers.vfs.deployer;
+
+import org.jboss.test.deployers.BaseDeployersVFSTest;
+import org.jboss.deployers.client.spi.DeployerClient;
+import org.jboss.deployers.client.spi.Deployment;
+import org.jboss.deployers.spi.DeploymentState;
+
+/**
+ * DeployerClientTestCase.
+ * DeployerClient instance holder.
+ *
+ * @author <a href="ales.justin at jboss.org">Ales Justin</a>
+ */
+public abstract class DeployerClientTest extends BaseDeployersVFSTest
+{
+ protected DeployerClient main;
+
+ public DeployerClientTest(String name)
+ {
+ super(name);
+ }
+
+ protected void assertDeploy(Deployment context) throws Exception
+ {
+ assertDeploy(context, DeploymentState.DEPLOYED);
+ }
+
+ protected void assertUndeploy(Deployment context) throws Exception
+ {
+ assertUndeploy(context, DeploymentState.UNDEPLOYED);
+ }
+
+ protected void assertDeploy(Deployment context, DeploymentState expectedState) throws Exception
+ {
+ main.addDeployment(context);
+ main.process();
+ assertEquals("Should be Deployed " + context, expectedState, main.getDeploymentState(context.getName()));
+ }
+
+ protected void assertUndeploy(Deployment context, DeploymentState expectedState) throws Exception
+ {
+ main.removeDeployment(context.getName());
+ main.process();
+ assertEquals("Should be Undeployed " + context, expectedState, main.getDeploymentState(context.getName()));
+ }
+}
Deleted: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/AbstractDeployerUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/AbstractDeployerUnitTestCase.java 2008-03-31 16:50:31 UTC (rev 71489)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/AbstractDeployerUnitTestCase.java 2008-03-31 16:54:30 UTC (rev 71490)
@@ -1,68 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.deployers.vfs.deployer.bean.test;
-
-import org.jboss.deployers.vfs.plugins.structure.file.FileStructure;
-import org.jboss.deployers.vfs.plugins.structure.jar.JARStructure;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
-import org.jboss.kernel.spi.dependency.KernelController;
-import org.jboss.test.deployers.vfs.deployer.jaxp.DeployerClientTestCase;
-
-/**
- * AbstractDeployerUnitTestCase.
- *
- * @author <a href="ales.justin at jboss.com">Ales Justin</a>
- */
-public abstract class AbstractDeployerUnitTestCase extends DeployerClientTestCase
-{
- protected KernelController controller;
-
- public AbstractDeployerUnitTestCase(String name) throws Throwable
- {
- super(name);
- }
-
- protected void setUp() throws Exception
- {
- super.setUp();
- try
- {
- BasicBootstrap bootstrap = new BasicBootstrap();
- bootstrap.run();
- Kernel kernel = bootstrap.getKernel();
- controller = kernel.getController();
-
- main = createMainDeployer();
- addStructureDeployer(main, new JARStructure());
- addStructureDeployer(main, new FileStructure());
-
- addDeployers(kernel);
- }
- catch (Throwable t)
- {
- throw new RuntimeException(t);
- }
- }
-
- protected abstract void addDeployers(Kernel kernel);
-}
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java 2008-03-31 16:50:31 UTC (rev 71489)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java 2008-03-31 16:54:30 UTC (rev 71490)
@@ -31,13 +31,14 @@
import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
import org.jboss.deployers.vfs.spi.client.VFSDeployment;
import org.jboss.kernel.Kernel;
+import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
/**
* AliasDeployerUnitTestCase.
*
* @author <a href="ales.justin at jboss.com">Ales Justin</a>
*/
-public class AliasDeployerUnitTestCase extends AbstractDeployerUnitTestCase
+public class AliasDeployerUnitTestCase extends AbstractDeployerUnitTest
{
public static Test suite()
{
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/BeanDeployerClassLoaderUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/BeanDeployerClassLoaderUnitTestCase.java 2008-03-31 16:50:31 UTC (rev 71489)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/BeanDeployerClassLoaderUnitTestCase.java 2008-03-31 16:54:30 UTC (rev 71490)
@@ -23,13 +23,13 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.deployer.kernel.BeanDeployer;
import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
import org.jboss.deployers.vfs.spi.client.VFSDeployment;
import org.jboss.kernel.Kernel;
+import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
import org.jboss.test.deployers.vfs.deployer.bean.support.Simple;
import org.jboss.test.deployers.vfs.deployer.bean.support.TestClassLoaderDeployer;
@@ -39,7 +39,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public class BeanDeployerClassLoaderUnitTestCase extends AbstractDeployerUnitTestCase
+public class BeanDeployerClassLoaderUnitTestCase extends AbstractDeployerUnitTest
{
public static Test suite()
{
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/BeanDeployerUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/BeanDeployerUnitTestCase.java 2008-03-31 16:50:31 UTC (rev 71489)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/BeanDeployerUnitTestCase.java 2008-03-31 16:54:30 UTC (rev 71490)
@@ -28,6 +28,7 @@
import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
import org.jboss.deployers.vfs.spi.client.VFSDeployment;
import org.jboss.kernel.Kernel;
+import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
/**
* BeanDeployerUnitTestCase.
@@ -36,7 +37,7 @@
* @author <a href="ales.justin at jboss.com">Ales Justin</a>
* @version $Revision: 1.1 $
*/
-public class BeanDeployerUnitTestCase extends AbstractDeployerUnitTestCase
+public class BeanDeployerUnitTestCase extends AbstractDeployerUnitTest
{
public static Test suite()
{
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/BeanManagedDeploymentUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/BeanManagedDeploymentUnitTestCase.java 2008-03-31 16:50:31 UTC (rev 71489)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/BeanManagedDeploymentUnitTestCase.java 2008-03-31 16:54:30 UTC (rev 71490)
@@ -25,7 +25,6 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-
import org.jboss.deployers.vfs.deployer.kernel.BeanDeployer;
import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
@@ -36,6 +35,7 @@
import org.jboss.managed.api.factory.ManagedObjectFactory;
import org.jboss.metatype.api.values.CollectionValue;
import org.jboss.metatype.api.values.GenericValue;
+import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
/**
* Tests of bean deployment ManagedObject/ManagedDeployment creation.
@@ -43,7 +43,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision:$
*/
-public class BeanManagedDeploymentUnitTestCase extends AbstractDeployerUnitTestCase
+public class BeanManagedDeploymentUnitTestCase extends AbstractDeployerUnitTest
{
public static Test suite()
{
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/KernelDeployerUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/KernelDeployerUnitTestCase.java 2008-03-31 16:50:31 UTC (rev 71489)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/KernelDeployerUnitTestCase.java 2008-03-31 16:54:30 UTC (rev 71490)
@@ -33,6 +33,7 @@
import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
+import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
import org.jboss.test.deployers.vfs.deployer.bean.support.Simple;
import org.jboss.test.deployers.vfs.deployer.bean.support.TestBeanDeployer;
@@ -42,7 +43,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public class KernelDeployerUnitTestCase extends AbstractDeployerUnitTestCase
+public class KernelDeployerUnitTestCase extends AbstractDeployerUnitTest
{
public static Test suite()
{
Deleted: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/jaxp/DeployerClientTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/jaxp/DeployerClientTestCase.java 2008-03-31 16:50:31 UTC (rev 71489)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/jaxp/DeployerClientTestCase.java 2008-03-31 16:54:30 UTC (rev 71490)
@@ -1,67 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.deployers.vfs.deployer.jaxp;
-
-import org.jboss.deployers.client.spi.DeployerClient;
-import org.jboss.deployers.client.spi.Deployment;
-import org.jboss.deployers.spi.DeploymentState;
-import org.jboss.test.deployers.BaseDeployersVFSTest;
-
-/**
- * DeployerClientTestCase.
- * DeployerClient instance holder.
- *
- * @author <a href="ales.justin at jboss.org">Ales Justin</a>
- */
-public abstract class DeployerClientTestCase extends BaseDeployersVFSTest
-{
- protected DeployerClient main;
-
- public DeployerClientTestCase(String name)
- {
- super(name);
- }
-
- protected void assertDeploy(Deployment context) throws Exception
- {
- assertDeploy(context, DeploymentState.DEPLOYED);
- }
-
- protected void assertUndeploy(Deployment context) throws Exception
- {
- assertUndeploy(context, DeploymentState.UNDEPLOYED);
- }
-
- protected void assertDeploy(Deployment context, DeploymentState expectedState) throws Exception
- {
- main.addDeployment(context);
- main.process();
- assertEquals("Should be Deployed " + context, expectedState, main.getDeploymentState(context.getName()));
- }
-
- protected void assertUndeploy(Deployment context, DeploymentState expectedState) throws Exception
- {
- main.removeDeployment(context.getName());
- main.process();
- assertEquals("Should be Undeployed " + context, expectedState, main.getDeploymentState(context.getName()));
- }
-}
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/jaxp/test/JAXPDeployerUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/jaxp/test/JAXPDeployerUnitTestCase.java 2008-03-31 16:50:31 UTC (rev 71489)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/jaxp/test/JAXPDeployerUnitTestCase.java 2008-03-31 16:54:30 UTC (rev 71490)
@@ -31,7 +31,7 @@
import org.jboss.deployers.vfs.plugins.structure.file.FileStructure;
import org.jboss.deployers.vfs.plugins.structure.jar.JARStructure;
import org.jboss.deployers.vfs.spi.client.VFSDeployment;
-import org.jboss.test.deployers.vfs.deployer.jaxp.DeployerClientTestCase;
+import org.jboss.test.deployers.vfs.deployer.DeployerClientTest;
import org.jboss.test.deployers.vfs.deployer.jaxp.support.SomeBean;
import org.jboss.test.deployers.vfs.deployer.jaxp.support.TestXmlDeployer;
import org.w3c.dom.DOMImplementation;
@@ -44,7 +44,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision: 60707 $
*/
-public class JAXPDeployerUnitTestCase extends DeployerClientTestCase
+public class JAXPDeployerUnitTestCase extends DeployerClientTest
{
public static Test suite()
{
Deleted: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/test/AbstractDeployerUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/test/AbstractDeployerUnitTestCase.java 2008-03-31 16:50:31 UTC (rev 71489)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/test/AbstractDeployerUnitTestCase.java 2008-03-31 16:54:30 UTC (rev 71490)
@@ -1,68 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.deployers.vfs.deployer.merge.test;
-
-import org.jboss.deployers.vfs.plugins.structure.file.FileStructure;
-import org.jboss.deployers.vfs.plugins.structure.jar.JARStructure;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
-import org.jboss.kernel.spi.dependency.KernelController;
-import org.jboss.test.deployers.vfs.deployer.jaxp.DeployerClientTestCase;
-
-/**
- * AbstractDeployerUnitTestCase.
- *
- * @author <a href="ales.justin at jboss.com">Ales Justin</a>
- */
-public abstract class AbstractDeployerUnitTestCase extends DeployerClientTestCase
-{
- protected KernelController controller;
-
- public AbstractDeployerUnitTestCase(String name) throws Throwable
- {
- super(name);
- }
-
- protected void setUp() throws Exception
- {
- super.setUp();
- try
- {
- BasicBootstrap bootstrap = new BasicBootstrap();
- bootstrap.run();
- Kernel kernel = bootstrap.getKernel();
- controller = kernel.getController();
-
- main = createMainDeployer();
- addStructureDeployer(main, new JARStructure());
- addStructureDeployer(main, new FileStructure());
-
- addDeployers(kernel);
- }
- catch (Throwable t)
- {
- throw new RuntimeException(t);
- }
- }
-
- protected abstract void addDeployers(Kernel kernel);
-}
\ No newline at end of file
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/test/BeanMergeUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/test/BeanMergeUnitTestCase.java 2008-03-31 16:50:31 UTC (rev 71489)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/test/BeanMergeUnitTestCase.java 2008-03-31 16:54:30 UTC (rev 71490)
@@ -27,6 +27,7 @@
import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
import org.jboss.deployers.vfs.spi.client.VFSDeployment;
import org.jboss.kernel.Kernel;
+import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
import org.jboss.test.deployers.vfs.deployer.merge.support.TestBeanMergeDeployer;
/**
@@ -34,7 +35,7 @@
*
* @author <a href="ales.justin at jboss.com">Ales Justin</a>
*/
-public class BeanMergeUnitTestCase extends AbstractDeployerUnitTestCase
+public class BeanMergeUnitTestCase extends AbstractDeployerUnitTest
{
public static Test suite()
{
More information about the jboss-cvs-commits
mailing list