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 2008/10/21 13:44:04 UTC

svn commit: r706586 - in /mina/trunk/core/src/test/java/org/apache/mina/core: DefaultIoFilterChainBuilderTest.java FutureTest.java IoBufferTest.java IoFilterChainTest.java IoServiceListenerSupportTest.java

Author: elecharny
Date: Tue Oct 21 04:44:03 2008
New Revision: 706586

URL: http://svn.apache.org/viewvc?rev=706586&view=rev
Log:
o Switched to Junit 4 syntax : 
- we don't extend testCase anymore
- we are using @Test, and such annotations
o Removed the useless Assert.

Modified:
    mina/trunk/core/src/test/java/org/apache/mina/core/DefaultIoFilterChainBuilderTest.java
    mina/trunk/core/src/test/java/org/apache/mina/core/FutureTest.java
    mina/trunk/core/src/test/java/org/apache/mina/core/IoBufferTest.java
    mina/trunk/core/src/test/java/org/apache/mina/core/IoFilterChainTest.java
    mina/trunk/core/src/test/java/org/apache/mina/core/IoServiceListenerSupportTest.java

Modified: mina/trunk/core/src/test/java/org/apache/mina/core/DefaultIoFilterChainBuilderTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/core/DefaultIoFilterChainBuilderTest.java?rev=706586&r1=706585&r2=706586&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/core/DefaultIoFilterChainBuilderTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/core/DefaultIoFilterChainBuilderTest.java Tue Oct 21 04:44:03 2008
@@ -19,14 +19,17 @@
  */
 package org.apache.mina.core;
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
 import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
 import org.apache.mina.core.filterchain.IoFilter;
 import org.apache.mina.core.filterchain.IoFilterAdapter;
 import org.apache.mina.core.filterchain.IoFilterChain.Entry;
 import org.apache.mina.filter.util.NoopFilter;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
 
 /**
  * Tests {@link DefaultIoFilterChainBuilder}.
@@ -34,19 +37,20 @@
  * @author The Apache MINA Project (dev@mina.apache.org)
  * @version $Rev$, $Date$
  */
-public class DefaultIoFilterChainBuilderTest extends TestCase {
-    public static void main(String[] args) {
+public class DefaultIoFilterChainBuilderTest {
+    /*public static void main(String[] args) {
         junit.textui.TestRunner.run(DefaultIoFilterChainBuilderTest.class);
-    }
+    }*/
 
-    @Override
-    protected void setUp() throws Exception {
+    @Before
+    public void setUp() throws Exception {
     }
 
-    @Override
-    protected void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
     }
 
+    @Test
     public void testAdd() throws Exception {
         DefaultIoFilterChainBuilder builder = new DefaultIoFilterChainBuilder();
 
@@ -64,9 +68,10 @@
             actual += e.getName();
         }
 
-        Assert.assertEquals("FCAEBGDH", actual);
+        assertEquals("FCAEBGDH", actual);
     }
 
+    @Test
     public void testGet() throws Exception {
         DefaultIoFilterChainBuilder builder = new DefaultIoFilterChainBuilder();
 
@@ -80,12 +85,13 @@
         builder.addBefore("B", "C", filterC);
         builder.addAfter("A", "D", filterD);
 
-        Assert.assertSame(filterA, builder.get("A"));
-        Assert.assertSame(filterB, builder.get("B"));
-        Assert.assertSame(filterC, builder.get("C"));
-        Assert.assertSame(filterD, builder.get("D"));
+        assertSame(filterA, builder.get("A"));
+        assertSame(filterB, builder.get("B"));
+        assertSame(filterC, builder.get("C"));
+        assertSame(filterD, builder.get("D"));
     }
 
+    @Test
     public void testRemove() throws Exception {
         DefaultIoFilterChainBuilder builder = new DefaultIoFilterChainBuilder();
 
@@ -101,9 +107,10 @@
         builder.remove("B");
         builder.remove("D");
 
-        Assert.assertEquals(0, builder.getAll().size());
+        assertEquals(0, builder.getAll().size());
     }
 
+    @Test
     public void testClear() throws Exception {
         DefaultIoFilterChainBuilder builder = new DefaultIoFilterChainBuilder();
 
@@ -115,14 +122,15 @@
 
         builder.clear();
 
-        Assert.assertEquals(0, builder.getAll().size());
+        assertEquals(0, builder.getAll().size());
     }
 
+    @Test
     public void testToString() {
         DefaultIoFilterChainBuilder builder = new DefaultIoFilterChainBuilder();
 
         // When the chain is empty
-        Assert.assertEquals("{ empty }", builder.toString());
+        assertEquals("{ empty }", builder.toString());
 
         // When there's one filter
         builder.addLast("A", new IoFilterAdapter() {
@@ -131,7 +139,7 @@
                 return "B";
             }
         });
-        Assert.assertEquals("{ (A:B) }", builder.toString());
+        assertEquals("{ (A:B) }", builder.toString());
 
         // When there are two
         builder.addLast("C", new IoFilterAdapter() {
@@ -140,6 +148,6 @@
                 return "D";
             }
         });
-        Assert.assertEquals("{ (A:B), (C:D) }", builder.toString());
+        assertEquals("{ (A:B), (C:D) }", builder.toString());
     }
 }

