svn commit: r901672 - in /mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression: CompressionFilterTest.java ZlibTest.java

[el...@apache.org]

Author: elecharny
Date: Thu Jan 21 12:17:38 2010
New Revision: 901672

URL: http://svn.apache.org/viewvc?rev=901672&view=rev
Log:
Switched more classes to JUnit 4 @nnotations

Modified:
    mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/CompressionFilterTest.java
    mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/ZlibTest.java

Modified: mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/CompressionFilterTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/CompressionFilterTest.java?rev=901672&r1=901671&r2=901672&view=diff
==============================================================================
--- mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/CompressionFilterTest.java (original)
+++ mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/CompressionFilterTest.java Thu Jan 21 12:17:38 2010
@@ -19,7 +19,7 @@
  */
 package org.apache.mina.filter.compression;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertTrue;
 
 import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.mina.core.filterchain.IoFilterChain;
@@ -29,11 +29,13 @@
 import org.apache.mina.core.write.WriteRequest;
 import org.easymock.AbstractMatcher;
 import org.easymock.MockControl;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * @author <a href="http://mina.apache.org">Apache MINA Project</a>
  */
-public class CompressionFilterTest extends TestCase {
+public class CompressionFilterTest {
     private MockControl mockSession;
 
     private MockControl mockNextFilter;
@@ -83,8 +85,8 @@
             + "The quick brown fox jumps over the lazy dog.  "
             + "The quick brown fox jumps over the lazy dog.  ";
 
-    @Override
-    protected void setUp() {
+    @Before
+    public void setUp() {
         // create the necessary mock controls.
         mockSession = MockControl.createControl(IoSession.class);
         mockNextFilter = MockControl.createControl(NextFilter.class);
@@ -109,6 +111,7 @@
         actualInflater = new Zlib(Zlib.COMPRESSION_MAX, Zlib.MODE_INFLATER);
     }
 
+    @Test
     public void testCompression() throws Exception {
         // prepare the input data
         IoBuffer buf = IoBuffer.wrap(strCompress.getBytes("UTF8"));
@@ -154,6 +157,7 @@
         assertTrue(true);
     }
 
+    @Test
     public void testDecompression() throws Exception {
         // prepare the input data
         IoBuffer buf = IoBuffer.wrap(strCompress.getBytes("UTF8"));

Modified: mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/ZlibTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/ZlibTest.java?rev=901672&r1=901671&r2=901672&view=diff
==============================================================================
--- mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/ZlibTest.java (original)
+++ mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/ZlibTest.java Thu Jan 21 12:17:38 2010
@@ -19,27 +19,31 @@
  */
 package org.apache.mina.filter.compression;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import java.io.IOException;
 import java.nio.charset.Charset;
 
-import junit.framework.TestCase;
-
 import org.apache.mina.core.buffer.IoBuffer;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * @author <a href="http://mina.apache.org">Apache MINA Project</a>
  */
-public class ZlibTest extends TestCase {
+public class ZlibTest {
     private Zlib deflater = null;
 
     private Zlib inflater = null;
 
-    @Override
-    protected void setUp() throws Exception {
+    @Before
+    public void setUp() throws Exception {
         deflater = new Zlib(Zlib.COMPRESSION_MAX, Zlib.MODE_DEFLATER);
         inflater = new Zlib(Zlib.COMPRESSION_MAX, Zlib.MODE_INFLATER);
     }
 
+    @Test
     public void testCompression() throws Exception {
         String strInput = "";
 
@@ -61,6 +65,7 @@
         }
     }
 
+    @Test
     public void testCorruptedData() throws Exception {
         String strInput = "Hello World";
         IoBuffer byteInput = IoBuffer.wrap(strInput.getBytes("UTF8"));
@@ -75,6 +80,7 @@
         assertFalse(strOutput.equals(strInput));
     }
 
+    @Test
     public void testCorruptedHeader() throws Exception {
         String strInput = "Hello World";
         IoBuffer byteInput = IoBuffer.wrap(strInput.getBytes("UTF8"));
@@ -92,6 +98,7 @@
         assertTrue(false);
     }
 
+    @Test
     public void testFragments() throws Exception {
         String strInput = "";
         for (int i = 0; i < 10; i++) {