This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch 1.X
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git


The following commit(s) were added to refs/heads/1.X by this push:
     new 919eee42 Rename concrete test classes from JUnit 3 names (*TestCase) 
to JUnit 4+ names (*Test)
919eee42 is described below

commit 919eee42da6bf3c9eeca356ca463662ab75c0482
Author: Gary Gregory <[email protected]>
AuthorDate: Thu Jan 1 09:54:39 2026 -0500

    Rename concrete test classes from JUnit 3 names (*TestCase) to JUnit 4+
    names (*Test)
    
    - The rename causes tests to run in a different order.
    - Fix an old bug in the tests that didn't setup or tear down cleanly.
---
 pom.xml                                            | 11 +---
 ...ynaBeanTestCase.java => BasicDynaBeanTest.java} |  2 +-
 ...aratorTestCase.java => BeanComparatorTest.java} |  2 +-
 ...estCase.java => BeanIntrospectionDataTest.java} |  2 +-
 .../{BeanMapTestCase.java => BeanMapTest.java}     |  6 +-
 ...edicateTestCase.java => BeanPredicateTest.java} |  4 +-
 ...ava => BeanPropertyValueChangeClosureTest.java} |  4 +-
 ...a => BeanPropertyValueEqualsPredicateTest.java} |  4 +-
 ...ava => BeanToPropertyValueTransformerTest.java} |  4 +-
 .../apache/commons/beanutils/BeanUtilCaches.java   | 50 ++++++++++++++++
 ...BeanUtils2TestCase.java => BeanUtils2Test.java} |  6 +-
 .../{BeanUtilsTestCase.java => BeanUtilsTest.java} |  8 +--
 ...icationTestCase.java => BeanificationTest.java} |  6 +-
 ...tilsTestCase.java => ConstructorUtilsTest.java} |  6 +-
 ...ertUtilsTestCase.java => ConvertUtilsTest.java} | 14 ++---
 ...e.java => DefaultIntrospectionContextTest.java} |  4 +-
 ...TestCase.java => DynaBeanMapDecoratorTest.java} |  6 +-
 ...anUtilsTestCase.java => DynaBeanUtilsTest.java} | 10 ++--
 ...PropertyTestCase.java => DynaPropertyTest.java} |  6 +-
 ...ilsTestCase.java => DynaPropertyUtilsTest.java} |  6 +-
 ...sultSetTestCase.java => DynaResultSetTest.java} |  6 +-
 ...DynaRowSetTestCase.java => DynaRowSetTest.java} |  6 +-
 ...ava => FluentPropertyBeanIntrospectorTest.java} |  2 +-
 ...pertyTestCase.java => IndexedPropertyTest.java} |  2 +-
 ...DynaBeanTestCase.java => LazyDynaBeanTest.java} |  6 +-
 ...naClassTestCase.java => LazyDynaClassTest.java} |  6 +-
 ...DynaListTestCase.java => LazyDynaListTest.java} |  6 +-
 ...zyDynaMapTestCase.java => LazyDynaMapTest.java} |  6 +-
 ...opertyTestCase.java => MappedPropertyTest.java} |  6 +-
 ...thodUtilsTestCase.java => MethodUtilsTest.java} |  6 +-
 ...tyUtilsTestCase.java => PropertyUtilsTest.java} |  6 +-
 ...=> SuppressPropertiesBeanIntrospectorTest.java} |  2 +-
 ...DynaBeanTestCase.java => WrapDynaBeanTest.java} |  2 +-
 .../{Jira157TestCase.java => Jira157Test.java}     |  8 +--
 .../bugs/{Jira18TestCase.java => Jira18Test.java}  |  8 +--
 .../{Jira273TestCase.java => Jira273Test.java}     |  8 +--
 .../{Jira298TestCase.java => Jira298Test.java}     |  8 +--
 .../{Jira339TestCase.java => Jira339Test.java}     |  8 +--
 .../{Jira345TestCase.java => Jira345Test.java}     |  6 +-
 .../{Jira347TestCase.java => Jira347Test.java}     |  6 +-
 .../{Jira349TestCase.java => Jira349Test.java}     |  8 +--
 .../{Jira357TestCase.java => Jira357Test.java}     |  6 +-
 .../{Jira358TestCase.java => Jira358Test.java}     |  6 +-
 .../{Jira359TestCase.java => Jira359Test.java}     |  6 +-
 .../{Jira368TestCase.java => Jira368Test.java}     |  6 +-
 .../{Jira369TestCase.java => Jira369Test.java}     |  6 +-
 .../{Jira381TestCase.java => Jira381Test.java}     |  4 +-
 .../{Jira411TestCase.java => Jira411Test.java}     |  2 +-
 .../{Jira422TestCase.java => Jira422Test.java}     |  4 +-
 .../{Jira422bTestCase.java => Jira422bTest.java}   |  4 +-
 .../{Jira454TestCase.java => Jira454Test.java}     |  2 +-
 .../{Jira456TestCase.java => Jira456Test.java}     |  2 +-
 .../{Jira458TestCase.java => Jira458Test.java}     |  2 +-
 .../{Jira463TestCase.java => Jira463Test.java}     |  2 +-
 .../{Jira465TestCase.java => Jira465Test.java}     |  2 +-
 .../{Jira492TestCase.java => Jira492Test.java}     |  2 +-
 .../{Jira493TestCase.java => Jira493Test.java}     |  2 +-
 .../{Jira520TestCase.java => Jira520Test.java}     |  2 +-
 .../{Jira541TestCase.java => Jira541Test.java}     |  2 +-
 .../bugs/{Jira61TestCase.java => Jira61Test.java}  |  8 +--
 .../bugs/{Jira87TestCase.java => Jira87Test.java}  |  8 +--
 .../bugs/{Jira92TestCase.java => Jira92Test.java}  |  2 +-
 .../beanutils/bugs/other/Jira18BeanFactory.java    |  4 +-
 .../beanutils/bugs/other/Jira273BeanFactory.java   |  4 +-
 .../beanutils/bugs/other/Jira298BeanFactory.java   |  4 +-
 .../beanutils/bugs/other/Jira61BeanFactory.java    |  4 +-
 .../beanutils/bugs/other/Jira87BeanFactory.java    |  4 +-
 .../converters/BigDecimalConverterTestCase.java    |  2 +-
 .../converters/BigIntegerConverterTestCase.java    |  2 +-
 .../converters/ByteConverterTestCase.java          |  2 +-
 ...erTestCase.java => CharacterConverterTest.java} |  6 +-
 ...verterTestCase.java => ClassConverterTest.java} |  6 +-
 ...eloaderTestCase.java => ClassReloaderTest.java} |  6 +-
 .../beanutils/converters/ConverterTestSuite.java   | 28 ++++-----
 ...nverterTestCase.java => DateConverterTest.java} |  6 +-
 ...erterTestCase.java => DoubleConverterTest.java} |  6 +-
 ...nverterTestCase.java => FileConverterTest.java} |  6 +-
 ...verterTestCase.java => FloatConverterTest.java} |  6 +-
 ...rterTestCase.java => IntegerConverterTest.java} |  6 +-
 ...nverterTestCase.java => LongConverterTest.java} |  6 +-
 .../{MemoryTestCase.java => MemoryTest.java}       |  2 +-
 ...erterTestBase.java => NumberConverterTest.java} |  4 +-
 ...verterTestCase.java => ShortConverterTest.java} |  6 +-
 ...rterTestCase.java => SqlDateConverterTest.java} |  6 +-
 ...rterTestCase.java => SqlTimeConverterTest.java} |  6 +-
 ...estCase.java => SqlTimestampConverterTest.java} |  6 +-
 ...TestCase.java => StringArrayConverterTest.java} |  4 +-
 ...erterTestCase.java => StringConverterTest.java} |  2 +-
 ...onverterTestCase.java => URLConverterTest.java} |  6 +-
 ...olverTestCase.java => DefaultResolverTest.java} |  6 +-
 ...UtilsTestCase.java => LocaleBeanUtilsTest.java} |  8 +--
 ...nTestCase.java => LocaleBeanificationTest.java} |  6 +-
 .../beanutils/locale/LocaleConvertTestSuite.java   | 40 ++++++-------
 ...lsTestCase.java => LocaleConvertUtilsTest.java} |  6 +-
 ...rTestCase.java => BaseLocaleConverterTest.java} |  4 +-
 ...ase.java => BigDecimalLocaleConverterTest.java} |  4 +-
 ...ase.java => BigIntegerLocaleConverterTest.java} |  4 +-
 ...rTestCase.java => ByteLocaleConverterTest.java} |  4 +-
 ...rTestCase.java => DateLocaleConverterTest.java} |  6 +-
 ...estCase.java => DoubleLocaleConverterTest.java} |  4 +-
 ...TestCase.java => FloatLocaleConverterTest.java} |  4 +-
 ...stCase.java => IntegerLocaleConverterTest.java} |  4 +-
 ...rTestCase.java => LongLocaleConverterTest.java} |  4 +-
 ...TestCase.java => ShortLocaleConverterTest.java} |  4 +-
 ...MemoryLeakTestCase.java => MemoryLeakTest.java} | 67 ++++++----------------
 105 files changed, 351 insertions(+), 337 deletions(-)

diff --git a/pom.xml b/pom.xml
index 691d13fe..117466a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,11 +26,9 @@
   <artifactId>commons-beanutils</artifactId>
   <version>1.11.1-SNAPSHOT</version>
   <name>Apache Commons BeanUtils</name>
-
   <inceptionYear>2000</inceptionYear>
   <description>Apache Commons BeanUtils provides an easy-to-use but flexible 
wrapper around reflection and introspection.</description>
   <url>https://commons.apache.org/proper/commons-beanutils</url>
-
   <properties>
       <maven.compiler.source>1.8</maven.compiler.source>
       <maven.compiler.target>1.8</maven.compiler.target>
@@ -57,13 +55,11 @@
       <commons.release.isDistModule>true</commons.release.isDistModule>
       
<commons.distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}</commons.distSvnStagingUrl>
   </properties>
-
   <scm>
     
<connection>scm:git:https://gitbox.apache.org/repos/asf?p=commons-beanutils.git</connection>
     
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf?p=commons-beanutils.git</developerConnection>
     <url>https://gitbox.apache.org/repos/asf?p=commons-beanutils.git</url>
   </scm>
-
   <distributionManagement>
     <site>
       <id>apache.website</id>
@@ -75,7 +71,6 @@
     <system>GitHub</system>
     <url>https://github.com/apache/commons-beanutils/actions</url>
   </ciManagement>
-
   <dependencies>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -104,7 +99,6 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
   <build>
       <defaultGoal>clean apache-rat:check verify japicmp:cmp javadoc:javadoc 
checkstyle:check</defaultGoal>
       <plugins>
@@ -116,15 +110,16 @@
               <!-- limit memory size see BEANUTILS-291 -->
               <argLine>${surefire.argLine}</argLine>
               <includes>
+                <include>**/*Test.java</include>
                 <include>**/*TestCase.java</include>
               </includes>
               <excludes>
                 <!-- This test case is known to fail, and there isn't any 
proposed fix
                   -  so we will just exclude it until someone comes up with a 
solution.
                 -->
+                <exclude>**/*MemoryTest.java</exclude>
                 <exclude>**/*MemoryTestCase.java</exclude>
               </excludes>
-
               <!-- Configure Logging -->
               <redirectTestOutputToFile>true</redirectTestOutputToFile>
               <systemPropertyVariables>
@@ -132,7 +127,6 @@
                   
<org.apache.commons.logging.Log>org.apache.commons.logging.impl.SimpleLog</org.apache.commons.logging.Log>
                   
<org.apache.commons.logging.simplelog.defaultlog>WARN</org.apache.commons.logging.simplelog.defaultlog>
               </systemPropertyVariables>
-
           </configuration>
         </plugin>
         <plugin>
@@ -173,7 +167,6 @@
         </plugins>
       </pluginManagement>
     </build>
-
     <reporting>
         <plugins>
             <plugin>
diff --git 
a/src/test/java/org/apache/commons/beanutils/BasicDynaBeanTestCase.java 
b/src/test/java/org/apache/commons/beanutils/BasicDynaBeanTest.java
similarity index 99%
rename from 
src/test/java/org/apache/commons/beanutils/BasicDynaBeanTestCase.java
rename to src/test/java/org/apache/commons/beanutils/BasicDynaBeanTest.java
index 2abf6eb7..d3bdcec7 100644
--- a/src/test/java/org/apache/commons/beanutils/BasicDynaBeanTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/BasicDynaBeanTest.java
@@ -43,7 +43,7 @@ import org.junit.jupiter.api.Test;
  * </p>
  *
  */
