natas_hw
/
ant-antlibs-antunit
mirror of https://github.com/apache/ant-antlibs-antunit
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove unsightly double catch 

git-svn-id: https://svn.apache.org/repos/asf/ant/antlibs/antunit/trunk@739408 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Scokart Gilles 2009-01-30 21:00:28 +00:00
parent cd5ca3a0b8
commit 6fd044277d
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/org/apache/ant/antunit/AntUnitScriptRunner.java
View File

@ -179,7 +179,7 @@ public class AntUnitScriptRunner {
}
/**
* Provide the list of test targets of the active antunit script.
* Provides the list of test targets of the active antunit script.
* @pre isActive()
* @return List<String> List of test target names
*/
@ -219,10 +219,6 @@ public class AntUnitScriptRunner {
try {
Project newProject = getCleanProject();
newProject.executeTarget(SUITESETUP);
} catch (AssertionFailedException e) {
env.fireStartTest(SUITESETUP);
env.fireFail(SUITESETUP, e);
return false;
} catch (BuildException e) {
env.fireStartTest(SUITESETUP);
fireFailOrError(SUITESETUP, e);
@ -253,8 +249,6 @@ public class AntUnitScriptRunner {
try {
env.fireStartTest(name);
newProject.executeTargets(v);
} catch (AssertionFailedException e) {
env.fireFail(name, e);
} catch (BuildException e) {
fireFailOrError(name, e);
} finally {
@ -268,8 +262,6 @@ public class AntUnitScriptRunner {
if (hasTearDown) {
try {
newProject.executeTarget(TEARDOWN);
} catch (final AssertionFailedException e) {
env.fireFail(name, e);
} catch (final BuildException e) {
fireFailOrError(name, e);
}
@ -290,9 +282,6 @@ public class AntUnitScriptRunner {
try {
Project newProject = getCleanProject();
newProject.executeTarget(SUITETEARDOWN);
} catch (AssertionFailedException e) {
env.fireStartTest(SUITETEARDOWN);
env.fireFail(SUITETEARDOWN, e);
} catch (BuildException e) {
env.fireStartTest(SUITETEARDOWN);
fireFailOrError(SUITETEARDOWN, e);
@ -302,24 +291,25 @@ public class AntUnitScriptRunner {
isSuiteStarted = false;
}
/** Report a failure or an exception for the test target name */
private void fireFailOrError(String name, BuildException e) {
/**
* Try to see whether the BuildException e is an AssertionFailedException
* or is caused by an AssertionFailedException. If so, fire a failure for
* given targetName. Otherwise fire an error.
*/
private void fireFailOrError(String targetName, BuildException e) {
boolean failed = false;
// try to see whether the BuildException masks
// an AssertionFailedException. If so, treat
// it as failure instead of error.
Throwable t = e.getCause();
Throwable t = e;
while (t != null && t instanceof BuildException) {
if (t instanceof AssertionFailedException) {
failed = true;
env.fireFail(name, (AssertionFailedException) t);
env.fireFail(targetName, (AssertionFailedException) t);
break;
}
t = ((BuildException) t).getCause();
}
if (!failed) {
env.fireError(name, e);
env.fireError(targetName, e);
}
}