From b429428ae61e9d2893649b28536552a20de8f6b7 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sun, 3 Feb 2002 02:35:37 +0000 Subject: [PATCH] Rename ComponentTestBase to AbstractComponentTest and make AbstractComponentTest abstract. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271099 13f79535-47bb-0310-9956-ffa450edef68 --- ...entTestBase.java => AbstractComponentTest.java} | 14 ++++++++------ .../configurer/DefaultConfigurerTest.java | 4 ++-- .../components/deployer/DefaultDeployerTest.java | 4 ++-- ...entTestBase.java => AbstractComponentTest.java} | 14 ++++++++------ .../configurer/DefaultConfigurerTest.java | 4 ++-- .../components/deployer/DefaultDeployerTest.java | 4 ++-- 6 files changed, 24 insertions(+), 20 deletions(-) rename proposal/myrmidon/src/test/org/apache/myrmidon/components/{ComponentTestBase.java => AbstractComponentTest.java} (94%) rename proposal/myrmidon/src/testcases/org/apache/myrmidon/components/{ComponentTestBase.java => AbstractComponentTest.java} (94%) diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/ComponentTestBase.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/AbstractComponentTest.java similarity index 94% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/ComponentTestBase.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/AbstractComponentTest.java index 94bf8f472..baf96177d 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/ComponentTestBase.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/AbstractComponentTest.java @@ -44,16 +44,17 @@ import org.apache.myrmidon.interfaces.type.TypeManager; * * @author Adam Murdoch */ -public class ComponentTestBase extends TestCase +public abstract class AbstractComponentTest + extends TestCase { private DefaultComponentManager m_componentManager; private Logger m_logger; private final static String PATTERN = "[%8.8{category}] %{message}\\n%{throwable}"; - public ComponentTestBase( String s ) + public AbstractComponentTest( final String name ) { - super( s ); + super( name ); } /** @@ -75,7 +76,8 @@ public class ComponentTestBase extends TestCase /** * Setup the test case - prepares the set of components. */ - protected void setUp() throws Exception + protected void setUp() + throws Exception { // Setup a logger final Priority priority = Priority.DEBUG; @@ -149,9 +151,9 @@ public class ComponentTestBase extends TestCase * TODO - should take the expected exception, rather than the message, * to check the entire cause chain. */ - protected void assertSameMessage( final String msg, final Throwable exc ) + protected void assertSameMessage( final String message, final Throwable throwable ) { - assertEquals( msg, exc.getMessage() ); + assertEquals( message, throwable.getMessage() ); } /** diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java index 6089be9ce..9eaf6224e 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java @@ -14,7 +14,7 @@ import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.configuration.DefaultConfiguration; import org.apache.myrmidon.api.TaskContext; -import org.apache.myrmidon.components.ComponentTestBase; +import org.apache.myrmidon.components.AbstractComponentTest; import org.apache.myrmidon.components.workspace.DefaultTaskContext; import org.apache.myrmidon.interfaces.configurer.Configurer; import org.apache.myrmidon.interfaces.type.DefaultTypeFactory; @@ -25,7 +25,7 @@ import org.apache.myrmidon.interfaces.type.DefaultTypeFactory; * @author Adam Murdoch */ public class DefaultConfigurerTest - extends ComponentTestBase + extends AbstractComponentTest { private final static Resources REZ = ResourceManager.getPackageResources( DefaultConfigurerTest.class ); diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java index 9820b4687..0d95f5571 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java @@ -7,7 +7,7 @@ */ package org.apache.myrmidon.components.deployer; -import org.apache.myrmidon.components.ComponentTestBase; +import org.apache.myrmidon.components.AbstractComponentTest; import org.apache.myrmidon.framework.DataType; import org.apache.myrmidon.interfaces.converter.MasterConverter; import org.apache.myrmidon.interfaces.deployer.ConverterDefinition; @@ -23,7 +23,7 @@ import org.apache.myrmidon.interfaces.type.TypeFactory; * @author Adam Murdoch */ public class DefaultDeployerTest - extends ComponentTestBase + extends AbstractComponentTest { private Deployer m_deployer; diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/ComponentTestBase.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/AbstractComponentTest.java similarity index 94% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/ComponentTestBase.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/AbstractComponentTest.java index 94bf8f472..baf96177d 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/ComponentTestBase.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/AbstractComponentTest.java @@ -44,16 +44,17 @@ import org.apache.myrmidon.interfaces.type.TypeManager; * * @author Adam Murdoch */ -public class ComponentTestBase extends TestCase +public abstract class AbstractComponentTest + extends TestCase { private DefaultComponentManager m_componentManager; private Logger m_logger; private final static String PATTERN = "[%8.8{category}] %{message}\\n%{throwable}"; - public ComponentTestBase( String s ) + public AbstractComponentTest( final String name ) { - super( s ); + super( name ); } /** @@ -75,7 +76,8 @@ public class ComponentTestBase extends TestCase /** * Setup the test case - prepares the set of components. */ - protected void setUp() throws Exception + protected void setUp() + throws Exception { // Setup a logger final Priority priority = Priority.DEBUG; @@ -149,9 +151,9 @@ public class ComponentTestBase extends TestCase * TODO - should take the expected exception, rather than the message, * to check the entire cause chain. */ - protected void assertSameMessage( final String msg, final Throwable exc ) + protected void assertSameMessage( final String message, final Throwable throwable ) { - assertEquals( msg, exc.getMessage() ); + assertEquals( message, throwable.getMessage() ); } /** diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java index 6089be9ce..9eaf6224e 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java @@ -14,7 +14,7 @@ import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.configuration.DefaultConfiguration; import org.apache.myrmidon.api.TaskContext; -import org.apache.myrmidon.components.ComponentTestBase; +import org.apache.myrmidon.components.AbstractComponentTest; import org.apache.myrmidon.components.workspace.DefaultTaskContext; import org.apache.myrmidon.interfaces.configurer.Configurer; import org.apache.myrmidon.interfaces.type.DefaultTypeFactory; @@ -25,7 +25,7 @@ import org.apache.myrmidon.interfaces.type.DefaultTypeFactory; * @author Adam Murdoch */ public class DefaultConfigurerTest - extends ComponentTestBase + extends AbstractComponentTest { private final static Resources REZ = ResourceManager.getPackageResources( DefaultConfigurerTest.class ); diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java index 9820b4687..0d95f5571 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java @@ -7,7 +7,7 @@ */ package org.apache.myrmidon.components.deployer; -import org.apache.myrmidon.components.ComponentTestBase; +import org.apache.myrmidon.components.AbstractComponentTest; import org.apache.myrmidon.framework.DataType; import org.apache.myrmidon.interfaces.converter.MasterConverter; import org.apache.myrmidon.interfaces.deployer.ConverterDefinition; @@ -23,7 +23,7 @@ import org.apache.myrmidon.interfaces.type.TypeFactory; * @author Adam Murdoch */ public class DefaultDeployerTest - extends ComponentTestBase + extends AbstractComponentTest { private Deployer m_deployer;