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 2010/01/21 13:04:06 UTC
svn commit: r901665 - in /mina/trunk:
core/src/test/java/org/apache/mina/transport/
core/src/test/java/org/apache/mina/transport/socket/nio/
core/src/test/java/org/apache/mina/transport/vmpipe/
example/src/test/java/org/apache/mina/example/haiku/
Author: elecharny
Date: Thu Jan 21 12:04:06 2010
New Revision: 901665
URL: http://svn.apache.org/viewvc?rev=901665&view=rev
Log:
Switched more classes to JUnit 4 @nnotations
Modified:
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/DatagramRecyclerTest.java
mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeEventOrderTest.java
mina/trunk/example/src/test/java/org/apache/mina/example/haiku/HaikuValidatorTest.java
mina/trunk/example/src/test/java/org/apache/mina/example/haiku/PhraseUtilitiesTest.java
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=901665&r1=901664&r2=901665&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 12:04:06 2010
@@ -19,6 +19,7 @@
*/
package org.apache.mina.transport;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
@@ -29,8 +30,6 @@
import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
-import junit.framework.Assert;
-
import org.apache.mina.core.RuntimeIoException;
import org.apache.mina.core.future.ConnectFuture;
import org.apache.mina.core.service.IoAcceptor;
@@ -84,7 +83,7 @@
future.getSession().close(true);
// sessionCreated() will fire before the connect future completes
// but sessionOpened() may not
- Assert.assertTrue(Pattern.matches("12?32?", buf.toString()));
+ assertTrue(Pattern.matches("12?32?", buf.toString()));
} finally {
acceptor.dispose();
}
@@ -125,7 +124,7 @@
// Signifies a successful test execution
assertTrue(true);
}
- Assert.assertEquals("1", buf.toString());
+ assertEquals("1", buf.toString());
} finally {
connector.dispose();
}
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=901665&r1=901664&r2=901665&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 12:04:06 2010
@@ -19,9 +19,10 @@
*/
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.Assert;
+import java.net.InetSocketAddress;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.filterchain.IoFilter;
@@ -84,7 +85,7 @@
WriteFuture writeFuture = future.getSession().write(
IoBuffer.allocate(16).putInt(0).flip());
writeFuture.awaitUninterruptibly();
- Assert.assertTrue(writeFuture.isWritten());
+ assertTrue(writeFuture.isWritten());
future.getSession().close(true);
@@ -95,7 +96,7 @@
Thread.sleep(100);
}
- Assert.assertEquals("FH", result);
+ assertEquals("FH", result);
} finally {
acceptor.unbind();
}
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=901665&r1=901664&r2=901665&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 12:04:06 2010
@@ -19,9 +19,11 @@
*/
package org.apache.mina.transport.socket.nio;
-import java.net.InetSocketAddress;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
-import junit.framework.Assert;
+import java.net.InetSocketAddress;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.future.ConnectFuture;
@@ -87,7 +89,7 @@
// The life cycle of the acceptor-side connection is managed by the recycler.
future.getSession().close(true);
future.getSession().getCloseFuture().awaitUninterruptibly();
- Assert.assertTrue(future.getSession().getCloseFuture().isClosed());
+ assertTrue(future.getSession().getCloseFuture().isClosed());
// Wait until the acceptor-side connection is closed.
while (acceptorHandler.session == null) {
@@ -96,13 +98,13 @@
acceptorHandler.session.getCloseFuture().awaitUninterruptibly(3000);
// Is it closed?
- Assert.assertTrue(acceptorHandler.session.getCloseFuture()
+ assertTrue(acceptorHandler.session.getCloseFuture()
.isClosed());
Thread.sleep(1000);
- Assert.assertEquals("CROPSECL", connectorHandler.result.toString());
- Assert.assertEquals("CROPRECL", acceptorHandler.result.toString());
+ assertEquals("CROPSECL", connectorHandler.result.toString());
+ assertEquals("CROPRECL", acceptorHandler.result.toString());
} finally {
acceptor.unbind();
}
@@ -135,7 +137,7 @@
Thread.yield();
}
acceptorHandler.session.close(true);
- Assert.assertTrue(
+ assertTrue(
acceptorHandler.session.getCloseFuture().awaitUninterruptibly(3000));
IoSession oldSession = acceptorHandler.session;
@@ -154,19 +156,19 @@
// Write whatever to trigger the acceptor again.
WriteFuture wf = future.getSession().write(
IoBuffer.allocate(1)).awaitUninterruptibly();
- Assert.assertTrue(wf.isWritten());
+ assertTrue(wf.isWritten());
// Make sure the connection is closed before recycler closes it.
while (acceptorHandler.session == null) {
Thread.yield();
}
acceptorHandler.session.close(true);
- Assert.assertTrue(
+ assertTrue(
acceptorHandler.session.getCloseFuture().awaitUninterruptibly(3000));
future.getSession().close(true).awaitUninterruptibly();
- Assert.assertNotSame(oldSession, acceptorHandler.session);
+ assertNotSame(oldSession, acceptorHandler.session);
} finally {
acceptor.unbind();
}
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=901665&r1=901664&r2=901665&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 12:04:06 2010
@@ -19,11 +19,11 @@
*/
package org.apache.mina.transport.vmpipe;
+import static org.junit.Assert.assertEquals;
+
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
-import junit.framework.Assert;
-
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.future.ConnectFuture;
import org.apache.mina.core.service.IoAcceptor;
@@ -93,7 +93,7 @@
Thread.yield();
}
- Assert.assertEquals("ABC", actual.toString());
+ assertEquals("ABC", actual.toString());
}
@Test
@@ -151,7 +151,7 @@
Thread.yield();
}
- Assert.assertEquals("ABC", actual.toString());
+ assertEquals("ABC", actual.toString());
}
@Test
@@ -200,7 +200,7 @@
semaphore.tryAcquire(1, TimeUnit.SECONDS);
vmPipeAcceptor.unbind(vmPipeAddress);
- Assert.assertEquals(1, connectFuture.getSession().getWrittenBytes());
- Assert.assertEquals("ABCD", stringBuffer.toString());
+ assertEquals(1, connectFuture.getSession().getWrittenBytes());
+ assertEquals("ABCD", stringBuffer.toString());
}
}
Modified: mina/trunk/example/src/test/java/org/apache/mina/example/haiku/HaikuValidatorTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/haiku/HaikuValidatorTest.java?rev=901665&r1=901664&r2=901665&view=diff
==============================================================================
--- mina/trunk/example/src/test/java/org/apache/mina/example/haiku/HaikuValidatorTest.java (original)
+++ mina/trunk/example/src/test/java/org/apache/mina/example/haiku/HaikuValidatorTest.java Thu Jan 21 12:04:06 2010
@@ -18,12 +18,14 @@
*/
package org.apache.mina.example.haiku;
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
+
/**
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
-public class HaikuValidatorTest extends TestCase {
+public class HaikuValidatorTest {
// from http://allrileyedup.blogspot.com/2006/10/dont-hassle-haiku.html -- good friend of proyal@apache.org
private static final String[] HAIKUS = {
"This class is boring.\n" + "Will David ever shut up?\n"
@@ -61,13 +63,12 @@
private HaikuValidator validator;
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
+ @Before
+ public void setUp() throws Exception {
validator = new HaikuValidator();
}
+ @Test
public void testValidateHaikus() throws Exception {
for (String s : HAIKUS) {
String[] lines = s.split("\n");
Modified: mina/trunk/example/src/test/java/org/apache/mina/example/haiku/PhraseUtilitiesTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/haiku/PhraseUtilitiesTest.java?rev=901665&r1=901664&r2=901665&view=diff
==============================================================================
--- mina/trunk/example/src/test/java/org/apache/mina/example/haiku/PhraseUtilitiesTest.java (original)
+++ mina/trunk/example/src/test/java/org/apache/mina/example/haiku/PhraseUtilitiesTest.java Thu Jan 21 12:04:06 2010
@@ -18,12 +18,15 @@
*/
package org.apache.mina.example.haiku;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
/**
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
-public class PhraseUtilitiesTest extends TestCase {
+public class PhraseUtilitiesTest {
+ @Test
public void testCountSyllablesInWord() throws Exception {
assertSyllableCount(1, "one");
assertSyllableCount(1, "I");