You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ro...@apache.org on 2007/08/25 17:05:16 UTC
svn commit: r569686 - in
/jakarta/httpcomponents/httpcore/trunk/module-main/src:
main/java/org/apache/http/message/ test/java/org/apache/http/message/
Author: rolandw
Date: Sat Aug 25 08:05:15 2007
New Revision: 569686
URL: http://svn.apache.org/viewvc?rev=569686&view=rev
Log:
removed BasicHttpVersionFormat, adjusted test cases
Removed:
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHttpVersionFormat.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestHttpVersion.java
Modified:
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicRequestLine.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestAllMessage.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestBasicLineFormatter.java
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicRequestLine.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicRequestLine.java?rev=569686&r1=569685&r2=569686&view=diff
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicRequestLine.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicRequestLine.java Sat Aug 25 08:05:15 2007
@@ -90,12 +90,8 @@
}
public String toString() {
- CharArrayBuffer buffer = new CharArrayBuffer(64);
- buffer.append(this.method);
- buffer.append(' ');
- buffer.append(this.uri);
- buffer.append(' ');
- buffer.append(this.httpversion);
- return buffer.toString();
+ // no need for non-default formatting in toString()
+ return BasicLineFormatter.DEFAULT
+ .formatRequestLine(null, this).toString();
}
}
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestAllMessage.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestAllMessage.java?rev=569686&r1=569685&r2=569686&view=diff
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestAllMessage.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestAllMessage.java Sat Aug 25 08:05:15 2007
@@ -46,7 +46,6 @@
suite.addTest(TestBasicHeaderValueParser.suite());
suite.addTest(TestStatusLine.suite());
suite.addTest(TestRequestLine.suite());
- suite.addTest(TestHttpVersion.suite());
suite.addTest(TestBasicLineParser.suite());
suite.addTest(TestBasicLineFormatter.suite());
suite.addTest(TestAbstractMessage.suite());
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestBasicLineFormatter.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestBasicLineFormatter.java?rev=569686&r1=569685&r2=569686&view=diff
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestBasicLineFormatter.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestBasicLineFormatter.java Sat Aug 25 08:05:15 2007
@@ -66,6 +66,31 @@
}
+
+ public void testHttpVersionFormatting() throws Exception {
+ String s = BasicLineFormatter.formatProtocolVersion
+ (HttpVersion.HTTP_1_1, null);
+ assertEquals("HTTP/1.1", s);
+ }
+
+ public void testHttpVersionFormattingInvalidInput() throws Exception {
+ try {
+ BasicLineFormatter.formatProtocolVersion
+ (null, BasicLineFormatter.DEFAULT);
+ fail("IllegalArgumentException should habe been thrown");
+ } catch (IllegalArgumentException ex) {
+ // expected
+ }
+ try {
+ BasicLineFormatter.DEFAULT.appendProtocolVersion
+ (new CharArrayBuffer(10), (HttpVersion) null);
+ fail("IllegalArgumentException should habe been thrown");
+ } catch (IllegalArgumentException ex) {
+ // expected
+ }
+ }
+
+
public void testRLFormatting() throws Exception {
RequestLine requestline = new BasicRequestLine("GET", "/stuff", HttpVersion.HTTP_1_1);
String s = BasicLineFormatter.formatRequestLine(requestline, null);