mend
Project: http://git-wip-us.apache.org/repos/asf/mina/repo Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/f180462b Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/f180462b Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/f180462b Branch: refs/heads/trunk Commit: f180462bcabfcd90385b7e2c771b955f276cecfd Parents: 8ee4890 Author: jvermillard <[email protected]> Authored: Sun May 26 17:09:45 2013 +0200 Committer: jvermillard <[email protected]> Committed: Sun May 26 17:09:45 2013 +0200 ---------------------------------------------------------------------- .../service/idlecheker/IndexedIdleChekerTest.java | 30 +--------- .../apache/mina/session/AbstractIoSessionTest.java | 44 ++------------- core/src/test/resources/log4j2-test.xml | 2 +- 3 files changed, 8 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina/blob/f180462b/core/src/test/java/org/apache/mina/service/idlecheker/IndexedIdleChekerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/mina/service/idlecheker/IndexedIdleChekerTest.java b/core/src/test/java/org/apache/mina/service/idlecheker/IndexedIdleChekerTest.java index 7095443..8e7c408 100644 --- a/core/src/test/java/org/apache/mina/service/idlecheker/IndexedIdleChekerTest.java +++ b/core/src/test/java/org/apache/mina/service/idlecheker/IndexedIdleChekerTest.java @@ -25,7 +25,6 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import java.net.SocketAddress; -import java.nio.ByteBuffer; import org.apache.mina.api.IdleStatus; import org.apache.mina.api.IoFuture; @@ -111,7 +110,7 @@ public class IndexedIdleChekerTest { int writeIdleCount = 0; private DummySession(IoService service, IdleChecker checker) { - super(service, null, checker); + super(service, checker); } @Override @@ -196,33 +195,8 @@ public class IndexedIdleChekerTest { return false; } - /** - * {@inheritDoc} - */ - @Override - protected void channelClose() { - } - - /** - * {@inheritDoc} - */ - @Override - public void flushWriteQueue() { - } - - /** - * {@inheritDoc} - */ - @Override - protected int writeDirect(Object message) { - return 0; - } - - /** - * {@inheritDoc} - */ @Override - protected ByteBuffer convertToDirectBuffer(WriteRequest writeRequest, boolean createNew) { + public WriteRequest enqueueWriteRequest(WriteRequest writeRequest) { return null; } } http://git-wip-us.apache.org/repos/asf/mina/blob/f180462b/core/src/test/java/org/apache/mina/session/AbstractIoSessionTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/mina/session/AbstractIoSessionTest.java b/core/src/test/java/org/apache/mina/session/AbstractIoSessionTest.java index bef0acc..a9277a6 100644 --- a/core/src/test/java/org/apache/mina/session/AbstractIoSessionTest.java +++ b/core/src/test/java/org/apache/mina/session/AbstractIoSessionTest.java @@ -18,17 +18,9 @@ */ package org.apache.mina.session; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.junit.Assert.*; +import static org.mockito.Matchers.*; +import static org.mockito.Mockito.*; import java.net.SocketAddress; import java.nio.ByteBuffer; @@ -52,7 +44,7 @@ public class AbstractIoSessionTest { private class DummySession extends AbstractIoSession { private DummySession(final IoService service) { - super(service, null, null); + super(service, null); } @Override @@ -121,34 +113,8 @@ public class AbstractIoSessionTest { return false; } - /** - * {@inheritDoc} - */ @Override - protected void channelClose() { - - } - - /** - * {@inheritDoc} - */ - @Override - public void flushWriteQueue() { - } - - /** - * {@inheritDoc} - */ - @Override - protected int writeDirect(Object message) { - return 0; - } - - /** - * {@inheritDoc} - */ - @Override - protected ByteBuffer convertToDirectBuffer(WriteRequest writeRequest, boolean createNew) { + public WriteRequest enqueueWriteRequest(WriteRequest writeRequest) { return null; } } http://git-wip-us.apache.org/repos/asf/mina/blob/f180462b/core/src/test/resources/log4j2-test.xml ---------------------------------------------------------------------- diff --git a/core/src/test/resources/log4j2-test.xml b/core/src/test/resources/log4j2-test.xml index aaa59df..f7c3d40 100644 --- a/core/src/test/resources/log4j2-test.xml +++ b/core/src/test/resources/log4j2-test.xml @@ -7,7 +7,7 @@ </appenders> <loggers> <logger name="org.apache.log4j.xml" level="info"/> - <root level="info"> + <root level="error"> <appender-ref ref="STDOUT"/> </root> </loggers>
