Fixing names of classes so they compile/run

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@751359 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Henri Yandell 2009-03-08 02:20:22 +00:00
parent e745797ab3
commit eca2cde607
7 changed files with 81 additions and 79 deletions

View File

@ -28,16 +28,16 @@ import junit.framework.TestCase;
* @author <a href="mailto:steven@caswell.name">Steven Caswell</a>
* @version $Id$
*/
public abstract class AbstractNestableTestCase extends TestCase
public abstract class AbstractNestableTest extends TestCase
{
/**
* Constructs an instance of
* <code>AbstractNestableTestCase</code>.
* <code>AbstractNestableTest</code>.
*
* @param name the test name
*/
public AbstractNestableTestCase(String name)
public AbstractNestableTest(String name)
{
super(name);
}

View File

@ -47,11 +47,11 @@ public class ExceptionTestSuite extends TestCase
public static Test suite()
{
TestSuite suite = new TestSuite();
suite.addTest(NestableDelegateTestCase.suite());
suite.addTest(NestableErrorTestCase.suite());
suite.addTest(NestableExceptionTestCase.suite());
suite.addTest(NestableRuntimeExceptionTestCase.suite());
suite.addTest(ExceptionUtilsTestCase.suite());
suite.addTest(NestableDelegateTest.suite());
suite.addTest(NestableErrorTest.suite());
suite.addTest(NestableExceptionTest.suite());
suite.addTest(NestableRuntimeExceptionTest.suite());
suite.addTest(ExceptionUtilsTest.suite());
return suite;
}
}

View File

