svn commit: r697410 - in /synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport: testkit/http/ testkit/server/ testkit/server/axis2/ testkit/tests/async/ vfs/

[veithen]

Author: veithen
Date: Sat Sep 20 11:57:49 2008
New Revision: 697410

URL: http://svn.apache.org/viewvc?rev=697410&view=rev
Log:
Transport test kit: Improve test case isolation by allowing to clear pending 
messages in AsyncEndpoint.

Modified:
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/http/JettyAsyncEndpoint.java
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/AsyncEndpoint.java
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/AsyncEndpointAdapter.java
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisAsyncEndpoint.java
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/AsyncMessageTestCase.java
    
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSMockAsyncEndpoint.java

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/http/JettyAsyncEndpoint.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/http/JettyAsyncEndpoint.java?rev=697410&r1=697409&r2=697410&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/http/JettyAsyncEndpoint.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/http/JettyAsyncEndpoint.java
 Sat Sep 20 11:57:49 2008
@@ -54,6 +54,10 @@
         queue = null;
     }
     
+    public void clear() throws Exception {
+        queue.clear();
+    }
+
     public IncomingMessage<M> waitForMessage(int timeout) throws Throwable {
         return queue.poll(timeout, TimeUnit.MILLISECONDS);
     }

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/AsyncEndpoint.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/AsyncEndpoint.java?rev=697410&r1=697409&r2=697410&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/AsyncEndpoint.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/AsyncEndpoint.java
 Sat Sep 20 11:57:49 2008
@@ -22,5 +22,10 @@
 import org.apache.synapse.transport.testkit.message.IncomingMessage;
 
 public interface AsyncEndpoint<M> extends Endpoint {
+    /**
+     * Discard any pending messages.
+     */
+    void clear() throws Exception;
+    
     IncomingMessage<M> waitForMessage(int timeout) throws Throwable;
 }

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/AsyncEndpointAdapter.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/AsyncEndpointAdapter.java?rev=697410&r1=697409&r2=697410&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/AsyncEndpointAdapter.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/AsyncEndpointAdapter.java
 Sat Sep 20 11:57:49 2008
@@ -38,6 +38,10 @@
         return target;
     }
 
+    public void clear() throws Exception {
+        target.clear();
+    }
+
     public IncomingMessage<M> waitForMessage(int timeout) throws Throwable {
         IncomingMessage<N> message = target.waitForMessage(timeout);
         if (message == null) {

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisAsyncEndpoint.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisAsyncEndpoint.java?rev=697410&r1=697409&r2=697410&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisAsyncEndpoint.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisAsyncEndpoint.java
 Sat Sep 20 11:57:49 2008
@@ -81,6 +81,10 @@
 //        });
 //    }
     
+    public void clear() throws Exception {
+        queue.clear();
+    }
+
     public IncomingMessage<AxisMessage> waitForMessage(int timeout) throws 
Throwable {
         Event event = queue.poll(timeout, TimeUnit.MILLISECONDS);
         return event == null ? null : event.process();

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/AsyncMessageTestCase.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/AsyncMessageTestCase.java?rev=697410&r1=697409&r2=697410&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/AsyncMessageTestCase.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/AsyncMessageTestCase.java
 Sat Sep 20 11:57:49 2008
@@ -43,6 +43,7 @@
 
     @Override
     protected void runTest() throws Throwable {
+        endpoint.clear();
         M expected = prepareMessage();
         
         // Run the test.

Modified: 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSMockAsyncEndpoint.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSMockAsyncEndpoint.java?rev=697410&r1=697409&r2=697410&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSMockAsyncEndpoint.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSMockAsyncEndpoint.java
 Sat Sep 20 11:57:49 2008
@@ -38,6 +38,10 @@
         contentType = client.getContentType(options, 
options.getBaseContentType());
     }
     
+    public void clear() throws Exception {
+        channel.getRequestFile().delete();
+    }
+
     public IncomingMessage<byte[]> waitForMessage(int timeout) throws 
Throwable {
         byte[] data = VFSTestUtils.waitForFile(channel.getRequestFile(), 
timeout);
         return data == null ? null : new IncomingMessage<byte[]>(contentType, 
data);