From: Kent B. <kb...@us...> - 2002-03-29 16:10:20
|
Update of /cvsroot/junit/junit/junit/tests/framework In directory usw-pr-cvs1:/tmp/cvs-serv16153/junit/tests/framework Modified Files: AllTests.java TestCaseTest.java Added Files: NoArgTestCaseTest.java Log Message: Kent & Erich patch swallowing in Merlin --- NEW FILE: NoArgTestCaseTest.java --- package junit.tests.framework; import junit.framework.TestCase; public class NoArgTestCaseTest extends TestCase { public void testNothing() { // If this compiles, the no arg ctor is there } } Index: AllTests.java =================================================================== RCS file: /cvsroot/junit/junit/junit/tests/framework/AllTests.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- AllTests.java 10 Nov 2001 14:39:35 -0000 1.1 +++ AllTests.java 29 Mar 2002 16:10:13 -0000 1.2 @@ -20,6 +20,7 @@ suite.addTestSuite(TestListenerTest.class); suite.addTestSuite(AssertTest.class); suite.addTestSuite(TestImplementorTest.class); + suite.addTestSuite(NoArgTestCaseTest.class); return suite; } Index: TestCaseTest.java =================================================================== RCS file: /cvsroot/junit/junit/junit/tests/framework/TestCaseTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- TestCaseTest.java 10 Nov 2001 14:39:35 -0000 1.1 +++ TestCaseTest.java 29 Mar 2002 16:10:13 -0000 1.2 @@ -110,6 +110,39 @@ test.run(); assertTrue(test.fWasRun); } + public void testExceptionRunningAndTearDown() { + // This test documents the current behavior. With 1.4, we should + // wrap the exception thrown while running with the exception thrown + // while tearing down + Test t= new TornDown("") { + public void tearDown() { + throw new Error("tearDown"); + } + }; + TestResult result= new TestResult(); + t.run(result); + TestFailure failure= (TestFailure) result.errors().nextElement(); + assertEquals("tearDown", failure.thrownException().getMessage()); + } + + public void testNoArgTestCasePasses() { + Test t= new TestSuite(NoArgTestCaseTest.class); + TestResult result= new TestResult(); + t.run(result); + assertTrue(result.runCount() == 1); + assertTrue(result.failureCount() == 0); + assertTrue(result.errorCount() == 0); + } + + public void testNamelessTestCase() { + TestCase t= new TestCase() {}; + try { + t.run(); + fail(); + } catch (AssertionFailedError e) { + } + } + void verifyError(TestCase test) { TestResult result= test.run(); assertTrue(result.runCount() == 1); @@ -128,6 +161,4 @@ assertTrue(result.failureCount() == 0); assertTrue(result.errorCount() == 0); } - - } |