-public class BasicDynaBeanTestCase {
+public class BasicDynaBeanTest {
 
     /**
      * The set of property names we expect to have returned when calling 
{@code getDynaProperties()}. You should update this list when new properties are
diff --git 
a/src/test/java/org/apache/commons/beanutils/BeanComparatorTestCase.java 
b/src/test/java/org/apache/commons/beanutils/BeanComparatorTest.java
similarity index 99%
rename from 
src/test/java/org/apache/commons/beanutils/BeanComparatorTestCase.java
rename to src/test/java/org/apache/commons/beanutils/BeanComparatorTest.java
index 36737cfc..25e38bb9 100644
--- a/src/test/java/org/apache/commons/beanutils/BeanComparatorTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/BeanComparatorTest.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
  * Test Case for the BeanComparator class.
  *
  */
-public class BeanComparatorTestCase {
+public class BeanComparatorTest {
 
     /**
      * The test beans for each test.
diff --git 
a/src/test/java/org/apache/commons/beanutils/BeanIntrospectionDataTestCase.java 
b/src/test/java/org/apache/commons/beanutils/BeanIntrospectionDataTest.java
similarity index 98%
rename from 
src/test/java/org/apache/commons/beanutils/BeanIntrospectionDataTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/BeanIntrospectionDataTest.java
index 2318aceb..5dbe946a 100644
--- 
a/src/test/java/org/apache/commons/beanutils/BeanIntrospectionDataTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/BeanIntrospectionDataTest.java
@@ -27,7 +27,7 @@ import junit.framework.TestCase;
  * Test class for {@code BeanIntrospectionData}.
  *
  */
-public class BeanIntrospectionDataTestCase extends TestCase {
+public class BeanIntrospectionDataTest extends TestCase {
     /** Constant for the test bean class. */
     private static final Class<?> BEAN_CLASS = 
FluentIntrospectionTestBean.class;
 
diff --git a/src/test/java/org/apache/commons/beanutils/BeanMapTestCase.java 
b/src/test/java/org/apache/commons/beanutils/BeanMapTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/beanutils/BeanMapTestCase.java
rename to src/test/java/org/apache/commons/beanutils/BeanMapTest.java
index 375ccad9..72eb5c31 100644
--- a/src/test/java/org/apache/commons/beanutils/BeanMapTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/BeanMapTest.java
@@ -35,7 +35,7 @@ import junit.textui.TestRunner;
  *
  */
 @SuppressWarnings("deprecation")
-public class BeanMapTestCase extends AbstractTestMap {
+public class BeanMapTest extends AbstractTestMap {
 
     public static class BeanThrowingExceptions extends BeanWithProperties {
         private static final long serialVersionUID = 1L;
@@ -161,7 +161,7 @@ public class BeanMapTestCase extends AbstractTestMap {
     }
 
     public static Test suite() {
-        return BulkTest.makeSuite(BeanMapTestCase.class);
+        return BulkTest.makeSuite(BeanMapTest.class);
     }
 
     /**
@@ -172,7 +172,7 @@ public class BeanMapTestCase extends AbstractTestMap {
      **/
     private final Object objectInFullMap = new Object();
 
-    public BeanMapTestCase(final String testName) {
+    public BeanMapTest(final String testName) {
         super(testName);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/BeanPredicateTestCase.java 
b/src/test/java/org/apache/commons/beanutils/BeanPredicateTest.java
similarity index 95%
rename from 
src/test/java/org/apache/commons/beanutils/BeanPredicateTestCase.java
rename to src/test/java/org/apache/commons/beanutils/BeanPredicateTest.java
index df32ca5b..d412532e 100644
--- a/src/test/java/org/apache/commons/beanutils/BeanPredicateTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/BeanPredicateTest.java
@@ -26,9 +26,9 @@ import junit.framework.TestCase;
 
 /**
  */
-public class BeanPredicateTestCase extends TestCase {
+public class BeanPredicateTest extends TestCase {
 
-    public BeanPredicateTestCase(final String name) {
+    public BeanPredicateTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosureTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosureTest.java
similarity index 98%
rename from 
src/test/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosureTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosureTest.java
index 655d93ea..14b4f85d 100644
--- 
a/src/test/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosureTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosureTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
  * Test cases for {@code BeanPropertyValueChangeClosure}.
  *
  */
-public class BeanPropertyValueChangeClosureTestCase extends TestCase {
+public class BeanPropertyValueChangeClosureTest extends TestCase {
 
     private static final Integer expectedIntegerValue = Integer.valueOf(123);
     private static final Float expectedFloatValue = Float.valueOf(123.123f);
@@ -36,7 +36,7 @@ public class BeanPropertyValueChangeClosureTestCase extends 
TestCase {
      *
      * @param name Name of this test case.
      */
-    public BeanPropertyValueChangeClosureTestCase(final String name) {
+    public BeanPropertyValueChangeClosureTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicateTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicateTest.java
similarity index 98%
rename from 
src/test/java/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicateTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicateTest.java
index af9fbe19..b0a0b263 100644
--- 
a/src/test/java/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicateTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicateTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
  * Test cases for {@code BeanPropertyValueEqualsPredicateTest}.
  *
  */
-public class BeanPropertyValueEqualsPredicateTestCase extends TestCase {
+public class BeanPropertyValueEqualsPredicateTest extends TestCase {
 
     private static final Integer expectedIntegerValue = Integer.valueOf(123);
     private static final Float expectedFloatValue = Float.valueOf(123.123f);
@@ -36,7 +36,7 @@ public class BeanPropertyValueEqualsPredicateTestCase extends 
TestCase {
      *
      * @param name Name of this test case.
      */
-    public BeanPropertyValueEqualsPredicateTestCase(final String name) {
+    public BeanPropertyValueEqualsPredicateTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/BeanToPropertyValueTransformerTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/BeanToPropertyValueTransformerTest.java
similarity index 98%
rename from 
src/test/java/org/apache/commons/beanutils/BeanToPropertyValueTransformerTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/BeanToPropertyValueTransformerTest.java
index 3cb6dac2..9f5cc33f 100644
--- 
a/src/test/java/org/apache/commons/beanutils/BeanToPropertyValueTransformerTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/BeanToPropertyValueTransformerTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
  * Test cases for {@code BeanToPropertyValueTransformer}.
  *
  */
-public class BeanToPropertyValueTransformerTestCase extends TestCase {
+public class BeanToPropertyValueTransformerTest extends TestCase {
 
     private static final Integer expectedIntegerValue = Integer.valueOf(123);
     private static final Long expectedLongValue = Long.valueOf(123);
@@ -37,7 +37,7 @@ public class BeanToPropertyValueTransformerTestCase extends 
TestCase {
      *
      * @param name Name of this test case.
      */
-    public BeanToPropertyValueTransformerTestCase(final String name) {
+    public BeanToPropertyValueTransformerTest(final String name) {
         super(name);
     }
 
diff --git a/src/test/java/org/apache/commons/beanutils/BeanUtilCaches.java 
b/src/test/java/org/apache/commons/beanutils/BeanUtilCaches.java
new file mode 100644
index 00000000..f805bc8f
--- /dev/null
+++ b/src/test/java/org/apache/commons/beanutils/BeanUtilCaches.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.beanutils;
+
+import org.apache.commons.beanutils.locale.LocaleBeanUtilsBean;
+
+public class BeanUtilCaches {
+
+    /**
+     * Clears all the BeanUtils Caches manually.
+     *
+     * This is probably overkill, but since we're dealing with static caches
+     * it seems sensible to ensure that all test cases start with a clean 
sheet.
+     */
+    public static void clear() {
+
+        // Clear BeanUtilsBean's PropertyUtilsBean descriptor caches
+        BeanUtilsBean.getInstance().getPropertyUtils().clearDescriptors();
+
+        // Clear LocaleBeanUtilsBean's PropertyUtilsBean descriptor caches
+        
LocaleBeanUtilsBean.getLocaleBeanUtilsInstance().getPropertyUtils().clearDescriptors();
+
+        // Clear MethodUtils's method cache
+        MethodUtils.clearCache();
+
+        // Clear WrapDynaClass cache
+        WrapDynaClass.clear();
+
+        // Replace the existing BeanUtilsBean instance for the current class 
loader with a new, clean instance
+        BeanUtilsBean.setInstance(new BeanUtilsBean());
+
+        // Replace the existing LocaleBeanUtilsBean instance for the current 
class loader with a new, clean instance
+        LocaleBeanUtilsBean.setInstance(new LocaleBeanUtilsBean());
+    }
+}
diff --git a/src/test/java/org/apache/commons/beanutils/BeanUtils2TestCase.java 
b/src/test/java/org/apache/commons/beanutils/BeanUtils2Test.java
similarity index 97%
rename from src/test/java/org/apache/commons/beanutils/BeanUtils2TestCase.java
rename to src/test/java/org/apache/commons/beanutils/BeanUtils2Test.java
index 4d3f34ac..9d029a16 100644
--- a/src/test/java/org/apache/commons/beanutils/BeanUtils2TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/BeanUtils2Test.java
@@ -23,13 +23,13 @@ import junit.framework.TestSuite;
  * Test Case for the {@link BeanUtilsBean2}.
  *
  */
-public class BeanUtils2TestCase extends BeanUtilsTestCase {
+public class BeanUtils2Test extends BeanUtilsTest {
 
     /**
      * Return the tests included in this test suite.
      */
     public static Test suite() {
-        return new TestSuite(BeanUtils2TestCase.class);
+        return new TestSuite(BeanUtils2Test.class);
     }
 
     /**
@@ -37,7 +37,7 @@ public class BeanUtils2TestCase extends BeanUtilsTestCase {
      *
      * @param name Name of the test case
      */
-    public BeanUtils2TestCase(final String name) {
+    public BeanUtils2Test(final String name) {
         super(name);
     }
 
diff --git a/src/test/java/org/apache/commons/beanutils/BeanUtilsTestCase.java 
b/src/test/java/org/apache/commons/beanutils/BeanUtilsTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/beanutils/BeanUtilsTestCase.java
rename to src/test/java/org/apache/commons/beanutils/BeanUtilsTest.java
index ad3486f0..d9281bd3 100644
--- a/src/test/java/org/apache/commons/beanutils/BeanUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/BeanUtilsTest.java
@@ -57,13 +57,13 @@ import junit.framework.TestSuite;
  *
  */
 
-public class BeanUtilsTestCase extends TestCase {
+public class BeanUtilsTest extends TestCase {
 
     /**
      * Return the tests included in this test suite.
      */
     public static Test suite() {
-        return new TestSuite(BeanUtilsTestCase.class);
+        return new TestSuite(BeanUtilsTest.class);
     }
 
     /**
@@ -111,7 +111,7 @@ public class BeanUtilsTestCase extends TestCase {
      *
      * @param name Name of the test case
      */
-    public BeanUtilsTestCase(final String name) {
+    public BeanUtilsTest(final String name) {
         super(name);
     }
 
@@ -220,7 +220,7 @@ public class BeanUtilsTestCase extends TestCase {
     public void testCopyPropertiesDynaBean() {
 
         // Set up an origin bean with customized properties
-        final DynaClass dynaClass = DynaBeanUtilsTestCase.createDynaClass();
+        final DynaClass dynaClass = DynaBeanUtilsTest.createDynaClass();
         DynaBean orig = null;
         try {
             orig = dynaClass.newInstance();
diff --git 
a/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java 
b/src/test/java/org/apache/commons/beanutils/BeanificationTest.java
similarity index 99%
rename from 
src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java
rename to src/test/java/org/apache/commons/beanutils/BeanificationTest.java
index 119a1159..eb0121e8 100644
--- a/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/BeanificationTest.java
@@ -35,7 +35,7 @@ import junit.framework.TestSuite;
  *
  */
 
-public class BeanificationTestCase extends TestCase {
+public class BeanificationTest extends TestCase {
 
     class Signal {
         private Exception e;
@@ -108,7 +108,7 @@ public class BeanificationTestCase extends TestCase {
      * Return the tests included in this test suite.
      */
     public static Test suite() {
-        return new TestSuite(BeanificationTestCase.class);
+        return new TestSuite(BeanificationTest.class);
     }
 
     /**
@@ -116,7 +116,7 @@ public class BeanificationTestCase extends TestCase {
      *
      * @param name Name of the test case
      */
-    public BeanificationTestCase(final String name) {
+    public BeanificationTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/ConstructorUtilsTestCase.java 
b/src/test/java/org/apache/commons/beanutils/ConstructorUtilsTest.java
similarity index 98%
rename from 
src/test/java/org/apache/commons/beanutils/ConstructorUtilsTestCase.java
rename to src/test/java/org/apache/commons/beanutils/ConstructorUtilsTest.java
index 07f2d02a..9e867d39 100644
--- a/src/test/java/org/apache/commons/beanutils/ConstructorUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/ConstructorUtilsTest.java
@@ -28,13 +28,13 @@ import junit.framework.TestSuite;
  * Tests {@link ConstructorUtils} </p>
  */
 @SuppressWarnings("deprecation")
-public class ConstructorUtilsTestCase extends TestCase {
+public class ConstructorUtilsTest extends TestCase {
 
     /**
      * Return the tests included in this test suite.
      */
     public static Test suite() {
-        return new TestSuite(ConstructorUtilsTestCase.class);
+        return new TestSuite(ConstructorUtilsTest.class);
     }
 
     /**
@@ -42,7 +42,7 @@ public class ConstructorUtilsTestCase extends TestCase {
      *
      * @param name Name of the test case
      */
-    public ConstructorUtilsTestCase(final String name) {
+    public ConstructorUtilsTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/ConvertUtilsTestCase.java 
b/src/test/java/org/apache/commons/beanutils/ConvertUtilsTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/beanutils/ConvertUtilsTestCase.java
rename to src/test/java/org/apache/commons/beanutils/ConvertUtilsTest.java
index 133506c2..0e102614 100644
--- a/src/test/java/org/apache/commons/beanutils/ConvertUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/ConvertUtilsTest.java
@@ -23,6 +23,7 @@ import java.sql.Timestamp;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Locale;
+import java.util.Objects;
 
 import org.apache.commons.beanutils.converters.DateConverter;
 
@@ -33,13 +34,13 @@ import junit.framework.TestSuite;
 /**
  * Test Case for the ConvertUtils class.
  */
-public class ConvertUtilsTestCase extends TestCase {
+public class ConvertUtilsTest extends TestCase {
 
     /**
      * Return the tests included in this test suite.
      */
     public static Test suite() {
-        return new TestSuite(ConvertUtilsTestCase.class);
+        return new TestSuite(ConvertUtilsTest.class);
     }
 
     /**
@@ -47,7 +48,7 @@ public class ConvertUtilsTestCase extends TestCase {
      *
      * @param name Name of the test case
      */
-    public ConvertUtilsTestCase(final String name) {
+    public ConvertUtilsTest(final String name) {
         super(name);
     }
 
@@ -85,9 +86,8 @@ public class ConvertUtilsTestCase extends TestCase {
      */
     @Override
     public void setUp() {
-
+        BeanUtilCaches.clear();
         ConvertUtils.deregister();
-
     }
 
     /**
@@ -95,7 +95,7 @@ public class ConvertUtilsTestCase extends TestCase {
      */
     @Override
     public void tearDown() {
-        // No action required
+        ConvertUtils.deregister();
     }
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -353,7 +353,7 @@ public class ConvertUtilsTestCase extends TestCase {
         final String values1[] = { "10", "20", "30" };
         Object value = ConvertUtils.convert(values1, Integer.TYPE);
         final int shape[] = {};
-        assertEquals(shape.getClass(), value.getClass());
+        assertEquals(Objects.toString(value), shape.getClass(), 
value.getClass());
         final int results1[] = (int[]) value;
         assertEquals(results1[0], 10);
         assertEquals(results1[1], 20);
diff --git 
a/src/test/java/org/apache/commons/beanutils/DefaultIntrospectionContextTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/DefaultIntrospectionContextTest.java
similarity index 97%
rename from 
src/test/java/org/apache/commons/beanutils/DefaultIntrospectionContextTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/DefaultIntrospectionContextTest.java
index a2b433c1..9514f16a 100644
--- 
a/src/test/java/org/apache/commons/beanutils/DefaultIntrospectionContextTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/DefaultIntrospectionContextTest.java
@@ -27,7 +27,7 @@ import junit.framework.TestCase;
  * Test class for {@code IntrospectionContext}.
  *
  */
-public class DefaultIntrospectionContextTestCase extends TestCase {
+public class DefaultIntrospectionContextTest extends TestCase {
     /** Constant for the name of a property. */
     private static final String PROP = "foo";
 
@@ -40,7 +40,7 @@ public class DefaultIntrospectionContextTestCase extends 
TestCase {
     private static PropertyDescriptor createDescriptor(final String propName) {
         try {
             return new PropertyDescriptor(propName,
-                    DefaultIntrospectionContextTestCase.class, null, null);
+                    DefaultIntrospectionContextTest.class, null, null);
         } catch (final IntrospectionException e) {
             throw new IllegalStateException("Unexpected exception: " + e);
         }
diff --git 
a/src/test/java/org/apache/commons/beanutils/DynaBeanMapDecoratorTestCase.java 
b/src/test/java/org/apache/commons/beanutils/DynaBeanMapDecoratorTest.java
similarity index 98%
rename from 
src/test/java/org/apache/commons/beanutils/DynaBeanMapDecoratorTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/DynaBeanMapDecoratorTest.java
index 1e06ea55..5b8f71d2 100644
--- 
a/src/test/java/org/apache/commons/beanutils/DynaBeanMapDecoratorTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/DynaBeanMapDecoratorTest.java
@@ -34,7 +34,7 @@ import junit.framework.TestSuite;
  *
  */
 @SuppressWarnings("deprecation")
-public class DynaBeanMapDecoratorTestCase extends TestCase {
+public class DynaBeanMapDecoratorTest extends TestCase {
 
     private static final DynaProperty stringProp = new 
DynaProperty("stringProp", String.class);
     private static final DynaProperty nullProp   = new 
DynaProperty("nullProp",   String.class);
@@ -61,7 +61,7 @@ public class DynaBeanMapDecoratorTestCase extends TestCase {
      * Return the tests included in this test suite.
      */
     public static Test suite() {
-        return new TestSuite(DynaBeanMapDecoratorTestCase.class);
+        return new TestSuite(DynaBeanMapDecoratorTest.class);
     }
     private final Map<Object, Object>     mapVal    = new HashMap<>();
     private final Object[] values = {stringVal, null, intVal, dateVal, mapVal};
@@ -76,7 +76,7 @@ public class DynaBeanMapDecoratorTestCase extends TestCase {
      *
      * @param name Name of the test case
      */
-    public DynaBeanMapDecoratorTestCase(final String name) {
+    public DynaBeanMapDecoratorTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/DynaBeanUtilsTestCase.java 
b/src/test/java/org/apache/commons/beanutils/DynaBeanUtilsTest.java
similarity index 99%
rename from 
src/test/java/org/apache/commons/beanutils/DynaBeanUtilsTestCase.java
rename to src/test/java/org/apache/commons/beanutils/DynaBeanUtilsTest.java
index 30abebf4..ff34880b 100644
--- a/src/test/java/org/apache/commons/beanutils/DynaBeanUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/DynaBeanUtilsTest.java
@@ -32,7 +32,7 @@ import junit.framework.TestSuite;
  *
  */
 
-public class DynaBeanUtilsTestCase extends TestCase {
+public class DynaBeanUtilsTest extends TestCase {
 
     /**
      * Create and return a {@code DynaClass} instance for our test
@@ -75,7 +75,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
      */
     public static Test suite() {
 
-        return new TestSuite(DynaBeanUtilsTestCase.class);
+        return new TestSuite(DynaBeanUtilsTest.class);
 
     }
 
@@ -121,7 +121,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
      *
      * @param name Name of the test case
      */
-    public DynaBeanUtilsTestCase(final String name) {
+    public DynaBeanUtilsTest(final String name) {
 
         super(name);
 
@@ -223,7 +223,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
     public void testCloneDynaBean() {
 
         // Set up an origin bean with customized properties
-        final DynaClass dynaClass = DynaBeanUtilsTestCase.createDynaClass();
+        final DynaClass dynaClass = DynaBeanUtilsTest.createDynaClass();
         DynaBean orig = null;
         try {
             orig = dynaClass.newInstance();
@@ -300,7 +300,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
     public void testCopyPropertiesDynaBean() {
 
         // Set up an origin bean with customized properties
-        final DynaClass dynaClass = DynaBeanUtilsTestCase.createDynaClass();
+        final DynaClass dynaClass = DynaBeanUtilsTest.createDynaClass();
         DynaBean orig = null;
         try {
             orig = dynaClass.newInstance();
diff --git 
a/src/test/java/org/apache/commons/beanutils/DynaPropertyTestCase.java 
b/src/test/java/org/apache/commons/beanutils/DynaPropertyTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/beanutils/DynaPropertyTestCase.java
rename to src/test/java/org/apache/commons/beanutils/DynaPropertyTest.java
index 98a1df0e..80ee5dc5 100644
--- a/src/test/java/org/apache/commons/beanutils/DynaPropertyTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/DynaPropertyTest.java
@@ -26,7 +26,7 @@ import junit.framework.TestSuite;
  * Test case for {@link DynaProperty}.
  *
  */
-public class DynaPropertyTestCase extends TestCase {
+public class DynaPropertyTest extends TestCase {
 
     /**
      * Return the tests included in this test suite.
@@ -34,7 +34,7 @@ public class DynaPropertyTestCase extends TestCase {
      */
     public static Test suite() {
 
-        return new TestSuite(DynaPropertyTestCase.class);
+        return new TestSuite(DynaPropertyTest.class);
 
     }
     private DynaProperty testPropertyWithName;
@@ -50,7 +50,7 @@ public class DynaPropertyTestCase extends TestCase {
      *
      * @param name Name of the test case
      */
-    public DynaPropertyTestCase(final String name) {
+    public DynaPropertyTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/DynaPropertyUtilsTestCase.java 
b/src/test/java/org/apache/commons/beanutils/DynaPropertyUtilsTest.java
similarity index 99%
rename from 
src/test/java/org/apache/commons/beanutils/DynaPropertyUtilsTestCase.java
rename to src/test/java/org/apache/commons/beanutils/DynaPropertyUtilsTest.java
index 9adc4a07..14caa834 100644
--- a/src/test/java/org/apache/commons/beanutils/DynaPropertyUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/DynaPropertyUtilsTest.java
@@ -32,14 +32,14 @@ import junit.framework.TestSuite;
  *
  */
 
-public class DynaPropertyUtilsTestCase extends TestCase {
+public class DynaPropertyUtilsTest extends TestCase {
 
     /**
      * Return the tests included in this test suite.
      */
     public static Test suite() {
 
-        return new TestSuite(DynaPropertyUtilsTestCase.class);
+        return new TestSuite(DynaPropertyUtilsTest.class);
 
     }
 
@@ -83,7 +83,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
      *
      * @param name Name of the test case
      */
-    public DynaPropertyUtilsTestCase(final String name) {
+    public DynaPropertyUtilsTest(final String name) {
 
         super(name);
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/DynaResultSetTestCase.java 
b/src/test/java/org/apache/commons/beanutils/DynaResultSetTest.java
similarity index 98%
rename from 
src/test/java/org/apache/commons/beanutils/DynaResultSetTestCase.java
rename to src/test/java/org/apache/commons/beanutils/DynaResultSetTest.java
index 05ddde4c..600b3239 100644
--- a/src/test/java/org/apache/commons/beanutils/DynaResultSetTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/DynaResultSetTest.java
@@ -29,14 +29,14 @@ import junit.framework.TestSuite;
  *
  */
 
-public class DynaResultSetTestCase extends TestCase {
+public class DynaResultSetTest extends TestCase {
 
     /**
      * Return the tests included in this test suite.
      */
     public static Test suite() {
 
-        return new TestSuite(DynaResultSetTestCase.class);
+        return new TestSuite(DynaResultSetTest.class);
 
     }
 
@@ -63,7 +63,7 @@ public class DynaResultSetTestCase extends TestCase {
      *
      * @param name Name of the test case
      */
-    public DynaResultSetTestCase(final String name) {
+    public DynaResultSetTest(final String name) {
 
         super(name);
 
diff --git a/src/test/java/org/apache/commons/beanutils/DynaRowSetTestCase.java 
b/src/test/java/org/apache/commons/beanutils/DynaRowSetTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/beanutils/DynaRowSetTestCase.java
rename to src/test/java/org/apache/commons/beanutils/DynaRowSetTest.java
index 657a1f74..68059ba8 100644
--- a/src/test/java/org/apache/commons/beanutils/DynaRowSetTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/DynaRowSetTest.java
@@ -32,7 +32,7 @@ import junit.framework.TestSuite;
  *
  */
 
-public class DynaRowSetTestCase extends TestCase {
+public class DynaRowSetTest extends TestCase {
 
     private static class CustomTimestamp {
         private final long timestamp = new java.util.Date().getTime();
@@ -102,7 +102,7 @@ public class DynaRowSetTestCase extends TestCase {
      */
     public static Test suite() {
 
-        return new TestSuite(DynaRowSetTestCase.class);
+        return new TestSuite(DynaRowSetTest.class);
 
     }
 
@@ -129,7 +129,7 @@ public class DynaRowSetTestCase extends TestCase {
      *
      * @param name Name of the test case
      */
-    public DynaRowSetTestCase(final String name) {
+    public DynaRowSetTest(final String name) {
 
         super(name);
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/FluentPropertyBeanIntrospectorTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/FluentPropertyBeanIntrospectorTest.java
similarity index 98%
rename from 
src/test/java/org/apache/commons/beanutils/FluentPropertyBeanIntrospectorTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/FluentPropertyBeanIntrospectorTest.java
index 74267cf9..94e111c2 100644
--- 
a/src/test/java/org/apache/commons/beanutils/FluentPropertyBeanIntrospectorTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/FluentPropertyBeanIntrospectorTest.java
@@ -28,7 +28,7 @@ import junit.framework.TestCase;
  * Test class for {@code FluentPropertyBeanIntrospector}.
  *
  */
-public class FluentPropertyBeanIntrospectorTestCase extends TestCase {
+public class FluentPropertyBeanIntrospectorTest extends TestCase {
     public static final class CapsBean {
         private URI mURI;
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/IndexedPropertyTestCase.java 
b/src/test/java/org/apache/commons/beanutils/IndexedPropertyTest.java
similarity index 99%
rename from 
src/test/java/org/apache/commons/beanutils/IndexedPropertyTestCase.java
rename to src/test/java/org/apache/commons/beanutils/IndexedPropertyTest.java
index 4e72826c..6273ed1d 100644
--- a/src/test/java/org/apache/commons/beanutils/IndexedPropertyTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/IndexedPropertyTest.java
@@ -36,7 +36,7 @@ import org.junit.jupiter.api.Test;
  *
  */
 
-public class IndexedPropertyTestCase {
+public class IndexedPropertyTest {
 
     /**
      * The test bean for each test.
diff --git 
a/src/test/java/org/apache/commons/beanutils/LazyDynaBeanTestCase.java 
b/src/test/java/org/apache/commons/beanutils/LazyDynaBeanTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/beanutils/LazyDynaBeanTestCase.java
rename to src/test/java/org/apache/commons/beanutils/LazyDynaBeanTest.java
index 38d931d8..aa69eec9 100644
--- a/src/test/java/org/apache/commons/beanutils/LazyDynaBeanTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/LazyDynaBeanTest.java
@@ -30,7 +30,7 @@ import junit.framework.TestSuite;
  * <p>Test Case for the {@code LazyDynaBean} implementation class.</p>
  *
  */
-public class LazyDynaBeanTestCase extends TestCase {
+public class LazyDynaBeanTest extends TestCase {
 
     /**
      * Run thus Test
@@ -42,7 +42,7 @@ public class LazyDynaBeanTestCase extends TestCase {
      * Return the tests included in this test suite.
      */
     public static Test suite() {
-        return new TestSuite(LazyDynaBeanTestCase.class);
+        return new TestSuite(LazyDynaBeanTest.class);
     }
     protected LazyDynaBean  bean;
     protected LazyDynaClass dynaClass;
@@ -62,7 +62,7 @@ public class LazyDynaBeanTestCase extends TestCase {
      *
      * @param name Name of the test case
      */
-    public LazyDynaBeanTestCase(final String name) {
+    public LazyDynaBeanTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/LazyDynaClassTestCase.java 
b/src/test/java/org/apache/commons/beanutils/LazyDynaClassTest.java
similarity index 98%
rename from 
src/test/java/org/apache/commons/beanutils/LazyDynaClassTestCase.java
rename to src/test/java/org/apache/commons/beanutils/LazyDynaClassTest.java
index 3f5e701b..3afd2f30 100644
--- a/src/test/java/org/apache/commons/beanutils/LazyDynaClassTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/LazyDynaClassTest.java
@@ -24,7 +24,7 @@ import junit.framework.TestSuite;
  * <p>Test Case for the {@code LazyDynaClass} implementation class.</p>
  *
  */
-public class LazyDynaClassTestCase extends TestCase {
+public class LazyDynaClassTest extends TestCase {
 
     /**
      * Run this Test
@@ -36,7 +36,7 @@ public class LazyDynaClassTestCase extends TestCase {
      * Return the tests included in this test suite.
      */
     public static Test suite() {
-        return new TestSuite(LazyDynaClassTestCase.class);
+        return new TestSuite(LazyDynaClassTest.class);
     }
 
     protected LazyDynaClass dynaClass;
@@ -48,7 +48,7 @@ public class LazyDynaClassTestCase extends TestCase {
      *
      * @param name Name of the test case
      */
-    public LazyDynaClassTestCase(final String name) {
+    public LazyDynaClassTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/LazyDynaListTestCase.java 
b/src/test/java/org/apache/commons/beanutils/LazyDynaListTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/beanutils/LazyDynaListTestCase.java
rename to src/test/java/org/apache/commons/beanutils/LazyDynaListTest.java
index 10d8fac4..4cf7936a 100644
--- a/src/test/java/org/apache/commons/beanutils/LazyDynaListTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/LazyDynaListTest.java
@@ -34,7 +34,7 @@ import junit.framework.TestSuite;
  * <p>Test Case for the {@code LazyDynaList}class.</p>
  *
  */
-public class LazyDynaListTestCase extends TestCase {
+public class LazyDynaListTest extends TestCase {
 
     private static final String BASIC_PROP1 = "BasicDynaClass_Property1";
     private static final String BASIC_PROP2 = "BasicDynaClass_Property2";
@@ -50,7 +50,7 @@ public class LazyDynaListTestCase extends TestCase {
      * Return the tests included in this test suite.
      */
     public static Test suite() {
-        return new TestSuite(LazyDynaListTestCase.class);
+        return new TestSuite(LazyDynaListTest.class);
     }
     protected DynaProperty[] properties = {
                                                new DynaProperty(BASIC_PROP1, 
String.class),
@@ -67,7 +67,7 @@ public class LazyDynaListTestCase extends TestCase {
      *
      * @param name Name of the test case
      */
-    public LazyDynaListTestCase(final String name) {
+    public LazyDynaListTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/LazyDynaMapTestCase.java 
b/src/test/java/org/apache/commons/beanutils/LazyDynaMapTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/beanutils/LazyDynaMapTestCase.java
rename to src/test/java/org/apache/commons/beanutils/LazyDynaMapTest.java
index 0f97ac1c..6a744d6e 100644
--- a/src/test/java/org/apache/commons/beanutils/LazyDynaMapTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/LazyDynaMapTest.java
@@ -32,7 +32,7 @@ import junit.framework.TestSuite;
  * <p>Test Case for the {@code LazyDynaMap} implementation class.</p>
  *
  */
-public class LazyDynaMapTestCase extends TestCase {
+public class LazyDynaMapTest extends TestCase {
 
     /**
      * Run thus Test
@@ -44,7 +44,7 @@ public class LazyDynaMapTestCase extends TestCase {
      * Return the tests included in this test suite.
      */
     public static Test suite() {
-        return new TestSuite(LazyDynaMapTestCase.class);
+        return new TestSuite(LazyDynaMapTest.class);
     }
     protected LazyDynaMap  dynaMap;
     protected String testProperty     = "myProperty";
@@ -63,7 +63,7 @@ public class LazyDynaMapTestCase extends TestCase {
      *
      * @param name Name of the test case
      */
-    public LazyDynaMapTestCase(final String name) {
+    public LazyDynaMapTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/MappedPropertyTestCase.java 
b/src/test/java/org/apache/commons/beanutils/MappedPropertyTest.java
similarity index 98%
rename from 
src/test/java/org/apache/commons/beanutils/MappedPropertyTestCase.java
rename to src/test/java/org/apache/commons/beanutils/MappedPropertyTest.java
index b195012a..26a8e8da 100644
--- a/src/test/java/org/apache/commons/beanutils/MappedPropertyTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/MappedPropertyTest.java
@@ -24,7 +24,7 @@ import junit.framework.TestSuite;
  * <p>Test Case for the {@code MappedPropertyDescriptor}.</p>
  *
  */
-public class MappedPropertyTestCase extends TestCase {
+public class MappedPropertyTest extends TestCase {
 
     /**
      * Run this Test
@@ -37,7 +37,7 @@ public class MappedPropertyTestCase extends TestCase {
      * Return the tests included in this test suite.
      */
     public static Test suite() {
-        return new TestSuite(MappedPropertyTestCase.class);
+        return new TestSuite(MappedPropertyTest.class);
     }
 
     /**
@@ -45,7 +45,7 @@ public class MappedPropertyTestCase extends TestCase {
      *
      * @param name Name of the test case
      */
-    public MappedPropertyTestCase(final String name) {
+    public MappedPropertyTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/MethodUtilsTestCase.java 
b/src/test/java/org/apache/commons/beanutils/MethodUtilsTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/beanutils/MethodUtilsTestCase.java
rename to src/test/java/org/apache/commons/beanutils/MethodUtilsTest.java
index bac65450..32e140a5 100644
--- a/src/test/java/org/apache/commons/beanutils/MethodUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/MethodUtilsTest.java
@@ -32,7 +32,7 @@ import junit.framework.TestSuite;
  * <p> Test case for {@code MethodUtils} </p>
  *
  */
-public class MethodUtilsTestCase extends TestCase {
+public class MethodUtilsTest extends TestCase {
 
     private static void assertMethod(final Method method, final String 
methodName) {
         assertNotNull(method);
@@ -46,7 +46,7 @@ public class MethodUtilsTestCase extends TestCase {
      * Return the tests included in this test suite.
      */
     public static Test suite() {
-        return new TestSuite(MethodUtilsTestCase.class);
+        return new TestSuite(MethodUtilsTest.class);
     }
 
     /**
@@ -54,7 +54,7 @@ public class MethodUtilsTestCase extends TestCase {
      *
      * @param name Name of the test case
      */
-    public MethodUtilsTestCase(final String name) {
+    public MethodUtilsTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/PropertyUtilsTestCase.java 
b/src/test/java/org/apache/commons/beanutils/PropertyUtilsTest.java
similarity index 99%
rename from 
src/test/java/org/apache/commons/beanutils/PropertyUtilsTestCase.java
rename to src/test/java/org/apache/commons/beanutils/PropertyUtilsTest.java
index 4eb2cea4..d052b3d1 100644
--- a/src/test/java/org/apache/commons/beanutils/PropertyUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/PropertyUtilsTest.java
@@ -64,7 +64,7 @@ import junit.framework.TestSuite;
  *
  */
 
-public class PropertyUtilsTestCase extends TestCase {
+public class PropertyUtilsTest extends TestCase {
 
     /**
      * The fully qualified class name of our private directly
@@ -133,7 +133,7 @@ public class PropertyUtilsTestCase extends TestCase {
      */
     public static Test suite() {
 
-        return new TestSuite(PropertyUtilsTestCase.class);
+        return new TestSuite(PropertyUtilsTest.class);
 
     }
 
@@ -192,7 +192,7 @@ public class PropertyUtilsTestCase extends TestCase {
      *
      * @param name Name of the test case
      */
-    public PropertyUtilsTestCase(final String name) {
+    public PropertyUtilsTest(final String name) {
 
         super(name);
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/SuppressPropertiesBeanIntrospectorTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/SuppressPropertiesBeanIntrospectorTest.java
similarity index 98%
rename from 
src/test/java/org/apache/commons/beanutils/SuppressPropertiesBeanIntrospectorTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/SuppressPropertiesBeanIntrospectorTest.java
index df594628..47cd9431 100644
--- 
a/src/test/java/org/apache/commons/beanutils/SuppressPropertiesBeanIntrospectorTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/SuppressPropertiesBeanIntrospectorTest.java
@@ -29,7 +29,7 @@ import junit.framework.TestCase;
  * Test class for {@code SuppressPropertiesBeanIntrospector}.
  *
  */
-public class SuppressPropertiesBeanIntrospectorTestCase extends TestCase {
+public class SuppressPropertiesBeanIntrospectorTest extends TestCase {
     /**
      * A test implementation of IntrospectionContext which collects the 
properties which
      * have been removed.
diff --git 
a/src/test/java/org/apache/commons/beanutils/WrapDynaBeanTestCase.java 
b/src/test/java/org/apache/commons/beanutils/WrapDynaBeanTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/beanutils/WrapDynaBeanTestCase.java
rename to src/test/java/org/apache/commons/beanutils/WrapDynaBeanTest.java
index 7daede3f..9e7df30f 100644
--- a/src/test/java/org/apache/commons/beanutils/WrapDynaBeanTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/WrapDynaBeanTest.java
@@ -37,7 +37,7 @@ import org.junit.jupiter.api.Test;
  * classes provide similar levels of functionality.
  * </p>
  */
-public class WrapDynaBeanTestCase extends BasicDynaBeanTestCase {
+public class WrapDynaBeanTest extends BasicDynaBeanTest {
 
     /**
      * Helper method for testing whether basic access to properties works as 
expected.
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira157TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira157Test.java
similarity index 96%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira157TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira157Test.java
index 0002fabe..58e2749a 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira157TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira157Test.java
@@ -36,7 +36,7 @@ import junit.framework.TestSuite;
  * @see <a
  *      
href="https://issues.apache.org/jira/browse/BEANUTILS-157";>https://issues.apache.org/jira/browse/BEANUTILS-157<a/>
  */
-public class Jira157TestCase extends TestCase {
+public class Jira157Test extends TestCase {
 
     public static class FooBar {
         String getPackageFoo() {
@@ -74,17 +74,17 @@ public class Jira157TestCase extends TestCase {
      * @return a test suite
      */
     public static Test suite() {
-        return new TestSuite(Jira157TestCase.class);
+        return new TestSuite(Jira157Test.class);
     }
 
-    private final Log log = LogFactory.getLog(Jira157TestCase.class);
+    private final Log log = LogFactory.getLog(Jira157Test.class);
 
     /**
      * Create a test case with the specified name.
      *
      * @param name The name of the test
      */
-    public Jira157TestCase(final String name) {
+    public Jira157Test(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira18TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira18Test.java
similarity index 97%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira18TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira18Test.java
index d8bdd840..5f699d90 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira18TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira18Test.java
@@ -32,7 +32,7 @@ import junit.framework.TestSuite;
  *
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-18";>https://issues.apache.org/jira/browse/BEANUTILS-18</a>
  */
-public class Jira18TestCase extends TestCase {
+public class Jira18Test extends TestCase {
 
     /**
      * Run the Test.
@@ -48,10 +48,10 @@ public class Jira18TestCase extends TestCase {
      * @return a test suite
      */
     public static Test suite() {
-        return new TestSuite(Jira18TestCase.class);
+        return new TestSuite(Jira18Test.class);
     }
 
-    private final Log log = LogFactory.getLog(Jira18TestCase.class);
+    private final Log log = LogFactory.getLog(Jira18Test.class);
 
     private Object bean;
 
@@ -60,7 +60,7 @@ public class Jira18TestCase extends TestCase {
      *
      * @param name The name of the test
      */
-    public Jira18TestCase(final String name) {
+    public Jira18Test(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira273TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira273Test.java
similarity index 96%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira273TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira273Test.java
index 172d9d17..3c5805ec 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira273TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira273Test.java
@@ -31,7 +31,7 @@ import junit.framework.TestSuite;
  *
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-273";>https://issues.apache.org/jira/browse/BEANUTILS-273</a>
  */
-public class Jira273TestCase extends TestCase {
+public class Jira273Test extends TestCase {
 
     /**
      * Run the Test.
@@ -48,17 +48,17 @@ public class Jira273TestCase extends TestCase {
      * @return a test suite
      */
     public static Test suite() {
-        return new TestSuite(Jira273TestCase.class);
+        return new TestSuite(Jira273Test.class);
     }
 
-    private final Log log = LogFactory.getLog(Jira273TestCase.class);
+    private final Log log = LogFactory.getLog(Jira273Test.class);
 
     /**
      * Create a test case with the specified name.
      *
      * @param name The name of the test
      */
-    public Jira273TestCase(final String name) {
+    public Jira273Test(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira298TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira298Test.java
similarity index 94%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira298TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira298Test.java
index 0e670dd4..af3b59e8 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira298TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira298Test.java
@@ -32,7 +32,7 @@ import junit.framework.TestSuite;
 /**
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-298";>https://issues.apache.org/jira/browse/BEANUTILS-298</a>
  */
-public class Jira298TestCase extends TestCase {
+public class Jira298Test extends TestCase {
 
     /**
      * Run the Test.
@@ -49,17 +49,17 @@ public class Jira298TestCase extends TestCase {
      * @return a test suite
      */
     public static Test suite() {
-        return new TestSuite(Jira298TestCase.class);
+        return new TestSuite(Jira298Test.class);
     }
 
-    private final Log log = LogFactory.getLog(Jira298TestCase.class);
+    private final Log log = LogFactory.getLog(Jira298Test.class);
 
     /**
      * Create a test case with the specified name.
      *
      * @param name The name of the test
      */
-    public Jira298TestCase(final String name) {
+    public Jira298Test(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira339TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira339Test.java
similarity index 94%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira339TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira339Test.java
index 7a026b50..7f226f48 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira339TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira339Test.java
@@ -32,7 +32,7 @@ import junit.framework.TestSuite;
 /**
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-339";>https://issues.apache.org/jira/browse/BEANUTILS-339</a>
  */
-public class Jira339TestCase extends TestCase {
+public class Jira339Test extends TestCase {
 
     /**
      * Test Bean.
@@ -75,17 +75,17 @@ public class Jira339TestCase extends TestCase {
      * @return a test suite
      */
     public static Test suite() {
-        return new TestSuite(Jira339TestCase.class);
+        return new TestSuite(Jira339Test.class);
     }
 
-    private final Log log = LogFactory.getLog(Jira339TestCase.class);
+    private final Log log = LogFactory.getLog(Jira339Test.class);
 
     /**
      * Create a test case with the specified name.
      *
      * @param name The name of the test
      */
-    public Jira339TestCase(final String name) {
+    public Jira339Test(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira345TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira345Test.java
similarity index 95%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira345TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira345Test.java
index 39ca142a..8787547a 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira345TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira345Test.java
@@ -25,7 +25,7 @@ import junit.framework.TestSuite;
 /**
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-345";>https://issues.apache.org/jira/browse/BEANUTILS-345</a>
  */
-public class Jira345TestCase extends TestCase {
+public class Jira345Test extends TestCase {
 
     /** Example Bean */
     public static class MyBean {
@@ -66,7 +66,7 @@ public class Jira345TestCase extends TestCase {
      * @return a test suite
      */
     public static Test suite() {
-        return new TestSuite(Jira345TestCase.class);
+        return new TestSuite(Jira345Test.class);
     }
 
     /**
@@ -74,7 +74,7 @@ public class Jira345TestCase extends TestCase {
      *
      * @param name The name of the test
      */
-    public Jira345TestCase(final String name) {
+    public Jira345Test(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira347TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira347Test.java
similarity index 97%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira347TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira347Test.java
index fd37fde0..2fbff3aa 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira347TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira347Test.java
@@ -25,7 +25,7 @@ import java.net.URLClassLoader;
 import java.util.ArrayList;
 
 import org.apache.commons.beanutils.MappedPropertyDescriptor;
-import org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase;
+import org.apache.commons.beanutils.memoryleaktests.MemoryLeakTest;
 
 import junit.framework.TestCase;
 
@@ -34,14 +34,14 @@ import junit.framework.TestCase;
  *
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-347";>https://issues.apache.org/jira/browse/BEANUTILS-347</a>
  */
-public class Jira347TestCase extends TestCase {
+public class Jira347Test extends TestCase {
 
     /**
      * Create a new class loader instance.
      */
     private static URLClassLoader newClassLoader() throws 
MalformedURLException {
 
-        final String dataFilePath = 
MemoryLeakTestCase.class.getResource("pojotests").getFile();
+        final String dataFilePath = 
MemoryLeakTest.class.getResource("pojotests").getFile();
         //System.out.println("dataFilePath: " + dataFilePath);
         final String location = "file://" + 
dataFilePath.substring(0,dataFilePath.length()-"org.apache.commons.beanutils.memoryleaktests.pojotests".length());
         //System.out.println("location: " + location);
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira349TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira349Test.java
similarity index 93%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira349TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira349Test.java
index a90a4daf..2ea85a09 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira349TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira349Test.java
@@ -27,7 +27,7 @@ import junit.framework.TestSuite;
 /**
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-349";>https://issues.apache.org/jira/browse/BEANUTILS-349</a>
  */
-public class Jira349TestCase extends TestCase {
+public class Jira349Test extends TestCase {
 
     /**
      * Test Bean with a Boolean object property.
@@ -70,17 +70,17 @@ public class Jira349TestCase extends TestCase {
      * @return a test suite
      */
     public static Test suite() {
-        return new TestSuite(Jira349TestCase.class);
+        return new TestSuite(Jira349Test.class);
     }
 
-    private final Log log = LogFactory.getLog(Jira349TestCase .class);
+    private final Log log = LogFactory.getLog(Jira349Test .class);
 
     /**
      * Create a test case with the specified name.
      *
      * @param name The name of the test
      */
-    public Jira349TestCase(final String name) {
+    public Jira349Test(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira357TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira357Test.java
similarity index 97%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira357TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira357Test.java
index 3fff1ba6..1862671b 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira357TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira357Test.java
@@ -27,7 +27,7 @@ import junit.framework.TestSuite;
 /**
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-357";>https://issues.apache.org/jira/browse/BEANUTILS-357</a>
  */
-public class Jira357TestCase extends TestCase {
+public class Jira357Test extends TestCase {
 
     /**
      * Abstract test bean.
@@ -103,7 +103,7 @@ public class Jira357TestCase extends TestCase {
      * @return a test suite
      */
     public static Test suite() {
-        return new TestSuite(Jira357TestCase.class);
+        return new TestSuite(Jira357Test.class);
     }
 
     /**
@@ -111,7 +111,7 @@ public class Jira357TestCase extends TestCase {
      *
      * @param name The name of the test
      */
-    public Jira357TestCase(final String name) {
+    public Jira357Test(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira358TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira358Test.java
similarity index 95%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira358TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira358Test.java
index 1ce89612..84695a2d 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira358TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira358Test.java
@@ -26,7 +26,7 @@ import junit.framework.TestSuite;
 /**
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-358";>https://issues.apache.org/jira/browse/BEANUTILS-358</a>
  */
-public class Jira358TestCase extends TestCase {
+public class Jira358Test extends TestCase {
 
     /**
      * Run the Test.
@@ -43,7 +43,7 @@ public class Jira358TestCase extends TestCase {
      * @return a test suite
      */
     public static Test suite() {
-        return new TestSuite(Jira358TestCase.class);
+        return new TestSuite(Jira358Test.class);
     }
 
     /**
@@ -51,7 +51,7 @@ public class Jira358TestCase extends TestCase {
      *
      * @param name The name of the test
      */
-    public Jira358TestCase(final String name) {
+    public Jira358Test(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira359TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira359Test.java
similarity index 97%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira359TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira359Test.java
index c379fb1e..acbd7fcb 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira359TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira359Test.java
@@ -28,7 +28,7 @@ import junit.framework.TestSuite;
 /**
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-359";>https://issues.apache.org/jira/browse/BEANUTILS-359</a>
  */
-public class Jira359TestCase extends TestCase {
+public class Jira359Test extends TestCase {
 
     public static class SimplePojoData {
         private String[] jcrMixinTypes = new String[1];
@@ -57,7 +57,7 @@ public class Jira359TestCase extends TestCase {
      * @return a test suite
      */
     public static Test suite() {
-        return new TestSuite(Jira359TestCase.class);
+        return new TestSuite(Jira359Test.class);
     }
 
     /**
@@ -65,7 +65,7 @@ public class Jira359TestCase extends TestCase {
      *
      * @param name The name of the test
      */
-    public Jira359TestCase(final String name) {
+    public Jira359Test(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira368TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira368Test.java
similarity index 94%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira368TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira368Test.java
index 7d2784ad..0df39de7 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira368TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira368Test.java
@@ -25,7 +25,7 @@ import junit.framework.TestSuite;
 /**
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-368";>https://issues.apache.org/jira/browse/BEANUTILS-368</a>
  */
-public class Jira368TestCase extends TestCase {
+public class Jira368Test extends TestCase {
 
     /**
      * Run the Test.
@@ -42,7 +42,7 @@ public class Jira368TestCase extends TestCase {
      * @return a test suite
      */
     public static Test suite() {
-        return new TestSuite(Jira368TestCase.class);
+        return new TestSuite(Jira368Test.class);
     }
 
     /**
@@ -50,7 +50,7 @@ public class Jira368TestCase extends TestCase {
      *
      * @param name The name of the test
      */
-    public Jira368TestCase(final String name) {
+    public Jira368Test(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira369TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira369Test.java
similarity index 96%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira369TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira369Test.java
index 0b509180..18961654 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira369TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira369Test.java
@@ -25,7 +25,7 @@ import junit.framework.TestSuite;
 /**
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-369";>https://issues.apache.org/jira/browse/BEANUTILS-369</a>
  */
-public class Jira369TestCase extends TestCase {
+public class Jira369Test extends TestCase {
 
     /**
      * Test Bean
@@ -66,7 +66,7 @@ public class Jira369TestCase extends TestCase {
      * @return a test suite
      */
     public static Test suite() {
-        return new TestSuite(Jira369TestCase.class);
+        return new TestSuite(Jira369Test.class);
     }
 
     /**
@@ -74,7 +74,7 @@ public class Jira369TestCase extends TestCase {
      *
      * @param name The name of the test
      */
-    public Jira369TestCase(final String name) {
+    public Jira369Test(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira381TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira381Test.java
similarity index 96%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira381TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira381Test.java
index 04068809..5b8d14f9 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira381TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira381Test.java
@@ -28,7 +28,7 @@ import junit.framework.TestCase;
  *
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-381";>https://issues.apache.org/jira/browse/BEANUTILS-381</a>
  */
-public class Jira381TestCase extends TestCase {
+public class Jira381Test extends TestCase {
 
     /**
      * Test object.
@@ -66,7 +66,7 @@ public class Jira381TestCase extends TestCase {
      *
      * @param name The name of the test
      */
-    public Jira381TestCase(final String name) {
+    public Jira381Test(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira411TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira411Test.java
similarity index 97%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira411TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira411Test.java
index 6efa0931..1636bdff 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira411TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira411Test.java
@@ -26,7 +26,7 @@ import junit.framework.TestCase;
  *
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-411";>https://issues.apache.org/jira/browse/BEANUTILS-411</a>
  */
-public class Jira411TestCase extends TestCase {
+public class Jira411Test extends TestCase {
 
     public class DummyBean {
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira422TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira422Test.java
similarity index 97%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira422TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira422Test.java
index 536091d8..99a9f66b 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira422TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira422Test.java
@@ -38,12 +38,12 @@ class FirstChildBean extends RootBean {
 /**
  * getPropertyType return null on second descendant class
  * <p>
- * This test only work in Java 7 or earlier (See BEANUTILS-492) - as a weaker 
alternative, see {@link Jira422bTestCase}.
+ * This test only work in Java 7 or earlier (See BEANUTILS-492) - as a weaker 
alternative, see {@link Jira422bTest}.
  *
  *
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-422";>https://issues.apache.org/jira/browse/BEANUTILS-422</a>
  */
-public class Jira422TestCase {
+public class Jira422Test {
 
     /**
      * Detects BEANUTILS-492 in Java 8 or later
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira422bTestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira422bTest.java
similarity index 95%
rename from 
src/test/java/org/apache/commons/beanutils/bugs/Jira422bTestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira422bTest.java
index 257f890f..33dabd0c 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira422bTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira422bTest.java
@@ -25,12 +25,12 @@ class FirstChildBeanB extends RootBeanB {
 }
 
 /**
- * Variant of {@link Jira422TestCase} that is compatible with BEANUTILS-492
+ * Variant of {@link Jira422Test} that is compatible with BEANUTILS-492
  *
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-422";>BEANUTILS-422</a>
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-492";>BEANUTILS-492</a>
  */
-public class Jira422bTestCase {
+public class Jira422bTest {
 
     @Test
     public void testRootBean() throws Exception {
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira454TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira454Test.java
similarity index 97%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira454TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira454Test.java
index f66923b5..8f93291a 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira454TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira454Test.java
@@ -27,7 +27,7 @@ import junit.framework.TestCase;
  * when the field is a java.util.Date with a null value
  *
  */
-public class Jira454TestCase extends TestCase {
+public class Jira454Test extends TestCase {
     public static class TestBean {
         private Date createdAt;
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira456TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira456Test.java
similarity index 98%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira456TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira456Test.java
index 88f3db30..ab04f783 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira456TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira456Test.java
@@ -30,7 +30,7 @@ import junit.framework.TestCase;
  * BEANUTILS-456</a>.
  *
  */
-public class Jira456TestCase extends TestCase {
+public class Jira456Test extends TestCase {
     /** Constant for the name of the test property. */
     private static final String TEST_PROP = "fluentGetProperty";
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira458TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira458Test.java
similarity index 97%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira458TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira458Test.java
index 981b2f33..22ee8d4f 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira458TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira458Test.java
@@ -29,7 +29,7 @@ import junit.framework.TestCase;
  *
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-458";>https://issues.apache.org/jira/browse/BEANUTILS-458</a>
  */
-public class Jira458TestCase extends TestCase {
+public class Jira458Test extends TestCase {
     /**
      * Helper method for testing a conversion with null as default.
      *
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira463TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira463Test.java
similarity index 97%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira463TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira463Test.java
index 8b05c9d7..b6a20091 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira463TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira463Test.java
@@ -27,7 +27,7 @@ import junit.framework.TestCase;
  *
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-463";>https://issues.apache.org/jira/browse/BEANUTILS-463</a>
  */
-public class Jira463TestCase extends TestCase {
+public class Jira463Test extends TestCase {
     /**
      * Tests that with a specialized {@code BeanIntrospector} implementation 
the class
      * property can be suppressed.
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira465TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira465Test.java
similarity index 98%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira465TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira465Test.java
index 517404f1..c25379eb 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira465TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira465Test.java
@@ -30,7 +30,7 @@ import junit.framework.TestCase;
  * @see <a
  * 
href="https://issues.apache.org/jira/browse/BEANUTILS-465";>https://issues.apache.org/jira/browse/BEANUTILS-465</a>
  */
-public class Jira465TestCase extends TestCase {
+public class Jira465Test extends TestCase {
     public static class ArrayIndexedProp {
         private final Object[] foo = { OLD_VALUE };
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira492TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira492Test.java
similarity index 99%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira492TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira492Test.java
index 0e353a94..5b84ec87 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira492TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira492Test.java
@@ -40,7 +40,7 @@ import org.junit.jupiter.api.Test;
  *
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-492";>BEANUTILS-492</a>
  */
-public class Jira492TestCase {
+public class Jira492Test {
 
     private final BeanUtilsBean beanUtils = new BeanUtilsBean();
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira493TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira493Test.java
similarity index 98%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira493TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira493Test.java
index d947c389..84fae338 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira493TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira493Test.java
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test;
  *
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-493";>BEANUTILS-493</a>
  */
-public class Jira493TestCase {
+public class Jira493Test {
 
     @Test
     public void testIndexedProperties() throws Exception {
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira520TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira520Test.java
similarity index 97%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira520TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira520Test.java
index 4677815b..11ac1429 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira520TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira520Test.java
@@ -27,7 +27,7 @@ import junit.framework.TestCase;
  *
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-520";>https://issues.apache.org/jira/browse/BEANUTILS-520</a>
  */
-public class Jira520TestCase extends TestCase {
+public class Jira520Test extends TestCase {
 
     /**
      * Allow opt-out to make your app less secure but allow access to "class".
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira541TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira541Test.java
similarity index 99%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira541TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira541Test.java
index c52e4dc1..f7e67cc0 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira541TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira541Test.java
@@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test;
  *
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-541";>https://issues.apache.org/jira/browse/BEANUTILS-541</a>
  */
-public class Jira541TestCase {
+public class Jira541Test {
 
     public static class BaseType {
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira61TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira61Test.java
similarity index 98%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira61TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira61Test.java
index b5f6f217..76eeb955 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira61TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira61Test.java
@@ -42,7 +42,7 @@ import junit.framework.TestSuite;
  *
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-61";>https://issues.apache.org/jira/browse/BEANUTILS-61</a>
  */
-public class Jira61TestCase extends TestCase {
+public class Jira61Test extends TestCase {
 
     /**
      * Run the Test.
@@ -58,9 +58,9 @@ public class Jira61TestCase extends TestCase {
      * @return a test suite
      */
     public static Test suite() {
-        return new TestSuite(Jira61TestCase.class);
+        return new TestSuite(Jira61Test.class);
     }
-    private final Log log = LogFactory.getLog(Jira61TestCase.class);
+    private final Log log = LogFactory.getLog(Jira61Test.class);
 
     private Jira61BeanFactory.TestBean testBean;
 
@@ -71,7 +71,7 @@ public class Jira61TestCase extends TestCase {
      *
      * @param name The name of the test
      */
-    public Jira61TestCase(final String name) {
+    public Jira61Test(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira87TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira87Test.java
similarity index 93%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira87TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira87Test.java
index 782b2021..d5fefdc5 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira87TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira87Test.java
@@ -39,7 +39,7 @@ import junit.framework.TestSuite;
  *
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-87";>https://issues.apache.org/jira/browse/BEANUTILS-87</a>
  */
-public class Jira87TestCase extends TestCase {
+public class Jira87Test extends TestCase {
 
     /**
      * Run the Test.
@@ -56,17 +56,17 @@ public class Jira87TestCase extends TestCase {
      * @return a test suite
      */
     public static Test suite() {
-        return new TestSuite(Jira87TestCase.class);
+        return new TestSuite(Jira87Test.class);
     }
 
-    private final Log log = LogFactory.getLog(Jira87TestCase.class);
+    private final Log log = LogFactory.getLog(Jira87Test.class);
 
     /**
      * Create a test case with the specified name.
      *
      * @param name The name of the test
      */
-    public Jira87TestCase(final String name) {
+    public Jira87Test(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/Jira92TestCase.java 
b/src/test/java/org/apache/commons/beanutils/bugs/Jira92Test.java
similarity index 97%
rename from src/test/java/org/apache/commons/beanutils/bugs/Jira92TestCase.java
rename to src/test/java/org/apache/commons/beanutils/bugs/Jira92Test.java
index ee841a74..990d66ca 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira92TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira92Test.java
@@ -26,7 +26,7 @@ import junit.framework.TestCase;
  *
  * @see <a 
href="https://issues.apache.org/jira/browse/BEANUTILS-92";>https://issues.apache.org/jira/browse/BEANUTILS-92</a>
  */
-public class Jira92TestCase extends TestCase {
+public class Jira92Test extends TestCase {
 
     /**
      * Test bean which has only indexed setter
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/other/Jira18BeanFactory.java 
b/src/test/java/org/apache/commons/beanutils/bugs/other/Jira18BeanFactory.java
index 8f094f1a..191843d4 100644
--- 
a/src/test/java/org/apache/commons/beanutils/bugs/other/Jira18BeanFactory.java
+++ 
b/src/test/java/org/apache/commons/beanutils/bugs/other/Jira18BeanFactory.java
@@ -19,11 +19,11 @@ package org.apache.commons.beanutils.bugs.other;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.beanutils.bugs.Jira18TestCase;
+import org.apache.commons.beanutils.bugs.Jira18Test;
 
 /**
  * Factory which creates <em>package</em> scope beans with
- * public methods for {@link Jira18TestCase}.
+ * public methods for {@link Jira18Test}.
  *
  */
 public class Jira18BeanFactory {
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/other/Jira273BeanFactory.java 
b/src/test/java/org/apache/commons/beanutils/bugs/other/Jira273BeanFactory.java
index c631927a..0d3229e5 100644
--- 
a/src/test/java/org/apache/commons/beanutils/bugs/other/Jira273BeanFactory.java
+++ 
b/src/test/java/org/apache/commons/beanutils/bugs/other/Jira273BeanFactory.java
@@ -16,10 +16,10 @@
  */
 package org.apache.commons.beanutils.bugs.other;
 
-import org.apache.commons.beanutils.bugs.Jira273TestCase;
+import org.apache.commons.beanutils.bugs.Jira273Test;
 
 /**
- * Factory which creates beans for {@link Jira273TestCase}.
+ * Factory which creates beans for {@link Jira273Test}.
  *
  */
 public class Jira273BeanFactory {
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/other/Jira298BeanFactory.java 
b/src/test/java/org/apache/commons/beanutils/bugs/other/Jira298BeanFactory.java
index 0cf97dde..c214f82f 100644
--- 
a/src/test/java/org/apache/commons/beanutils/bugs/other/Jira298BeanFactory.java
+++ 
b/src/test/java/org/apache/commons/beanutils/bugs/other/Jira298BeanFactory.java
@@ -16,10 +16,10 @@
  */
 package org.apache.commons.beanutils.bugs.other;
 
-import org.apache.commons.beanutils.bugs.Jira298TestCase;
+import org.apache.commons.beanutils.bugs.Jira298Test;
 
 /**
- * Factory which creates beans for {@link Jira298TestCase}.
+ * Factory which creates beans for {@link Jira298Test}.
  *
  */
 public class Jira298BeanFactory {
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/other/Jira61BeanFactory.java 
b/src/test/java/org/apache/commons/beanutils/bugs/other/Jira61BeanFactory.java
index be606ba3..5f40af35 100644
--- 
a/src/test/java/org/apache/commons/beanutils/bugs/other/Jira61BeanFactory.java
+++ 
b/src/test/java/org/apache/commons/beanutils/bugs/other/Jira61BeanFactory.java
@@ -19,10 +19,10 @@ package org.apache.commons.beanutils.bugs.other;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.beanutils.bugs.Jira61TestCase;
+import org.apache.commons.beanutils.bugs.Jira61Test;
 
 /**
- * Factory which creates beans for {@link Jira61TestCase}.
+ * Factory which creates beans for {@link Jira61Test}.
  *
  */
 public class Jira61BeanFactory {
diff --git 
a/src/test/java/org/apache/commons/beanutils/bugs/other/Jira87BeanFactory.java 
b/src/test/java/org/apache/commons/beanutils/bugs/other/Jira87BeanFactory.java
index a9ec5818..caef0559 100644
--- 
a/src/test/java/org/apache/commons/beanutils/bugs/other/Jira87BeanFactory.java
+++ 
b/src/test/java/org/apache/commons/beanutils/bugs/other/Jira87BeanFactory.java
@@ -16,10 +16,10 @@
  */
 package org.apache.commons.beanutils.bugs.other;
 
-import org.apache.commons.beanutils.bugs.Jira87TestCase;
+import org.apache.commons.beanutils.bugs.Jira87Test;
 
 /**
- * Factory which creates beans for {@link Jira87TestCase}.
+ * Factory which creates beans for {@link Jira87Test}.
  *
  */
 public class Jira87BeanFactory {
diff --git 
a/src/test/java/org/apache/commons/beanutils/converters/BigDecimalConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/converters/BigDecimalConverterTestCase.java
index f6feb9e2..16c61ae2 100644
--- 
a/src/test/java/org/apache/commons/beanutils/converters/BigDecimalConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/converters/BigDecimalConverterTestCase.java
@@ -28,7 +28,7 @@ import junit.framework.TestSuite;
  *
  */
 
-public class BigDecimalConverterTestCase extends NumberConverterTestBase {
+public class BigDecimalConverterTestCase extends NumberConverterTest {
 
     /**
      * A class derived from {@code BigDecimal} used for testing whether
diff --git 
a/src/test/java/org/apache/commons/beanutils/converters/BigIntegerConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/converters/BigIntegerConverterTestCase.java
index 9d0fbe2f..cc6f6a41 100644
--- 
a/src/test/java/org/apache/commons/beanutils/converters/BigIntegerConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/converters/BigIntegerConverterTestCase.java
@@ -27,7 +27,7 @@ import junit.framework.TestSuite;
  * Test Case for the BigInteger class.
  *
  */
-public class BigIntegerConverterTestCase extends NumberConverterTestBase {
+public class BigIntegerConverterTestCase extends NumberConverterTest {
 
     public static TestSuite suite() {
         return new TestSuite(BigIntegerConverterTestCase.class);
diff --git 
a/src/test/java/org/apache/commons/beanutils/converters/ByteConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/converters/ByteConverterTestCase.java
index ee12576c..18a1f317 100644
--- 
a/src/test/java/org/apache/commons/beanutils/converters/ByteConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/converters/ByteConverterTestCase.java
@@ -26,7 +26,7 @@ import junit.framework.TestSuite;
  *
  */
 
-public class ByteConverterTestCase extends NumberConverterTestBase {
+public class ByteConverterTestCase extends NumberConverterTest {
 
     public static TestSuite suite() {
         return new TestSuite(ByteConverterTestCase.class);
diff --git 
a/src/test/java/org/apache/commons/beanutils/converters/CharacterConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/converters/CharacterConverterTest.java
similarity index 95%
rename from 
src/test/java/org/apache/commons/beanutils/converters/CharacterConverterTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/converters/CharacterConverterTest.java
index aa3b136b..34242d33 100644
--- 
a/src/test/java/org/apache/commons/beanutils/converters/CharacterConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/converters/CharacterConverterTest.java
@@ -26,21 +26,21 @@ import junit.framework.TestSuite;
  * Test Case for the CharacterConverter class.
  *
  */
-public class CharacterConverterTestCase extends TestCase {
+public class CharacterConverterTest extends TestCase {
 
     /**
      * Create Test Suite
      * @return test suite
      */
     public static TestSuite suite() {
-        return new TestSuite(CharacterConverterTestCase.class);
+        return new TestSuite(CharacterConverterTest.class);
     }
 
     /**
      * Construct a new Character Converter test case.
      * @param name Test Name
      */
-    public CharacterConverterTestCase(final String name) {
+    public CharacterConverterTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/converters/ClassConverterTestCase.java
 b/src/test/java/org/apache/commons/beanutils/converters/ClassConverterTest.java
similarity index 96%
rename from 
src/test/java/org/apache/commons/beanutils/converters/ClassConverterTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/converters/ClassConverterTest.java
index 3f01f40c..1fbb26e4 100644
--- 
a/src/test/java/org/apache/commons/beanutils/converters/ClassConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/converters/ClassConverterTest.java
@@ -26,21 +26,21 @@ import junit.framework.TestSuite;
  * Test Case for the ClassConverter class.
  *
  */
-public class ClassConverterTestCase extends TestCase {
+public class ClassConverterTest extends TestCase {
 
     /**
      * Create Test Suite
      * @return test suite
      */
     public static TestSuite suite() {
-        return new TestSuite(ClassConverterTestCase.class);
+        return new TestSuite(ClassConverterTest.class);
     }
 
     /**
      * Construct a new Class Converter test case.
      * @param name Test Name
      */
-    public ClassConverterTestCase(final String name) {
+    public ClassConverterTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/converters/ClassReloaderTestCase.java
 b/src/test/java/org/apache/commons/beanutils/converters/ClassReloaderTest.java
similarity index 93%
rename from 
src/test/java/org/apache/commons/beanutils/converters/ClassReloaderTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/converters/ClassReloaderTest.java
index 458db2dd..eaa986c2 100644
--- 
a/src/test/java/org/apache/commons/beanutils/converters/ClassReloaderTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/converters/ClassReloaderTest.java
@@ -25,16 +25,16 @@ import junit.framework.TestSuite;
  *
  */
 
-public class ClassReloaderTestCase extends TestCase {
+public class ClassReloaderTest extends TestCase {
 
     public static class DummyClass {
     }
 
     public static TestSuite suite() {
-        return new TestSuite(ClassReloaderTestCase.class);
+        return new TestSuite(ClassReloaderTest.class);
     }
 
-    public ClassReloaderTestCase(final String name) {
+    public ClassReloaderTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/converters/ConverterTestSuite.java 
b/src/test/java/org/apache/commons/beanutils/converters/ConverterTestSuite.java
index d7219dd5..6c7549f5 100644
--- 
a/src/test/java/org/apache/commons/beanutils/converters/ConverterTestSuite.java
+++ 
b/src/test/java/org/apache/commons/beanutils/converters/ConverterTestSuite.java
@@ -42,20 +42,20 @@ public class ConverterTestSuite {
         testSuite.addTestSuite(BooleanConverterTestCase.class);
         testSuite.addTestSuite(ByteConverterTestCase.class);
         testSuite.addTestSuite(CalendarConverterTestCase.class);
-        testSuite.addTestSuite(CharacterConverterTestCase.class);
-        testSuite.addTestSuite(ClassConverterTestCase.class);
-        testSuite.addTestSuite(DateConverterTestCase.class);
-        testSuite.addTestSuite(DoubleConverterTestCase.class);
-        testSuite.addTestSuite(FileConverterTestCase.class);
-        testSuite.addTestSuite(FloatConverterTestCase.class);
-        testSuite.addTestSuite(IntegerConverterTestCase.class);
-        testSuite.addTestSuite(LongConverterTestCase.class);
-        testSuite.addTestSuite(ShortConverterTestCase.class);
-        testSuite.addTestSuite(SqlDateConverterTestCase.class);
-        testSuite.addTestSuite(SqlTimeConverterTestCase.class);
-        testSuite.addTestSuite(SqlTimestampConverterTestCase.class);
-        testSuite.addTestSuite(StringArrayConverterTestCase.class);
-        testSuite.addTestSuite(URLConverterTestCase.class);
+        testSuite.addTestSuite(CharacterConverterTest.class);
+        testSuite.addTestSuite(ClassConverterTest.class);
+        testSuite.addTestSuite(DateConverterTest.class);
+        testSuite.addTestSuite(DoubleConverterTest.class);
+        testSuite.addTestSuite(FileConverterTest.class);
+        testSuite.addTestSuite(FloatConverterTest.class);
+        testSuite.addTestSuite(IntegerConverterTest.class);
+        testSuite.addTestSuite(LongConverterTest.class);
+        testSuite.addTestSuite(ShortConverterTest.class);
+        testSuite.addTestSuite(SqlDateConverterTest.class);
+        testSuite.addTestSuite(SqlTimeConverterTest.class);
+        testSuite.addTestSuite(SqlTimestampConverterTest.class);
+        testSuite.addTestSuite(StringArrayConverterTest.class);
+        testSuite.addTestSuite(URLConverterTest.class);
         return testSuite;
     }
 }
diff --git 
a/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestCase.java
 b/src/test/java/org/apache/commons/beanutils/converters/DateConverterTest.java
similarity index 92%
rename from 
src/test/java/org/apache/commons/beanutils/converters/DateConverterTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/converters/DateConverterTest.java
index cb821a64..9520e2a2 100644
--- 
a/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/converters/DateConverterTest.java
@@ -25,21 +25,21 @@ import junit.framework.TestSuite;
  * Test Case for the DateConverter class.
  *
  */
-public class DateConverterTestCase extends DateConverterTestBase {
+public class DateConverterTest extends DateConverterTestBase {
 
     /**
      * Create Test Suite
      * @return test suite
      */
     public static TestSuite suite() {
-        return new TestSuite(DateConverterTestCase.class);
+        return new TestSuite(DateConverterTest.class);
     }
 
     /**
      * Construct a new Date test case.
      * @param name Test Name
      */
-    public DateConverterTestCase(final String name) {
+    public DateConverterTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/converters/DoubleConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/converters/DoubleConverterTest.java
similarity index 95%
rename from 
src/test/java/org/apache/commons/beanutils/converters/DoubleConverterTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/converters/DoubleConverterTest.java
index 1cef9ad0..c3348bdd 100644
--- 
a/src/test/java/org/apache/commons/beanutils/converters/DoubleConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/converters/DoubleConverterTest.java
@@ -26,15 +26,15 @@ import junit.framework.TestSuite;
  *
  */
 
-public class DoubleConverterTestCase extends NumberConverterTestBase {
+public class DoubleConverterTest extends NumberConverterTest {
 
     public static TestSuite suite() {
-        return new TestSuite(DoubleConverterTestCase.class);
+        return new TestSuite(DoubleConverterTest.class);
     }
 
     private Converter converter;
 
-    public DoubleConverterTestCase(final String name) {
+    public DoubleConverterTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/converters/FileConverterTestCase.java
 b/src/test/java/org/apache/commons/beanutils/converters/FileConverterTest.java
similarity index 94%
rename from 
src/test/java/org/apache/commons/beanutils/converters/FileConverterTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/converters/FileConverterTest.java
index c46f463a..85183584 100644
--- 
a/src/test/java/org/apache/commons/beanutils/converters/FileConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/converters/FileConverterTest.java
@@ -30,15 +30,15 @@ import junit.framework.TestSuite;
  *
  */
 
-public class FileConverterTestCase extends TestCase {
+public class FileConverterTest extends TestCase {
 
     public static TestSuite suite() {
-        return new TestSuite(FileConverterTestCase.class);
+        return new TestSuite(FileConverterTest.class);
     }
 
     private Converter converter;
 
-    public FileConverterTestCase(final String name) {
+    public FileConverterTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/converters/FloatConverterTestCase.java
 b/src/test/java/org/apache/commons/beanutils/converters/FloatConverterTest.java
similarity index 96%
rename from 
src/test/java/org/apache/commons/beanutils/converters/FloatConverterTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/converters/FloatConverterTest.java
index 5e6e5f50..e00f0da0 100644
--- 
a/src/test/java/org/apache/commons/beanutils/converters/FloatConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/converters/FloatConverterTest.java
@@ -26,15 +26,15 @@ import junit.framework.TestSuite;
  *
  */
 
-public class FloatConverterTestCase extends NumberConverterTestBase {
+public class FloatConverterTest extends NumberConverterTest {
 
     public static TestSuite suite() {
-        return new TestSuite(FloatConverterTestCase.class);
+        return new TestSuite(FloatConverterTest.class);
     }
 
     private Converter converter;
 
-    public FloatConverterTestCase(final String name) {
+    public FloatConverterTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/converters/IntegerConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/converters/IntegerConverterTest.java
similarity index 96%
rename from 
src/test/java/org/apache/commons/beanutils/converters/IntegerConverterTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/converters/IntegerConverterTest.java
index cacc535c..bfbf2070 100644
--- 
a/src/test/java/org/apache/commons/beanutils/converters/IntegerConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/converters/IntegerConverterTest.java
@@ -27,15 +27,15 @@ import junit.framework.TestSuite;
  *
  */
 
-public class IntegerConverterTestCase extends NumberConverterTestBase {
+public class IntegerConverterTest extends NumberConverterTest {
 
     public static TestSuite suite() {
-        return new TestSuite(IntegerConverterTestCase.class);
+        return new TestSuite(IntegerConverterTest.class);
     }
 
     private Converter converter;
 
-    public IntegerConverterTestCase(final String name) {
+    public IntegerConverterTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/converters/LongConverterTestCase.java
 b/src/test/java/org/apache/commons/beanutils/converters/LongConverterTest.java
similarity index 95%
rename from 
src/test/java/org/apache/commons/beanutils/converters/LongConverterTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/converters/LongConverterTest.java
index 72fc731a..6fd5339c 100644
--- 
a/src/test/java/org/apache/commons/beanutils/converters/LongConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/converters/LongConverterTest.java
@@ -26,15 +26,15 @@ import junit.framework.TestSuite;
  *
  */
 
-public class LongConverterTestCase extends NumberConverterTestBase {
+public class LongConverterTest extends NumberConverterTest {
 
     public static TestSuite suite() {
-        return new TestSuite(LongConverterTestCase.class);
+        return new TestSuite(LongConverterTest.class);
     }
 
     private Converter converter;
 
-    public LongConverterTestCase(final String name) {
+    public LongConverterTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/converters/MemoryTestCase.java 
b/src/test/java/org/apache/commons/beanutils/converters/MemoryTest.java
similarity index 99%
rename from 
src/test/java/org/apache/commons/beanutils/converters/MemoryTestCase.java
rename to src/test/java/org/apache/commons/beanutils/converters/MemoryTest.java
index 34c7d67f..cb59e1aa 100644
--- a/src/test/java/org/apache/commons/beanutils/converters/MemoryTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/converters/MemoryTest.java
@@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test;
  * garbage collection, particularly in j2ee-like situations.
  *
  */
-public class MemoryTestCase {
+public class MemoryTest {
 
     /**
      * Attempt to force garbage collection of the specified target.
diff --git 
a/src/test/java/org/apache/commons/beanutils/converters/NumberConverterTestBase.java
 
b/src/test/java/org/apache/commons/beanutils/converters/NumberConverterTest.java
similarity index 99%
rename from 
src/test/java/org/apache/commons/beanutils/converters/NumberConverterTestBase.java
rename to 
src/test/java/org/apache/commons/beanutils/converters/NumberConverterTest.java
index 181ca9d8..5dcb299a 100644
--- 
a/src/test/java/org/apache/commons/beanutils/converters/NumberConverterTestBase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/converters/NumberConverterTest.java
@@ -32,12 +32,12 @@ import junit.framework.TestCase;
  *
  */
 
-public abstract class NumberConverterTestBase extends TestCase {
+public abstract class NumberConverterTest extends TestCase {
 
     /** Test Number values */
     protected Number[] numbers = new Number[4];
 
-    public NumberConverterTestBase(final String name) {
+    public NumberConverterTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/converters/ShortConverterTestCase.java
 b/src/test/java/org/apache/commons/beanutils/converters/ShortConverterTest.java
similarity index 96%
rename from 
src/test/java/org/apache/commons/beanutils/converters/ShortConverterTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/converters/ShortConverterTest.java
index 6c8a1a89..bc5f255d 100644
--- 
a/src/test/java/org/apache/commons/beanutils/converters/ShortConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/converters/ShortConverterTest.java
@@ -26,15 +26,15 @@ import junit.framework.TestSuite;
  *
  */
 
-public class ShortConverterTestCase extends NumberConverterTestBase {
+public class ShortConverterTest extends NumberConverterTest {
 
     public static TestSuite suite() {
-        return new TestSuite(ShortConverterTestCase.class);
+        return new TestSuite(ShortConverterTest.class);
     }
 
     private Converter converter;
 
-    public ShortConverterTestCase(final String name) {
+    public ShortConverterTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/converters/SqlDateConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/converters/SqlDateConverterTest.java
similarity index 94%
rename from 
src/test/java/org/apache/commons/beanutils/converters/SqlDateConverterTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/converters/SqlDateConverterTest.java
index f5310c9c..83dc4bad 100644
--- 
a/src/test/java/org/apache/commons/beanutils/converters/SqlDateConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/converters/SqlDateConverterTest.java
@@ -27,21 +27,21 @@ import junit.framework.TestSuite;
  *
  */
 
-public class SqlDateConverterTestCase extends DateConverterTestBase {
+public class SqlDateConverterTest extends DateConverterTestBase {
 
     /**
      * Create Test Suite
      * @return test suite
      */
     public static TestSuite suite() {
-        return new TestSuite(SqlDateConverterTestCase.class);
+        return new TestSuite(SqlDateConverterTest.class);
     }
 
     /**
      * Construct a new Date test case.
      * @param name Test Name
      */
-    public SqlDateConverterTestCase(final String name) {
+    public SqlDateConverterTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/converters/SqlTimeConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/converters/SqlTimeConverterTest.java
similarity index 96%
rename from 
src/test/java/org/apache/commons/beanutils/converters/SqlTimeConverterTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/converters/SqlTimeConverterTest.java
index 2ddafac2..39d8d4e9 100644
--- 
a/src/test/java/org/apache/commons/beanutils/converters/SqlTimeConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/converters/SqlTimeConverterTest.java
@@ -30,21 +30,21 @@ import junit.framework.TestSuite;
  *
  */
 
-public class SqlTimeConverterTestCase extends DateConverterTestBase {
+public class SqlTimeConverterTest extends DateConverterTestBase {
 
     /**
      * Create Test Suite
      * @return test suite
      */
     public static TestSuite suite() {
-        return new TestSuite(SqlTimeConverterTestCase.class);
+        return new TestSuite(SqlTimeConverterTest.class);
     }
 
     /**
      * Construct a new Date test case.
      * @param name Test Name
      */
-    public SqlTimeConverterTestCase(final String name) {
+    public SqlTimeConverterTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/converters/SqlTimestampConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/converters/SqlTimestampConverterTest.java
similarity index 96%
rename from 
src/test/java/org/apache/commons/beanutils/converters/SqlTimestampConverterTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/converters/SqlTimestampConverterTest.java
index fcea774d..4dc2b755 100644
--- 
a/src/test/java/org/apache/commons/beanutils/converters/SqlTimestampConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/converters/SqlTimestampConverterTest.java
@@ -29,21 +29,21 @@ import junit.framework.TestSuite;
 /**
  * Test Case for the {@link SqlTimestampConverter} class.
  */
-public class SqlTimestampConverterTestCase extends DateConverterTestBase {
+public class SqlTimestampConverterTest extends DateConverterTestBase {
 
     /**
      * Create Test Suite
      * @return test suite
      */
     public static TestSuite suite() {
-        return new TestSuite(SqlTimestampConverterTestCase.class);
+        return new TestSuite(SqlTimestampConverterTest.class);
     }
 
     /**
      * Construct a new Date test case.
      * @param name Test Name
      */
-    public SqlTimestampConverterTestCase(final String name) {
+    public SqlTimestampConverterTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/converters/StringArrayConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/converters/StringArrayConverterTest.java
similarity index 92%
rename from 
src/test/java/org/apache/commons/beanutils/converters/StringArrayConverterTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/converters/StringArrayConverterTest.java
index 3f6ca852..91250cb2 100644
--- 
a/src/test/java/org/apache/commons/beanutils/converters/StringArrayConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/converters/StringArrayConverterTest.java
@@ -24,9 +24,9 @@ import junit.framework.TestCase;
  *
  */
 
-public class StringArrayConverterTestCase extends TestCase {
+public class StringArrayConverterTest extends TestCase {
 
-    public StringArrayConverterTestCase(final String name) {
+    public StringArrayConverterTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/converters/StringConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/converters/StringConverterTest.java
similarity index 97%
rename from 
src/test/java/org/apache/commons/beanutils/converters/StringConverterTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/converters/StringConverterTest.java
index e65a2a46..29589d59 100644
--- 
a/src/test/java/org/apache/commons/beanutils/converters/StringConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/converters/StringConverterTest.java
@@ -24,7 +24,7 @@ import junit.framework.TestCase;
  * Test case for {@code StringConverter}.
  *
  */
-public class StringConverterTestCase extends TestCase {
+public class StringConverterTest extends TestCase {
     /** The converter to be tested. */
     private StringConverter converter;
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/converters/URLConverterTestCase.java
 b/src/test/java/org/apache/commons/beanutils/converters/URLConverterTest.java
similarity index 95%
rename from 
src/test/java/org/apache/commons/beanutils/converters/URLConverterTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/converters/URLConverterTest.java
index e23c2c15..e2afbf6d 100644
--- 
a/src/test/java/org/apache/commons/beanutils/converters/URLConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/converters/URLConverterTest.java
@@ -30,15 +30,15 @@ import junit.framework.TestSuite;
  *
  */
 
-public class URLConverterTestCase extends TestCase {
+public class URLConverterTest extends TestCase {
 
     public static TestSuite suite() {
-        return new TestSuite(URLConverterTestCase.class);
+        return new TestSuite(URLConverterTest.class);
     }
 
     private Converter converter;
 
-    public URLConverterTestCase(final String name) {
+    public URLConverterTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/expression/DefaultResolverTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/expression/DefaultResolverTest.java
similarity index 98%
rename from 
src/test/java/org/apache/commons/beanutils/expression/DefaultResolverTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/expression/DefaultResolverTest.java
index f820ee5d..f498af50 100644
--- 
a/src/test/java/org/apache/commons/beanutils/expression/DefaultResolverTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/expression/DefaultResolverTest.java
@@ -23,14 +23,14 @@ import junit.framework.TestSuite;
  * Junit Test for BasicResolver.
  *
  */
-public class DefaultResolverTestCase extends TestCase {
+public class DefaultResolverTest extends TestCase {
 
     /**
      * Create Test Suite
      * @return test suite
      */
     public static TestSuite suite() {
-        return new TestSuite(DefaultResolverTestCase.class);
+        return new TestSuite(DefaultResolverTest.class);
     }
 
     private final DefaultResolver resolver = new DefaultResolver();
@@ -57,7 +57,7 @@ public class DefaultResolverTestCase extends TestCase {
      * Construct a DefaultResolver Test Case.
      * @param name The name of the test
      */
-    public DefaultResolverTestCase(final String name) {
+    public DefaultResolverTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTestCase.java
 b/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTest.java
similarity index 93%
rename from 
src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTest.java
index f3e26556..9057ded9 100644
--- 
a/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTest.java
@@ -28,16 +28,16 @@ import junit.framework.TestSuite;
  * Test Case for {@link LocaleBeanUtils}.
  *
  */
-public class LocaleBeanUtilsTestCase extends TestCase {
+public class LocaleBeanUtilsTest extends TestCase {
 
-    private static Log log = LogFactory.getLog(LocaleBeanUtilsTestCase.class);
+    private static Log log = LogFactory.getLog(LocaleBeanUtilsTest.class);
 
     /**
      * Return the tests included in this test suite.
      * @return Test Suite
      */
     public static Test suite() {
-        return new TestSuite(LocaleBeanUtilsTestCase.class);
+        return new TestSuite(LocaleBeanUtilsTest.class);
     }
 
     /**
@@ -45,7 +45,7 @@ public class LocaleBeanUtilsTestCase extends TestCase {
      *
      * @param name Name of the test case
      */
-    public LocaleBeanUtilsTestCase(final String name) {
+    public LocaleBeanUtilsTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTest.java
similarity index 99%
rename from 
src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTest.java
index 877752b0..3f47b6e4 100644
--- 
a/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTest.java
@@ -43,7 +43,7 @@ import junit.framework.TestSuite;
  *
  */
 
-public class LocaleBeanificationTestCase extends TestCase {
+public class LocaleBeanificationTest extends TestCase {
 
     class Signal {
         private Exception e;
@@ -107,7 +107,7 @@ public class LocaleBeanificationTestCase extends TestCase {
      * Return the tests included in this test suite.
      */
     public static Test suite() {
-        return new TestSuite(LocaleBeanificationTestCase.class);
+        return new TestSuite(LocaleBeanificationTest.class);
     }
 
     /**
@@ -115,7 +115,7 @@ public class LocaleBeanificationTestCase extends TestCase {
      *
      * @param name Name of the test case
      */
-    public LocaleBeanificationTestCase(final String name) {
+    public LocaleBeanificationTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertTestSuite.java 
b/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertTestSuite.java
index 2fc3a517..a8bf4e5d 100644
--- 
a/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertTestSuite.java
+++ 
b/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertTestSuite.java
@@ -17,15 +17,15 @@
 
 package org.apache.commons.beanutils.locale;
 
-import 
org.apache.commons.beanutils.locale.converters.BigDecimalLocaleConverterTestCase;
-import 
org.apache.commons.beanutils.locale.converters.BigIntegerLocaleConverterTestCase;
-import 
org.apache.commons.beanutils.locale.converters.ByteLocaleConverterTestCase;
-import 
org.apache.commons.beanutils.locale.converters.DateLocaleConverterTestCase;
-import 
org.apache.commons.beanutils.locale.converters.DoubleLocaleConverterTestCase;
-import 
org.apache.commons.beanutils.locale.converters.FloatLocaleConverterTestCase;
-import 
org.apache.commons.beanutils.locale.converters.IntegerLocaleConverterTestCase;
-import 
org.apache.commons.beanutils.locale.converters.LongLocaleConverterTestCase;
-import 
org.apache.commons.beanutils.locale.converters.ShortLocaleConverterTestCase;
+import 
org.apache.commons.beanutils.locale.converters.BigDecimalLocaleConverterTest;
+import 
org.apache.commons.beanutils.locale.converters.BigIntegerLocaleConverterTest;
+import org.apache.commons.beanutils.locale.converters.ByteLocaleConverterTest;
+import org.apache.commons.beanutils.locale.converters.DateLocaleConverterTest;
+import 
org.apache.commons.beanutils.locale.converters.DoubleLocaleConverterTest;
+import org.apache.commons.beanutils.locale.converters.FloatLocaleConverterTest;
+import 
org.apache.commons.beanutils.locale.converters.IntegerLocaleConverterTest;
+import org.apache.commons.beanutils.locale.converters.LongLocaleConverterTest;
+import org.apache.commons.beanutils.locale.converters.ShortLocaleConverterTest;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -45,17 +45,17 @@ public class LocaleConvertTestSuite {
      */
     public static Test suite() {
         final TestSuite testSuite = new TestSuite();
-        testSuite.addTestSuite(LocaleConvertUtilsTestCase.class);
-        testSuite.addTestSuite(LocaleBeanificationTestCase.class);
-        testSuite.addTestSuite(BigDecimalLocaleConverterTestCase.class);
-        testSuite.addTestSuite(BigIntegerLocaleConverterTestCase.class);
-        testSuite.addTestSuite(ByteLocaleConverterTestCase.class);
-        testSuite.addTestSuite(DateLocaleConverterTestCase.class);
-        testSuite.addTestSuite(DoubleLocaleConverterTestCase.class);
-        testSuite.addTestSuite(FloatLocaleConverterTestCase.class);
-        testSuite.addTestSuite(IntegerLocaleConverterTestCase.class);
-        testSuite.addTestSuite(LongLocaleConverterTestCase.class);
-        testSuite.addTestSuite(ShortLocaleConverterTestCase.class);
+        testSuite.addTestSuite(LocaleConvertUtilsTest.class);
+        testSuite.addTestSuite(LocaleBeanificationTest.class);
+        testSuite.addTestSuite(BigDecimalLocaleConverterTest.class);
+        testSuite.addTestSuite(BigIntegerLocaleConverterTest.class);
+        testSuite.addTestSuite(ByteLocaleConverterTest.class);
+        testSuite.addTestSuite(DateLocaleConverterTest.class);
+        testSuite.addTestSuite(DoubleLocaleConverterTest.class);
+        testSuite.addTestSuite(FloatLocaleConverterTest.class);
+        testSuite.addTestSuite(IntegerLocaleConverterTest.class);
+        testSuite.addTestSuite(LongLocaleConverterTest.class);
+        testSuite.addTestSuite(ShortLocaleConverterTest.class);
         return testSuite;
     }
 }
diff --git 
a/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsTestCase.java
 b/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsTest.java
similarity index 99%
rename from 
src/test/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsTest.java
index 9a0e68b7..d0e88c1d 100644
--- 
a/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsTest.java
@@ -37,13 +37,13 @@ import junit.framework.TestSuite;
  *
  */
 
-public class LocaleConvertUtilsTestCase extends TestCase {
+public class LocaleConvertUtilsTest extends TestCase {
 
     /**
      * Return the tests included in this test suite.
      */
     public static Test suite() {
-        return new TestSuite(LocaleConvertUtilsTestCase.class);
+        return new TestSuite(LocaleConvertUtilsTest.class);
     }
 
     private char m_decimalSeparator;
@@ -53,7 +53,7 @@ public class LocaleConvertUtilsTestCase extends TestCase {
      *
      * @param name Name of the test case
      */
-    public LocaleConvertUtilsTestCase(final String name) {
+    public LocaleConvertUtilsTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/locale/converters/BaseLocaleConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/locale/converters/BaseLocaleConverterTest.java
similarity index 98%
rename from 
src/test/java/org/apache/commons/beanutils/locale/converters/BaseLocaleConverterTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/locale/converters/BaseLocaleConverterTest.java
index be38cb46..6012f55e 100644
--- 
a/src/test/java/org/apache/commons/beanutils/locale/converters/BaseLocaleConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/locale/converters/BaseLocaleConverterTest.java
@@ -30,7 +30,7 @@ import junit.framework.TestCase;
  *
  */
 
-public class BaseLocaleConverterTestCase extends TestCase {
+public class BaseLocaleConverterTest extends TestCase {
 
     // Original Default Locale
     protected Locale origLocale;
@@ -59,7 +59,7 @@ public class BaseLocaleConverterTestCase extends TestCase {
     protected String expectedDecimalValue;
     protected String expectedIntegerValue;
 
-    public BaseLocaleConverterTestCase(final String name) {
+    public BaseLocaleConverterTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverterTest.java
similarity index 98%
rename from 
src/test/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverterTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverterTest.java
index 4ffc0455..527a58de 100644
--- 
a/src/test/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverterTest.java
@@ -24,9 +24,9 @@ import java.math.BigDecimal;
  *
  */
 
-public class BigDecimalLocaleConverterTestCase extends 
BaseLocaleConverterTestCase {
+public class BigDecimalLocaleConverterTest extends BaseLocaleConverterTest {
 
-    public BigDecimalLocaleConverterTestCase(final String name) {
+    public BigDecimalLocaleConverterTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverterTest.java
similarity index 98%
rename from 
src/test/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverterTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverterTest.java
index cc758110..4413d24d 100644
--- 
a/src/test/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverterTest.java
@@ -26,9 +26,9 @@ import org.apache.commons.beanutils.ConversionException;
  *
  */
 
-public class BigIntegerLocaleConverterTestCase extends 
BaseLocaleConverterTestCase {
+public class BigIntegerLocaleConverterTest extends BaseLocaleConverterTest {
 
-    public BigIntegerLocaleConverterTestCase(final String name) {
+    public BigIntegerLocaleConverterTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverterTest.java
similarity index 98%
rename from 
src/test/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverterTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverterTest.java
index abd05ea7..e2df3385 100644
--- 
a/src/test/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverterTest.java
@@ -22,9 +22,9 @@ package org.apache.commons.beanutils.locale.converters;
  *
  */
 
-public class ByteLocaleConverterTestCase extends BaseLocaleConverterTestCase {
+public class ByteLocaleConverterTest extends BaseLocaleConverterTest {
 
-    public ByteLocaleConverterTestCase(final String name) {
+    public ByteLocaleConverterTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTest.java
similarity index 98%
rename from 
src/test/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTest.java
index bf29f652..69b68316 100644
--- 
a/src/test/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverterTest.java
@@ -32,10 +32,10 @@ import org.apache.commons.logging.LogFactory;
  *
  */
 
-public class DateLocaleConverterTestCase extends BaseLocaleConverterTestCase {
+public class DateLocaleConverterTest extends BaseLocaleConverterTest {
 
     /** All logging goes through this logger */
-    private final Log log = 
LogFactory.getLog(DateLocaleConverterTestCase.class);
+    private final Log log = LogFactory.getLog(DateLocaleConverterTest.class);
 
     protected String localizedDatePattern;
     protected String localizedDateValue;
@@ -46,7 +46,7 @@ public class DateLocaleConverterTestCase extends 
BaseLocaleConverterTestCase {
 
     protected boolean validLocalDateSymbols;
 
-    public DateLocaleConverterTestCase(final String name) {
+    public DateLocaleConverterTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverterTest.java
similarity index 98%
rename from 
src/test/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverterTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverterTest.java
index 287e08e2..ccbef9da 100644
--- 
a/src/test/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverterTest.java
@@ -22,9 +22,9 @@ package org.apache.commons.beanutils.locale.converters;
  *
  */
 
-public class DoubleLocaleConverterTestCase extends BaseLocaleConverterTestCase 
{
+public class DoubleLocaleConverterTest extends BaseLocaleConverterTest {
 
-    public DoubleLocaleConverterTestCase(final String name) {
+    public DoubleLocaleConverterTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverterTest.java
similarity index 98%
rename from 
src/test/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverterTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverterTest.java
index b6aca24f..a98752b8 100644
--- 
a/src/test/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverterTest.java
@@ -28,9 +28,9 @@ import org.apache.commons.beanutils.locale.LocaleConvertUtils;
  *
  */
 
-public class FloatLocaleConverterTestCase extends BaseLocaleConverterTestCase {
+public class FloatLocaleConverterTest extends BaseLocaleConverterTest {
 
-    public FloatLocaleConverterTestCase(final String name) {
+    public FloatLocaleConverterTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverterTest.java
similarity index 98%
rename from 
src/test/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverterTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverterTest.java
index f5f2f56c..fb9b02b3 100644
--- 
a/src/test/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverterTest.java
@@ -22,9 +22,9 @@ package org.apache.commons.beanutils.locale.converters;
  *
  */
 
-public class IntegerLocaleConverterTestCase extends 
BaseLocaleConverterTestCase {
+public class IntegerLocaleConverterTest extends BaseLocaleConverterTest {
 
-    public IntegerLocaleConverterTestCase(final String name) {
+    public IntegerLocaleConverterTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverterTest.java
similarity index 98%
rename from 
src/test/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverterTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverterTest.java
index 77bc82f7..fd7298e3 100644
--- 
a/src/test/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverterTest.java
@@ -22,9 +22,9 @@ package org.apache.commons.beanutils.locale.converters;
  *
  */
 
-public class LongLocaleConverterTestCase extends BaseLocaleConverterTestCase {
+public class LongLocaleConverterTest extends BaseLocaleConverterTest {
 
-    public LongLocaleConverterTestCase(final String name) {
+    public LongLocaleConverterTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverterTest.java
similarity index 98%
rename from 
src/test/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverterTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverterTest.java
index 14fc9bb1..71974957 100644
--- 
a/src/test/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverterTest.java
@@ -22,9 +22,9 @@ package org.apache.commons.beanutils.locale.converters;
  *
  */
 
-public class ShortLocaleConverterTestCase extends BaseLocaleConverterTestCase {
+public class ShortLocaleConverterTest extends BaseLocaleConverterTest {
 
-    public ShortLocaleConverterTestCase(final String name) {
+    public ShortLocaleConverterTest(final String name) {
         super(name);
     }
 
diff --git 
a/src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java
 
b/src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTest.java
similarity index 92%
rename from 
src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java
rename to 
src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTest.java
index 3657fa0a..9f41b4e3 100644
--- 
a/src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTest.java
@@ -29,15 +29,13 @@ import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Locale;
 
-import org.apache.commons.beanutils.BeanUtilsBean;
+import org.apache.commons.beanutils.BeanUtilCaches;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.beanutils.MappedPropertyDescriptor;
 import org.apache.commons.beanutils.MethodUtils;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.beanutils.WrapDynaBean;
-import org.apache.commons.beanutils.WrapDynaClass;
 import org.apache.commons.beanutils.converters.IntegerConverter;
-import org.apache.commons.beanutils.locale.LocaleBeanUtilsBean;
 import org.apache.commons.beanutils.locale.LocaleConvertUtils;
 import org.apache.commons.beanutils.locale.converters.IntegerLocaleConverter;
 import org.junit.Assume;
@@ -49,14 +47,14 @@ import org.junit.jupiter.api.Test;
  * See https://issues.apache.org/jira/browse/BEANUTILS-291
  *
  */
-public class MemoryLeakTestCase {
+public class MemoryLeakTest {
 
     /**
      * Creates a new class loader instance.
      */
     private static URLClassLoader newClassLoader() throws 
MalformedURLException {
 
-        final String dataFilePath = 
MemoryLeakTestCase.class.getResource("pojotests").getFile();
+        final String dataFilePath = 
MemoryLeakTest.class.getResource("pojotests").getFile();
         //System.out.println("dataFilePath: " + dataFilePath);
         final String location = "file://" + 
dataFilePath.substring(0,dataFilePath.length()-"org.apache.commons.beanutils.memoryleaktests.pojotests".length());
         //System.out.println("location: " + location);
@@ -75,33 +73,6 @@ public class MemoryLeakTestCase {
         return URLClassLoader.newInstance(new URL[]{new 
URL(classLocation)},null);
     }
 
-    /**
-     * Clears all the BeanUtils Caches manually.
-     *
-     * This is probably overkill, but since we're dealing with static caches
-     * it seems sensible to ensure that all test cases start with a clean 
sheet.
-     */
-    private void clearAllBeanUtilsCaches() {
-
-        // Clear BeanUtilsBean's PropertyUtilsBean descriptor caches
-        BeanUtilsBean.getInstance().getPropertyUtils().clearDescriptors();
-
-        // Clear LocaleBeanUtilsBean's PropertyUtilsBean descriptor caches
-        
LocaleBeanUtilsBean.getLocaleBeanUtilsInstance().getPropertyUtils().clearDescriptors();
-
-        // Clear MethodUtils's method cache
-        MethodUtils.clearCache();
-
-        // Clear WrapDynaClass cache
-        WrapDynaClass.clear();
-
-        // replace the existing BeanUtilsBean instance for the current class 
loader with a new, clean instance
-        BeanUtilsBean.setInstance(new BeanUtilsBean());
-
-        // replace the existing LocaleBeanUtilsBean instance for the current 
class loader with a new, clean instance
-        LocaleBeanUtilsBean.setInstance(new LocaleBeanUtilsBean());
-    }
-
     /**
      * Tries to force the garbage collector to run by filling up memory and 
calling System.gc().
      */
@@ -177,7 +148,7 @@ public class MemoryLeakTestCase {
     public void testConvertUtilsBean_converters_memoryLeak() throws Exception {
 
         // Clear All BeanUtils caches before the test
-        clearAllBeanUtilsCaches();
+        BeanUtilCaches.clear();
 
         final String className = 
"org.apache.commons.beanutils.memoryleaktests.pojotests.CustomInteger";
 
@@ -214,7 +185,7 @@ public class MemoryLeakTestCase {
         assertNull("ConvertUtilsBean is holding a reference to the 
classLoader", someRef.get());
 
         // Clear All BeanUtils caches after the test
-        clearAllBeanUtilsCaches();
+        BeanUtilCaches.clear();
     }
 
     /**
@@ -224,7 +195,7 @@ public class MemoryLeakTestCase {
     public void testLocaleConvertUtilsBean_converters_memoryLeak() throws 
Exception {
 
         // Clear All BeanUtils caches before the test
-        clearAllBeanUtilsCaches();
+        BeanUtilCaches.clear();
 
         final String className = 
"org.apache.commons.beanutils.memoryleaktests.pojotests.CustomInteger";
 
@@ -261,7 +232,7 @@ public class MemoryLeakTestCase {
         assertNull("LocaleConvertUtilsBean is holding a reference to the 
classLoader", someRef.get());
 
         // Clear All BeanUtils caches after the test
-        clearAllBeanUtilsCaches();
+        BeanUtilCaches.clear();
     }
 
     /**
@@ -272,7 +243,7 @@ public class MemoryLeakTestCase {
     public void testMappedPropertyDescriptor_MappedMethodReference1() throws 
Exception {
 
         // Clear All BeanUtils caches before the test
-        clearAllBeanUtilsCaches();
+        BeanUtilCaches.clear();
 
         final String className = 
"org.apache.commons.beanutils.memoryleaktests.pojotests.SomeMappedPojo";
         final ClassLoader loader = newClassLoader();
@@ -306,7 +277,7 @@ public class MemoryLeakTestCase {
         assertEquals("1-Read Write name", "setMappedProperty", 
descriptor.getMappedWriteMethod().getName());
 
         // Clear All BeanUtils caches after the test
-        clearAllBeanUtilsCaches();
+        BeanUtilCaches.clear();
     }
 
     /**
@@ -317,7 +288,7 @@ public class MemoryLeakTestCase {
     public void testMappedPropertyDescriptor_MappedMethodReference2() throws 
Exception {
 
         // Clear All BeanUtils caches before the test
-        clearAllBeanUtilsCaches();
+        BeanUtilCaches.clear();
 
         final String className = 
"org.apache.commons.beanutils.memoryleaktests.pojotests.SomeMappedPojo";
         ClassLoader loader = newClassLoader();
@@ -356,7 +327,7 @@ public class MemoryLeakTestCase {
         assertEquals("1-Read Write name", "setMappedProperty", 
descriptor.getMappedWriteMethod().getName());
 
         // Clear All BeanUtils caches after the test
-        clearAllBeanUtilsCaches();
+        BeanUtilCaches.clear();
     }
 
     /**
@@ -366,7 +337,7 @@ public class MemoryLeakTestCase {
     public void testMethodUtils_cache_memoryLeak() throws Exception {
 
         // Clear All BeanUtils caches before the test
-        clearAllBeanUtilsCaches();
+        BeanUtilCaches.clear();
 
         final String className = 
"org.apache.commons.beanutils.memoryleaktests.pojotests.SomePojo";
 
@@ -402,7 +373,7 @@ public class MemoryLeakTestCase {
         assertNull("MethodUtils is holding a reference to the classLoader", 
someRef.get());
 
         // Clear All BeanUtils caches after the test
-        clearAllBeanUtilsCaches();
+        BeanUtilCaches.clear();
     }
 
     /**
@@ -412,7 +383,7 @@ public class MemoryLeakTestCase {
     public void testPropertyUtilsBean_descriptorsCache_memoryLeak() throws 
Exception {
 
         // Clear All BeanUtils caches before the test
-        clearAllBeanUtilsCaches();
+        BeanUtilCaches.clear();
 
         final String className = 
"org.apache.commons.beanutils.memoryleaktests.pojotests.SomePojo";
 
@@ -448,7 +419,7 @@ public class MemoryLeakTestCase {
         assertNull("PropertyUtilsBean is holding a reference to the 
classLoader", someRef.get());
 
         // Clear All BeanUtils caches after the test
-        clearAllBeanUtilsCaches();
+        BeanUtilCaches.clear();
     }
 
     /**
@@ -458,7 +429,7 @@ public class MemoryLeakTestCase {
     public void testPropertyUtilsBean_mappedDescriptorsCache_memoryLeak() 
throws Exception {
 
         // Clear All BeanUtils caches before the test
-        clearAllBeanUtilsCaches();
+        BeanUtilCaches.clear();
 
         final String className = 
"org.apache.commons.beanutils.memoryleaktests.pojotests.SomeMappedPojo";
 
@@ -500,7 +471,7 @@ public class MemoryLeakTestCase {
         assertNull("PropertyUtilsBean is holding a reference to the 
classLoader", someRef.get());
 
         // Clear All BeanUtils caches after the test
-        clearAllBeanUtilsCaches();
+        BeanUtilCaches.clear();
     }
 
     /**
@@ -510,7 +481,7 @@ public class MemoryLeakTestCase {
     public void testWrapDynaClass_dynaClasses_memoryLeak() throws Exception {
 
         // Clear All BeanUtils caches before the test
-        clearAllBeanUtilsCaches();
+        BeanUtilCaches.clear();
 
         final String className = 
"org.apache.commons.beanutils.memoryleaktests.pojotests.SomePojo";
 
@@ -552,6 +523,6 @@ public class MemoryLeakTestCase {
         assertNull("WrapDynaClass is holding a reference to the classLoader", 
someRef.get());
 
         // Clear All BeanUtils caches after the test
-        clearAllBeanUtilsCaches();
+        BeanUtilCaches.clear();
     }
 }


Reply via email to