[jbossnative-commits] JBoss Native SVN: r1986 - in trunk/mod_cluster/src/test/java/org/jboss/modcluster: load and 1 other directory.

Author: pferraro Date: 2008-10-22 12:49:00 -0400 (Wed, 22 Oct 2008) New Revision: 1986 Modified: trunk/mod_cluster/src/test/java/org/jboss/modcluster/BasicClusterListenerTestCase.java trunk/mod_cluster/src/test/java/org/jboss/modcluster/DefaultJBossWebEventHandlerTestCase.java trunk/mod_cluster/src/test/java/org/jboss/modcluster/load/DynamicLoadBalanceFactorProviderTestCase.java Log: Remove references to junit3 Modified: trunk/mod_cluster/src/test/java/org/jboss/modcluster/BasicClusterListenerTestCase.java =================================================================== --- trunk/mod_cluster/src/test/java/org/jboss/modcluster/BasicClusterListenerTestCase.java 2008-10-22 16:43:53 UTC (rev 1985) +++ trunk/mod_cluster/src/test/java/org/jboss/modcluster/BasicClusterListenerTestCase.java 2008-10-22 16:49:00 UTC (rev 1986) @@ -31,20 +31,20 @@ import org.apache.catalina.Server; import org.apache.catalina.Service; import org.easymock.EasyMock; +import org.junit.Test; -import junit.framework.TestCase; - /** * @author Paul Ferraro * */ -public class BasicClusterListenerTestCase extends TestCase +public class BasicClusterListenerTestCase { private JBossWebEventHandler eventHandler = EasyMock.createStrictMock(JBossWebEventHandler.class); private BasicClusterListener listener = new BasicClusterListener(this.eventHandler); - public void testDeployWebApp() + @Test + public void deployWebApp() { Host host = EasyMock.createStrictMock(Host.class); LifecycleContext context = EasyMock.createStrictMock(LifecycleContext.class); @@ -62,7 +62,8 @@ EasyMock.reset(this.eventHandler, host, context); } - public void testDeployHost() + @Test + public void deployHost() { Engine engine = EasyMock.createStrictMock(Engine.class); @@ -78,7 +79,8 @@ EasyMock.reset(engine); } - public void testUndeployWebApp() + @Test + public void undeployWebApp() { Host host = EasyMock.createStrictMock(Host.class); LifecycleContext context = EasyMock.createStrictMock(LifecycleContext.class); @@ -96,7 +98,8 @@ EasyMock.reset(this.eventHandler, host, context); } - public void testUndeployHost() + @Test + public void undeployHost() { Engine engine = EasyMock.createStrictMock(Engine.class); @@ -112,7 +115,8 @@ EasyMock.reset(engine); } - public void testStartWebApp() + @Test + public void startWebApp() { LifecycleContext context = EasyMock.createStrictMock(LifecycleContext.class); @@ -128,7 +132,8 @@ EasyMock.reset(this.eventHandler); } - public void testStartServer() + @Test + public void startServer() { LifecycleServer server = EasyMock.createStrictMock(LifecycleServer.class); Service service = EasyMock.createStrictMock(Service.class); @@ -164,7 +169,8 @@ EasyMock.reset(this.eventHandler, server, service, engine, container, childContainer); } - public void testStopWebApp() + @Test + public void stopWebApp() { LifecycleContext context = EasyMock.createStrictMock(LifecycleContext.class); @@ -180,7 +186,8 @@ EasyMock.reset(this.eventHandler); } - public void testStopServer() + @Test + public void stopServer() { LifecycleServer server = EasyMock.createStrictMock(LifecycleServer.class); Service service = EasyMock.createStrictMock(Service.class); @@ -215,7 +222,8 @@ EasyMock.reset(this.eventHandler, server, service, engine, container, childContainer); } - public void testPeriodicEvent() + @Test + public void periodicEvent() { LifecycleEngine engine = EasyMock.createStrictMock(LifecycleEngine.class); @@ -230,7 +238,7 @@ EasyMock.reset(this.eventHandler); // Init - this.testStartServer(); + this.startServer(); // Test initialized this.eventHandler.status(engine); Modified: trunk/mod_cluster/src/test/java/org/jboss/modcluster/DefaultJBossWebEventHandlerTestCase.java =================================================================== --- trunk/mod_cluster/src/test/java/org/jboss/modcluster/DefaultJBossWebEventHandlerTestCase.java 2008-10-22 16:43:53 UTC (rev 1985) +++ trunk/mod_cluster/src/test/java/org/jboss/modcluster/DefaultJBossWebEventHandlerTestCase.java 2008-10-22 16:49:00 UTC (rev 1986) @@ -68,10 +68,6 @@ private JBossWebEventHandler handler; - /** - * @{inheritDoc} - * @see junit.framework.TestCase#setUp() - */ @Before public void construct() throws Exception { Modified: trunk/mod_cluster/src/test/java/org/jboss/modcluster/load/DynamicLoadBalanceFactorProviderTestCase.java =================================================================== --- trunk/mod_cluster/src/test/java/org/jboss/modcluster/load/DynamicLoadBalanceFactorProviderTestCase.java 2008-10-22 16:43:53 UTC (rev 1985) +++ trunk/mod_cluster/src/test/java/org/jboss/modcluster/load/DynamicLoadBalanceFactorProviderTestCase.java 2008-10-22 16:49:00 UTC (rev 1986) @@ -45,10 +45,6 @@ private final DynamicLoadBalanceFactorProvider provider = new DynamicLoadBalanceFactorProvider(Arrays.asList(this.source1, this.source2)); - /** - * @{inheritDoc} - * @see junit.framework.TestCase#setUp() - */ @Before public void init() throws Exception {