svn commit: r495721 - in /incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components: email/MimeMailTest.java xfire/OneWayService.java xfire/XFireOutBindingTest.java

[gnodet]

Author: gnodet
Date: Fri Jan 12 12:21:32 2007
New Revision: 495721

URL: http://svn.apache.org/viewvc?view=rev&rev=495721
Log:
Fix tests on JDK 6

Modified:
    
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/MimeMailTest.java
    
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/OneWayService.java
    
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/XFireOutBindingTest.java

Modified: 
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/MimeMailTest.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/MimeMailTest.java?view=diff&rev=495721&r1=495720&r2=495721
==============================================================================
--- 
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/MimeMailTest.java
 (original)
+++ 
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/MimeMailTest.java
 Fri Jan 12 12:21:32 2007
@@ -17,7 +17,9 @@
 package org.apache.servicemix.components.email;
 
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import javax.activation.DataHandler;
 import javax.jbi.messaging.InOnly;
@@ -154,16 +156,19 @@
         assertEquals(contentMP.getCount(), 3); // first attachement for text 
body and second for file attached
         Part part = contentMP.getBodyPart(0);
         assertTrue(part.isMimeType("text/plain"));
+        Set names = new HashSet();
         part = contentMP.getBodyPart(1);
         String disposition = part.getDisposition();
         assertTrue(disposition.equalsIgnoreCase(Part.ATTACHMENT));
         DataHandler att = part.getDataHandler();
-        assertEquals("example.xml", att.getName().toLowerCase());
+        names.add(att.getName().toLowerCase());
         part = contentMP.getBodyPart(2);
         disposition = part.getDisposition();
         assertTrue(disposition.equalsIgnoreCase(Part.ATTACHMENT));
         att = part.getDataHandler();
-        assertEquals("id", att.getName().toLowerCase());
+        names.add(att.getName().toLowerCase());
+        assertTrue(names.contains("example.xml"));
+        assertTrue(names.contains("id"));
         assertEquals("subject", "Drink a beer James", message.getSubject());
     }
 

Modified: 
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/OneWayService.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/OneWayService.java?view=diff&rev=495721&r1=495720&r2=495721
==============================================================================
--- 
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/OneWayService.java
 (original)
+++ 
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/OneWayService.java
 Fri Jan 12 12:21:32 2007
@@ -22,13 +22,10 @@
 
 public class OneWayService {
 
-    private MessageList messageList = new MessageList();
+    public MessageList messageList = new MessageList();
     
     public void receive(String msg) throws MessagingException {
         messageList.addMessage(msg);
     }
 
-    public MessageList getMessageList() {
-        return messageList;
-    }
 }

Modified: 
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/XFireOutBindingTest.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/XFireOutBindingTest.java?view=diff&rev=495721&r1=495720&r2=495721
==============================================================================
--- 
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/XFireOutBindingTest.java
 (original)
+++ 
incubator/servicemix/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/XFireOutBindingTest.java
 Fri Jan 12 12:21:32 2007
@@ -38,7 +38,7 @@
         sendFile(new QName("http://xfire.components.servicemix.org";, 
"OneWayService"),
                 "/org/apache/servicemix/components/xfire/oneway.xml"); 
 
-        receiverService.getMessageList().assertMessagesReceived(1);
+        receiverService.messageList.assertMessagesReceived(1);
     }
 
     protected void sendFile(QName serviceName, String fileOnClassPath) throws 
JBIException {