svn commit: r681315 - in /servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip: ResequencerTest.java support/resequence/ResequencerEngineTest.java

[gnodet]

Author: gnodet
Date: Thu Jul 31 02:45:18 2008
New Revision: 681315

URL: http://svn.apache.org/viewvc?rev=681315&view=rev
Log:
SM-1442: Allow ServiceMix to build using the ibm jdk

Modified:
    
servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/ResequencerTest.java
    
servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/support/resequence/ResequencerEngineTest.java

Modified: 
servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/ResequencerTest.java
URL: 
http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/ResequencerTest.java?rev=681315&r1=681314&r2=681315&view=diff
==============================================================================
--- 
servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/ResequencerTest.java
 (original)
+++ 
servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/ResequencerTest.java
 Thu Jul 31 02:45:18 2008
@@ -22,6 +22,7 @@
 import javax.jbi.messaging.NormalizedMessage;
 import javax.xml.namespace.QName;
 
+import org.apache.servicemix.components.util.CopyTransformer;
 import org.apache.servicemix.eip.patterns.Resequencer;
 import org.apache.servicemix.eip.support.resequence.DefaultComparator;
 import org.apache.servicemix.tck.MessageList;
@@ -53,6 +54,19 @@
     public void testAsync() throws Exception {
         int numMessages = 5;
         ReceiverComponent receiver = activateReceiver(TARGET_NAME);
+        //
+        // This test depends on copyProperties of the CopyTransformer
+        // singleton being set to true (the default).  However, if the
+        // SpringConfigurationTest runs before this test (as it does on
+        // the ibm jdk) copyProperties will be configured to false.  So,
+        // explicitly ensure it is set to the default value of true here.
+        //
+        if (receiver.getMessageTransformer() instanceof CopyTransformer) {
+            CopyTransformer copyTransformer = 
(CopyTransformer)receiver.getMessageTransformer();
+            if (!copyTransformer.isCopyProperties()) {
+                copyTransformer.setCopyProperties(true);
+            }
+        }
         client.send(createTestMessageExchange(4));
         client.send(createTestMessageExchange(1));
         client.send(createTestMessageExchange(3));

Modified: 
servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/support/resequence/ResequencerEngineTest.java
URL: 
http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/support/resequence/ResequencerEngineTest.java?rev=681315&r1=681314&r2=681315&view=diff
==============================================================================
--- 
servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/support/resequence/ResequencerEngineTest.java
 (original)
+++ 
servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/support/resequence/ResequencerEngineTest.java
 Thu Jul 31 02:45:18 2008
@@ -32,9 +32,6 @@
     
     private LinkedBlockingQueue<Integer> queue;
     
-    public void setUp() throws Exception {
-    }
-
     public void tearDown() throws Exception {
         if (resequencer != null) {
             resequencer.stop();