svn commit: r572024 - /mina/branches/1.1/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java

[proyal]

Author: proyal
Date: Sun Sep  2 09:45:59 2007
New Revision: 572024

URL: http://svn.apache.org/viewvc?rev=572024&view=rev
Log:
Use latches vs synchronization

Modified:
    
mina/branches/1.1/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java

Modified: 
mina/branches/1.1/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java
URL: 
http://svn.apache.org/viewvc/mina/branches/1.1/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java?rev=572024&r1=572023&r2=572024&view=diff
==============================================================================
--- 
mina/branches/1.1/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java
 (original)
+++ 
mina/branches/1.1/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java
 Sun Sep  2 09:45:59 2007
@@ -28,8 +28,8 @@
 import java.util.LinkedList;
 import java.util.Queue;
 import java.util.Random;
+import java.util.concurrent.CountDownLatch;
 
-import junit.framework.TestCase;
 import org.apache.mina.common.ByteBuffer;
 import org.apache.mina.common.IdleStatus;
 import org.apache.mina.common.IoAcceptor;
@@ -48,6 +48,8 @@
 import org.easymock.AbstractMatcher;
 import org.easymock.MockControl;
 
+import junit.framework.TestCase;
+
 /**
  * Tests [EMAIL PROTECTED] StreamWriteFilter}.
  *
@@ -393,14 +395,9 @@
 
         acceptor.bind(address, sender);
 
-        synchronized (sender.lock) {
-            synchronized (receiver.lock) {
-                connector.connect(address, receiver);
-
-                sender.lock.wait();
-                receiver.lock.wait();
-            }
-        }
+        connector.connect(address, receiver);
+        sender.latch.await();
+        receiver.latch.await();
 
         acceptor.unbind(address);
 
@@ -452,7 +449,7 @@
     }
 
     private static class SenderHandler extends IoHandlerAdapter {
-        final Object lock = new Object();
+        final CountDownLatch latch = new CountDownLatch( 1 );
 
         InputStream inputStream;
 
@@ -476,39 +473,31 @@
         @Override
         public void exceptionCaught(IoSession session, Throwable cause)
                 throws Exception {
-            synchronized (lock) {
-                lock.notifyAll();
-            }
+            latch.countDown();
         }
 
         @Override
         public void sessionClosed(IoSession session) throws Exception {
-            synchronized (lock) {
-                lock.notifyAll();
-            }
+            latch.countDown();
         }
 
         @Override
         public void sessionIdle(IoSession session, IdleStatus status)
                 throws Exception {
-            synchronized (lock) {
-                lock.notifyAll();
-            }
+            latch.countDown();
         }
 
         @Override
         public void messageSent(IoSession session, Object message)
                 throws Exception {
             if (message == inputStream) {
-                synchronized (lock) {
-                    lock.notifyAll();
-                }
+                latch.countDown();
             }
         }
     }
 
     private static class ReceiverHandler extends IoHandlerAdapter {
-        final Object lock = new Object();
+        final CountDownLatch latch = new CountDownLatch( 1 );
 
         long bytesRead = 0;
 
@@ -537,16 +526,12 @@
         @Override
         public void exceptionCaught(IoSession session, Throwable cause)
                 throws Exception {
-            synchronized (lock) {
-                lock.notifyAll();
-            }
+            latch.countDown();
         }
 
         @Override
         public void sessionClosed(IoSession session) throws Exception {
-            synchronized (lock) {
-                lock.notifyAll();
-            }
+            latch.countDown();
         }
 
         @Override