You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by lu...@apache.org on 2005/01/10 19:26:40 UTC
cvs commit: jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor TProcessors.java
luetzkendorf 2005/01/10 10:26:40
Modified: testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tutil
TArgs.java TProcessorTask.java XConf.java
testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor
TProcessors.java
Log:
spelling corrected exceuteStep->executeStep
Revision Changes Path
1.6 +4 -5 jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tutil/TArgs.java
Index: TArgs.java
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tutil/TArgs.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TArgs.java 28 Jul 2004 09:31:52 -0000 1.5
+++ TArgs.java 10 Jan 2005 18:26:40 -0000 1.6
@@ -95,7 +95,6 @@
public class TArgs {
- private List allowedTokens = new ArrayList ();
private Map container = new HashMap();
private String[] args = null;
1.11 +44 -7 jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tutil/TProcessorTask.java
Index: TProcessorTask.java
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tutil/TProcessorTask.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TProcessorTask.java 16 Nov 2004 14:43:41 -0000 1.10
+++ TProcessorTask.java 10 Jan 2005 18:26:40 -0000 1.11
@@ -84,6 +84,7 @@
private String urlEncoding;
private String tracingRequest;
private final List filesets;
+ private boolean printProperties = false;
public TProcessorTask() {
super();
@@ -111,6 +112,9 @@
public void setResult(File result) {
this.result = result;
}
+ public void setPrintProperties(boolean value) {
+ this.printProperties = value;
+ }
private static void check(Object attr, String name) throws BuildException {
if (attr == null) {
@@ -162,13 +166,25 @@
try {
out.println("<test>");
+ if (this.printProperties) {
+ out.println(" <properties>");
+ for(Iterator it = getProject().getProperties().entrySet().iterator(); it.hasNext();) {
+ Map.Entry e = (Map.Entry)it.next();
+ out.print(" <property name=\"");
+ out.print(e.getKey());
+ out.print("\" value=\"");
+ out.print(xmlEscape((String)e.getValue()));
+ out.println("\"/>");
+ }
+ out.println(" </properties>");
+ }
okCount = 0;
testCount = 0;
for (i = 0; i < filesets.size(); i++) {
fs = (FileSet) filesets.get(i);
- dir = fs.getDir(project);
+ dir = fs.getDir(getProject());
log("Entering directory: " + dir);
- files = fs.getDirectoryScanner(project).getIncludedFiles();
+ files = fs.getDirectoryScanner(getProject()).getIncludedFiles();
testCount += files.length;
okCount += execute(dir, files, out, host, port, user, password);
log("Leaving directory: " + dir);
@@ -221,7 +237,7 @@
String key;
props = new Properties();
- iter = project.getProperties().entrySet().iterator();
+ iter = getProject().getProperties().entrySet().iterator();
while (iter.hasNext()) {
entry = (Map.Entry) iter.next();
key = (String) entry.getKey();
@@ -237,11 +253,32 @@
String fullName;
fullName = PREFIX + name;
- value = project.getProperty(fullName);
+ value = getProject().getProperty(fullName);
if (value == null) {
throw new BuildException("mandatory property not found: " + fullName);
}
return value;
+ }
+
+ private static String xmlEscape(String text) {
+ StringBuffer b = new StringBuffer(text.length() * 2);
+ for(int i = 0, l = text.length(); i < l; i++) {
+ char c = text.charAt(i);
+ switch(c) {
+ case '&':
+ b.append("&");
+ break;
+ case '"':
+ b.append(""");
+ break;
+ case '<':
+ b.append("<");
+ break;
+ default:
+ b.append(c);
+ }
+ }
+ return b.toString();
}
}
1.6 +4 -5 jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tutil/XConf.java
Index: XConf.java
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tutil/XConf.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XConf.java 28 Jul 2004 09:31:52 -0000 1.5
+++ XConf.java 10 Jan 2005 18:26:40 -0000 1.6
@@ -122,7 +122,6 @@
* @exception JDOMException
*/
public XConf (Document doc) throws IOException, JDOMException {
- SAXBuilder sb = new SAXBuilder();
cfgDoc = doc;
rootElement = cfgDoc.getRootElement();
}
1.87 +21 -21 jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/TProcessors.java
Index: TProcessors.java
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/tprocessor/TProcessors.java,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- TProcessors.java 3 Sep 2004 13:54:43 -0000 1.86
+++ TProcessors.java 10 Jan 2005 18:26:40 -0000 1.87
@@ -459,7 +459,7 @@
globalTestFileName = testfile.getName();
globalAbsolutePath = testfile.getParent();
// globalAbsolutePath = testfile.;
- exceuteStepOrRepeater(testElement.getChildren().iterator());
+ executeStepOrRepeater(testElement.getChildren().iterator());
} catch (JDOMException e){
xmlresult.writeElement("domException", e.toString());
throw e;
@@ -479,20 +479,20 @@
}
- protected boolean exceuteStepOrRepeater(Iterator items) throws IOException, JDOMException {
+ protected boolean executeStepOrRepeater(Iterator items) throws IOException, JDOMException {
boolean result = true;
- Vector threadsToExceute = new Vector(10);
+ Vector threadsToExecute = new Vector(10);
Vector cleanUpThreads = new Vector(10);
- result = exceuteStepOrRepeater(items, threadsToExceute, cleanUpThreads);
+ result = executeStepOrRepeater(items, threadsToExecute, cleanUpThreads);
try {
// now execute all collected threads in parallel
- for (int i = 0 ; i<threadsToExceute.size(); i++) {
- ((Thread)threadsToExceute.elementAt(i)).start();
+ for (int i = 0 ; i<threadsToExecute.size(); i++) {
+ ((Thread)threadsToExecute.elementAt(i)).start();
}
- for (int i = 0 ; i<threadsToExceute.size(); i++) {
- ((Thread)threadsToExceute.elementAt(i)).join();
+ for (int i = 0 ; i<threadsToExecute.size(); i++) {
+ ((Thread)threadsToExecute.elementAt(i)).join();
}
// now do the clean up tasks
@@ -513,11 +513,11 @@
- private boolean exceuteStepOrRepeater(Iterator items, Vector threadsToExceute, Vector cleanUpThreads)
+ private boolean executeStepOrRepeater(Iterator items, Vector threadsToExecute, Vector cleanUpThreads)
throws IOException, JDOMException {
HttpClientExtended client = new HttpClientExtended(defaultUser, defaultPassword);
- return exceuteStepOrRepeater(items, threadsToExceute, cleanUpThreads, client);
+ return executeStepOrRepeater(items, threadsToExecute, cleanUpThreads, client);
}
@@ -533,7 +533,7 @@
- private boolean exceuteStepOrRepeater(Iterator items, Vector threadsToExceute, Vector cleanUpThreads, HttpClientExtended client)
+ private boolean executeStepOrRepeater(Iterator items, Vector threadsToExecute, Vector cleanUpThreads, HttpClientExtended client)
throws IOException, JDOMException
{
boolean result = true;
@@ -552,7 +552,7 @@
throw new IllegalStateException("unexpected InterruptedException");
}
} else if(item.getName().equals("thread")){
- threadsToExceute.add(new Thread(new Runner(item.getChildren().iterator(), Thread.currentThread()), "parallelThread-" + (threadsToExceute.size()+1)));
+ threadsToExecute.add(new Thread(new Runner(item.getChildren().iterator(), Thread.currentThread()), "parallelThread-" + (threadsToExecute.size()+1)));
} else if(item.getName().equals("cleanup")){
cleanUpThreads.add(new Thread(new Runner(item.getChildren().iterator(), Thread.currentThread()), "cleanUpThread"));
} else if(item.getName().equals("repeater")){
@@ -572,7 +572,7 @@
for (long i = 0; i < maximum && !checkRepeaterCondition(item, condition); i++){
knownVariables.removeAllFramedVariables(stackMarker);
knownVariables.put(varName, new Long(i+1).toString());
- result = exceuteStepOrRepeater(item.getChildren().iterator(), threadsToExceute, cleanUpThreads, client) && result;
+ result = executeStepOrRepeater(item.getChildren().iterator(), threadsToExecute, cleanUpThreads, client) && result;
}
} else if(item.getName().equals("specification")){
// do nothing in case of docu
@@ -614,7 +614,7 @@
long executionTime = 0;
HttpMethod method = null;
- xmlresult.writeElementStart("exceuteStep");
+ xmlresult.writeElementStart("executeStep");
boolean conditionsOk = conditionsAreFullfilled(
elt.getChildren("condition").iterator());
@@ -622,7 +622,7 @@
if (!conditionsOk) {
xmlresult.writeElement("result", ("SKIPPED"));
xmlresult.writeElement("time", (executionTime));
- xmlresult.writeElementEnd("exceuteStep");
+ xmlresult.writeElementEnd("executeStep");
this.testElementsExecuted++;
this.testElementsSkipped++;
return true;
@@ -727,7 +727,7 @@
xmlresult.writeElement("result", (!result?"ERROR":"Success"));
xmlresult.writeElement("time", (executionTime));
- xmlresult.writeElementEnd("exceuteStep");
+ xmlresult.writeElementEnd("executeStep");
return result;
@@ -1730,7 +1730,7 @@
public void run() {
knownVariables.createNewEnvironment(varsToBeUsed, name);
try {
- exceuteStepOrRepeater(items);
+ executeStepOrRepeater(items);
}
catch (JDOMException e) {
e.printStackTrace();
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org