You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by rw...@apache.org on 2001/12/04 22:08:52 UTC
cvs commit: jakarta-commons/httpclient/src/test/org/apache/commons/httpclient TestHttpClientNoHost.java TestNoHost.java
rwaldhoff 01/12/04 13:08:52
Modified: httpclient/src/java/org/apache/commons/httpclient
HttpClient.java
httpclient/src/test/org/apache/commons/httpclient
TestNoHost.java
Added: httpclient/src/test/org/apache/commons/httpclient
TestHttpClientNoHost.java
Log:
ensure state attribute isn't null by using "getState()." instead of "state.", and test of same.
(bug pointed out by Nathan Coast on commons-dev)
Revision Changes Path
1.41 +6 -6 jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpClient.java
Index: HttpClient.java
===================================================================
RCS file: /home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpClient.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- HttpClient.java 2001/10/06 00:46:42 1.40
+++ HttpClient.java 2001/12/04 21:08:51 1.41
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpClient.java,v 1.40 2001/10/06 00:46:42 rwaldhoff Exp $
- * $Revision: 1.40 $
- * $Date: 2001/10/06 00:46:42 $
+ * $Header: /home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpClient.java,v 1.41 2001/12/04 21:08:51 rwaldhoff Exp $
+ * $Revision: 1.41 $
+ * $Date: 2001/12/04 21:08:51 $
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -78,7 +78,7 @@
* </p>
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
* @author Rodney Waldhoff
- * @version $Revision: 1.40 $ $Date: 2001/10/06 00:46:42 $
+ * @version $Revision: 1.41 $ $Date: 2001/12/04 21:08:51 $
*/
public class HttpClient {
@@ -180,7 +180,7 @@
log.debug("HttpClient.startSession(String,int,Credentials,boolean): Host:" +
host + " Port:" + port + " Credentials:" + creds +
" HTTPS:" + https);
- state.setCredentials(null,creds);
+ getState().setCredentials(null,creds);
connection = new HttpConnection(host,port,https);
}
@@ -221,7 +221,7 @@
* and port of the session are determined
*/
public void startSession(URL url, Credentials creds) {
- state.setCredentials(null,creds);
+ getState().setCredentials(null,creds);
startSession(url);
}
1.3 +5 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestNoHost.java 2001/10/04 17:49:13 1.2
+++ TestNoHost.java 2001/12/04 21:08:52 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestNoHost.java,v 1.2 2001/10/04 17:49:13 rwaldhoff Exp $
- * $Revision: 1.2 $
- * $Date: 2001/10/04 17:49:13 $
+ * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestNoHost.java,v 1.3 2001/12/04 21:08:52 rwaldhoff Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/12/04 21:08:52 $
* ====================================================================
*
* 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.2 2001/10/04 17:49:13 rwaldhoff Exp $
+ * @version $Id: TestNoHost.java,v 1.3 2001/12/04 21:08:52 rwaldhoff Exp $
*/
public class TestNoHost extends TestCase {
@@ -89,6 +89,7 @@
// MD5Encoder removed
// suite.addTest(TestMD5Encoder.suite());
suite.addTest(TestAuthenticator.suite());
+ suite.addTest(TestHttpClientNoHost.suite());
return suite;
}
1.1 jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHttpClientNoHost.java
Index: TestHttpClientNoHost.java
===================================================================
/*
* $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHttpClientNoHost.java,v 1.1 2001/12/04 21:08:52 rwaldhoff Exp $
* $Revision: 1.1 $
* $Date: 2001/12/04 21:08:52 $
* ====================================================================
*
* 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 java.io.IOException;
import java.util.Enumeration;
import junit.framework.*;
import org.apache.commons.httpclient.methods.*;
/**
* @author Rodney Waldhoff
* @version $Id: TestHttpClientNoHost.java,v 1.1 2001/12/04 21:08:52 rwaldhoff Exp $
*/
public class TestHttpClientNoHost extends TestCase {
// ------------------------------------------------------------ Constructor
public TestHttpClientNoHost(String testName) {
super(testName);
}
// ------------------------------------------------------- TestCase Methods
public static Test suite() {
return new TestSuite(TestHttpClientNoHost.class);
}
// ------------------------------------------------------------------ Tests
// This tests for bug pointed out by
// Nathan Coast on the commons-dev list,
// namely that startSession(String,int,Credentials,boolean)
// throws a NullPointerException when setState hasn't
// been called.
public void testStartSessionBug() throws Exception {
HttpClient client = new HttpClient();
client.startSession("jakarta.apache.org",80,new UsernamePasswordCredentials("ignored","ignored"),false);
client.endSession();
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>