@ -29,6 +29,7 @@ import java.util.List;
import junit.framework.Assert;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.commons.lang.SystemUtils;
@ -58,7 +59,7 @@ import org.apache.commons.lang.SystemUtils;
* @author <a href="mailto:ggregory@seagullsw.com">Gary Gregory</a>
* @since 1.0
*/
public class ExceptionUtilsTestCase extends junit.framework.TestCase {
public class ExceptionUtilsTest extends TestCase {
private NestableException nested;
private Throwable withCause;
@ -67,12 +68,12 @@ public class ExceptionUtilsTestCase extends junit.framework.TestCase {
private ExceptionWithCause selfCause;
private ExceptionWithCause cyclicCause;
public ExceptionUtilsTestCase(String name) {
public ExceptionUtilsTest(String name) {
super(name);
}
public static Test suite() {
return new TestSuite(ExceptionUtilsTestCase.class);
return new TestSuite(ExceptionUtilsTest.class);
}
public void setUp() {
@ -545,7 +546,7 @@ public class ExceptionUtilsTestCase extends junit.framework.TestCase {
assertEquals("IllegalArgumentException: Base", ExceptionUtils.getMessage(th));
th = new ExceptionWithCause("Wrapper", th);
assertEquals("ExceptionUtilsTestCase.ExceptionWithCause: Wrapper", ExceptionUtils.getMessage(th));
assertEquals("ExceptionUtilsTest.ExceptionWithCause: Wrapper", ExceptionUtils.getMessage(th));
}
public void test_getRootCauseMessage_Throwable() {

View File

@ -23,6 +23,7 @@ import java.io.PrintStream;
import java.io.PrintWriter;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
@ -33,7 +34,7 @@ import junit.textui.TestRunner;
* @author Daniel L. Rall
* @version $Id$
*/
public class NestableDelegateTestCase extends junit.framework.TestCase {
public class NestableDelegateTest extends TestCase {
private static final String CONSTRUCTOR_FAILED_MSG =
"The Nestable implementation passed to the NestableDelegate(Nestable) constructor must extend java.lang.Throwable";
@ -43,9 +44,9 @@ public class NestableDelegateTestCase extends junit.framework.TestCase {
protected String lineSeparator;
/**
* Construct a new instance of NestableDelegateTestCase with the specified name
* Construct a new instance of NestableDelegateTest with the specified name
*/
public NestableDelegateTestCase(String name)
public NestableDelegateTest(String name)
{
super(name);
}
@ -60,7 +61,7 @@ public class NestableDelegateTestCase extends junit.framework.TestCase {
public static Test suite()
{
return new TestSuite(NestableDelegateTestCase.class);
return new TestSuite(NestableDelegateTest.class);
}
/**

View File

@ -28,15 +28,15 @@ import junit.textui.TestRunner;
* @author <a href="mailto:steven@caswell.name">Steven Caswell</a>
* @version $Id$
*/
public class NestableErrorTestCase extends AbstractNestableTestCase {
public class NestableErrorTest extends AbstractNestableTest {
/**
* Construct a new instance of
* <code>NestableErrorTestCase</code>.
* <code>NestableErrorTest</code>.
*
* @param name test case name
*/
public NestableErrorTestCase(String name)
public NestableErrorTest(String name)
{
super(name);
}
@ -55,7 +55,7 @@ public class NestableErrorTestCase extends AbstractNestableTestCase {
*/
public static Test suite()
{
return new TestSuite(NestableErrorTestCase.class);
return new TestSuite(NestableErrorTest.class);
}
/**
@ -76,7 +76,7 @@ public class NestableErrorTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getNestable()
* @see AbstractNestableTest#getNestable()
*/
public Nestable getNestable()
{
@ -84,7 +84,7 @@ public class NestableErrorTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getNestable(Nestable)
* @see AbstractNestableTest#getNestable(Nestable)
*/
public Nestable getNestable(Nestable n)
{
@ -92,7 +92,7 @@ public class NestableErrorTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getNestable(String)
* @see AbstractNestableTest#getNestable(String)
*/
public Nestable getNestable(String msg)
{
@ -100,7 +100,7 @@ public class NestableErrorTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getNestable(Throwable)
* @see AbstractNestableTest#getNestable(Throwable)
*/
public Nestable getNestable(Throwable t)
{
@ -108,7 +108,7 @@ public class NestableErrorTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getNestable(String, Throwable)
* @see AbstractNestableTest#getNestable(String, Throwable)
*/
public Nestable getNestable(String msg, Throwable t)
{
@ -116,7 +116,7 @@ public class NestableErrorTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getNestable(String, Nestable)
* @see AbstractNestableTest#getNestable(String, Nestable)
*/
public Nestable getNestable(String msg, Nestable n)
{
@ -124,7 +124,7 @@ public class NestableErrorTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getTester1(Throwable)
* @see AbstractNestableTest#getTester1(Throwable)
*/
public Nestable getTester1(Throwable t)
{
@ -132,7 +132,7 @@ public class NestableErrorTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getTester1(Nestable)
* @see AbstractNestableTest#getTester1(Nestable)
*/
public Nestable getTester1(Nestable n)
{
@ -140,7 +140,7 @@ public class NestableErrorTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getTester1(String, Throwable)
* @see AbstractNestableTest#getTester1(String, Throwable)
*/
public Nestable getTester1(String msg, Throwable t)
{
@ -148,7 +148,7 @@ public class NestableErrorTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getTester1(String, Nestable)
* @see AbstractNestableTest#getTester1(String, Nestable)
*/
public Nestable getTester1(String msg, Nestable n)
{
@ -156,7 +156,7 @@ public class NestableErrorTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getTester1Class()
* @see AbstractNestableTest#getTester1Class()
*/
public Class getTester1Class()
{
@ -164,7 +164,7 @@ public class NestableErrorTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getTester2(String, Throwable)
* @see AbstractNestableTest#getTester2(String, Throwable)
*/
public Nestable getTester2(String msg, Throwable t)
{
@ -172,7 +172,7 @@ public class NestableErrorTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getTester2(String, Nestable)
* @see AbstractNestableTest#getTester2(String, Nestable)
*/
public Nestable getTester2(String msg, Nestable n)
{
@ -180,7 +180,7 @@ public class NestableErrorTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getTester2Class()
* @see AbstractNestableTest#getTester2Class()
*/
public Class getTester2Class()
{
@ -188,7 +188,7 @@ public class NestableErrorTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getThrowable(String)
* @see AbstractNestableTest#getThrowable(String)
*/
public Throwable getThrowable(String msg)
{
@ -196,7 +196,7 @@ public class NestableErrorTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getThrowableClass()
* @see AbstractNestableTest#getThrowableClass()
*/
public Class getThrowableClass()
{
@ -204,7 +204,7 @@ public class NestableErrorTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getBaseThrowableClass()
* @see AbstractNestableTest#getBaseThrowableClass()
*/
public Class getBaseThrowableClass()
{

View File

@ -33,15 +33,15 @@ import junit.textui.TestRunner;
* @author <a href="mailto:steven@caswell.name">Steven Caswell</a>
* @version $Id$
*/
public class NestableExceptionTestCase extends AbstractNestableTestCase {
public class NestableExceptionTest extends AbstractNestableTest {
/**
* Construct a new instance of
* <code>NestableExceptionTestCase</code>.
* <code>NestableExceptionTest</code>.
*
* @param name test case name
*/
public NestableExceptionTestCase(String name)
public NestableExceptionTest(String name)
{
super(name);
}
@ -60,7 +60,7 @@ public class NestableExceptionTestCase extends AbstractNestableTestCase {
*/
public static Test suite()
{
return new TestSuite(NestableExceptionTestCase.class);
return new TestSuite(NestableExceptionTest.class);
}
/**
@ -81,7 +81,7 @@ public class NestableExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getNestable()
* @see AbstractNestableTest#getNestable()
*/
public Nestable getNestable()
{
@ -89,7 +89,7 @@ public class NestableExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getNestable(Nestable)
* @see AbstractNestableTest#getNestable(Nestable)
*/
public Nestable getNestable(Nestable n)
{
@ -97,7 +97,7 @@ public class NestableExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getNestable(String)
* @see AbstractNestableTest#getNestable(String)
*/
public Nestable getNestable(String msg)
{
@ -105,7 +105,7 @@ public class NestableExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getNestable(Throwable)
* @see AbstractNestableTest#getNestable(Throwable)
*/
public Nestable getNestable(Throwable t)
{
@ -113,7 +113,7 @@ public class NestableExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getNestable(String, Throwable)
* @see AbstractNestableTest#getNestable(String, Throwable)
*/
public Nestable getNestable(String msg, Throwable t)
{
@ -121,7 +121,7 @@ public class NestableExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getNestable(String, Nestable)
* @see AbstractNestableTest#getNestable(String, Nestable)
*/
public Nestable getNestable(String msg, Nestable n)
{
@ -129,7 +129,7 @@ public class NestableExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getTester1(Throwable)
* @see AbstractNestableTest#getTester1(Throwable)
*/
public Nestable getTester1(Throwable t)
{
@ -137,7 +137,7 @@ public class NestableExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getTester1(Nestable)
* @see AbstractNestableTest#getTester1(Nestable)
*/
public Nestable getTester1(Nestable n)
{
@ -145,7 +145,7 @@ public class NestableExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getTester1(String, Throwable)
* @see AbstractNestableTest#getTester1(String, Throwable)
*/
public Nestable getTester1(String msg, Throwable t)
{
@ -153,7 +153,7 @@ public class NestableExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getTester1(String, Nestable)
* @see AbstractNestableTest#getTester1(String, Nestable)
*/
public Nestable getTester1(String msg, Nestable n)
{
@ -161,7 +161,7 @@ public class NestableExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getTester1Class()
* @see AbstractNestableTest#getTester1Class()
*/
public Class getTester1Class()
{
@ -169,7 +169,7 @@ public class NestableExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getTester2(String, Throwable)
* @see AbstractNestableTest#getTester2(String, Throwable)
*/
public Nestable getTester2(String msg, Throwable t)
{
@ -177,7 +177,7 @@ public class NestableExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getTester2(String, Nestable)
* @see AbstractNestableTest#getTester2(String, Nestable)
*/
public Nestable getTester2(String msg, Nestable n)
{
@ -185,7 +185,7 @@ public class NestableExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getTester2Class()
* @see AbstractNestableTest#getTester2Class()
*/
public Class getTester2Class()
{
@ -193,7 +193,7 @@ public class NestableExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getThrowable(String)
* @see AbstractNestableTest#getThrowable(String)
*/
public Throwable getThrowable(String msg)
{
@ -201,7 +201,7 @@ public class NestableExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getThrowableClass()
* @see AbstractNestableTest#getThrowableClass()
*/
public Class getThrowableClass()
{
@ -209,7 +209,7 @@ public class NestableExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getBaseThrowableClass()
* @see AbstractNestableTest#getBaseThrowableClass()
*/
public Class getBaseThrowableClass()
{

View File

@ -30,15 +30,15 @@ import junit.textui.TestRunner;
* @author <a href="mailto:steven@caswell.name">Steven Caswell</a>
* @version $Id$
*/
public class NestableRuntimeExceptionTestCase extends AbstractNestableTestCase {
public class NestableRuntimeExceptionTest extends AbstractNestableTest {
/**
* Construct a new instance of
* <code>NestableRuntimeExceptionTestCase</code>.
* <code>NestableRuntimeExceptionTest</code>.
*
* @param name test case name
*/
public NestableRuntimeExceptionTestCase(String name)
public NestableRuntimeExceptionTest(String name)
{
super(name);
}
@ -57,7 +57,7 @@ public class NestableRuntimeExceptionTestCase extends AbstractNestableTestCase {
*/
public static Test suite()
{
return new TestSuite(NestableRuntimeExceptionTestCase.class);
return new TestSuite(NestableRuntimeExceptionTest.class);
}
/**
@ -78,7 +78,7 @@ public class NestableRuntimeExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getNestable()
* @see AbstractNestableTest#getNestable()
*/
public Nestable getNestable()
{
@ -86,7 +86,7 @@ public class NestableRuntimeExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getNestable(Nestable)
* @see AbstractNestableTest#getNestable(Nestable)
*/
public Nestable getNestable(Nestable n)
{
@ -94,7 +94,7 @@ public class NestableRuntimeExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getNestable(String)
* @see AbstractNestableTest#getNestable(String)
*/
public Nestable getNestable(String msg)
{
@ -102,7 +102,7 @@ public class NestableRuntimeExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getNestable(Throwable)
* @see AbstractNestableTest#getNestable(Throwable)
*/
public Nestable getNestable(Throwable t)
{
@ -110,7 +110,7 @@ public class NestableRuntimeExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getNestable(String, Throwable)
* @see AbstractNestableTest#getNestable(String, Throwable)
*/
public Nestable getNestable(String msg, Throwable t)
{
@ -118,7 +118,7 @@ public class NestableRuntimeExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getNestable(String, Nestable)
* @see AbstractNestableTest#getNestable(String, Nestable)
*/
public Nestable getNestable(String msg, Nestable n)
{
@ -126,7 +126,7 @@ public class NestableRuntimeExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getTester1(Throwable)
* @see AbstractNestableTest#getTester1(Throwable)
*/
public Nestable getTester1(Throwable t)
{
@ -134,7 +134,7 @@ public class NestableRuntimeExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getTester1(Nestable)
* @see AbstractNestableTest#getTester1(Nestable)
*/
public Nestable getTester1(Nestable n)
{
@ -142,7 +142,7 @@ public class NestableRuntimeExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getTester1(String, Throwable)
* @see AbstractNestableTest#getTester1(String, Throwable)
*/
public Nestable getTester1(String msg, Throwable t)
{
@ -150,7 +150,7 @@ public class NestableRuntimeExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getTester1(String, Nestable)
* @see AbstractNestableTest#getTester1(String, Nestable)
*/
public Nestable getTester1(String msg, Nestable n)
{
@ -158,7 +158,7 @@ public class NestableRuntimeExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getTester1Class()
* @see AbstractNestableTest#getTester1Class()
*/
public Class getTester1Class()
{
@ -166,7 +166,7 @@ public class NestableRuntimeExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getTester2(String, Throwable)
* @see AbstractNestableTest#getTester2(String, Throwable)
*/
public Nestable getTester2(String msg, Throwable t)
{
@ -174,7 +174,7 @@ public class NestableRuntimeExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getTester2(String, Nestable)
* @see AbstractNestableTest#getTester2(String, Nestable)
*/
public Nestable getTester2(String msg, Nestable n)
{
@ -182,7 +182,7 @@ public class NestableRuntimeExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getTester2Class()
* @see AbstractNestableTest#getTester2Class()
*/
public Class getTester2Class()
{
@ -190,7 +190,7 @@ public class NestableRuntimeExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getThrowable(String)
* @see AbstractNestableTest#getThrowable(String)
*/
public Throwable getThrowable(String msg)
{
@ -198,7 +198,7 @@ public class NestableRuntimeExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getThrowableClass()
* @see AbstractNestableTest#getThrowableClass()
*/
public Class getThrowableClass()
{
@ -206,7 +206,7 @@ public class NestableRuntimeExceptionTestCase extends AbstractNestableTestCase {
}
/**
* @see AbstractNestableTestCase#getBaseThrowableClass()
* @see AbstractNestableTest#getBaseThrowableClass()
*/
public Class getBaseThrowableClass()
{