larryi 01/07/20 19:38:01
Modified: src/conf Tag: tomcat_32 jsp-gtest.xml
src/server/jsp-tests/jsp/engine/JspWriter/misc Tag:
tomcat_32 positiveGetRemaining.jsp
Log:
Second try fix the positiveGetRemaining test. The line separator in
the HTML output will match the line separator used in the JSP file.
Update the JSP to include two values so that one will match the expected
value based on using CRLF.
Revision Changes Path
No revision
No revision
1.2.2.1 +1 -1 jakarta-watchdog/src/conf/jsp-gtest.xml
Index: jsp-gtest.xml
===================================================================
RCS file: /home/cvs/jakarta-watchdog/src/conf/jsp-gtest.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- jsp-gtest.xml 2000/05/01 19:36:20 1.2
+++ jsp-gtest.xml 2001/07/21 02:38:00 1.2.2.1
@@ -413,7 +413,7 @@
goldenFile="${wgdir}/engine/JspWriter/misc/positiveGetBufferSizeUnBuffered.html" />
<gtest request="GET
/jsp-tests/jsp/engine/JspWriter/misc/positiveGetRemaining.jsp HTTP/1.0"
debug="0" host="${host}" port="${port}"
- goldenFile="${wgdir}/engine/JspWriter/misc/positiveGetRemaining.html" />
+ responseMatch="got=4939" />
<gtest request="GET
/jsp-tests/jsp/engine/JspWriter/misc/positiveGetRemainingBufferUnset.jsp HTTP/1.0"
debug="0" host="${host}" port="${port}"
goldenFile="${wgdir}/engine/JspWriter/misc/positiveGetRemainingBufferUnset.html" />
No revision
No revision
1.1.1.1.4.2 +6 -4
jakarta-watchdog/src/server/jsp-tests/jsp/engine/JspWriter/misc/positiveGetRemaining.jsp
Index: positiveGetRemaining.jsp
===================================================================
RCS file:
/home/cvs/jakarta-watchdog/src/server/jsp-tests/jsp/engine/JspWriter/misc/positiveGetRemaining.jsp,v
retrieving revision 1.1.1.1.4.1
retrieving revision 1.1.1.1.4.2
diff -u -r1.1.1.1.4.1 -r1.1.1.1.4.2
--- positiveGetRemaining.jsp 2001/07/19 02:39:49 1.1.1.1.4.1
+++ positiveGetRemaining.jsp 2001/07/21 02:38:01 1.1.1.1.4.2
@@ -5,16 +5,18 @@
/*
Name : positiveGetRemaining
Description : Set the buffer using the buffer directive and then call the
- getRemaining() method. Assumes the line separator written to the buffer
- is the same as the line separator for the system. Value reported will
- be as if CRLF was used.
+ getRemaining() method. The value will vary depending on the line separator
+ used for this file. Report two values so one will match the expected value
+ based on CRLF as the line separator.
*/
%>
<!-- this is to test if getRemaining method works with no buffer-->
<!-- setting buffer size to 5kb using directive -->
<%@ page buffer="5kb" %>
-<%
out.print("got="+(out.getRemaining()-(System.getProperty("line.separator").length() ==
1 ? 8 : 0))); %>
+<% int r = out.getRemaining();
+ out.println("got="+r);
+ out.print("got="+(r-8)); %>
<!-- expected to return remaining buffer size -->
</body>
</html>
