cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[larryi]

larryi  2003/02/16 14:23:08

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Update test to reflect new behavior for trailing "/." and "/foo/..".
  
  Revision  ChangesPath
  1.54  +3 -6  jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- test-tomcat.xml   27 Apr 2002 01:44:11 -  1.53
  +++ test-tomcat.xml   16 Feb 2003 22:23:08 -  1.54
  @@ -1252,15 +1252,12 @@
 
 
  -  
  -  
  +  
 
 
 
  -  
  -  
  -  
  +  
 
 
 

RE: cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[Keith Wannamaker]

I haven't heard from any 4.0 folks -- any interest
in me doing something similar for that tree?

Keith

| -Original Message-
| From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
| Sent: Thursday, April 18, 2002 8:58 AM
| To: [EMAIL PROTECTED]
| Subject: cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF
| test-tomcat.xml
| 
|   Log:
|   Remove '.sh' extensions from shell scripts (in the build).
|   Update references.
|   


--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[keith]

keith   02/04/18 06:58:01

  Modified:.README RELEASE-NOTES-3.3.2.txt build.xml
   src/admin index.html
   src/build/nightly start_tomcat.sh stop_tomcat.sh
   src/build/pkg prototype tomcat.spec
   src/doc  readme serverxml.html tomcat-security.html
tomcat-ssl-howto.html tomcat-ug.html
   src/doc/appdev processes.html
   src/native/mod_jk README
   src/shell jspc.sh shutdown.sh startup.sh tomcat.sh
   src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Remove '.sh' extensions from shell scripts (in the build).
  Update references.
  
  Revision  ChangesPath
  1.20  +10 -10jakarta-tomcat/README
  
  Index: README
  ===
  RCS file: /home/cvs/jakarta-tomcat/README,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- README24 Feb 2002 03:50:14 -  1.19
  +++ README18 Apr 2002 13:57:59 -  1.20
  @@ -60,13 +60,13 @@
 This version can be executed as follows:
   
cd $JAKARTA_HOME/jakarta-tomcat/build/tomcat
  - ./bin/startup.sh<-- Unix
  + ./bin/startup   <-- Unix
bin\startup <-- Windows
   
 and it can be shut down as follows:
   
cd $JAKARTA_HOME/jakarta-tomcat/build/tomcat
  - ./bin/shutdown.sh   <-- Unix
  + ./bin/shutdown  <-- Unix
bin\shutdown<-- Windows
   
   * You can also build a binary distribution version of Tomcat as follows:
  @@ -95,7 +95,7 @@
   * To start Tomcat, execute the following commands:
   
cd $JAKARTA_HOME/jakarta-tomcat/build/tomcat
  - ./bin/startup.sh<-- Unix
  + ./bin/startup   <-- Unix
bin\startup <-- Windows
   
   * You can now access the default web pages from a web browser at URL:
  @@ -105,7 +105,7 @@
   * To stop Tomcat, execute the following commands:
   
cd $JAKARTA_HOME/jakarta-tomcat/build/tomcat
  - ./bin/shutdown.sh   <-- Unix
  + ./bin/shutdown  <-- Unix
bin\shutdown<-- Windows
   
   You can run the "distribution" version of Tomcat as follows:
  @@ -113,7 +113,7 @@
   * To start Tomcat, execute the following commands:
   
cd $JAKARTA_HOME/jakarta-tomcat/dist/tomcat
  - ./bin/startup.sh<-- Unix
  + ./bin/startup   <-- Unix
bin\startup <-- Windows
   
   * You can now access the default web pages from a web browser at URL:
  @@ -123,7 +123,7 @@
   * To stop Tomcat, execute the following commands:
   
cd $JAKARTA_HOME/jakarta-tomcat/dist/tomcat
  - ./bin/shutdown.sh   <-- Unix
  + ./bin/shutdown  <-- Unix
bin\shutdown<-- Windows
   
   Alternatively, you can run Tomcat without changing your current working
  @@ -133,12 +133,12 @@
   "$JAKARTA_HOME/jakarta-tomcat/dist/tomcat").  Now, you can start Tomcat
   as follows:
   
  - $TOMCAT_HOME/bin/startup.sh <-- Unix
  + $TOMCAT_HOME/bin/startup<-- Unix
%TOMCAT_HOME%\bin\startup   <-- Windows
   
   and shut it down likewise:
   
  - $TOMCAT_HOME/bin/shutdown.sh<-- Unix
  + $TOMCAT_HOME/bin/shutdown   <-- Unix
%TOMCAT_HOME%\bin\shutdown  <-- Windows
   
   Tomcat may be run with any XML parser that is compliant with the Java API for
  @@ -173,14 +173,14 @@
   "trusted". This can be accomplished by executing the following:
   
cd $JAKARTA_HOME/jakarta-tomcat/build/tomcat<-- Unix
  - ./bin/tomcat.sh enableAdmin
  + ./bin/tomcat enableAdmin
   
cd %JAKARTA_HOME%\jakarta-tomcat\build\tomcat   <-- Windows
bin\tomcat enableAdmin
   
   Next, start Tomcat with: 
   
  - ./bin/startup.sh<-- Unix
  + ./bin/startup   <-- Unix
bin\startup <-- Windows
   
   To run the test, invoke the following URL in your browser:
  
  
  
  1.4   +2 -1  jakarta-tomcat/RELEASE-NOTES-3.3.2.txt
  
  Index: RELEASE-NOTES-3.3.2.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat/RELEASE-NOTES-3.3.2.txt,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RELEASE-NOTES-3.3.2.txt   17 Apr 2002 02:44:11 -  1.3
  +++ RELEASE-NOTES-3.3.2.txt   18 Apr 2002 13:57:59 -  1.4
  @@ -3,7 +3,7 @@
Release Notes
=
   
  -$Id: RELEASE-NOTES-3.3.2.txt,v 1.3 2002/04/17 02:44:11 billbarker Exp $
  +$Id: RELEASE-NOTES-3.3.2.txt,v 1.4 2002/04/18 13:57:59 keith Exp $
   
   
   This document describes the changes that have been made since the
  @@ -21,6 +21,7 @@
   
   8099 Preserve the query string when redirecting to the welcome page.
   
  + Removed '.sh' extension from

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[larryi]

larryi  02/02/06 20:01:07

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Fix tests to pass with forwardAll both "true" and "false" with Apache, IIS
  and Netscape (4.1).
  
  Added a test to ensure "+" is converted to space in query string.
  
  Revision  ChangesPath
  1.51  +39 -32jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- test-tomcat.xml   13 Jan 2002 03:01:26 -  1.50
  +++ test-tomcat.xml   7 Feb 2002 04:01:07 -   1.51
  @@ -16,7 +16,7 @@
   early tests.
   -->
   
  -   
  +   



  @@ -186,6 +186,12 @@
 
 
 
  +  
  +  Test '+' in query string is decoded.
  +  
  +  
  +  
  +  
 
   
 
  @@ -1253,12 +1259,6 @@
 
 
 
  -  
  -  
  -  
  -  
  -  
  
   
  
  @@ -1272,6 +1272,13 @@
  returnCode="${http.protocol} 40" 
 />
   
  +  
  +  
  +  
  +  
  +  
  +
 
  
   
  -   
  +   
  
 
  + returnCode="${http.protocol} 40" />
   
 
  + returnCode="${http.protocol} 40" />
   
 
  + returnCode="${http.protocol} 40" />
   
 
  + returnCode="${http.protocol} 40" />
   
 
  + returnCode="${http.protocol} 40" />
   
 
  + returnCode="${http.protocol} 40" />
   
 
  + returnCode="${http.protocol} 40" />
   
 
  + returnCode="${http.protocol} 40" />
   
 
  + returnCode="${http.protocol} 40" />
   
 
  + returnCode="${http.protocol} 40" />
   
 
  + returnCode="${http.protocol} 40" />
   
 
  + returnCode="${http.protocol} 40" />
   
 
  + returnCode="${http.protocol} 40" />
   
 
  + returnCode="${http.protocol} 40" />
   
 
  + returnCode="${http.protocol} 40" />
   
 
  + returnCode="${http.protocol} 40" />
   
 
  + returnCode="${http.protocol} 40" />
   
 
  + returnCode="${http.protocol} 40" />
   
 
  + returnCode="${http.protocol} 40" />
   
 
  + returnCode="${http.protocol} 40" />
   
 
  + returnCode="${http.protocol} 40" />
   
 
  + returnCode="${http.protocol} 40" />
   
 
  + returnCode="${http.protocol} 40" />
   
 
  + returnCode="${http.protocol} 40" />
  
   
  
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[larryi]