Modified: mina/trunk/core/src/test/java/org/apache/mina/core/FutureTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/core/FutureTest.java?rev=706586&r1=706585&r2=706586&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/core/FutureTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/core/FutureTest.java Tue Oct 21 04:44:03 2008
@@ -28,8 +28,14 @@
 import org.apache.mina.core.future.IoFutureListener;
 import org.apache.mina.core.session.DummySession;
 import org.apache.mina.core.session.IoSession;
+import org.junit.Test;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
 
 /**
  * Tests {@link IoFuture} implementations.
@@ -37,8 +43,9 @@
  * @author The Apache MINA Project (dev@mina.apache.org)
  * @version $Rev:671827 $, $Date:2008-06-26 09:49:48 +0100 (jeu., 26 juin 2008) $
  */
-public class FutureTest extends TestCase {
+public class FutureTest {
 
+    @Test
     public void testCloseFuture() throws Exception {
         DefaultCloseFuture future = new DefaultCloseFuture(null);
         assertFalse(future.isDone());
@@ -55,6 +62,7 @@
         assertTrue(future.isClosed());
     }
 
+    @Test
     public void testConnectFuture() throws Exception {
         DefaultConnectFuture future = new DefaultConnectFuture();
         assertFalse(future.isDone());
@@ -94,6 +102,7 @@
         }
     }
 
+    @Test
     public void testWriteFuture() throws Exception {
         DefaultWriteFuture future = new DefaultWriteFuture(null);
         assertFalse(future.isDone());
@@ -122,6 +131,7 @@
         assertTrue(future.getException().getClass() == Exception.class);
     }
 
+    @Test
     public void testAddListener() throws Exception {
         DefaultCloseFuture future = new DefaultCloseFuture(null);
         assertFalse(future.isDone());
@@ -146,6 +156,7 @@
         assertSame(future, listener2.notifiedFuture);
     }
 
+    @Test
     public void testLateAddListener() throws Exception {
         DefaultCloseFuture future = new DefaultCloseFuture(null);
         assertFalse(future.isDone());
@@ -166,6 +177,7 @@
         assertSame(future, listener.notifiedFuture);
     }
 
+    @Test
     public void testRemoveListener1() throws Exception {
         DefaultCloseFuture future = new DefaultCloseFuture(null);
         assertFalse(future.isDone());
@@ -191,6 +203,7 @@
         assertSame(future, listener2.notifiedFuture);
     }
 
+    @Test
     public void testRemoveListener2() throws Exception {
         DefaultCloseFuture future = new DefaultCloseFuture(null);
         assertFalse(future.isDone());

Modified: mina/trunk/core/src/test/java/org/apache/mina/core/IoBufferTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/core/IoBufferTest.java?rev=706586&r1=706585&r2=706586&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/core/IoBufferTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/core/IoBufferTest.java Tue Oct 21 04:44:03 2008
@@ -32,10 +32,18 @@
 import java.util.EnumSet;
 import java.util.List;
 
-import junit.framework.TestCase;
-
 import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.mina.util.Bar;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.fail;
 
 /**
  * Tests {@link IoBuffer}.
@@ -43,20 +51,21 @@
  * @author The Apache MINA Project (dev@mina.apache.org)
  * @version $Rev$, $Date$
  */
-public class IoBufferTest extends TestCase {
+public class IoBufferTest {
 
-    public static void main(String[] args) {
+    /* public static void main(String[] args) {
         junit.textui.TestRunner.run(IoBufferTest.class);
-    }
+    } */
 
-    @Override
-    protected void setUp() throws Exception {
+    @Before
+    public void setUp() throws Exception {
     }
 
-    @Override
-    protected void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
     }
 
+    @Test
     public void testAllocate() throws Exception {
         for (int i = 10; i < 1048576 * 2; i = i * 11 / 10) // increase by 10%
         {
@@ -68,6 +77,7 @@
         }
     }
 
+    @Test
     public void testAutoExpand() throws Exception {
         IoBuffer buf = IoBuffer.allocate(1);
 
@@ -111,6 +121,7 @@
         }
     }
 
+    @Test
     public void testAutoExpandMark() throws Exception {
         IoBuffer buf = IoBuffer.allocate(4).setAutoExpand(true);
 
@@ -130,6 +141,7 @@
         assertEquals(3, buf.position());
     }
 
+    @Test
     public void testAutoShrink() throws Exception {
         IoBuffer buf = IoBuffer.allocate(8).setAutoShrink(true);
 
@@ -204,6 +216,7 @@
         }
     }
 
+    @Test
     public void testGetString() throws Exception {
         IoBuffer buf = IoBuffer.allocate(16);
         CharsetDecoder decoder;
@@ -317,6 +330,7 @@
         assertEquals(4, buf.limit());
     }
 
+    @Test
     public void testGetStringWithFailure() throws Exception {
         String test = "\u30b3\u30e1\u30f3\u30c8\u7de8\u96c6";
         IoBuffer buffer = IoBuffer.wrap(test.getBytes("Shift_JIS"));
@@ -341,6 +355,7 @@
         }
     }
 
+    @Test
     public void testPutString() throws Exception {
         CharsetEncoder encoder;
         IoBuffer buf = IoBuffer.allocate(16);
@@ -408,6 +423,7 @@
         assertEquals(0, buf.get(1));
     }
 
+    @Test
     public void testGetPrefixedString() throws Exception {
         IoBuffer buf = IoBuffer.allocate(16);
         CharsetEncoder encoder;
@@ -421,6 +437,7 @@
         assertEquals("ABC", buf.getPrefixedString(decoder));
     }
 
+    @Test
     public void testPutPrefixedString() throws Exception {
         CharsetEncoder encoder;
         IoBuffer buf = IoBuffer.allocate(16);
@@ -468,6 +485,7 @@
         assertEquals('5', buf.get(16));
     }
 
+    @Test
     public void testPutPrefixedStringWithPrefixLength() throws Exception {
         CharsetEncoder encoder = Charset.forName("ISO-8859-1").newEncoder();
         IoBuffer buf = IoBuffer.allocate(16).sweep().setAutoExpand(true);
@@ -494,6 +512,7 @@
         assertEquals('A', buf.get(4));
     }
 
+    @Test
     public void testPutPrefixedStringWithPadding() throws Exception {
         CharsetEncoder encoder = Charset.forName("ISO-8859-1").newEncoder();
         IoBuffer buf = IoBuffer.allocate(16).sweep().setAutoExpand(true);
@@ -514,6 +533,7 @@
         assertEquals(' ', buf.get(4));
     }
 
+    @Test
     public void testWideUtf8Characters() throws Exception {
         Runnable r = new Runnable() {
             public void run() {
@@ -553,6 +573,7 @@
         }
     }
 
+    @Test
     public void testObjectSerialization() throws Exception {
         IoBuffer buf = IoBuffer.allocate(16);
         buf.setAutoExpand(true);
@@ -572,6 +593,7 @@
         assertNotSame(o, o2);
     }
 
+    @Test
     public void testInheritedObjectSerialization() throws Exception {
         IoBuffer buf = IoBuffer.allocate(16);
         buf.setAutoExpand(true);
@@ -594,6 +616,7 @@
         assertNotSame(expected, actual);
     }
 
+    @Test
     public void testSweepWithZeros() throws Exception {
         IoBuffer buf = IoBuffer.allocate(4);
         buf.putInt(0xdeadbeef);
@@ -608,6 +631,7 @@
         assertEquals(0x0, buf.getInt());
     }
 
+    @Test
     public void testSweepNonZeros() throws Exception {
         IoBuffer buf = IoBuffer.allocate(4);
         buf.putInt(0xdeadbeef);
@@ -622,6 +646,7 @@
         assertEquals(0x45454545, buf.getInt());
     }
 
+    @Test
     public void testWrapNioBuffer() throws Exception {
         ByteBuffer nioBuf = ByteBuffer.allocate(10);
         nioBuf.position(3);
@@ -633,6 +658,7 @@
         assertEquals(10, buf.capacity());
     }
 
+    @Test
     public void testWrapSubArray() throws Exception {
         byte[] array = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
 
@@ -647,6 +673,7 @@
         assertEquals(10, buf.capacity());
     }
 
+    @Test
     public void testDuplicate() throws Exception {
         IoBuffer original;
         IoBuffer duplicate;
@@ -691,6 +718,7 @@
         }
     }
 
+    @Test
     public void testSlice() throws Exception {
         IoBuffer original;
         IoBuffer slice;
@@ -708,6 +736,7 @@
         assertEquals(127, slice.get(0));
     }
 
+    @Test
     public void testReadOnlyBuffer() throws Exception {
         IoBuffer original;
         IoBuffer duplicate;
@@ -736,6 +765,7 @@
         }
     }
 
+    @Test
     public void testGetUnsigned() throws Exception {
         IoBuffer buf = IoBuffer.allocate(16);
         buf.put((byte) 0xA4);
@@ -754,6 +784,7 @@
         assertEquals(0xCDB3D0A4L, buf.getUnsignedInt());
     }
 
+    @Test
     public void testIndexOf() throws Exception {
         boolean direct = false;
         for (int i = 0; i < 2; i++, direct = !direct) {
@@ -785,6 +816,7 @@
         E1, E2, E3, E4, E5, E6, E7, E8, E9, E10, E11, E12, E13, E14, E15, E16, E17, E18, E19, E20, E21, E22, E23, E24, E25, E26, E27, E28, E29, E30, E31, E32, E33, E34, E35, E36, E37, E38, E39, E40, E41, E42, E43, E44, E45, E46, E77, E48, E49, E50, E51, E52, E53, E54, E55, E56, E57, E58, E59, E60, E61, E62, E63, E64, E65
     }
 
+    @Test
     public void testPutEnumSet() {
         IoBuffer buf = IoBuffer.allocate(8);
 
@@ -872,6 +904,7 @@
         assertEquals(Long.MIN_VALUE + 1, buf.getLong());
     }
 
+    @Test
     public void testGetEnumSet() {
         IoBuffer buf = IoBuffer.allocate(8);
 
@@ -976,6 +1009,7 @@
                 .getEnumSetLong(TestEnum.class));
     }
 
+    @Test
     public void testBitVectorOverFlow() {
         IoBuffer buf = IoBuffer.allocate(8);
         try {
@@ -1007,6 +1041,7 @@
         }
     }
 
+    @Test
     public void testGetPutEnum() {
         IoBuffer buf = IoBuffer.allocate(4);
 
@@ -1025,6 +1060,7 @@
         assertEquals(TestEnum.E64, buf.getEnumInt(TestEnum.class));
     }
 
+    @Test
     public void testGetMediumInt() {
         IoBuffer buf = IoBuffer.allocate(3);
 
@@ -1069,6 +1105,7 @@
         assertEquals(0x00ff0203, buf.getUnsignedMediumInt(0));
     }
 
+    @Test
     public void testPutMediumInt() {
         IoBuffer buf = IoBuffer.allocate(3);
 
@@ -1091,5 +1128,4 @@
 
         buf.flip();
     }
-
 }

