This is an automated email from the ASF dual-hosted git repository.
garydgregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-logging.git
The following commit(s) were added to refs/heads/master by this push:
new b0817e0 JUnit 4+: Rename all *TestCase classes to *Test (#434)
b0817e0 is described below
commit b0817e0a5be62f8d477ee5fcffba76d4c06084a0
Author: Gary Gregory <[email protected]>
AuthorDate: Tue Nov 3 15:01:34 2026 -0500
JUnit 4+: Rename all *TestCase classes to *Test (#434)
Follows the JUnit 4 and up style
---
pom.xml | 14 +++++++-------
.../{AltHashtableTestCase.java => AltHashtableTest.java} | 6 +++---
...PropertyTestCase.java => BadHashtablePropertyTest.java} | 4 ++--
...sicOperationsTestCase.java => BasicOperationsTest.java} | 14 +++++++-------
.../commons/logging/{LoadTestCase.java => LoadTest.java} | 2 +-
...renceTestCase.java => LogFactoryWeakReferenceTest.java} | 2 +-
.../commons/logging/{LogTestCase.java => LogTest.java} | 2 +-
...llClassLoaderTestCase.java => NullClassLoaderTest.java} | 2 +-
.../java/org/apache/commons/logging/PathableTestSuite.java | 4 ++--
.../logging/{SimpleLogTestCase.java => SimpleLogTest.java} | 2 +-
src/test/java/org/apache/commons/logging/UserClass.java | 3 ++-
.../{AvalonLoggerTestCase.java => AvalonLoggerTest.java} | 4 ++--
...ityConfigTestCase.java => FirstPriorityConfigTest.java} | 4 ++--
...PriorityConfigTestCase.java => PriorityConfigTest.java} | 4 ++--
.../{WeakHashtableTestCase.java => WeakHashtableTest.java} | 4 ++--
...stomConfigAPITestCase.java => CustomConfigAPITest.java} | 6 +++---
...omConfigFullTestCase.java => CustomConfigFullTest.java} | 6 +++---
.../{CustomConfigTestCase.java => CustomConfigTest.java} | 8 ++++----
.../{DefaultConfigTestCase.java => DefaultConfigTest.java} | 6 +++---
...StandardTestCase.java => ApiClasspathStandardTest.java} | 2 +-
...StandardTestCase.java => AppClasspathStandardTest.java} | 2 +-
...andardTestCase.java => ChildClasspathStandardTest.java} | 2 +-
...ndardTestCase.java => ParentClasspathStandardTest.java} | 2 +-
...InformationTestCase.java => CallerInformationTest.java} | 4 ++--
.../logkit/{StandardTestCase.java => StandardTest.java} | 4 ++--
.../noop/{NoOpLogTestCase.java => NoOpLogTest.java} | 2 +-
.../{ChildFirstTestCase.java => ChildFirstTest.java} | 4 ++--
.../pathable/{GeneralTestCase.java => GeneralTest.java} | 4 ++--
.../{ParentFirstTestCase.java => ParentFirstTest.java} | 4 ++--
...curityAllowedTestCase.java => SecurityAllowedTest.java} | 4 ++--
...tyForbiddenTestCase.java => SecurityForbiddenTest.java} | 4 ++--
.../{ServiceLoaderTestCase.java => ServiceLoaderTest.java} | 2 +-
...taServletTestCase.java => BasicJakartaServletTest.java} | 4 ++--
.../{BasicServletTestCase.java => BasicServletTest.java} | 4 ++--
.../{CustomConfigTestCase.java => CustomConfigTest.java} | 6 +++---
...omConfigTestCase.java => DateTimeCustomConfigTest.java} | 6 +++---
.../{DefaultConfigTestCase.java => DefaultConfigTest.java} | 6 +++---
...InformationTestCase.java => CallerInformationTest.java} | 2 +-
.../tccl/{BadTCCLTestCase.java => BadTCCLTest.java} | 6 +++---
.../tccl/{NullTCCLTestCase.java => NullTCCLTest.java} | 6 +++---
.../{TcclDisabledTestCase.java => TcclDisabledTest.java} | 4 ++--
.../log/{TcclEnabledTestCase.java => TcclEnabledTest.java} | 4 ++--
.../{AdaptersTcclTestCase.java => AdaptersTcclTest.java} | 4 ++--
.../{SiblingTcclTestCase.java => SiblingTcclTest.java} | 4 ++--
.../{TcclDisabledTestCase.java => TcclDisabledTest.java} | 4 ++--
.../{TcclEnabledTestCase.java => TcclEnabledTest.java} | 4 ++--
.../apache/commons/logging/jdk14/CustomConfig.properties | 2 +-
src/test/resources/serviceloader/README.txt | 2 +-
48 files changed, 103 insertions(+), 102 deletions(-)
diff --git a/pom.xml b/pom.xml
index e8ce989..ca31359 100644
--- a/pom.xml
+++ b/pom.xml
@@ -267,7 +267,7 @@ under the License.
<exclude>org/apache/commons/logging/serviceloader/**</exclude>
</excludes>
<includes>
- <include>**/*TestCase.java</include>
+ <include>**/*Test.java</include>
</includes>
<systemPropertyVariables>
<!--
@@ -287,7 +287,7 @@ under the License.
</configuration>
</execution>
<!--
- The ServiceLoaderTestCase uses a custom implementation of
LogFactory,
+ The ServiceLoaderTest uses a custom implementation of LogFactory,
therefore it requires a separate execution.
-->
<execution>
@@ -300,7 +300,7 @@ under the License.
<additionalClasspathElement>${project.build.testOutputDirectory}/serviceloader</additionalClasspathElement>
</additionalClasspathElements>
<includes>
-
<include>org/apache/commons/logging/serviceloader/*TestCase.java</include>
+
<include>org/apache/commons/logging/serviceloader/*Test.java</include>
</includes>
</configuration>
</execution>
@@ -319,7 +319,7 @@ under the License.
</dependency>
</additionalClasspathDependencies>
<includes>
-
<include>org/apache/commons/logging/log4j2/*TestCase.java</include>
+ <include>org/apache/commons/logging/log4j2/*Test.java</include>
</includes>
<systemPropertyVariables>
<!-- Due to a bug in `log4j-core-test`,
@@ -356,7 +356,7 @@ under the License.
</dependency>
</additionalClasspathDependencies>
<includes>
-
<include>org/apache/commons/logging/log4j/log4j12/*TestCase.java</include>
+
<include>org/apache/commons/logging/log4j/log4j12/*Test.java</include>
</includes>
<systemPropertyVariables>
<!-- Due to a bug in `log4j-core-test`,
@@ -395,7 +395,7 @@ under the License.
<exclude>org.apache.logging.log4j:*</exclude>
</classpathDependencyExcludes>
<includes>
-
<include>org/apache/commons/logging/slf4j/*TestCase.java</include>
+ <include>org/apache/commons/logging/slf4j/*Test.java</include>
</includes>
</configuration>
</execution>
@@ -425,7 +425,7 @@ under the License.
<exclude>org.apache.logging.log4j:log4j-core-test</exclude>
</classpathDependencyExcludes>
<includes>
-
<include>org/apache/commons/logging/slf4j/*TestCase.java</include>
+ <include>org/apache/commons/logging/slf4j/*Test.java</include>
</includes>
</configuration>
</execution>
diff --git a/src/test/java/org/apache/commons/logging/AltHashtableTestCase.java
b/src/test/java/org/apache/commons/logging/AltHashtableTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/logging/AltHashtableTestCase.java
rename to src/test/java/org/apache/commons/logging/AltHashtableTest.java
index 47c2650..9d36356 100644
--- a/src/test/java/org/apache/commons/logging/AltHashtableTestCase.java
+++ b/src/test/java/org/apache/commons/logging/AltHashtableTest.java
@@ -25,10 +25,10 @@ import junit.framework.TestCase;
* arbitrary Hashtable implementation to store its mapping from
* context class loader -> LogFactory object.
*/
-public class AltHashtableTestCase extends TestCase {
+public class AltHashtableTest extends TestCase {
public static Test suite() throws Exception {
- final Class<AltHashtableTestCase> thisClass =
AltHashtableTestCase.class;
+ final Class<AltHashtableTest> thisClass = AltHashtableTest.class;
final ClassLoader thisClassLoader = thisClass.getClassLoader();
final PathableClassLoader loader = new PathableClassLoader(null);
@@ -71,7 +71,7 @@ public class AltHashtableTestCase extends TestCase {
AltHashtable.lastKey = null;
AltHashtable.lastValue = null;
- LogFactory.getLog(AltHashtableTestCase.class);
+ LogFactory.getLog(AltHashtableTest.class);
final ClassLoader contextLoader =
Thread.currentThread().getContextClassLoader();
assertEquals(contextLoader, AltHashtable.lastKey);
assertNotNull(AltHashtable.lastValue);
diff --git
a/src/test/java/org/apache/commons/logging/BadHashtablePropertyTestCase.java
b/src/test/java/org/apache/commons/logging/BadHashtablePropertyTest.java
similarity index 90%
rename from
src/test/java/org/apache/commons/logging/BadHashtablePropertyTestCase.java
rename to src/test/java/org/apache/commons/logging/BadHashtablePropertyTest.java
index 9387629..b1d02ff 100644
--- a/src/test/java/org/apache/commons/logging/BadHashtablePropertyTestCase.java
+++ b/src/test/java/org/apache/commons/logging/BadHashtablePropertyTest.java
@@ -24,10 +24,10 @@ import junit.framework.TestCase;
/**
* Tests behavior when the property is misconfigured.
*/
-public class BadHashtablePropertyTestCase extends TestCase {
+public class BadHashtablePropertyTest extends TestCase {
public void testPutCalled() throws Exception {
- LogFactory.getLog(BadHashtablePropertyTestCase.class);
+ LogFactory.getLog(BadHashtablePropertyTest.class);
}
public void testType() {
diff --git
a/src/test/java/org/apache/commons/logging/BasicOperationsTestCase.java
b/src/test/java/org/apache/commons/logging/BasicOperationsTest.java
similarity index 85%
rename from
src/test/java/org/apache/commons/logging/BasicOperationsTestCase.java
rename to src/test/java/org/apache/commons/logging/BasicOperationsTest.java
index c034c19..88a9e96 100644
--- a/src/test/java/org/apache/commons/logging/BasicOperationsTestCase.java
+++ b/src/test/java/org/apache/commons/logging/BasicOperationsTest.java
@@ -25,7 +25,7 @@ import junit.framework.TestCase;
* This is the minimum requirement for any well behaved logger
* and so this test should be run for each kind.
*/
-public class BasicOperationsTestCase extends TestCase {
+public class BasicOperationsTest extends TestCase {
public void executeIsEnabledTest(final Log log) {
try {
@@ -70,32 +70,32 @@ public class BasicOperationsTestCase extends TestCase {
}
public void testIsEnabledClassLog() {
- final Log log = LogFactory.getLog(BasicOperationsTestCase.class);
+ final Log log = LogFactory.getLog(BasicOperationsTest.class);
executeIsEnabledTest(log);
}
public void testIsEnabledNamedLog() {
- final Log log =
LogFactory.getLog(BasicOperationsTestCase.class.getName());
+ final Log log = LogFactory.getLog(BasicOperationsTest.class.getName());
executeIsEnabledTest(log);
}
public void testMessageWithExceptionClassLog() {
- final Log log = LogFactory.getLog(BasicOperationsTestCase.class);
+ final Log log = LogFactory.getLog(BasicOperationsTest.class);
executeMessageWithExceptionTest(log);
}
public void testMessageWithExceptionNamedLog() {
- final Log log =
LogFactory.getLog(BasicOperationsTestCase.class.getName());
+ final Log log = LogFactory.getLog(BasicOperationsTest.class.getName());
executeMessageWithExceptionTest(log);
}
public void testMessageWithoutExceptionClassLog() {
- final Log log = LogFactory.getLog(BasicOperationsTestCase.class);
+ final Log log = LogFactory.getLog(BasicOperationsTest.class);
executeMessageWithoutExceptionTest(log);
}
public void testMessageWithoutExceptionNamedLog() {
- final Log log =
LogFactory.getLog(BasicOperationsTestCase.class.getName());
+ final Log log = LogFactory.getLog(BasicOperationsTest.class.getName());
executeMessageWithoutExceptionTest(log);
}
}
diff --git a/src/test/java/org/apache/commons/logging/LoadTestCase.java
b/src/test/java/org/apache/commons/logging/LoadTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/logging/LoadTestCase.java
rename to src/test/java/org/apache/commons/logging/LoadTest.java
index 8bab225..65aac12 100644
--- a/src/test/java/org/apache/commons/logging/LoadTestCase.java
+++ b/src/test/java/org/apache/commons/logging/LoadTest.java
@@ -29,7 +29,7 @@ import org.apache.commons.io.IOUtils;
/**
* test to emulate container and application isolated from container
*/
-public class LoadTestCase extends TestCase {
+public class LoadTest extends TestCase {
/**
* A custom class loader which "duplicates" logging classes available
diff --git
a/src/test/java/org/apache/commons/logging/LogFactoryWeakReferenceTestCase.java
b/src/test/java/org/apache/commons/logging/LogFactoryWeakReferenceTest.java
similarity index 97%
rename from
src/test/java/org/apache/commons/logging/LogFactoryWeakReferenceTestCase.java
rename to
src/test/java/org/apache/commons/logging/LogFactoryWeakReferenceTest.java
index bde1638..190e1e6 100644
---
a/src/test/java/org/apache/commons/logging/LogFactoryWeakReferenceTestCase.java
+++ b/src/test/java/org/apache/commons/logging/LogFactoryWeakReferenceTest.java
@@ -22,7 +22,7 @@ import java.lang.reflect.Field;
import junit.framework.TestCase;
-public class LogFactoryWeakReferenceTestCase extends TestCase {
+public class LogFactoryWeakReferenceTest extends TestCase {
private static final long MAX_WAIT_FOR_REF_NULLED_BY_GC = 15_000;
public void testNotLeakingThisClassLoader() throws Exception {
diff --git a/src/test/java/org/apache/commons/logging/LogTestCase.java
b/src/test/java/org/apache/commons/logging/LogTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/logging/LogTestCase.java
rename to src/test/java/org/apache/commons/logging/LogTest.java
index f878cd0..1a3c2b7 100644
--- a/src/test/java/org/apache/commons/logging/LogTestCase.java
+++ b/src/test/java/org/apache/commons/logging/LogTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.commons.logging;
-public class LogTestCase extends AbstractLogTest {
+public class LogTest extends AbstractLogTest {
@Override
public Log getLogObject() {
diff --git
a/src/test/java/org/apache/commons/logging/NullClassLoaderTestCase.java
b/src/test/java/org/apache/commons/logging/NullClassLoaderTest.java
similarity index 96%
rename from
src/test/java/org/apache/commons/logging/NullClassLoaderTestCase.java
rename to src/test/java/org/apache/commons/logging/NullClassLoaderTest.java
index 19675b4..a804807 100644
--- a/src/test/java/org/apache/commons/logging/NullClassLoaderTestCase.java
+++ b/src/test/java/org/apache/commons/logging/NullClassLoaderTest.java
@@ -24,7 +24,7 @@ import junit.framework.TestCase;
* JCL is deployed via the bootclass loader - something that could be done when
* using Java in embedded systems.
*/
-public class NullClassLoaderTestCase extends TestCase {
+public class NullClassLoaderTest extends TestCase {
//---------------------- unit tests ---------------------------------
diff --git a/src/test/java/org/apache/commons/logging/PathableTestSuite.java
b/src/test/java/org/apache/commons/logging/PathableTestSuite.java
index 4415a0f..9ba2500 100644
--- a/src/test/java/org/apache/commons/logging/PathableTestSuite.java
+++ b/src/test/java/org/apache/commons/logging/PathableTestSuite.java
@@ -29,7 +29,7 @@ import junit.framework.TestSuite;
* For tests that need to control exactly what the class loader hierarchy is
* like when the test is run, something like the following is recommended:
* <pre>
- * class SomeTestCase extends TestCase {
+ * class SomeTest extends TestCase {
* public static Test suite() throws Exception {
* PathableClassLoader parent = new PathableClassLoader(null);
* parent.useSystemLoader("junit.");
@@ -39,7 +39,7 @@ import junit.framework.TestSuite;
* child.addLogicalLib("log4j12");
* child.addLogicalLib("commons-logging");
*
- * Class testClass = child.loadClass(SomeTestCase.class.getName());
+ * Class testClass = child.loadClass(SomeTest.class.getName());
* ClassLoader contextClassLoader = child;
*
* PathableTestSuite suite = new PathableTestSuite(testClass, child);
diff --git a/src/test/java/org/apache/commons/logging/SimpleLogTestCase.java
b/src/test/java/org/apache/commons/logging/SimpleLogTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/logging/SimpleLogTestCase.java
rename to src/test/java/org/apache/commons/logging/SimpleLogTest.java
index 51ce758..fae5bd5 100644
--- a/src/test/java/org/apache/commons/logging/SimpleLogTestCase.java
+++ b/src/test/java/org/apache/commons/logging/SimpleLogTest.java
@@ -18,7 +18,7 @@ package org.apache.commons.logging;
import org.apache.commons.logging.impl.SimpleLog;
-public class SimpleLogTestCase extends AbstractLogTest {
+public class SimpleLogTest extends AbstractLogTest {
@Override
public Log getLogObject() {
return new SimpleLog(this.getClass().getName());
diff --git a/src/test/java/org/apache/commons/logging/UserClass.java
b/src/test/java/org/apache/commons/logging/UserClass.java
index cb89331..c6fb0e0 100644
--- a/src/test/java/org/apache/commons/logging/UserClass.java
+++ b/src/test/java/org/apache/commons/logging/UserClass.java
@@ -27,6 +27,7 @@ public class UserClass {
* Don't forget to set the context class loader to whatever it will be
* when an instance of this class is actually created <em>before</em>
calling
* this method!
+ * </p>
*/
public static void setAllowFlawedContext(final String state) {
final LogFactory f = LogFactory.getFactory();
@@ -34,7 +35,7 @@ public class UserClass {
}
public UserClass() {
- final Log log = LogFactory.getLog(LoadTestCase.class);
+ final Log log = LogFactory.getLog(LoadTest.class);
}
}
diff --git
a/src/test/java/org/apache/commons/logging/avalon/AvalonLoggerTestCase.java
b/src/test/java/org/apache/commons/logging/avalon/AvalonLoggerTest.java
similarity index 92%
rename from
src/test/java/org/apache/commons/logging/avalon/AvalonLoggerTestCase.java
rename to src/test/java/org/apache/commons/logging/avalon/AvalonLoggerTest.java
index de97cf5..c575c03 100644
--- a/src/test/java/org/apache/commons/logging/avalon/AvalonLoggerTestCase.java
+++ b/src/test/java/org/apache/commons/logging/avalon/AvalonLoggerTest.java
@@ -26,11 +26,11 @@ import org.apache.commons.logging.impl.AvalonLogger;
/**
*/
-public class AvalonLoggerTestCase extends AbstractLogTest {
+public class AvalonLoggerTest extends AbstractLogTest {
public static Test suite() {
final TestSuite suite = new TestSuite();
- suite.addTestSuite(AvalonLoggerTestCase.class);
+ suite.addTestSuite(AvalonLoggerTest.class);
return suite;
}
diff --git
a/src/test/java/org/apache/commons/logging/config/FirstPriorityConfigTestCase.java
b/src/test/java/org/apache/commons/logging/config/FirstPriorityConfigTest.java
similarity index 96%
rename from
src/test/java/org/apache/commons/logging/config/FirstPriorityConfigTestCase.java
rename to
src/test/java/org/apache/commons/logging/config/FirstPriorityConfigTest.java
index cc62eff..4f39ce2 100644
---
a/src/test/java/org/apache/commons/logging/config/FirstPriorityConfigTestCase.java
+++
b/src/test/java/org/apache/commons/logging/config/FirstPriorityConfigTest.java
@@ -37,13 +37,13 @@ import org.apache.commons.logging.PathableTestSuite;
* </ul>
* The result should be that the first file is used.
*/
-public class FirstPriorityConfigTestCase extends TestCase {
+public class FirstPriorityConfigTest extends TestCase {
/**
* Return the tests included in this test suite.
*/
public static Test suite() throws Exception {
- final Class<FirstPriorityConfigTestCase> thisClass =
FirstPriorityConfigTestCase.class;
+ final Class<FirstPriorityConfigTest> thisClass =
FirstPriorityConfigTest.class;
// Determine the URL to this .class file, so that we can then
// append the priority dirs to it. For tidiness, load this
diff --git
a/src/test/java/org/apache/commons/logging/config/PriorityConfigTestCase.java
b/src/test/java/org/apache/commons/logging/config/PriorityConfigTest.java
similarity index 97%
rename from
src/test/java/org/apache/commons/logging/config/PriorityConfigTestCase.java
rename to
src/test/java/org/apache/commons/logging/config/PriorityConfigTest.java
index 814ecef..5e67e9e 100644
---
a/src/test/java/org/apache/commons/logging/config/PriorityConfigTestCase.java
+++ b/src/test/java/org/apache/commons/logging/config/PriorityConfigTest.java
@@ -44,13 +44,13 @@ import org.apache.commons.logging.PathableTestSuite;
* parentFirst=true; see the PathableClassLoader Javadoc for details.
*/
-public class PriorityConfigTestCase extends TestCase {
+public class PriorityConfigTest extends TestCase {
/**
* Return the tests included in this test suite.
*/
public static Test suite() throws Exception {
- final Class<PriorityConfigTestCase> thisClass =
PriorityConfigTestCase.class;
+ final Class<PriorityConfigTest> thisClass = PriorityConfigTest.class;
// Determine the URL to this .class file, so that we can then
// append the priority dirs to it. For tidiness, load this
diff --git
a/src/test/java/org/apache/commons/logging/impl/WeakHashtableTestCase.java
b/src/test/java/org/apache/commons/logging/impl/WeakHashtableTest.java
similarity index 99%
rename from
src/test/java/org/apache/commons/logging/impl/WeakHashtableTestCase.java
rename to src/test/java/org/apache/commons/logging/impl/WeakHashtableTest.java
index 7647864..9957801 100644
--- a/src/test/java/org/apache/commons/logging/impl/WeakHashtableTestCase.java
+++ b/src/test/java/org/apache/commons/logging/impl/WeakHashtableTest.java
@@ -28,7 +28,7 @@ import java.util.Set;
import junit.framework.TestCase;
-public class WeakHashtableTestCase extends TestCase {
+public class WeakHashtableTest extends TestCase {
public static class TestThread extends Thread {
@@ -65,7 +65,7 @@ public class WeakHashtableTestCase extends TestCase {
private Long valueThree;
- public WeakHashtableTestCase(final String testName) {
+ public WeakHashtableTest(final String testName) {
super(testName);
}
diff --git
a/src/test/java/org/apache/commons/logging/jdk14/CustomConfigAPITestCase.java
b/src/test/java/org/apache/commons/logging/jdk14/CustomConfigAPITest.java
similarity index 93%
rename from
src/test/java/org/apache/commons/logging/jdk14/CustomConfigAPITestCase.java
rename to
src/test/java/org/apache/commons/logging/jdk14/CustomConfigAPITest.java
index 4d131bb..9a18aa8 100644
---
a/src/test/java/org/apache/commons/logging/jdk14/CustomConfigAPITestCase.java
+++ b/src/test/java/org/apache/commons/logging/jdk14/CustomConfigAPITest.java
@@ -27,7 +27,7 @@ import org.apache.commons.logging.PathableTestSuite;
* the parent classpath and commons-logging.jar is in the child.
*/
-public class CustomConfigAPITestCase extends CustomConfigTestCase {
+public class CustomConfigAPITest extends CustomConfigTest {
/**
* Return the tests included in this test suite.
@@ -50,11 +50,11 @@ public class CustomConfigAPITestCase extends
CustomConfigTestCase {
child.addLogicalLib("testclasses");
child.addLogicalLib("commons-logging");
- final Class<?> testClass =
child.loadClass(CustomConfigAPITestCase.class.getName());
+ final Class<?> testClass =
child.loadClass(CustomConfigAPITest.class.getName());
return new PathableTestSuite(testClass, child);
}
- public CustomConfigAPITestCase(final String name) {
+ public CustomConfigAPITest(final String name) {
super(name);
}
}
diff --git
a/src/test/java/org/apache/commons/logging/jdk14/CustomConfigFullTestCase.java
b/src/test/java/org/apache/commons/logging/jdk14/CustomConfigFullTest.java
similarity index 93%
rename from
src/test/java/org/apache/commons/logging/jdk14/CustomConfigFullTestCase.java
rename to
src/test/java/org/apache/commons/logging/jdk14/CustomConfigFullTest.java
index c26d908..73a2490 100644
---
a/src/test/java/org/apache/commons/logging/jdk14/CustomConfigFullTestCase.java
+++ b/src/test/java/org/apache/commons/logging/jdk14/CustomConfigFullTest.java
@@ -27,7 +27,7 @@ import org.apache.commons.logging.PathableTestSuite;
* the parent classpath.
*/
-public class CustomConfigFullTestCase extends CustomConfigTestCase {
+public class CustomConfigFullTest extends CustomConfigTest {
/**
* Return the tests included in this test suite.
@@ -49,11 +49,11 @@ public class CustomConfigFullTestCase extends
CustomConfigTestCase {
final PathableClassLoader child = new PathableClassLoader(parent);
child.addLogicalLib("testclasses");
- final Class<?> testClass =
child.loadClass(CustomConfigFullTestCase.class.getName());
+ final Class<?> testClass =
child.loadClass(CustomConfigFullTest.class.getName());
return new PathableTestSuite(testClass, child);
}
- public CustomConfigFullTestCase(final String name) {
+ public CustomConfigFullTest(final String name) {
super(name);
}
}
diff --git
a/src/test/java/org/apache/commons/logging/jdk14/CustomConfigTestCase.java
b/src/test/java/org/apache/commons/logging/jdk14/CustomConfigTest.java
similarity index 98%
rename from
src/test/java/org/apache/commons/logging/jdk14/CustomConfigTestCase.java
rename to src/test/java/org/apache/commons/logging/jdk14/CustomConfigTest.java
index 6114cde..fa5ae6c 100644
--- a/src/test/java/org/apache/commons/logging/jdk14/CustomConfigTestCase.java
+++ b/src/test/java/org/apache/commons/logging/jdk14/CustomConfigTest.java
@@ -39,7 +39,7 @@ import org.apache.commons.logging.PathableTestSuite;
* logger configured per the configuration properties.</p>
*/
-public class CustomConfigTestCase extends DefaultConfigTestCase {
+public class CustomConfigTest extends DefaultConfigTest {
protected static final String HANDLER_NAME =
"org.apache.commons.logging.jdk14.TestHandler";
@@ -59,7 +59,7 @@ public class CustomConfigTestCase extends
DefaultConfigTestCase {
}
try {
- final ClassLoader srcCL =
CustomConfigAPITestCase.class.getClassLoader();
+ final ClassLoader srcCL =
CustomConfigAPITest.class.getClassLoader();
final byte[] classData = readClass(className, srcCL);
final Class<?>[] params = { String.class, classData.getClass(),
Integer.TYPE, Integer.TYPE };
@@ -109,7 +109,7 @@ public class CustomConfigTestCase extends
DefaultConfigTestCase {
cl.addLogicalLib("commons-logging");
cl.addLogicalLib("testclasses");
- final Class<?> testClass =
cl.loadClass(CustomConfigTestCase.class.getName());
+ final Class<?> testClass =
cl.loadClass(CustomConfigTest.class.getName());
return new PathableTestSuite(testClass, cl);
}
@@ -150,7 +150,7 @@ public class CustomConfigTestCase extends
DefaultConfigTestCase {
*
* @param name Name of the test case
*/
- public CustomConfigTestCase(final String name) {
+ public CustomConfigTest(final String name) {
super(name);
}
diff --git
a/src/test/java/org/apache/commons/logging/jdk14/DefaultConfigTestCase.java
b/src/test/java/org/apache/commons/logging/jdk14/DefaultConfigTest.java
similarity index 97%
rename from
src/test/java/org/apache/commons/logging/jdk14/DefaultConfigTestCase.java
rename to src/test/java/org/apache/commons/logging/jdk14/DefaultConfigTest.java
index d10eb5b..526c2aa 100644
--- a/src/test/java/org/apache/commons/logging/jdk14/DefaultConfigTestCase.java
+++ b/src/test/java/org/apache/commons/logging/jdk14/DefaultConfigTest.java
@@ -35,7 +35,7 @@ import org.apache.commons.logging.PathableTestSuite;
* zero configuration, and with Log4J not present (so JDK 1.4 logging
* should be automatically configured.</p>
*/
-public class DefaultConfigTestCase extends TestCase {
+public class DefaultConfigTest extends TestCase {
/**
* Return the tests included in this test suite.
@@ -46,7 +46,7 @@ public class DefaultConfigTestCase extends TestCase {
loader.addLogicalLib("testclasses");
loader.addLogicalLib("commons-logging");
- final Class<?> testClass =
loader.loadClass(DefaultConfigTestCase.class.getName());
+ final Class<?> testClass =
loader.loadClass(DefaultConfigTest.class.getName());
return new PathableTestSuite(testClass, loader);
}
@@ -65,7 +65,7 @@ public class DefaultConfigTestCase extends TestCase {
*
* @param name Name of the test case
*/
- public DefaultConfigTestCase(final String name) {
+ public DefaultConfigTest(final String name) {
super(name);
}
diff --git
a/src/test/java/org/apache/commons/logging/log4j/log4j12/ApiClasspathStandardTestCase.java
b/src/test/java/org/apache/commons/logging/log4j/log4j12/ApiClasspathStandardTest.java
similarity index 97%
rename from
src/test/java/org/apache/commons/logging/log4j/log4j12/ApiClasspathStandardTestCase.java
rename to
src/test/java/org/apache/commons/logging/log4j/log4j12/ApiClasspathStandardTest.java
index f210706..2ec7725 100644
---
a/src/test/java/org/apache/commons/logging/log4j/log4j12/ApiClasspathStandardTestCase.java
+++
b/src/test/java/org/apache/commons/logging/log4j/log4j12/ApiClasspathStandardTest.java
@@ -31,7 +31,7 @@ import org.apache.commons.logging.impl.LogFactoryImpl;
* the parent classpath and commons-logging.jar is in the child.
*/
-public class ApiClasspathStandardTestCase extends TestCase {
+public class ApiClasspathStandardTest extends TestCase {
/**
* Return the tests included in this test suite.
diff --git
a/src/test/java/org/apache/commons/logging/log4j/log4j12/AppClasspathStandardTestCase.java
b/src/test/java/org/apache/commons/logging/log4j/log4j12/AppClasspathStandardTest.java
similarity index 97%
rename from
src/test/java/org/apache/commons/logging/log4j/log4j12/AppClasspathStandardTestCase.java
rename to
src/test/java/org/apache/commons/logging/log4j/log4j12/AppClasspathStandardTest.java
index aa22b1d..a43c6bd 100644
---
a/src/test/java/org/apache/commons/logging/log4j/log4j12/AppClasspathStandardTestCase.java
+++
b/src/test/java/org/apache/commons/logging/log4j/log4j12/AppClasspathStandardTest.java
@@ -30,7 +30,7 @@ import org.apache.commons.logging.impl.LogFactoryImpl;
* is in it, as would be the situation for a standalone application.
*/
-public class AppClasspathStandardTestCase extends TestCase {
+public class AppClasspathStandardTest extends TestCase {
/**
* Return the tests included in this test suite.
diff --git
a/src/test/java/org/apache/commons/logging/log4j/log4j12/ChildClasspathStandardTestCase.java
b/src/test/java/org/apache/commons/logging/log4j/log4j12/ChildClasspathStandardTest.java
similarity index 97%
rename from
src/test/java/org/apache/commons/logging/log4j/log4j12/ChildClasspathStandardTestCase.java
rename to
src/test/java/org/apache/commons/logging/log4j/log4j12/ChildClasspathStandardTest.java
index 902cb7e..25c2fa9 100644
---
a/src/test/java/org/apache/commons/logging/log4j/log4j12/ChildClasspathStandardTestCase.java
+++
b/src/test/java/org/apache/commons/logging/log4j/log4j12/ChildClasspathStandardTest.java
@@ -30,7 +30,7 @@ import org.apache.commons.logging.impl.LogFactoryImpl;
* a container where all the necessary libs are in the child.
*/
-public class ChildClasspathStandardTestCase extends TestCase {
+public class ChildClasspathStandardTest extends TestCase {
/**
* Return the tests included in this test suite.
diff --git
a/src/test/java/org/apache/commons/logging/log4j/log4j12/ParentClasspathStandardTestCase.java
b/src/test/java/org/apache/commons/logging/log4j/log4j12/ParentClasspathStandardTest.java
similarity index 97%
rename from
src/test/java/org/apache/commons/logging/log4j/log4j12/ParentClasspathStandardTestCase.java
rename to
src/test/java/org/apache/commons/logging/log4j/log4j12/ParentClasspathStandardTest.java
index b829fb0..55607be 100644
---
a/src/test/java/org/apache/commons/logging/log4j/log4j12/ParentClasspathStandardTestCase.java
+++
b/src/test/java/org/apache/commons/logging/log4j/log4j12/ParentClasspathStandardTest.java
@@ -30,7 +30,7 @@ import org.apache.commons.logging.impl.LogFactoryImpl;
* a container where all the necessary libs are in the parent.
*/
-public class ParentClasspathStandardTestCase extends TestCase {
+public class ParentClasspathStandardTest extends TestCase {
/**
* Return the tests included in this test suite.
diff --git
a/src/test/java/org/apache/commons/logging/log4j2/CallerInformationTestCase.java
b/src/test/java/org/apache/commons/logging/log4j2/CallerInformationTest.java
similarity index 97%
rename from
src/test/java/org/apache/commons/logging/log4j2/CallerInformationTestCase.java
rename to
src/test/java/org/apache/commons/logging/log4j2/CallerInformationTest.java
index 12d545e..a12a9ac 100644
---
a/src/test/java/org/apache/commons/logging/log4j2/CallerInformationTestCase.java
+++ b/src/test/java/org/apache/commons/logging/log4j2/CallerInformationTest.java
@@ -33,7 +33,7 @@ import
org.apache.logging.log4j.core.test.appender.ListAppender;
import org.apache.logging.log4j.message.ObjectMessage;
import org.apache.logging.log4j.message.SimpleMessage;
-public class CallerInformationTestCase extends TestCase {
+public class CallerInformationTest extends TestCase {
private static final Object OBJ = new Object();
private static final String STRING = "String";
@@ -87,7 +87,7 @@ public class CallerInformationTestCase extends TestCase {
assertEquals("Level matches.", levels[lev], event.getLevel());
final StackTraceElement location = event.getSource();
assertNotNull("Has location", location);
- assertEquals("Correct source file.",
"CallerInformationTestCase.java", location.getFileName());
+ assertEquals("Correct source file.",
"CallerInformationTest.java", location.getFileName());
assertEquals("Correct method name.", "testLocationInfo",
location.getMethodName());
assertEquals("Correct location class.", getClass().getName(),
location.getClassName());
assertEquals("Correct location line.", currentLineNumber + 2 *
lev + hasThrowable + 1, location.getLineNumber());
diff --git
a/src/test/java/org/apache/commons/logging/logkit/StandardTestCase.java
b/src/test/java/org/apache/commons/logging/logkit/StandardTest.java
similarity index 97%
rename from
src/test/java/org/apache/commons/logging/logkit/StandardTestCase.java
rename to src/test/java/org/apache/commons/logging/logkit/StandardTest.java
index d699eb6..a3546d9 100644
--- a/src/test/java/org/apache/commons/logging/logkit/StandardTestCase.java
+++ b/src/test/java/org/apache/commons/logging/logkit/StandardTest.java
@@ -35,13 +35,13 @@ import org.apache.commons.logging.impl.LogKitLogger;
* Basic tests for Avalon LogKit logger adapter.
*/
-public class StandardTestCase extends AbstractLogTest {
+public class StandardTest extends AbstractLogTest {
/**
* Return the tests included in this test suite.
*/
public static Test suite() throws Exception {
- final Class<StandardTestCase> thisClass = StandardTestCase.class;
+ final Class<StandardTest> thisClass = StandardTest.class;
final PathableClassLoader loader = new PathableClassLoader(null);
loader.useExplicitLoader("junit.", Test.class.getClassLoader());
diff --git a/src/test/java/org/apache/commons/logging/noop/NoOpLogTestCase.java
b/src/test/java/org/apache/commons/logging/noop/NoOpLogTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/logging/noop/NoOpLogTestCase.java
rename to src/test/java/org/apache/commons/logging/noop/NoOpLogTest.java
index f369868..09e984b 100644
--- a/src/test/java/org/apache/commons/logging/noop/NoOpLogTestCase.java
+++ b/src/test/java/org/apache/commons/logging/noop/NoOpLogTest.java
@@ -32,7 +32,7 @@ import org.apache.commons.logging.impl.NoOpLog;
* <p>
* This simply applies the tests defined in AbstractLogTest to this class.
*/
-public class NoOpLogTestCase extends AbstractLogTest {
+public class NoOpLogTest extends AbstractLogTest {
private void checkLog(final Log log) {
assertNotNull("Log exists", log);
diff --git
a/src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java
b/src/test/java/org/apache/commons/logging/pathable/ChildFirstTest.java
similarity index 99%
rename from
src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java
rename to src/test/java/org/apache/commons/logging/pathable/ChildFirstTest.java
index a71f2d3..a785090 100644
--- a/src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java
+++ b/src/test/java/org/apache/commons/logging/pathable/ChildFirstTest.java
@@ -41,7 +41,7 @@ import org.apache.commons.logging.PathableTestSuite;
* </ul>
*/
-public class ChildFirstTestCase extends TestCase {
+public class ChildFirstTest extends TestCase {
/**
* Sets up a custom class loader hierarchy for this test case.
@@ -53,7 +53,7 @@ public class ChildFirstTestCase extends TestCase {
* </ul>
*/
public static Test suite() throws Exception {
- final Class<ChildFirstTestCase> thisClass = ChildFirstTestCase.class;
+ final Class<ChildFirstTest> thisClass = ChildFirstTest.class;
final ClassLoader thisClassLoader = thisClass.getClassLoader();
// Make the parent a direct child of the bootloader to hide all
diff --git
a/src/test/java/org/apache/commons/logging/pathable/GeneralTestCase.java
b/src/test/java/org/apache/commons/logging/pathable/GeneralTest.java
similarity index 97%
rename from
src/test/java/org/apache/commons/logging/pathable/GeneralTestCase.java
rename to src/test/java/org/apache/commons/logging/pathable/GeneralTest.java
index 3cfc2d1..904a98c 100644
--- a/src/test/java/org/apache/commons/logging/pathable/GeneralTestCase.java
+++ b/src/test/java/org/apache/commons/logging/pathable/GeneralTest.java
@@ -29,7 +29,7 @@ import org.apache.commons.logging.PathableTestSuite;
* Tests for the PathableTestSuite class.
*/
-public class GeneralTestCase extends TestCase {
+public class GeneralTest extends TestCase {
/**
* Verify that the context class loader is a custom one, then reset it to
@@ -60,7 +60,7 @@ public class GeneralTestCase extends TestCase {
* Sets up a custom class loader hierarchy for this test case.
*/
public static Test suite() throws Exception {
- final Class<GeneralTestCase> thisClass = GeneralTestCase.class;
+ final Class<GeneralTest> thisClass = GeneralTest.class;
final ClassLoader thisClassLoader = thisClass.getClassLoader();
final PathableClassLoader loader = new PathableClassLoader(null);
diff --git
a/src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java
b/src/test/java/org/apache/commons/logging/pathable/ParentFirstTest.java
similarity index 99%
rename from
src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java
rename to src/test/java/org/apache/commons/logging/pathable/ParentFirstTest.java
index e7c82ce..e1bf0ca 100644
--- a/src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java
+++ b/src/test/java/org/apache/commons/logging/pathable/ParentFirstTest.java
@@ -44,7 +44,7 @@ import org.apache.commons.logging.PathableTestSuite;
* </ul>
*/
-public class ParentFirstTestCase extends TestCase {
+public class ParentFirstTest extends TestCase {
/**
* Sets up a custom class loader hierarchy for this test case.
@@ -56,7 +56,7 @@ public class ParentFirstTestCase extends TestCase {
* </ul>
*/
public static Test suite() throws Exception {
- final Class<ParentFirstTestCase> thisClass = ParentFirstTestCase.class;
+ final Class<ParentFirstTest> thisClass = ParentFirstTest.class;
final ClassLoader thisClassLoader = thisClass.getClassLoader();
// Make the parent a direct child of the bootloader to hide all
diff --git
a/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
b/src/test/java/org/apache/commons/logging/security/SecurityAllowedTest.java
similarity index 98%
rename from
src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
rename to
src/test/java/org/apache/commons/logging/security/SecurityAllowedTest.java
index 45f99eb..246bf8a 100644
---
a/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
+++ b/src/test/java/org/apache/commons/logging/security/SecurityAllowedTest.java
@@ -44,7 +44,7 @@ import org.apache.commons.logging.PathableTestSuite;
* a separate test class for each test.
* </p>
*/
-public class SecurityAllowedTestCase extends TestCase {
+public class SecurityAllowedTest extends TestCase {
/**
* Dummy special Hashtable, so we can tell JCL to use this instead of the
standard one.
@@ -67,7 +67,7 @@ public class SecurityAllowedTestCase extends TestCase {
parent.addLogicalLib("testclasses");
parent.addLogicalLib("commons-lang3");
- final Class<?> testClass =
parent.loadClass("org.apache.commons.logging.security.SecurityAllowedTestCase");
+ final Class<?> testClass =
parent.loadClass("org.apache.commons.logging.security.SecurityAllowedTest");
return new PathableTestSuite(testClass, parent);
}
diff --git
a/src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java
b/src/test/java/org/apache/commons/logging/security/SecurityForbiddenTest.java
similarity index 98%
rename from
src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java
rename to
src/test/java/org/apache/commons/logging/security/SecurityForbiddenTest.java
index 93ed119..3d77347 100644
---
a/src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java
+++
b/src/test/java/org/apache/commons/logging/security/SecurityForbiddenTest.java
@@ -54,7 +54,7 @@ import org.apache.commons.logging.PathableTestSuite;
* class loader, and use a separate test class for each test.
* </p>
*/
-public class SecurityForbiddenTestCase extends TestCase {
+public class SecurityForbiddenTest extends TestCase {
/**
* Dummy special Hashtable, so we can tell JCL to use this instead of the
standard one.
@@ -78,7 +78,7 @@ public class SecurityForbiddenTestCase extends TestCase {
parent.addLogicalLib("testclasses");
parent.addLogicalLib("commons-lang3");
- final Class<?> testClass =
parent.loadClass("org.apache.commons.logging.security.SecurityForbiddenTestCase");
+ final Class<?> testClass =
parent.loadClass("org.apache.commons.logging.security.SecurityForbiddenTest");
return new PathableTestSuite(testClass, parent);
}
diff --git
a/src/test/java/org/apache/commons/logging/serviceloader/ServiceLoaderTestCase.java
b/src/test/java/org/apache/commons/logging/serviceloader/ServiceLoaderTest.java
similarity index 95%
rename from
src/test/java/org/apache/commons/logging/serviceloader/ServiceLoaderTestCase.java
rename to
src/test/java/org/apache/commons/logging/serviceloader/ServiceLoaderTest.java
index f06ce29..1294887 100644
---
a/src/test/java/org/apache/commons/logging/serviceloader/ServiceLoaderTestCase.java
+++
b/src/test/java/org/apache/commons/logging/serviceloader/ServiceLoaderTest.java
@@ -21,7 +21,7 @@ import junit.framework.TestCase;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.serviceloader.internal.DummyLogFactory;
-public class ServiceLoaderTestCase extends TestCase {
+public class ServiceLoaderTest extends TestCase {
public void testServiceLoader() {
final LogFactory factory = LogFactory.getFactory();
diff --git
a/src/test/java/org/apache/commons/logging/servlet/BasicJakartaServletTestCase.java
b/src/test/java/org/apache/commons/logging/servlet/BasicJakartaServletTest.java
similarity index 96%
rename from
src/test/java/org/apache/commons/logging/servlet/BasicJakartaServletTestCase.java
rename to
src/test/java/org/apache/commons/logging/servlet/BasicJakartaServletTest.java
index e294569..9b28f61 100644
---
a/src/test/java/org/apache/commons/logging/servlet/BasicJakartaServletTestCase.java
+++
b/src/test/java/org/apache/commons/logging/servlet/BasicJakartaServletTest.java
@@ -27,7 +27,7 @@ import
org.apache.commons.logging.jakarta.ServletContextCleaner;
/**
* Tests for ServletContextCleaner utility class.
*/
-public class BasicJakartaServletTestCase extends TestCase {
+public class BasicJakartaServletTest extends TestCase {
/**
* Return the tests included in this test suite.
@@ -55,7 +55,7 @@ public class BasicJakartaServletTestCase extends TestCase {
tccl.setParentFirst(false);
tccl.addLogicalLib("commons-logging");
- final Class<?> testClass =
child.loadClass(BasicJakartaServletTestCase.class.getName());
+ final Class<?> testClass =
child.loadClass(BasicJakartaServletTest.class.getName());
return new PathableTestSuite(testClass, tccl);
}
diff --git
a/src/test/java/org/apache/commons/logging/servlet/BasicServletTestCase.java
b/src/test/java/org/apache/commons/logging/servlet/BasicServletTest.java
similarity index 97%
rename from
src/test/java/org/apache/commons/logging/servlet/BasicServletTestCase.java
rename to src/test/java/org/apache/commons/logging/servlet/BasicServletTest.java
index 67b2cfb..d8fe1ff 100644
--- a/src/test/java/org/apache/commons/logging/servlet/BasicServletTestCase.java
+++ b/src/test/java/org/apache/commons/logging/servlet/BasicServletTest.java
@@ -28,7 +28,7 @@ import org.apache.commons.logging.impl.ServletContextCleaner;
* Tests for ServletContextCleaner utility class.
*/
-public class BasicServletTestCase extends TestCase {
+public class BasicServletTest extends TestCase {
/**
* Return the tests included in this test suite.
@@ -56,7 +56,7 @@ public class BasicServletTestCase extends TestCase {
tccl.setParentFirst(false);
tccl.addLogicalLib("commons-logging");
- final Class<?> testClass =
child.loadClass(BasicServletTestCase.class.getName());
+ final Class<?> testClass =
child.loadClass(BasicServletTest.class.getName());
return new PathableTestSuite(testClass, tccl);
}
diff --git
a/src/test/java/org/apache/commons/logging/simple/CustomConfigTestCase.java
b/src/test/java/org/apache/commons/logging/simple/CustomConfigTest.java
similarity index 97%
rename from
src/test/java/org/apache/commons/logging/simple/CustomConfigTestCase.java
rename to src/test/java/org/apache/commons/logging/simple/CustomConfigTest.java
index b300459..77955c6 100644
--- a/src/test/java/org/apache/commons/logging/simple/CustomConfigTestCase.java
+++ b/src/test/java/org/apache/commons/logging/simple/CustomConfigTest.java
@@ -32,14 +32,14 @@ import org.apache.commons.logging.impl.SimpleLog;
* <p>TestCase for simple logging when running with custom configuration
* properties.</p>
*/
-public class CustomConfigTestCase extends DefaultConfigTestCase {
+public class CustomConfigTest extends DefaultConfigTest {
/**
* Return the tests included in this test suite.
* <p>
* We need to use a PathableClassLoader here because the SimpleLog class
* is a pile of junk and chock-full of static variables. Any other test
- * (like simple.CustomConfigTestCase) that has used the SimpleLog class
+ * (like simple.CustomConfigTest) that has used the SimpleLog class
* will already have caused it to do once-only initialization that we
* can't reset, even by calling LogFactory.releaseAll, because of those
* ugly statics. The only clean solution is to load a clean copy of
@@ -47,7 +47,7 @@ public class CustomConfigTestCase extends
DefaultConfigTestCase {
* Or we could fix SimpleLog to be sane...
*/
public static Test suite() throws Exception {
- final Class<CustomConfigTestCase> thisClass =
CustomConfigTestCase.class;
+ final Class<CustomConfigTest> thisClass = CustomConfigTest.class;
final PathableClassLoader loader = new PathableClassLoader(null);
loader.useExplicitLoader("junit.", Test.class.getClassLoader());
diff --git
a/src/test/java/org/apache/commons/logging/simple/DateTimeCustomConfigTestCase.java
b/src/test/java/org/apache/commons/logging/simple/DateTimeCustomConfigTest.java
similarity index 93%
rename from
src/test/java/org/apache/commons/logging/simple/DateTimeCustomConfigTestCase.java
rename to
src/test/java/org/apache/commons/logging/simple/DateTimeCustomConfigTest.java
index 098d561..893ed58 100644
---
a/src/test/java/org/apache/commons/logging/simple/DateTimeCustomConfigTestCase.java
+++
b/src/test/java/org/apache/commons/logging/simple/DateTimeCustomConfigTest.java
@@ -29,14 +29,14 @@ import org.apache.commons.logging.PathableTestSuite;
/**
* Tests custom date time format configuration
*/
-public class DateTimeCustomConfigTestCase extends CustomConfigTestCase {
+public class DateTimeCustomConfigTest extends CustomConfigTest {
/**
* Return the tests included in this test suite.
* <p>
* We need to use a PathableClassLoader here because the SimpleLog class
* is a pile of junk and chock-full of static variables. Any other test
- * (like simple.CustomConfigTestCase) that has used the SimpleLog class
+ * (like simple.CustomConfigTest) that has used the SimpleLog class
* will already have caused it to do once-only initialization that we
* can't reset, even by calling LogFactory.releaseAll, because of those
* ugly statics. The only clean solution is to load a clean copy of
@@ -44,7 +44,7 @@ public class DateTimeCustomConfigTestCase extends
CustomConfigTestCase {
* Or we could fix SimpleLog to be sane...
*/
public static Test suite() throws Exception {
- final Class<DateTimeCustomConfigTestCase> thisClass =
DateTimeCustomConfigTestCase.class;
+ final Class<DateTimeCustomConfigTest> thisClass =
DateTimeCustomConfigTest.class;
final PathableClassLoader loader = new PathableClassLoader(null);
loader.useExplicitLoader("junit.", Test.class.getClassLoader());
diff --git
a/src/test/java/org/apache/commons/logging/simple/DefaultConfigTestCase.java
b/src/test/java/org/apache/commons/logging/simple/DefaultConfigTest.java
similarity index 97%
rename from
src/test/java/org/apache/commons/logging/simple/DefaultConfigTestCase.java
rename to src/test/java/org/apache/commons/logging/simple/DefaultConfigTest.java
index 496ab51..3acfd67 100644
--- a/src/test/java/org/apache/commons/logging/simple/DefaultConfigTestCase.java
+++ b/src/test/java/org/apache/commons/logging/simple/DefaultConfigTest.java
@@ -36,14 +36,14 @@ import org.apache.commons.logging.impl.SimpleLog;
* other than selecting the SimpleLog implementation.</p>
*/
-public class DefaultConfigTestCase extends TestCase {
+public class DefaultConfigTest extends TestCase {
/**
* Return the tests included in this test suite.
* <p>
* We need to use a PathableClassLoader here because the SimpleLog class
* is a pile of junk and chock-full of static variables. Any other test
- * (like simple.CustomConfigTestCase) that has used the SimpleLog class
+ * (like simple.CustomConfigTest) that has used the SimpleLog class
* will already have caused it to do once-only initialization that we
* can't reset, even by calling LogFactory.releaseAll, because of those
* ugly statics. The only clean solution is to load a clean copy of
@@ -51,7 +51,7 @@ public class DefaultConfigTestCase extends TestCase {
* Or we could fix SimpleLog to be sane...
*/
public static Test suite() throws Exception {
- final Class<DefaultConfigTestCase> thisClass =
DefaultConfigTestCase.class;
+ final Class<DefaultConfigTest> thisClass = DefaultConfigTest.class;
final PathableClassLoader loader = new PathableClassLoader(null);
loader.useExplicitLoader("junit.", Test.class.getClassLoader());
diff --git
a/src/test/java/org/apache/commons/logging/slf4j/CallerInformationTestCase.java
b/src/test/java/org/apache/commons/logging/slf4j/CallerInformationTest.java
similarity index 98%
rename from
src/test/java/org/apache/commons/logging/slf4j/CallerInformationTestCase.java
rename to
src/test/java/org/apache/commons/logging/slf4j/CallerInformationTest.java
index cfb3416..6a563dc 100644
---
a/src/test/java/org/apache/commons/logging/slf4j/CallerInformationTestCase.java
+++ b/src/test/java/org/apache/commons/logging/slf4j/CallerInformationTest.java
@@ -38,7 +38,7 @@ import ch.qos.logback.core.filter.Filter;
import ch.qos.logback.core.read.ListAppender;
import ch.qos.logback.core.spi.FilterReply;
-public class CallerInformationTestCase extends TestCase {
+public class CallerInformationTest extends TestCase {
private static final String STRING = "String";
private static final Throwable T = new RuntimeException();
diff --git a/src/test/java/org/apache/commons/logging/tccl/BadTCCLTestCase.java
b/src/test/java/org/apache/commons/logging/tccl/BadTCCLTest.java
similarity index 89%
rename from src/test/java/org/apache/commons/logging/tccl/BadTCCLTestCase.java
rename to src/test/java/org/apache/commons/logging/tccl/BadTCCLTest.java
index 75497f8..050bbdd 100644
--- a/src/test/java/org/apache/commons/logging/tccl/BadTCCLTestCase.java
+++ b/src/test/java/org/apache/commons/logging/tccl/BadTCCLTest.java
@@ -27,12 +27,12 @@ import org.apache.commons.logging.PathableTestSuite;
/**
* Simulates the case when TCCL is badly set and cannot load JCL.
*/
-public class BadTCCLTestCase extends TestCase {
+public class BadTCCLTest extends TestCase {
public static Test suite() throws Exception {
final PathableClassLoader contextClassLoader = new
PathableClassLoader(null);
contextClassLoader.useExplicitLoader("junit.",
Test.class.getClassLoader());
- return new PathableTestSuite(BadTCCLTestCase.class,
contextClassLoader);
+ return new PathableTestSuite(BadTCCLTest.class, contextClassLoader);
}
// test methods
@@ -42,7 +42,7 @@ public class BadTCCLTestCase extends TestCase {
* by the LogFactory.
*/
public void testGetLog() {
- final Log log = LogFactory.getLog(BadTCCLTestCase.class);
+ final Log log = LogFactory.getLog(BadTCCLTest.class);
log.debug("Hello, Mum");
}
}
diff --git
a/src/test/java/org/apache/commons/logging/tccl/NullTCCLTestCase.java
b/src/test/java/org/apache/commons/logging/tccl/NullTCCLTest.java
similarity index 88%
rename from src/test/java/org/apache/commons/logging/tccl/NullTCCLTestCase.java
rename to src/test/java/org/apache/commons/logging/tccl/NullTCCLTest.java
index b43e9f7..d2f20cd 100644
--- a/src/test/java/org/apache/commons/logging/tccl/NullTCCLTestCase.java
+++ b/src/test/java/org/apache/commons/logging/tccl/NullTCCLTest.java
@@ -26,10 +26,10 @@ import org.apache.commons.logging.PathableTestSuite;
/**
* Simulates the case when TCCL is set to NULL.
*/
-public class NullTCCLTestCase extends TestCase {
+public class NullTCCLTest extends TestCase {
public static Test suite() throws Exception {
- return new PathableTestSuite(NullTCCLTestCase.class, null);
+ return new PathableTestSuite(NullTCCLTest.class, null);
}
// test methods
@@ -39,7 +39,7 @@ public class NullTCCLTestCase extends TestCase {
* by the LogFactory.
*/
public void testGetLog() {
- final Log log = LogFactory.getLog(NullTCCLTestCase.class);
+ final Log log = LogFactory.getLog(NullTCCLTest.class);
log.debug("Hello, Mum");
}
}
diff --git
a/src/test/java/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java
b/src/test/java/org/apache/commons/logging/tccl/log/TcclDisabledTest.java
similarity index 97%
rename from
src/test/java/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java
rename to
src/test/java/org/apache/commons/logging/tccl/log/TcclDisabledTest.java
index c022a2e..67bd5cb 100644
---
a/src/test/java/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java
+++ b/src/test/java/org/apache/commons/logging/tccl/log/TcclDisabledTest.java
@@ -31,7 +31,7 @@ import org.apache.commons.logging.PathableTestSuite;
/**
* Verifies that by default LogFactoryImpl is loaded from the TCCL class
loader.
*/
-public class TcclDisabledTestCase extends TestCase {
+public class TcclDisabledTest extends TestCase {
public static final String MY_LOG_PKG =
"org.apache.commons.logging.tccl.custom";
@@ -43,7 +43,7 @@ public class TcclDisabledTestCase extends TestCase {
* Returns the tests included in this test suite.
*/
public static Test suite() throws Exception {
- final Class<TcclDisabledTestCase> thisClass =
TcclDisabledTestCase.class;
+ final Class<TcclDisabledTest> thisClass = TcclDisabledTest.class;
// Determine the URL to this .class file, so that we can then
// append the priority dirs to it. For tidiness, load this
diff --git
a/src/test/java/org/apache/commons/logging/tccl/log/TcclEnabledTestCase.java
b/src/test/java/org/apache/commons/logging/tccl/log/TcclEnabledTest.java
similarity index 97%
rename from
src/test/java/org/apache/commons/logging/tccl/log/TcclEnabledTestCase.java
rename to src/test/java/org/apache/commons/logging/tccl/log/TcclEnabledTest.java
index c47c3df..ca9b72b 100644
--- a/src/test/java/org/apache/commons/logging/tccl/log/TcclEnabledTestCase.java
+++ b/src/test/java/org/apache/commons/logging/tccl/log/TcclEnabledTest.java
@@ -31,7 +31,7 @@ import org.apache.commons.logging.PathableTestSuite;
* Verifies that by default the standard LogFactoryImpl class loads a
* custom Log implementation via the TCCL.
*/
-public class TcclEnabledTestCase extends TestCase {
+public class TcclEnabledTest extends TestCase {
public static final String MY_LOG_PKG =
"org.apache.commons.logging.tccl.custom";
@@ -43,7 +43,7 @@ public class TcclEnabledTestCase extends TestCase {
* Returns the tests included in this test suite.
*/
public static Test suite() throws Exception {
- final Class<TcclEnabledTestCase> thisClass = TcclEnabledTestCase.class;
+ final Class<TcclEnabledTest> thisClass = TcclEnabledTest.class;
// Determine the URL to this .class file, so that we can then
// append the priority dirs to it. For tidiness, load this
diff --git
a/src/test/java/org/apache/commons/logging/tccl/logfactory/AdaptersTcclTestCase.java
b/src/test/java/org/apache/commons/logging/tccl/logfactory/AdaptersTcclTest.java
similarity index 97%
rename from
src/test/java/org/apache/commons/logging/tccl/logfactory/AdaptersTcclTestCase.java
rename to
src/test/java/org/apache/commons/logging/tccl/logfactory/AdaptersTcclTest.java
index 38bf906..26fca5c 100644
---
a/src/test/java/org/apache/commons/logging/tccl/logfactory/AdaptersTcclTestCase.java
+++
b/src/test/java/org/apache/commons/logging/tccl/logfactory/AdaptersTcclTest.java
@@ -29,7 +29,7 @@ import org.apache.commons.logging.impl.Log4jApiLogFactory;
* Verifies that if the TCCL contains only `commons-logging-adapters`, it can
load a web-application specific
* logging backend.
*/
-public class AdaptersTcclTestCase extends TestCase {
+public class AdaptersTcclTest extends TestCase {
/**
* Return the tests included in this test suite.
@@ -47,7 +47,7 @@ public class AdaptersTcclTestCase extends TestCase {
tcclLoader.addLogicalLib("log4j-api");
tcclLoader.setParentFirst(false);
- final Class<?> testClass =
classLoader.loadClass(AdaptersTcclTestCase.class.getName());
+ final Class<?> testClass =
classLoader.loadClass(AdaptersTcclTest.class.getName());
return new PathableTestSuite(testClass, tcclLoader);
}
diff --git
a/src/test/java/org/apache/commons/logging/tccl/logfactory/SiblingTcclTestCase.java
b/src/test/java/org/apache/commons/logging/tccl/logfactory/SiblingTcclTest.java
similarity index 96%
rename from
src/test/java/org/apache/commons/logging/tccl/logfactory/SiblingTcclTestCase.java
rename to
src/test/java/org/apache/commons/logging/tccl/logfactory/SiblingTcclTest.java
index 69cd006..2446350 100644
---
a/src/test/java/org/apache/commons/logging/tccl/logfactory/SiblingTcclTestCase.java
+++
b/src/test/java/org/apache/commons/logging/tccl/logfactory/SiblingTcclTest.java
@@ -27,7 +27,7 @@ import org.apache.commons.logging.PathableTestSuite;
/**
* Verifies that if the TCCL is a sibling of the classloader with
`commons-logging`
*/
-public class SiblingTcclTestCase extends TestCase {
+public class SiblingTcclTest extends TestCase {
/**
* Return the tests included in this test suite.
@@ -44,7 +44,7 @@ public class SiblingTcclTestCase extends TestCase {
final PathableClassLoader tcclLoader = new PathableClassLoader(null);
tcclLoader.addLogicalLib("log4j-api");
- final Class<?> testClass =
classLoader.loadClass(SiblingTcclTestCase.class.getName());
+ final Class<?> testClass =
classLoader.loadClass(SiblingTcclTest.class.getName());
return new PathableTestSuite(testClass, tcclLoader);
}
diff --git
a/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java
b/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclDisabledTest.java
similarity index 97%
rename from
src/test/java/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java
rename to
src/test/java/org/apache/commons/logging/tccl/logfactory/TcclDisabledTest.java
index d0630da..97d6036 100644
---
a/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java
+++
b/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclDisabledTest.java
@@ -30,7 +30,7 @@ import org.apache.commons.logging.PathableTestSuite;
* Verifies that a commons-logging.properties file can prevent a custom
* LogFactoryImpl being loaded from the TCCL class loader.
*/
-public class TcclDisabledTestCase extends TestCase {
+public class TcclDisabledTest extends TestCase {
public static final String MY_LOG_FACTORY_PKG =
"org.apache.commons.logging.tccl.custom";
@@ -42,7 +42,7 @@ public class TcclDisabledTestCase extends TestCase {
* Returns the tests included in this test suite.
*/
public static Test suite() throws Exception {
- final Class<TcclDisabledTestCase> thisClass =
TcclDisabledTestCase.class;
+ final Class<TcclDisabledTest> thisClass = TcclDisabledTest.class;
// Determine the URL to this .class file, so that we can then
// append the priority dirs to it. For tidiness, load this
diff --git
a/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java
b/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclEnabledTest.java
similarity index 97%
rename from
src/test/java/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java
rename to
src/test/java/org/apache/commons/logging/tccl/logfactory/TcclEnabledTest.java
index e9a6e22..c20fc8a 100644
---
a/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java
+++
b/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclEnabledTest.java
@@ -30,13 +30,13 @@ import org.apache.commons.logging.PathableTestSuite;
* Verifies that by default a custom LogFactoryImpl is loaded from the
* TCCL class loader.
*/
-public class TcclEnabledTestCase extends TestCase {
+public class TcclEnabledTest extends TestCase {
/**
* Return the tests included in this test suite.
*/
public static Test suite() throws Exception {
- final Class<TcclEnabledTestCase> thisClass = TcclEnabledTestCase.class;
+ final Class<TcclEnabledTest> thisClass = TcclEnabledTest.class;
// Determine the URL to this .class file, so that we can then
// append the priority dirs to it. For tidiness, load this
diff --git
a/src/test/resources/org/apache/commons/logging/jdk14/CustomConfig.properties
b/src/test/resources/org/apache/commons/logging/jdk14/CustomConfig.properties
index f42c14b..0ed82db 100644
---
a/src/test/resources/org/apache/commons/logging/jdk14/CustomConfig.properties
+++
b/src/test/resources/org/apache/commons/logging/jdk14/CustomConfig.properties
@@ -15,7 +15,7 @@
# This is the custom configuration properties for the JDK 1.4 logger tests
-# in CustomConfigTestCase.
+# in CustomConfigTest.
# Configure the Handler so we can examine the logged messages
handlers = org.apache.commons.logging.jdk14.TestHandler
diff --git a/src/test/resources/serviceloader/README.txt
b/src/test/resources/serviceloader/README.txt
index f604285..82cbba3 100644
--- a/src/test/resources/serviceloader/README.txt
+++ b/src/test/resources/serviceloader/README.txt
@@ -1 +1 @@
-Contains resources used exclusively by `ServiceLoaderTestCase`
+Contains resources used exclusively by `ServiceLoaderTest`