larryi  02/01/12 19:01:27

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Include a test for NUL.jsp (in addition to nul.jsp).
  
  Revision  ChangesPath
  1.50  +4 -1  jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- test-tomcat.xml   9 Jan 2002 06:36:24 -   1.49
  +++ test-tomcat.xml   13 Jan 2002 03:01:26 -  1.50
  @@ -16,7 +16,7 @@
   early tests.
   -->
   
  -   
  +   



  @@ -1373,6 +1373,9 @@
returnCode="${http.protocol} 404" />
   
 
  +
  +  
   
 mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: 

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[larryi]

larryi  02/01/08 22:36:25

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Add tests to ensure JSP pages whose names match Windows DOS device
  names, such as aux.jsp, return "not found".
  
  Revision  ChangesPath
  1.49  +74 -2 jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- test-tomcat.xml   31 Dec 2001 21:50:09 -  1.48
  +++ test-tomcat.xml   9 Jan 2002 06:36:24 -   1.49
  @@ -16,7 +16,7 @@
   early tests.
   -->
   
  -   
  +   



  @@ -1364,6 +1364,78 @@
 />
  
   
  +   
  +   
  +  
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +   
  +
  
 
 Writer test, closing writer at end
  @@ -1447,7 +1519,7 @@
   
   
  
  -   
  +   
  
   
  
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[larryi]

larryi  01/12/31 13:50:09

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Update to use properties to provide configurable tests to deal with
  behavioral differences among various web servers.
  
  Revision  ChangesPath
  1.48  +103 -57   jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- test-tomcat.xml   9 Oct 2001 02:31:45 -   1.47
  +++ test-tomcat.xml   31 Dec 2001 21:50:09 -  1.48
  @@ -16,10 +16,12 @@
   early tests.
   -->
   
  -   
  +   



  + 
  + 



  @@ -78,9 +80,11 @@
   
 
   
  -
  +
  +Content Type Test
  +
  +
  +
   

  +   returnCode="${http.protocol} ${redir.status}" /> 
   
   
  +   returnCode="${http.protocol} ${redir.status}" />
   
 
   
  @@ -116,6 +120,7 @@
 

 
  +  
 
 
 
  @@ -125,6 +130,62 @@
 
 
 
  +  
  +  Test space in directory name
  +  
  +  
  +  http://${host}${colonPort}/enc/dir%20name/index.html";
  +/>
  +  
  +  
  +  Test space in directory name #2
  +  
  +  
  +  
  +  
  +  
  +  Test space in HTML name
  +  
  +  
  +  
  +  
  +  
  +  Test space in JSP name
  +  
  +  
  +  
  +  
  +  
  +  Test encoded space in HTML name
  +  
  +  
  +  
  +  
  +  
  +  Test encoded space in JSP Name
  +  
  +  
  +  
  +  
  +  
  +  Test '+' in HTML name
  +  
  +  
  +  
  +  
  +  
  +  Test '+' in JSP name
  +  
  +  
  +  
  +  
  +  
  +  Test servlet with encoded '?' in pathinfo
  +  
  +  
  +  
  +  
 
   
 
  @@ -498,42 +559,6 @@
   
   
   
  -  
  -  
  -  
  -
  -
  -
  -
  -
  -
  -
  -   
  -
  -  
  -  
  -
  -
  -
  -
  -
  -
  -
  -
 
 
   
   
  -  
   
 
   
 
  +   returnCode="${http.protocol} ${redir.status}"  />
  +
  +  
  +
  +  
  +
  +  
   
  
   
  @@ -1241,15 +1277,21 @@
  returnCode="${http.protocol} 40" 
 />
   
  -  
  +  
  +  This URL should return 404 Not Found (unless Netscape)
  +  
  +  
  +  
  +  
   
  -  
  +  
  +  This URL should return 403 Forbidden (unless Netscape)
  +  
  +  
  +  
  +  
   
 
   
  -  
  +  
  +  This URL should return 404 Not Found (unless Netscape)
  +  
  +  
  +  
  +  
  +  
   
 mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: 

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[nacho]

nacho   01/09/22 19:56:32

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Another test that fails on IIS 5.0, returns the ROOT index page,
  instead of 403 status
  
  Revision  ChangesPath
  1.46  +2 -1  jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- test-tomcat.xml   2001/09/22 21:16:28 1.45
  +++ test-tomcat.xml   2001/09/23 02:56:32 1.46
  @@ -16,7 +16,7 @@
   early tests.
   -->
   
  -   
  +   



  @@ -1281,6 +1281,7 @@
 
   
 

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[larryi]

larryi  01/09/22 14:16:28

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Add unless="not.standalone" to some tests so they will be skipped when
  testing via a web server.  We don't need to be testing how they react
  to bad requests. In some cases they hang anyway.  Ant 1.4 is required
  for the tests to actually be skipped.
  
  Revision  ChangesPath
  1.45  +7 -4  jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- test-tomcat.xml   2001/08/30 20:42:04 1.44
  +++ test-tomcat.xml   2001/09/22 21:16:28 1.45
  @@ -16,7 +16,7 @@
   early tests.
   -->
   
  -   
  +   



  @@ -920,7 +920,8 @@
returnCode="${http.protocol} 200"
   />
   
  -  
  +  
  @@ -955,7 +956,8 @@
returnCode="${http.protocol} 404"
   />
   
  -  
  +  
   
  -  
  +  
  
  
  

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[costin]