Modified: mina/trunk/core/src/test/java/org/apache/mina/core/IoFilterChainTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/core/IoFilterChainTest.java?rev=706586&r1=706585&r2=706586&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/core/IoFilterChainTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/core/IoFilterChainTest.java Tue Oct 21 04:44:03 2008
@@ -19,9 +19,6 @@
  */
 package org.apache.mina.core;
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
 import org.apache.mina.core.filterchain.DefaultIoFilterChain;
 import org.apache.mina.core.filterchain.IoFilter;
 import org.apache.mina.core.filterchain.IoFilterAdapter;
@@ -35,6 +32,12 @@
 import org.apache.mina.core.write.DefaultWriteRequest;
 import org.apache.mina.core.write.WriteRequest;
 import org.apache.mina.filter.util.NoopFilter;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
 
 /**
  * Tests {@link DefaultIoFilterChain}.
@@ -42,7 +45,7 @@
  * @author The Apache MINA Project (dev@mina.apache.org)
  * @version $Rev$, $Date$
  */
-public class IoFilterChainTest extends TestCase {
+public class IoFilterChainTest {
     private DummySession session;
     private IoFilterChain chain;
     private String result;
@@ -87,7 +90,7 @@
         }
     };
 
-    @Override
+    @Before
     public void setUp() {
         session = new DummySession();
         session.setHandler(handler);
@@ -95,10 +98,11 @@
         result = "";
     }
 
