You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ru...@locus.apache.org on 2000/01/12 05:10:40 UTC
cvs commit: jakarta-tomcat/src/tests/share/tests/jsp Jsp.java
rubys 00/01/11 20:10:40
Modified: src/tests/bin test.xml
src/tests/share/tests/jsp Jsp.java
Log:
run the jsp tests one at a time
Revision Changes Path
1.3 +62 -1 jakarta-tomcat/src/tests/bin/test.xml
Index: test.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/tests/bin/test.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- test.xml 2000/01/11 16:04:29 1.2
+++ test.xml 2000/01/12 04:10:40 1.3
@@ -28,7 +28,68 @@
<java class="org.apache.tools.moo.RunTest" args="tests.request.Get" />
<java class="org.apache.tools.moo.RunTest" args="tests.request.Post" />
<java class="org.apache.tools.moo.RunTest" args="tests.request.RequestMap" />
- <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp" />
+
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 1" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 2" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 3" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 4" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 5" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 6" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 7" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 8" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 9" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 10" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 11" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 12" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 13" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 14" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 15" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 16" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 17" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 18" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 19" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 20" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 21" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 22" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 23" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 24" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 25" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 26" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 27" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 28" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 29" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 30" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 31" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 32" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 33" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 34" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 35" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 36" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 37" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 38" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 39" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 40" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 42" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 43" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 44" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 45" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 46" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 47" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 48" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 49" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 50" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 51" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 52" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 53" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 54" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 55" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 56" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 57" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 58" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 59" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 60" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 61" />
+ <java class="org.apache.tools.moo.RunTest" args="tests.jsp.Jsp -key 63" />
</target>
<target name="shutdown">
1.5 +19 -9 jakarta-tomcat/src/tests/share/tests/jsp/Jsp.java
Index: Jsp.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/tests/share/tests/jsp/Jsp.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Jsp.java 1999/11/12 03:18:02 1.4
+++ Jsp.java 2000/01/12 04:10:40 1.5
@@ -7,7 +7,7 @@
package tests.jsp;
-import org.apache.tools.moo.TestableBase;
+import org.apache.tools.moo.ParameterizedTest;
import org.apache.tools.moo.TestResult;
import org.apache.tools.moo.SocketHelper;
import java.net.*;
@@ -15,10 +15,14 @@
import java.util.*;
import java.net.*;
-public class Jsp extends TestableBase {
+public class Jsp extends ParameterizedTest {
public String getDescription() {
- return "JSP Tests";
+ if (testsKey == null) {
+ return "JSP Tests";
+ } else {
+ return testsKey;
+ }
}
public TestResult runTest() {
@@ -29,7 +33,7 @@
boolean status = true;
StringBuffer msg = new StringBuffer("");
- String testsKey = props.getProperty("tests");
+ if (testsKey == null) testsKey = props.getProperty("tests");
String debugS = props.getProperty("Debug");
debug = Boolean.valueOf(debugS).booleanValue();
@@ -43,6 +47,7 @@
}
Enumeration testNames = tests.elements();
+ int count = tests.size();
boolean debugSaved = debug;
while (testNames.hasMoreElements()) {
@@ -51,12 +56,18 @@
if (debugThis != null)
debug = Boolean.valueOf(debugThis).booleanValue();
+ String description = props.getProperty("test." + testId +
+ ".request");
+
+ if (count > 1)
+ System.out.println("Testing " + description );
+
if (! test(testId)) {
status = false;
- String description = props.getProperty("test." + testId +
- ".request");
- msg.append("\tTest " + testId + " : " +
- description + "\n");
+ msg.append("\n\tTest " + testId + " : " +
+ description);
+ } else if (count <= 1) {
+ msg.append("\t"+description);
}
debug = debugSaved;
}
@@ -105,7 +116,6 @@
if (ready()) {
try {
String request = props.getProperty("test." + testId + ".request");
- System.out.println("Testing " + request );
writeRequest(testId, request);
if (this.debug)
System.out.println("<--BEG---");