vmassol     2004/01/25 04:33:30

  Modified:    
samples/servlet/src/test-cactus/j2ee13/org/apache/cactus/sample/servlet/unit
                        TestAll.java
  Added:       
samples/servlet/src/test-cactus/j2ee13/org/apache/cactus/sample/servlet/unit
                        TestSetURLSpecific.java
  Log:
  Added J2EE 1.3 specific test to verify that request.getRequestURL() works fine with 
setURL()
  
  Revision  Changes    Path
  1.2       +3 -2      
jakarta-cactus/samples/servlet/src/test-cactus/j2ee13/org/apache/cactus/sample/servlet/unit/TestAll.java
  
  Index: TestAll.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/samples/servlet/src/test-cactus/j2ee13/org/apache/cactus/sample/servlet/unit/TestAll.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestAll.java      30 Nov 2003 12:19:43 -0000      1.1
  +++ TestAll.java      25 Jan 2004 12:33:30 -0000      1.2
  @@ -3,7 +3,7 @@
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2004 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -84,6 +84,7 @@
           suite.addTestSuite(TestHttpRequestSpecific.class);
           suite.addTestSuite(TestJspTagLifecycle.class);
           suite.addTestSuite(TestFilterHttpHeaders.class);
  +        suite.addTestSuite(TestSetURLSpecific.class);
   
           return suite;
       }
  
  
  
  1.1                  
jakarta-cactus/samples/servlet/src/test-cactus/j2ee13/org/apache/cactus/sample/servlet/unit/TestSetURLSpecific.java
  
  Index: TestSetURLSpecific.java
  ===================================================================
  /*
   * ====================================================================
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2004 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Cactus" and "Apache Software
   *    Foundation" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact [EMAIL PROTECTED]
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   */
  package org.apache.cactus.sample.servlet.unit;
  
  import org.apache.cactus.ServletTestCase;
  import org.apache.cactus.WebRequest;
  
  /**
   * Test the J2EE 1.3 specifics of the [EMAIL PROTECTED] WebRequest#setURL} method
   * (specifically verify calls to <code>getRequestURL</code>).
   *
   * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Massol</a>
   *
   * @version $Id: TestSetURLSpecific.java,v 1.1 2004/01/25 12:33:30 vmassol Exp $
   */
  public class TestSetURLSpecific extends ServletTestCase
  {
      /**
       * Verify that when <code>setURL()</code> is called with a null
       * pathinfo parameter, the call to <code>getRequestURL</code> works
       * properly.
       *
       * @param theRequest the request object that serves to initialize the
       *                   HTTP connection to the server redirector.
       */
      public void beginSimulatedURLGetRequestURLWhenNull(WebRequest theRequest)
      {
          theRequest.setURL("jakarta.apache.org", "", "/test/test.jsp", null, 
              null);
      }
  
      /**
       * Verify that when <code>setURL()</code> is called with a null
       * pathinfo parameter, the call to <code>getRequestURL</code> works
       * properly.
       */
      public void testSimulatedURLGetRequestURLWhenNull()
      {
          assertEquals("http://jakarta.apache.org:80/test/test.jsp";, 
              request.getRequestURL().toString());
      }
  
      //-------------------------------------------------------------------------
  
      /**
       * Verify that when <code>setURL()</code> is called with a not null
       * pathinfo parameter, the call to <code>getRequestURL</code> works
       * properly.
       *
       * @param theRequest the request object that serves to initialize the
       *                   HTTP connection to the server redirector.
       */
      public void beginSimulatedURLGetRequestURLWhenNotNull(
          WebRequest theRequest)
      {
          theRequest.setURL("jakarta.apache.org", "/catalog", "/lawn", 
                  "/index.html", null);
      }
  
      /**
       * Verify that when <code>setURL()</code> is called with a not null
       * pathinfo parameter, the call to <code>getRequestURL</code> works
       * properly.
       */
      public void testSimulatedURLGetRequestURLWhenNotNull()
      {
          assertEquals("http://jakarta.apache.org:80/catalog/lawn/index.html";, 
              request.getRequestURL().toString());
      }
  }
  
  
  

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

Reply via email to