costin  01/08/30 13:42:04

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Apache has different return codes for bad requests ( I would argue 501 as tomcat
  returns is better than 500, but it doesn't matter )
  
  Revision  ChangesPath
  1.44  +6 -3  jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- test-tomcat.xml   2001/08/25 16:18:20 1.43
  +++ test-tomcat.xml   2001/08/30 20:42:04 1.44
  @@ -16,7 +16,7 @@
   early tests.
   -->
   
  -   
  +   



  @@ -922,7 +922,7 @@
   
 
   
 
 
 
  
  
  

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[nacho]

nacho   01/08/25 09:18:20

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Forget  to add a dependency to the new mangler tests in client target.
  
  Revision  ChangesPath
  1.43  +2 -2  jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- test-tomcat.xml   2001/08/25 14:47:33 1.42
  +++ test-tomcat.xml   2001/08/25 16:18:20 1.43
  @@ -16,7 +16,7 @@
   early tests.
   -->
   
  -   
  +   



  @@ -1400,7 +1400,7 @@
   
   
  
  -   
  +   
  
   
  
  
  
  

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[larryi]

larryi  01/08/07 05:14:20

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Added a "colonPort" property that includes the colon with the port number,
  and updated response matches to use it to in place of ":${port}".  This allows
  you to avoid false failures when using the default port 80.
  
  Revision  ChangesPath
  1.41  +10 -9 jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- test-tomcat.xml   2001/08/03 02:57:08 1.40
  +++ test-tomcat.xml   2001/08/07 12:14:20 1.41
  @@ -16,9 +16,10 @@
   early tests.
   -->
   
  -   
  +   


  + 



  @@ -458,13 +459,13 @@
   
   http://${host}:${port}/index.html"; 
  +expectHeaders="Location:http://${host}${colonPort}/index.html"; 
   returnCode="${http.protocol} 302" 
   />
   
 http://${host}:${port}/test/servlet/index.html"; 
  + 
expectHeaders="Location:http://${host}${colonPort}/test/servlet/index.html"; 
returnCode="${http.protocol} 302" 
  />
   
  @@ -1338,7 +1339,7 @@
 Test for required authorization redirection response
 
 
  -  http://${host}:${port}/test/aaa/login.jsp"; />
  +  http://${host}${colonPort}/test/aaa/login.jsp"; />
 
   
 
  @@ -1346,31 +1347,31 @@
 
 
  -  http://${host}:${port}/test/aaa/login.jsp"; />
  +  http://${host}${colonPort}/test/aaa/login.jsp"; />
 
 
 
 
  -  http://${host}:${port}/test/aaa/login.jsp"; />
  +  http://${host}${colonPort}/test/aaa/login.jsp"; />
 
 
 
 
  -  http://${host}:${port}/test/aaa/login.jsp"; />
  +  http://${host}${colonPort}/test/aaa/login.jsp"; />
 
 
 
 
  -  http://${host}:${port}/test/aaa/login.jsp"; />
  +  http://${host}${colonPort}/test/aaa/login.jsp"; />
 
 
 
 
  -  http://${host}:${port}/test/aaa/login.jsp"; />
  +  http://${host}${colonPort}/test/aaa/login.jsp"; />
 
 
 

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[larryi]

larryi  01/07/20 10:43:25

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Add test to insure normal ";jsessionid" works as expected.
  
  Revision  ChangesPath
  1.39  +7 -1  jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- test-tomcat.xml   2001/07/20 04:28:16 1.38
  +++ test-tomcat.xml   2001/07/20 17:43:25 1.39
  @@ -16,7 +16,7 @@
   early tests.
   -->
   
  -   
  +   



  @@ -1211,6 +1211,12 @@
  method="GET" />
 
 
  +  
  +  
  +  
  +  
  +  
 
  
   
  
  
  

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[larryi]

larryi  01/07/19 21:28:16

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Fix some descriptions
  
  Revision  ChangesPath
  1.38  +15 -15jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- test-tomcat.xml   2001/07/18 21:20:06 1.37
  +++ test-tomcat.xml   2001/07/20 04:28:16 1.38
  @@ -16,7 +16,7 @@
   early tests.
   -->
   
  -   
  +   



  @@ -1220,12 +1220,12 @@
  returnCode="${http.protocol} 404" 
 />
   
  -  
   
  -  
  @@ -1235,12 +1235,12 @@
  returnCode="${http.protocol} 404" 
 />
   
  -  
   
  -  
  @@ -1250,7 +1250,7 @@
  returnCode="${http.protocol} 404" 
 />
   
  -  
  @@ -1260,31 +1260,31 @@
  returnCode="${http.protocol} 404" 
 />
   
  -  
   
  -  
   
  -  
   
  -  
   
  -  
  -  
  @@ -1295,16 +1295,16 @@
  goldenFile="${gdir}/HelloWorld.txt"
 />
   
  -  
  -  
   
  -  
  
  
  

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[larryi]

larryi  01/07/17 07:12:06

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Specifying a classpath in a Task definition causes Ant to create the task in
  its own class loader.  Thus, GTestDefaults, GTest, and HttpClient tasks
  reference different sets of static "result" vectors.  test.jsp would always
  display the empty result vectors created for GTestDefaults.  By removing
  the classpath, test.jsp behavior returns to normal.
  
  Hopefully, access to tomcat_util.jar can be provided in some other fashion..
  
  Revision  ChangesPath
  1.36  +1 -22 jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- test-tomcat.xml   2001/07/17 05:17:58 1.35
  +++ test-tomcat.xml   2001/07/17 14:12:06 1.36
  @@ -16,7 +16,7 @@
   early tests.
   -->
   
  -   
  +   



  @@ -25,61 +25,40 @@

   

  - 
  -  
  - 
  -   
  - 
   
 













   

   


   
   
  
  
  

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[costin]

costin  01/07/16 22:17:58

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Added the client side of the japanese test.
  
  The funny ½ etc are result of "od -xa" on the page ( I can see
  the icons on the browser ).
  
  Revision  ChangesPath
  1.35  +8 -1  jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- test-tomcat.xml   2001/07/16 01:13:45 1.34
  +++ test-tomcat.xml   2001/07/17 05:17:58 1.35
  @@ -16,7 +16,7 @@
   early tests.
   -->
   
  -   
  +   



  @@ -137,6 +137,13 @@

 
 
  +  
  +  
  +  Japanese
  +  
  + 
  +  
  +  
 
 
   
  
  
  

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[costin]

costin  01/07/15 18:13:46

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Added few more checks for security.
  
  Add the class path to the taskdefs, so it can be run standalone.
  
  Revision  ChangesPath
  1.34  +99 -5 jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- test-tomcat.xml   2001/07/14 03:52:43 1.33
  +++ test-tomcat.xml   2001/07/16 01:13:45 1.34
  @@ -16,7 +16,7 @@
   early tests.
   -->
   
  -   
  +   



  @@ -25,38 +25,62 @@

   

  + 
  +  
  + 
  +   
  + 
   
 









  +   classpathRef="cp.g"
  +   classname="org.apache.tomcat.util.test.matchers.HttpStatusMatch" />


  +   classpathRef="cp.g"
  +   classname="org.apache.tomcat.util.test.matchers.ResponseMatchFile" />
  + 

   

   

  - 
  + 
   
   
 
  @@ -106,6 +130,16 @@
 
 
 
  +  
  +  
  +  Few romanian chars in UNICED
  +  
  + 
  +  
  +  
  +  
  +  
  +
 
 
 Simple GET with parameters
  @@ -458,6 +492,18 @@
   
   
   
  +  
  +  
  +  Get a session and then include a JSP.
  +  
  +  
  +  
  +  
  +  
  +
  +
  +
 
 
  @@ -1112,8 +1158,56 @@
returnCode="${http.protocol} 4" />
   
  
  +
  +   
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +  
  +   
   
  -   
  +   
 

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[nacho]

nacho   01/07/13 20:52:43

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  *delocalize test, test cannot use messages for match
   will fail on languages distinct from english.
  
  Revision  ChangesPath
  1.33  +1 -2  jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- test-tomcat.xml   2001/07/10 21:13:02 1.32
  +++ test-tomcat.xml   2001/07/14 03:52:43 1.33
  @@ -16,7 +16,7 @@
   early tests.
   -->
   
  -   
  +   



  @@ -1233,7 +1233,6 @@
 
 
 http://${host}:${port}/test/aaa/login.jsp"; />
  -  
 
  
   
  
  
  

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[larryi]

larryi  01/05/22 20:28:18

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Update expected results for couple of "security_chk" tests to correct for
  updated Tomcat behavior.
  
  Revision  ChangesPath
  1.31  +5 -7  jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- test-tomcat.xml   2001/05/17 00:09:06 1.30
  +++ test-tomcat.xml   2001/05/23 03:28:13 1.31
  @@ -16,7 +16,7 @@
   early tests.
   -->
   
  -   
  +   



  @@ -1194,10 +1194,9 @@
  goldenFile="${gdir}/HelloWorld.txt"
 />
   
  -  
 
   
  -  
  
   
  
  
  

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[larryi]

larryi  01/05/16 17:09:09

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  A few more test cases to check if JSP source is served
  
  Revision  ChangesPath
  1.30  +31 -1 jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- test-tomcat.xml   2001/05/15 13:09:16 1.29
  +++ test-tomcat.xml   2001/05/17 00:09:06 1.30
  @@ -16,7 +16,7 @@
   early tests.
   -->
   
  -   
  +   



  @@ -1114,6 +1114,36 @@
  
   
  
  +  
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +
 

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[larryi]

larryi  01/05/15 06:09:20

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Add tests to check if "escaped" URL's are able to cause JSP source to
  be served.
  
  Revision  ChangesPath
  1.29  +67 -2 jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- test-tomcat.xml   2001/03/11 21:41:41 1.28
  +++ test-tomcat.xml   2001/05/15 13:09:16 1.29
  @@ -16,7 +16,7 @@
   early tests.
   -->
   
  -   
  +   



  @@ -,10 +,75 @@
 
   
  +   
  +
  +   
 
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +
  +  
  +  
  +
  +  
  +
  +  
  +  
  +
  +  
  
   
  
  @@ -1135,7 +1200,7 @@
  
   
  
  -   
  +   
  
   
  
  
  
  

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[nacho]

nacho   01/03/03 14:08:16

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Added:   src/tests/webpages/WEB-INF/classes CloseWriter.java
   src/tests/share/tests/jsp/Golden CloseWriter.txt
  Log:
  Regression test for reciclying writer bug ( aka RequesDispatcher ) .
  
  Revision  ChangesPath
  1.1  
jakarta-tomcat/src/tests/webpages/WEB-INF/classes/CloseWriter.java
  
  Index: CloseWriter.java
  ===
  import javax.servlet.*;
  import javax.servlet.http.*;
  import java.io.*;
  
  public class CloseWriter extends HttpServlet {
  
  public void init(ServletConfig conf)
  throws ServletException
  {
  super.init(conf);
  }
  
  public void service(HttpServletRequest req, HttpServletResponse res)
  throws ServletException, IOException
  {
  res.setContentType("text/plain");
  PrintWriter out= res.getWriter();
  out.write( "Closing Writer" );
  /// XXX trying to simulate the closed outputstream bug,
  // this test runs 2 times hoping it will catch a regression
  // on this issue.. 
  out.close();
  }
  }
  
  
  
  1.1  jakarta-tomcat/src/tests/share/tests/jsp/Golden/CloseWriter.txt
  
  Index: CloseWriter.txt
  ===
  Closing Writer
  
  
  1.27  +25 -9 jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- test-tomcat.xml   2001/03/01 17:59:03 1.26
  +++ test-tomcat.xml   2001/03/03 22:08:16 1.27
  @@ -16,7 +16,7 @@
   early tests.
   -->
   
  -   
  +   



  @@ -52,7 +52,7 @@

   
  - 
   

  @@ -108,7 +108,7 @@
 
 
 
  -  Simple GET with parmeters
  +  Simple GET with parameters
 


  @@ -120,7 +120,7 @@
 
   
 
  -  Simple POST parmeters
  +  Simple POST parameters
 

  @@ -133,7 +133,7 @@
   
 
 POST and GET parameters
  -  

  @@ -214,7 +214,7 @@
 
 
 
  -  
 
 
  @@ -339,9 +339,9 @@
   
 
 
  +   
   
  +   
  +  
  +  Writer test, closing writer at end
  +  
  +  
  +  
  +  
  +  
  +  
  +  Writer test,trying to catch reciclying issues
  +  
  +  
  +  
  +  
  +  
  
   
  
  -   
  +   
  
   
  
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[larryi]

larryi  01/03/01 09:59:11

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Added a test to check if a file ending with ".jsp%20" is served.  It should
  result in a 404 Not found error.
  
  Revision  ChangesPath
  1.26  +7 -1  jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- test-tomcat.xml   2001/02/28 20:35:15 1.25
  +++ test-tomcat.xml   2001/03/01 17:59:03 1.26
  @@ -16,7 +16,7 @@
   early tests.
   -->
   
  -   
  +   



  @@ -1102,6 +1102,12 @@
   
 
  +
  +  
  +
  
   
  
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[larryi]

larryi  01/02/28 12:35:16

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Was testing with Tomcat 3.2 and forgot to update the cookie which
  Tomcat 3.3 uses.
  
  Revision  ChangesPath
  1.25  +2 -2  jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- test-tomcat.xml   2001/02/23 21:45:46 1.24
  +++ test-tomcat.xml   2001/02/28 20:35:15 1.25
  @@ -16,7 +16,7 @@
   early tests.
   -->
   
  -   
  +   



  @@ -445,7 +445,7 @@
 
 
 
  -  
  +  
 
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[costin]

costin  01/02/09 09:02:03

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Ops, the updated file was in build and didn't got commited
  ( thanks to nightly build for finding that :-)
  
  Revision  ChangesPath
  1.16  +28 -22jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- test-tomcat.xml   2001/02/09 03:59:33 1.15
  +++ test-tomcat.xml   2001/02/09 17:02:01 1.16
  @@ -16,7 +16,7 @@
   early tests.
   -->
   
  -   
  +   



  @@ -39,8 +39,16 @@
  classname="org.apache.tomcat.util.test.Cookie" />

  - 
  + 
  + 
  + 
  + 
  + 

   
  @@ -96,9 +104,9 @@


 
  -  
  -  
  -  
  +  
  +  
  +  
 
   
 
  @@ -108,9 +116,9 @@


 
  -  
  -  
  -  
  +  
  +  
  +  
 
   
 
  @@ -123,14 +131,14 @@


 
  -  
  -  
  -  
  -  
  +  
  +  
  +  
  +  
 
   
 
  -  The POST data can't be read before getParameter
  +  The POST data is not read before getParameter
 
  @@ -139,14 +147,13 @@


 
  -  
  -  
  -  
  -  
  +  
  +  
  +  
 
   
 
  -  The POST data can't be read before getParameter
  +  No data after the params are read
 
  @@ -155,10 +162,9 @@


 
  -  
  -  
  -  
  -  
  +  
  +  
  +  
 
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[costin]

costin  01/02/08 19:59:34

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Update the tests - the "param" target uses the new features.
  
  I'll send detailed instructions on how to add new tests ( it is very
  important to start adding regression tests whenever possible - otherwise
  we'll never be able to make a release without going through hundreds of
  bug reports and wasting the time ).
  
  Revision  ChangesPath
  1.15  +63 -46jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- test-tomcat.xml   2001/02/07 06:49:29 1.14
  +++ test-tomcat.xml   2001/02/09 03:59:33 1.15
  @@ -16,7 +16,7 @@
   early tests.
   -->
   
  -   
  +   



  @@ -27,11 +27,16 @@

   
 
  - 

  + 

  + 
  + 


   
  + 
  + 
  +
  +
 
 
   
  @@ -51,20 +60,7 @@
   protocol="${http.protocol}"
   outputType="${outputType}" />
 
  -  
  -  
  -  
  -  
  - 
  - RequestBody
  -  
  -  
  - 
  -  
  -  
  -   
   
  -
 
 
   
  @@ -93,55 +89,77 @@
 
   
 
  -  
  +  
 Simple GET with parmeters
  -  
  +  
  + 
  + 
  + 
  +  
 
 
 
  -  
  +  
   
  -  
  +  
 Simple POST parmeters
  -  
  - 
  - a=b&c=d
  -  
  + 
  + 
  +  
 
 
 
  -  
  +  
   
  -  
  +  
 POST and GET parameters
  -  
  - 
  - a=b&c=d
  -  
  +  
  + 
  + 
  + 
  + 
  +  
 
 
 
 
  -  
  +  
   
  -  
  +  
 The POST data can't be read before getParameter
  -  
  - 
  - a=b&c=d
  -  
  + 
  + 
  + 
  + 
  +  
 
 
 
 
  -  
  +  
  +
  +  
  +  The POST data can't be read before getParameter
  +  
  + 
  + 
  + 
  + 
  +  
  +  
  +  
  +  
  +  
  +  
   
   
 
  @@ -663,14 +681,13 @@
   />
   
 
  -  
  + responseMatch="Servlet: Servlet1" />
  +  
   
 
   
  
  -   
  +   
  
   
  
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[larryi]

