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.

Author: garydgregory

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,23 +110,23 @@
               <!-- 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>
                   <org.apache.commons.logging.LogFactory>org.apache.commons.logging.impl.LogFactoryImpl</org.apache.commons.logging.LogFactory>
                   <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>

…ons/beanutils/BasicDynaBeanTestCase.java …commons/beanutils/BasicDynaBeanTest.javasrc/test/java/org/apache/commons/beanutils/BasicDynaBeanTestCase.java renamed to src/test/java/org/apache/commons/beanutils/BasicDynaBeanTest.java src/test/java/org/apache/commons/beanutils/BasicDynaBeanTestCase.java renamed to src/test/java/org/apache/commons/beanutils/BasicDynaBeanTest.java

@@ -43,7 +43,7 @@
  * </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

…ns/beanutils/BeanComparatorTestCase.java …ommons/beanutils/BeanComparatorTest.javasrc/test/java/org/apache/commons/beanutils/BeanComparatorTestCase.java renamed to src/test/java/org/apache/commons/beanutils/BeanComparatorTest.java src/test/java/org/apache/commons/beanutils/BeanComparatorTestCase.java renamed to src/test/java/org/apache/commons/beanutils/BeanComparatorTest.java

@@ -29,7 +29,7 @@
  * Test Case for the BeanComparator class.
  *
  */
-public class BeanComparatorTestCase {
+public class BeanComparatorTest {
 
     /**
      * The test beans for each test.

…utils/BeanIntrospectionDataTestCase.java …beanutils/BeanIntrospectionDataTest.javasrc/test/java/org/apache/commons/beanutils/BeanIntrospectionDataTestCase.java renamed to src/test/java/org/apache/commons/beanutils/BeanIntrospectionDataTest.java src/test/java/org/apache/commons/beanutils/BeanIntrospectionDataTestCase.java renamed to src/test/java/org/apache/commons/beanutils/BeanIntrospectionDataTest.java

@@ -27,7 +27,7 @@
  * 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;
 

…e/commons/beanutils/BeanMapTestCase.java …pache/commons/beanutils/BeanMapTest.javasrc/test/java/org/apache/commons/beanutils/BeanMapTestCase.java renamed to src/test/java/org/apache/commons/beanutils/BeanMapTest.java src/test/java/org/apache/commons/beanutils/BeanMapTestCase.java renamed to src/test/java/org/apache/commons/beanutils/BeanMapTest.java

@@ -35,7 +35,7 @@
  *
  */
 @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 static void main(final String[] args) {
     }
 
     public static Test suite() {
-        return BulkTest.makeSuite(BeanMapTestCase.class);
+        return BulkTest.makeSuite(BeanMapTest.class);
     }
 
     /**
@@ -172,7 +172,7 @@ public static Test suite() {
      **/
     private final Object objectInFullMap = new Object();
 
-    public BeanMapTestCase(final String testName) {
+    public BeanMapTest(final String testName) {
         super(testName);
     }
 

…ons/beanutils/BeanPredicateTestCase.java …commons/beanutils/BeanPredicateTest.javasrc/test/java/org/apache/commons/beanutils/BeanPredicateTestCase.java renamed to src/test/java/org/apache/commons/beanutils/BeanPredicateTest.java src/test/java/org/apache/commons/beanutils/BeanPredicateTestCase.java renamed to src/test/java/org/apache/commons/beanutils/BeanPredicateTest.java

@@ -26,9 +26,9 @@
 
 /**
  */
-public class BeanPredicateTestCase extends TestCase {
+public class BeanPredicateTest extends TestCase {
 
-    public BeanPredicateTestCase(final String name) {
+    public BeanPredicateTest(final String name) {
         super(name);
     }
 

…nPropertyValueChangeClosureTestCase.java …/BeanPropertyValueChangeClosureTest.javasrc/test/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosureTestCase.java renamed to src/test/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosureTest.java src/test/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosureTestCase.java renamed to src/test/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosureTest.java

@@ -23,7 +23,7 @@
  * 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);
     }
 

…ropertyValueEqualsPredicateTestCase.java …eanPropertyValueEqualsPredicateTest.javasrc/test/java/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicateTestCase.java renamed to src/test/java/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicateTest.java src/test/java/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicateTestCase.java renamed to src/test/java/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicateTest.java

@@ -23,7 +23,7 @@
  * 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);
     }
 

…nToPropertyValueTransformerTestCase.java …/BeanToPropertyValueTransformerTest.javasrc/test/java/org/apache/commons/beanutils/BeanToPropertyValueTransformerTestCase.java renamed to src/test/java/org/apache/commons/beanutils/BeanToPropertyValueTransformerTest.java src/test/java/org/apache/commons/beanutils/BeanToPropertyValueTransformerTestCase.java renamed to src/test/java/org/apache/commons/beanutils/BeanToPropertyValueTransformerTest.java

@@ -23,7 +23,7 @@
  * 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);
     }
 

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());
+    }
+}