You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2007/09/13 09:57:59 UTC
svn commit: r575208 - in
/mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client:
AbstractTest.java AsyncHttpClientTest.java ChunkedTest.java
FakeIoSession.java FakeProtocolDecoderOutput.java
Author: trustin
Date: Thu Sep 13 00:57:58 2007
New Revision: 575208
URL: http://svn.apache.org/viewvc?rev=575208&view=rev
Log:
Fixed compilation warnings
Removed:
mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/FakeIoSession.java
mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/FakeProtocolDecoderOutput.java
Modified:
mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/AbstractTest.java
mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/AsyncHttpClientTest.java
mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/ChunkedTest.java
Modified: mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/AbstractTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/AbstractTest.java?rev=575208&r1=575207&r2=575208&view=diff
==============================================================================
--- mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/AbstractTest.java (original)
+++ mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/AbstractTest.java Thu Sep 13 00:57:58 2007
@@ -32,7 +32,7 @@
import org.apache.catalina.startup.Embedded;
-public class AbstractTest extends TestCase
+public abstract class AbstractTest extends TestCase
{
protected final File BASEDIR = getBaseDir();
Modified: mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/AsyncHttpClientTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/AsyncHttpClientTest.java?rev=575208&r1=575207&r2=575208&view=diff
==============================================================================
--- mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/AsyncHttpClientTest.java (original)
+++ mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/AsyncHttpClientTest.java Thu Sep 13 00:57:58 2007
@@ -117,7 +117,7 @@
HttpRequestMessage request = new HttpRequestMessage( uri );
request.setParameter( "TEST1", "Test One" );
request.setParameter( "TEST2", "Test Two" );
- doConnection( callback, url, request, false );
+ doConnection( callback, url, request, testForException );
}
@@ -128,7 +128,7 @@
request.setParameter( "TEST1", "Test One" );
request.setParameter( "TEST2", "Test Two" );
request.setRequestMethod( HttpRequestMessage.REQUEST_POST );
- doConnection( callback, url, request, false );
+ doConnection( callback, url, request, testForException );
}
Modified: mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/ChunkedTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/ChunkedTest.java?rev=575208&r1=575207&r2=575208&view=diff
==============================================================================
--- mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/ChunkedTest.java (original)
+++ mina/trunk/protocol-client-http/src/test/java/org/apache/mina/http/client/ChunkedTest.java Thu Sep 13 00:57:58 2007
@@ -25,7 +25,7 @@
import junit.framework.TestCase;
import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.filter.codec.ProtocolCodecSession;
import org.apache.mina.http.codec.HttpResponseDecoder;
import org.apache.mina.http.codec.HttpResponseMessage;
@@ -48,12 +48,11 @@
buffer.put( fakeHttp.getBytes() );
buffer.flip();
- IoSession session = new FakeIoSession();
+ ProtocolCodecSession session = new ProtocolCodecSession();
HttpResponseDecoder decoder = new HttpResponseDecoder();
- FakeProtocolDecoderOutput out = new FakeProtocolDecoderOutput();
- decoder.decode( session, buffer, out );
+ decoder.decode( session, buffer, session.getDecoderOutput() );
- HttpResponseMessage response = ( HttpResponseMessage ) out.getObject();
+ HttpResponseMessage response = (HttpResponseMessage) session.getDecoderOutputQueue().poll();
assertTrue( Arrays.equals( response.getContent(), "abcdefghijklmnopqrstuvwxyz1234567890abcdef".getBytes() ) );
}
@@ -64,12 +63,11 @@
buffer.put( fakeHttp.getBytes() );
buffer.flip();
- IoSession session = new FakeIoSession();
+ ProtocolCodecSession session = new ProtocolCodecSession();
HttpResponseDecoder decoder = new HttpResponseDecoder();
- FakeProtocolDecoderOutput out = new FakeProtocolDecoderOutput();
- decoder.decode( session, buffer, out );
+ decoder.decode( session, buffer, session.getDecoderOutput() );
- HttpResponseMessage response = ( HttpResponseMessage ) out.getObject();
+ HttpResponseMessage response = (HttpResponseMessage) session.getDecoderOutputQueue().poll();
assertTrue( Arrays.equals( response.getContent(), "abcdefghijklmnopqrstuvwxyz1234567890abcdef".getBytes() ) );
}