larryi  01/01/30 18:05:55

  Modified:src/tests/share/tests/jsp/Golden PrintWriterTest.txt
   src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Update PrintWriterTest test to use a responseMatchFile to verify that the
  expected exception occurred.
  
  Revision  ChangesPath
  1.2   +5 -2  
jakarta-tomcat/src/tests/share/tests/jsp/Golden/PrintWriterTest.txt
  
  Index: PrintWriterTest.txt
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/tests/share/tests/jsp/Golden/PrintWriterTest.txt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PrintWriterTest.txt   2000/01/18 00:02:29 1.1
  +++ PrintWriterTest.txt   2001/01/31 02:05:54 1.2
  @@ -1,2 +1,5 @@
  -
  -
  +Included servlet error: 500
  +java.lang.IllegalStateException: getOutputStream() has already been called
  +!=
  +PreInclude
  +PostInclude
  
  
  
  1.13  +2 -1  jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- test-tomcat.xml   2001/01/29 06:59:39 1.12
  +++ test-tomcat.xml   2001/01/31 02:05:54 1.13
  @@ -16,7 +16,7 @@
   early tests.
   -->
   
  -   
  +   



  @@ -133,6 +133,7 @@
 

   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[costin]

costin  01/01/28 22:59:43

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Removed: src/tests/share run-test.sh
  Log:
  A bit of reorganization of tests - grouped the tests that are
  specific to standalone and apache ( different behavior for static
  resources - AFAIK both are valid )
  
  Added few comments to some tests, make sure unavailable test is run
  corectly ( it should be a better way to do it - it works only the first
  time anyway )
  
  The run-tests.sh is moved in admin/WEB-INF/scripts - will be enhanced
  to deploy/undeploy the test app, etc ( to avoid having the /tests
  around all the time )
  
  Revision  ChangesPath
  1.12  +112 -138  jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- test-tomcat.xml   2001/01/28 21:46:01 1.11
  +++ test-tomcat.xml   2001/01/29 06:59:39 1.12
  @@ -1,4 +1,4 @@
  -
  +
  
   
  -   
  +   



  @@ -44,12 +44,12 @@
   
 
 
  +
   
  -
 
 
 
  @@ -66,7 +66,10 @@
   
   
 
  +  
  +
 
  +
   
  @@ -75,42 +78,16 @@
  request="GET /test/binaries/image1.gif HTTP/1.0"
  goldenFile="${gdir}/image1.gif"
  exactMatch="true"  />
  -
  -  
  -
  -  
   

   
  -
  -
  -
  -
  -
  -   
  -  
  -   
  -
  -
  - 
  -
  +
 
   
 
  @@ -205,32 +182,56 @@
  />
  -->
   
  -
  +http://${host}:${port}/index.html" 
  +returnCode="${http.protocol} 302" 
  +/>
   
  -
  -
  -
  -  http://${host}:${port}/index.html" 
  - returnCode="${http.protocol} 302" 
  -   />
 http://${host}:${port}/test/servlet/index.html" 
