From 3b6aedbd218dfdc3284e0ba331a686b2a8448722 Mon Sep 17 00:00:00 2001 From: Peter Reilly Date: Sun, 8 Oct 2006 20:53:25 +0000 Subject: [PATCH] For JUnitTestRunnerTest: testInvalidTestCase and testNoTestCase JUnit4 adaption returns an ERROR wheres JUnit3 returns a FAILURE. Modify testcase to reflect this. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@454207 13f79535-47bb-0310-9956-ffa450edef68 --- .../optional/junit/JUnitTestRunnerTest.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunnerTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunnerTest.java index a06bdb8cd..d44ebdf47 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunnerTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunnerTest.java @@ -61,15 +61,27 @@ public class JUnitTestRunnerTest extends TestCase { public void testNoTestCase(){ TestRunner runner = createRunner(NoTestCase.class); runner.run(); - assertEquals(runner.getFormatter().getError(), JUnitTestRunner.FAILURES, runner.getRetCode()); + // On junit3 this is a FAILURE, on junit4 this is an ERROR + int ret = runner.getRetCode(); + + if (ret != JUnitTestRunner.FAILURES && ret != JUnitTestRunner.ERRORS) { + fail("Unexpected result " + ret + " from junit runner"); + } + // JUnit3 test + //assertEquals(runner.getFormatter().getError(), JUnitTestRunner.FAILURES, runner.getRetCode()); } // check that an exception in the constructor is noticed public void testInvalidTestCase(){ TestRunner runner = createRunner(InvalidTestCase.class); runner.run(); - String error = runner.getFormatter().getError(); - assertEquals(error, JUnitTestRunner.FAILURES, runner.getRetCode()); + // On junit3 this is a FAILURE, on junit4 this is an ERROR + int ret = runner.getRetCode(); + if (ret != JUnitTestRunner.FAILURES && ret != JUnitTestRunner.ERRORS) { + fail("Unexpected result " + ret + " from junit runner"); + } + // JUNIT3 test + //assertEquals(error, JUnitTestRunner.FAILURES, runner.getRetCode()); //@fixme as of now does not report the original stacktrace. //assertTrue(error, error.indexOf("thrown on purpose") != -1); }