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 rl...@apache.org on 2002/01/29 00:56:43 UTC

cvs commit: jakarta-watchdog-4.0/src/server/jsp-tests/jsp/core_syntax/implicitobjects Errorpage.jsp checkApplication.jsp checkConfig.jsp checkException.jsp checkOut.jsp checkPage.jsp checkPageContext.jsp checkRequest.jsp checkResponse.jsp checkSession.jsp

rlubke      02/01/28 15:56:43

  Modified:    src/server/jsp-tests/jsp/core_syntax/implicitobjects
                        Errorpage.jsp checkApplication.jsp checkConfig.jsp
                        checkException.jsp checkOut.jsp checkPage.jsp
                        checkPageContext.jsp checkRequest.jsp
                        checkResponse.jsp checkSession.jsp
  Log:
   - content push from CTS
  
  Revision  Changes    Path
  1.2       +2 -4      jakarta-watchdog-4.0/src/server/jsp-tests/jsp/core_syntax/implicitobjects/Errorpage.jsp
  
  Index: Errorpage.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/core_syntax/implicitobjects/Errorpage.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Errorpage.jsp	4 Oct 2000 00:10:04 -0000	1.1
  +++ Errorpage.jsp	28 Jan 2002 23:56:42 -0000	1.2
  @@ -1,11 +1,9 @@
   <html>
  -<title>checkException Test </title>
  +<title>checkException</title>
   <body>
   <%@ page isErrorPage="true" %>
   <!-- checking for exception object state -->
   
  -<%= exception instanceof java.lang.Throwable %>
  +<%= exception instanceof java.lang.ArithmeticException %>
   </body>
   </html>
  -
  -
  
  
  
  1.2       +10 -16    jakarta-watchdog-4.0/src/server/jsp-tests/jsp/core_syntax/implicitobjects/checkApplication.jsp
  
  Index: checkApplication.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/core_syntax/implicitobjects/checkApplication.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- checkApplication.jsp	4 Oct 2000 00:10:04 -0000	1.1
  +++ checkApplication.jsp	28 Jan 2002 23:56:42 -0000	1.2
  @@ -4,23 +4,17 @@
   <% /**	Name:checkApplicationTest
   		Description: Returns true if application
   		 	is of type javax.servlet.ServletContext
  -		 	else returns false. Then checks for the
  -		 	a short description about the server-side 
  -		 	information of the application.
  -		Result: Returns true twice
  -**/ %>		 		 	
  +		 	else returns false. Then verify that the
  +            Context init parameter, contextParam1, is
  +            available using the application object.
  +		Result: Returns true if the application object
  +                is the correct object type and print 
  +                a non-null value for the context init 
  +                parameter.
  +**/ %>
   <!-- checking for application object state -->
   
  -<%= (application instanceof javax.servlet.ServletContext) %>
  -
  -<br>
  -<% 
  -   if(application.getServerInfo()!=null) {
  -%> true <% }
  -   else {
  -%> false <% } %>
  -
  +<%= (application instanceof javax.servlet.ServletContext) %><br>
  +<%= application.getInitParameter( "contextParam1" ) %><br>
   </body>
   </html>
  -
  -
  
  
  
  1.2       +8 -12     jakarta-watchdog-4.0/src/server/jsp-tests/jsp/core_syntax/implicitobjects/checkConfig.jsp
  
  Index: checkConfig.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/core_syntax/implicitobjects/checkConfig.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- checkConfig.jsp	4 Oct 2000 00:10:04 -0000	1.1
  +++ checkConfig.jsp	28 Jan 2002 23:56:42 -0000	1.2
  @@ -3,20 +3,16 @@
   <body>
   <% /**	Name:checkConfig
   		Description: Checks whether configuration information
  -			 is being passed to the server page. Also checks whether
  -			 it returns the initialization parameters as an Enumeration
  -			 of Strings or as an empty enumeration.
  -		Result: Returns true twice	
  -**/ %>				 
  +			 is being passed to the server page. Verify that the
  +             implicit config object is an instance of
  +             javax.servlet.ServletConfig and then print out the 
  +             values of two servlet initialization parameters.
  +		Result: Display true and the values of configParam1 and configParam2 
  +**/ %>
   <!-- checking for config object state -->
   <%= (config instanceof javax.servlet.ServletConfig) %>
   <br>
  -<% 
  -   if(config.getInitParameterNames()!=null) {
  -%> true <% }
  -   else {
  -%> false <% } %>
  +<%= config.getInitParameter( "configParam1" ) %><br>
  +<%= config.getInitParameter( "configParam2" ) %><br>
   </body>
   </html>
  -
  -
  
  
  
  1.2       +9 -5      jakarta-watchdog-4.0/src/server/jsp-tests/jsp/core_syntax/implicitobjects/checkException.jsp
  
  Index: checkException.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/core_syntax/implicitobjects/checkException.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- checkException.jsp	4 Oct 2000 00:10:04 -0000	1.1
  +++ checkException.jsp	28 Jan 2002 23:56:42 -0000	1.2
  @@ -2,10 +2,16 @@
   <title>checkException Test </title>
   <body>
   <% /**	Name:checkExceptionTest
  -		Description: checks whether 'exception' is of 
  +		Description: Cause a java.lang.ArithmeticException by 
  +                     dividing by zero.  The Exception should
  +                     be passed to the error page as specified
  +                     by the errorPage attribute of the page
  +                     directive.  The errorpage will verify the
  +                     type of exception.
   			 type java.lang.Throwable
  -        Result: Errorpage is calledup, where this check is done.Should return true.					 
  -**/ %>		
  +        Result: Errorpage is called up, where this check is done.
  +                Should return true.					 
  +**/ %>
   <!-- errorpage -->
   <%@ page errorPage="Errorpage.jsp" %>
   
  @@ -16,5 +22,3 @@
   %>
   </body>
   </html>
  -
  -
  
  
  
  1.2       +2 -2      jakarta-watchdog-4.0/src/server/jsp-tests/jsp/core_syntax/implicitobjects/checkOut.jsp
  
  Index: checkOut.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/core_syntax/implicitobjects/checkOut.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- checkOut.jsp	4 Oct 2000 00:10:04 -0000	1.1
  +++ checkOut.jsp	28 Jan 2002 23:56:42 -0000	1.2
  @@ -2,10 +2,10 @@
   <title>checkOut</title>
   <body>
   <% /** Name: checkOut
  -	   Description	:checking 'out' is of the type
  +	   Description: Checking 'out' is of the type
   	   		 javax.servlet.jsp.JspWriter
   	   Result: true	   	
  -**/ %>	   
  +**/ %>
   <!-- checking for out object type -->
   <%= (out instanceof javax.servlet.jsp.JspWriter ) %>
   </body>
  
  
  
  1.2       +8 -5      jakarta-watchdog-4.0/src/server/jsp-tests/jsp/core_syntax/implicitobjects/checkPage.jsp
  
  Index: checkPage.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/core_syntax/implicitobjects/checkPage.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- checkPage.jsp	4 Oct 2000 00:10:04 -0000	1.1
  +++ checkPage.jsp	28 Jan 2002 23:56:42 -0000	1.2
  @@ -2,11 +2,14 @@
   <title>checkPage</title>
   <body>
   <% /**	Name: checkPage
  -	    Description: checking if this page is of the
  -	    	  type java.lang.Object
  -		Result: writes true to browser
  -**/ %>			    	   
  +	    Description: Validate that the implicit page
  +                     object is of type java.lang.Object.
  +                     Also verify that this is the same
  +                     reference as page.
  +		Result: writes true twice.
  +**/ %>
   <!-- checking for page object type -->
  -<%= (this instanceof java.lang.Object ) %>
  +<%= (page instanceof java.lang.Object ) %><br>
  +<%= ( page == this ) %><br>
   </body>
   </html>
  
  
  
  1.2       +14 -5     jakarta-watchdog-4.0/src/server/jsp-tests/jsp/core_syntax/implicitobjects/checkPageContext.jsp
  
  Index: checkPageContext.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/core_syntax/implicitobjects/checkPageContext.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- checkPageContext.jsp	4 Oct 2000 00:10:04 -0000	1.1
  +++ checkPageContext.jsp	28 Jan 2002 23:56:42 -0000	1.2
  @@ -2,11 +2,20 @@
   <title>checkPageContext</title>
   <body>
   <% /**	Name:checkPageContext 
  -		Description: checking 'page' is of type 
  -			javax.servlet.jsp.PageContext
  -		Result: True
  -**/ %>		
  +        Description: Verify that implicit object pageContext
  +                     is an instance of javax.servlet.jsp.PageContext.
  +                     Then use PageContext.setAttribute() and 
  +                     PageContext.getAttribute() to set and retrieve
  +                     an attribute from the page.
  +		Result: true should be returned twice. 
  +**/ %>
   <!-- checking for pageContext object type -->
  -<%= (pageContext instanceof javax.servlet.jsp.PageContext) %>
  +<%= (pageContext instanceof javax.servlet.jsp.PageContext) %><br>
  +<%
  +    pageContext.setAttribute( "available", new String( "true" ), PageContext.PAGE_SCOPE );
  +    String temp = (String) pageContext.findAttribute( "available" );
  +    out.print( temp );
  +%><br>
  +
   </body>
   </html>
  
  
  
  1.2       +4 -4      jakarta-watchdog-4.0/src/server/jsp-tests/jsp/core_syntax/implicitobjects/checkRequest.jsp
  
  Index: checkRequest.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/core_syntax/implicitobjects/checkRequest.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- checkRequest.jsp	4 Oct 2000 00:10:04 -0000	1.1
  +++ checkRequest.jsp	28 Jan 2002 23:56:42 -0000	1.2
  @@ -2,17 +2,17 @@
   <title>checkRequest</title>
   <body>
   <% /** Name:checkRequest
  -	   Description: checks whether 'request' is an instance 
  +	   Description: Checks whether 'request' is an instance 
   	   		of javax.servlet.ServletRequest and uses the request
   	   		object for getting the protocol and getting parameter 
  -	   		value passing Years with a parameter value of 2.
  +	   		value passing Years.
   		Result:returns true,HTTP/1.0,2 	
  -**/ %>		   		
  +**/ %>
   <!-- checking for request object type -->
   <%= (request instanceof javax.servlet.ServletRequest) %>
   
   <br>
  - <!-- request object used to access getProtocol -->
  +<!-- request object used to access getProtocol -->
   <% out.println(request.getProtocol()); %>
   <br>
   
  
  
  
  1.2       +7 -8      jakarta-watchdog-4.0/src/server/jsp-tests/jsp/core_syntax/implicitobjects/checkResponse.jsp
  
  Index: checkResponse.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/core_syntax/implicitobjects/checkResponse.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- checkResponse.jsp	4 Oct 2000 00:10:04 -0000	1.1
  +++ checkResponse.jsp	28 Jan 2002 23:56:42 -0000	1.2
  @@ -4,18 +4,17 @@
   <% /**	Name:checkResponse
   		Description: Checks whether response is an object
   			 of type javax.servlet.ServletResponse.The other part 
  -			 checks whether a character encoding is used by the
  -			 response object or not
  +			 verifes that the expected value is returned from
  +			 response.getCharacterEncoding().
   		Result: returns true
  -**/ %>					 
  +**/ %>
   <!-- checking for response object type -->
  -<%= (response instanceof javax.servlet.ServletResponse) %>
  -<br>
  +<%= (response instanceof javax.servlet.ServletResponse) %><br>
   <% 
  -   if(response.getCharacterEncoding()!=null) {
  -%> true <% }
  +   if(response.getCharacterEncoding().equals( "ISO-8859-1" ) ) {
  +%>true<br><% }
      else {
  -%> false <% } %>
  +%>false<br><% } %>
   
   </body>
   </html>
  
  
  
  1.2       +3 -5      jakarta-watchdog-4.0/src/server/jsp-tests/jsp/core_syntax/implicitobjects/checkSession.jsp
  
  Index: checkSession.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/server/jsp-tests/jsp/core_syntax/implicitobjects/checkSession.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- checkSession.jsp	4 Oct 2000 00:10:04 -0000	1.1
  +++ checkSession.jsp	28 Jan 2002 23:56:42 -0000	1.2
  @@ -2,11 +2,11 @@
   <title>checkSession Test </title>
   <body>
   <% /**	Name:checkSession
  -		Description: checking 'session' is of type javax.servlet.HttpSession
  +		Description: Checking 'session' is of type javax.servlet.HttpSession
   			  and also whether an identifier is assigned to this session
  -			  or not
  +			  or not.
   		Result: returns true		
  -**/ %>			  
  +**/ %>
   <!-- checking for Session object state -->
   <%= (session instanceof javax.servlet.http.HttpSession) %>
   <br>
  @@ -19,5 +19,3 @@
   <br>
   </body>
   </html>
  -
  -
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>