commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marcs...@apache.org
Subject cvs commit: jakarta-commons/httpclient/src/test/org/apache/commons/httpclient TestHttpConnectionManager.java TestURIUtil.java TestNoHost.java
Date Fri, 12 Apr 2002 21:17:06 GMT
marcsaeg    02/04/12 14:17:06

  Modified:    httpclient/src/test/org/apache/commons/httpclient
                        TestNoHost.java
  Added:       httpclient/src/test/org/apache/commons/httpclient
                        TestHttpConnectionManager.java TestURIUtil.java
  Log:
  Added new test suites for HttpConnectionManager and URIUtil.
  
  Revision  Changes    Path
  1.6       +6 -4      jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestNoHost.java
  
  Index: TestNoHost.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestNoHost.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TestNoHost.java	28 Mar 2002 03:59:06 -0000	1.5
  +++ TestNoHost.java	12 Apr 2002 21:17:06 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestNoHost.java,v
1.5 2002/03/28 03:59:06 marcsaeg Exp $
  - * $Revision: 1.5 $
  - * $Date: 2002/03/28 03:59:06 $
  + * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestNoHost.java,v
1.6 2002/04/12 21:17:06 marcsaeg Exp $
  + * $Revision: 1.6 $
  + * $Date: 2002/04/12 21:17:06 $
    * ====================================================================
    *
    * The Apache Software License, Version 1.1
  @@ -71,7 +71,7 @@
    * (True unit tests, by some definitions.)
    *
    * @author Rodney Waldhoff
  - * @version $Id: TestNoHost.java,v 1.5 2002/03/28 03:59:06 marcsaeg Exp $
  + * @version $Id: TestNoHost.java,v 1.6 2002/04/12 21:17:06 marcsaeg Exp $
    */
   public class TestNoHost extends TestCase {
   
  @@ -92,6 +92,8 @@
           suite.addTest(TestAuthenticator.suite());
           suite.addTest(TestHttpClientNoHost.suite());
           suite.addTest(TestHttpUrlMethod.suite());
  +        suite.addTest(TestHttpConnectionManager.suite());
  +        suite.addTest(TestURIUtil.suite());
           return suite;
       }
   
  
  
  
  1.1                  jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHttpConnectionManager.java
  
  Index: TestHttpConnectionManager.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHttpConnectionManager.java,v
