[servicemix-scm] tided XFire test cases to remove the sleep to ensure the test works, even on a slow, overworked powerbook :)

[jstrachan]

Commit in servicemix/base/src on MAIN
main/java/org/servicemix/components/xfire/XFireOutBinding.java		-4	1.1 -> 1.2
test/java/org/servicemix/components/xfire/OneWayService.java	+10	-6	1.2 -> 1.3
/XFireOutBindingTest.java	+1	-4	1.3 -> 1.4
test/java/org/servicemix/examples/MessageList.java	+8	-1	1.5 -> 1.6
	+19	-15

4 modified files

tided XFire test cases to remove the sleep to ensure the test works, even on a slow, overworked powerbook :)

---

servicemix/base/src/main/java/org/servicemix/components/xfire

XFireOutBinding.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- XFireOutBinding.java	13 Jul 2005 14:37:16 -0000	1.1
+++ XFireOutBinding.java	2 Aug 2005 16:55:22 -0000	1.2
@@ -41,12 +41,8 @@

             Channel channel = transport.createChannel();
             channel.receive(context, in);
 

-            messageExchange.setStatus(ExchangeStatus.DONE);

             done(messageExchange);
         } catch (Exception e) {

-            messageExchange.setError(e);
-            messageExchange.setStatus(ExchangeStatus.ERROR);
-            

             fail(messageExchange, e);
         }
     }

---

servicemix/base/src/test/java/org/servicemix/components/xfire

OneWayService.java 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- OneWayService.java	16 Jul 2005 03:09:38 -0000	1.2
+++ OneWayService.java	2 Aug 2005 16:55:22 -0000	1.3
@@ -1,14 +1,18 @@

 package org.servicemix.components.xfire;
 

+import org.servicemix.examples.MessageList;
+
+import javax.jbi.messaging.MessagingException;
+

 public class OneWayService {

+
+    private MessageList messageList = new MessageList();

     

-    private int count = 0;
-    
-    public void receive(String msg) {
-        count++;

+    public void receive(String msg) throws MessagingException {
+        messageList.addMessage(msg);

     }
 

-    protected int getCount() {
-        return count;

+    public MessageList getMessageList() {
+        return messageList;

     }
 }

---

servicemix/base/src/test/java/org/servicemix/components/xfire

XFireOutBindingTest.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- XFireOutBindingTest.java	16 Jul 2005 03:09:38 -0000	1.3
+++ XFireOutBindingTest.java	2 Aug 2005 16:55:22 -0000	1.4
@@ -22,10 +22,7 @@

         sendFile(new QName("http://xfire.components.servicemix.org", "OneWayService"),
                 "/org/servicemix/components/xfire/oneway.xml"); 
 

-        // sleep because XFire delivers the message asynchronously
-        Thread.sleep(500);
-        
-        assertEquals(1, receiverService.getCount());

+        receiverService.getMessageList().assertMessagesReceived(1);

     }
 
     protected void sendFile(QName serviceName, String fileOnClassPath) throws JBIException {

---

servicemix/base/src/test/java/org/servicemix/examples

MessageList.java 1.5 -> 1.6

diff -u -r1.5 -r1.6
--- MessageList.java	26 Jul 2005 11:19:11 -0000	1.5
+++ MessageList.java	2 Aug 2005 16:55:22 -0000	1.6
@@ -27,7 +27,7 @@

 /**
  * A simple container for performing testing and rendezvous style code.
  *

- * @version $Revision: 1.5 $

+ * @version $Revision: 1.6 $

  */
 public class MessageList extends Assert {
     private List messages = new ArrayList();

@@ -59,6 +59,13 @@

     }
 
     public void addMessage(NormalizedMessage message) throws MessagingException {

+        synchronized (semaphore) {
+            messages.add(message);
+            semaphore.notifyAll();
+        }
+    }
+
+    public void addMessage(String message) throws MessagingException {

         synchronized (semaphore) {
             messages.add(message);
             semaphore.notifyAll();

CVSspam 0.2.8