You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by di...@apache.org on 2002/02/04 16:26:44 UTC
cvs commit: jakarta-commons/httpclient/src/test/org/apache/commons/httpclient TestWebappCookie.java TestWebappParameters.java TestMethodsLocalHost.java TestWebappHeaders.java TestHttps.java TestMethodsExternalHost.java TestHttpClientLocalHost.java TestNVP.java TestWebappMethods.java TestWebappRedirect.java TestHeader.java TestAuthenticator.java TestBase64.java TestWebappBasicAuth.java TestGetMethodLocal.java TestCookie.java TestHeaderElement.java
dion 02/02/04 07:26:44
Modified: httpclient/src/test/org/apache/commons/httpclient
TestWebappCookie.java TestWebappParameters.java
TestMethodsLocalHost.java TestWebappHeaders.java
TestHttps.java TestMethodsExternalHost.java
TestHttpClientLocalHost.java TestNVP.java
TestWebappMethods.java TestWebappRedirect.java
TestHeader.java TestAuthenticator.java
TestBase64.java TestWebappBasicAuth.java
TestGetMethodLocal.java TestCookie.java
TestHeaderElement.java
Log:
JUnit 3.7 upgrade - provided by Sean C. Sullivan
Revision Changes Path
1.3 +80 -80 jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestWebappCookie.java
Index: TestWebappCookie.java
===================================================================
RCS file: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestWebappCookie.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestWebappCookie.java 4 Oct 2001 17:49:13 -0000 1.2
+++ TestWebappCookie.java 4 Feb 2002 15:26:43 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestWebappCookie.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/TestWebappCookie.java,v 1.3 2002/02/04 15:26:43 dion Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/04 15:26:43 $
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -82,7 +82,7 @@
* "httpclient.test.webappContext" property.
*
* @author Rodney Waldhoff
- * @version $Id: TestWebappCookie.java,v 1.2 2001/10/04 17:49:13 rwaldhoff Exp $
+ * @version $Id: TestWebappCookie.java,v 1.3 2002/02/04 15:26:43 dion Exp $
*/
public class TestWebappCookie extends TestWebappBase {
@@ -116,8 +116,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("Wrote simplecookie.<br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("Wrote simplecookie.<br>") >= 0);
assertEquals(1,client.getState().getCookies().length);
assertEquals("simplecookie", ((Cookie)(client.getState().getCookies()[0])).getName());
assertEquals("value",((Cookie)(client.getState().getCookies()[0])).getValue());
@@ -136,8 +136,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: POST</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("Wrote simplecookie.<br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: POST</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("Wrote simplecookie.<br>") >= 0);
assertEquals(1,client.getState().getCookies().length);
assertEquals("simplecookie", ((Cookie)(client.getState().getCookies()[0])).getName());
assertEquals("value",((Cookie)(client.getState().getCookies()[0])).getValue());
@@ -156,8 +156,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: PUT</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("Wrote simplecookie.<br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: PUT</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("Wrote simplecookie.<br>") >= 0);
assertEquals(1,client.getState().getCookies().length);
assertEquals("simplecookie", ((Cookie)(client.getState().getCookies()[0])).getName());
assertEquals("value",((Cookie)(client.getState().getCookies()[0])).getValue());
@@ -176,8 +176,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("Deleted simplecookie.<br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("Deleted simplecookie.<br>") >= 0);
assertEquals(0,client.getState().getCookies().length);
}
@@ -194,8 +194,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: PUT</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("Deleted simplecookie.<br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: PUT</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("Deleted simplecookie.<br>") >= 0);
assertEquals(0,client.getState().getCookies().length);
}
@@ -212,8 +212,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("Wrote simplecookie.<br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("Wrote simplecookie.<br>") >= 0);
assertEquals(1,client.getState().getCookies().length);
assertEquals("simplecookie", ((Cookie)(client.getState().getCookies()[0])).getName());
assertEquals("value",((Cookie)(client.getState().getCookies()[0])).getValue());
@@ -229,8 +229,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("Deleted simplecookie.<br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("Deleted simplecookie.<br>") >= 0);
assertEquals(0,client.getState().getCookies().length);
}
@@ -247,9 +247,9 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("Wrote simplecookie.<br>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("Wrote domaincookie.<br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("Wrote simplecookie.<br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("Wrote domaincookie.<br>") >= 0);
assertEquals(2,client.getState().getCookies().length);
assertEquals("simplecookie", ((Cookie)(client.getState().getCookies()[0])).getName());
assertEquals("value",((Cookie)(client.getState().getCookies()[0])).getValue());
@@ -270,9 +270,9 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: PUT</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("Wrote simplecookie.<br>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("Wrote domaincookie.<br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: PUT</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("Wrote simplecookie.<br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("Wrote domaincookie.<br>") >= 0);
assertEquals(2,client.getState().getCookies().length);
assertEquals("simplecookie", ((Cookie)(client.getState().getCookies()[0])).getName());
assertEquals("value",((Cookie)(client.getState().getCookies()[0])).getValue());
@@ -293,8 +293,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("Wrote simplecookie.<br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("Wrote simplecookie.<br>") >= 0);
assertEquals(1,client.getState().getCookies().length);
assertEquals("simplecookie", ((Cookie)(client.getState().getCookies()[0])).getName());
assertEquals("value",((Cookie)(client.getState().getCookies()[0])).getValue());
@@ -308,9 +308,9 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method2.getStatusCode());
- assert(method2.getResponseBodyAsString().indexOf("<title>ReadCookieServlet: GET</title>") >= 0);
- assert(method2.getResponseBodyAsString().indexOf("<p><tt>Cookie: $Version=1;simplecookie=value;$Path=/" + context + "/cookie;$Domain=" + host + "</tt></p>") >= 0);
- assert(method2.getResponseBodyAsString().indexOf("<tt>simplecookie=value</tt><br>") >= 0);
+ assertTrue(method2.getResponseBodyAsString().indexOf("<title>ReadCookieServlet: GET</title>") >= 0);
+ assertTrue(method2.getResponseBodyAsString().indexOf("<p><tt>Cookie: $Version=1;simplecookie=value;$Path=/" + context + "/cookie;$Domain=" + host + "</tt></p>") >= 0);
+ assertTrue(method2.getResponseBodyAsString().indexOf("<tt>simplecookie=value</tt><br>") >= 0);
}
public void testMultiSendCookieGet() throws Exception {
@@ -326,9 +326,9 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("Wrote simplecookie.<br>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("Wrote domaincookie.<br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("Wrote simplecookie.<br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("Wrote domaincookie.<br>") >= 0);
assertEquals(2,client.getState().getCookies().length);
assertEquals("simplecookie", ((Cookie)(client.getState().getCookies()[0])).getName());
assertEquals("value",((Cookie)(client.getState().getCookies()[0])).getValue());
@@ -344,10 +344,10 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method2.getStatusCode());
- assert(method2.getResponseBodyAsString().indexOf("<title>ReadCookieServlet: GET</title>") >= 0);
- assert(method2.getResponseBodyAsString(),method2.getResponseBodyAsString().indexOf("<p><tt>Cookie: $Version=1;simplecookie=value;$Path=/" + context + "/cookie;$Domain=" + host + ";domaincookie=value;$Path=/" + context + "/cookie;$Domain=" + host + "</tt></p>") >= 0);
- assert(method2.getResponseBodyAsString().indexOf("<tt>simplecookie=value</tt><br>") >= 0);
- assert(method2.getResponseBodyAsString().indexOf("<tt>domaincookie=value</tt><br>") >= 0);
+ assertTrue(method2.getResponseBodyAsString().indexOf("<title>ReadCookieServlet: GET</title>") >= 0);
+ assertTrue(method2.getResponseBodyAsString(),method2.getResponseBodyAsString().indexOf("<p><tt>Cookie: $Version=1;simplecookie=value;$Path=/" + context + "/cookie;$Domain=" + host + ";domaincookie=value;$Path=/" + context + "/cookie;$Domain=" + host + "</tt></p>") >= 0);
+ assertTrue(method2.getResponseBodyAsString().indexOf("<tt>simplecookie=value</tt><br>") >= 0);
+ assertTrue(method2.getResponseBodyAsString().indexOf("<tt>domaincookie=value</tt><br>") >= 0);
}
public void testDeleteCookieGet() throws Exception {
@@ -365,9 +365,9 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("Wrote simplecookie.<br>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("Wrote domaincookie.<br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("Wrote simplecookie.<br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("Wrote domaincookie.<br>") >= 0);
assertEquals(2,client.getState().getCookies().length);
assertEquals("simplecookie", ((Cookie)(client.getState().getCookies()[0])).getName());
assertEquals("value",((Cookie)(client.getState().getCookies()[0])).getValue());
@@ -385,10 +385,10 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method2.getStatusCode());
- assert(method2.getResponseBodyAsString().indexOf("<title>ReadCookieServlet: GET</title>") >= 0);
- assert(method2.getResponseBodyAsString(),method2.getResponseBodyAsString().indexOf("<p><tt>Cookie: $Version=1;simplecookie=value;$Path=/" + context + "/cookie;$Domain=" + host + ";domaincookie=value;$Path=/" + context + "/cookie;$Domain=" + host + "</tt></p>") >= 0);
- assert(method2.getResponseBodyAsString().indexOf("<tt>simplecookie=value</tt><br>") >= 0);
- assert(method2.getResponseBodyAsString().indexOf("<tt>domaincookie=value</tt><br>") >= 0);
+ assertTrue(method2.getResponseBodyAsString().indexOf("<title>ReadCookieServlet: GET</title>") >= 0);
+ assertTrue(method2.getResponseBodyAsString(),method2.getResponseBodyAsString().indexOf("<p><tt>Cookie: $Version=1;simplecookie=value;$Path=/" + context + "/cookie;$Domain=" + host + ";domaincookie=value;$Path=/" + context + "/cookie;$Domain=" + host + "</tt></p>") >= 0);
+ assertTrue(method2.getResponseBodyAsString().indexOf("<tt>simplecookie=value</tt><br>") >= 0);
+ assertTrue(method2.getResponseBodyAsString().indexOf("<tt>domaincookie=value</tt><br>") >= 0);
}
{
@@ -402,8 +402,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method3.getStatusCode());
- assert(method3.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
- assert(method3.getResponseBodyAsString().indexOf("Deleted simplecookie.<br>") >= 0);
+ assertTrue(method3.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
+ assertTrue(method3.getResponseBodyAsString().indexOf("Deleted simplecookie.<br>") >= 0);
assertEquals(1,client.getState().getCookies().length);
assertEquals("domaincookie", ((Cookie)(client.getState().getCookies()[0])).getName());
assertEquals("value",((Cookie)(client.getState().getCookies()[0])).getValue());
@@ -419,9 +419,9 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method4.getStatusCode());
- assert(method4.getResponseBodyAsString().indexOf("<title>ReadCookieServlet: GET</title>") >= 0);
- assert(method4.getResponseBodyAsString().indexOf("<p><tt>Cookie: $Version=1;domaincookie=value;$Path=/" + context + "/cookie;$Domain=" + host + "</tt></p>") >= 0);
- assert(method4.getResponseBodyAsString().indexOf("<tt>domaincookie=value</tt><br>") >= 0);
+ assertTrue(method4.getResponseBodyAsString().indexOf("<title>ReadCookieServlet: GET</title>") >= 0);
+ assertTrue(method4.getResponseBodyAsString().indexOf("<p><tt>Cookie: $Version=1;domaincookie=value;$Path=/" + context + "/cookie;$Domain=" + host + "</tt></p>") >= 0);
+ assertTrue(method4.getResponseBodyAsString().indexOf("<tt>domaincookie=value</tt><br>") >= 0);
}
}
@@ -440,9 +440,9 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: PUT</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("Wrote simplecookie.<br>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("Wrote domaincookie.<br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: PUT</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("Wrote simplecookie.<br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("Wrote domaincookie.<br>") >= 0);
assertEquals(2,client.getState().getCookies().length);
assertEquals("simplecookie", ((Cookie)(client.getState().getCookies()[0])).getName());
assertEquals("value",((Cookie)(client.getState().getCookies()[0])).getValue());
@@ -460,10 +460,10 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method2.getStatusCode());
- assert(method2.getResponseBodyAsString().indexOf("<title>ReadCookieServlet: PUT</title>") >= 0);
- assert(method2.getResponseBodyAsString(),method2.getResponseBodyAsString().indexOf("<p><tt>Cookie: $Version=1;simplecookie=value;$Path=/" + context + "/cookie;$Domain=" + host + ";domaincookie=value;$Path=/" + context + "/cookie;$Domain=" + host + "</tt></p>") >= 0);
- assert(method2.getResponseBodyAsString().indexOf("<tt>simplecookie=value</tt><br>") >= 0);
- assert(method2.getResponseBodyAsString().indexOf("<tt>domaincookie=value</tt><br>") >= 0);
+ assertTrue(method2.getResponseBodyAsString().indexOf("<title>ReadCookieServlet: PUT</title>") >= 0);
+ assertTrue(method2.getResponseBodyAsString(),method2.getResponseBodyAsString().indexOf("<p><tt>Cookie: $Version=1;simplecookie=value;$Path=/" + context + "/cookie;$Domain=" + host + ";domaincookie=value;$Path=/" + context + "/cookie;$Domain=" + host + "</tt></p>") >= 0);
+ assertTrue(method2.getResponseBodyAsString().indexOf("<tt>simplecookie=value</tt><br>") >= 0);
+ assertTrue(method2.getResponseBodyAsString().indexOf("<tt>domaincookie=value</tt><br>") >= 0);
}
{
@@ -477,8 +477,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method3.getStatusCode());
- assert(method3.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: PUT</title>") >= 0);
- assert(method3.getResponseBodyAsString().indexOf("Deleted simplecookie.<br>") >= 0);
+ assertTrue(method3.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: PUT</title>") >= 0);
+ assertTrue(method3.getResponseBodyAsString().indexOf("Deleted simplecookie.<br>") >= 0);
assertEquals(1,client.getState().getCookies().length);
assertEquals("domaincookie", ((Cookie)(client.getState().getCookies()[0])).getName());
assertEquals("value",((Cookie)(client.getState().getCookies()[0])).getValue());
@@ -494,9 +494,9 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method4.getStatusCode());
- assert(method4.getResponseBodyAsString().indexOf("<title>ReadCookieServlet: PUT</title>") >= 0);
- assert(method4.getResponseBodyAsString().indexOf("<p><tt>Cookie: $Version=1;domaincookie=value;$Path=/" + context + "/cookie;$Domain=" + host + "</tt></p>") >= 0);
- assert(method4.getResponseBodyAsString().indexOf("<tt>domaincookie=value</tt><br>") >= 0);
+ assertTrue(method4.getResponseBodyAsString().indexOf("<title>ReadCookieServlet: PUT</title>") >= 0);
+ assertTrue(method4.getResponseBodyAsString().indexOf("<p><tt>Cookie: $Version=1;domaincookie=value;$Path=/" + context + "/cookie;$Domain=" + host + "</tt></p>") >= 0);
+ assertTrue(method4.getResponseBodyAsString().indexOf("<tt>domaincookie=value</tt><br>") >= 0);
}
}
@@ -515,8 +515,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("Wrote pathcookie.<br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("Wrote pathcookie.<br>") >= 0);
assertEquals(1,client.getState().getCookies().length);
assertEquals("/",((Cookie)(client.getState().getCookies()[0])).getPath());
}
@@ -531,9 +531,9 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>ReadCookieServlet: GET</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("<p><tt>Cookie: $Version=1;pathcookie=value;$Path=/;$Domain=" + host + "</tt></p>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("<tt>pathcookie=value</tt><br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>ReadCookieServlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<p><tt>Cookie: $Version=1;pathcookie=value;$Path=/;$Domain=" + host + "</tt></p>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<tt>pathcookie=value</tt><br>") >= 0);
}
}
@@ -552,8 +552,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("Wrote pathcookie.<br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("Wrote pathcookie.<br>") >= 0);
assertEquals(1,client.getState().getCookies().length);
assertEquals("/" + context,((Cookie)(client.getState().getCookies()[0])).getPath());
}
@@ -568,9 +568,9 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>ReadCookieServlet: GET</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("<p><tt>Cookie: $Version=1;pathcookie=value;$Path=/" + context + ";$Domain=" + host + "</tt></p>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("<tt>pathcookie=value</tt><br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>ReadCookieServlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<p><tt>Cookie: $Version=1;pathcookie=value;$Path=/" + context + ";$Domain=" + host + "</tt></p>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<tt>pathcookie=value</tt><br>") >= 0);
}
}
@@ -589,8 +589,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("Wrote pathcookie.<br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("Wrote pathcookie.<br>") >= 0);
assertEquals(1,client.getState().getCookies().length);
assertEquals("/" + context + "/cookie",((Cookie)(client.getState().getCookies()[0])).getPath());
}
@@ -605,9 +605,9 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>ReadCookieServlet: GET</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("<p><tt>Cookie: $Version=1;pathcookie=value;$Path=/" + context + "/cookie;$Domain=" + host + "</tt></p>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("<tt>pathcookie=value</tt><br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>ReadCookieServlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<p><tt>Cookie: $Version=1;pathcookie=value;$Path=/" + context + "/cookie;$Domain=" + host + "</tt></p>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<tt>pathcookie=value</tt><br>") >= 0);
}
}
@@ -626,8 +626,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("Wrote pathcookie.<br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>WriteCookieServlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("Wrote pathcookie.<br>") >= 0);
assertEquals(1,client.getState().getCookies().length);
assertEquals("/" + context + "/cookie/write",((Cookie)(client.getState().getCookies()[0])).getPath());
}
@@ -642,9 +642,9 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>ReadCookieServlet: GET</title>") >= 0);
- assert(method.getResponseBodyAsString(),method.getResponseBodyAsString().indexOf("<p><tt>Cookie: null</tt></p>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("<tt>pathcookie=value</tt><br>") == -1);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>ReadCookieServlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString(),method.getResponseBodyAsString().indexOf("<p><tt>Cookie: null</tt></p>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<tt>pathcookie=value</tt><br>") == -1);
}
}
}
1.3 +27 -27 jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestWebappParameters.java
Index: TestWebappParameters.java
===================================================================
RCS file: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestWebappParameters.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestWebappParameters.java 4 Oct 2001 17:49:13 -0000 1.2
+++ TestWebappParameters.java 4 Feb 2002 15:26:43 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestWebappParameters.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/TestWebappParameters.java,v 1.3 2002/02/04 15:26:43 dion Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/04 15:26:43 $
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -82,7 +82,7 @@
* "httpclient.test.webappContext" property.
*
* @author Rodney Waldhoff
- * @version $Id: TestWebappParameters.java,v 1.2 2001/10/04 17:49:13 rwaldhoff Exp $
+ * @version $Id: TestWebappParameters.java,v 1.3 2002/02/04 15:26:43 dion Exp $
*/
public class TestWebappParameters extends TestWebappBase {
@@ -118,9 +118,9 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<p>QueryString=\"hadQuestionMark=true\"</p>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<p>QueryString=\"hadQuestionMark=true\"</p>") >= 0);
}
/**
@@ -139,9 +139,9 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<p>QueryString=\"hadQuestionMark=false\"</p>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<p>QueryString=\"hadQuestionMark=false\"</p>") >= 0);
}
/**
@@ -160,9 +160,9 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<p>QueryString=\"param-one=param-value\"</p>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<p>QueryString=\"param-one=param-value\"</p>") >= 0);
}
/**
@@ -185,11 +185,11 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("name=\"special-chars\";value=\":/?~.\"") >= 0);
- assert(method.getResponseBodyAsString().indexOf("name=\"param-one\";value=\"param-value\"") >= 0);
- assert(method.getResponseBodyAsString().indexOf("name=\"param-two\";value=\"param-value2\"") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("name=\"special-chars\";value=\":/?~.\"") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("name=\"param-one\";value=\"param-value\"") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("name=\"param-two\";value=\"param-value2\"") >= 0);
}
/**
@@ -208,9 +208,9 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<p>QueryString=\"param-without-value\"</p>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<p>QueryString=\"param-without-value\"</p>") >= 0);
}
/**
@@ -232,10 +232,10 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("name=\"foo\";value=\"one\"") >= 0);
- assert(method.getResponseBodyAsString().indexOf("name=\"foo\";value=\"two\"") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("name=\"foo\";value=\"one\"") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("name=\"foo\";value=\"two\"") >= 0);
}
public void testGetMethodOverwriteQueryString() throws Exception {
@@ -254,11 +254,11 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("name=\"query\";value=\"string\"") == -1);
- assert(method.getResponseBodyAsString().indexOf("name=\"param\";value=\"eter\"") >= 0);
- assert(method.getResponseBodyAsString().indexOf("name=\"para\";value=\"meter\"") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("name=\"query\";value=\"string\"") == -1);
+ assertTrue(method.getResponseBodyAsString().indexOf("name=\"param\";value=\"eter\"") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("name=\"para\";value=\"meter\"") >= 0);
}
/**
@@ -280,11 +280,11 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet: POST</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>Param Servlet: POST</title>") >= 0);
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<p>QueryString=\"query=string\"</p>") >= 0);
- assert(method.getResponseBodyAsString(),method.getResponseBodyAsString().indexOf("name=\"param\";value=\"eter\"") >= 0);
- assert(method.getResponseBodyAsString().indexOf("name=\"para\";value=\"meter\"") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<p>QueryString=\"query=string\"</p>") >= 0);
+ assertTrue(method.getResponseBodyAsString(),method.getResponseBodyAsString().indexOf("name=\"param\";value=\"eter\"") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("name=\"para\";value=\"meter\"") >= 0);
}
}
1.3 +9 -9 jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestMethodsLocalHost.java
Index: TestMethodsLocalHost.java
===================================================================
RCS file: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestMethodsLocalHost.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestMethodsLocalHost.java 4 Oct 2001 17:49:13 -0000 1.2
+++ TestMethodsLocalHost.java 4 Feb 2002 15:26:43 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestMethodsLocalHost.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/TestMethodsLocalHost.java,v 1.3 2002/02/04 15:26:43 dion Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/04 15:26:43 $
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -80,7 +80,7 @@
*
* @author Remy Maucherat
* @author Rodney Waldhoff
- * @version $Id: TestMethodsLocalHost.java,v 1.2 2001/10/04 17:49:13 rwaldhoff Exp $
+ * @version $Id: TestMethodsLocalHost.java,v 1.3 2002/02/04 15:26:43 dion Exp $
*/
public class TestMethodsLocalHost extends TestCase {
@@ -131,7 +131,7 @@
Enumeration methodsAllowed = method.getAllowedMethods();
// This enumeration musn't be empty
- assert("No HTTP method allowed : result of OPTIONS is incorrect "
+ assertTrue("No HTTP method allowed : result of OPTIONS is incorrect "
+ "(make sure the webserver running on port " + port
+ " supports OPTIONS properly)",
methodsAllowed.hasMoreElements());
@@ -160,7 +160,7 @@
try {
String data = method.getResponseBodyAsString();
// This enumeration musn't be empty
- assert("No data returned.",
+ assertTrue("No data returned.",
(data.length() > 0));
} catch (Throwable t) {
t.printStackTrace();
@@ -181,7 +181,7 @@
try {
String data = method.getResponseBodyAsString();
// This enumeration musn't be empty
- assert("No data returned.",
+ assertTrue("No data returned.",
(data.length() > 0));
} catch (Throwable t) {
t.printStackTrace();
@@ -217,7 +217,7 @@
fail("Unable to execute method : " + t.toString());
}
- assert("Method failed : " + method.getStatusCode(),
+ assertTrue("Method failed : " + method.getStatusCode(),
(method.getStatusCode() == 200));
method.recycle();
@@ -230,7 +230,7 @@
fail("Unable to execute method : " + t.toString());
}
- assert("Method failed : " + method.getStatusCode(),
+ assertTrue("Method failed : " + method.getStatusCode(),
(method.getStatusCode() == 200));
}
1.3 +8 -8 jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestWebappHeaders.java
Index: TestWebappHeaders.java
===================================================================
RCS file: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestWebappHeaders.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestWebappHeaders.java 4 Oct 2001 17:49:13 -0000 1.2
+++ TestWebappHeaders.java 4 Feb 2002 15:26:43 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestWebappHeaders.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/TestWebappHeaders.java,v 1.3 2002/02/04 15:26:43 dion Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/04 15:26:43 $
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -82,7 +82,7 @@
* "httpclient.test.webappContext" property.
*
* @author Rodney Waldhoff
- * @version $Id: TestWebappHeaders.java,v 1.2 2001/10/04 17:49:13 rwaldhoff Exp $
+ * @version $Id: TestWebappHeaders.java,v 1.3 2002/02/04 15:26:43 dion Exp $
*/
public class TestWebappHeaders extends TestWebappBase {
@@ -119,8 +119,8 @@
fail("Unable to execute method : " + t.toString());
}
// Tomcat 4 at least converts the header name to lower case
- assert(method.getResponseBodyAsString().indexOf("name=\"addrequestheader(header)\";value=\"True\"<br>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("name=\"addrequestheader(string,string)\";value=\"Also True\"<br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("name=\"addrequestheader(header)\";value=\"True\"<br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("name=\"addrequestheader(string,string)\";value=\"Also True\"<br>") >= 0);
}
/**
@@ -140,7 +140,7 @@
fail("Unable to execute method : " + t.toString());
}
// Tomcat 4 at least converts the header name to lower case
- assert(!(method.getResponseBodyAsString().indexOf("xxx-a-header") >= 0));
+ assertTrue(!(method.getResponseBodyAsString().indexOf("xxx-a-header") >= 0));
}
/**
@@ -160,7 +160,7 @@
fail("Unable to execute method : " + t.toString());
}
// Tomcat 4 at least converts the header name to lower case
- assert(method.getResponseBodyAsString().indexOf("name=\"xxx-a-header\";value=\"two\"<br>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("name=\"xxx-a-header\";value=\"two\"<br>") >= 0);
}
/**
1.4 +6 -6 jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHttps.java
Index: TestHttps.java
===================================================================
RCS file: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHttps.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestHttps.java 4 Oct 2001 17:49:13 -0000 1.3
+++ TestHttps.java 4 Feb 2002 15:26:43 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHttps.java,v 1.3 2001/10/04 17:49:13 rwaldhoff Exp $
- * $Revision: 1.3 $
- * $Date: 2001/10/04 17:49:13 $
+ * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHttps.java,v 1.4 2002/02/04 15:26:43 dion Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/02/04 15:26:43 $
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -78,7 +78,7 @@
* (see build.xml)
*
* @author Rodney Waldhoff
- * @version $Id: TestHttps.java,v 1.3 2001/10/04 17:49:13 rwaldhoff Exp $
+ * @version $Id: TestHttps.java,v 1.4 2002/02/04 15:26:43 dion Exp $
*/
public class TestHttps extends TestCase {
@@ -122,7 +122,7 @@
try {
String data = method.getResponseBodyAsString();
// This enumeration musn't be empty
- assert("No data returned.", (data.length() > 0));
+ assertTrue("No data returned.", (data.length() > 0));
} catch (Throwable t) {
t.printStackTrace();
fail("Exception thrown while retrieving data : " + t.toString());
@@ -144,7 +144,7 @@
try {
String data = method.getResponseBodyAsString();
// This enumeration musn't be empty
- assert("No data returned.", (data.length() > 0));
+ assertTrue("No data returned.", (data.length() > 0));
} catch (Throwable t) {
t.printStackTrace();
fail("Exception thrown while retrieving data : " + t.toString());
1.3 +8 -8 jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestMethodsExternalHost.java
Index: TestMethodsExternalHost.java
===================================================================
RCS file: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestMethodsExternalHost.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestMethodsExternalHost.java 4 Oct 2001 17:49:13 -0000 1.2
+++ TestMethodsExternalHost.java 4 Feb 2002 15:26:43 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestMethodsExternalHost.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/TestMethodsExternalHost.java,v 1.3 2002/02/04 15:26:43 dion Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/04 15:26:43 $
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -75,7 +75,7 @@
*
* @author Remy Maucherat
* @author Rodney Waldhoff
- * @version $Id: TestMethodsExternalHost.java,v 1.2 2001/10/04 17:49:13 rwaldhoff Exp $
+ * @version $Id: TestMethodsExternalHost.java,v 1.3 2002/02/04 15:26:43 dion Exp $
*/
public class TestMethodsExternalHost extends TestCase {
@@ -121,7 +121,7 @@
Enumeration methodsAllowed = method.getAllowedMethods();
// This enumeration musn't be empty
- assert("No HTTP method allowed : result of OPTIONS is incorrect.",
+ assertTrue("No HTTP method allowed : result of OPTIONS is incorrect.",
methodsAllowed.hasMoreElements());
}
@@ -148,7 +148,7 @@
try {
String data = method.getResponseBodyAsString();
// This enumeration musn't be empty
- assert("No data returned.",
+ assertTrue("No data returned.",
(data.length() > 0));
} catch (Throwable t) {
t.printStackTrace();
@@ -169,7 +169,7 @@
try {
String data = method.getResponseBodyAsString();
// This enumeration musn't be empty
- assert("No data returned.",
+ assertTrue("No data returned.",
(data.length() > 0));
} catch (Throwable t) {
t.printStackTrace();
@@ -195,7 +195,7 @@
fail("Unable to execute method : " + t.toString());
}
- assert("Method failed : " + method.getStatusCode(),
+ assertTrue("Method failed : " + method.getStatusCode(),
(method.getStatusCode() == 200));
}
1.2 +10 -10 jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHttpClientLocalHost.java
Index: TestHttpClientLocalHost.java
===================================================================
RCS file: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHttpClientLocalHost.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestHttpClientLocalHost.java 5 Oct 2001 18:13:28 -0000 1.1
+++ TestHttpClientLocalHost.java 4 Feb 2002 15:26:43 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHttpClientLocalHost.java,v 1.1 2001/10/05 18:13:28 rwaldhoff Exp $
- * $Revision: 1.1 $
- * $Date: 2001/10/05 18:13:28 $
+ * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHttpClientLocalHost.java,v 1.2 2002/02/04 15:26:43 dion Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/02/04 15:26:43 $
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -76,7 +76,7 @@
* The default configuration of Tomcat 4 will work fine.
*
* @author Rodney Waldhoff
- * @version $Id: TestHttpClientLocalHost.java,v 1.1 2001/10/05 18:13:28 rwaldhoff Exp $
+ * @version $Id: TestHttpClientLocalHost.java,v 1.2 2002/02/04 15:26:43 dion Exp $
*/
public class TestHttpClientLocalHost extends TestCase {
@@ -119,10 +119,10 @@
public void testExecuteMethod() throws Exception {
client.startSession(host, port);
- assert(200 == client.executeMethod(getSlash));
+ assertTrue(200 == client.executeMethod(getSlash));
String data = getSlash.getResponseBodyAsString();
- assert(null != data);
- assert(data.length() > 0);
+ assertTrue(null != data);
+ assertTrue(data.length() > 0);
client.endSession();
}
@@ -130,10 +130,10 @@
public void testExecuteMultipleMethods() throws Exception {
client.startSession(host, port);
for(int i=0;i<10;i++) {
- assert(200 == client.executeMethod(getSlash));
+ assertTrue(200 == client.executeMethod(getSlash));
String data = getSlash.getResponseBodyAsString();
- assert(null != data);
- assert(data.length() > 0);
+ assertTrue(null != data);
+ assertTrue(data.length() > 0);
getSlash.recycle();
getSlash.setPath("/");
}
1.3 +10 -10 jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestNVP.java
Index: TestNVP.java
===================================================================
RCS file: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestNVP.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestNVP.java 4 Oct 2001 17:49:13 -0000 1.2
+++ TestNVP.java 4 Feb 2002 15:26:43 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestNVP.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/TestNVP.java,v 1.3 2002/02/04 15:26:43 dion Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/04 15:26:43 $
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -68,7 +68,7 @@
* Simple tests for {@link NameValuePair}.
*
* @author Rodney Waldhoff
- * @version $Id: TestNVP.java,v 1.2 2001/10/04 17:49:13 rwaldhoff Exp $
+ * @version $Id: TestNVP.java,v 1.3 2002/02/04 15:26:43 dion Exp $
*/
public class TestNVP extends TestCase {
@@ -110,8 +110,8 @@
public void testSet() {
NameValuePair pair = makePair();
- assert(null == pair.getName());
- assert(null == pair.getValue());
+ assertTrue(null == pair.getName());
+ assertTrue(null == pair.getValue());
pair.setName("name");
assertEquals("name",pair.getName());
pair.setValue("value");
@@ -135,8 +135,8 @@
assertEquals(pair1,pair1);
assertEquals(pair1.hashCode(),pair1.hashCode());
- assert(!pair1.equals(pair2));
- assert(!pair2.equals(pair1));
+ assertTrue(!pair1.equals(pair2));
+ assertTrue(!pair2.equals(pair1));
pair2.setName("name");
@@ -144,8 +144,8 @@
assertEquals(pair1.hashCode(),pair1.hashCode());
assertEquals(pair2,pair2);
assertEquals(pair2.hashCode(),pair2.hashCode());
- assert(!pair1.equals(pair2));
- assert(!pair2.equals(pair1));
+ assertTrue(!pair1.equals(pair2));
+ assertTrue(!pair2.equals(pair1));
pair2.setValue("value");
1.3 +15 -15 jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestWebappMethods.java
Index: TestWebappMethods.java
===================================================================
RCS file: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestWebappMethods.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestWebappMethods.java 4 Oct 2001 17:49:13 -0000 1.2
+++ TestWebappMethods.java 4 Feb 2002 15:26:43 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestWebappMethods.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/TestWebappMethods.java,v 1.3 2002/02/04 15:26:43 dion Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/04 15:26:43 $
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -82,7 +82,7 @@
* "httpclient.test.webappContext" property.
*
* @author Rodney Waldhoff
- * @version $Id: TestWebappMethods.java,v 1.2 2001/10/04 17:49:13 rwaldhoff Exp $
+ * @version $Id: TestWebappMethods.java,v 1.3 2002/02/04 15:26:43 dion Exp $
*/
public class TestWebappMethods extends TestWebappBase {
@@ -116,7 +116,7 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
assertEquals(200,method.getStatusCode());
method.recycle();
@@ -128,7 +128,7 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
assertEquals(200,method.getStatusCode());
}
@@ -146,7 +146,7 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet: POST</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>Param Servlet: POST</title>") >= 0);
assertEquals(200,method.getStatusCode());
method.recycle();
@@ -158,7 +158,7 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet: POST</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>Param Servlet: POST</title>") >= 0);
assertEquals(200,method.getStatusCode());
}
@@ -203,7 +203,7 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getAllowedMethods().hasMoreElements());
+ assertTrue(method.getAllowedMethods().hasMoreElements());
method.recycle();
@@ -215,7 +215,7 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getAllowedMethods().hasMoreElements());
+ assertTrue(method.getAllowedMethods().hasMoreElements());
}
/**
@@ -232,7 +232,7 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getAllowedMethods().hasMoreElements());
+ assertTrue(method.getAllowedMethods().hasMoreElements());
}
/**
@@ -276,7 +276,7 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString(),method.getResponseBodyAsString().indexOf("<title>Param Servlet: PUT</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString(),method.getResponseBodyAsString().indexOf("<title>Param Servlet: PUT</title>") >= 0);
method.recycle();
@@ -288,7 +288,7 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString(),method.getResponseBodyAsString().indexOf("<title>Param Servlet: PUT</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString(),method.getResponseBodyAsString().indexOf("<title>Param Servlet: PUT</title>") >= 0);
}
public void testPostBody() throws Exception {
@@ -303,7 +303,7 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getResponseBodyAsString().indexOf("<tt>quote=It+was+the+best+of+times%2C+it+was+the+worst+of+times.</tt>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<tt>quote=It+was+the+best+of+times%2C+it+was+the+worst+of+times.</tt>") >= 0);
assertEquals(200,method.getStatusCode());
}
@@ -319,7 +319,7 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getResponseBodyAsString(),method.getResponseBodyAsString().indexOf("<tt>This is data to be sent in the body of an HTTP PUT.</tt>") >= 0);
+ assertTrue(method.getResponseBodyAsString(),method.getResponseBodyAsString().indexOf("<tt>This is data to be sent in the body of an HTTP PUT.</tt>") >= 0);
assertEquals(200,method.getStatusCode());
}
1.4 +17 -17 jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestWebappRedirect.java
Index: TestWebappRedirect.java
===================================================================
RCS file: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestWebappRedirect.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestWebappRedirect.java 15 Jan 2002 20:53:47 -0000 1.3
+++ TestWebappRedirect.java 4 Feb 2002 15:26:43 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestWebappRedirect.java,v 1.3 2002/01/15 20:53:47 rwaldhoff Exp $
- * $Revision: 1.3 $
- * $Date: 2002/01/15 20:53:47 $
+ * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestWebappRedirect.java,v 1.4 2002/02/04 15:26:43 dion Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/02/04 15:26:43 $
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -83,7 +83,7 @@
* "httpclient.test.webappContext" property.
*
* @author Rodney Waldhoff
- * @version $Id: TestWebappRedirect.java,v 1.3 2002/01/15 20:53:47 rwaldhoff Exp $
+ * @version $Id: TestWebappRedirect.java,v 1.4 2002/02/04 15:26:43 dion Exp $
*/
public class TestWebappRedirect extends TestWebappBase {
@@ -116,7 +116,7 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
}
// see http://nagoya.apache.org/bugzilla/show_bug.cgi?id=5870
@@ -133,7 +133,7 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
}
public void testRedirectWithQueryString() throws Exception {
@@ -149,8 +149,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("<p>QueryString=\"foo=bar&bar=foo\"</p>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<p>QueryString=\"foo=bar&bar=foo\"</p>") >= 0);
}
public void testRecursiveRedirect() throws Exception {
@@ -171,8 +171,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("<p>QueryString=\"foo=bar&bar=foo\"</p>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>Param Servlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<p>QueryString=\"foo=bar&bar=foo\"</p>") >= 0);
}
public void testDetectRedirectLoop() throws Exception {
@@ -187,8 +187,8 @@
// expected
}
assertEquals(302,method.getStatusCode());
- assert(null != method.getResponseHeader("location"));
- assert(null != (method.getResponseHeader("location")).getValue());
+ assertTrue(null != method.getResponseHeader("location"));
+ assertTrue(null != (method.getResponseHeader("location")).getValue());
assertEquals("http://" + host + (port == 80 ? "" : ":" + port) + "/" + context + "/redirect?loop=true",(method.getResponseHeader("location")).getValue());
}
@@ -207,10 +207,10 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>Param Servlet: POST</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("<p>QueryString=\"foo=bar&bar=foo\"</p>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("name=\"para\";value=\"meter\"") >= 0);
- assert(method.getResponseBodyAsString().indexOf("name=\"param\";value=\"eter\"") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>Param Servlet: POST</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<p>QueryString=\"foo=bar&bar=foo\"</p>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("name=\"para\";value=\"meter\"") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("name=\"param\";value=\"eter\"") >= 0);
}
public void testPutRedirect() throws Exception {
@@ -226,7 +226,7 @@
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
}
- assert(method.getResponseBodyAsString(),method.getResponseBodyAsString().indexOf("<tt>This is data to be sent in the body of an HTTP PUT.</tt>") >= 0);
+ assertTrue(method.getResponseBodyAsString(),method.getResponseBodyAsString().indexOf("<tt>This is data to be sent in the body of an HTTP PUT.</tt>") >= 0);
assertEquals(200,method.getStatusCode());
}
}
1.3 +6 -6 jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHeader.java
Index: TestHeader.java
===================================================================
RCS file: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHeader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestHeader.java 4 Oct 2001 17:49:13 -0000 1.2
+++ TestHeader.java 4 Feb 2002 15:26:43 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHeader.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/TestHeader.java,v 1.3 2002/02/04 15:26:43 dion Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/04 15:26:43 $
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -68,7 +68,7 @@
* Simple tests for {@link NameValuePair}.
*
* @author Rodney Waldhoff
- * @version $Id: TestHeader.java,v 1.2 2001/10/04 17:49:13 rwaldhoff Exp $
+ * @version $Id: TestHeader.java,v 1.3 2002/02/04 15:26:43 dion Exp $
*/
public class TestHeader extends TestNVP {
@@ -125,7 +125,7 @@
public void testNotEqualToNVP() {
NameValuePair header = makePair("a","b");
NameValuePair pair = new NameValuePair("a","b");
- assert(!header.equals(pair));
- assert(!pair.equals(header));
+ assertTrue(!header.equals(pair));
+ assertTrue(!pair.equals(header));
}
}
1.6 +13 -13 jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestAuthenticator.java
Index: TestAuthenticator.java
===================================================================
RCS file: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestAuthenticator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestAuthenticator.java 4 Oct 2001 17:49:13 -0000 1.5
+++ TestAuthenticator.java 4 Feb 2002 15:26:43 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestAuthenticator.java,v 1.5 2001/10/04 17:49:13 rwaldhoff Exp $
- * $Revision: 1.5 $
- * $Date: 2001/10/04 17:49:13 $
+ * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestAuthenticator.java,v 1.6 2002/02/04 15:26:43 dion Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/02/04 15:26:43 $
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -68,7 +68,7 @@
* Unit tests for {@link Authenticator}.
*
* @author Rodney Waldhoff
- * @version $Id: TestAuthenticator.java,v 1.5 2001/10/04 17:49:13 rwaldhoff Exp $
+ * @version $Id: TestAuthenticator.java,v 1.6 2002/02/04 15:26:43 dion Exp $
*/
public class TestAuthenticator extends TestCase {
@@ -152,7 +152,7 @@
public void testBasicAuthenticationWithNoChallenge() throws Exception {
HttpState state = new HttpState();
HttpMethod method = new SimpleHttpMethod(null);
- assert(false == Authenticator.authenticate(method,state));
+ assertTrue(false == Authenticator.authenticate(method,state));
}
public void testBasicAuthenticationWithNullHttpState() throws Exception {
@@ -169,8 +169,8 @@
HttpState state = new HttpState();
state.setCredentials(null,new UsernamePasswordCredentials("username","password"));
HttpMethod method = new SimpleHttpMethod(new Header("WWW-Authenticate","Basic realm=\"realm1\""));
- assert(Authenticator.authenticate(method,state));
- assert(null != method.getRequestHeader("Authorization"));
+ assertTrue(Authenticator.authenticate(method,state));
+ assertTrue(null != method.getRequestHeader("Authorization"));
String expected = "Basic " + new String(Base64.encode("username:password".getBytes()));
assertEquals(expected,method.getRequestHeader("Authorization").getValue());
}
@@ -179,8 +179,8 @@
HttpState state = new HttpState();
state.setCredentials("realm1",new UsernamePasswordCredentials("username","password"));
HttpMethod method = new SimpleHttpMethod(new Header("WWW-Authenticate","Basic realm=\"realm1\""));
- assert(Authenticator.authenticate(method,state));
- assert(null != method.getRequestHeader("Authorization"));
+ assertTrue(Authenticator.authenticate(method,state));
+ assertTrue(null != method.getRequestHeader("Authorization"));
String expected = "Basic " + new String(Base64.encode("username:password".getBytes()));
assertEquals(expected,method.getRequestHeader("Authorization").getValue());
}
@@ -191,15 +191,15 @@
state.setCredentials("realm2",new UsernamePasswordCredentials("uname2","password2"));
{
HttpMethod method = new SimpleHttpMethod(new Header("WWW-Authenticate","Basic realm=\"realm1\""));
- assert(Authenticator.authenticate(method,state));
- assert(null != method.getRequestHeader("Authorization"));
+ assertTrue(Authenticator.authenticate(method,state));
+ assertTrue(null != method.getRequestHeader("Authorization"));
String expected = "Basic " + new String(Base64.encode("username:password".getBytes()));
assertEquals(expected,method.getRequestHeader("Authorization").getValue());
}
{
HttpMethod method = new SimpleHttpMethod(new Header("WWW-Authenticate","Basic realm=\"realm2\""));
- assert(Authenticator.authenticate(method,state));
- assert(null != method.getRequestHeader("Authorization"));
+ assertTrue(Authenticator.authenticate(method,state));
+ assertTrue(null != method.getRequestHeader("Authorization"));
String expected = "Basic " + new String(Base64.encode("uname2:password2".getBytes()));
assertEquals(expected,method.getRequestHeader("Authorization").getValue());
}
1.4 +8 -8 jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestBase64.java
Index: TestBase64.java
===================================================================
RCS file: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestBase64.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestBase64.java 4 Oct 2001 17:49:13 -0000 1.3
+++ TestBase64.java 4 Feb 2002 15:26:43 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestBase64.java,v 1.3 2001/10/04 17:49:13 rwaldhoff Exp $
- * $Revision: 1.3 $
- * $Date: 2001/10/04 17:49:13 $
+ * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestBase64.java,v 1.4 2002/02/04 15:26:43 dion Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/02/04 15:26:43 $
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -69,7 +69,7 @@
* Simple tests of {@link Base64}.
*
* @author Rodney Waldhoff
- * @version $Id: TestBase64.java,v 1.3 2001/10/04 17:49:13 rwaldhoff Exp $
+ * @version $Id: TestBase64.java,v 1.4 2002/02/04 15:26:43 dion Exp $
*/
public class TestBase64 extends TestCase {
@@ -100,9 +100,9 @@
byte[] data = new byte[i];
_rand.nextBytes(data);
byte[] enc = Base64.encode(data);
- assert("\"" + (new String(enc)) + "\" is Base64 data.",Base64.isBase64((new String(enc))));
+ assertTrue("\"" + (new String(enc)) + "\" is Base64 data.",Base64.isBase64((new String(enc))));
byte[] data2 = Base64.decode(enc);
- assert(toString(data) + " equals " + toString(data2),isEqual(data,data2));
+ assertTrue(toString(data) + " equals " + toString(data2),isEqual(data,data2));
}
}
@@ -112,9 +112,9 @@
byte[] data = new byte[_rand.nextInt(10000)+1];
_rand.nextBytes(data);
byte[] enc = Base64.encode(data);
- assert(Base64.isBase64(new String(enc)));
+ assertTrue(Base64.isBase64(new String(enc)));
byte[] data2 = Base64.decode(enc);
- assert(isEqual(data,data2));
+ assertTrue(isEqual(data,data2));
}
}
1.4 +24 -24 jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestWebappBasicAuth.java
Index: TestWebappBasicAuth.java
===================================================================
RCS file: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestWebappBasicAuth.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestWebappBasicAuth.java 15 Nov 2001 23:00:37 -0000 1.3
+++ TestWebappBasicAuth.java 4 Feb 2002 15:26:43 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestWebappBasicAuth.java,v 1.3 2001/11/15 23:00:37 rwaldhoff Exp $
- * $Revision: 1.3 $
- * $Date: 2001/11/15 23:00:37 $
+ * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestWebappBasicAuth.java,v 1.4 2002/02/04 15:26:43 dion Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/02/04 15:26:43 $
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -83,7 +83,7 @@
* "httpclient.test.webappContext" property.
*
* @author Rodney Waldhoff
- * @version $Id: TestWebappBasicAuth.java,v 1.3 2001/11/15 23:00:37 rwaldhoff Exp $
+ * @version $Id: TestWebappBasicAuth.java,v 1.4 2002/02/04 15:26:43 dion Exp $
*/
public class TestWebappBasicAuth extends TestWebappBase {
@@ -116,8 +116,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>BasicAuth Servlet: GET</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("<p>You have authenticated as \"jakarta:commons\"</p>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>BasicAuth Servlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<p>You have authenticated as \"jakarta:commons\"</p>") >= 0);
method.recycle();
method.setPath("/" + context + "/auth/basic");
@@ -128,8 +128,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>BasicAuth Servlet: GET</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("<p>You have authenticated as \"jakarta:commons\"</p>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>BasicAuth Servlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<p>You have authenticated as \"jakarta:commons\"</p>") >= 0);
}
public void testSimpleAuthPost() throws Exception {
@@ -146,8 +146,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>BasicAuth Servlet: POST</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("<p>You have authenticated as \"jakarta:commons\"</p>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>BasicAuth Servlet: POST</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<p>You have authenticated as \"jakarta:commons\"</p>") >= 0);
method.recycle();
method.setPath("/" + context + "/auth/basic");
@@ -159,8 +159,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>BasicAuth Servlet: POST</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("<p>You have authenticated as \"jakarta:commons\"</p>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>BasicAuth Servlet: POST</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<p>You have authenticated as \"jakarta:commons\"</p>") >= 0);
}
public void testSimpleAuthPut() throws Exception {
@@ -176,8 +176,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>BasicAuth Servlet: PUT</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("<p>You have authenticated as \"jakarta:commons\"</p>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>BasicAuth Servlet: PUT</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<p>You have authenticated as \"jakarta:commons\"</p>") >= 0);
method.recycle();
method.setPath("/" + context + "/auth/basic");
@@ -188,8 +188,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>BasicAuth Servlet: PUT</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("<p>You have authenticated as \"jakarta:commons\"</p>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>BasicAuth Servlet: PUT</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<p>You have authenticated as \"jakarta:commons\"</p>") >= 0);
}
public void testNoCredAuthRetry() throws Exception {
@@ -204,8 +204,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(401,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>BasicAuth Servlet: GET</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("<p>Not authorized.</p>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>BasicAuth Servlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<p>Not authorized.</p>") >= 0);
client.getState().setCredentials("BasicAuthServlet",new UsernamePasswordCredentials("jakarta","commons"));
@@ -218,8 +218,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(200,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>BasicAuth Servlet: GET</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("<p>You have authenticated as \"jakarta:commons\"</p>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>BasicAuth Servlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<p>You have authenticated as \"jakarta:commons\"</p>") >= 0);
}
public void testBadCredFails() throws Exception {
@@ -234,8 +234,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(HttpStatus.SC_UNAUTHORIZED,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>BasicAuth Servlet: GET</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("<p>Not authorized.</p>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>BasicAuth Servlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<p>Not authorized.</p>") >= 0);
client.getState().setCredentials("BasicAuthServlet",new UsernamePasswordCredentials("bad","creds"));
@@ -248,8 +248,8 @@
fail("Unable to execute method : " + t.toString());
}
assertEquals(HttpStatus.SC_UNAUTHORIZED,method.getStatusCode());
- assert(method.getResponseBodyAsString().indexOf("<title>BasicAuth Servlet: GET</title>") >= 0);
- assert(method.getResponseBodyAsString().indexOf("<p>Not authorized. \"Basic YmFkOmNyZWRz\" not recognized.</p>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<title>BasicAuth Servlet: GET</title>") >= 0);
+ assertTrue(method.getResponseBodyAsString().indexOf("<p>Not authorized. \"Basic YmFkOmNyZWRz\" not recognized.</p>") >= 0);
}
}
1.3 +8 -8 jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestGetMethodLocal.java
Index: TestGetMethodLocal.java
===================================================================
RCS file: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestGetMethodLocal.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestGetMethodLocal.java 4 Oct 2001 17:49:13 -0000 1.2
+++ TestGetMethodLocal.java 4 Feb 2002 15:26:43 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestGetMethodLocal.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/TestGetMethodLocal.java,v 1.3 2002/02/04 15:26:43 dion Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/04 15:26:43 $
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -81,7 +81,7 @@
* "httpclient.test.localHost" property.
*
* @author Rodney Waldhoff
- * @version $Id: TestGetMethodLocal.java,v 1.2 2001/10/04 17:49:13 rwaldhoff Exp $
+ * @version $Id: TestGetMethodLocal.java,v 1.3 2002/02/04 15:26:43 dion Exp $
*/
public class TestGetMethodLocal extends TestCase {
@@ -135,7 +135,7 @@
try {
String data = method.getResponseBodyAsString();
- assert("No data returned.",(data.length() > 0));
+ assertTrue("No data returned.",(data.length() > 0));
} catch (Throwable t) {
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
@@ -158,7 +158,7 @@
try {
String data = method.getResponseBodyAsString();
- assert("No data returned.",(data.length() > 0));
+ assertTrue("No data returned.",(data.length() > 0));
} catch (Throwable t) {
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
@@ -181,7 +181,7 @@
try {
String data = method.getResponseBodyAsString();
- assert("No data returned.",(data.length() > 0));
+ assertTrue("No data returned.",(data.length() > 0));
} catch (Throwable t) {
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
@@ -200,7 +200,7 @@
try {
String data = method.getResponseBodyAsString();
- assert("No data returned.",(data.length() > 0));
+ assertTrue("No data returned.",(data.length() > 0));
} catch (Throwable t) {
t.printStackTrace();
fail("Unable to execute method : " + t.toString());
1.3 +44 -44 jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestCookie.java
Index: TestCookie.java
===================================================================
RCS file: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestCookie.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestCookie.java 4 Oct 2001 17:49:13 -0000 1.2
+++ TestCookie.java 4 Feb 2002 15:26:43 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestCookie.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/TestCookie.java,v 1.3 2002/02/04 15:26:43 dion Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/04 15:26:43 $
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -73,7 +73,7 @@
*
* @author BC Holmes
* @author Rod Waldhoff
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class TestCookie extends TestCase {
@@ -121,20 +121,20 @@
protected void checkResultsOfParse(
Cookie[] cookies, int length, int offset) throws Exception {
- assert("number of cookies should be " + length + ", but is " +
+ assertTrue("number of cookies should be " + length + ", but is " +
cookies.length + " instead.", cookies.length == length);
for (int i = 0; i < cookies.length; i++) {
- assert("Name of cookie " + i + " should be \"" +
+ assertTrue("Name of cookie " + i + " should be \"" +
testName[i+offset] + "\", but is " + cookies[i].getName() +
" instead.",
testName[i+offset].equals(cookies[i].getName()));
- assert("Value of cookie " + i + " should be \"" +
+ assertTrue("Value of cookie " + i + " should be \"" +
testValue[i+offset] + "\", but is " +
cookies[i].getValue() + " instead.",
testValue[i+offset].equals(cookies[i].getValue()));
- assert("Domain of cookie " + i + " should be \"" +
+ assertTrue("Domain of cookie " + i + " should be \"" +
testDomain[i+offset] + "\", but is " +
cookies[i].getDomain() + " instead.",
testDomain[i+offset].equalsIgnoreCase(
@@ -192,13 +192,13 @@
assertEquals("Found 1 cookie.",1,parsed.length);
assertEquals("Name","cookie-name",parsed[0].getName());
assertEquals("Value","cookie-value",parsed[0].getValue());
- assert("Comment",null == parsed[0].getComment());
- assert("ExpiryDate",null == parsed[0].getExpiryDate());
- //assert("isToBeDiscarded",parsed[0].isToBeDiscarded());
- assert("isPersistent",!parsed[0].isPersistent());
+ assertTrue("Comment",null == parsed[0].getComment());
+ assertTrue("ExpiryDate",null == parsed[0].getExpiryDate());
+ //assertTrue("isToBeDiscarded",parsed[0].isToBeDiscarded());
+ assertTrue("isPersistent",!parsed[0].isPersistent());
assertEquals("Domain","127.0.0.1",parsed[0].getDomain());
assertEquals("Path","/",parsed[0].getPath());
- assert("Secure",!parsed[0].getSecure());
+ assertTrue("Secure",!parsed[0].getSecure());
assertEquals("Version",1,parsed[0].getVersion());
}
@@ -208,13 +208,13 @@
assertEquals("Found 1 cookie.",1,parsed.length);
assertEquals("Name","",parsed[0].getName());
assertEquals("Value","cookie-value",parsed[0].getValue());
- assert("Comment",null == parsed[0].getComment());
- assert("ExpiryDate",null == parsed[0].getExpiryDate());
- //assert("isToBeDiscarded",parsed[0].isToBeDiscarded());
- assert("isPersistent",!parsed[0].isPersistent());
+ assertTrue("Comment",null == parsed[0].getComment());
+ assertTrue("ExpiryDate",null == parsed[0].getExpiryDate());
+ //assertTrue("isToBeDiscarded",parsed[0].isToBeDiscarded());
+ assertTrue("isPersistent",!parsed[0].isPersistent());
assertEquals("Domain","127.0.0.1",parsed[0].getDomain());
assertEquals("Path","/",parsed[0].getPath());
- assert("Secure",!parsed[0].getSecure());
+ assertTrue("Secure",!parsed[0].getSecure());
assertEquals("Version",1,parsed[0].getVersion());
}
@@ -223,14 +223,14 @@
Cookie[] parsed = Cookie.parse("127.0.0.1","/",setCookie);
assertEquals("Found 1 cookie.",1,parsed.length);
assertEquals("Name","cookie-name",parsed[0].getName());
- assert("Value",null == parsed[0].getValue());
- assert("Comment",null == parsed[0].getComment());
- assert("ExpiryDate",null == parsed[0].getExpiryDate());
- //assert("isToBeDiscarded",parsed[0].isToBeDiscarded());
- assert("isPersistent",!parsed[0].isPersistent());
+ assertTrue("Value",null == parsed[0].getValue());
+ assertTrue("Comment",null == parsed[0].getComment());
+ assertTrue("ExpiryDate",null == parsed[0].getExpiryDate());
+ //assertTrue("isToBeDiscarded",parsed[0].isToBeDiscarded());
+ assertTrue("isPersistent",!parsed[0].isPersistent());
assertEquals("Domain","127.0.0.1",parsed[0].getDomain());
assertEquals("Path","/",parsed[0].getPath());
- assert("Secure",!parsed[0].getSecure());
+ assertTrue("Secure",!parsed[0].getSecure());
assertEquals("Version",1,parsed[0].getVersion());
}
@@ -242,9 +242,9 @@
assertEquals("Value","cookie-value",parsed[0].getValue());
assertEquals("Domain","127.0.0.1",parsed[0].getDomain());
assertEquals("Path","/",parsed[0].getPath());
- assert("Secure",!parsed[0].getSecure());
- assert("ExpiryDate",null == parsed[0].getExpiryDate());
- assert("Comment",null == parsed[0].getComment());
+ assertTrue("Secure",!parsed[0].getSecure());
+ assertTrue("ExpiryDate",null == parsed[0].getExpiryDate());
+ assertTrue("Comment",null == parsed[0].getComment());
}
public void testParseWithQuotes() throws Exception {
@@ -255,9 +255,9 @@
assertEquals("Value"," cookie-value ",parsed[0].getValue());
assertEquals("Domain","127.0.0.1",parsed[0].getDomain());
assertEquals("Path","/",parsed[0].getPath());
- assert("Secure",!parsed[0].getSecure());
- assert("ExpiryDate",null == parsed[0].getExpiryDate());
- assert("Comment",null == parsed[0].getComment());
+ assertTrue("Secure",!parsed[0].getSecure());
+ assertTrue("ExpiryDate",null == parsed[0].getExpiryDate());
+ assertTrue("Comment",null == parsed[0].getComment());
}
public void testParseWithPath() throws Exception {
@@ -268,9 +268,9 @@
assertEquals("Value","cookie-value",parsed[0].getValue());
assertEquals("Domain","127.0.0.1",parsed[0].getDomain());
assertEquals("Path","/path/",parsed[0].getPath());
- assert("Secure",!parsed[0].getSecure());
- assert("ExpiryDate",null == parsed[0].getExpiryDate());
- assert("Comment",null == parsed[0].getComment());
+ assertTrue("Secure",!parsed[0].getSecure());
+ assertTrue("ExpiryDate",null == parsed[0].getExpiryDate());
+ assertTrue("Comment",null == parsed[0].getComment());
}
public void testParseWithDomain() throws Exception {
@@ -281,9 +281,9 @@
assertEquals("Value","cookie-value",parsed[0].getValue());
assertEquals("Domain","127.0.0.1",parsed[0].getDomain());
assertEquals("Path","/",parsed[0].getPath());
- assert("Secure",!parsed[0].getSecure());
- assert("ExpiryDate",null == parsed[0].getExpiryDate());
- assert("Comment",null == parsed[0].getComment());
+ assertTrue("Secure",!parsed[0].getSecure());
+ assertTrue("ExpiryDate",null == parsed[0].getExpiryDate());
+ assertTrue("Comment",null == parsed[0].getComment());
}
public void testParseWithSecure() throws Exception {
@@ -294,9 +294,9 @@
assertEquals("Value","cookie-value",parsed[0].getValue());
assertEquals("Domain","127.0.0.1",parsed[0].getDomain());
assertEquals("Path","/",parsed[0].getPath());
- assert("Secure",parsed[0].getSecure());
- assert("ExpiryDate",null == parsed[0].getExpiryDate());
- assert("Comment",null == parsed[0].getComment());
+ assertTrue("Secure",parsed[0].getSecure());
+ assertTrue("ExpiryDate",null == parsed[0].getExpiryDate());
+ assertTrue("Comment",null == parsed[0].getComment());
}
public void testParseWithComment() throws Exception {
@@ -307,8 +307,8 @@
assertEquals("Value","cookie-value",parsed[0].getValue());
assertEquals("Domain","127.0.0.1",parsed[0].getDomain());
assertEquals("Path","/",parsed[0].getPath());
- assert("Secure",!parsed[0].getSecure());
- assert("ExpiryDate",null == parsed[0].getExpiryDate());
+ assertTrue("Secure",!parsed[0].getSecure());
+ assertTrue("ExpiryDate",null == parsed[0].getExpiryDate());
assertEquals("Comment","This is a comment.",parsed[0].getComment());
}
@@ -320,9 +320,9 @@
assertEquals("Value","cookie-value",parsed[0].getValue());
assertEquals("Domain","127.0.0.1",parsed[0].getDomain());
assertEquals("Path","/",parsed[0].getPath());
- assert("Secure",!parsed[0].getSecure());
+ assertTrue("Secure",!parsed[0].getSecure());
assertEquals(new Date(10000L),parsed[0].getExpiryDate());
- assert("Comment",null == parsed[0].getComment());
+ assertTrue("Comment",null == parsed[0].getComment());
}
public void testParseWithAll() throws Exception {
@@ -333,7 +333,7 @@
assertEquals("Value","cookie-value",parsed[0].getValue());
assertEquals("Domain",".apache.org",parsed[0].getDomain());
assertEquals("Path","/commons",parsed[0].getPath());
- assert("Secure",parsed[0].getSecure());
+ assertTrue("Secure",parsed[0].getSecure());
assertEquals(new Date(10000L),parsed[0].getExpiryDate());
assertEquals("Comment","This is a comment.",parsed[0].getComment());
}
1.3 +6 -6 jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHeaderElement.java
Index: TestHeaderElement.java
===================================================================
RCS file: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHeaderElement.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestHeaderElement.java 4 Oct 2001 17:49:13 -0000 1.2
+++ TestHeaderElement.java 4 Feb 2002 15:26:43 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHeaderElement.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/TestHeaderElement.java,v 1.3 2002/02/04 15:26:43 dion Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/04 15:26:43 $
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -70,7 +70,7 @@
* @author Rodney Waldhoff
* @author <a href="mailto:bcholmes@interlog.com">B.C. Holmes</a>
* @author <a href="mailto:jericho@thinkfree.com">Park, Sung-Gu</a>
- * @version $Id: TestHeaderElement.java,v 1.2 2001/10/04 17:49:13 rwaldhoff Exp $
+ * @version $Id: TestHeaderElement.java,v 1.3 2002/02/04 15:26:43 dion Exp $
*/
public class TestHeaderElement extends TestNVP {
@@ -117,7 +117,7 @@
// 1st element has 2 parameters
assertEquals(2,elements[0].parameters.length);
assertEquals("name2",elements[0].parameters[0].getName());
- assert(null == elements[0].parameters[0].getValue());
+ assertTrue(null == elements[0].parameters[0].getValue());
assertEquals("name3",elements[0].parameters[1].getName());
assertEquals("value3",elements[0].parameters[1].getValue());
// 2nd element
@@ -129,7 +129,7 @@
assertEquals("value5",elements[1].parameters[0].getValue());
// 3rd element
assertEquals("name6",elements[2].getName());
- assert(null == elements[2].getValue());
+ assertTrue(null == elements[2].getValue());
// 3rd element has 2 parameters
assertEquals(2,elements[2].parameters.length);
assertEquals("name7",elements[2].parameters[0].getName());
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>