svn commit: r596187 [3/3] - in /mina: sandbox/asyncweb/ sandbox/asyncweb/core/ sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/ sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/common/ sandbox/asyncweb/core/src/main/java/org/sa...

Sun, 18 Nov 2007 19:42:10 -0800 

Modified: 
mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/AsyncHttpClientTest.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/AsyncHttpClientTest.java?rev=596187&r1=596186&r2=596187&view=diff
==============================================================================
--- 
mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/AsyncHttpClientTest.java
 (original)
+++ 
mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/AsyncHttpClientTest.java
 Sun Nov 18 19:41:14 2007
@@ -21,11 +21,16 @@
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.net.URI;
 import java.net.URL;
-import java.util.Arrays;
+import java.nio.charset.Charset;
 
-import org.apache.mina.filter.codec.http.HttpRequestMessage;
-import org.apache.mina.filter.codec.http.HttpResponseMessage;
+import org.apache.mina.common.IoBuffer;
+import org.apache.mina.filter.codec.http.DefaultHttpRequest;
+import org.apache.mina.filter.codec.http.HttpMethod;
+import org.apache.mina.filter.codec.http.HttpRequest;
+import org.apache.mina.filter.codec.http.HttpResponse;
+import org.apache.mina.filter.codec.http.MutableHttpRequest;
 
 public class AsyncHttpClientTest extends AbstractTest {
 
@@ -33,18 +38,18 @@
 
     public void testHtmlConnection() throws Exception {
         TestCallback callback = new TestCallback();
-        doGetConnection(callback, "http://localhost:8282";, "/", false);
+        doGetConnection(callback, "http://localhost:8282/";, false);
 
-        HttpResponseMessage msg = callback.getMessage();
-        assertEquals("\nHello World!", msg.getStringContent());
+        HttpResponse msg = callback.getMessage();
+        assertEquals("\nHello World!", 
msg.getContent().getString(Charset.forName("UTF-8").newDecoder()));
     }
 
     public void testSSLHtmlConnection() throws Exception {
         TestCallback callback = new TestCallback();
-        doGetConnection(callback, "https://localhost:8383";, "/", false);
+        doGetConnection(callback, "https://localhost:8383/";, false);
 
-        HttpResponseMessage msg = callback.getMessage();
-        assertEquals("\nHello World!", msg.getStringContent());
+        HttpResponse msg = callback.getMessage();
+        assertEquals("\nHello World!", 
msg.getContent().getString(Charset.forName("UTF-8").newDecoder()));
     }
 
     public void testBinaryRequest() throws Exception {
@@ -56,12 +61,12 @@
         fis.read(realFile);
 
         TestCallback callback = new TestCallback();
-        doGetConnection(callback, "http://localhost:8282";, "/pwrd_apache.gif",
+        doGetConnection(callback, "http://localhost:8282/pwrd_apache.gif";,
                 false);
 
-        HttpResponseMessage msg = callback.getMessage();
+        HttpResponse msg = callback.getMessage();
 
-        assertTrue(Arrays.equals(realFile, msg.getContent()));
+        assertEquals(IoBuffer.wrap(realFile), msg.getContent());
     }
 
     public void testSSLBinaryRequest() throws Exception {
@@ -73,50 +78,52 @@
         fis.read(realFile);
 
         TestCallback callback = new TestCallback();
-        doGetConnection(callback, "https://localhost:8383";, "/pwrd_apache.gif",
+        doGetConnection(callback, "https://localhost:8383/pwrd_apache.gif";,
                 false);
 
-        HttpResponseMessage msg = callback.getMessage();
+        HttpResponse msg = callback.getMessage();
 
-        assertTrue(Arrays.equals(realFile, msg.getContent()));
+        assertEquals(IoBuffer.wrap(realFile), msg.getContent());
     }
 
     public void testGetParameters() throws Exception {
         TestCallback callback = new TestCallback();
-        doGetConnection(callback, "http://localhost:8282";, "/params.jsp", 
false);
+        doGetConnection(callback, "http://localhost:8282/params.jsp";, false);
 
-        HttpResponseMessage msg = callback.getMessage();
-        assertEquals("Test One Test Two", msg.getStringContent());
+        HttpResponse msg = callback.getMessage();
+        assertEquals("Test One Test Two", 
msg.getContent().getString(Charset.forName("UTF-8").newDecoder()));
     }
 
     public void testPostParameters() throws Exception {
         TestCallback callback = new TestCallback();
-        doPostConnection(callback, "http://localhost:8282";, "/params.jsp",
+        doPostConnection(callback, "http://localhost:8282/params.jsp";,
                 false);
 
-        HttpResponseMessage msg = callback.getMessage();
-        assertEquals("Test One Test Two", msg.getStringContent());
+        HttpResponse msg = callback.getMessage();
+        assertEquals("Test One Test Two", 
msg.getContent().getString(Charset.forName("UTF-8").newDecoder()));
     }
 
-    private void doGetConnection(TestCallback callback, String url, String uri,
+    private void doGetConnection(TestCallback callback, String url,
             boolean testForException) throws Exception {
-        HttpRequestMessage request = new HttpRequestMessage(uri);
+        MutableHttpRequest request = new DefaultHttpRequest();
+        request.setRequestUri(new URI(url));
         request.setParameter("TEST1", "Test One");
         request.setParameter("TEST2", "Test Two");
         doConnection(callback, url, request, testForException);
     }
 
     private void doPostConnection(TestCallback callback, String url,
-            String uri, boolean testForException) throws Exception {
-        HttpRequestMessage request = new HttpRequestMessage(uri);
+            boolean testForException) throws Exception {
+        MutableHttpRequest request = new DefaultHttpRequest();
+        request.setRequestUri(new URI(url));
         request.setParameter("TEST1", "Test One");
         request.setParameter("TEST2", "Test Two");
-        request.setRequestMethod(HttpRequestMessage.REQUEST_POST);
+        request.setMethod(HttpMethod.POST);
         doConnection(callback, url, request, testForException);
     }
 
     private void doConnection(TestCallback callback, String url,
-            HttpRequestMessage request, boolean testForException)
+            HttpRequest request, boolean testForException)
             throws Exception {
         URL url_connect = new URL(url);
 
@@ -148,13 +155,13 @@
 
         private Throwable throwable = null;
 
-        private HttpResponseMessage message = null;
+        private HttpResponse message = null;
 
         public TestCallback() {
             clear();
         }
 
-        public void onResponse(HttpResponseMessage message) {
+        public void onResponse(HttpResponse message) {
             this.message = message;
             synchronized (semaphore) {
                 semaphore.notify();
@@ -202,11 +209,11 @@
             this.exception = exception;
         }
 
-        public HttpResponseMessage getMessage() {
+        public HttpResponse getMessage() {
             return message;
         }
 
-        public void setMessage(HttpResponseMessage message) {
+        public void setMessage(HttpResponse message) {
             this.message = message;
         }
     }

Modified: 
mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/ChunkedTest.java
URL: 
http://svn.apache.org/viewvc/mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/ChunkedTest.java?rev=596187&r1=596186&r2=596187&view=diff
==============================================================================
--- 
mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/ChunkedTest.java
 (original)
+++ 
mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/ChunkedTest.java
 Sun Nov 18 19:41:14 2007
@@ -19,14 +19,12 @@
  */
 package org.apache.mina.protocol.http.client;
 
-import java.util.Arrays;
-
 import junit.framework.TestCase;
 
 import org.apache.mina.common.IoBuffer;
 import org.apache.mina.filter.codec.ProtocolCodecSession;
+import org.apache.mina.filter.codec.http.HttpResponse;
 import org.apache.mina.filter.codec.http.HttpResponseDecoder;
-import org.apache.mina.filter.codec.http.HttpResponseMessage;
 
 public class ChunkedTest extends TestCase {
 
@@ -51,10 +49,11 @@
         HttpResponseDecoder decoder = new HttpResponseDecoder();
         decoder.decode(session, buffer, session.getDecoderOutput());
 
-        HttpResponseMessage response = (HttpResponseMessage) session
+        HttpResponse response = (HttpResponse) session
                 .getDecoderOutputQueue().poll();
-        assertTrue(Arrays.equals(response.getContent(),
-                "abcdefghijklmnopqrstuvwxyz1234567890abcdef".getBytes()));
+        assertEquals(
+                
IoBuffer.wrap("abcdefghijklmnopqrstuvwxyz1234567890abcdef".getBytes()),
+                response.getContent());
     }
 
     public void testChunkingContinue() throws Exception {
@@ -66,10 +65,10 @@
         HttpResponseDecoder decoder = new HttpResponseDecoder();
         decoder.decode(session, buffer, session.getDecoderOutput());
 
-        HttpResponseMessage response = (HttpResponseMessage) session
+        HttpResponse response = (HttpResponse) session
                 .getDecoderOutputQueue().poll();
-        assertTrue(Arrays.equals(response.getContent(),
-                "abcdefghijklmnopqrstuvwxyz1234567890abcdef".getBytes()));
+        assertEquals(
+                
IoBuffer.wrap("abcdefghijklmnopqrstuvwxyz1234567890abcdef".getBytes()),
+                response.getContent());
     }
-
 }

Reply via email to