You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ar...@hyperreal.org on 1999/11/12 04:18:24 UTC
cvs commit: jakarta-tomcat/src/tests/webpages/jsp pageContent3.jsp xml.jsp buffer.jsp
arun 99/11/11 19:18:23
Modified: src/tests/share/tests/jsp Jsp.java jsp.properties
src/tests/share/tests/jsp/Golden buffer.txt
src/tests/webpages/jsp buffer.jsp
Added: src/tests/webpages/jsp pageContent3.jsp xml.jsp
Log:
Merging TOMCAT_J2EE branch with the main trunk.
Revision Changes Path
1.4 +0 -3 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Jsp.java 1999/11/04 18:43:42 1.3
+++ Jsp.java 1999/11/12 03:18:02 1.4
@@ -1,7 +1,4 @@
-/*
- * $Id: Jsp.java,v 1.3 1999/11/04 18:43:42 costin Exp $
- */
/**
*
1.4 +121 -15 jakarta-tomcat/src/tests/share/tests/jsp/jsp.properties
Index: jsp.properties
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/tests/share/tests/jsp/jsp.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jsp.properties 1999/11/04 18:43:49 1.3
+++ jsp.properties 1999/11/12 03:18:05 1.4
@@ -1,18 +1,24 @@
#
+# For each test, we MUST define
+# request
+# and at least one of the two (or both)
+# returnCode
+# golden
#
-#
Debug:false
tests:1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22, \
- 22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43
+ 23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41, \
+ 42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60, \
+ 61
test.1.request:GET /jsp/HelloWorld.jsp HTTP/1.0
test.1.golden: HelloWorld.txt
test.1.magnitude:true
test.2.request:GET /doesNotExist.jsp HTTP/1.0
-test.2.golden: MustFail.txt
+test.2.returnCode: HTTP/1.0 200 OK
test.2.magnitude:false
test.3.request:GET /jsp/ HTTP/1.0
@@ -21,20 +27,20 @@
test.3.magnitude:true
test.4.request:GET /jsp HTTP/1.0
-test.4.golden: MustFail.txt
-test.4.commect: Getting -->> HTTP/1.0 302 Found
+test.4.returnCode: HTTP/1.0 200 OK
+test.4.comment: Getting -->> HTTP/1.0 302 Found
test.4.magnitude:false
test.5.request:GET /.jsp HTTP/1.0
-test.5.golden: MustFail.txt
+test.5.returnCode: HTTP/1.0 200 OK
test.5.magnitude:false
test.6.request:GET /*.jsp HTTP/1.0
-test.6.golden: MustFail.txt
+test.6.returnCode: HTTP/1.0 200 OK
test.6.magnitude:false
test.7.request:GET *jsp HTTP/1.0
-test.7.golden: MustFail.txt
+test.7.returnCode: HTTP/1.0 200 OK
test.7.magnitude:false
test.8.request:GET HelloWorld.jsp
@@ -188,19 +194,119 @@
test.40.golden: pageImport.txt
test.40.magnitude:true
-test.41.request:GET /servlet/servletParam1 HTTP/1.0
+test.41.request:GET /jsp/beanSer.jsp HTTP/1.0
test.41.returnCode: HTTP/1.0 200 OK
-test.41.golden: servletParam1.txt
+test.41.golden: beanSer.txt
+test.41.debug:false
test.41.magnitude:true
-test.42.request:GET /servlet/servletParam2 HTTP/1.0
+test.42.request:GET /jsp/beanTest1.jsp HTTP/1.0
test.42.returnCode: HTTP/1.0 200 OK
-test.42.golden: servletParam2.txt
+test.42.golden: beanTest.txt
+test.42.debug:false
test.42.magnitude:true
-test.43.request:GET /servlet/ServletParam HTTP/1.0
+test.43.request:GET /jsp/beanTest2.jsp HTTP/1.0
test.43.returnCode: HTTP/1.0 200 OK
-test.43.golden: ServletParam.txt
-test.43.magnitude:true
+test.43.debug:false
+test.43.magnitude:false
+
+test.44.request:GET /jsp/beanScopePage.jsp HTTP/1.0
+test.44.returnCode: HTTP/1.0 200 OK
+test.44.debug:false
+test.44.magnitude:true
+
+test.45.request:GET /jsp/beanScopeSession.jsp HTTP/1.0
+test.45.returnCode: HTTP/1.0 200 OK
+test.45.debug:false
+test.45.magnitude:true
+
+test.46.request:GET /jsp/implicitOut.jsp HTTP/1.0
+test.46.returnCode: HTTP/1.0 200 OK
+test.46.golden: implicitOut.txt
+test.46.debug:false
+test.46.magnitude:true
+
+test.47.request:GET /jsp/implicitConfig.jsp HTTP/1.0
+test.47.returnCode: HTTP/1.0 200 OK
+test.47.golden: implicitConfig.txt
+test.47.debug:false
+test.47.magnitude:true
+
+test.48.request:GET /jsp/implicitException.jsp HTTP/1.0
+test.48.returnCode: HTTP/1.0 200 OK
+test.48.golden: implicitException.txt
+test.48.debug:false
+test.48.magnitude:true
+
+test.49.request:GET /jsp/implicitPageContext.jsp HTTP/1.0
+test.49.returnCode: HTTP/1.0 200 OK
+test.49.golden: implicitPageContext.txt
+test.49.debug:false
+test.49.magnitude:true
+
+test.50.request:GET /jsp/implicitContext.jsp HTTP/1.0
+test.50.returnCode: HTTP/1.0 200 OK
+test.50.golden: implicitContext.txt
+test.50.debug:false
+test.50.magnitude:true
+
+test.51.request:GET /jsp/implicitRequest.jsp HTTP/1.0
+test.51.returnCode: HTTP/1.0 200 OK
+test.51.golden: implicitRequest.txt
+test.51.debug:false
+test.51.magnitude:true
+
+test.52.request:GET /jsp/implicitResponse.jsp HTTP/1.0
+test.52.returnCode: HTTP/1.0 200 OK
+test.52.golden: implicitResponse.txt
+test.52.debug:false
+test.52.magnitude:true
+
+test.53.request:GET /jsp/implicitSession.jsp HTTP/1.0
+test.53.returnCode: HTTP/1.0 200 OK
+test.53.golden: implicitSession.txt
+test.53.debug:false
+test.53.magnitude:true
+
+test.54.request:GET /jsp/implicitPageContext.jsp HTTP/1.0
+test.54.returnCode: HTTP/1.0 200 OK
+test.54.golden: implicitPageContext.txt
+test.54.debug:false
+test.54.magnitude:true
+
+test.55.request:GET /jsp/pageInvalid.jsp HTTP/1.0
+test.55.returnCode: HTTP/1.0 200 OK
+test.55.debug:false
+test.55.magnitude:false
+
+test.56.request:GET /jsp/pageDouble.jsp HTTP/1.0
+test.56.returnCode: HTTP/1.0 200 OK
+test.56.debug:false
+test.56.magnitude:false
+
+test.57.request:GET /jsp/pageContent3.jsp HTTP/1.0
+test.57.returnCode: HTTP/1.0 200 OK
+test.57.debug:false
+test.57.magnitude:true
+
+test.58.request:GET /jsp/xml.jsp HTTP/1.0
+test.58.returnCode: HTTP/1.0 200 OK
+test.58.magnitude:true
+
+test.59.request:GET /servlet/servletParam1 HTTP/1.0
+test.59.returnCode: HTTP/1.0 200 OK
+test.59.golden: servletParam1.txt
+test.59.magnitude:true
+
+test.60.request:GET /servlet/servletParam2 HTTP/1.0
+test.60.returnCode: HTTP/1.0 200 OK
+test.60.golden: servletParam2.txt
+test.60.magnitude:true
+
+test.61.request:GET /servlet/ServletParam HTTP/1.0
+test.61.returnCode: HTTP/1.0 200 OK
+test.61.golden: ServletParam.txt
+test.61.magnitude:true
1.3 +0 -1 jakarta-tomcat/src/tests/share/tests/jsp/Golden/buffer.txt
Index: buffer.txt
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/tests/share/tests/jsp/Golden/buffer.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buffer.txt 1999/11/04 01:39:46 1.2
+++ buffer.txt 1999/11/12 03:18:07 1.3
@@ -1,5 +1,4 @@
<html>
-<title>jspInit and jspDestroy</title>
<body>
Valid buffer size - "2048kb"
1.3 +0 -1 jakarta-tomcat/src/tests/webpages/jsp/buffer.jsp
Index: buffer.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/jsp/buffer.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buffer.jsp 1999/11/04 01:39:59 1.2
+++ buffer.jsp 1999/11/12 03:18:10 1.3
@@ -1,5 +1,4 @@
<html>
-<title>jspInit and jspDestroy</title>
<body>
<%@ page buffer="2048kb" %>
Valid buffer size - "2048kb"
1.2 +12 -0 jakarta-tomcat/src/tests/webpages/jsp/pageContent3.jsp
1.2 +20 -0 jakarta-tomcat/src/tests/webpages/jsp/xml.jsp