1.1 2002/04/12 21:17:06 marcsaeg Exp $
   * $Revision: 1.1 $
   * $Date: 2002/04/12 21:17:06 $
   * ====================================================================
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999 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", "Tomcat", 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 apache@apache.org.
   *
   * 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/>.
   *
   * [Additional notices, if required by prior licensing conditions]
   *
   */
  
  package org.apache.commons.httpclient;
  
  import junit.framework.*;
  import java.net.MalformedURLException;
  import java.lang.reflect.*;
  
  import org.apache.commons.httpclient.methods.*;
  
  /**
   *
   * Unit tests for {@link HttpConnectionManager}.  These tests
   * do not require any network connection or web app.
   *
   * @author Marc A. Saegesser
   * @version $Id: TestHttpConnectionManager.java,v 1.1 2002/04/12 21:17:06 marcsaeg Exp $
   */
  public class TestHttpConnectionManager extends TestCase {
      // ----------------------------------------------------- Instance Variables
  
      // ------------------------------------------------------------ Constructor
      public TestHttpConnectionManager(String testName) {
          super(testName);
      }
  
      // ------------------------------------------------------------------- Main
      public static void main(String args[]) {
          String[] testCaseName = { TestHttpConnectionManager.class.getName() };
          junit.textui.TestRunner.main(testCaseName);
      }
  
      // ------------------------------------------------------- TestCase Methods
  
      public static Test suite() {
          return new TestSuite(TestHttpConnectionManager.class);
      }
  
  
      // ----------------------------------------------------------- Test Methods
  
      // Test the accessor methods
      public void testProxyHostAccessors() {
          HttpConnectionManager mgr = new HttpConnectionManager();
  
          mgr.setProxyHost("proxyhost");
          assertEquals("Proxy Host", "proxyhost", mgr.getProxyHost());
      }
  
      public void testProxyPortAccessors() {
          HttpConnectionManager mgr = new HttpConnectionManager();
  
          mgr.setProxyPort(8888);
          assertEquals("Proxy Port", 8888, mgr.getProxyPort());
      }
  
      public void testMaxConnectionsAccessors() {
          HttpConnectionManager mgr = new HttpConnectionManager();
  
          // First test the default value
          assertEquals("Default MaxConnections", 2, mgr.getMaxConnectionsPerHost());
  
          mgr.setMaxConnectionsPerHost(10);
          assertEquals("MaxConnections", 10, mgr.getMaxConnectionsPerHost());
      }
  
      public void testGetConnection() {
          HttpConnectionManager mgr = new HttpConnectionManager();
  
          try{
              // Create a new connection
              HttpConnection conn = mgr.getConnection("http://www.nosuchserver.com/path/path?query=string");
              // Validate the connection properties
              assertEquals("Host", "www.nosuchserver.com", conn.getHost());
              assertEquals("Port", 80, conn.getPort());
              // Release the connection
              mgr.releaseConnection(conn);
  
              // Create a new connection
              conn = mgr.getConnection("https://www.nosuchserver.com/path/path?query=string");
              // Validate the connection properties
              assertEquals("Host", "www.nosuchserver.com", conn.getHost());
              assertEquals("Port", 443, conn.getPort());
              // Release the connection
              mgr.releaseConnection(conn);
  
              // Create a new connection
              conn = mgr.getConnection("http://www.nowhere.org:8080/path/path?query=string");
              // Validate the connection properties
              assertEquals("Host", "www.nowhere.org", conn.getHost());
              assertEquals("Port", 8080, conn.getPort());
              // Release the connection
              mgr.releaseConnection(conn);
  
          }catch(MalformedURLException e){
              fail("Caught unexpected MalformedURLException (" + e.toString() + ")");
          }catch(HttpException e){
              fail("Caught unexpected HttpException (" + e.toString() + ")");
          }
  
  
      }
  
      public void testGetMultipleConnections() {
          HttpConnectionManager mgr = new HttpConnectionManager();
  
          try{
              // Create a new connection
              HttpConnection conn1 = mgr.getConnection("http://www.nosuchserver.com/path/path?query=string");
              // Release the connection
              mgr.releaseConnection(conn1);
  
              // Get the same connection again
              HttpConnection conn2 = mgr.getConnection("http://www.nosuchserver.com/");
              assertEquals("Same connection", conn1, conn2);
              // don't release yet
  
              // Get another new connection
              HttpConnection conn3 = mgr.getConnection("http://www.nosuchserver.com/");
              assertTrue(conn2 != conn3);
  
          }catch(MalformedURLException e){
              fail("Caught unexpected MalformedURLException (" + e.toString() + ")");
          }catch(HttpException e){
              fail("Caught unexpected HttpException (" + e.toString() + ")");
          }
      }
  
      public void testTimeout()
      {
          HttpConnectionManager mgr = new HttpConnectionManager();
          
          try{
              HttpConnection conn1 = mgr.getConnection("http://www.nosuchserver.com/path/path?query=string");
              HttpConnection conn2 = mgr.getConnection("http://www.nosuchserver.com/path/path?query=string");
              HttpConnection conn3 = mgr.getConnection("http://www.nosuchserver.com/path/path?query=string",
5000);
              fail("Expected an HttpException.");
          }catch(MalformedURLException e){
              fail("Caught unexpected MalformedURLException (" + e.toString() + ")");
          }catch(HttpException e){
              //Expected result
          }
      }
  }
  
  
  
  
  1.1                  jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestURIUtil.java
  
  Index: TestURIUtil.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestURIUtil.java,v