returnCode="${http.protocol} 302" 
  />
  +
  +
  +
   
   
  -
  -  
  -  
  +  
  +  
  +  
  +
  +
  +
  +
  +
  +
  +
  +   
  +
  +  
  +  
  +
  +
  +
  +
  +
  +
   
   
 
  @@ -504,27 +505,8 @@
   />
   
  
  -
  -  
  -
  -
  -
   
  -   
  -
  -  
  -
  -
  -   
  -
  +  
 
   
   
  -  
  -
   
  +   
  +  
  +   
   
  -   
  +  
   
  -   
  -  
  -  
   
  @@ -590,30 +575,6 @@
returnCode="Error: "
magnitude="false" />
   
  -  
  -
  -  
  -
  -  
  -
  -  
  -
  -
 
  @@ -626,28 +587,13 @@
returnCode="${http.protocol} 404"
 />
   
  -   
  -
  -   
  -  
  -
 
  -   
  +   returnCode="${http.protocol} 301"  />
   
  -   
  -  
  -
  -  
  
   
  + 
  +   
  
 
  
   
  -   
  -
  -   
  -   
  +   
  
 
  
  + 
  +   
  +
  +   
  +
  +
  +
  +
  +  
   
  +  
  +
  +  
  +
  +   
  +
  +
  
  
 
  -->
  
  -  
  -  
  +  
  @@ -835,7 +807,8 @@
   
  
  
  -  
   
 
   
  -  
   
  +  
  +
  +  
  +
 
 
  @@ -903,25 +882,20 @@
returnCode="${http.protocol} 4" />
  
   
  -   
  - 
  -   
  -
  -
  -   
  +   
  +   
  
   
  -   
  +   
  +   
  + 
  
   
  

  
   
  -
  
  -
  -   
   
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[costin]

costin  01/01/28 13:46:01

  Modified:src/admin/test test.jsp
   src/native/mod_jk/apache1.3 mod_jk.c
   src/share/org/apache/tomcat/modules/generators
StaticInterceptor.java
   src/share/org/apache/tomcat/modules/server Ajp12.java
   src/share/org/apache/tomcat/util/test Body.java GTest.java
   src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Fix in mod_jk.c ( should resolve at least some of the failures
  on Apache ) - we need to check Apache2.0 module too.
  - send the "right" hostname and port ( uncomment the println to see
  what's generated in the other cases - at least of 1.3.12 this is the
  only combination that seems to work )
  - This should fix "Location" problems with Apache
  
  StaticInterceptor:
  - more consistency with Apache, use 301 instead of 302 and do a redirect for
  directories if the uri doesn't end in "/"
  
  -Ajp12 - read the protocol from the server ( it was http/1.0 only ). Even
  if currently tomcat implements only 1.0, we should report the protocol
  of the real server - i.e. 1.1.
  
  - added few comments in test-tomcat.xml
  
  test.jsp:
  - fill port and host from the request data ( if you access test.jsp
  using Apache port - no need to change )
  
  - added "comments" for failed tests. Gtest now supports a
  body to allow more descriptive data ( description
  is very limited )
  
  Revision  ChangesPath
  1.8   +9 -3  jakarta-tomcat/src/admin/test/test.jsp
  
  Index: test.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/test/test.jsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- test.jsp  2001/01/28 19:18:37 1.7
  +++ test.jsp  2001/01/28 21:46:00 1.8
  @@ -26,9 +26,12 @@
   
   
   Debug: 
  -Port: 
  -Host: 
  -Expected protocol: 
  +Port: 
  +
  +Host: 
  +
  +Expected protocol: 
( use when testing Apache - tomcat3.x returns HTTP/1.0 ) 
   
   
  @@ -76,6 +79,9 @@
   
 <%= failures.getHttpClient().getFullRequest() %>
   
  +Comments: 
  +  <%= failures.getComment() %>
  +
   Message: 
   
 <%= failures.getMatcher().getMessage() %>
  
  
  
  1.3   +24 -2 jakarta-tomcat/src/native/mod_jk/apache1.3/mod_jk.c
  
  Index: mod_jk.c
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/native/mod_jk/apache1.3/mod_jk.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_jk.c  2000/11/10 18:48:50 1.2
  +++ mod_jk.c  2001/01/28 21:46:00 1.3
  @@ -351,8 +351,30 @@
   s->remote_host  = NULL_FOR_EMPTY(s->remote_host);
   
   s->remote_addr  = NULL_FOR_EMPTY(r->connection->remote_ip);
  -s->server_name  = (char *)(r->hostname ? r->hostname : 
r->server->server_hostname);
  -s->server_port  = r->server->port;
  +/* Wrong:s->server_name  = (char *)ap_get_server_name( r ); */
  +s->server_name= (char *)(r->hostname ? r->hostname : 
  +  r->server->server_hostname);
  +
  +
  +s->server_port= htons( r->connection->local_addr.sin_port );
  +/* Wrong: s->server_port  = r->server->port; */
  +
  +
  +/*Winners:  htons( r->connection->local_addr.sin_port )
  +   (r->hostname ? r->hostname : 
  +  r->server->server_hostname),
  +*/
  +/* printf( "Port %u %u %u %s %s %s %d %d \n", 
  + ap_get_server_port( r ), 
  + htons( r->connection->local_addr.sin_port ),
  + ntohs( r->connection->local_addr.sin_port ),
  + ap_get_server_name( r ),
  + (r->hostname ? r->hostname : r->server->server_hostname),
  + r->hostname,
  + r->connection->base_server->port,
  + r->server->port
  + );
  +*/
   s->server_software = (char *)ap_get_server_version();
   
   s->method   = (char *)r->method;
  
  
  
  1.3   +10 -1 
jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/StaticInterceptor.java
  
  Index: StaticInterceptor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/StaticInterceptor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StaticInterceptor.java2001/01/01 02:07:24 1.2
  +++ StaticInterceptor.java2001/01/28 21:46:00 1.3
  @@ -167,6 +167,15 @@
return 0;
}
   
  + // consistent with Apache
  + if( ! requestURI.endsWith("/") ) {
  + String redirectURI= requestURI + "/";
  + req.setAttribute("javax.servlet.error.message",
  +  redirectURI);
  + if( debug > 0) log( "Redirect " + redirectURI );
  + return 301;
  + }
  + 
// Send redirect to the welcome file.

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[costin]

costin  01/01/28 11:58:21

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Added few comments on the tests that fail on Apache+tomcat ( because
  of different behavior of the static handler ).
  
  Tomcat behavior is not "wrong", but I think we should make it consistent
  with Apache ( i.e. use similar error codes - 301 vs. 302 for example for
  dirs, or the way the index file is displayed - using a redirect in apache
  which may be a better solution for limit cases )
  
  Revision  ChangesPath
  1.10  +16 -6 jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- test-tomcat.xml   2001/01/27 18:41:05 1.9
  +++ test-tomcat.xml   2001/01/28 19:58:21 1.10
  @@ -16,11 +16,12 @@
   early tests.
   -->
   
  -   
  +   




  + 

   

  @@ -46,6 +47,7 @@
   debug="${debug}" 
   protocol="${http.protocol}"
   outputType="${outputType}" />
  +
 
 
 
  @@ -75,22 +77,30 @@
 
   
 
  -
  +
  +   returnCode="${http.protocol} 30" /> 
   
  +
  +
  +
   
   
  
  -
  -  
  +  
  +   
   

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[larryi]

larryi  01/01/27 10:41:05

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Add revision property.
  
  Revision  ChangesPath
  1.9   +2 -1  jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- test-tomcat.xml   2001/01/27 00:59:20 1.8
  +++ test-tomcat.xml   2001/01/27 18:41:05 1.9
  @@ -15,7 +15,8 @@
   "main" or "apache" targets, tomcat may not start fast enough to avoid 
failing some of the
   early tests.
   -->
  -  
  +
  +   



  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[nacho]

nacho   01/01/26 16:59:20

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  * Tests involving  welcome.tst were bad , because now the 302
  body response is localizd
  
  * Tests involving a Location header were trying
  to match up with "localhost" the default it's "127.0.0.1"
  when there is no no host header in request
  
  Revision  ChangesPath
  1.8   +9 -5  jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- test-tomcat.xml   2001/01/23 05:08:40 1.7
  +++ test-tomcat.xml   2001/01/27 00:59:20 1.8
  @@ -16,7 +16,7 @@
   early tests.
   -->
 
  - 
  + 



  @@ -85,8 +85,8 @@
   
   
  +   returnCode="${http.protocol} 302" />
  +
  
   
 
  @@ -499,9 +499,13 @@
  
   
 
  +
  +
   
   
  
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[costin]

costin  01/01/22 21:08:40

  Modified:src/admin/WEB-INF admin.tld
   src/share/org/apache/tomcat/core Response.java
   src/share/org/apache/tomcat/modules/config
PolicyInterceptor.java
   src/share/org/apache/tomcat/modules/server Http10.java
