svn commit: r951692 - /servicemix/components/bindings/servicemix-file/trunk/src/test/java/org/apache/servicemix/file/PollDirectoryTest.java

[ge...@apache.org]

Author: gertv
Date: Sat Jun  5 11:38:44 2010
New Revision: 951692

URL: http://svn.apache.org/viewvc?rev=951692&view=rev
Log:
SMXCOMP-643: Testing that exchanges are being sent in the right order (instead of being received in order)

Modified:
    servicemix/components/bindings/servicemix-file/trunk/src/test/java/org/apache/servicemix/file/PollDirectoryTest.java

Modified: servicemix/components/bindings/servicemix-file/trunk/src/test/java/org/apache/servicemix/file/PollDirectoryTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-file/trunk/src/test/java/org/apache/servicemix/file/PollDirectoryTest.java?rev=951692&r1=951691&r2=951692&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-file/trunk/src/test/java/org/apache/servicemix/file/PollDirectoryTest.java (original)
+++ servicemix/components/bindings/servicemix-file/trunk/src/test/java/org/apache/servicemix/file/PollDirectoryTest.java Sat Jun  5 11:38:44 2010
@@ -30,8 +30,6 @@ import javax.jbi.messaging.InOnly;
 import javax.jbi.messaging.MessageExchange;
 import javax.jbi.messaging.NormalizedMessage;
 import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-import javax.xml.transform.TransformerException;
 
 import org.apache.servicemix.client.DefaultServiceMixClient;
 import org.apache.servicemix.components.util.DefaultFileMarshaler;
@@ -116,13 +114,13 @@ public class PollDirectoryTest extends S
      */
     public void testComparator() throws Exception {
         // adding a listener to register the order in which exchanges are being sent
-        final List<MessageExchange> sent = new ArrayList<MessageExchange>();
+        final List<String> sent = new ArrayList<String>();
         jbi.addListener(new ExchangeListener() {
 
             public void exchangeSent(ExchangeEvent exchangeEvent) {
                 MessageExchange exchange = exchangeEvent.getExchange();
                 if (exchange.getStatus() == ExchangeStatus.ACTIVE && "receiver3".equals(exchange.getService().getLocalPart())) {
-                    sent.add(exchange);
+                    sent.add((String) exchange.getMessage("in").getProperty(DefaultFileMarshaler.FILE_NAME_PROPERTY));
                 }
             }
 
@@ -153,10 +151,10 @@ public class PollDirectoryTest extends S
         Receiver receiver = (Receiver) getBean("receiver3");
         receiver.getMessageList().waitForMessagesToArrive(2, 10000);
         receiver.getMessageList().assertMessagesReceived(2);
-        assertEquals(TRANSFORMER.toString(sent.get(0).getMessage("in").getContent()),
-                     "<?xml version=\"1.0\" encoding=\"UTF-8\"?><first>file</first>");
-        assertEquals(TRANSFORMER.toString(sent.get(1).getMessage("in").getContent()),
-                     "<?xml version=\"1.0\" encoding=\"UTF-8\"?><second>file</second>");
+        assertEquals("atest.xml should have been sent before btest.xml",
+                     "atest.xml", sent.get(0));
+        assertEquals("atest.xml should have been sent before btest.xml",
+                     "btest.xml", sent.get(1));
     }
 
     // Testing the "append=false" 
@@ -225,7 +223,7 @@ public class PollDirectoryTest extends S
                 fail("Received ERROR status");
             }
         } else if (me.getFault() != null) {
-            fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
+            fail("Received fault: " + TRANSFORMER.toString(me.getFault().getContent()));
         }
     }