-    @Override
+    @After
     public void tearDown() {
     }
 
+    @Test
     public void testAdd() throws Exception {
         chain.addFirst("A", new EventOrderTestFilter('A'));
         chain.addLast("B", new EventOrderTestFilter('A'));
@@ -114,9 +118,10 @@
             actual += e.getName();
         }
 
-        Assert.assertEquals("FCAEBGDH", actual);
+        assertEquals("FCAEBGDH", actual);
     }
 
+    @Test
     public void testGet() throws Exception {
         IoFilter filterA = new NoopFilter();
         IoFilter filterB = new NoopFilter();
@@ -128,12 +133,13 @@
         chain.addBefore("B", "C", filterC);
         chain.addAfter("A", "D", filterD);
 
-        Assert.assertSame(filterA, chain.get("A"));
-        Assert.assertSame(filterB, chain.get("B"));
-        Assert.assertSame(filterC, chain.get("C"));
-        Assert.assertSame(filterD, chain.get("D"));
+        assertSame(filterA, chain.get("A"));
+        assertSame(filterB, chain.get("B"));
+        assertSame(filterC, chain.get("C"));
+        assertSame(filterD, chain.get("D"));
     }
 
+    @Test
     public void testRemove() throws Exception {
         chain.addLast("A", new EventOrderTestFilter('A'));
         chain.addLast("B", new EventOrderTestFilter('A'));
@@ -147,9 +153,10 @@
         chain.remove("B");
         chain.remove("D");
 
-        Assert.assertEquals(0, chain.getAll().size());
+        assertEquals(0, chain.getAll().size());
     }
 
