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 9f7e8bc8 Remove legacy suite() methods in tests
9f7e8bc8 is described below
commit 9f7e8bc80718fff4f03fce7e813769808771f635
Author: Gary Gregory <[email protected]>
AuthorDate: Thu Jan 1 10:23:55 2026 -0500
Remove legacy suite() methods in tests
Leave BeanMapTest as a to-do since it involves updating Commons
Collections
---
.../apache/commons/beanutils/BeanUtils2Test.java | 11 --------
.../commons/beanutils/BeanUtilsBenchCase.java | 12 --------
.../apache/commons/beanutils/BeanUtilsTest.java | 10 -------
.../commons/beanutils/BeanificationTest.java | 10 -------
.../commons/beanutils/ConstructorUtilsTest.java | 10 -------
.../apache/commons/beanutils/ConvertUtilsTest.java | 10 -------
.../beanutils/DynaBeanMapDecoratorTest.java | 8 ------
.../commons/beanutils/DynaBeanUtilsTest.java | 12 --------
.../apache/commons/beanutils/DynaPropertyTest.java | 12 --------
.../commons/beanutils/DynaPropertyUtilsTest.java | 12 --------
.../commons/beanutils/DynaResultSetTest.java | 12 --------
.../apache/commons/beanutils/DynaRowSetTest.java | 12 --------
.../apache/commons/beanutils/LazyDynaBeanTest.java | 8 ------
.../commons/beanutils/LazyDynaClassTest.java | 9 ------
.../apache/commons/beanutils/LazyDynaListTest.java | 8 ------
.../apache/commons/beanutils/LazyDynaMapTest.java | 8 ------
.../commons/beanutils/MappedPropertyTest.java | 9 ------
.../apache/commons/beanutils/MethodUtilsTest.java | 10 -------
.../commons/beanutils/PropertyUtilsBenchCase.java | 12 --------
.../commons/beanutils/PropertyUtilsTest.java | 12 --------
.../apache/commons/beanutils/bugs/Jira157Test.java | 11 --------
.../apache/commons/beanutils/bugs/Jira18Test.java | 10 -------
.../apache/commons/beanutils/bugs/Jira273Test.java | 11 --------
.../apache/commons/beanutils/bugs/Jira298Test.java | 11 --------
.../apache/commons/beanutils/bugs/Jira339Test.java | 11 --------
.../apache/commons/beanutils/bugs/Jira345Test.java | 11 --------
.../apache/commons/beanutils/bugs/Jira349Test.java | 11 --------
.../apache/commons/beanutils/bugs/Jira357Test.java | 11 --------
.../apache/commons/beanutils/bugs/Jira358Test.java | 11 --------
.../apache/commons/beanutils/bugs/Jira359Test.java | 11 --------
.../apache/commons/beanutils/bugs/Jira368Test.java | 11 --------
.../apache/commons/beanutils/bugs/Jira369Test.java | 11 --------
.../apache/commons/beanutils/bugs/Jira61Test.java | 10 -------
.../apache/commons/beanutils/bugs/Jira87Test.java | 11 --------
.../converters/ArrayConverterTestCase.java | 10 -------
.../converters/BigDecimalConverterTestCase.java | 7 -----
.../converters/BigIntegerConverterTestCase.java | 7 -----
.../converters/ByteConverterTestCase.java | 7 -----
.../converters/CalendarConverterTestCase.java | 11 --------
.../converters/CharacterConverterTest.java | 10 -------
.../beanutils/converters/ClassConverterTest.java | 10 -------
.../beanutils/converters/ClassReloaderTest.java | 6 ----
.../beanutils/converters/ConverterTestSuite.java | 32 ----------------------
.../beanutils/converters/DateConverterTest.java | 11 --------
.../beanutils/converters/DoubleConverterTest.java | 7 -----
.../beanutils/converters/FileConverterTest.java | 6 ----
.../beanutils/converters/FloatConverterTest.java | 7 -----
.../beanutils/converters/IntegerConverterTest.java | 7 -----
.../beanutils/converters/LongConverterTest.java | 7 -----
.../beanutils/converters/ShortConverterTest.java | 7 -----
.../beanutils/converters/SqlDateConverterTest.java | 11 --------
.../beanutils/converters/SqlTimeConverterTest.java | 11 --------
.../converters/SqlTimestampConverterTest.java | 11 --------
.../beanutils/converters/URLConverterTest.java | 6 ----
.../beanutils/expression/DefaultResolverTest.java | 10 -------
.../beanutils/locale/LocaleBeanUtilsTest.java | 11 --------
.../beanutils/locale/LocaleBeanificationTest.java | 10 -------
.../beanutils/locale/LocaleConvertTestSuite.java | 32 ----------------------
.../beanutils/locale/LocaleConvertUtilsTest.java | 10 -------
59 files changed, 623 deletions(-)
diff --git a/src/test/java/org/apache/commons/beanutils/BeanUtils2Test.java
b/src/test/java/org/apache/commons/beanutils/BeanUtils2Test.java
index 9d029a16..de14c63b 100644
--- a/src/test/java/org/apache/commons/beanutils/BeanUtils2Test.java
+++ b/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.
*
diff --git a/src/test/java/org/apache/commons/beanutils/BeanUtilsBenchCase.java
b/src/test/java/org/apache/commons/beanutils/BeanUtilsBenchCase.java
index b47d980c..bee0fb2c 100644
--- a/src/test/java/org/apache/commons/beanutils/BeanUtilsBenchCase.java
+++ b/src/test/java/org/apache/commons/beanutils/BeanUtilsBenchCase.java
@@ -21,9 +21,7 @@ import java.util.HashMap;
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.
@@ -31,16 +29,6 @@ import junit.framework.TestSuite;
*/
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;
diff --git a/src/test/java/org/apache/commons/beanutils/BeanUtilsTest.java
b/src/test/java/org/apache/commons/beanutils/BeanUtilsTest.java
index d9281bd3..fe80f508 100644
--- a/src/test/java/org/apache/commons/beanutils/BeanUtilsTest.java
+++ b/src/test/java/org/apache/commons/beanutils/BeanUtilsTest.java
@@ -26,9 +26,7 @@ import java.util.Map;
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 @@ import junit.framework.TestSuite;
*/
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.
*/
diff --git a/src/test/java/org/apache/commons/beanutils/BeanificationTest.java
b/src/test/java/org/apache/commons/beanutils/BeanificationTest.java
index eb0121e8..198725f1 100644
--- a/src/test/java/org/apache/commons/beanutils/BeanificationTest.java
+++ b/src/test/java/org/apache/commons/beanutils/BeanificationTest.java
@@ -24,9 +24,7 @@ import java.util.WeakHashMap;
import org.apache.commons.logging.LogFactory;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* <p>
@@ -103,14 +101,6 @@ public class BeanificationTest extends TestCase {
/** 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.
*
diff --git
a/src/test/java/org/apache/commons/beanutils/ConstructorUtilsTest.java
b/src/test/java/org/apache/commons/beanutils/ConstructorUtilsTest.java
index 9e867d39..fc28eaee 100644
--- a/src/test/java/org/apache/commons/beanutils/ConstructorUtilsTest.java
+++ b/src/test/java/org/apache/commons/beanutils/ConstructorUtilsTest.java
@@ -20,23 +20,13 @@ package org.apache.commons.beanutils;
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.
*
diff --git a/src/test/java/org/apache/commons/beanutils/ConvertUtilsTest.java
b/src/test/java/org/apache/commons/beanutils/ConvertUtilsTest.java
index 0e102614..73fa15fb 100644
--- a/src/test/java/org/apache/commons/beanutils/ConvertUtilsTest.java
+++ b/src/test/java/org/apache/commons/beanutils/ConvertUtilsTest.java
@@ -27,22 +27,12 @@ import java.util.Objects;
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.
*
diff --git
a/src/test/java/org/apache/commons/beanutils/DynaBeanMapDecoratorTest.java
b/src/test/java/org/apache/commons/beanutils/DynaBeanMapDecoratorTest.java
index a83af56e..471d8f51 100644
--- a/src/test/java/org/apache/commons/beanutils/DynaBeanMapDecoratorTest.java
+++ b/src/test/java/org/apache/commons/beanutils/DynaBeanMapDecoratorTest.java
@@ -25,9 +25,7 @@ import java.util.Map;
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;
diff --git a/src/test/java/org/apache/commons/beanutils/DynaBeanUtilsTest.java
b/src/test/java/org/apache/commons/beanutils/DynaBeanUtilsTest.java
index ff34880b..0bdbd949 100644
--- a/src/test/java/org/apache/commons/beanutils/DynaBeanUtilsTest.java
+++ b/src/test/java/org/apache/commons/beanutils/DynaBeanUtilsTest.java
@@ -23,9 +23,7 @@ import java.util.HashMap;
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 @@ public class DynaBeanUtilsTest extends TestCase {
});
}
-
- /**
- * Return the tests included in this test suite.
- */
- public static Test suite() {
-
- return new TestSuite(DynaBeanUtilsTest.class);
-
- }
-
/**
* The basic test bean for each test.
*/
diff --git a/src/test/java/org/apache/commons/beanutils/DynaPropertyTest.java
b/src/test/java/org/apache/commons/beanutils/DynaPropertyTest.java
index 80ee5dc5..682d55f3 100644
--- a/src/test/java/org/apache/commons/beanutils/DynaPropertyTest.java
+++ b/src/test/java/org/apache/commons/beanutils/DynaPropertyTest.java
@@ -18,25 +18,13 @@ package org.apache.commons.beanutils;
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;
diff --git
a/src/test/java/org/apache/commons/beanutils/DynaPropertyUtilsTest.java
b/src/test/java/org/apache/commons/beanutils/DynaPropertyUtilsTest.java
index 14caa834..a24e67aa 100644
--- a/src/test/java/org/apache/commons/beanutils/DynaPropertyUtilsTest.java
+++ b/src/test/java/org/apache/commons/beanutils/DynaPropertyUtilsTest.java
@@ -23,9 +23,7 @@ import java.util.HashMap;
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.
@@ -33,16 +31,6 @@ import junit.framework.TestSuite;
*/
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.
*/
diff --git a/src/test/java/org/apache/commons/beanutils/DynaResultSetTest.java
b/src/test/java/org/apache/commons/beanutils/DynaResultSetTest.java
index 600b3239..782c5a9f 100644
--- a/src/test/java/org/apache/commons/beanutils/DynaResultSetTest.java
+++ b/src/test/java/org/apache/commons/beanutils/DynaResultSetTest.java
@@ -20,9 +20,7 @@ package org.apache.commons.beanutils;
import java.math.BigDecimal;
import java.util.Iterator;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* Test accessing ResultSets via DynaBeans.
@@ -30,16 +28,6 @@ import junit.framework.TestSuite;
*/
public class DynaResultSetTest extends TestCase {
-
- /**
- * Return the tests included in this test suite.
- */
- public static Test suite() {
-
- return new TestSuite(DynaResultSetTest.class);
-
- }
-
/**
* The mock result set DynaClass to be tested.
*/
diff --git a/src/test/java/org/apache/commons/beanutils/DynaRowSetTest.java
b/src/test/java/org/apache/commons/beanutils/DynaRowSetTest.java
index 68059ba8..4a0e7011 100644
--- a/src/test/java/org/apache/commons/beanutils/DynaRowSetTest.java
+++ b/src/test/java/org/apache/commons/beanutils/DynaRowSetTest.java
@@ -23,9 +23,7 @@ import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.util.List;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* Test accessing RowSets via DynaBeans.
@@ -96,16 +94,6 @@ public class DynaRowSetTest extends TestCase {
return super.getColumnClassName(columnIndex);
}
}
-
- /**
- * Return the tests included in this test suite.
- */
- public static Test suite() {
-
- return new TestSuite(DynaRowSetTest.class);
-
- }
-
/**
* The mock result set DynaClass to be tested.
*/
diff --git a/src/test/java/org/apache/commons/beanutils/LazyDynaBeanTest.java
b/src/test/java/org/apache/commons/beanutils/LazyDynaBeanTest.java
index 09bc6b62..ac9fec7c 100644
--- a/src/test/java/org/apache/commons/beanutils/LazyDynaBeanTest.java
+++ b/src/test/java/org/apache/commons/beanutils/LazyDynaBeanTest.java
@@ -22,21 +22,13 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.TreeMap;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* <p>Test Case for the {@code LazyDynaBean} implementation class.</p>
*
*/
public class LazyDynaBeanTest extends TestCase {
- /**
- * Return the tests included in this test suite.
- */
- public static Test suite() {
- return new TestSuite(LazyDynaBeanTest.class);
- }
protected LazyDynaBean bean;
protected LazyDynaClass dynaClass;
protected String testProperty = "myProperty";
diff --git a/src/test/java/org/apache/commons/beanutils/LazyDynaClassTest.java
b/src/test/java/org/apache/commons/beanutils/LazyDynaClassTest.java
index 63ef6520..72bb4800 100644
--- a/src/test/java/org/apache/commons/beanutils/LazyDynaClassTest.java
+++ b/src/test/java/org/apache/commons/beanutils/LazyDynaClassTest.java
@@ -16,22 +16,13 @@
*/
package org.apache.commons.beanutils;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* <p>Test Case for the {@code LazyDynaClass} implementation class.</p>
*
*/
public class LazyDynaClassTest extends TestCase {
- /**
- * Return the tests included in this test suite.
- */
- public static Test suite() {
- return new TestSuite(LazyDynaClassTest.class);
- }
-
protected LazyDynaClass dynaClass;
protected String testProperty = "myProperty";
diff --git a/src/test/java/org/apache/commons/beanutils/LazyDynaListTest.java
b/src/test/java/org/apache/commons/beanutils/LazyDynaListTest.java
index f2163a32..35dc5907 100644
--- a/src/test/java/org/apache/commons/beanutils/LazyDynaListTest.java
+++ b/src/test/java/org/apache/commons/beanutils/LazyDynaListTest.java
@@ -26,9 +26,7 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* <p>Test Case for the {@code LazyDynaList}class.</p>
@@ -38,12 +36,6 @@ public class LazyDynaListTest extends TestCase {
private static final String BASIC_PROP1 = "BasicDynaClass_Property1";
private static final String BASIC_PROP2 = "BasicDynaClass_Property2";
- /**
- * Return the tests included in this test suite.
- */
- public static Test suite() {
- return new TestSuite(LazyDynaListTest.class);
- }
protected DynaProperty[] properties = {
new DynaProperty(BASIC_PROP1,
String.class),
new DynaProperty(BASIC_PROP2,
HashMap.class)};
diff --git a/src/test/java/org/apache/commons/beanutils/LazyDynaMapTest.java
b/src/test/java/org/apache/commons/beanutils/LazyDynaMapTest.java
index b96a7a52..919e7e7d 100644
--- a/src/test/java/org/apache/commons/beanutils/LazyDynaMapTest.java
+++ b/src/test/java/org/apache/commons/beanutils/LazyDynaMapTest.java
@@ -24,21 +24,13 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* <p>Test Case for the {@code LazyDynaMap} implementation class.</p>
*
*/
public class LazyDynaMapTest extends TestCase {
- /**
- * Return the tests included in this test suite.
- */
- public static Test suite() {
- return new TestSuite(LazyDynaMapTest.class);
- }
protected LazyDynaMap dynaMap;
protected String testProperty = "myProperty";
protected String testPropertyA = "myProperty-A";
diff --git a/src/test/java/org/apache/commons/beanutils/MappedPropertyTest.java
b/src/test/java/org/apache/commons/beanutils/MappedPropertyTest.java
index bede396f..dd6a7985 100644
--- a/src/test/java/org/apache/commons/beanutils/MappedPropertyTest.java
+++ b/src/test/java/org/apache/commons/beanutils/MappedPropertyTest.java
@@ -16,22 +16,13 @@
*/
package org.apache.commons.beanutils;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* <p>Test Case for the {@code MappedPropertyDescriptor}.</p>
*
*/
public class MappedPropertyTest extends TestCase {
- /**
- * Return the tests included in this test suite.
- */
- public static Test suite() {
- return new TestSuite(MappedPropertyTest.class);
- }
-
/**
* Construct a new instance of this test case.
*
diff --git a/src/test/java/org/apache/commons/beanutils/MethodUtilsTest.java
b/src/test/java/org/apache/commons/beanutils/MethodUtilsTest.java
index 32e140a5..351862e2 100644
--- a/src/test/java/org/apache/commons/beanutils/MethodUtilsTest.java
+++ b/src/test/java/org/apache/commons/beanutils/MethodUtilsTest.java
@@ -24,9 +24,7 @@ import java.lang.reflect.Modifier;
import org.apache.commons.beanutils.priv.PrivateBeanFactory;
import org.apache.commons.beanutils.priv.PublicSubBean;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* <p> Test case for {@code MethodUtils} </p>
@@ -41,14 +39,6 @@ public class MethodUtilsTest extends TestCase {
assertTrue("Method is not public",
Modifier.isPublic(method.getModifiers()));
}
-
- /**
- * Return the tests included in this test suite.
- */
- public static Test suite() {
- return new TestSuite(MethodUtilsTest.class);
- }
-
/**
* Construct a new instance of this test case.
*
diff --git
a/src/test/java/org/apache/commons/beanutils/PropertyUtilsBenchCase.java
b/src/test/java/org/apache/commons/beanutils/PropertyUtilsBenchCase.java
index 69cbc3e7..d33f4d9e 100644
--- a/src/test/java/org/apache/commons/beanutils/PropertyUtilsBenchCase.java
+++ b/src/test/java/org/apache/commons/beanutils/PropertyUtilsBenchCase.java
@@ -20,9 +20,7 @@ package org.apache.commons.beanutils;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* JUnit Test Case containing microbenchmarks for PropertyUtils.
@@ -30,16 +28,6 @@ import junit.framework.TestSuite;
*/
public class PropertyUtilsBenchCase extends TestCase {
-
- /**
- * Return the tests included in this test suite.
- */
- public static Test suite() {
-
- return new TestSuite(PropertyUtilsBenchCase.class);
-
- }
-
// Basic loop counter
private long counter = 100000;
diff --git a/src/test/java/org/apache/commons/beanutils/PropertyUtilsTest.java
b/src/test/java/org/apache/commons/beanutils/PropertyUtilsTest.java
index d052b3d1..574bb541 100644
--- a/src/test/java/org/apache/commons/beanutils/PropertyUtilsTest.java
+++ b/src/test/java/org/apache/commons/beanutils/PropertyUtilsTest.java
@@ -33,9 +33,7 @@ import org.apache.commons.beanutils.priv.PrivateBeanFactory;
import org.apache.commons.beanutils.priv.PrivateDirect;
import org.apache.commons.beanutils.priv.PublicSubBean;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* <p>Test Case for the PropertyUtils class. The majority of these tests use
@@ -127,16 +125,6 @@ public class PropertyUtilsTest extends TestCase {
}
return null;
}
-
- /**
- * Return the tests included in this test suite.
- */
- public static Test suite() {
-
- return new TestSuite(PropertyUtilsTest.class);
-
- }
-
/**
* The basic test bean for each test.
*/
diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira157Test.java
b/src/test/java/org/apache/commons/beanutils/bugs/Jira157Test.java
index ce357d2d..57270338 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira157Test.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira157Test.java
@@ -25,9 +25,7 @@ import
org.apache.commons.beanutils.SuppressPropertiesBeanIntrospector;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* Beanutils's describe() method cannot determine reader methods for anonymous
@@ -58,15 +56,6 @@ public class Jira157Test extends TestCase {
String getX();
String getY();
}
- /**
- * Create a test suite for this test.
- *
- * @return a test suite
- */
- public static Test suite() {
- return new TestSuite(Jira157Test.class);
- }
-
private final Log log = LogFactory.getLog(Jira157Test.class);
/**
diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira18Test.java
b/src/test/java/org/apache/commons/beanutils/bugs/Jira18Test.java
index a0cecd02..f10a51dc 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira18Test.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira18Test.java
@@ -21,9 +21,7 @@ import
org.apache.commons.beanutils.bugs.other.Jira18BeanFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* Test case for Jira issue# BEANUTILS-18.
@@ -33,14 +31,6 @@ 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 Jira18Test extends TestCase {
- /**
- * Create a test suite for this test.
- *
- * @return a test suite
- */
- public static Test suite() {
- return new TestSuite(Jira18Test.class);
- }
private final Log log = LogFactory.getLog(Jira18Test.class);
diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira273Test.java
b/src/test/java/org/apache/commons/beanutils/bugs/Jira273Test.java
index 1ad5ac19..35567967 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira273Test.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira273Test.java
@@ -21,9 +21,7 @@ import
org.apache.commons.beanutils.bugs.other.Jira273BeanFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* Public methods overriden in anonymous or private subclasses
@@ -32,15 +30,6 @@ 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 Jira273Test extends TestCase {
- /**
- * Create a test suite for this test.
- *
- * @return a test suite
- */
- public static Test suite() {
- return new TestSuite(Jira273Test.class);
- }
-
private final Log log = LogFactory.getLog(Jira273Test.class);
/**
diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira298Test.java
b/src/test/java/org/apache/commons/beanutils/bugs/Jira298Test.java
index fbfb45d5..86237124 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira298Test.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira298Test.java
@@ -25,23 +25,12 @@ import
org.apache.commons.beanutils.bugs.other.Jira298BeanFactory.IX;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import junit.framework.Test;
import junit.framework.TestCase;
-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 Jira298Test extends TestCase {
- /**
- * Create a test suite for this test.
- *
- * @return a test suite
- */
- public static Test suite() {
- return new TestSuite(Jira298Test.class);
- }
-
private final Log log = LogFactory.getLog(Jira298Test.class);
/**
diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira339Test.java
b/src/test/java/org/apache/commons/beanutils/bugs/Jira339Test.java
index 579d1d9f..5dbb5c12 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira339Test.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira339Test.java
@@ -25,9 +25,7 @@ import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* @see <a
href="https://issues.apache.org/jira/browse/BEANUTILS-339";>https://issues.apache.org/jira/browse/BEANUTILS-339</a>
@@ -59,15 +57,6 @@ public class Jira339Test extends TestCase {
}
}
- /**
- * Create a test suite for this test.
- *
- * @return a test suite
- */
- public static Test suite() {
- return new TestSuite(Jira339Test.class);
- }
-
private final Log log = LogFactory.getLog(Jira339Test.class);
/**
diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira345Test.java
b/src/test/java/org/apache/commons/beanutils/bugs/Jira345Test.java
index 0132001f..59fac057 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira345Test.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira345Test.java
@@ -18,9 +18,7 @@ package org.apache.commons.beanutils.bugs;
import org.apache.commons.beanutils.BeanUtils;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* @see <a
href="https://issues.apache.org/jira/browse/BEANUTILS-345";>https://issues.apache.org/jira/browse/BEANUTILS-345</a>
@@ -50,15 +48,6 @@ public class Jira345Test extends TestCase {
this.matr3D = matr3D;
}
}
- /**
- * Create a test suite for this test.
- *
- * @return a test suite
- */
- public static Test suite() {
- return new TestSuite(Jira345Test.class);
- }
-
/**
* Create a test case with the specified name.
*
diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira349Test.java
b/src/test/java/org/apache/commons/beanutils/bugs/Jira349Test.java
index 3dfbace8..8cb16ba8 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira349Test.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira349Test.java
@@ -20,9 +20,7 @@ import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* @see <a
href="https://issues.apache.org/jira/browse/BEANUTILS-349";>https://issues.apache.org/jira/browse/BEANUTILS-349</a>
@@ -54,15 +52,6 @@ public class Jira349Test extends TestCase {
this.testProperty = testProperty;
}
}
- /**
- * Create a test suite for this test.
- *
- * @return a test suite
- */
- public static Test suite() {
- return new TestSuite(Jira349Test.class);
- }
-
private final Log log = LogFactory.getLog(Jira349Test .class);
/**
diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira357Test.java
b/src/test/java/org/apache/commons/beanutils/bugs/Jira357Test.java
index ac385486..6c975165 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira357Test.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira357Test.java
@@ -20,9 +20,7 @@ import java.beans.PropertyDescriptor;
import org.apache.commons.beanutils.PropertyUtils;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* @see <a
href="https://issues.apache.org/jira/browse/BEANUTILS-357";>https://issues.apache.org/jira/browse/BEANUTILS-357</a>
@@ -87,15 +85,6 @@ public class Jira357Test extends TestCase {
this.innerClassProperty = innerClassProperty;
}
}
- /**
- * Create a test suite for this test.
- *
- * @return a test suite
- */
- public static Test suite() {
- return new TestSuite(Jira357Test.class);
- }
-
/**
* Create a test case with the specified name.
*
diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira358Test.java
b/src/test/java/org/apache/commons/beanutils/bugs/Jira358Test.java
index 34c0ad4a..d323a8bf 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira358Test.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira358Test.java
@@ -19,23 +19,12 @@ package org.apache.commons.beanutils.bugs;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.beanutils.TestBean;
-import junit.framework.Test;
import junit.framework.TestCase;
-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 Jira358Test extends TestCase {
- /**
- * Create a test suite for this test.
- *
- * @return a test suite
- */
- public static Test suite() {
- return new TestSuite(Jira358Test.class);
- }
-
/**
* Create a test case with the specified name.
*
diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira359Test.java
b/src/test/java/org/apache/commons/beanutils/bugs/Jira359Test.java
index 13b10c76..06acb404 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira359Test.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira359Test.java
@@ -21,9 +21,7 @@ import org.apache.commons.beanutils.BeanUtilsBean;
import org.apache.commons.beanutils.converters.ArrayConverter;
import org.apache.commons.beanutils.converters.StringConverter;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* @see <a
href="https://issues.apache.org/jira/browse/BEANUTILS-359";>https://issues.apache.org/jira/browse/BEANUTILS-359</a>
@@ -41,15 +39,6 @@ public class Jira359Test extends TestCase {
this.jcrMixinTypes = mixinTypes;
}
}
- /**
- * Create a test suite for this test.
- *
- * @return a test suite
- */
- public static Test suite() {
- return new TestSuite(Jira359Test.class);
- }
-
/**
* Create a test case with the specified name.
*
diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira368Test.java
b/src/test/java/org/apache/commons/beanutils/bugs/Jira368Test.java
index 8b1f8659..e06cb442 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira368Test.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira368Test.java
@@ -18,23 +18,12 @@ package org.apache.commons.beanutils.bugs;
import org.apache.commons.beanutils.BeanUtils;
-import junit.framework.Test;
import junit.framework.TestCase;
-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 Jira368Test extends TestCase {
- /**
- * Create a test suite for this test.
- *
- * @return a test suite
- */
- public static Test suite() {
- return new TestSuite(Jira368Test.class);
- }
-
/**
* Create a test case with the specified name.
*
diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira369Test.java
b/src/test/java/org/apache/commons/beanutils/bugs/Jira369Test.java
index 3fd6cfa3..56327289 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira369Test.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira369Test.java
@@ -18,9 +18,7 @@ package org.apache.commons.beanutils.bugs;
import org.apache.commons.beanutils.BeanUtils;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* @see <a
href="https://issues.apache.org/jira/browse/BEANUTILS-369";>https://issues.apache.org/jira/browse/BEANUTILS-369</a>
@@ -50,15 +48,6 @@ public class Jira369Test extends TestCase {
this.bproperty = bproperty;
}
}
- /**
- * Create a test suite for this test.
- *
- * @return a test suite
- */
- public static Test suite() {
- return new TestSuite(Jira369Test.class);
- }
-
/**
* Create a test case with the specified name.
*
diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira61Test.java
b/src/test/java/org/apache/commons/beanutils/bugs/Jira61Test.java
index fac73110..e69b9ecd 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira61Test.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira61Test.java
@@ -27,9 +27,7 @@ import
org.apache.commons.beanutils.bugs.other.Jira61BeanFactory.TestBean;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* Test case for Jira issue# BEANUTILS-61.
@@ -43,14 +41,6 @@ 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 Jira61Test extends TestCase {
- /**
- * Create a test suite for this test.
- *
- * @return a test suite
- */
- public static Test suite() {
- return new TestSuite(Jira61Test.class);
- }
private final Log log = LogFactory.getLog(Jira61Test.class);
private Jira61BeanFactory.TestBean testBean;
diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira87Test.java
b/src/test/java/org/apache/commons/beanutils/bugs/Jira87Test.java
index 5876bc35..21e0cd12 100644
--- a/src/test/java/org/apache/commons/beanutils/bugs/Jira87Test.java
+++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira87Test.java
@@ -21,9 +21,7 @@ import
org.apache.commons.beanutils.bugs.other.Jira87BeanFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* Test case for Jiar issue# BEANUTILS-87.
@@ -40,15 +38,6 @@ 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 Jira87Test extends TestCase {
- /**
- * Create a test suite for this test.
- *
- * @return a test suite
- */
- public static Test suite() {
- return new TestSuite(Jira87Test.class);
- }
-
private final Log log = LogFactory.getLog(Jira87Test.class);
/**
diff --git
a/src/test/java/org/apache/commons/beanutils/converters/ArrayConverterTestCase.java
b/src/test/java/org/apache/commons/beanutils/converters/ArrayConverterTestCase.java
index 5b1ae6e6..656ed181 100644
---
a/src/test/java/org/apache/commons/beanutils/converters/ArrayConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils/converters/ArrayConverterTestCase.java
@@ -22,22 +22,12 @@ import java.util.Collections;
import java.util.Locale;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* Test Case for the ArrayConverter class.
*
*/
public class ArrayConverterTestCase extends TestCase {
-
- /**
- * Create Test Suite
- * @return test suite
- */
- public static TestSuite suite() {
- return new TestSuite(ArrayConverterTestCase.class);
- }
-
/**
* Construct a new Array Converter test case.
* @param name Test Name
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 16c61ae2..bfff09f5 100644
---
a/src/test/java/org/apache/commons/beanutils/converters/BigDecimalConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils/converters/BigDecimalConverterTestCase.java
@@ -21,8 +21,6 @@ import java.math.BigDecimal;
import org.apache.commons.beanutils.Converter;
-import junit.framework.TestSuite;
-
/**
* Test Case for the DoubleConverter class.
*
@@ -41,11 +39,6 @@ public class BigDecimalConverterTestCase extends
NumberConverterTest {
super(val);
}
}
-
- public static TestSuite suite() {
- return new TestSuite(BigDecimalConverterTestCase.class);
- }
-
private Converter converter;
public BigDecimalConverterTestCase(final String name) {
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 cc6f6a41..6f51f4ea 100644
---
a/src/test/java/org/apache/commons/beanutils/converters/BigIntegerConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils/converters/BigIntegerConverterTestCase.java
@@ -21,18 +21,11 @@ import java.math.BigInteger;
import org.apache.commons.beanutils.Converter;
-import junit.framework.TestSuite;
-
/**
* Test Case for the BigInteger class.
*
*/
public class BigIntegerConverterTestCase extends NumberConverterTest {
-
- public static TestSuite suite() {
- return new TestSuite(BigIntegerConverterTestCase.class);
- }
-
private Converter converter;
public BigIntegerConverterTestCase(final String name) {
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 18a1f317..d9179738 100644
---
a/src/test/java/org/apache/commons/beanutils/converters/ByteConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils/converters/ByteConverterTestCase.java
@@ -19,19 +19,12 @@ package org.apache.commons.beanutils.converters;
import org.apache.commons.beanutils.Converter;
-import junit.framework.TestSuite;
-
/**
* Test Case for the ByteConverter class.
*
*/
public class ByteConverterTestCase extends NumberConverterTest {
-
- public static TestSuite suite() {
- return new TestSuite(ByteConverterTestCase.class);
- }
-
private Converter converter;
public ByteConverterTestCase(final String name) {
diff --git
a/src/test/java/org/apache/commons/beanutils/converters/CalendarConverterTestCase.java
b/src/test/java/org/apache/commons/beanutils/converters/CalendarConverterTestCase.java
index 1144c5e5..fbaa51c6 100644
---
a/src/test/java/org/apache/commons/beanutils/converters/CalendarConverterTestCase.java
+++
b/src/test/java/org/apache/commons/beanutils/converters/CalendarConverterTestCase.java
@@ -18,22 +18,11 @@ package org.apache.commons.beanutils.converters;
import java.util.Calendar;
-import junit.framework.TestSuite;
-
/**
* Test Case for the CalendarConverter class.
*
*/
public class CalendarConverterTestCase extends DateConverterTestBase {
-
- /**
- * Create Test Suite
- * @return test suite
- */
- public static TestSuite suite() {
- return new TestSuite(CalendarConverterTestCase.class);
- }
-
/**
* Construct a new Calendar test case.
* @param name Test Name
diff --git
a/src/test/java/org/apache/commons/beanutils/converters/CharacterConverterTest.java
b/src/test/java/org/apache/commons/beanutils/converters/CharacterConverterTest.java
index 34242d33..bb219edb 100644
---
a/src/test/java/org/apache/commons/beanutils/converters/CharacterConverterTest.java
+++
b/src/test/java/org/apache/commons/beanutils/converters/CharacterConverterTest.java
@@ -20,22 +20,12 @@ import org.apache.commons.beanutils.ConversionException;
import org.apache.commons.beanutils.Converter;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* Test Case for the CharacterConverter class.
*
*/
public class CharacterConverterTest extends TestCase {
-
- /**
- * Create Test Suite
- * @return test suite
- */
- public static TestSuite suite() {
- return new TestSuite(CharacterConverterTest.class);
- }
-
/**
* Construct a new Character Converter test case.
* @param name Test Name
diff --git
a/src/test/java/org/apache/commons/beanutils/converters/ClassConverterTest.java
b/src/test/java/org/apache/commons/beanutils/converters/ClassConverterTest.java
index 1fbb26e4..662128ef 100644
---
a/src/test/java/org/apache/commons/beanutils/converters/ClassConverterTest.java
+++
b/src/test/java/org/apache/commons/beanutils/converters/ClassConverterTest.java
@@ -20,22 +20,12 @@ import org.apache.commons.beanutils.ConversionException;
import org.apache.commons.beanutils.Converter;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* Test Case for the ClassConverter class.
*
*/
public class ClassConverterTest extends TestCase {
-
- /**
- * Create Test Suite
- * @return test suite
- */
- public static TestSuite suite() {
- return new TestSuite(ClassConverterTest.class);
- }
-
/**
* Construct a new Class Converter test case.
* @param name Test Name
diff --git
a/src/test/java/org/apache/commons/beanutils/converters/ClassReloaderTest.java
b/src/test/java/org/apache/commons/beanutils/converters/ClassReloaderTest.java
index eaa986c2..51841d30 100644
---
a/src/test/java/org/apache/commons/beanutils/converters/ClassReloaderTest.java
+++
b/src/test/java/org/apache/commons/beanutils/converters/ClassReloaderTest.java
@@ -18,7 +18,6 @@
package org.apache.commons.beanutils.converters;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* Tests for the ClassReloader utility class.
@@ -29,11 +28,6 @@ public class ClassReloaderTest extends TestCase {
public static class DummyClass {
}
-
- public static TestSuite suite() {
- return new TestSuite(ClassReloaderTest.class);
- }
-
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 6c7549f5..c63e80b7 100644
---
a/src/test/java/org/apache/commons/beanutils/converters/ConverterTestSuite.java
+++
b/src/test/java/org/apache/commons/beanutils/converters/ConverterTestSuite.java
@@ -17,9 +17,6 @@
package org.apache.commons.beanutils.converters;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
/**
* <p>
* Created a test suite so that new test cases can be added here without
having to
@@ -29,34 +26,5 @@ import junit.framework.TestSuite;
*/
public class ConverterTestSuite {
-
- /**
- * Return the tests included in this test suite.
- */
- public static Test suite() {
- final TestSuite testSuite = new TestSuite();
- testSuite.addTestSuite(ArrayConverterTestCase.class);
- testSuite.addTestSuite(BigDecimalConverterTestCase.class);
- testSuite.addTestSuite(BigIntegerConverterTestCase.class);
- testSuite.addTestSuite(BooleanArrayConverterTestCase.class);
- testSuite.addTestSuite(BooleanConverterTestCase.class);
- testSuite.addTestSuite(ByteConverterTestCase.class);
- testSuite.addTestSuite(CalendarConverterTestCase.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/DateConverterTest.java
b/src/test/java/org/apache/commons/beanutils/converters/DateConverterTest.java
index 9520e2a2..f650ea06 100644
---
a/src/test/java/org/apache/commons/beanutils/converters/DateConverterTest.java
+++
b/src/test/java/org/apache/commons/beanutils/converters/DateConverterTest.java
@@ -19,22 +19,11 @@ package org.apache.commons.beanutils.converters;
import java.util.Calendar;
import java.util.Date;
-import junit.framework.TestSuite;
-
/**
* Test Case for the DateConverter class.
*
*/
public class DateConverterTest extends DateConverterTestBase {
-
- /**
- * Create Test Suite
- * @return test suite
- */
- public static TestSuite suite() {
- return new TestSuite(DateConverterTest.class);
- }
-
/**
* Construct a new Date test case.
* @param name Test Name
diff --git
a/src/test/java/org/apache/commons/beanutils/converters/DoubleConverterTest.java
b/src/test/java/org/apache/commons/beanutils/converters/DoubleConverterTest.java
index c3348bdd..3b350db9 100644
---
a/src/test/java/org/apache/commons/beanutils/converters/DoubleConverterTest.java
+++
b/src/test/java/org/apache/commons/beanutils/converters/DoubleConverterTest.java
@@ -19,19 +19,12 @@ package org.apache.commons.beanutils.converters;
import org.apache.commons.beanutils.Converter;
-import junit.framework.TestSuite;
-
/**
* Test Case for the DoubleConverter class.
*
*/
public class DoubleConverterTest extends NumberConverterTest {
-
- public static TestSuite suite() {
- return new TestSuite(DoubleConverterTest.class);
- }
-
private Converter converter;
public DoubleConverterTest(final String name) {
diff --git
a/src/test/java/org/apache/commons/beanutils/converters/FileConverterTest.java
b/src/test/java/org/apache/commons/beanutils/converters/FileConverterTest.java
index 85183584..3097c817 100644
---
a/src/test/java/org/apache/commons/beanutils/converters/FileConverterTest.java
+++
b/src/test/java/org/apache/commons/beanutils/converters/FileConverterTest.java
@@ -23,7 +23,6 @@ import org.apache.commons.beanutils.ConversionException;
import org.apache.commons.beanutils.Converter;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* Test Case for the FileConverter class.
@@ -31,11 +30,6 @@ import junit.framework.TestSuite;
*/
public class FileConverterTest extends TestCase {
-
- public static TestSuite suite() {
- return new TestSuite(FileConverterTest.class);
- }
-
private Converter converter;
public FileConverterTest(final String name) {
diff --git
a/src/test/java/org/apache/commons/beanutils/converters/FloatConverterTest.java
b/src/test/java/org/apache/commons/beanutils/converters/FloatConverterTest.java
index e00f0da0..373cdc1a 100644
---
a/src/test/java/org/apache/commons/beanutils/converters/FloatConverterTest.java
+++
b/src/test/java/org/apache/commons/beanutils/converters/FloatConverterTest.java
@@ -19,19 +19,12 @@ package org.apache.commons.beanutils.converters;
import org.apache.commons.beanutils.Converter;
-import junit.framework.TestSuite;
-
/**
* Test Case for the FloatConverter class.
*
*/
public class FloatConverterTest extends NumberConverterTest {
-
- public static TestSuite suite() {
- return new TestSuite(FloatConverterTest.class);
- }
-
private Converter converter;
public FloatConverterTest(final String name) {
diff --git
a/src/test/java/org/apache/commons/beanutils/converters/IntegerConverterTest.java
b/src/test/java/org/apache/commons/beanutils/converters/IntegerConverterTest.java
index bfbf2070..d85122c4 100644
---
a/src/test/java/org/apache/commons/beanutils/converters/IntegerConverterTest.java
+++
b/src/test/java/org/apache/commons/beanutils/converters/IntegerConverterTest.java
@@ -20,19 +20,12 @@ package org.apache.commons.beanutils.converters;
import org.apache.commons.beanutils.ConversionException;
import org.apache.commons.beanutils.Converter;
-import junit.framework.TestSuite;
-
/**
* Test Case for the IntegerConverter class.
*
*/
public class IntegerConverterTest extends NumberConverterTest {
-
- public static TestSuite suite() {
- return new TestSuite(IntegerConverterTest.class);
- }
-
private Converter converter;
public IntegerConverterTest(final String name) {
diff --git
a/src/test/java/org/apache/commons/beanutils/converters/LongConverterTest.java
b/src/test/java/org/apache/commons/beanutils/converters/LongConverterTest.java
index 6fd5339c..ddfbc85f 100644
---
a/src/test/java/org/apache/commons/beanutils/converters/LongConverterTest.java
+++
b/src/test/java/org/apache/commons/beanutils/converters/LongConverterTest.java
@@ -19,19 +19,12 @@ package org.apache.commons.beanutils.converters;
import org.apache.commons.beanutils.Converter;
-import junit.framework.TestSuite;
-
/**
* Test Case for the LongConverter class.
*
*/
public class LongConverterTest extends NumberConverterTest {
-
- public static TestSuite suite() {
- return new TestSuite(LongConverterTest.class);
- }
-
private Converter converter;
public LongConverterTest(final String name) {
diff --git
a/src/test/java/org/apache/commons/beanutils/converters/ShortConverterTest.java
b/src/test/java/org/apache/commons/beanutils/converters/ShortConverterTest.java
index bc5f255d..5660a8ae 100644
---
a/src/test/java/org/apache/commons/beanutils/converters/ShortConverterTest.java
+++
b/src/test/java/org/apache/commons/beanutils/converters/ShortConverterTest.java
@@ -19,19 +19,12 @@ package org.apache.commons.beanutils.converters;
import org.apache.commons.beanutils.Converter;
-import junit.framework.TestSuite;
-
/**
* Test Case for the ShortConverter class.
*
*/
public class ShortConverterTest extends NumberConverterTest {
-
- public static TestSuite suite() {
- return new TestSuite(ShortConverterTest.class);
- }
-
private Converter converter;
public ShortConverterTest(final String name) {
diff --git
a/src/test/java/org/apache/commons/beanutils/converters/SqlDateConverterTest.java
b/src/test/java/org/apache/commons/beanutils/converters/SqlDateConverterTest.java
index 83dc4bad..14034c40 100644
---
a/src/test/java/org/apache/commons/beanutils/converters/SqlDateConverterTest.java
+++
b/src/test/java/org/apache/commons/beanutils/converters/SqlDateConverterTest.java
@@ -20,23 +20,12 @@ package org.apache.commons.beanutils.converters;
import java.sql.Date;
import java.util.Calendar;
-import junit.framework.TestSuite;
-
/**
* Test Case for the {@link SqlDateConverter} class.
*
*/
public class SqlDateConverterTest extends DateConverterTestBase {
-
- /**
- * Create Test Suite
- * @return test suite
- */
- public static TestSuite suite() {
- return new TestSuite(SqlDateConverterTest.class);
- }
-
/**
* Construct a new Date test case.
* @param name Test Name
diff --git
a/src/test/java/org/apache/commons/beanutils/converters/SqlTimeConverterTest.java
b/src/test/java/org/apache/commons/beanutils/converters/SqlTimeConverterTest.java
index 39d8d4e9..b8a5bf4d 100644
---
a/src/test/java/org/apache/commons/beanutils/converters/SqlTimeConverterTest.java
+++
b/src/test/java/org/apache/commons/beanutils/converters/SqlTimeConverterTest.java
@@ -23,23 +23,12 @@ import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Locale;
-import junit.framework.TestSuite;
-
/**
* Test Case for the {@link SqlTimeConverter} class.
*
*/
public class SqlTimeConverterTest extends DateConverterTestBase {
-
- /**
- * Create Test Suite
- * @return test suite
- */
- public static TestSuite suite() {
- return new TestSuite(SqlTimeConverterTest.class);
- }
-
/**
* Construct a new Date test case.
* @param name Test Name
diff --git
a/src/test/java/org/apache/commons/beanutils/converters/SqlTimestampConverterTest.java
b/src/test/java/org/apache/commons/beanutils/converters/SqlTimestampConverterTest.java
index 4dc2b755..e31a7831 100644
---
a/src/test/java/org/apache/commons/beanutils/converters/SqlTimestampConverterTest.java
+++
b/src/test/java/org/apache/commons/beanutils/converters/SqlTimestampConverterTest.java
@@ -24,21 +24,10 @@ import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
-import junit.framework.TestSuite;
-
/**
* Test Case for the {@link SqlTimestampConverter} class.
*/
public class SqlTimestampConverterTest extends DateConverterTestBase {
-
- /**
- * Create Test Suite
- * @return test suite
- */
- public static TestSuite suite() {
- return new TestSuite(SqlTimestampConverterTest.class);
- }
-
/**
* Construct a new Date test case.
* @param name Test Name
diff --git
a/src/test/java/org/apache/commons/beanutils/converters/URLConverterTest.java
b/src/test/java/org/apache/commons/beanutils/converters/URLConverterTest.java
index e2afbf6d..a89835ff 100644
---
a/src/test/java/org/apache/commons/beanutils/converters/URLConverterTest.java
+++
b/src/test/java/org/apache/commons/beanutils/converters/URLConverterTest.java
@@ -23,7 +23,6 @@ import org.apache.commons.beanutils.ConversionException;
import org.apache.commons.beanutils.Converter;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* Test Case for the URLConverter class.
@@ -31,11 +30,6 @@ import junit.framework.TestSuite;
*/
public class URLConverterTest extends TestCase {
-
- public static TestSuite suite() {
- return new TestSuite(URLConverterTest.class);
- }
-
private Converter converter;
public URLConverterTest(final String name) {
diff --git
a/src/test/java/org/apache/commons/beanutils/expression/DefaultResolverTest.java
b/src/test/java/org/apache/commons/beanutils/expression/DefaultResolverTest.java
index f498af50..526fde43 100644
---
a/src/test/java/org/apache/commons/beanutils/expression/DefaultResolverTest.java
+++
b/src/test/java/org/apache/commons/beanutils/expression/DefaultResolverTest.java
@@ -17,22 +17,12 @@
package org.apache.commons.beanutils.expression;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* Junit Test for BasicResolver.
*
*/
public class DefaultResolverTest extends TestCase {
-
- /**
- * Create Test Suite
- * @return test suite
- */
- public static TestSuite suite() {
- return new TestSuite(DefaultResolverTest.class);
- }
-
private final DefaultResolver resolver = new DefaultResolver();
// Simple Properties Test Data
private final String[] validProperties = {null, "", "a", "bc", "def",
"g.h", "ij.k", "lm.no", "pqr.stu"};
diff --git
a/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTest.java
b/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTest.java
index 9057ded9..9b192e44 100644
--- a/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTest.java
+++ b/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTest.java
@@ -20,9 +20,7 @@ import org.apache.commons.beanutils.TestBean;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* Test Case for {@link LocaleBeanUtils}.
@@ -31,15 +29,6 @@ import junit.framework.TestSuite;
public class LocaleBeanUtilsTest extends TestCase {
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(LocaleBeanUtilsTest.class);
- }
-
/**
* Construct a new instance of this test case.
*
diff --git
a/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTest.java
b/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTest.java
index 3f47b6e4..66904321 100644
---
a/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTest.java
+++
b/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTest.java
@@ -31,9 +31,7 @@ import org.apache.commons.beanutils.PrimitiveBean;
import org.apache.commons.beanutils.locale.converters.LongLocaleConverter;
import org.apache.commons.logging.LogFactory;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* <p>
@@ -102,14 +100,6 @@ public class LocaleBeanificationTest extends TestCase {
/** 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(LocaleBeanificationTest.class);
- }
-
/**
* Construct a new instance of this test case.
*
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 a8bf4e5d..54108874 100644
---
a/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertTestSuite.java
+++
b/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertTestSuite.java
@@ -17,19 +17,6 @@
package org.apache.commons.beanutils.locale;
-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;
-
/**
* <p>
* Created a test suite so that new test cases can be added here without
having to
@@ -39,24 +26,5 @@ import junit.framework.TestSuite;
*/
public class LocaleConvertTestSuite {
-
- /**
- * Return the tests included in this test suite.
- */
- public static Test suite() {
- final TestSuite testSuite = new TestSuite();
- 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/LocaleConvertUtilsTest.java
b/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsTest.java
index d0e88c1d..ade40980 100644
---
a/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsTest.java
+++
b/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsTest.java
@@ -25,9 +25,7 @@ import java.util.Locale;
import org.apache.commons.beanutils.ConversionException;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* <p>
@@ -38,14 +36,6 @@ import junit.framework.TestSuite;
*/
public class LocaleConvertUtilsTest extends TestCase {
-
- /**
- * Return the tests included in this test suite.
- */
- public static Test suite() {
- return new TestSuite(LocaleConvertUtilsTest.class);
- }
-
private char m_decimalSeparator;
/**
