You are viewing a plain text version of this content. The canonical link for it is here.
Posted to watchdog-dev@jakarta.apache.org by cr...@apache.org on 2001/01/11 22:37:05 UTC
cvs commit: jakarta-watchdog-4.0/src/conf jsp-gtest.xml runtest.xml servlet-gtest-xml.save
craigmcc 01/01/11 13:37:04
Modified: src/conf jsp-gtest.xml runtest.xml
Removed: src/conf servlet-gtest-xml.save
Log:
Clean up JSP scripts. In particular, add a commented-out version of the
positiveScriptletLiteral test, which currently includes invalid Java
syntax in its scriptlet and therefore causes a compile failure.
Tomcat 4.0 still passes 100% of the JSP tests (both syntaxes) currently
run by these scripts.
Revision Changes Path
1.6 +14 -6 jakarta-watchdog-4.0/src/conf/jsp-gtest.xml
Index: jsp-gtest.xml
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/conf/jsp-gtest.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jsp-gtest.xml 2000/12/19 22:01:34 1.5
+++ jsp-gtest.xml 2001/01/11 21:37:00 1.6
@@ -9,8 +9,8 @@
<target name="main" depends="jsp-test" />
<!-- ==================== Watchdog JSP tests ==================== -->
-
-
+
+
<target name="jsp-test">
<!-- Precompilation tests -->
<gtest request="GET /jsp-tests/jsp/misc/precompilation/precompile.jsp?jsp_precompile HTTP/1.0"
@@ -502,23 +502,31 @@
testStrategy="correct syntax is used in the expression with no space between tags"
/>
- <!-- #####Commented ..has to be debugged
<gtest request="GET /jsp-tests/jsp/core_syntax/scripting/scriptlet/positiveScriptlet.jsp HTTP/1.0"
debug="0" host="${host}" port="${port}"
goldenFile="${wgdir}/core_syntax/scripting/scriptlet/positiveScriptlet.html"
- testName="positiveScriptlet.jsp"
+ testName="positiveScriptlet.jsp"
assertion="Create a valid scriplet in the JSP page.Declare a variable and increment it, specified in the Java Server Pages Specification v1.2, Sec 2.12.2 "
testStrategy="correct syntax is used in the scriptlet"
/>
- -->
<gtest request="GET /jsp-tests/jsp/core_syntax/scripting/scriptlet/positiveScriptletComment.jsp HTTP/1.0"
debug="0" host="${host}" port="${port}"
goldenFile="${wgdir}/core_syntax/scripting/scriptlet/positiveScriptletComment.html"
- testName="positiveScriptlet.jsp"
+ testName="positiveScriptletComment.jsp"
assertion="Create a valid scriplet in the JSP page.Declare a variable and increment it, specified in the Java Server Pages Specification v1.2, Sec 2.12.2 "
testStrategy="correct syntax is used in the scriptlet"
/>
+
+<!-- Test commented out as the JSP file contains invalid Java code in the scriptlet
+ <gtest request="GET /jsp-tests/jsp/core_syntax/scripting/scriptlet/positiveScriptletLiteral.jsp HTTP/1.0"
+ debug="0" host="${host}" port="${port}"
+ goldenFile="${wgdir}/core_syntax/scripting/scriptlet/positiveScriptletLiteral.html"
+ testName="positiveScriptletLiteral.jsp"
+ assertion="Create a valid scriptlet in a JSP page that includes the usual scriptlet end tag in a String literal."
+ testStrategy="correct syntax is used in the scriptlet"
+ />
+-->
<gtest request="GET /jsp-tests/jsp/core_syntax/scripting/scriptlet/positiveScriptletMultiline.jsp HTTP/1.0"
debug="0" host="${host}" port="${port}"
1.4 +3 -0 jakarta-watchdog-4.0/src/conf/runtest.xml
Index: runtest.xml
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/src/conf/runtest.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- runtest.xml 2000/12/13 18:04:02 1.3
+++ runtest.xml 2001/01/11 21:37:01 1.4
@@ -21,6 +21,9 @@
target="gtestservlet-test"/>
</target>
+ <!-- JSP (non-XML) plus SERVLET Tests -->
+ <target name="jsp-servlet" depends="jsp,servlet"/>
+
<!-- ALL TESTS -->
<target name="all" depends="jsp-all,servlet"/>