You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2013/05/17 15:01:11 UTC
[2/2] git commit: o Removed useless imports o Fixed references to
junit.framework.Assert
o Removed useless imports
o Fixed references to junit.framework.Assert
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/523b3627
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/523b3627
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/523b3627
Branch: refs/heads/trunk
Commit: 523b362744b012add2608adbec5a9b4a7fc818ed
Parents: 13d52b8
Author: Emmanuel Lécharny <el...@apache.org>
Authored: Fri May 17 14:56:59 2013 +0200
Committer: Emmanuel Lécharny <el...@apache.org>
Committed: Fri May 17 14:56:59 2013 +0200
----------------------------------------------------------------------
.../apache/mina/session/AbstractIoSessionTest.java | 17 +++++++--------
.../mina/transport/tcp/IdleTcpServerTest.java | 4 +-
.../transport/tcp/NioTcpClientFilterEventTest.java | 8 +++---
.../transport/tcp/NioTcpServerFilterEventTest.java | 6 ++--
.../transport/tcp/NioTcpServerHandlerTest.java | 11 ++++-----
.../org/apache/mina/transport/tcp/SslTest.java | 1 -
6 files changed, 22 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/523b3627/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 c49ab9c..bef0acc 100644
--- a/core/src/test/java/org/apache/mina/session/AbstractIoSessionTest.java
+++ b/core/src/test/java/org/apache/mina/session/AbstractIoSessionTest.java
@@ -18,10 +18,11 @@
*/
package org.apache.mina.session;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
+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;
@@ -32,8 +33,6 @@ import static org.mockito.Mockito.when;
import java.net.SocketAddress;
import java.nio.ByteBuffer;
-import junit.framework.Assert;
-
import org.apache.mina.api.AbstractIoFilter;
import org.apache.mina.api.IoFilter;
import org.apache.mina.api.IoFuture;
@@ -172,7 +171,7 @@ public class AbstractIoSessionTest {
@Test
public void testGetId() {
- Assert.assertNotSame((new DummySession(service)).getId(), (new DummySession(service)).getId());
+ assertNotSame((new DummySession(service)).getId(), (new DummySession(service)).getId());
}
@@ -181,8 +180,8 @@ public class AbstractIoSessionTest {
final long before = System.currentTimeMillis();
final long creation = (new DummySession(service)).getCreationTime();
final long after = System.currentTimeMillis();
- Assert.assertTrue(creation <= after);
- Assert.assertTrue(creation >= before);
+ assertTrue(creation <= after);
+ assertTrue(creation >= before);
}
@Test
http://git-wip-us.apache.org/repos/asf/mina/blob/523b3627/core/src/test/java/org/apache/mina/transport/tcp/IdleTcpServerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/mina/transport/tcp/IdleTcpServerTest.java b/core/src/test/java/org/apache/mina/transport/tcp/IdleTcpServerTest.java
index 5d57093..366db52 100644
--- a/core/src/test/java/org/apache/mina/transport/tcp/IdleTcpServerTest.java
+++ b/core/src/test/java/org/apache/mina/transport/tcp/IdleTcpServerTest.java
@@ -19,8 +19,8 @@
*/
package org.apache.mina.transport.tcp;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.IOException;
import java.net.InetSocketAddress;
http://git-wip-us.apache.org/repos/asf/mina/blob/523b3627/core/src/test/java/org/apache/mina/transport/tcp/NioTcpClientFilterEventTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/mina/transport/tcp/NioTcpClientFilterEventTest.java b/core/src/test/java/org/apache/mina/transport/tcp/NioTcpClientFilterEventTest.java
index 5c1fd9d..053a823 100644
--- a/core/src/test/java/org/apache/mina/transport/tcp/NioTcpClientFilterEventTest.java
+++ b/core/src/test/java/org/apache/mina/transport/tcp/NioTcpClientFilterEventTest.java
@@ -19,10 +19,10 @@
*/
package org.apache.mina.transport.tcp;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.IOException;
import java.net.InetSocketAddress;
http://git-wip-us.apache.org/repos/asf/mina/blob/523b3627/core/src/test/java/org/apache/mina/transport/tcp/NioTcpServerFilterEventTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/mina/transport/tcp/NioTcpServerFilterEventTest.java b/core/src/test/java/org/apache/mina/transport/tcp/NioTcpServerFilterEventTest.java
index 8b04729..072f358 100644
--- a/core/src/test/java/org/apache/mina/transport/tcp/NioTcpServerFilterEventTest.java
+++ b/core/src/test/java/org/apache/mina/transport/tcp/NioTcpServerFilterEventTest.java
@@ -19,9 +19,9 @@
*/
package org.apache.mina.transport.tcp;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.IOException;
import java.net.Socket;
http://git-wip-us.apache.org/repos/asf/mina/blob/523b3627/core/src/test/java/org/apache/mina/transport/tcp/NioTcpServerHandlerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/mina/transport/tcp/NioTcpServerHandlerTest.java b/core/src/test/java/org/apache/mina/transport/tcp/NioTcpServerHandlerTest.java
index d10658a..4fc8441 100644
--- a/core/src/test/java/org/apache/mina/transport/tcp/NioTcpServerHandlerTest.java
+++ b/core/src/test/java/org/apache/mina/transport/tcp/NioTcpServerHandlerTest.java
@@ -19,8 +19,9 @@
*/
package org.apache.mina.transport.tcp;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.IOException;
import java.net.Socket;
@@ -28,8 +29,6 @@ import java.nio.ByteBuffer;
import java.util.concurrent.CountDownLatch;
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;
@@ -199,10 +198,10 @@ public class NioTcpServerHandlerTest {
LOG.debug("** message received {}", message);
msgReadLatch.countDown();
if (message instanceof ByteBuffer) {
- final ByteBuffer msg = (ByteBuffer) message;
+ ByteBuffer msg = (ByteBuffer) message;
session.write(ByteBuffer.allocate(msg.remaining()).put(msg).flip());
} else {
- Assert.fail("non bytebuffer received??");
+ fail("non bytebuffer received??");
}
}
http://git-wip-us.apache.org/repos/asf/mina/blob/523b3627/core/src/test/java/org/apache/mina/transport/tcp/SslTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/mina/transport/tcp/SslTest.java b/core/src/test/java/org/apache/mina/transport/tcp/SslTest.java
index 8a7aa61..798a1f4 100644
--- a/core/src/test/java/org/apache/mina/transport/tcp/SslTest.java
+++ b/core/src/test/java/org/apache/mina/transport/tcp/SslTest.java
@@ -42,7 +42,6 @@ import javax.net.ssl.TrustManagerFactory;
import org.apache.mina.api.AbstractIoHandler;
import org.apache.mina.api.IoSession;
-import org.apache.mina.transport.nio.tcp.NioTcpClient;
import org.apache.mina.transport.nio.tcp.NioTcpServer;
import org.junit.Ignore;
import org.junit.Test;