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

separate test target identification from test target execution (prepare further refactoring to extract part reusable in junit adapter) 

git-svn-id: https://svn.apache.org/repos/asf/ant/antlibs/antunit/trunk@736745 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Scokart Gilles 2009-01-22 19:06:02 +00:00
parent eef127ec79
commit aba154292a
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/org/apache/ant/antunit/AntUnit.java
View File

@ -24,6 +24,8 @@ import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Vector;
@ -238,6 +240,14 @@ public class AntUnit extends Task {
boolean tearDown = targets.containsKey(TEARDOWN);
boolean suiteSetUp = targets.containsKey(SUITESETUP);
boolean suiteTearDown = targets.containsKey(SUITETEARDOWN);
List testTargets = new LinkedList();
Iterator it = targets.keySet().iterator();
while (it.hasNext()) {
String name = (String) it.next();
if (name.startsWith(TEST) && !name.equals(TEST)) {
testTargets.add(name);
}
}
// start test
newProject.fireBuildStarted();
@ -260,10 +270,9 @@ public class AntUnit extends Task {
return;
}
}
Iterator iter = targets.keySet().iterator();
Iterator iter = testTargets.iterator();
while (iter.hasNext()) {
String name = (String) iter.next();
if (name.startsWith(TEST) && !name.equals(TEST)) {
Vector v = new Vector();
if (setUp) {
v.add(SETUP);
@ -299,7 +308,6 @@ public class AntUnit extends Task {
newProject = createProjectForFile(f);
}
}
}
}
} catch (Throwable e) {
caught = e;