Return-Path: Delivered-To: apmail-jakarta-httpclient-commits-archive@www.apache.org Received: (qmail 13052 invoked from network); 2 Jul 2006 12:18:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 2 Jul 2006 12:18:37 -0000 Received: (qmail 43509 invoked by uid 500); 2 Jul 2006 12:18:36 -0000 Mailing-List: contact httpclient-commits-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: httpclient-dev@jakarta.apache.org Delivered-To: mailing list httpclient-commits@jakarta.apache.org Received: (qmail 43497 invoked by uid 99); 2 Jul 2006 12:18:36 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Jul 2006 05:18:36 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Jul 2006 05:18:34 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id EBC2A1A9842; Sun, 2 Jul 2006 05:18:13 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r418582 [2/2] - in /jakarta/httpcomponents/httpcore/trunk/src: java/org/apache/http/ java/org/apache/http/impl/ java/org/apache/http/message/ java/org/apache/http/protocol/ test/org/apache/http/ test/org/apache/http/impl/ test/org/apache/ht... Date: Sun, 02 Jul 2006 12:18:09 -0000 To: httpclient-commits@jakarta.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060702121813.EBC2A1A9842@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Modified: jakarta/httpcomponents/httpcore/trunk/src/test/org/apache/http/TestNameValuePair.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/src/test/org/apache/http/TestNameValuePair.java?rev=418582&r1=418581&r2=418582&view=diff ============================================================================== --- jakarta/httpcomponents/httpcore/trunk/src/test/org/apache/http/TestNameValuePair.java (original) +++ jakarta/httpcomponents/httpcore/trunk/src/test/org/apache/http/TestNameValuePair.java Sun Jul 2 05:18:08 2006 @@ -30,6 +30,7 @@ package org.apache.http; import org.apache.http.io.CharArrayBuffer; +import org.apache.http.message.BasicNameValuePair; import junit.framework.Test; import junit.framework.TestCase; @@ -56,14 +57,14 @@ } public void testConstructor() { - NameValuePair param = new NameValuePair("name", "value"); + NameValuePair param = new BasicNameValuePair("name", "value"); assertEquals("name", param.getName()); assertEquals("value", param.getValue()); } public void testInvalidName() { try { - new NameValuePair(null, null); + new BasicNameValuePair(null, null); fail("IllegalArgumentException should have been thrown"); } catch (IllegalArgumentException ex) { //expected @@ -71,17 +72,17 @@ } public void testHashCode() { - NameValuePair param1 = new NameValuePair("name1", "value1"); - NameValuePair param2 = new NameValuePair("name2", "value2"); - NameValuePair param3 = new NameValuePair("name1", "value1"); + NameValuePair param1 = new BasicNameValuePair("name1", "value1"); + NameValuePair param2 = new BasicNameValuePair("name2", "value2"); + NameValuePair param3 = new BasicNameValuePair("name1", "value1"); assertTrue(param1.hashCode() != param2.hashCode()); assertTrue(param1.hashCode() == param3.hashCode()); } public void testEquals() { - NameValuePair param1 = new NameValuePair("name1", "value1"); - NameValuePair param2 = new NameValuePair("name2", "value2"); - NameValuePair param3 = new NameValuePair("name1", "value1"); + NameValuePair param1 = new BasicNameValuePair("name1", "value1"); + NameValuePair param2 = new BasicNameValuePair("name2", "value2"); + NameValuePair param3 = new BasicNameValuePair("name1", "value1"); assertFalse(param1.equals(param2)); assertFalse(param1.equals(null)); assertFalse(param1.equals("name1 = value1")); @@ -91,50 +92,50 @@ } public void testToString() { - NameValuePair param1 = new NameValuePair("name1", "value1"); + NameValuePair param1 = new BasicNameValuePair("name1", "value1"); assertEquals("name1=value1", param1.toString()); - NameValuePair param2 = new NameValuePair("name1", null); + NameValuePair param2 = new BasicNameValuePair("name1", null); assertEquals("name1", param2.toString()); } public void testParse() { String s = "test"; - NameValuePair param = NameValuePair.parse(s); + NameValuePair param = BasicNameValuePair.parse(s); assertEquals("test", param.getName()); assertEquals(null, param.getValue()); s = "test=stuff"; - param = NameValuePair.parse(s); + param = BasicNameValuePair.parse(s); assertEquals("test", param.getName()); assertEquals("stuff", param.getValue()); s = " test = stuff "; - param = NameValuePair.parse(s); + param = BasicNameValuePair.parse(s); assertEquals("test", param.getName()); assertEquals("stuff", param.getValue()); s = "test = \"stuff\""; - param = NameValuePair.parse(s); + param = BasicNameValuePair.parse(s); assertEquals("test", param.getName()); assertEquals("stuff", param.getValue()); s = "test = \" stuff\\\"\""; - param = NameValuePair.parse(s); + param = BasicNameValuePair.parse(s); assertEquals("test", param.getName()); assertEquals(" stuff\\\"", param.getValue()); s = " test"; - param = NameValuePair.parse(s); + param = BasicNameValuePair.parse(s); assertEquals("test", param.getName()); assertEquals(null, param.getValue()); s = " "; - param = NameValuePair.parse(s); + param = BasicNameValuePair.parse(s); assertEquals("", param.getName()); assertEquals(null, param.getValue()); s = " = stuff "; - param = NameValuePair.parse(s); + param = BasicNameValuePair.parse(s); assertEquals("", param.getName()); assertEquals("stuff", param.getValue()); } @@ -142,7 +143,7 @@ public void testParseAll() { String s = "test; test1 = stuff ; test2 = \"stuff; stuff\"; test3=\"stuff"; - NameValuePair[] params = NameValuePair.parseAll(s); + NameValuePair[] params = BasicNameValuePair.parseAll(s); assertEquals("test", params[0].getName()); assertEquals(null, params[0].getValue()); assertEquals("test1", params[1].getName()); @@ -153,14 +154,14 @@ assertEquals("\"stuff", params[3].getValue()); s = " "; - params = NameValuePair.parseAll(s); + params = BasicNameValuePair.parseAll(s); assertEquals(0, params.length); } public void testParseEscaped() { String s = "test1 = \"\\\"stuff\\\"\"; test2= \"\\\\\"; test3 = \"stuff; stuff\""; - NameValuePair[] params = NameValuePair.parseAll(s); + NameValuePair[] params = BasicNameValuePair.parseAll(s); assertEquals(3, params.length); assertEquals("test1", params[0].getName()); assertEquals("\\\"stuff\\\"", params[0].getValue()); @@ -174,61 +175,61 @@ CharArrayBuffer buffer = new CharArrayBuffer(32); buffer.append("name = value"); try { - NameValuePair.parseAll(null, 0, 0); + BasicNameValuePair.parseAll(null, 0, 0); fail("IllegalArgumentException should have been thrown"); } catch (IllegalArgumentException ex) { // expected } try { - NameValuePair.parseAll(null); + BasicNameValuePair.parseAll(null); fail("IllegalArgumentException should have been thrown"); } catch (IllegalArgumentException ex) { // expected } try { - NameValuePair.parseAll(buffer, -1, 0); + BasicNameValuePair.parseAll(buffer, -1, 0); fail("IllegalArgumentException should have been thrown"); } catch (IndexOutOfBoundsException ex) { // expected } try { - NameValuePair.parseAll(buffer, 0, 1000); + BasicNameValuePair.parseAll(buffer, 0, 1000); fail("IllegalArgumentException should have been thrown"); } catch (IndexOutOfBoundsException ex) { // expected } try { - NameValuePair.parseAll(buffer, 2, 1); + BasicNameValuePair.parseAll(buffer, 2, 1); fail("IllegalArgumentException should have been thrown"); } catch (IndexOutOfBoundsException ex) { // expected } try { - NameValuePair.parse(null, 0, 0); + BasicNameValuePair.parse(null, 0, 0); fail("IllegalArgumentException should have been thrown"); } catch (IllegalArgumentException ex) { // expected } try { - NameValuePair.parse(null); + BasicNameValuePair.parse(null); fail("IllegalArgumentException should have been thrown"); } catch (IllegalArgumentException ex) { // expected } try { - NameValuePair.parse(buffer, -1, 0); + BasicNameValuePair.parse(buffer, -1, 0); fail("IllegalArgumentException should have been thrown"); } catch (IndexOutOfBoundsException ex) { // expected } try { - NameValuePair.parse(buffer, 0, 1000); + BasicNameValuePair.parse(buffer, 0, 1000); fail("IllegalArgumentException should have been thrown"); } catch (IndexOutOfBoundsException ex) { // expected } try { - NameValuePair.parse(buffer, 2, 1); + BasicNameValuePair.parse(buffer, 2, 1); fail("IllegalArgumentException should have been thrown"); } catch (IndexOutOfBoundsException ex) { // expected @@ -236,63 +237,63 @@ } public void testBasicFormatting() throws Exception { - NameValuePair param1 = new NameValuePair("param", "regular_stuff"); - NameValuePair param2 = new NameValuePair("param", "this\\that"); - NameValuePair param3 = new NameValuePair("param", "this,that"); - NameValuePair param4 = new NameValuePair("param", "quote marks (\") must be escaped"); - NameValuePair param5 = new NameValuePair("param", "back slash (\\) must be escaped too"); - NameValuePair param6 = new NameValuePair("param", "values with\tblanks must always be quoted"); - NameValuePair param7 = new NameValuePair("param", null); + NameValuePair param1 = new BasicNameValuePair("param", "regular_stuff"); + NameValuePair param2 = new BasicNameValuePair("param", "this\\that"); + NameValuePair param3 = new BasicNameValuePair("param", "this,that"); + NameValuePair param4 = new BasicNameValuePair("param", "quote marks (\") must be escaped"); + NameValuePair param5 = new BasicNameValuePair("param", "back slash (\\) must be escaped too"); + NameValuePair param6 = new BasicNameValuePair("param", "values with\tblanks must always be quoted"); + NameValuePair param7 = new BasicNameValuePair("param", null); - assertEquals("param=regular_stuff", NameValuePair.format(param1, false)); - assertEquals("param=\"this\\\\that\"", NameValuePair.format(param2, false)); - assertEquals("param=\"this,that\"", NameValuePair.format(param3, false)); - assertEquals("param=\"quote marks (\\\") must be escaped\"", NameValuePair.format(param4, false)); - assertEquals("param=\"back slash (\\\\) must be escaped too\"", NameValuePair.format(param5, false)); - assertEquals("param=\"values with\tblanks must always be quoted\"", NameValuePair.format(param6, false)); - assertEquals("param", NameValuePair.format(param7, false)); - - assertEquals("param=\"regular_stuff\"", NameValuePair.format(param1, true)); - assertEquals("param=\"this\\\\that\"", NameValuePair.format(param2, true)); - assertEquals("param=\"this,that\"", NameValuePair.format(param3, true)); - assertEquals("param=\"quote marks (\\\") must be escaped\"", NameValuePair.format(param4, true)); - assertEquals("param=\"back slash (\\\\) must be escaped too\"", NameValuePair.format(param5, true)); - assertEquals("param=\"values with\tblanks must always be quoted\"", NameValuePair.format(param6, true)); - assertEquals("param", NameValuePair.format(param7, false)); + assertEquals("param=regular_stuff", BasicNameValuePair.format(param1, false)); + assertEquals("param=\"this\\\\that\"", BasicNameValuePair.format(param2, false)); + assertEquals("param=\"this,that\"", BasicNameValuePair.format(param3, false)); + assertEquals("param=\"quote marks (\\\") must be escaped\"", BasicNameValuePair.format(param4, false)); + assertEquals("param=\"back slash (\\\\) must be escaped too\"", BasicNameValuePair.format(param5, false)); + assertEquals("param=\"values with\tblanks must always be quoted\"", BasicNameValuePair.format(param6, false)); + assertEquals("param", BasicNameValuePair.format(param7, false)); + + assertEquals("param=\"regular_stuff\"", BasicNameValuePair.format(param1, true)); + assertEquals("param=\"this\\\\that\"", BasicNameValuePair.format(param2, true)); + assertEquals("param=\"this,that\"", BasicNameValuePair.format(param3, true)); + assertEquals("param=\"quote marks (\\\") must be escaped\"", BasicNameValuePair.format(param4, true)); + assertEquals("param=\"back slash (\\\\) must be escaped too\"", BasicNameValuePair.format(param5, true)); + assertEquals("param=\"values with\tblanks must always be quoted\"", BasicNameValuePair.format(param6, true)); + assertEquals("param", BasicNameValuePair.format(param7, false)); } public void testArrayFormatting() throws Exception { - NameValuePair param1 = new NameValuePair("param", "regular_stuff"); - NameValuePair param2 = new NameValuePair("param", "this\\that"); - NameValuePair param3 = new NameValuePair("param", "this,that"); + NameValuePair param1 = new BasicNameValuePair("param", "regular_stuff"); + NameValuePair param2 = new BasicNameValuePair("param", "this\\that"); + NameValuePair param3 = new BasicNameValuePair("param", "this,that"); NameValuePair[] params = new NameValuePair[] {param1, param2, param3}; assertEquals("param=regular_stuff; param=\"this\\\\that\"; param=\"this,that\"", - NameValuePair.formatAll(params, false)); + BasicNameValuePair.formatAll(params, false)); assertEquals("param=\"regular_stuff\"; param=\"this\\\\that\"; param=\"this,that\"", - NameValuePair.formatAll(params, true)); + BasicNameValuePair.formatAll(params, true)); } public void testFormatInvalidInput() throws Exception { try { - NameValuePair.format(null, new NameValuePair("param", "value"), true); + BasicNameValuePair.format(null, new BasicNameValuePair("param", "value"), true); fail("IllegalArgumentException should habe been thrown"); } catch (IllegalArgumentException ex) { // expected } try { - NameValuePair.format(new CharArrayBuffer(10), (NameValuePair) null, true); + BasicNameValuePair.format(new CharArrayBuffer(10), (NameValuePair) null, true); fail("IllegalArgumentException should habe been thrown"); } catch (IllegalArgumentException ex) { // expected } try { - NameValuePair.formatAll(null, new NameValuePair[] {new NameValuePair("param", "value")}, true); + BasicNameValuePair.formatAll(null, new NameValuePair[] {new BasicNameValuePair("param", "value")}, true); fail("IllegalArgumentException should habe been thrown"); } catch (IllegalArgumentException ex) { // expected } try { - NameValuePair.formatAll(new CharArrayBuffer(10), (NameValuePair[]) null, true); + BasicNameValuePair.formatAll(new CharArrayBuffer(10), (NameValuePair[]) null, true); fail("IllegalArgumentException should habe been thrown"); } catch (IllegalArgumentException ex) { // expected Modified: jakarta/httpcomponents/httpcore/trunk/src/test/org/apache/http/TestRequestLine.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/src/test/org/apache/http/TestRequestLine.java?rev=418582&r1=418581&r2=418582&view=diff ============================================================================== --- jakarta/httpcomponents/httpcore/trunk/src/test/org/apache/http/TestRequestLine.java (original) +++ jakarta/httpcomponents/httpcore/trunk/src/test/org/apache/http/TestRequestLine.java Sun Jul 2 05:18:08 2006 @@ -29,6 +29,7 @@ package org.apache.http; import org.apache.http.io.CharArrayBuffer; +import org.apache.http.message.BasicRequestLine; import junit.framework.*; @@ -59,7 +60,7 @@ } public void testConstructor() { - RequestLine requestline = new RequestLine("GET", "/stuff", HttpVersion.HTTP_1_1); + RequestLine requestline = new BasicRequestLine("GET", "/stuff", HttpVersion.HTTP_1_1); assertEquals("GET", requestline.getMethod()); assertEquals("/stuff", requestline.getUri()); assertEquals(HttpVersion.HTTP_1_1, requestline.getHttpVersion()); @@ -67,36 +68,36 @@ public void testConstructorInvalidInput() { try { - new RequestLine(null, "/stuff", HttpVersion.HTTP_1_1); + new BasicRequestLine(null, "/stuff", HttpVersion.HTTP_1_1); fail("IllegalArgumentException should have been thrown"); } catch (IllegalArgumentException e) { /* expected */ } try { - new RequestLine("GEt", null, HttpVersion.HTTP_1_1); + new BasicRequestLine("GEt", null, HttpVersion.HTTP_1_1); fail("IllegalArgumentException should have been thrown"); } catch (IllegalArgumentException e) { /* expected */ } try { - new RequestLine("GET", "/stuff", (HttpVersion)null); + new BasicRequestLine("GET", "/stuff", (HttpVersion)null); fail("IllegalArgumentException should have been thrown"); } catch (IllegalArgumentException e) { /* expected */ } } public void testParseSuccess() throws Exception { //typical request line - RequestLine requestline = RequestLine.parse("GET /stuff HTTP/1.1"); + RequestLine requestline = BasicRequestLine.parse("GET /stuff HTTP/1.1"); assertEquals("GET /stuff HTTP/1.1", requestline.toString()); assertEquals("GET", requestline.getMethod()); assertEquals("/stuff", requestline.getUri()); assertEquals(HttpVersion.HTTP_1_1, requestline.getHttpVersion()); //Lots of blanks - requestline = RequestLine.parse(" GET /stuff HTTP/1.1 "); + requestline = BasicRequestLine.parse(" GET /stuff HTTP/1.1 "); assertEquals("GET /stuff HTTP/1.1", requestline.toString()); assertEquals("GET", requestline.getMethod()); assertEquals("/stuff", requestline.getUri()); assertEquals(HttpVersion.HTTP_1_1, requestline.getHttpVersion()); //this is not strictly valid, but is lienent - requestline = RequestLine.parse("\rGET /stuff HTTP/1.1"); + requestline = BasicRequestLine.parse("\rGET /stuff HTTP/1.1"); assertEquals("GET", requestline.getMethod()); assertEquals("/stuff", requestline.getUri()); assertEquals(HttpVersion.HTTP_1_1, requestline.getHttpVersion()); @@ -104,22 +105,22 @@ public void testParseFailure() throws Exception { try { - RequestLine.parse(" "); + BasicRequestLine.parse(" "); fail(); } catch (HttpException e) { /* expected */ } try { - RequestLine.parse(" GET"); + BasicRequestLine.parse(" GET"); fail(); } catch (HttpException e) { /* expected */ } try { - RequestLine.parse("GET /stuff"); + BasicRequestLine.parse("GET /stuff"); fail(); } catch (HttpException e) { /* expected */ } try { - RequestLine.parse("GET/stuff HTTP/1.1"); + BasicRequestLine.parse("GET/stuff HTTP/1.1"); fail(); } catch (HttpException e) { /* expected */ } } @@ -128,31 +129,31 @@ CharArrayBuffer buffer = new CharArrayBuffer(32); buffer.append("GET /stuff HTTP/1.1"); try { - RequestLine.parse(null, 0, 0); + BasicRequestLine.parse(null, 0, 0); fail("IllegalArgumentException should have been thrown"); } catch (IllegalArgumentException ex) { // expected } try { - RequestLine.parse(null); + BasicRequestLine.parse(null); fail("IllegalArgumentException should have been thrown"); } catch (IllegalArgumentException ex) { // expected } try { - RequestLine.parse(buffer, -1, 0); + BasicRequestLine.parse(buffer, -1, 0); fail("IllegalArgumentException should have been thrown"); } catch (IndexOutOfBoundsException ex) { // expected } try { - RequestLine.parse(buffer, 0, 1000); + BasicRequestLine.parse(buffer, 0, 1000); fail("IllegalArgumentException should have been thrown"); } catch (IndexOutOfBoundsException ex) { // expected } try { - RequestLine.parse(buffer, 2, 1); + BasicRequestLine.parse(buffer, 2, 1); fail("IllegalArgumentException should have been thrown"); } catch (IndexOutOfBoundsException ex) { // expected @@ -160,20 +161,20 @@ } public void testFormatting() throws Exception { - RequestLine requestline = new RequestLine("GET", "/stuff", HttpVersion.HTTP_1_1); - String s = RequestLine.format(requestline); + RequestLine requestline = new BasicRequestLine("GET", "/stuff", HttpVersion.HTTP_1_1); + String s = BasicRequestLine.format(requestline); assertEquals("GET /stuff HTTP/1.1", s); } public void testFormattingInvalidInput() throws Exception { try { - RequestLine.format(null, new RequestLine("GET", "/stuff", HttpVersion.HTTP_1_1)); + BasicRequestLine.format(null, new BasicRequestLine("GET", "/stuff", HttpVersion.HTTP_1_1)); fail("IllegalArgumentException should habe been thrown"); } catch (IllegalArgumentException ex) { // expected } try { - RequestLine.format(new CharArrayBuffer(10), (RequestLine) null); + BasicRequestLine.format(new CharArrayBuffer(10), (RequestLine) null); fail("IllegalArgumentException should habe been thrown"); } catch (IllegalArgumentException ex) { // expected Modified: jakarta/httpcomponents/httpcore/trunk/src/test/org/apache/http/TestStatusLine.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/src/test/org/apache/http/TestStatusLine.java?rev=418582&r1=418581&r2=418582&view=diff ============================================================================== --- jakarta/httpcomponents/httpcore/trunk/src/test/org/apache/http/TestStatusLine.java (original) +++ jakarta/httpcomponents/httpcore/trunk/src/test/org/apache/http/TestStatusLine.java Sun Jul 2 05:18:08 2006 @@ -29,6 +29,7 @@ package org.apache.http; import org.apache.http.io.CharArrayBuffer; +import org.apache.http.message.BasicStatusLine; import junit.framework.*; @@ -64,12 +65,12 @@ // ----------------------------------------------------------- Test Methods public void testConstructor() { - StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK"); + StatusLine statusline = new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK"); assertEquals(HttpVersion.HTTP_1_1, statusline.getHttpVersion()); assertEquals(HttpStatus.SC_OK, statusline.getStatusCode()); assertEquals("OK", statusline.getReasonPhrase()); - statusline = new StatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK); + statusline = new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK); assertEquals(HttpVersion.HTTP_1_1, statusline.getHttpVersion()); assertEquals(HttpStatus.SC_OK, statusline.getStatusCode()); assertEquals("OK", statusline.getReasonPhrase()); @@ -77,59 +78,59 @@ public void testConstructorInvalidInput() { try { - new StatusLine(null, HttpStatus.SC_OK, "OK"); + new BasicStatusLine(null, HttpStatus.SC_OK, "OK"); fail("IllegalArgumentException should have been thrown"); } catch (IllegalArgumentException e) { /* expected */ } try { - new StatusLine(HttpVersion.HTTP_1_1, -1, "OK"); + new BasicStatusLine(HttpVersion.HTTP_1_1, -1, "OK"); fail("IllegalArgumentException should have been thrown"); } catch (IllegalArgumentException e) { /* expected */ } } public void testParseSuccess() throws Exception { //typical status line - StatusLine statusLine = StatusLine.parse("HTTP/1.1 200 OK"); + StatusLine statusLine = BasicStatusLine.parse("HTTP/1.1 200 OK"); assertEquals("HTTP/1.1 200 OK", statusLine.toString()); assertEquals(HttpVersion.HTTP_1_1, statusLine.getHttpVersion()); assertEquals(200, statusLine.getStatusCode()); assertEquals("OK", statusLine.getReasonPhrase()); //status line with multi word reason phrase - statusLine = StatusLine.parse("HTTP/1.1 404 Not Found"); + statusLine = BasicStatusLine.parse("HTTP/1.1 404 Not Found"); assertEquals(404, statusLine.getStatusCode()); assertEquals("Not Found", statusLine.getReasonPhrase()); //reason phrase can be anyting - statusLine = StatusLine.parse("HTTP/1.1 404 Non Trouve"); + statusLine = BasicStatusLine.parse("HTTP/1.1 404 Non Trouve"); assertEquals("Non Trouve", statusLine.getReasonPhrase()); //its ok to end with a \n\r - statusLine = StatusLine.parse("HTTP/1.1 404 Not Found\r\n"); + statusLine = BasicStatusLine.parse("HTTP/1.1 404 Not Found\r\n"); assertEquals("Not Found", statusLine.getReasonPhrase()); //this is valid according to the Status-Line BNF - statusLine = StatusLine.parse("HTTP/1.1 200 "); + statusLine = BasicStatusLine.parse("HTTP/1.1 200 "); assertEquals(200, statusLine.getStatusCode()); assertEquals("", statusLine.getReasonPhrase()); //this is not strictly valid, but is lienent - statusLine = StatusLine.parse("HTTP/1.1 200"); + statusLine = BasicStatusLine.parse("HTTP/1.1 200"); assertEquals(200, statusLine.getStatusCode()); assertEquals("", statusLine.getReasonPhrase()); //this is not strictly valid, but is lienent - statusLine = StatusLine.parse("HTTP/1.1 200 OK"); + statusLine = BasicStatusLine.parse("HTTP/1.1 200 OK"); assertEquals(200, statusLine.getStatusCode()); assertEquals("OK", statusLine.getReasonPhrase()); //this is not strictly valid, but is lienent - statusLine = StatusLine.parse("\rHTTP/1.1 200 OK"); + statusLine = BasicStatusLine.parse("\rHTTP/1.1 200 OK"); assertEquals(200, statusLine.getStatusCode()); assertEquals("OK", statusLine.getReasonPhrase()); assertEquals(HttpVersion.HTTP_1_1, statusLine.getHttpVersion()); //this is not strictly valid, but is lienent - statusLine = StatusLine.parse(" HTTP/1.1 200 OK"); + statusLine = BasicStatusLine.parse(" HTTP/1.1 200 OK"); assertEquals(200, statusLine.getStatusCode()); assertEquals("OK", statusLine.getReasonPhrase()); assertEquals(HttpVersion.HTTP_1_1, statusLine.getHttpVersion()); @@ -137,21 +138,21 @@ public void testParseFailure() throws Exception { try { - StatusLine.parse("xxx 200 OK"); + BasicStatusLine.parse("xxx 200 OK"); fail(); } catch (HttpException e) { /* expected */ } try { - StatusLine.parse("HTTP/1.1 xxx OK"); + BasicStatusLine.parse("HTTP/1.1 xxx OK"); fail(); } catch (HttpException e) { /* expected */ } try { - StatusLine.parse("HTTP/1.1 "); + BasicStatusLine.parse("HTTP/1.1 "); fail(); } catch (HttpException e) { /* expected */ } try { - StatusLine.parse("HTTP/1.1"); + BasicStatusLine.parse("HTTP/1.1"); fail(); } catch (HttpException e) { /* expected */ } } @@ -160,31 +161,31 @@ CharArrayBuffer buffer = new CharArrayBuffer(32); buffer.append("HTTP/1.1 200 OK"); try { - StatusLine.parse(null, 0, 0); + BasicStatusLine.parse(null, 0, 0); fail("IllegalArgumentException should have been thrown"); } catch (IllegalArgumentException ex) { // expected } try { - StatusLine.parse(null); + BasicStatusLine.parse(null); fail("IllegalArgumentException should have been thrown"); } catch (IllegalArgumentException ex) { // expected } try { - StatusLine.parse(buffer, -1, 0); + BasicStatusLine.parse(buffer, -1, 0); fail("IllegalArgumentException should have been thrown"); } catch (IndexOutOfBoundsException ex) { // expected } try { - StatusLine.parse(buffer, 0, 1000); + BasicStatusLine.parse(buffer, 0, 1000); fail("IllegalArgumentException should have been thrown"); } catch (IndexOutOfBoundsException ex) { // expected } try { - StatusLine.parse(buffer, 2, 1); + BasicStatusLine.parse(buffer, 2, 1); fail("IllegalArgumentException should have been thrown"); } catch (IndexOutOfBoundsException ex) { // expected @@ -192,30 +193,30 @@ } public void testToString() throws Exception { - StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK"); + StatusLine statusline = new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK"); assertEquals("HTTP/1.1 200 OK", statusline.toString()); - statusline = new StatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, null); + statusline = new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, null); assertEquals("HTTP/1.1 200", statusline.toString()); } public void testFormatting() throws Exception { - StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK"); - String s = StatusLine.format(statusline); + StatusLine statusline = new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK"); + String s = BasicStatusLine.format(statusline); assertEquals("HTTP/1.1 200 OK", s); - statusline = new StatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, null); - s = StatusLine.format(statusline); + statusline = new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, null); + s = BasicStatusLine.format(statusline); assertEquals("HTTP/1.1 200", s); } public void testFormattingInvalidInput() throws Exception { try { - StatusLine.format(null, new StatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK")); + BasicStatusLine.format(null, new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK")); fail("IllegalArgumentException should habe been thrown"); } catch (IllegalArgumentException ex) { // expected } try { - StatusLine.format(new CharArrayBuffer(10), (StatusLine) null); + BasicStatusLine.format(new CharArrayBuffer(10), (StatusLine) null); fail("IllegalArgumentException should habe been thrown"); } catch (IllegalArgumentException ex) { // expected Modified: jakarta/httpcomponents/httpcore/trunk/src/test/org/apache/http/impl/TestBasicRequest.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/src/test/org/apache/http/impl/TestBasicRequest.java?rev=418582&r1=418581&r2=418582&view=diff ============================================================================== --- jakarta/httpcomponents/httpcore/trunk/src/test/org/apache/http/impl/TestBasicRequest.java (original) +++ jakarta/httpcomponents/httpcore/trunk/src/test/org/apache/http/impl/TestBasicRequest.java Sun Jul 2 05:18:08 2006 @@ -34,7 +34,6 @@ import org.apache.http.HttpRequest; import org.apache.http.HttpVersion; -import org.apache.http.RequestLine; import org.apache.http.message.BasicHttpRequest; import org.apache.http.params.HttpProtocolParams; @@ -58,7 +57,7 @@ public void testConstructor() throws Exception { new BasicHttpRequest("GET", "/stuff"); - new BasicHttpRequest(new RequestLine("GET", "/stuff", HttpVersion.HTTP_1_1)); + new BasicHttpRequest("GET", "/stuff", HttpVersion.HTTP_1_1); try { new BasicHttpRequest(null, "/stuff"); fail("IllegalArgumentException should have been thrown"); @@ -83,8 +82,7 @@ } public void testRequestLine2() throws Exception { - HttpRequest request = new BasicHttpRequest( - new RequestLine("GET", "/stuff", HttpVersion.HTTP_1_0)); + HttpRequest request = new BasicHttpRequest("GET", "/stuff", HttpVersion.HTTP_1_0); assertEquals("GET", request.getRequestLine().getMethod()); assertEquals("/stuff", request.getRequestLine().getUri()); assertEquals(HttpVersion.HTTP_1_0, request.getRequestLine().getHttpVersion()); Modified: jakarta/httpcomponents/httpcore/trunk/src/test/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/src/test/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java?rev=418582&r1=418581&r2=418582&view=diff ============================================================================== --- jakarta/httpcomponents/httpcore/trunk/src/test/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java (original) +++ jakarta/httpcomponents/httpcore/trunk/src/test/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java Sun Jul 2 05:18:08 2006 @@ -34,6 +34,7 @@ import org.apache.http.StatusLine; import org.apache.http.entity.BasicHttpEntity; import org.apache.http.message.BasicHttpResponse; +import org.apache.http.message.BasicStatusLine; import junit.framework.Test; import junit.framework.TestCase; @@ -71,7 +72,7 @@ BasicHttpEntity entity = new BasicHttpEntity(); entity.setChunked(false); entity.setContentLength(-1); - StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_0, 200, "OK"); + StatusLine statusline = new BasicStatusLine(HttpVersion.HTTP_1_0, 200, "OK"); HttpResponse response = new BasicHttpResponse(statusline); response.setEntity(entity); @@ -83,7 +84,7 @@ BasicHttpEntity entity = new BasicHttpEntity(); entity.setChunked(false); entity.setContentLength(-1); - StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_1, 200, "OK"); + StatusLine statusline = new BasicStatusLine(HttpVersion.HTTP_1_1, 200, "OK"); HttpResponse response = new BasicHttpResponse(statusline); response.setEntity(entity); @@ -95,7 +96,7 @@ BasicHttpEntity entity = new BasicHttpEntity(); entity.setChunked(true); entity.setContentLength(-1); - StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_1, 200, "OK"); + StatusLine statusline = new BasicStatusLine(HttpVersion.HTTP_1_1, 200, "OK"); HttpResponse response = new BasicHttpResponse(statusline); response.setEntity(entity); @@ -107,7 +108,7 @@ BasicHttpEntity entity = new BasicHttpEntity(); entity.setChunked(false); entity.setContentLength(-1); - StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_0, 200, "OK"); + StatusLine statusline = new BasicStatusLine(HttpVersion.HTTP_1_0, 200, "OK"); HttpResponse response = new BasicHttpResponse(statusline); response.addHeader("Connection", "keep-alive"); response.setEntity(entity); @@ -121,7 +122,7 @@ entity.setChunked(true); entity.setContentLength(-1); // Use HTTP 1.1 - StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_1, 200, "OK"); + StatusLine statusline = new BasicStatusLine(HttpVersion.HTTP_1_1, 200, "OK"); HttpResponse response = new BasicHttpResponse(statusline); response.addHeader("Connection", "close"); response.setEntity(entity); @@ -135,7 +136,7 @@ entity.setChunked(false); entity.setContentLength(10); // Use HTTP 1.0 - StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_0, 200, "OK"); + StatusLine statusline = new BasicStatusLine(HttpVersion.HTTP_1_0, 200, "OK"); HttpResponse response = new BasicHttpResponse(statusline); response.addHeader("Connection", "keep-alive"); response.setEntity(entity); @@ -145,7 +146,7 @@ } public void testHTTP10Default() throws Exception { - StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_0, 200, "OK"); + StatusLine statusline = new BasicStatusLine(HttpVersion.HTTP_1_0, 200, "OK"); HttpResponse response = new BasicHttpResponse(statusline); ConnectionReuseStrategy s = new DefaultConnectionReuseStrategy(); @@ -153,7 +154,7 @@ } public void testHTTP11Default() throws Exception { - StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_1, 200, "OK"); + StatusLine statusline = new BasicStatusLine(HttpVersion.HTTP_1_1, 200, "OK"); HttpResponse response = new BasicHttpResponse(statusline); ConnectionReuseStrategy s = new DefaultConnectionReuseStrategy(); @@ -161,7 +162,7 @@ } public void testFutureHTTP() throws Exception { - StatusLine statusline = new StatusLine(new HttpVersion(3, 45), 200, "OK"); + StatusLine statusline = new BasicStatusLine(new HttpVersion(3, 45), 200, "OK"); HttpResponse response = new BasicHttpResponse(statusline); ConnectionReuseStrategy s = new DefaultConnectionReuseStrategy(); @@ -170,7 +171,7 @@ public void testBrokenConnectionDirective1() throws Exception { // Use HTTP 1.0 - StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_0, 200, "OK"); + StatusLine statusline = new BasicStatusLine(HttpVersion.HTTP_1_0, 200, "OK"); HttpResponse response = new BasicHttpResponse(statusline); response.addHeader("Connection", "keep--alive"); @@ -180,7 +181,7 @@ public void testBrokenConnectionDirective2() throws Exception { // Use HTTP 1.0 - StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_0, 200, "OK"); + StatusLine statusline = new BasicStatusLine(HttpVersion.HTTP_1_0, 200, "OK"); HttpResponse response = new BasicHttpResponse(statusline); response.addHeader("Connection", null); Modified: jakarta/httpcomponents/httpcore/trunk/src/test/org/apache/http/protocol/TestStandardInterceptors.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/src/test/org/apache/http/protocol/TestStandardInterceptors.java?rev=418582&r1=418581&r2=418582&view=diff ============================================================================== --- jakarta/httpcomponents/httpcore/trunk/src/test/org/apache/http/protocol/TestStandardInterceptors.java (original) +++ jakarta/httpcomponents/httpcore/trunk/src/test/org/apache/http/protocol/TestStandardInterceptors.java Sun Jul 2 05:18:08 2006 @@ -29,14 +29,16 @@ package org.apache.http.protocol; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + import org.apache.http.Header; import org.apache.http.HttpHost; import org.apache.http.HttpStatus; import org.apache.http.HttpVersion; import org.apache.http.ProtocolException; -import org.apache.http.RequestLine; import org.apache.http.Scheme; -import org.apache.http.StatusLine; import org.apache.http.entity.BasicHttpEntity; import org.apache.http.entity.StringEntity; import org.apache.http.impl.io.PlainSocketFactory; @@ -46,10 +48,6 @@ import org.apache.http.message.BasicHttpResponse; import org.apache.http.params.HttpProtocolParams; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - /** * @author Oleg Kalnichevski */ @@ -185,7 +183,7 @@ public void testRequestContentEntityChunkedHTTP10() throws Exception { HttpContext context = new HttpExecutionContext(null); BasicHttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest( - new RequestLine("POST", "/", HttpVersion.HTTP_1_0)); + "POST", "/", HttpVersion.HTTP_1_0); String s = "whatever"; StringEntity entity = new StringEntity(s, "US-ASCII"); entity.setChunked(true); @@ -233,7 +231,7 @@ public void testRequestContentEntityUnknownLengthHTTP10() throws Exception { HttpContext context = new HttpExecutionContext(null); BasicHttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest( - new RequestLine("POST", "/", HttpVersion.HTTP_1_0)); + "POST", "/", HttpVersion.HTTP_1_0); BasicHttpEntity entity = new BasicHttpEntity(); entity.setContentLength(-1); entity.setChunked(false); @@ -296,7 +294,7 @@ public void testRequestExpectContinueHTTP10() throws Exception { HttpContext context = new HttpExecutionContext(null); BasicHttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest( - new RequestLine("POST", "/", HttpVersion.HTTP_1_0)); + "POST", "/", HttpVersion.HTTP_1_0); String s = "whatever"; StringEntity entity = new StringEntity(s, "US-ASCII"); request.setEntity(entity); @@ -368,7 +366,7 @@ public void testRequestTargetHostMissingHostHTTP10() throws Exception { HttpContext context = new HttpExecutionContext(null); BasicHttpRequest request = new BasicHttpRequest( - new RequestLine("GET", "/", HttpVersion.HTTP_1_0)); + "GET", "/", HttpVersion.HTTP_1_0); RequestTargetHost interceptor = new RequestTargetHost(); interceptor.process(request, context); Header header = request.getFirstHeader(HTTP.TARGET_HOST); @@ -513,7 +511,7 @@ context.setAttribute(HttpExecutionContext.HTTP_REQUEST, request); BasicHttpResponse response = new BasicHttpResponse( - new StatusLine(HttpVersion.HTTP_1_0, HttpStatus.SC_OK)); + HttpVersion.HTTP_1_0, HttpStatus.SC_OK); BasicHttpEntity entity = new BasicHttpEntity(); response.setEntity(entity); ResponseConnControl interceptor = new ResponseConnControl(); @@ -573,7 +571,7 @@ for (int i = 0; i < statusCodes.length; i++) { BasicHttpResponse response = new BasicHttpResponse( - new StatusLine(HttpVersion.HTTP_1_1, statusCodes[i])); + HttpVersion.HTTP_1_1, statusCodes[i]); interceptor.process(response, context); Header header = response.getFirstHeader(HTTP.CONN_DIRECTIVE); assertNotNull(header); @@ -683,8 +681,7 @@ public void testResponseContentEntityChunkedHTTP10() throws Exception { HttpContext context = new HttpExecutionContext(null); - BasicHttpResponse response = new BasicHttpResponse( - new StatusLine(HttpVersion.HTTP_1_0, HttpStatus.SC_OK)); + BasicHttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_0, HttpStatus.SC_OK); BasicHttpEntity entity = new BasicHttpEntity(); entity.setChunked(true); response.setEntity(entity);