+    @Test
     public void testClear() throws Exception {
         chain.addLast("A", new EventOrderTestFilter('A'));
         chain.addLast("B", new EventOrderTestFilter('A'));
@@ -159,12 +166,13 @@
 
         chain.clear();
 
-        Assert.assertEquals(0, chain.getAll().size());
+        assertEquals(0, chain.getAll().size());
     }
 
+    @Test
     public void testToString() throws Exception {
         // When the chain is empty
-        Assert.assertEquals("{ empty }", chain.toString());
+        assertEquals("{ empty }", chain.toString());
 
         // When there's one filter
         chain.addLast("A", new IoFilterAdapter() {
@@ -173,7 +181,7 @@
                 return "B";
             }
         });
-        Assert.assertEquals("{ (A:B) }", chain.toString());
+        assertEquals("{ (A:B) }", chain.toString());
 
         // When there are two
         chain.addLast("C", new IoFilterAdapter() {
@@ -182,13 +190,15 @@
                 return "D";
             }
         });
-        Assert.assertEquals("{ (A:B), (C:D) }", chain.toString());
+        assertEquals("{ (A:B), (C:D) }", chain.toString());
     }
 
+    @Test
     public void testDefault() {
         run("HS0 HSO HMR HMS HSI HEC HSC");
     }
 
+    @Test
     public void testChained() throws Exception {
         chain.addLast("A", new EventOrderTestFilter('A'));
         chain.addLast("B", new EventOrderTestFilter('B'));
@@ -197,6 +207,7 @@
                 + "ASC BSC HSC");
     }
 
