Author: trustin
Date: Wed Aug 22 06:06:41 2007
New Revision: 568604
URL: http://svn.apache.org/viewvc?rev=568604&view=rev
Log:
* Replaced anonymous dummy IoSessions in test cases with DummySession
* Added DummySession.setFilterChain()
* Added DummySession.setConfig()
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoSession.java
mina/trunk/core/src/main/java/org/apache/mina/common/DummySession.java
mina/trunk/core/src/test/java/org/apache/mina/common/FutureTest.java
mina/trunk/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java
mina/trunk/core/src/test/java/org/apache/mina/common/IoServiceListenerSupportTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/reqres/RequestResponseFilterTest.java
mina/trunk/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoSession.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoSession.java?rev=568604&r1=568603&r2=568604&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoSession.java
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoSession.java
Wed Aug 22 06:06:41 2007
@@ -501,14 +501,11 @@
}
private String getServiceName() {
- if (getService() == null) {
+ TransportMetadata tm = getTransportMetadata();
+ if (tm == null) {
return "null";
+ } else {
+ return tm.getName();
}
-
- if (getService().getTransportMetadata() == null) {
- return "null";
- }
-
- return getService().getTransportMetadata().getName();
}
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/DummySession.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/DummySession.java?rev=568604&r1=568603&r2=568604&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/DummySession.java
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/DummySession.java Wed
Aug 22 06:06:41 2007
@@ -47,13 +47,13 @@
private volatile IoService service;
- private final IoSessionConfig config = new AbstractIoSessionConfig() {
+ private volatile IoSessionConfig config = new AbstractIoSessionConfig() {
@Override
protected void doSetAll(IoSessionConfig config) {
}
};
- private final IoFilterChain filterChain = new AbstractIoFilterChain(this) {
+ private volatile IoFilterChain filterChain = new
AbstractIoFilterChain(this) {
@Override
protected void doClose(IoSession session) throws Exception {
}
@@ -61,6 +61,7 @@
@Override
protected void doWrite(IoSession session, WriteRequest writeRequest)
throws Exception {
+ fireMessageSent(session, writeRequest);
}
};
@@ -114,9 +115,31 @@
public IoSessionConfig getConfig() {
return config;
}
+
+ /**
+ * Sets the configuration of this session.
+ */
+ public void setConfig(IoSessionConfig config) {
+ if (config == null) {
+ throw new NullPointerException("config");
+ }
+
+ this.config = config;
+ }
public IoFilterChain getFilterChain() {
return filterChain;
+ }
+
+ /**
+ * Sets the filter chain that affects this session.
+ */
+ public void setFilterChain(IoFilterChain filterChain) {
+ if (filterChain == null) {
+ throw new NullPointerException("filterChain");
+ }
+
+ this.filterChain = filterChain;
}
public IoHandler getHandler() {
Modified: mina/trunk/core/src/test/java/org/apache/mina/common/FutureTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/common/FutureTest.java?rev=568604&r1=568603&r2=568604&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/common/FutureTest.java
(original)
+++ mina/trunk/core/src/test/java/org/apache/mina/common/FutureTest.java Wed
Aug 22 06:06:41 2007
@@ -20,7 +20,6 @@
package org.apache.mina.common;
import java.io.IOException;
-import java.net.SocketAddress;
import junit.framework.TestCase;
@@ -58,57 +57,7 @@
TestThread thread = new TestThread(future);
thread.start();
- IoSession session = new AbstractIoSession() {
- public IoHandler getHandler() {
- return null;
- }
-
- public IoFilterChain getFilterChain() {
- return null;
- }
-
- public SocketAddress getRemoteAddress() {
- return null;
- }
-
- public SocketAddress getLocalAddress() {
- return null;
- }
-
- public int getScheduledWriteMessages() {
- return 0;
- }
-
- @Override
- protected void updateTrafficMask() {
- }
-
- @Override
- public boolean isClosing() {
- return false;
- }
-
- public IoService getService() {
- return null;
- }
-
- public IoSessionConfig getConfig() {
- return null;
- }
-
- @Override
- public SocketAddress getServiceAddress() {
- return null;
- }
-
- public int getScheduledWriteBytes() {
- return 0;
- }
-
- public TransportMetadata getTransportMetadata() {
- return null;
- }
- };
+ IoSession session = new DummySession();
future.setSession(session);
thread.join();
Modified:
mina/trunk/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java?rev=568604&r1=568603&r2=568604&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java
(original)
+++ mina/trunk/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java
Wed Aug 22 06:06:41 2007
@@ -19,8 +19,6 @@
*/
package org.apache.mina.common;
-import java.net.SocketAddress;
-
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -33,16 +31,55 @@
* @version $Rev$, $Date$
*/
public class IoFilterChainTest extends TestCase {
- private IoFilterChainImpl chain;
+ private DummySession session;
+ private IoFilterChain chain;
+ private String result;
- private IoSession session;
+ private final IoHandler handler = new IoHandlerAdapter() {
+ @Override
+ public void sessionCreated(IoSession session) {
+ result += "HS0";
+ }
- private String result;
+ @Override
+ public void sessionOpened(IoSession session) {
+ result += "HSO";
+ }
+
+ @Override
+ public void sessionClosed(IoSession session) {
+ result += "HSC";
+ }
+
+ @Override
+ public void sessionIdle(IoSession session, IdleStatus status) {
+ result += "HSI";
+ }
+
+ @Override
+ public void exceptionCaught(IoSession session, Throwable cause) {
+ result += "HEC";
+ if (cause.getClass() != Exception.class) {
+ cause.printStackTrace(System.out);
+ }
+ }
+
+ @Override
+ public void messageReceived(IoSession session, Object message) {
+ result += "HMR";
+ }
+ @Override
+ public void messageSent(IoSession session, Object message) {
+ result += "HMS";
+ }
+ };
+
@Override
public void setUp() {
- chain = new IoFilterChainImpl();
- session = new TestSession();
+ session = new DummySession();
+ session.setHandler(handler);
+ chain = session.getFilterChain();
result = "";
}
@@ -188,112 +225,6 @@
return buf.toString();
}
- private class TestSession extends AbstractIoSession implements IoSession {
- private final IoHandler handler = new IoHandlerAdapter() {
- @Override
- public void sessionCreated(IoSession session) {
- result += "HS0";
- }
-
- @Override
- public void sessionOpened(IoSession session) {
- result += "HSO";
- }
-
- @Override
- public void sessionClosed(IoSession session) {
- result += "HSC";
- }
-
- @Override
- public void sessionIdle(IoSession session, IdleStatus status) {
- result += "HSI";
- }
-
- @Override
- public void exceptionCaught(IoSession session, Throwable cause) {
- result += "HEC";
- if (cause.getClass() != Exception.class) {
- cause.printStackTrace(System.out);
- }
- }
-
- @Override
- public void messageReceived(IoSession session, Object message) {
- result += "HMR";
- }
-
- @Override
- public void messageSent(IoSession session, Object message) {
- result += "HMS";
- }
- };
-
- public IoHandler getHandler() {
- return handler;
- }
-
- @Override
- public CloseFuture close() {
- return null;
- }
-
- public SocketAddress getRemoteAddress() {
- return null;
- }
-
- public SocketAddress getLocalAddress() {
- return null;
- }
-
- public IoFilterChain getFilterChain() {
- return new AbstractIoFilterChain(this) {
- @Override
- protected void doWrite(IoSession session,
- WriteRequest writeRequest) {
- }
-
- @Override
- protected void doClose(IoSession session) {
- }
- };
- }
-
- public int getScheduledWriteMessages() {
- return 0;
- }
-
- @Override
- protected void updateTrafficMask() {
- }
-
- @Override
- public boolean isClosing() {
- return false;
- }
-
- public IoService getService() {
- return null;
- }
-
- public IoSessionConfig getConfig() {
- return null;
- }
-
- @Override
- public SocketAddress getServiceAddress() {
- return null;
- }
-
- public int getScheduledWriteBytes() {
- return 0;
- }
-
- public TransportMetadata getTransportMetadata() {
- return null;
- }
- }
-
private class EventOrderTestFilter extends IoFilterAdapter {
private final char id;
@@ -374,65 +305,4 @@
result += "REMOVED";
}
}
-
- private static class IoFilterChainImpl extends AbstractIoFilterChain {
- protected IoFilterChainImpl() {
- super(new AbstractIoSession() {
- @Override
- protected void updateTrafficMask() {
- }
-
- public IoService getService() {
- return null;
- }
-
- public IoHandler getHandler() {
- return null;
- }
-
- public IoFilterChain getFilterChain() {
- return null;
- }
-
- public SocketAddress getRemoteAddress() {
- return null;
- }
-
- public SocketAddress getLocalAddress() {
- return null;
- }
-
- public int getScheduledWriteMessages() {
- return 0;
- }
-
- public IoSessionConfig getConfig() {
- return null;
- }
-
- @Override
- public SocketAddress getServiceAddress() {
- return null;
- }
-
- public int getScheduledWriteBytes() {
- return 0;
- }
-
- public TransportMetadata getTransportMetadata() {
- return null;
- }
- });
- }
-
- @Override
- protected void doWrite(IoSession session, WriteRequest writeRequest) {
- fireMessageSent(session, writeRequest);
- }
-
- @Override
- protected void doClose(IoSession session) {
- }
- }
-
}
Modified:
mina/trunk/core/src/test/java/org/apache/mina/common/IoServiceListenerSupportTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/common/IoServiceListenerSupportTest.java?rev=568604&r1=568603&r2=568604&view=diff
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/common/IoServiceListenerSupportTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/common/IoServiceListenerSupportTest.java
Wed Aug 22 06:06:41 2007
@@ -25,16 +25,6 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.AbstractIoSession;
-import org.apache.mina.common.IoAcceptor;
-import org.apache.mina.common.IoConnector;
-import org.apache.mina.common.IoFilterChain;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoService;
-import org.apache.mina.common.IoServiceListener;
-import org.apache.mina.common.IoServiceListenerSupport;
-import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.TransportMetadata;
import org.easymock.MockControl;
/**
@@ -87,7 +77,9 @@
IoServiceListenerSupport support = new IoServiceListenerSupport(
mockService);
- TestSession session = new TestSession(mockService, ADDRESS);
+ DummySession session = new DummySession();
+ session.setService(mockService);
+ session.setLocalAddress(ADDRESS);
MockControl chainControl = MockControl
.createStrictControl(IoFilterChain.class);
@@ -145,7 +137,9 @@
final IoServiceListenerSupport support = new IoServiceListenerSupport(
acceptor);
- final TestSession session = new TestSession(acceptor, ADDRESS);
+ final DummySession session = new DummySession();
+ session.setService(acceptor);
+ session.setLocalAddress(ADDRESS);
MockControl chainControl = MockControl
.createStrictControl(IoFilterChain.class);
@@ -217,7 +211,9 @@
IoServiceListenerSupport support = new IoServiceListenerSupport(
connector);
- final TestSession session = new TestSession(connector, ADDRESS);
+ final DummySession session = new DummySession();
+ session.setService(connector);
+ session.setRemoteAddress(ADDRESS);
MockControl chainControl = MockControl
.createStrictControl(IoFilterChain.class);
@@ -261,80 +257,5 @@
Assert.assertEquals(0, support.getManagedSessions().size());
Assert.assertFalse(support.getManagedSessions().contains(session));
- }
-
- private static class TestSession extends AbstractIoSession {
- private final IoService service;
-
- private final SocketAddress serviceAddress;
-
- private IoFilterChain filterChain;
-
- TestSession(SocketAddress serviceAddress) {
- this(null, serviceAddress);
- }
-
- TestSession(IoService service, SocketAddress serviceAddress) {
- this.service = service;
- this.serviceAddress = serviceAddress;
- }
-
- @Override
- protected void updateTrafficMask() {
- }
-
- public IoSessionConfig getConfig() {
- return null;
- }
-
- public IoFilterChain getFilterChain() {
- return filterChain;
- }
-
- public void setFilterChain(IoFilterChain filterChain) {
- this.filterChain = filterChain;
- }
-
- public IoHandler getHandler() {
- return null;
- }
-
- public SocketAddress getLocalAddress() {
- return null;
- }
-
- public SocketAddress getRemoteAddress() {
- return null;
- }
-
- public int getScheduledWriteBytes() {
- return 0;
- }
-
- public int getScheduledWriteMessages() {
- return 0;
- }
-
- public IoService getService() {
- return service;
- }
-
- @Override
- public SocketAddress getServiceAddress() {
- return serviceAddress;
- }
-
- public TransportMetadata getTransportType() {
- return null;
- }
-
- @Override
- public String toString() {
- return String.valueOf(serviceAddress);
- }
-
- public TransportMetadata getTransportMetadata() {
- return null;
- }
}
}
Modified:
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java?rev=568604&r1=568603&r2=568604&view=diff
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java
Wed Aug 22 06:06:41 2007
@@ -19,22 +19,14 @@
*/
package org.apache.mina.filter.codec;
-import java.net.SocketAddress;
import java.util.ArrayList;
import java.util.List;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.AbstractIoSession;
import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.common.CloseFuture;
-import org.apache.mina.common.IoFilterChain;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoService;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.TransportMetadata;
/**
* Tests [EMAIL PROTECTED] CumulativeProtocolDecoder}.
@@ -43,14 +35,11 @@
* @version $Rev$, $Date$
*/
public class CumulativeProtocolDecoderTest extends TestCase {
- private final IoSession session = new IoSessionImpl();
+ private final ProtocolCodecSession session = new ProtocolCodecSession();
private ByteBuffer buf;
-
private IntegerDecoder decoder;
- private IntegerDecoderOutput output;
-
public static void main(String[] args) {
junit.textui.TestRunner.run(CumulativeProtocolDecoderTest.class);
}
@@ -59,7 +48,6 @@
protected void setUp() throws Exception {
buf = ByteBuffer.allocate(16);
decoder = new IntegerDecoder();
- output = new IntegerDecoderOutput();
}
@Override
@@ -71,8 +59,8 @@
buf.put((byte) 0);
buf.flip();
- decoder.decode(session, buf, output);
- Assert.assertEquals(0, output.getValues().size());
+ decoder.decode(session, buf, session.getDecoderOutput());
+ Assert.assertEquals(0, session.getDecoderOutputQueue().size());
Assert.assertEquals(buf.limit(), buf.position());
buf.clear();
@@ -81,9 +69,9 @@
buf.put((byte) 1);
buf.flip();
- decoder.decode(session, buf, output);
- Assert.assertEquals(1, output.getValues().size());
- Assert.assertEquals(new Integer(1), output.getValues().get(0));
+ decoder.decode(session, buf, session.getDecoderOutput());
+ Assert.assertEquals(1, session.getDecoderOutputQueue().size());
+ Assert.assertEquals(new Integer(1),
session.getDecoderOutputQueue().poll());
Assert.assertEquals(buf.limit(), buf.position());
}
@@ -93,20 +81,20 @@
}
buf.flip();
- decoder.decode(session, buf, output);
- Assert.assertEquals(4, output.getValues().size());
+ decoder.decode(session, buf, session.getDecoderOutput());
+ Assert.assertEquals(4, session.getDecoderOutputQueue().size());
Assert.assertEquals(buf.limit(), buf.position());
List<Object> expected = new ArrayList<Object>();
for (int i = 0; i < 4; i++) {
expected.add(new Integer(i));
}
- Assert.assertEquals(expected, output.getValues());
+ Assert.assertEquals(expected, session.getDecoderOutputQueue());
}
public void testWrongImplementationDetection() throws Exception {
try {
- new WrongDecoder().decode(session, buf, output);
+ new WrongDecoder().decode(session, buf,
session.getDecoderOutput());
Assert.fail();
} catch (IllegalStateException e) {
// OK
@@ -132,25 +120,6 @@
}
- private static class IntegerDecoderOutput implements ProtocolDecoderOutput
{
- private final List<Object> values = new ArrayList<Object>();
-
- public void write(Object message) {
- values.add(message);
- }
-
- public List<Object> getValues() {
- return values;
- }
-
- public void clear() {
- values.clear();
- }
-
- public void flush() {
- }
- }
-
private static class WrongDecoder extends CumulativeProtocolDecoder {
@Override
@@ -160,73 +129,6 @@
}
public void dispose() throws Exception {
- }
- }
-
- private static class IoSessionImpl extends AbstractIoSession implements
- IoSession {
-
- public IoHandler getHandler() {
- return null;
- }
-
- public ProtocolEncoder getEncoder() {
- return null;
- }
-
- public ProtocolDecoder getDecoder() {
- return null;
- }
-
- @Override
- public CloseFuture close() {
- return null;
- }
-
- public SocketAddress getRemoteAddress() {
- return null;
- }
-
- public SocketAddress getLocalAddress() {
- return null;
- }
-
- public IoFilterChain getFilterChain() {
- return null;
- }
-
- public int getScheduledWriteMessages() {
- return 0;
- }
-
- @Override
- protected void updateTrafficMask() {
- }
-
- @Override
- public boolean isClosing() {
- return false;
- }
-
- public IoService getService() {
- return null;
- }
-
- public IoSessionConfig getConfig() {
- return null;
- }
-
- @Override
- public SocketAddress getServiceAddress() {
- return null;
- }
-
- public int getScheduledWriteBytes() {
- return 0;
- }
-
- public TransportMetadata getTransportMetadata() {
- return null;
}
}
}
Modified:
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java?rev=568604&r1=568603&r2=568604&view=diff
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java
Wed Aug 22 06:06:41 2007
@@ -20,26 +20,16 @@
package org.apache.mina.filter.codec.serialization;
import java.io.ByteArrayOutputStream;
-import java.net.SocketAddress;
-import java.util.ArrayList;
-import java.util.List;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.AbstractIoSession;
import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.common.IoFilterChain;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoService;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.TransportMetadata;
-import org.apache.mina.common.WriteFuture;
+import org.apache.mina.filter.codec.ProtocolCodecSession;
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.mina.filter.codec.ProtocolEncoder;
-import org.apache.mina.filter.codec.AbstractProtocolEncoderOutput;
+import org.apache.mina.filter.codec.ProtocolEncoderOutput;
/**
* Tests object serialization codec and streams.
@@ -51,18 +41,14 @@
public void testEncoder() throws Exception {
final String expected = "1234";
- IoSession session = new MockIoSession();
- AbstractProtocolEncoderOutput out = new
AbstractProtocolEncoderOutput() {
- public WriteFuture flush() {
- return null;
- }
- };
+ ProtocolCodecSession session = new ProtocolCodecSession();
+ ProtocolEncoderOutput out = session.getEncoderOutput();
ProtocolEncoder encoder = new ObjectSerializationEncoder();
encoder.encode(session, expected, out);
- Assert.assertEquals(1, out.getBufferQueue().size());
- ByteBuffer buf = out.getBufferQueue().poll();
+ Assert.assertEquals(1, session.getEncoderOutputQueue().size());
+ ByteBuffer buf = session.getEncoderOutputQueue().poll();
testDecoderAndInputStream(expected, buf);
}
@@ -91,69 +77,11 @@
// Test ProtocolDecoder
ProtocolDecoder decoder = new ObjectSerializationDecoder();
- MockProtocolDecoderOutput decoderOut = new MockProtocolDecoderOutput();
- IoSession session = new MockIoSession();
+ ProtocolCodecSession session = new ProtocolCodecSession();
+ ProtocolDecoderOutput decoderOut = session.getDecoderOutput();
decoder.decode(session, in.duplicate(), decoderOut);
- Assert.assertEquals(expected, decoderOut.result.get(0));
- Assert.assertEquals(1, decoderOut.result.size());
- }
-
- private static class MockIoSession extends AbstractIoSession {
- @Override
- protected void updateTrafficMask() {
- }
-
- public IoSessionConfig getConfig() {
- return null;
- }
-
- public IoFilterChain getFilterChain() {
- return null;
- }
-
- public IoHandler getHandler() {
- return null;
- }
-
- public SocketAddress getLocalAddress() {
- return null;
- }
-
- public SocketAddress getRemoteAddress() {
- return null;
- }
-
- public int getScheduledWriteBytes() {
- return 0;
- }
-
- public int getScheduledWriteMessages() {
- return 0;
- }
-
- public IoService getService() {
- return null;
- }
-
- public TransportMetadata getTransportType() {
- return null;
- }
-
- public TransportMetadata getTransportMetadata() {
- return null;
- }
- }
-
- private static class MockProtocolDecoderOutput implements
- ProtocolDecoderOutput {
- private final List<Object> result = new ArrayList<Object>();
-
- public void flush() {
- }
-
- public void write(Object message) {
- result.add(message);
- }
+ Assert.assertEquals(1, session.getDecoderOutputQueue().size());
+ Assert.assertEquals(expected, session.getDecoderOutputQueue().poll());
}
}
Modified:
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java?rev=568604&r1=568603&r2=568604&view=diff
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java
Wed Aug 22 06:06:41 2007
@@ -19,23 +19,16 @@
*/
package org.apache.mina.filter.codec.textline;
-import java.net.SocketAddress;
import java.nio.charset.Charset;
import java.nio.charset.CharsetEncoder;
-import java.util.LinkedList;
-import java.util.Queue;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.AbstractIoSession;
import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.common.IoFilterChain;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoService;
+import org.apache.mina.common.DummySession;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.TransportMetadata;
+import org.apache.mina.filter.codec.ProtocolCodecSession;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
/**
@@ -54,38 +47,38 @@
LineDelimiter.WINDOWS);
CharsetEncoder encoder = Charset.forName("UTF-8").newEncoder();
- IoSession session = new DummySession();
- TestDecoderOutput out = new TestDecoderOutput();
+ ProtocolCodecSession session = new ProtocolCodecSession();
+ ProtocolDecoderOutput out = session.getDecoderOutput();
ByteBuffer in = ByteBuffer.allocate(16);
// Test one decode and one output
in.putString("ABC\r\n", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(1, out.getMessageQueue().size());
- Assert.assertEquals("ABC", out.getMessageQueue().poll());
+ Assert.assertEquals(1, session.getDecoderOutputQueue().size());
+ Assert.assertEquals("ABC", session.getDecoderOutputQueue().poll());
// Test two decode and one output
in.clear();
in.putString("DEF", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(0, out.getMessageQueue().size());
+ Assert.assertEquals(0, session.getDecoderOutputQueue().size());
in.clear();
in.putString("GHI\r\n", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(1, out.getMessageQueue().size());
- Assert.assertEquals("DEFGHI", out.getMessageQueue().poll());
+ Assert.assertEquals(1, session.getDecoderOutputQueue().size());
+ Assert.assertEquals("DEFGHI", session.getDecoderOutputQueue().poll());
// Test one decode and two output
in.clear();
in.putString("JKL\r\nMNO\r\n", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(2, out.getMessageQueue().size());
- Assert.assertEquals("JKL", out.getMessageQueue().poll());
- Assert.assertEquals("MNO", out.getMessageQueue().poll());
+ Assert.assertEquals(2, session.getDecoderOutputQueue().size());
+ Assert.assertEquals("JKL", session.getDecoderOutputQueue().poll());
+ Assert.assertEquals("MNO", session.getDecoderOutputQueue().poll());
// Test splitted long delimiter
decoder = new TextLineDecoder(Charset.forName("UTF-8"),
@@ -94,18 +87,18 @@
in.putString("PQR\n", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(0, out.getMessageQueue().size());
+ Assert.assertEquals(0, session.getDecoderOutputQueue().size());
in.clear();
in.putString("\n", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(0, out.getMessageQueue().size());
+ Assert.assertEquals(0, session.getDecoderOutputQueue().size());
in.clear();
in.putString("\n", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(1, out.getMessageQueue().size());
- Assert.assertEquals("PQR", out.getMessageQueue().poll());
+ Assert.assertEquals(1, session.getDecoderOutputQueue().size());
+ Assert.assertEquals("PQR", session.getDecoderOutputQueue().poll());
// Test splitted long delimiter which produces two output
decoder = new TextLineDecoder(Charset.forName("UTF-8"),
@@ -114,19 +107,19 @@
in.putString("PQR\n", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(0, out.getMessageQueue().size());
+ Assert.assertEquals(0, session.getDecoderOutputQueue().size());
in.clear();
in.putString("\n", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(0, out.getMessageQueue().size());
+ Assert.assertEquals(0, session.getDecoderOutputQueue().size());
in.clear();
in.putString("\nSTU\n\n\n", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(2, out.getMessageQueue().size());
- Assert.assertEquals("PQR", out.getMessageQueue().poll());
- Assert.assertEquals("STU", out.getMessageQueue().poll());
+ Assert.assertEquals(2,session.getDecoderOutputQueue().size());
+ Assert.assertEquals("PQR", session.getDecoderOutputQueue().poll());
+ Assert.assertEquals("STU", session.getDecoderOutputQueue().poll());
// Test splitted long delimiter mixed with partial non-delimiter.
decoder = new TextLineDecoder(Charset.forName("UTF-8"),
@@ -135,19 +128,19 @@
in.putString("PQR\n", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(0, out.getMessageQueue().size());
+ Assert.assertEquals(0, session.getDecoderOutputQueue().size());
in.clear();
in.putString("X\n", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(0, out.getMessageQueue().size());
+ Assert.assertEquals(0, session.getDecoderOutputQueue().size());
in.clear();
in.putString("\n\nSTU\n\n\n", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(2, out.getMessageQueue().size());
- Assert.assertEquals("PQR\nX", out.getMessageQueue().poll());
- Assert.assertEquals("STU", out.getMessageQueue().poll());
+ Assert.assertEquals(2, session.getDecoderOutputQueue().size());
+ Assert.assertEquals("PQR\nX", session.getDecoderOutputQueue().poll());
+ Assert.assertEquals("STU", session.getDecoderOutputQueue().poll());
}
public void testAutoDecode() throws Exception {
@@ -155,169 +148,103 @@
LineDelimiter.AUTO);
CharsetEncoder encoder = Charset.forName("UTF-8").newEncoder();
- IoSession session = new DummySession();
- TestDecoderOutput out = new TestDecoderOutput();
+ ProtocolCodecSession session = new ProtocolCodecSession();
+ ProtocolDecoderOutput out = session.getDecoderOutput();
ByteBuffer in = ByteBuffer.allocate(16);
// Test one decode and one output
in.putString("ABC\r\n", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(1, out.getMessageQueue().size());
- Assert.assertEquals("ABC", out.getMessageQueue().poll());
+ Assert.assertEquals(1, session.getDecoderOutputQueue().size());
+ Assert.assertEquals("ABC", session.getDecoderOutputQueue().poll());
// Test two decode and one output
in.clear();
in.putString("DEF", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(0, out.getMessageQueue().size());
+ Assert.assertEquals(0, session.getDecoderOutputQueue().size());
in.clear();
in.putString("GHI\r\n", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(1, out.getMessageQueue().size());
- Assert.assertEquals("DEFGHI", out.getMessageQueue().poll());
+ Assert.assertEquals(1, session.getDecoderOutputQueue().size());
+ Assert.assertEquals("DEFGHI", session.getDecoderOutputQueue().poll());
// Test one decode and two output
in.clear();
in.putString("JKL\r\nMNO\r\n", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(2, out.getMessageQueue().size());
- Assert.assertEquals("JKL", out.getMessageQueue().poll());
- Assert.assertEquals("MNO", out.getMessageQueue().poll());
+ Assert.assertEquals(2, session.getDecoderOutputQueue().size());
+ Assert.assertEquals("JKL", session.getDecoderOutputQueue().poll());
+ Assert.assertEquals("MNO", session.getDecoderOutputQueue().poll());
// Test multiple '\n's
in.clear();
in.putString("\n\n\n", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(3, out.getMessageQueue().size());
- Assert.assertEquals("", out.getMessageQueue().poll());
- Assert.assertEquals("", out.getMessageQueue().poll());
- Assert.assertEquals("", out.getMessageQueue().poll());
+ Assert.assertEquals(3, session.getDecoderOutputQueue().size());
+ Assert.assertEquals("", session.getDecoderOutputQueue().poll());
+ Assert.assertEquals("", session.getDecoderOutputQueue().poll());
+ Assert.assertEquals("", session.getDecoderOutputQueue().poll());
// Test splitted long delimiter (\r\r\n)
in.clear();
in.putString("PQR\r", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(0, out.getMessageQueue().size());
+ Assert.assertEquals(0, session.getDecoderOutputQueue().size());
in.clear();
in.putString("\r", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(0, out.getMessageQueue().size());
+ Assert.assertEquals(0, session.getDecoderOutputQueue().size());
in.clear();
in.putString("\n", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(1, out.getMessageQueue().size());
- Assert.assertEquals("PQR", out.getMessageQueue().poll());
+ Assert.assertEquals(1, session.getDecoderOutputQueue().size());
+ Assert.assertEquals("PQR", session.getDecoderOutputQueue().poll());
// Test splitted long delimiter (\r\r\n) which produces two output
in.clear();
in.putString("PQR\r", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(0, out.getMessageQueue().size());
+ Assert.assertEquals(0, session.getDecoderOutputQueue().size());
in.clear();
in.putString("\r", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(0, out.getMessageQueue().size());
+ Assert.assertEquals(0, session.getDecoderOutputQueue().size());
in.clear();
in.putString("\nSTU\r\r\n", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(2, out.getMessageQueue().size());
- Assert.assertEquals("PQR", out.getMessageQueue().poll());
- Assert.assertEquals("STU", out.getMessageQueue().poll());
+ Assert.assertEquals(2, session.getDecoderOutputQueue().size());
+ Assert.assertEquals("PQR", session.getDecoderOutputQueue().poll());
+ Assert.assertEquals("STU", session.getDecoderOutputQueue().poll());
// Test splitted long delimiter mixed with partial non-delimiter.
in.clear();
in.putString("PQR\r", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(0, out.getMessageQueue().size());
+ Assert.assertEquals(0, session.getDecoderOutputQueue().size());
in.clear();
in.putString("X\r", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(0, out.getMessageQueue().size());
+ Assert.assertEquals(0, session.getDecoderOutputQueue().size());
in.clear();
in.putString("\r\nSTU\r\r\n", encoder);
in.flip();
decoder.decode(session, in, out);
- Assert.assertEquals(2, out.getMessageQueue().size());
- Assert.assertEquals("PQR\rX", out.getMessageQueue().poll());
- Assert.assertEquals("STU", out.getMessageQueue().poll());
- }
-
- private static class DummySession extends AbstractIoSession {
- @Override
- protected void updateTrafficMask() {
- }
-
- public IoService getService() {
- return null;
- }
-
- public IoHandler getHandler() {
- return null;
- }
-
- public IoFilterChain getFilterChain() {
- return null;
- }
-
- public TransportMetadata getTransportType() {
- return null;
- }
-
- public SocketAddress getRemoteAddress() {
- return null;
- }
-
- public SocketAddress getLocalAddress() {
- return null;
- }
-
- public int getScheduledWriteMessages() {
- return 0;
- }
-
- public IoSessionConfig getConfig() {
- return null;
- }
-
- @Override
- public SocketAddress getServiceAddress() {
- return null;
- }
-
- public int getScheduledWriteBytes() {
- return 0;
- }
-
- public TransportMetadata getTransportMetadata() {
- return null;
- }
- }
-
- private static class TestDecoderOutput implements ProtocolDecoderOutput {
- private final Queue<Object> messageQueue = new LinkedList<Object>();
-
- public void write(Object message) {
- messageQueue.offer(message);
- }
-
- public Queue<Object> getMessageQueue() {
- return messageQueue;
- }
-
- public void flush() {
- }
+ Assert.assertEquals(2, session.getDecoderOutputQueue().size());
+ Assert.assertEquals("PQR\rX", session.getDecoderOutputQueue().poll());
+ Assert.assertEquals("STU", session.getDecoderOutputQueue().poll());
}
}
Modified:
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java?rev=568604&r1=568603&r2=568604&view=diff
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java
Wed Aug 22 06:06:41 2007
@@ -19,22 +19,16 @@
*/
package org.apache.mina.filter.codec.textline;
-import java.net.SocketAddress;
import java.nio.charset.Charset;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.AbstractIoSession;
import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.common.IoFilterChain;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoService;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.TransportMetadata;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.filter.codec.AbstractProtocolEncoderOutput;
+import org.apache.mina.filter.codec.ProtocolCodecSession;
+import org.apache.mina.filter.codec.ProtocolEncoderOutput;
/**
* Tests [EMAIL PROTECTED] TextLineEncoder}.
@@ -50,72 +44,17 @@
public void testEncode() throws Exception {
TextLineEncoder encoder = new TextLineEncoder(Charset.forName("UTF-8"),
LineDelimiter.WINDOWS);
- IoSession session = new DummySession();
- AbstractProtocolEncoderOutput out = new
AbstractProtocolEncoderOutput() {
- public WriteFuture flush() {
- return null;
- }
- };
+ ProtocolCodecSession session = new ProtocolCodecSession();
+ ProtocolEncoderOutput out = session.getEncoderOutput();
encoder.encode(session, "ABC", out);
- Assert.assertEquals(1, out.getBufferQueue().size());
- ByteBuffer buf = out.getBufferQueue().poll();
+ Assert.assertEquals(1, session.getEncoderOutputQueue().size());
+ ByteBuffer buf = session.getEncoderOutputQueue().poll();
Assert.assertEquals(5, buf.remaining());
Assert.assertEquals('A', buf.get());
Assert.assertEquals('B', buf.get());
Assert.assertEquals('C', buf.get());
Assert.assertEquals('\r', buf.get());
Assert.assertEquals('\n', buf.get());
- }
-
- private static class DummySession extends AbstractIoSession {
- @Override
- protected void updateTrafficMask() {
- }
-
- public IoService getService() {
- return null;
- }
-
- public IoHandler getHandler() {
- return null;
- }
-
- public IoFilterChain getFilterChain() {
- return null;
- }
-
- public TransportMetadata getTransportType() {
- return null;
- }
-
- public SocketAddress getRemoteAddress() {
- return null;
- }
-
- public SocketAddress getLocalAddress() {
- return null;
- }
-
- public int getScheduledWriteMessages() {
- return 0;
- }
-
- public IoSessionConfig getConfig() {
- return null;
- }
-
- @Override
- public SocketAddress getServiceAddress() {
- return null;
- }
-
- public int getScheduledWriteBytes() {
- return 0;
- }
-
- public TransportMetadata getTransportMetadata() {
- return null;
- }
}
}
Modified:
mina/trunk/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java?rev=568604&r1=568603&r2=568604&view=diff
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java
Wed Aug 22 06:06:41 2007
@@ -19,22 +19,15 @@
*/
package org.apache.mina.filter.executor;
-import java.net.SocketAddress;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.AbstractIoSession;
-import org.apache.mina.common.CloseFuture;
+import org.apache.mina.common.DummySession;
import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoFilterChain;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoService;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.TransportMetadata;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.IoFilter.NextFilter;
@@ -88,7 +81,7 @@
}
}
- private static class EventOrderCounter extends AbstractIoSession {
+ private static class EventOrderCounter extends DummySession {
private Integer lastCount = null;
public synchronized void setLastCount(Integer newCount) {
@@ -98,65 +91,6 @@
}
lastCount = newCount;
- }
-
- public IoHandler getHandler() {
- return null;
- }
-
- public IoFilterChain getFilterChain() {
- return null;
- }
-
- @Override
- public CloseFuture close() {
- return null;
- }
-
- public TransportMetadata getTransportType() {
- return null;
- }
-
- public SocketAddress getRemoteAddress() {
- return null;
- }
-
- public SocketAddress getLocalAddress() {
- return null;
- }
-
- public int getScheduledWriteMessages() {
- return 0;
- }
-
- @Override
- protected void updateTrafficMask() {
- }
-
- @Override
- public boolean isClosing() {
- return false;
- }
-
- public IoService getService() {
- return null;
- }
-
- public IoSessionConfig getConfig() {
- return null;
- }
-
- @Override
- public SocketAddress getServiceAddress() {
- return null;
- }
-
- public int getScheduledWriteBytes() {
- return 0;
- }
-
- public TransportMetadata getTransportMetadata() {
- return null;
}
}
Modified:
mina/trunk/core/src/test/java/org/apache/mina/filter/reqres/RequestResponseFilterTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/reqres/RequestResponseFilterTest.java?rev=568604&r1=568603&r2=568604&view=diff
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/filter/reqres/RequestResponseFilterTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/filter/reqres/RequestResponseFilterTest.java
Wed Aug 22 06:06:41 2007
@@ -19,22 +19,17 @@
*/
package org.apache.mina.filter.reqres;
-import java.net.SocketAddress;
import java.util.NoSuchElementException;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
-import org.apache.mina.common.AbstractIoFilterChain;
-import org.apache.mina.common.AbstractIoSession;
+import junit.framework.TestCase;
+
import org.apache.mina.common.DefaultWriteRequest;
+import org.apache.mina.common.DummySession;
import org.apache.mina.common.IoFilterChain;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoService;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionConfig;
import org.apache.mina.common.IoSessionLogger;
-import org.apache.mina.common.TransportMetadata;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.IoFilter.NextFilter;
import org.easymock.AbstractMatcher;
@@ -43,7 +38,6 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import junit.framework.TestCase;
/**
* Tests [EMAIL PROTECTED] RequestResponseFilter}.
@@ -70,20 +64,11 @@
@Before
public void setUp() throws Exception {
scheduler = Executors.newScheduledThreadPool(1);
- session = new DummySession();
filter = new RequestResponseFilter(new MessageInspector(), scheduler);
// Set up mock objects.
- chain = new AbstractIoFilterChain(session) {
- @Override
- protected void doClose(IoSession session) throws Exception {
- }
-
- @Override
- protected void doWrite(IoSession session, WriteRequest
writeRequest)
- throws Exception {
- }
- };
+ session = new DummySession();
+ chain = session.getFilterChain();
nextFilterControl = MockControl.createControl(NextFilter.class);
nextFilter = (NextFilter) nextFilterControl.getMock();
@@ -323,53 +308,6 @@
}
return ((Message) message).getType();
- }
- }
-
- private static class DummySession extends AbstractIoSession {
-
- @Override
- protected void updateTrafficMask() {
- }
-
- public IoSessionConfig getConfig() {
- return null;
- }
-
- public IoFilterChain getFilterChain() {
- return null;
- }
-
- public IoHandler getHandler() {
- return new IoHandlerAdapter();
- }
-
- public SocketAddress getLocalAddress() {
- return null;
- }
-
- public SocketAddress getRemoteAddress() {
- return null;
- }
-
- public int getScheduledWriteBytes() {
- return 0;
- }
-
- public int getScheduledWriteMessages() {
- return 0;
- }
-
- public IoService getService() {
- return null;
- }
-
- public TransportMetadata getTransportType() {
- return null;
- }
-
- public TransportMetadata getTransportMetadata() {
- return null;
}
}
Modified:
mina/trunk/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java?rev=568604&r1=568603&r2=568604&view=diff
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java
Wed Aug 22 06:06:41 2007
@@ -19,18 +19,11 @@
*/
package org.apache.mina.handler.chain;
-import java.net.SocketAddress;
-
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.AbstractIoSession;
-import org.apache.mina.common.IoFilterChain;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoService;
+import org.apache.mina.common.DummySession;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.TransportMetadata;
/**
* A test case for [EMAIL PROTECTED] ChainedIoHandler}.
@@ -50,52 +43,7 @@
chain.addLast("B", new TestCommand(buf, 'B'));
chain.addLast("C", new TestCommand(buf, 'C'));
- new ChainedIoHandler(chain).messageReceived(new AbstractIoSession() {
- @Override
- protected void updateTrafficMask() {
- }
-
- public IoService getService() {
- return null;
- }
-
- public IoHandler getHandler() {
- return null;
- }
-
- public IoFilterChain getFilterChain() {
- return null;
- }
-
- public SocketAddress getRemoteAddress() {
- return null;
- }
-
- public SocketAddress getLocalAddress() {
- return null;
- }
-
- public int getScheduledWriteMessages() {
- return 0;
- }
-
- public IoSessionConfig getConfig() {
- return null;
- }
-
- @Override
- public SocketAddress getServiceAddress() {
- return null;
- }
-
- public int getScheduledWriteBytes() {
- return 0;
- }
-
- public TransportMetadata getTransportMetadata() {
- return null;
- }
- }, null);
+ new ChainedIoHandler(chain).messageReceived(new DummySession(), null);
Assert.assertEquals("ABC", buf.toString());
}
