Author: elecharny
Date: Tue Oct 28 16:58:17 2008
New Revision: 708731
URL: http://svn.apache.org/viewvc?rev=708731&view=rev
Log:
Switched to Junit 4 construct, adding @Test, @Before, @After and static asserts
elements in the test
Modified:
mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java
Modified:
mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java?rev=708731&r1=708730&r2=708731&view=diff
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java
Tue Oct 28 16:58:17 2008
@@ -21,8 +21,6 @@
import java.net.SocketAddress;
-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;
@@ -30,6 +28,13 @@
import org.apache.mina.core.service.IoHandlerAdapter;
import org.apache.mina.core.service.TransportMetadata;
import org.apache.mina.core.session.IoSession;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
/**
* Abstract base class for testing suspending and resuming reads and
@@ -38,7 +43,7 @@
* @author The Apache MINA Project ([EMAIL PROTECTED])
* @version $Rev$, $Date$
*/
-public abstract class AbstractTrafficControlTest extends TestCase {
+public abstract class AbstractTrafficControlTest {
protected int port;
protected IoAcceptor acceptor;
@@ -48,18 +53,15 @@
this.acceptor = acceptor;
}
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
+ @Before
+ public void setUp() throws Exception {
acceptor.setHandler(new ServerIoHandler());
acceptor.bind(createServerSocketAddress(0));
port = getPort(acceptor.getLocalAddress());
}
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
+ @After
+ public void tearDown() throws Exception {
acceptor.unbind();
acceptor.dispose();
}
@@ -70,6 +72,7 @@
protected abstract SocketAddress createServerSocketAddress(int port);
protected abstract int getPort(SocketAddress address);
+ @Test
public void testSuspendResumeReadWrite() throws Exception {
ConnectFuture future = connect(port, new ClientIoHandler());
future.awaitUninterruptibly();
@@ -80,7 +83,7 @@
while (session.getAttribute("lock") == null) {
Thread.yield();
}
-
+
Object lock = session.getAttribute("lock");
synchronized (lock) {