+    @Test
     public void testAddRemove() throws Exception {
         IoFilter filter = new AddRemoveTestFilter();
 
@@ -221,7 +232,7 @@
 
         System.out.println("Expected: " + expectedResult);
         System.out.println("Actual:   " + result);
-        Assert.assertEquals(expectedResult, result);
+        assertEquals(expectedResult, result);
     }
 
     private String formatResult(String result) {

Modified: mina/trunk/core/src/test/java/org/apache/mina/core/IoServiceListenerSupportTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/core/IoServiceListenerSupportTest.java?rev=706586&r1=706585&r2=706586&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/core/IoServiceListenerSupportTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/core/IoServiceListenerSupportTest.java Tue Oct 21 04:44:03 2008
@@ -22,9 +22,6 @@
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
 import org.apache.mina.core.service.IoAcceptor;
 import org.apache.mina.core.service.IoConnector;
 import org.apache.mina.core.service.IoHandler;
@@ -33,6 +30,12 @@
 import org.apache.mina.core.service.IoServiceListenerSupport;
 import org.apache.mina.core.session.DummySession;
 import org.easymock.EasyMock;
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
 
 /**
  * Tests {@link IoServiceListenerSupport}.
@@ -40,11 +43,12 @@
  * @author The Apache MINA Project (dev@mina.apache.org)
  * @version $Rev$, $Date$
  */
-public class IoServiceListenerSupportTest extends TestCase {
+public class IoServiceListenerSupportTest {
     private static final SocketAddress ADDRESS = new InetSocketAddress(8080);
 
     private final IoService mockService = EasyMock.createMock(IoService.class);
 
+    @Test
     public void testServiceLifecycle() throws Exception {
         IoServiceListenerSupport support = new IoServiceListenerSupport(
                 mockService);
@@ -76,6 +80,7 @@
         EasyMock.verify(listener);
     }
 
+    @Test
     public void testSessionLifecycle() throws Exception {
         IoServiceListenerSupport support = new IoServiceListenerSupport(
                 mockService);
@@ -103,8 +108,8 @@
         EasyMock.verify(listener);
         EasyMock.verify(handler);
 
-        Assert.assertEquals(1, support.getManagedSessions().size());
-        Assert.assertSame(session, support.getManagedSessions().get(session.getId()));
+        assertEquals(1, support.getManagedSessions().size());
+        assertSame(session, support.getManagedSessions().get(session.getId()));
 
         // Test destruction & other side effects
         EasyMock.reset(listener);
@@ -122,11 +127,12 @@
 
         EasyMock.verify(listener);
 
-        Assert.assertTrue(session.isClosing());
-        Assert.assertEquals(0, support.getManagedSessions().size());
-        Assert.assertNull(support.getManagedSessions().get(session.getId()));
+        assertTrue(session.isClosing());
+        assertEquals(0, support.getManagedSessions().size());
+        assertNull(support.getManagedSessions().get(session.getId()));
     }
 
+    @Test
     public void testDisconnectOnUnbind() throws Exception {
         IoAcceptor acceptor = EasyMock.createStrictMock(IoAcceptor.class);
 
@@ -196,11 +202,12 @@
         EasyMock.verify(acceptor);
         EasyMock.verify(handler);
 
-        Assert.assertTrue(session.isClosing());
-        Assert.assertEquals(0, support.getManagedSessions().size());
-        Assert.assertNull(support.getManagedSessions().get(session.getId()));
+        assertTrue(session.isClosing());
+        assertEquals(0, support.getManagedSessions().size());
+        assertNull(support.getManagedSessions().get(session.getId()));
     }
 
+    @Test
     public void testConnectorActivation() throws Exception {
         IoConnector connector = EasyMock.createStrictMock(IoConnector.class);
 
@@ -246,7 +253,7 @@
         EasyMock.verify(listener);
         EasyMock.verify(handler);
 
-        Assert.assertEquals(0, support.getManagedSessions().size());
-        Assert.assertNull(support.getManagedSessions().get(session.getId()));
+        assertEquals(0, support.getManagedSessions().size());
+        assertNull(support.getManagedSessions().get(session.getId()));
     }
 }