1.1 2002/04/12 21:17:06 marcsaeg Exp $
   * $Revision: 1.1 $
   * $Date: 2002/04/12 21:17:06 $
   * ====================================================================
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999 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", "Tomcat", 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 apache@apache.org.
   *
   * 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/>.
   *
   * [Additional notices, if required by prior licensing conditions]
   *
   */
  
  package org.apache.commons.httpclient;
  
  import junit.framework.*;
  import java.net.MalformedURLException;
  import java.lang.reflect.*;
  
  /**
   *
   * Unit tests for {@link URIUtil}.  These tests care currently quite limited
   * and should be expanded to test more functionality.
   *
   * @author Marc A. Saegesser
   * @version $Id: TestURIUtil.java,v 1.1 2002/04/12 21:17:06 marcsaeg Exp $
   */
  public class TestURIUtil extends TestCase {
      // ----------------------------------------------------- Instance Variables
      URITestCase pathTests[] = {new URITestCase("http://www.server.com/path1/path2", "/path1/path2"),
                                 new URITestCase("http://www.server.com/path1/path2/", "/path1/path2/"),
                                 new URITestCase("http://www.server.com/path1/path2?query=string",
"/path1/path2"),
                                 new URITestCase("http://www.server.com/path1/path2/?query=string",
"/path1/path2/"),
                                 new URITestCase("www.noscheme.com/path1/path2", "/path1/path2"),
                                 new URITestCase("www.noscheme.com/path1/path2#anchor?query=string",
"/path1/path2"),
                                 new URITestCase("/noscheme/nohost/path", "/noscheme/nohost/path"),
                                 new URITestCase("http://www.server.com", "/"),
                                 new URITestCase("https://www.server.com:443/ssl/path", "/ssl/path"),
                                 new URITestCase("http://www.server.com:8080/path/with/port",
"/path/with/port")};
  
      URITestCase queryTests[] = {new URITestCase("http://www.server.com/path1/path2", null),
                                  new URITestCase("http://www.server.com/path1/path2?query=string",
"query=string"),
                                  new URITestCase("http://www.server.com/path1/path2/?query=string",
"query=string"),
                                  new URITestCase("www.noscheme.com/path1/path2#anchor?query=string",
"query=string"),
                                  new URITestCase("/noscheme/nohost/path?query1=string1&query2=string2",
"query1=string1&query2=string2"),
                                  new URITestCase("https://www.server.com:443/ssl/path?query1=string1&query2=string2",
"query1=string1&query2=string2"),
                                  new URITestCase("http://www.server.com:8080/path/with/port?query1=string1&query2=string2",
"query1=string1&query2=string2")};
  
  
  
      // ------------------------------------------------------------ Constructor
      public TestURIUtil(String testName) {
          super(testName);
      }
  
      // ------------------------------------------------------------------- Main
      public static void main(String args[]) {
          String[] testCaseName = { TestURIUtil.class.getName() };
          junit.textui.TestRunner.main(testCaseName);
      }
  
      // ------------------------------------------------------- TestCase Methods
  
      public static Test suite() {
          return new TestSuite(TestURIUtil.class);
      }
  
  
      // ----------------------------------------------------------- Test Methods
      public void testGetPath()
      {
          String testValue = "";
          String expectedResult = "";
  
          for(int i=0;i<pathTests.length;i++){
              testValue = pathTests[i].getTestValue();
              expectedResult = pathTests[i].getExpectedResult();
              assertEquals("Path test", expectedResult, URIUtil.getPath(testValue));
          }
      }
  
      public void testGetQueryString()
      {
          String testValue = "";
          String expectedResult = "";
  
          for(int i=0;i<queryTests.length;i++){
              testValue = queryTests[i].getTestValue();
              expectedResult = queryTests[i].getExpectedResult();
              assertEquals("Path test", expectedResult, URIUtil.getQueryString(testValue));
          }
      }
  
      private class URITestCase{
          private String testValue;
          private String expectedResult;
  
          public URITestCase(String testValue, String expectedResult){
              this.testValue = testValue;
              this.expectedResult = expectedResult;
          }
  
          public String getTestValue(){
              return testValue;
          }
  
          public String getExpectedResult(){
              return expectedResult;
          }
      }
  }
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


Mime
View raw message