You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by jv...@apache.org on 2012/11/22 22:47:29 UTC
svn commit: r1412679 - in /mina/mina/trunk:
core/src/main/java/org/apache/mina/filter/codec/
core/src/main/java/org/apache/mina/session/
core/src/main/java/org/apache/mina/util/
core/src/test/java/org/apache/mina/filter/codec/ core/src/test/java/org/ap...
Author: jvermillard
Date: Thu Nov 22 21:47:25 2012
New Revision: 1412679
URL: http://svn.apache.org/viewvc?rev=1412679&view=rev
Log:
more test, fixed imports
Modified:
mina/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoder.java
mina/mina/trunk/core/src/main/java/org/apache/mina/session/AbstractIoSession.java
mina/mina/trunk/core/src/main/java/org/apache/mina/util/AbstractIoFuture.java
mina/mina/trunk/core/src/test/java/org/apache/mina/filter/codec/ProtocolCodecFilterTest.java
mina/mina/trunk/core/src/test/java/org/apache/mina/transport/tcp/NioTcpServerHandlerTest.java
mina/mina/trunk/core/src/test/java/org/apache/mina/transport/tcp/ProxySocketSessionConfigTest.java
mina/mina/trunk/http/src/test/java/org/apache/mina/http/DateUtilTest.java
Modified: mina/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoder.java
URL: http://svn.apache.org/viewvc/mina/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoder.java?rev=1412679&r1=1412678&r2=1412679&view=diff
==============================================================================
--- mina/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoder.java (original)
+++ mina/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoder.java Thu Nov 22 21:47:25 2012
@@ -21,6 +21,7 @@ package org.apache.mina.filter.codec;
import org.apache.mina.api.IoSession;
import org.apache.mina.filterchain.WriteFilterChainController;
+import org.apache.mina.util.IoBuffer;
/**
* Encodes higher-level message objects into binary or protocol-specific data.
Modified: mina/mina/trunk/core/src/main/java/org/apache/mina/session/AbstractIoSession.java
URL: http://svn.apache.org/viewvc/mina/mina/trunk/core/src/main/java/org/apache/mina/session/AbstractIoSession.java?rev=1412679&r1=1412678&r2=1412679&view=diff
==============================================================================
--- mina/mina/trunk/core/src/main/java/org/apache/mina/session/AbstractIoSession.java (original)
+++ mina/mina/trunk/core/src/main/java/org/apache/mina/session/AbstractIoSession.java Thu Nov 22 21:47:25 2012
@@ -769,14 +769,14 @@ public abstract class AbstractIoSession
LOG.debug("processing message '{}' sent event for session {}", highLevelMessage, this);
try {
- final int size = chain.length;
- for (int i = size - 1; i >= 0; i--) {
- chain[i].messageSent(this, highLevelMessage);
- }
- final IoHandler handler = getService().getIoHandler();
- if (handler != null) {
- handler.messageSent(this, highLevelMessage);
- }
+ final int size = chain.length;
+ for (int i = size - 1; i >= 0; i--) {
+ chain[i].messageSent(this, highLevelMessage);
+ }
+ final IoHandler handler = getService().getIoHandler();
+ if (handler != null) {
+ handler.messageSent(this, highLevelMessage);
+ }
} catch (final RuntimeException e) {
processException(e);
}
@@ -828,4 +828,5 @@ public abstract class AbstractIoSession
readChainPosition--;
}
+
}
\ No newline at end of file
Modified: mina/mina/trunk/core/src/main/java/org/apache/mina/util/AbstractIoFuture.java
URL: http://svn.apache.org/viewvc/mina/mina/trunk/core/src/main/java/org/apache/mina/util/AbstractIoFuture.java?rev=1412679&r1=1412678&r2=1412679&view=diff
==============================================================================
--- mina/mina/trunk/core/src/main/java/org/apache/mina/util/AbstractIoFuture.java (original)
+++ mina/mina/trunk/core/src/main/java/org/apache/mina/util/AbstractIoFuture.java Thu Nov 22 21:47:25 2012
@@ -27,11 +27,10 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicReference;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.mina.api.IoFuture;
import org.apache.mina.api.IoFutureListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An abstract implementation of {@link IoFuture}. Owners of this future
Modified: mina/mina/trunk/core/src/test/java/org/apache/mina/filter/codec/ProtocolCodecFilterTest.java
URL: http://svn.apache.org/viewvc/mina/mina/trunk/core/src/test/java/org/apache/mina/filter/codec/ProtocolCodecFilterTest.java?rev=1412679&r1=1412678&r2=1412679&view=diff
==============================================================================
--- mina/mina/trunk/core/src/test/java/org/apache/mina/filter/codec/ProtocolCodecFilterTest.java (original)
+++ mina/mina/trunk/core/src/test/java/org/apache/mina/filter/codec/ProtocolCodecFilterTest.java Thu Nov 22 21:47:25 2012
@@ -18,9 +18,11 @@
*/
package org.apache.mina.filter.codec;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import org.apache.mina.api.IoSession;
import org.junit.Test;
Modified: mina/mina/trunk/core/src/test/java/org/apache/mina/transport/tcp/NioTcpServerHandlerTest.java
URL: http://svn.apache.org/viewvc/mina/mina/trunk/core/src/test/java/org/apache/mina/transport/tcp/NioTcpServerHandlerTest.java?rev=1412679&r1=1412678&r2=1412679&view=diff
==============================================================================
--- mina/mina/trunk/core/src/test/java/org/apache/mina/transport/tcp/NioTcpServerHandlerTest.java (original)
+++ mina/mina/trunk/core/src/test/java/org/apache/mina/transport/tcp/NioTcpServerHandlerTest.java Thu Nov 22 21:47:25 2012
@@ -31,6 +31,7 @@ import java.util.concurrent.TimeUnit;
import junit.framework.Assert;
import org.apache.mina.api.AbstractIoHandler;
+import org.apache.mina.api.IdleStatus;
import org.apache.mina.api.IoHandler;
import org.apache.mina.api.IoSession;
import org.apache.mina.transport.nio.FixedSelectorLoopPool;
@@ -68,6 +69,7 @@ public class NioTcpServerHandlerTest {
public void generate_all_kind_of_server_event() throws IOException, InterruptedException {
final NioTcpServer server = new NioTcpServer();
server.setFilters();
+ server.getSessionConfig().setIdleTimeInMillis(IdleStatus.READ_IDLE, 1000);
server.setIoHandler(new Handler());
server.bind(0);
@@ -107,6 +109,9 @@ public class NioTcpServerHandlerTest {
assertEquals("test:" + i, text);
}
+ // does the session idle event was fired ?
+ assertTrue(idleLatch.await(5 * WAIT_TIME, TimeUnit.MILLISECONDS));
+
// close the session
assertEquals(CLIENT_COUNT, closedLatch.getCount());
for (int i = 0; i < CLIENT_COUNT; i++) {
@@ -206,6 +211,13 @@ public class NioTcpServerHandlerTest {
LOG.info("** message sent {}", message);
msgSentLatch.countDown();
}
+
+ @Override
+ public void sessionIdle(IoSession session, IdleStatus status) {
+ if (status == IdleStatus.READ_IDLE) {
+ idleLatch.countDown();
+ }
+ }
}
}
Modified: mina/mina/trunk/core/src/test/java/org/apache/mina/transport/tcp/ProxySocketSessionConfigTest.java
URL: http://svn.apache.org/viewvc/mina/mina/trunk/core/src/test/java/org/apache/mina/transport/tcp/ProxySocketSessionConfigTest.java?rev=1412679&r1=1412678&r2=1412679&view=diff
==============================================================================
--- mina/mina/trunk/core/src/test/java/org/apache/mina/transport/tcp/ProxySocketSessionConfigTest.java (original)
+++ mina/mina/trunk/core/src/test/java/org/apache/mina/transport/tcp/ProxySocketSessionConfigTest.java Thu Nov 22 21:47:25 2012
@@ -18,9 +18,15 @@
*/
package org.apache.mina.transport.tcp;
-import static org.junit.Assert.*;
-import static org.mockito.Matchers.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
import java.net.Socket;
import java.net.SocketException;
Modified: mina/mina/trunk/http/src/test/java/org/apache/mina/http/DateUtilTest.java
URL: http://svn.apache.org/viewvc/mina/mina/trunk/http/src/test/java/org/apache/mina/http/DateUtilTest.java?rev=1412679&r1=1412678&r2=1412679&view=diff
==============================================================================
--- mina/mina/trunk/http/src/test/java/org/apache/mina/http/DateUtilTest.java (original)
+++ mina/mina/trunk/http/src/test/java/org/apache/mina/http/DateUtilTest.java Thu Nov 22 21:47:25 2012
@@ -1,14 +1,14 @@
package org.apache.mina.http;
-import org.junit.Assert;
-import org.junit.Test;
-
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
+import org.junit.Assert;
+import org.junit.Test;
+
/**
* Test class for DateUtil
*/