Http10Interceptor.java
   src/share/org/apache/tomcat/util/test DefaultMatcher.java
   src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  2 fixes in the Http implementation:
  - do case-sensitive compare for the http method ( GET works, get doesn't )
  - right HTTP 0.9 support
  
  Also, a fix in the matcher ( the responseCode is not matched, needed to
  deal with 0.9 requests ).
  
  I also commented out or changed a number of tests ( POST doesn't exist
  in 0.9, so need to add the protocol ).
  
  Right now all but one tests are passing.
  The failing test works fine with JspInterceptor ( if useJspServlet="false"
  is used ), but fails with JspServlet.
  
  ( the current default is to use JspServlet, in order to test and make sure
  it is supported and works fine ).
  
  The failing test is test/jsp/classTest.jsp, with the error:
  java.lang.IllegalAccessError: try to access class 
jsp/_0002fjsp_0002fclassTest_0002ejspclassTest_jsp_0$JSPTest$Inner from class 
jsp/_0002fjsp_0002fclassTest_0002ejspclassTest_jsp_0
  
  Revision  ChangesPath
  1.7   +2 -1  jakarta-tomcat/src/admin/WEB-INF/admin.tld
  
  Index: admin.tld
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/admin.tld,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- admin.tld 2001/01/21 20:10:37 1.6
  +++ admin.tld 2001/01/23 05:08:37 1.7
  @@ -20,7 +20,8 @@
   tadm.TomcatAdmin
   tadm.TomcatAdminTEI
   
  -  Admin
  +  The admin tag will perform various tomcat admin tasks. It'll also
  +  make available the "cm" and "ctx" variables.
   
   
  action
  
  
  
  1.47  +0 -2  jakarta-tomcat/src/share/org/apache/tomcat/core/Response.java
  
  Index: Response.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Response.java,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- Response.java 2000/12/30 07:54:12 1.46
  +++ Response.java 2001/01/23 05:08:38 1.47
  @@ -349,8 +349,6 @@
*/
   public void notifyEndHeaders() throws IOException {
commited=true;
  - if(request.protocol().isNull()) // HTTP/0.9 
  - return;
   
// let CM notify interceptors and give a chance to fix
// the headers
  
  
  
  1.4   +2 -2  
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/PolicyInterceptor.java
  
  Index: PolicyInterceptor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/PolicyInterceptor.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PolicyInterceptor.java2001/01/08 12:15:22 1.3
  +++ PolicyInterceptor.java2001/01/23 05:08:38 1.4
  @@ -72,8 +72,8 @@
* Set policy-based access to tomcat.
* Must be hooked before class loader setter.
* The context will have a single protection domain, pointing to the doc root.
  - *  That will include all classes loaded that belong to the context ( jsps, 
WEB-INF/classes,
  - * WEB-INF/lib/
  + *  That will include all classes loaded that belong to the context
  + * ( jsps, WEB-INF/classes, WEB-INF/lib/
*
* @author  Glenn Nielsen 
* @author [EMAIL PROTECTED]
  
  
  
  1.7   +9 -7  
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Http10.java
  
  Index: Http10.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Http10.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Http10.java   2000/12/30 08:26:45 1.6
  +++ Http10.java   2001/01/23 05:08:39 1.7
  @@ -259,16 +259,18 @@
   
methodMB.setBytes( buf, startMethod, endMethod - startMethod );
// optimization - detect common strings, no allocations
  - if( buf[startMethod] == 'g' ||
  - buf[startMethod] == 'G') {
  - if( methodMB.equalsIgnoreCase( "get" ))
  + // buf[startMethod] == 'g' ||, ignoreCase
  +
  + // the idea is that we don't allocate new strings - but set
  + // to constants. ( probably not needed, it's has a tiny impact )
  + if( buf[startMethod] == 'G') {
  + if( methodMB.equals( "GET" ))
methodMB.setString("GET");
}
  - if( buf[startMethod] == 'p' ||
  - buf[startMethod] == 'P' ) {
  - if(

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[costin]

costin  01/01/21 12:10:40

  Modified:src/admin/WEB-INF admin.tld
   src/admin/WEB-INF/classes/tadm GTestTEI.java GTestTag.java
   src/admin/test test.jsp
   src/share/org/apache/tomcat/util/test DefaultMatcher.java
GTest.java HttpClient.java
   src/tests/webpages/WEB-INF test-tomcat.xml
  Added:   src/share/org/apache/tomcat/util/test TestDefaults.java
  Log:
  Varius cosmetic changes to the testing component of the admin webapp.
  
  - Option to do "external" formating ( i.e. the test results are stored,
  and the JSP page can do whatever formating it wants ). Old style is
  still supported ( text, simple html generated by GTest )
  
  - A simple tag to set the defaults for HttpClient and GTest ( avoid quite
  a few keystrokes - host="${host}", etc for each test )
  
  - test.jsp will display the FAILED tests first ( easier to read )
  
  - the test now detects HTTP/0.9 errors ( 9 tests are now failing, mostly
  because of a bug in HTTP/0.9 support - not hard to fix, I think the bug
  is also present in 3.2 ). The old GTest didn't implemented 0.9 support
  corectly, and accepted 1.0 responses for 0.9 requests. Few of the tests are
  wrong from the same reason ( expect status on 0.9 requests )
  
  - fixes, more options, etc
  
  Revision  ChangesPath
  1.6   +5 -0  jakarta-tomcat/src/admin/WEB-INF/admin.tld
  
  Index: admin.tld
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/admin.tld,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- admin.tld 2001/01/21 06:39:21 1.5
  +++ admin.tld 2001/01/21 20:10:37 1.6
  @@ -107,6 +107,11 @@
  false
  true
   
  +
  +   outputType
  +   false
  +   true
  +
 
   
   
  
  
  
  1.2   +12 -6 jakarta-tomcat/src/admin/WEB-INF/classes/tadm/GTestTEI.java
  
  Index: GTestTEI.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/classes/tadm/GTestTEI.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- GTestTEI.java 2001/01/20 20:14:28 1.1
  +++ GTestTEI.java 2001/01/21 20:10:38 1.2
  @@ -20,15 +20,21 @@
   
   public VariableInfo[] getVariableInfo(TagData data) {
return (new VariableInfo[] {
  - new VariableInfo("gtestSuccessCount",
  -  "java.lang.Integer",
  + new VariableInfo("gtestTestResults",
  +  "java.util.Vector",
 true,  VariableInfo.AT_BEGIN),
  - new VariableInfo("gtestErrorCount",
  -  "java.lang.Integer",
  + new VariableInfo("gtestTestFailures",
  +  "java.util.Vector",
 true,  VariableInfo.AT_BEGIN),
  - new VariableInfo("gtestErrors",
  + new VariableInfo("gtestTestSuccess",
 "java.util.Vector",
  -  true,  VariableInfo.AT_BEGIN)
  +  true,  VariableInfo.AT_BEGIN),
  + new VariableInfo("gtestTestProperties",
  +  "java.util.Hashtable",
  +  true,  VariableInfo.AT_BEGIN),
  + new VariableInfo("gtestHttpClients",
  +  "java.util.Hashtable",
  +  true,  VariableInfo.AT_BEGIN),
});
   
   }
  
  
  
  1.5   +32 -10jakarta-tomcat/src/admin/WEB-INF/classes/tadm/GTestTag.java
  
  Index: GTestTag.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/classes/tadm/GTestTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- GTestTag.java 2001/01/21 06:39:21 1.4
  +++ GTestTag.java 2001/01/21 20:10:38 1.5
  @@ -36,8 +36,18 @@
String base=targetCtx.getRealPath("/");

runTest( base );
  - //pageContext.setAttribute("cm", cm);
   
  + pageContext.setAttribute("gtestTestResults",
  +  GTest.getTestResults());
  + pageContext.setAttribute("gtestTestFailures",
  +  GTest.getTestFailures());
  + pageContext.setAttribute("gtestTestSuccess",
  +  GTest.getTestSuccess());
  + pageContext.setAttribute("gtestTestProperties",
  +  GTest.getTestProperties());
  + pageContext.setAttribute("gtestHttpClients",
  +  HttpClient.getHttpClients());
  +
} catch (Exception ex ) {
ex.printStackTrace();
}
  @@ -64,7 +74,8 @@
   String target;
   String testApp;
   String debug;
  -
  +

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[costin]

costin  01/01/20 22:39:22

  Modified:src/admin/WEB-INF admin.tld
   src/admin/WEB-INF/classes/tadm GTestTag.java
   src/admin/test test.jsp
   src/share/org/apache/tomcat/util/test DefaultMatcher.java
GTest.java Header.java HttpClient.java
Response.java
   src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Second round of changes in the sanity-test running.
  
  You should be able to run the tests by starting tomcat and accessing
  http://localhost:8080/admin/test/test.jsp
  
  The old GTest is deprecated, it has been split into HttpClient and
  DefaultMatcher ( plus a wrapper that allows 'old-style' calling ).
  
  The goal is to make it easy to run the tests, and to make it easy and
  clean to add tests.
  
  I'll probably add a page that allow to run watchdog from the web, but
  right now it's more important to get "writing new tests" and
  adding regression tests for the bugs we fix as easy and simple as possible.
  
  ( long term we should use a dedicated test program - ant is getting
  very hard to use embeded without enough API control ).
  
  Changes:
  - added a form to test.jsp, allow to run a subset of the tests
  - fixes to deal with IntrospectionHelper
  - various fixes in the util.test
  - more debugging
  - dispay the  on GET tests, so we can re-run individual tests
  manually
  - added a sample test using the cleaner ( IMHO ) syntax ( i.e. httpClient
  followed by a matcher )
  
  Missing:
  - code documentation
  - documentation on how to write tests
  - fixes, etc.
  
  ( it's a test application, should make things simpler - if it doesn't we
  should go back to the old one )
  
  Revision  ChangesPath
  1.5   +5 -0  jakarta-tomcat/src/admin/WEB-INF/admin.tld
  
  Index: admin.tld
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/admin.tld,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- admin.tld 2001/01/20 21:50:23 1.4
  +++ admin.tld 2001/01/21 06:39:21 1.5
  @@ -102,6 +102,11 @@
  false
  true
   
  +
  +   debug
  +   false
  +   true
  +
 
   
   
  
  
  
  1.4   +9 -1  jakarta-tomcat/src/admin/WEB-INF/classes/tadm/GTestTag.java
  
  Index: GTestTag.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/classes/tadm/GTestTag.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- GTestTag.java 2001/01/20 23:25:44 1.3
  +++ GTestTag.java 2001/01/21 06:39:21 1.4
  @@ -63,6 +63,7 @@
   String testFileName;
   String target;
   String testApp;
  +String debug;
   
   /** Set the name of the test.xml, relative to the base dir.
*  For example, /WEB-INF/test-tomcat.xml
  @@ -84,6 +85,10 @@
   public void setTestApp( String s ) {
testApp=s;
   }
  +
  +public void setDebug( String s ) {
  + debug=s;
  +}
   
   //  Implementation methods 
   
  @@ -102,6 +107,8 @@
// new one
GTest.setDefaultWriter(out);
GTest.setDefaultOutput("html");
  + if(debug!=null)
  + GTest.setDefaultDebug(Integer.valueOf( debug ).intValue());

Project project=new Project();

  @@ -127,7 +134,8 @@
if( ex instanceof BuildException ) {
Throwable ex1=((BuildException)ex).getException();
System.out.println("Root cause: " );
  - ex1.printStackTrace(out);
  + if( ex1!=null)
  + ex1.printStackTrace(out);
}
}
   }
  
  
  
  1.3   +28 -4 jakarta-tomcat/src/admin/test/test.jsp
  
  Index: test.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/admin/test/test.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- test.jsp  2001/01/20 23:25:44 1.2
  +++ test.jsp  2001/01/21 06:39:21 1.3
  @@ -6,11 +6,37 @@
   This page will show the result of executing the sanity test suite. 
   You can see the context log here
   
  +
  +Target:
  + 
  +  new-style
  +  file-tomcat
  +  dispatch-tomcat
  +  get-tomcat
  +  requestMap
  +  post
  +  jsp-tomcat
  +  wrong_request
  +  unavailable
  +  restricted
  +  client
  +
  +
  +
  +Debug: 
  +
  +
  +
  +
   <% // This is an ugly hack to make the logs easily accessible.
  // Keep in mind this is just a way to jump-start testing, not a 
  // production-quality test runner.
   %>
   
  +<% out.flush(); 
  +   if( request.getParameter("target") == null ) return;
  +%>
  +
   
  @@ -18,8 +44,6 @@
   
   
  -
  -
  +target='<%= request.getParameter("target") %>

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[costin]

costin  01/01/20 12:11:04

  Modified:src/tests build.xml
   src/tests/share/gtest GTest.java
   src/tests/webpages index.html
   src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Few changes to the self-test building.
  
  The Golden files will be part of the .war file ( no need to polute /lib ),
  allow less config headache.
  
  Reverted to the old package name for the (old) GTest - until the improved
  version is ready.
  
  This is work on progress.
  
  Revision  ChangesPath
  1.2   +12 -11jakarta-tomcat/src/tests/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml 2000/12/29 00:20:28 1.1
  +++ build.xml 2001/01/20 20:11:03 1.2
  @@ -37,37 +37,38 @@
   
 
 
  -
  -
  -
  +
  +
  +
  +
  +
   
   
   
  -  
  -
   
   
   
  +
   
  +
  +
   
  -
  -
  -
  +  
   
  +  

  -
  +  basedir="${tomcat.build}/webapps/test" includes="**"/> 
 
   
 
  
  
  
  1.2   +1 -1  jakarta-tomcat/src/tests/share/gtest/GTest.java
  
  Index: GTest.java
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/share/gtest/GTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- GTest.java2001/01/20 02:35:36 1.1
  +++ GTest.java2001/01/20 20:11:03 1.2
  @@ -56,7 +56,7 @@
* [Additional notices, if required by prior licensing conditions]
*
*/ 
  -package org.apache.tomcat.util.test;
  +package org.apache.tomcat.util.task;
   
   import java.net.*;
   import java.io.*;
  
  
  
  1.3   +62 -8 jakarta-tomcat/src/tests/webpages/index.html
  
  Index: index.html
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/index.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- index.html1999/11/11 22:09:51 1.2
  +++ index.html2001/01/20 20:11:03 1.3
  @@ -1,8 +1,62 @@
  -Test Heiarchy Base Page
  -
  -This is 
  -  the home page of the test hierarchy. It doesn't do too much good to look at 
  -  it directly... Instead, why don't you run the tests to find out what you might 
  -  want to know.
  -Oh, by the way, 
  -  merry christmas.. :)
  +Sanity Test Base Page
  +
  +
  +
  +This is the home page of the self test hierarchy. 
  +
  +Running the tests from the web
  +
  +You first need to enable the /admin application. You'll need that for other 
  +purposes as well. 
  +
  +Edit TOMCAT_HOME/conf/server.xml  and replace:
  +
  +
  + 
  +
  +
  +With:
  +
  +
  + < Context path="/admin" 
  +  docBase="webapps/admin" 
  +  debug="0" 
  +  reloadable="true" 
  +  trusted="false" > 
  +
  +
  +You'll also need to edit TOMCAT_HOME/conf/users/admin-users.xml and 
  +change the password ( very important for security reasons ).
  +
  +
  +
  +After that you can just go to 
  +/admin/test/test.jsp and you'll see
  +the test results. 
  +
  +You can run only subsets of the tests:
  +
  +soon, I need to finish test.jsp first to see what param I'll use :-)
  +
  +
  +Autmated ( script based ) run
  +
  +There are 2 ways to run the sanity checks in a nightly or automated way.
  +
  +
  +The easiest is to use a bit of "sed" magic to make /admin "trusted", then
  +start the server and use "wget" or "htget" or any equivalent program 
  +( I'll include a java one soon ) to get the /admin/test/test.jsp page.
  +
  +
  +The alternate solution is to run the scripts provided in 
  +TOMCAT_HOME/webapps/test/WEB-INF/scripts ( instructions will be added soon
  +if anyone asks )
  +
  +
  +
  +
  
  
  
  1.3   +2 -1  jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- test-tomcat.xml   2001/01/07 00:24:00 1.2
  +++ test-tomcat.xml   2001/01/20 20:11:04 1.3
  @@ -1,5 +1,6 @@
   
  -   

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[costin]

costin  01/01/06 16:24:00

  Modified:src/tests/webpages/WEB-INF test-tomcat.xml
  Log:
  Removed few bad tests (IMHO) that tested for tomcat-specific behavior ( that was
  wrong ).
  
  The problem is that in previous versions of tomcat, errors RequestDispatcher.include
  were not propagated. Thanks to Larry and other's work on error handling we do now the
   right thing.
  
  One of the tests was also assuming the buffer is not reset before the error message 
is
  shown - I think it's very important to do reset the buffer.
  
  Also, in IncludeMismatch1 the test assumed the error handler will be called - but the
  spec requires to forward the exception, and it is dealt with in the calling servlet,
  so no error page will be displayed.
  
  Another bad test was Set-Cookie2 - which belongs to the wrong Cookie spec.
  
  Revision  ChangesPath
  1.2   +28 -3 jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml
  
  Index: test-tomcat.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/test-tomcat.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- test-tomcat.xml   2000/12/29 00:33:15 1.1
  +++ test-tomcat.xml   2001/01/07 00:24:00 1.2
  @@ -18,7 +18,7 @@



  - 
  + 



  @@ -83,6 +83,14 @@
returnCode="${http.protocol} 200"
goldenFile="${gdir}/SimpleForward.txt" 
  />
  +
  +  
  + 
  +  
  + 
  +
 
   
  +  
   
 
   
 
   
 
  -  
  +  
  +   
 
 

cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF test-tomcat.xml

[costin]

costin  00/12/28 16:33:15

  Modified:src/etc  server.xml
   src/share/org/apache/tomcat/request SimpleRealm.java
  Added:   src/etc/users admin-users.xml example-users.xml
global-users.xml tomcat-users.xml
   src/tests/webpages/WEB-INF test-tomcat.xml
  Removed: src/etc  admin-users.xml example-users.xml global-users.xml
tomcat-users.xml
   src/etc/ant test-tomcat.xml
  Log:
  More cleanup.
  
  The sanity-test application is now separated ( no more polution on the
  tomcat distribution ). I'll update the ant file to run it in the new
  structure.
  
  Simple-user realms are grouped under conf/users ( they are not intended for
  production mode anyway - use JdbcRealm or JAAS ).
  
  Revision  ChangesPath
  1.57  +3 -3  jakarta-tomcat/src/etc/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat/src/etc/server.xml,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- server.xml2000/12/27 19:52:50 1.56
  +++ server.xml2000/12/29 00:33:13 1.57
  @@ -199,7 +199,7 @@
 -->
   
   
  

   
   
   
   
   
   
   
  


  
  
  
  

  

  
  
  
  
  
 
  

  
  
  
  
   
  

  

  






  

  

  

  

  

  
  
  
  
  
  
http://${host}:${port}/index.html" 
   returnCode="${http.protocol} 302" 
 />
http://${host}:${port}/test/servlet/index.html" 
   returnCode="${http.protocol} 302" 
 />