Remove legacy suite() methods in tests

Leave BeanMapTest as a to-do since it involves updating Commons
Collections

Author: garydgregory

src/test/java/org/apache/commons/beanutils/BeanUtils2Test.java

@@ -16,22 +16,11 @@
  */
 package org.apache.commons.beanutils;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 /**
  * Test Case for the {@link BeanUtilsBean2}.
  *
  */
 public class BeanUtils2Test extends BeanUtilsTest {
-
-    /**
-     * Return the tests included in this test suite.
-     */
-    public static Test suite() {
-        return new TestSuite(BeanUtils2Test.class);
-    }
-
     /**
      * Construct a new instance of this test case.
      *

src/test/java/org/apache/commons/beanutils/BeanUtilsBenchCase.java

@@ -21,26 +21,14 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * JUnit Test Case containing microbenchmarks for BeanUtils.
  *
  */
 
 public class BeanUtilsBenchCase extends TestCase {
-
-    /**
-     * Return the tests included in this test suite.
-     */
-    public static Test suite() {
-
-        return new TestSuite(BeanUtilsBenchCase.class);
-
-    }
-
     // Basic loop counter
     private long counter = 100000;
 

src/test/java/org/apache/commons/beanutils/BeanUtilsTest.java

@@ -26,9 +26,7 @@
 import org.apache.commons.beanutils.converters.ArrayConverter;
 import org.apache.commons.beanutils.converters.DateConverter;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * <p>
@@ -58,14 +56,6 @@
  */
 
 public class BeanUtilsTest extends TestCase {
-
-    /**
-     * Return the tests included in this test suite.
-     */
-    public static Test suite() {
-        return new TestSuite(BeanUtilsTest.class);
-    }
-
     /**
      * The test bean for each test.
      */

src/test/java/org/apache/commons/beanutils/BeanificationTest.java

@@ -24,9 +24,7 @@
 
 import org.apache.commons.logging.LogFactory;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * <p>
@@ -103,14 +101,6 @@ public String toString() {
 
     /** Maximum number of iterations before our test fails */
     public static final int MAX_GC_ITERATIONS = 50;
-
-    /**
-     * Return the tests included in this test suite.
-     */
-    public static Test suite() {
-        return new TestSuite(BeanificationTest.class);
-    }
-
     /**
      * Construct a new instance of this test case.
      *

src/test/java/org/apache/commons/beanutils/ConstructorUtilsTest.java

@@ -20,23 +20,13 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Modifier;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * Tests {@link ConstructorUtils} </p>
  */
 @SuppressWarnings("deprecation")
 public class ConstructorUtilsTest extends TestCase {
-
-    /**
-     * Return the tests included in this test suite.
-     */
-    public static Test suite() {
-        return new TestSuite(ConstructorUtilsTest.class);
-    }
-
     /**
      * Construct a new instance of this test case.
      *

src/test/java/org/apache/commons/beanutils/ConvertUtilsTest.java

@@ -27,22 +27,12 @@
 
 import org.apache.commons.beanutils.converters.DateConverter;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * Test Case for the ConvertUtils class.
  */
 public class ConvertUtilsTest extends TestCase {
-
-    /**
-     * Return the tests included in this test suite.
-     */
-    public static Test suite() {
-        return new TestSuite(ConvertUtilsTest.class);
-    }
-
     /**
      * Construct a new instance of this test case.
      *

src/test/java/org/apache/commons/beanutils/DynaBeanMapDecoratorTest.java

@@ -25,9 +25,7 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * <p>Test Case for the {@code DynaBeanMapDecorator} implementation class.</p>
@@ -49,12 +47,6 @@ public class DynaBeanMapDecoratorTest extends TestCase {
     private static Integer intVal    = Integer.valueOf(5);
     private static Date    dateVal   = new Date();
     private static final Map<Object, Object> emptyMap = new DynaBeanMapDecorator(new BasicDynaBean(new BasicDynaClass()));
-    /**
-     * Return the tests included in this test suite.
-     */
-    public static Test suite() {
-        return new TestSuite(DynaBeanMapDecoratorTest.class);
-    }
     private final Map<Object, Object>     mapVal    = new HashMap<>();
     private final Object[] values = {stringVal, null, intVal, dateVal, mapVal};
     private BasicDynaBean dynaBean;

src/test/java/org/apache/commons/beanutils/DynaBeanUtilsTest.java

@@ -23,9 +23,7 @@
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * Test case for BeanUtils when the underlying bean is actually a DynaBean.
@@ -69,16 +67,6 @@ protected static DynaClass createDynaClass() {
                         });
 
     }
-
-    /**
-     * Return the tests included in this test suite.
-     */
-    public static Test suite() {
-
-        return new TestSuite(DynaBeanUtilsTest.class);
-
-    }
-
     /**
      * The basic test bean for each test.
      */

src/test/java/org/apache/commons/beanutils/DynaPropertyTest.java

@@ -18,25 +18,13 @@
 
 import java.util.Collection;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * Test case for {@link DynaProperty}.
  *
  */
 public class DynaPropertyTest extends TestCase {
-
-    /**
-     * Return the tests included in this test suite.
-     * @return a test suite
-     */
-    public static Test suite() {
-
-        return new TestSuite(DynaPropertyTest.class);
-
-    }
     private DynaProperty testPropertyWithName;
     private DynaProperty testProperty1Duplicate;
     private DynaProperty testPropertyWithNameAndType;

src/test/java/org/apache/commons/beanutils/DynaPropertyUtilsTest.java

@@ -23,26 +23,14 @@
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * Test accessing DynaBeans transparently via PropertyUtils.
  *
  */
 
 public class DynaPropertyUtilsTest extends TestCase {
-
-    /**
-     * Return the tests included in this test suite.
-     */
-    public static Test suite() {
-
-        return new TestSuite(DynaPropertyUtilsTest.class);
-
-    }
-
     /**
      * The basic test bean for each test.
      */