Author: elecharny
Date: Thu Jan 21 11:23:32 2010
New Revision: 901656
URL: http://svn.apache.org/viewvc?rev=901656&view=rev
Log:
Switched more classes to JUnit 4 @nnotations
Modified:
mina/trunk/core/src/test/java/org/apache/mina/handler/demux/DemuxingIoHandlerTest.java
mina/trunk/core/src/test/java/org/apache/mina/proxy/HttpAuthTest.java
mina/trunk/core/src/test/java/org/apache/mina/proxy/MD4Test.java
mina/trunk/core/src/test/java/org/apache/mina/proxy/NTLMTest.java
mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractBindTest.java
mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractConnectorTest.java
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramPortUnreachableTest.java
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramSessionIdleTest.java
mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeEventOrderTest.java
mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeSessionCrossCommunicationTest.java
mina/trunk/example/src/test/java/org/apache/mina/example/chat/SpringMainTest.java
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AcceptorTest.java
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java
Modified:
mina/trunk/core/src/test/java/org/apache/mina/handler/demux/DemuxingIoHandlerTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/handler/demux/DemuxingIoHandlerTest.java?rev=901656&r1=901655&r2=901656&view=diff
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/handler/demux/DemuxingIoHandlerTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/handler/demux/DemuxingIoHandlerTest.java
Thu Jan 21 11:23:32 2010
@@ -19,10 +19,10 @@
*/
package org.apache.mina.handler.demux;
-import junit.framework.TestCase;
-
import org.apache.mina.core.session.IoSession;
import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
/**
* Tests {...@link org.apache.mina.handler.demux.DemuxingIoHandler}.
@@ -30,7 +30,7 @@
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
*/
@SuppressWarnings("unchecked")
-public class DemuxingIoHandlerTest extends TestCase {
+public class DemuxingIoHandlerTest {
MessageHandler handler1;
MessageHandler handler2;
@@ -41,10 +41,8 @@
Object[] msg;
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
+ @Before
+ public void setUp() throws Exception {
/*
* Create the messages.
*/
@@ -69,6 +67,7 @@
session = EasyMock.createMock( IoSession.class);
}
+ @Test
public void testFindHandlerByClass() throws Exception {
/*
* Record expectations.
@@ -126,6 +125,7 @@
EasyMock.verify(handler3);
}
+ @Test
public void testFindHandlerByInterface() throws Exception {
/*
* Record expectations.
Modified: mina/trunk/core/src/test/java/org/apache/mina/proxy/HttpAuthTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/proxy/HttpAuthTest.java?rev=901656&r1=901655&r2=901656&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/proxy/HttpAuthTest.java
(original)
+++ mina/trunk/core/src/test/java/org/apache/mina/proxy/HttpAuthTest.java Thu
Jan 21 11:23:32 2010
@@ -19,13 +19,14 @@
*/
package org.apache.mina.proxy;
-import java.util.HashMap;
+import static org.junit.Assert.assertEquals;
-import junit.framework.TestCase;
+import java.util.HashMap;
import org.apache.mina.core.session.DummySession;
import org.apache.mina.proxy.handlers.http.basic.HttpBasicAuthLogicHandler;
import org.apache.mina.proxy.handlers.http.digest.DigestUtilities;
+import org.junit.Test;
/**
* HttpAuthTest.java - JUNIT tests of the HTTP Basic & Digest authentication
mechanisms.
@@ -34,7 +35,7 @@
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
* @since MINA 2.0.0-M3
*/
-public class HttpAuthTest extends TestCase {
+public class HttpAuthTest {
/**
* The charset in use.
@@ -44,6 +45,8 @@
/**
* Tests Basic authentication mechanism.
*/
+ @Test
+
public void testBasicAuthResponse() {
String USER = "Aladdin";
String PWD = "open sesame";
@@ -55,6 +58,7 @@
/**
* Tests Http Digest authentication mechanism.
*/
+ @Test
public void testDigestAuthResponse() {
String USER = "Mufasa";
String PWD = "Circle Of Life";
Modified: mina/trunk/core/src/test/java/org/apache/mina/proxy/MD4Test.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/proxy/MD4Test.java?rev=901656&r1=901655&r2=901656&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/proxy/MD4Test.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/proxy/MD4Test.java Thu Jan 21
11:23:32 2010
@@ -20,6 +20,7 @@
package org.apache.mina.proxy;
import static org.apache.mina.proxy.utils.ByteUtilities.asHex;
+import static org.junit.Assert.assertEquals;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -27,8 +28,8 @@
import java.security.Security;
import org.apache.mina.proxy.utils.MD4Provider;
-
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
/**
* MD4Test.java - JUnit testcase that tests the rfc 1320 test suite.
@@ -37,13 +38,13 @@
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
* @since MINA 2.0.0-M3
*/
-public class MD4Test extends TestCase {
+public class MD4Test {
/**
* {...@inheritdoc}
*/
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
if (Security.getProvider(MD4Provider.PROVIDER_NAME) == null) {
System.out.print("Adding MINA provider...");
Security.addProvider(new MD4Provider());
@@ -54,6 +55,7 @@
/**
* Test suite for the MD4 algorithm.
*/
+ @Test
public void testRFCVectors() throws NoSuchAlgorithmException,
NoSuchProviderException {
MessageDigest md4 = MessageDigest.getInstance("MD4",
@@ -76,6 +78,7 @@
* Original test vector found on <a
href="http://en.wikipedia.org/wiki/MD4";>wikipedia(en)</a>
* and <a href="http://fr.wikipedia.org/wiki/MD4";>wikipedia(fr)</a>
*/
+ @Test
public void testWikipediaVectors() throws NoSuchAlgorithmException,
NoSuchProviderException {
MessageDigest md4 = MessageDigest.getInstance("MD4",
@@ -98,10 +101,7 @@
*/
private static void doTest(MessageDigest md4, String expected,
String testVector) {
- System.out.print("Testing vector [" + testVector + "]: ");
String result = asHex(md4.digest(testVector.getBytes()));
- System.out.print(result);
assertEquals(expected, result);
- //System.out.println(" ... Ok");
}
}
Modified: mina/trunk/core/src/test/java/org/apache/mina/proxy/NTLMTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/proxy/NTLMTest.java?rev=901656&r1=901655&r2=901656&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/proxy/NTLMTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/proxy/NTLMTest.java Thu Jan
21 11:23:32 2010
@@ -20,6 +20,7 @@
package org.apache.mina.proxy;
import static org.apache.mina.proxy.utils.ByteUtilities.asHex;
+import static org.junit.Assert.assertEquals;
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
@@ -27,12 +28,11 @@
import java.security.NoSuchAlgorithmException;
import java.security.Security;
-import junit.framework.TestCase;
-
import org.apache.mina.proxy.handlers.http.ntlm.NTLMResponses;
import org.apache.mina.proxy.handlers.http.ntlm.NTLMUtilities;
import org.apache.mina.proxy.utils.ByteUtilities;
import org.apache.mina.proxy.utils.MD4Provider;
+import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,7 +42,7 @@
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
* @since MINA 2.0.0-M3
*/
-public class NTLMTest extends TestCase {
+public class NTLMTest {
private final static Logger logger = LoggerFactory
.getLogger(NTLMTest.class);
@@ -55,6 +55,7 @@
/**
* Tests bytes manipulations.
*/
+ @Test
public void testEncoding() throws UnsupportedEncodingException {
assertEquals("d204", asHex(ByteUtilities.writeShort((short) 1234)));
assertEquals("d2040000", asHex(ByteUtilities.writeInt(1234)));
@@ -70,6 +71,7 @@
/**
* Tests conversions to and from network byte order.
*/
+ @Test
public void testMethods() {
byte[] buf = new byte[4];
ByteUtilities.intToNetworkByteOrder(1234, buf, 0, 4);
@@ -80,6 +82,7 @@
/**
* Tests security buffers.
*/
+ @Test
public void testSecurityBuffer() {
byte[] secBuf = new byte[8];
NTLMUtilities.writeSecurityBuffer((short) 1234, (short) 1234, 4321,
@@ -90,6 +93,7 @@
/**
* Tests creating a type 1 message.
*/
+ @Test
public void testType1Message() {
int customFlags = NTLMUtilities.FLAG_NEGOTIATE_UNICODE
| NTLMUtilities.FLAG_NEGOTIATE_OEM
@@ -125,6 +129,7 @@
* Tests creating a type 3 message.
* WARNING: Will silently fail if no MD4 digest provider is available.
*/
+ @Test
public void testType3Message() throws Exception {
try {
MessageDigest.getInstance("MD4");
@@ -191,6 +196,7 @@
/**
* Tests flags manipulations.
*/
+ @Test
public void testFlags() {
int flags = NTLMUtilities.FLAG_NEGOTIATE_UNICODE
| NTLMUtilities.FLAG_REQUEST_SERVER_AUTH_REALM
@@ -220,6 +226,7 @@
* Tests response computing.
* WARNING: Will silently fail if no MD4 digest provider is available.
*/
+ @Test
public void testResponses() throws Exception {
try {
MessageDigest.getInstance("MD4");
Modified:
mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractBindTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractBindTest.java?rev=901656&r1=901655&r2=901656&view=diff
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractBindTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractBindTest.java
Thu Jan 21 11:23:32 2010
@@ -19,12 +19,17 @@
*/
package org.apache.mina.transport;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.io.IOException;
import java.net.SocketAddress;
import java.util.Collection;
-import junit.framework.TestCase;
-
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.future.ConnectFuture;
import org.apache.mina.core.service.IoAcceptor;
@@ -36,6 +41,9 @@
import org.apache.mina.transport.socket.DatagramSessionConfig;
import org.apache.mina.transport.socket.SocketAcceptor;
import org.apache.mina.transport.socket.SocketSessionConfig;
+import org.junit.After;
+import org.junit.Ignore;
+import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,7 +52,7 @@
*
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
*/
-public abstract class AbstractBindTest extends TestCase {
+public abstract class AbstractBindTest {
protected final IoAcceptor acceptor;
protected int port;
@@ -99,7 +107,7 @@
}
}
- @Override
+ @After
public void tearDown() {
try {
acceptor.dispose();
@@ -110,6 +118,7 @@
acceptor.setDefaultLocalAddress(null);
}
+ @Test
public void testAnonymousBind() throws Exception {
acceptor.setHandler(new IoHandlerAdapter());
acceptor.setDefaultLocalAddress(null);
@@ -124,6 +133,7 @@
acceptor.unbind(acceptor.getLocalAddress());
}
+ @Test
public void testDuplicateBind() throws IOException {
bind(false);
@@ -136,6 +146,7 @@
}
}
+ @Test
public void testDuplicateUnbind() throws IOException {
bind(false);
@@ -146,6 +157,7 @@
acceptor.unbind();
}
+ @Test
public void testManyTimes() throws IOException {
bind(true);
@@ -155,6 +167,7 @@
}
}
+ @Test
public void testUnbindDisconnectsClients() throws Exception {
bind(true);
IoConnector connector = newConnector();
@@ -185,6 +198,7 @@
}
}
+ @Test
public void testUnbindResume() throws Exception {
bind(true);
IoConnector connector = newConnector();
@@ -230,7 +244,9 @@
assertEquals(1, managedSession.size());
}
- public void _testRegressively() throws IOException {
+ @Test
+ @Ignore
+ public void testRegressively() throws IOException {
setReuseAddress(true);
SocketAddress addr = createSocketAddress(port);
@@ -240,9 +256,6 @@
for (int i = 0; i < 1048576; i++) {
acceptor.bind();
acceptor.unbind();
- //if (i % 100 == 0) {
- //System.out.println(i + " (" + new Date() + ")");
- //}
}
bind(false);
}
Modified:
mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractConnectorTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractConnectorTest.java?rev=901656&r1=901655&r2=901656&view=diff
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractConnectorTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractConnectorTest.java
Thu Jan 21 11:23:32 2010
@@ -19,13 +19,17 @@
*/
package org.apache.mina.transport;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.net.InetSocketAddress;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
import junit.framework.Assert;
-import junit.framework.TestCase;
import org.apache.mina.core.RuntimeIoException;
import org.apache.mina.core.future.ConnectFuture;
@@ -35,17 +39,19 @@
import org.apache.mina.core.session.IoSession;
import org.apache.mina.core.session.IoSessionInitializer;
import org.apache.mina.util.AvailablePortFinder;
+import org.junit.Test;
/**
* Tests a generic {...@link IoConnector}.
*
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
*/
-public abstract class AbstractConnectorTest extends TestCase {
+public abstract class AbstractConnectorTest {
protected abstract IoAcceptor createAcceptor();
protected abstract IoConnector createConnector();
+ @Test
public void testConnectFutureSuccessTiming() throws Exception {
int port = AvailablePortFinder.getNextAvailable(1025);
IoAcceptor acceptor = createAcceptor();
@@ -84,6 +90,7 @@
}
}
+ @Test
public void testConnectFutureFailureTiming() throws Exception {
int port = AvailablePortFinder.getNextAvailable(1025);
final StringBuffer buf = new StringBuffer();
@@ -127,6 +134,7 @@
/**
* Test to make sure the SessionCallback gets invoked before
IoHandler.sessionCreated.
*/
+ @Test
public void testSessionCallbackInvocation() throws Exception {
final int callbackInvoked = 0;
final int sessionCreatedInvoked = 1;
Modified:
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java?rev=901656&r1=901655&r2=901656&view=diff
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java
Thu Jan 21 11:23:32 2010
@@ -22,7 +22,6 @@
import java.net.InetSocketAddress;
import junit.framework.Assert;
-import junit.framework.TestCase;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.filterchain.IoFilter;
@@ -35,13 +34,16 @@
import org.apache.mina.core.service.IoHandlerAdapter;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.util.AvailablePortFinder;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
/**
* Tests if {...@link NioDatagramAcceptor} session is configured properly.
*
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
*/
-public class DatagramConfigTest extends TestCase {
+public class DatagramConfigTest {
private IoAcceptor acceptor;
private IoConnector connector;
String result;
@@ -50,19 +52,20 @@
// Do nothing
}
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
result = "";
acceptor = new NioDatagramAcceptor();
connector = new NioDatagramConnector();
}
- @Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
acceptor.dispose();
connector.dispose();
}
+ @Test
public void testAcceptorFilterChain() throws Exception {
int port = AvailablePortFinder.getNextAvailable(1024 + 1000);
IoFilter mockFilter = new MockFilter();
Modified:
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramPortUnreachableTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramPortUnreachableTest.java?rev=901656&r1=901655&r2=901656&view=diff
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramPortUnreachableTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramPortUnreachableTest.java
Thu Jan 21 11:23:32 2010
@@ -19,11 +19,11 @@
*/
package org.apache.mina.transport.socket.nio;
+import static org.junit.Assert.assertEquals;
+
import java.net.InetSocketAddress;
import java.net.PortUnreachableException;
-import junit.framework.TestCase;
-
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.future.ConnectFuture;
import org.apache.mina.core.service.IoConnector;
@@ -31,13 +31,14 @@
import org.apache.mina.core.session.IoSession;
import org.apache.mina.transport.socket.DatagramSessionConfig;
import org.apache.mina.util.AvailablePortFinder;
+import org.junit.Test;
/**
* Tests {...@link DatagramSessionConfig#setCloseOnPortUnreachable(boolean)}.
*
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
*/
-public class DatagramPortUnreachableTest extends TestCase {
+public class DatagramPortUnreachableTest {
Object mutex = new Object();
@@ -78,11 +79,13 @@
connector.dispose();
}
+ @Test
public void testPortUnreachableClosesSession() throws Exception {
// session should be closing
runTest(true);
}
+ @Test
public void testNormal() throws Exception {
// test that session is not closed on port unreachable exception
runTest(false);
Modified:
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java?rev=901656&r1=901655&r2=901656&view=diff
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java
Thu Jan 21 11:23:32 2010
@@ -22,7 +22,6 @@
import java.net.InetSocketAddress;
import junit.framework.Assert;
-import junit.framework.TestCase;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.future.ConnectFuture;
@@ -32,13 +31,16 @@
import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.util.AvailablePortFinder;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
/**
* Tests if datagram sessions are recycled properly.
*
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
*/
-public class DatagramRecyclerTest extends TestCase {
+public class DatagramRecyclerTest {
private NioDatagramAcceptor acceptor;
private NioDatagramConnector connector;
@@ -46,20 +48,19 @@
// Do nothing
}
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
acceptor = new NioDatagramAcceptor();
connector = new NioDatagramConnector();
}
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
+ @After
+ public void tearDown() throws Exception {
acceptor.dispose();
connector.dispose();
}
+ @Test
public void testDatagramRecycler() throws Exception {
int port = AvailablePortFinder.getNextAvailable(1024);
ExpiringSessionRecycler recycler = new ExpiringSessionRecycler(1, 1);
@@ -107,6 +108,7 @@
}
}
+ @Test
public void testCloseRequest() throws Exception {
int port = AvailablePortFinder.getNextAvailable(1024);
ExpiringSessionRecycler recycler = new ExpiringSessionRecycler(10, 1);
Modified:
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramSessionIdleTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramSessionIdleTest.java?rev=901656&r1=901655&r2=901656&view=diff
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramSessionIdleTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramSessionIdleTest.java
Thu Jan 21 11:23:32 2010
@@ -19,20 +19,22 @@
*/
package org.apache.mina.transport.socket.nio;
-import java.net.InetSocketAddress;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
-import junit.framework.TestCase;
+import java.net.InetSocketAddress;
import org.apache.mina.core.service.IoHandlerAdapter;
import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession;
+import org.junit.Test;
/**
* Test for DIRMINA-732
*
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
*/
-public class DatagramSessionIdleTest extends TestCase {
+public class DatagramSessionIdleTest {
private boolean readerIdleReceived;
@@ -63,6 +65,7 @@
}
}
+ @Test
public void testSessionIdle() throws Exception {
final int READER_IDLE_TIME = 3;//seconds
final int WRITER_IDLE_TIME = READER_IDLE_TIME + 2;//seconds
Modified:
mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeEventOrderTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeEventOrderTest.java?rev=901656&r1=901655&r2=901656&view=diff
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeEventOrderTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeEventOrderTest.java
Thu Jan 21 11:23:32 2010
@@ -23,7 +23,6 @@
import java.util.concurrent.TimeUnit;
import junit.framework.Assert;
-import junit.framework.TestCase;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.future.ConnectFuture;
@@ -32,13 +31,15 @@
import org.apache.mina.core.service.IoHandlerAdapter;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.executor.ExecutorFilter;
+import org.junit.Test;
/**
* Makes sure the order of events are correct.
*
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
*/
-public class VmPipeEventOrderTest extends TestCase {
+public class VmPipeEventOrderTest {
+ @Test
public void testServerToClient() throws Exception {
IoAcceptor acceptor = new VmPipeAcceptor();
IoConnector connector = new VmPipeConnector();
@@ -95,6 +96,7 @@
Assert.assertEquals("ABC", actual.toString());
}
+ @Test
public void testClientToServer() throws Exception {
IoAcceptor acceptor = new VmPipeAcceptor();
IoConnector connector = new VmPipeConnector();
@@ -152,6 +154,7 @@
Assert.assertEquals("ABC", actual.toString());
}
+ @Test
public void testSessionCreated() throws Exception {
final Semaphore semaphore = new Semaphore(0);
final StringBuffer stringBuffer = new StringBuffer();
Modified:
mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeSessionCrossCommunicationTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeSessionCrossCommunicationTest.java?rev=901656&r1=901655&r2=901656&view=diff
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeSessionCrossCommunicationTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeSessionCrossCommunicationTest.java
Thu Jan 21 11:23:32 2010
@@ -18,6 +18,8 @@
*/
package org.apache.mina.transport.vmpipe;
+import static org.junit.Assert.fail;
+
import java.lang.management.ManagementFactory;
import java.lang.management.ThreadInfo;
import java.lang.management.ThreadMXBean;
@@ -25,20 +27,20 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-import junit.framework.TestCase;
-
import org.apache.mina.core.future.ConnectFuture;
import org.apache.mina.core.service.IoAcceptor;
import org.apache.mina.core.service.IoConnector;
import org.apache.mina.core.service.IoHandlerAdapter;
import org.apache.mina.core.session.IoSession;
+import org.junit.Test;
/**
* TODO Add documentation
*
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
*/
-public class VmPipeSessionCrossCommunicationTest extends TestCase {
+public class VmPipeSessionCrossCommunicationTest {
+ @Test
public void testOneSessionTalkingBackAndForthDoesNotDeadlock() throws
Exception {
final VmPipeAddress address = new VmPipeAddress(1);
final IoConnector connector = new VmPipeConnector();
Modified:
mina/trunk/example/src/test/java/org/apache/mina/example/chat/SpringMainTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/chat/SpringMainTest.java?rev=901656&r1=901655&r2=901656&view=diff
==============================================================================
---
mina/trunk/example/src/test/java/org/apache/mina/example/chat/SpringMainTest.java
(original)
+++
mina/trunk/example/src/test/java/org/apache/mina/example/chat/SpringMainTest.java
Thu Jan 21 11:23:32 2010
@@ -19,27 +19,31 @@
*/
package org.apache.mina.example.chat;
-import junit.framework.TestCase;
-import org.springframework.context.ConfigurableApplicationContext;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import org.apache.mina.core.service.IoService;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.context.ConfigurableApplicationContext;
/**
* TODO Add documentation
*
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
*/
-public class SpringMainTest extends TestCase {
+public class SpringMainTest {
private ConfigurableApplicationContext appContext;
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
+ @Before
+ public void tearDown() throws Exception {
if (appContext != null) {
appContext.close();
}
}
+ @Test
public void testContext() {
appContext = SpringMain.getApplicationContext();
IoService service = (IoService) appContext.getBean("ioAcceptor");
Modified:
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java?rev=901656&r1=901655&r2=901656&view=diff
==============================================================================
---
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java
(original)
+++
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java
Thu Jan 21 11:23:32 2010
@@ -18,14 +18,13 @@
*
*/
package org.apache.mina.example.echoserver;
+import static org.junit.Assert.assertEquals;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.security.GeneralSecurityException;
-import junit.framework.TestCase;
-
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.service.IoAcceptor;
import org.apache.mina.core.session.IoSession;
@@ -35,6 +34,8 @@
import org.apache.mina.transport.socket.nio.NioDatagramAcceptor;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import org.apache.mina.util.AvailablePortFinder;
+import org.junit.After;
+import org.junit.Before;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,7 +44,7 @@
*
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
*/
-public abstract class AbstractTest extends TestCase {
+public abstract class AbstractTest {
private final static Logger LOGGER =
LoggerFactory.getLogger(AbstractTest.class);
protected boolean useSSL;
@@ -60,11 +61,11 @@
// Do nothing
}
- protected static void assertEquals(byte[] expected, byte[] actual) {
+ protected static void isEquals(byte[] expected, byte[] actual) {
assertEquals(toString(expected), toString(actual));
}
- protected static void assertEquals(IoBuffer expected, IoBuffer actual) {
+ protected static void isEquals(IoBuffer expected, IoBuffer actual) {
assertEquals(toString(expected), toString(actual));
}
@@ -81,8 +82,8 @@
return buf.getHexDump();
}
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
// Disable SSL by default
useSSL = false;
@@ -182,8 +183,8 @@
LOGGER.info("Using port " + port + " for testing.");
}
- @Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
if (boundAddress != null) {
socketAcceptor.dispose();
datagramAcceptor.dispose();
Modified:
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AcceptorTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AcceptorTest.java?rev=901656&r1=901655&r2=901656&view=diff
==============================================================================
---
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AcceptorTest.java
(original)
+++
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AcceptorTest.java
Thu Jan 21 11:23:32 2010
@@ -19,14 +19,20 @@
*/
package org.apache.mina.example.echoserver;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.net.DatagramPacket;
import java.net.DatagramSocket;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketTimeoutException;
+import java.util.Arrays;
import org.apache.mina.example.echoserver.ssl.SslServerSocketFactory;
import org.apache.mina.example.echoserver.ssl.SslSocketFactory;
+import org.junit.Test;
/**
* Tests echo server example.
@@ -37,10 +43,12 @@
public AcceptorTest() {
}
+ @Test
public void testTCP() throws Exception {
testTCP0(new Socket("127.0.0.1", port));
}
+ @Test
public void testTCPWithSSL() throws Exception {
// Add an SSL filter
useSSL = true;
@@ -78,7 +86,7 @@
readBytes += nBytes;
}
- assertEquals(writeBuf, readBuf);
+ assertTrue(Arrays.equals( writeBuf, readBuf));
}
client.setSoTimeout(500);
@@ -109,7 +117,7 @@
client.receive(rp);
assertEquals(writeBuf.length, rp.getLength());
- assertEquals(writeBuf, readBuf);
+ assertTrue(Arrays.equals(writeBuf, readBuf));
}
try {
@@ -126,8 +134,4 @@
writeBuf[j] = (byte) (j + i);
}
}
-
- public static void main(String[] args) {
- junit.textui.TestRunner.run(AcceptorTest.class);
- }
}
Modified:
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java?rev=901656&r1=901655&r2=901656&view=diff
==============================================================================
---
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java
(original)
+++
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java
Thu Jan 21 11:23:32 2010
@@ -19,9 +19,11 @@
*/
package org.apache.mina.example.echoserver;
-import java.net.InetSocketAddress;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
-import junit.framework.Assert;
+import java.net.InetSocketAddress;
import org.apache.mina.core.RuntimeIoException;
import org.apache.mina.core.buffer.IoBuffer;
@@ -36,6 +38,8 @@
import org.apache.mina.transport.socket.nio.NioDatagramConnector;
import org.apache.mina.transport.socket.nio.NioSocketConnector;
import org.apache.mina.util.AvailablePortFinder;
+import org.junit.Before;
+import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,8 +64,8 @@
// Do nothing
}
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
super.setUp();
handler = new EchoConnectorHandler();
connectorSSLFilter = new SslFilter(BogusSslContextFactory
@@ -69,11 +73,13 @@
connectorSSLFilter.setUseClientMode(true); // set client mode
}
+ @Test
public void testTCP() throws Exception {
IoConnector connector = new NioSocketConnector();
testConnector(connector);
}
+ @Test
public void testTCPWithSSL() throws Exception {
useSSL = true;
// Create a connector
@@ -84,6 +90,7 @@
testConnector(connector);
}
+ @Test
public void testUDP() throws Exception {
IoConnector connector = new NioDatagramConnector();
testConnector(connector);
@@ -125,7 +132,7 @@
}
if (session == null) {
- Assert.fail("Failed to find out an appropriate local
address.");
+ fail("Failed to find out an appropriate local address.");
}
}
@@ -156,11 +163,11 @@
waitForResponse(handler, 1);
handler.readBuf.flip();
- Assert.assertEquals(1, handler.readBuf.remaining());
- Assert.assertEquals((byte) '.', handler.readBuf.get());
+ assertEquals(1, handler.readBuf.remaining());
+ assertEquals((byte) '.', handler.readBuf.get());
// Now start TLS connection
- Assert.assertTrue(connectorSSLFilter.startSsl(session));
+ assertTrue(connectorSSLFilter.startSsl(session));
testConnector0(session);
}
@@ -197,15 +204,17 @@
//// we share readBuf.
readBuf.flip();
LOGGER.info("readBuf: " + readBuf);
- Assert.assertEquals(DATA_SIZE * COUNT, readBuf.remaining());
+ assertEquals(DATA_SIZE * COUNT, readBuf.remaining());
IoBuffer expectedBuf = IoBuffer.allocate(DATA_SIZE * COUNT);
+
for (int i = 0; i < COUNT; i++) {
expectedBuf.limit((i + 1) * DATA_SIZE);
fillWriteBuffer(expectedBuf, i);
}
+
expectedBuf.position(0);
- assertEquals(expectedBuf, readBuf);
+ isEquals(expectedBuf, readBuf);
}
private void waitForResponse(EchoConnectorHandler handler, int bytes)
@@ -217,7 +226,7 @@
Thread.sleep(10);
}
- Assert.assertEquals(bytes, handler.readBuf.position());
+ assertEquals(bytes, handler.readBuf.position());
}
private void fillWriteBuffer(IoBuffer writeBuf, int i) {
@@ -226,10 +235,6 @@
}
}
- public static void main(String[] args) {
- junit.textui.TestRunner.run(ConnectorTest.class);
- }
-
private static class EchoConnectorHandler extends IoHandlerAdapter {
private final IoBuffer readBuf = IoBuffer.allocate(1024);
