svn commit: r1032777 - in /commons/proper/email/trunk/src/test/org/apache/commons/mail: EmailTest.java HtmlEmailTest.java ImageHtmlEmailTest.java

[niallp]

Author: niallp
Date: Mon Nov  8 22:42:14 2010
New Revision: 1032777

URL: http://svn.apache.org/viewvc?rev=1032777&view=rev
Log:
Restore Java 1.4 compatibility

Modified:
    commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailTest.java
    
commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java
    
commons/proper/email/trunk/src/test/org/apache/commons/mail/ImageHtmlEmailTest.java

Modified: 
commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailTest.java?rev=1032777&r1=1032776&r2=1032777&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailTest.java 
(original)
+++ commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailTest.java 
Mon Nov  8 22:42:14 2010
@@ -1118,7 +1118,7 @@ public class EmailTest extends BaseEmail
     {
         this.email.addHeader("X-LongHeader", "1234567890 1234567890 123456789 
01234567890 123456789 0123456789 01234567890 01234567890");
         assertTrue(this.email.getHeaders().size() == 1);
-        
assertTrue(this.email.getHeaders().get("X-LongHeader").toString().contains("\r\n"));
+        
assertTrue(this.email.getHeaders().get("X-LongHeader").toString().indexOf("\r\n")
 >= 0);
     }
 
     /** */

Modified: 
commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java?rev=1032777&r1=1032776&r2=1032777&view=diff
==============================================================================
--- 
commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java 
(original)
+++ 
commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java 
Mon Nov  8 22:42:14 2010
@@ -533,8 +533,8 @@ public class HtmlEmailTest extends BaseE
             false);
         
         // make sure that no double dots show up
-        assertTrue(this.email.getHtmlMsg().contains("3DTZC268X93337.zip"));
-        assertFalse(this.email.getHtmlMsg().contains("3DTZC268X93337..zip"));
+        assertTrue(this.email.getHtmlMsg().indexOf("3DTZC268X93337.zip") >= 0);
+        assertFalse(this.email.getHtmlMsg().indexOf("3DTZC268X93337..zip") >= 
0);
     }
 
     /**

Modified: 
commons/proper/email/trunk/src/test/org/apache/commons/mail/ImageHtmlEmailTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/ImageHtmlEmailTest.java?rev=1032777&r1=1032776&r2=1032777&view=diff
==============================================================================
--- 
commons/proper/email/trunk/src/test/org/apache/commons/mail/ImageHtmlEmailTest.java
 (original)
+++ 
commons/proper/email/trunk/src/test/org/apache/commons/mail/ImageHtmlEmailTest.java
 Mon Nov  8 22:42:14 2010
@@ -77,7 +77,7 @@ public class ImageHtmlEmailTest extends 
 
                URL url = TEST_HTML_URL;
                InputStream stream = url.openStream();
-               StringBuilder str = new StringBuilder();
+               StringBuffer str = new StringBuffer();
                try {
                        List lines = IOUtils.readLines(stream);
                        for(int i=0;i<lines.size();i++) {
@@ -103,7 +103,7 @@ public class ImageHtmlEmailTest extends 
                assertEquals(1, fakeMailServer.getMessages().size());
                MimeMessage mimeMessage = ((WiserMessage) 
fakeMailServer.getMessages().get(0)).getMimeMessage();
         MimeMessageParser mimeMessageParser = new 
MimeMessageParser(mimeMessage).parse();
-        assertTrue(mimeMessageParser.getHtmlContent().contains("\"cid:"));
+        assertTrue(mimeMessageParser.getHtmlContent().indexOf("\"cid:") >= 0);
         assertTrue(mimeMessageParser.getAttachmentList().size() == 3);
        }
 
@@ -118,8 +118,8 @@ public class ImageHtmlEmailTest extends 
                        email.setHtmlMsg(null);
                        fail("Should fail here!");
                } catch (EmailException e) {
-                       assertTrue(e.getMessage(), e.getMessage().contains(
-                                       "Invalid message supplied"));
+                       assertTrue(e.getMessage(), e.getMessage().indexOf(
+                                       "Invalid message supplied") >= 0);
                }
        }
 
@@ -134,8 +134,8 @@ public class ImageHtmlEmailTest extends 
                        email.setHtmlMsg("");
                        fail("Should fail here!");
                } catch (EmailException e) {
-                       assertTrue(e.getMessage(), e.getMessage().contains(
-                                       "Invalid message supplied"));
+                       assertTrue(e.getMessage(), e.getMessage().indexOf(
+                                       "Invalid message supplied") >= 0);
                }
 
        }