juergen 2003/01/16 08:16:45
Modified: testsuite/bin TProcessor.CMD
testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/walker
MultiTProcessorExecuter.java
Log:
enable the -exclude parameter
Revision Changes Path
1.16 +9 -0 jakarta-slide/testsuite/bin/TProcessor.CMD
Index: TProcessor.CMD
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/bin/TProcessor.CMD,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TProcessor.CMD 16 Jan 2003 15:13:35 -0000 1.15
+++ TProcessor.CMD 16 Jan 2003 16:16:45 -0000 1.16
@@ -52,6 +52,7 @@
if "%1" == "-workhost" goto SET_WORKHOST
if "%1" == "-testcase" goto SET_TESTCASE
if "%1" == "-pattern" goto SET_PATTERN
+if "%1" == "-exclude" goto SET_EXCLUDE
goto SET_PAR
:SET_PAR
@@ -143,6 +144,12 @@
shift
goto LOOP
+:SET_EXCLUDE
+shift
+set TESTCASE_EXCLUDE=%1
+shift
+goto LOOP
+
:INVOKE_TP
set /A TP_ITER_SMALL=%TP_ITERATIONS%/2
set ROOT_USER_PATH=/%DAV_NAME%/administration/security/users
@@ -182,6 +189,7 @@
:SET_PATTERN
set CLS=org.apache.slide.testsuite.testtools.walker.MultiTProcessorExecuter
set PAR=%TESTCASE_PATTERN%
+if not "%TESTCASE_EXCLUDE%" == "" set Par=%PAR% -exclude %TESTCASE_EXCLUDE%
goto EXEC
:SET_ALL
@@ -211,6 +219,7 @@
echo -iterations ^<number_of_iterations^> (default: 10)
echo -testcase ^<xmltestcase_path^> (relative to the home directory)
echo -pattern ^<xmltestcase_pattern^> (wildard is *, file separator is \\)
+echo -exclude ^<xmltestcase_pattern^> (wildard is *, file separator is \\)
echo.
echo The -davauth option specifies whether authentication is enabled at server side.
echo If both, -testcase and -pattern are omitted, all testcases are executed.
1.5 +58 -37
jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/walker/MultiTProcessorExecuter.java
Index: MultiTProcessorExecuter.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/src/org/apache/slide/testsuite/testtools/walker/MultiTProcessorExecuter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MultiTProcessorExecuter.java 25 Apr 2002 21:30:19 -0000 1.4
+++ MultiTProcessorExecuter.java 16 Jan 2003 16:16:45 -0000 1.5
@@ -64,10 +64,11 @@
package org.apache.slide.testsuite.testtools.walker;
//TProcessor import
-import org.apache.slide.testsuite.testtools.tprocessor.TProcessors;
-//java
-import java.io.PrintStream;
import java.io.FileOutputStream;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.slide.testsuite.testtools.tprocessor.TProcessors;
/**
@@ -77,15 +78,15 @@
* @version $Revision$
*/
public class MultiTProcessorExecuter {
-
+
private String xdavHome = System.getProperty("xdav.home");
private String xdavHost = System.getProperty("xdav.host");
private String xdavPort = System.getProperty("xdav.port");
-
+
private static PrintStream resultOutput = null;
private static boolean result = true;
-
-
+
+
/**
** Constructor that creates the GenericBeanContextChildTest with the given
name.
** Constructor description
@@ -106,30 +107,28 @@
xdavHome = xdavHome+java.io.File.separatorChar+"junit";
xdavHome = xdavHome+java.io.File.separatorChar+"xmltestcases";
}
-
-
-
- public void exceuteAllSpecifiedXMLFileByTProcessor(String[] filter) throws
Exception {
-
+
+
+
+ public void exceuteAllSpecifiedXMLFileByTProcessor(String[] include, String[]
exclude) throws Exception {
+
final int[] testCaseCount = new int[2];
-
+
testCaseCount[0] = 0;
testCaseCount[1] = 0;
-
+
resultOutput = new java.io.PrintStream(new
FileOutputStream(xdavHome+java.io.File.separatorChar+".."+java.io.File.separatorChar+"testCasesResults.xml"));
-
+
long time = System.currentTimeMillis();
java.util.Date startDate = new java.util.Date();
-
+
resultOutput.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
resultOutput.println("<!DOCTYPE testSuite SYSTEM
\"testCasesResults.dtd\">");
resultOutput.println("<testSuite>");
resultOutput.println(" <excecutionDate>" + new
java.text.SimpleDateFormat("dd.MM.yy HH:mm").format(startDate) + "</excecutionDate>");
resultOutput.println(" <resultFileName>" +
xdavHome+java.io.File.separatorChar+".."+java.io.File.separatorChar+"testCasesResults.xml"
+ "</resultFileName>");
-
- String[] exclude = new String[1];
- exclude[0] = "CVS";
- DirectoryWalker walker = new DirectoryWalker(xdavHome, filter, exclude, new
WalkerJob() {
+
+ DirectoryWalker walker = new DirectoryWalker(xdavHome, include, exclude,
new WalkerJob() {
public void job(String jobName) {
String[] parameters = new String[2];
parameters[0] = "-name";
@@ -141,17 +140,17 @@
}
}
);
-
-
+
+
resultOutput.println(" <result>" + (!result?"ERROR":"Success") +
"</result>");
resultOutput.println(" <time>" + ((System.currentTimeMillis() - time)) +
"</time>");
resultOutput.println(" <testElementCount>" + testCaseCount[0] +
"</testElementCount>");
resultOutput.println(" <testElementErrors>" + testCaseCount[1] +
"</testElementErrors>");
resultOutput.println("</testSuite>");
resultOutput.close();
-
-
-
+
+
+
System.out.println();
System.out.println();
System.out.println();
@@ -169,20 +168,42 @@
System.out.println("</testSuite>");
System.out.println();
System.out.println();
-
-
+
+
}
-
-
+
+
public static void main(String[] args) {
+ List include = new ArrayList();
+ List exclude = new ArrayList();
+ exclude.add("CVS");
for (int i=0; i < args.length; i++) {
+ boolean includeSpecified = true;
+ if (args[i].equals("-exclude")) {
+ includeSpecified = false;
+ i++;
+ }
+ if (args[i].equals("-include")) {
+ includeSpecified = true;
+ i++;
+ }
+
if (!args[i].endsWith(".xml")) args[i] = args[i] + ".xml";
if (!args[i].startsWith("*")) args[i] = "*" + args[i];
- System.out.println("Arguments found : " + args[i]);
+
+ if (includeSpecified) include.add(args[i]);
+ else exclude.add(args[i]);
+ System.out.println("Arguments found : " + (includeSpecified?" + ":" -
") + args[i]);
}
- try { new
MultiTProcessorExecuter().exceuteAllSpecifiedXMLFileByTProcessor(args); }
+
+ try {
+ String[] incl = new String[include.size()];
+ String[] excl = new String[exclude.size()];
+ for (int i=0; i<include.size(); i++) incl[i] = (String)include.get(i);
+ for (int i=0; i<exclude.size(); i++) excl[i] = (String)exclude.get(i);
+ new
MultiTProcessorExecuter().exceuteAllSpecifiedXMLFileByTProcessor(incl, excl); }
catch (Exception e) { e.printStackTrace(); }
}
-
-
+
+
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
