You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2013/08/05 21:29:10 UTC

svn commit: r1510676 - in /commons/proper/email/trunk/src/test/java/org/apache/commons/mail: AbstractEmailTest.java HtmlEmailTest.java ImageHtmlEmailTest.java InvalidInternetAddressTest.java MultiPartEmailTest.java

Author: britter
Date: Mon Aug  5 19:29:09 2013
New Revision: 1510676

URL: http://svn.apache.org/r1510676
Log:
Replace indexOf expressions with contains

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

Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/AbstractEmailTest.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/AbstractEmailTest.java?rev=1510676&r1=1510675&r2=1510676&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/AbstractEmailTest.java (original)
+++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/AbstractEmailTest.java Mon Aug  5 19:29:09 2013
@@ -271,22 +271,20 @@ public abstract class AbstractEmailTest
 
             //test to address
             assertTrue("got wrong To: address from mail",
-                toAdd.toString().indexOf(mimeMessage.getHeader("To", null)) != -1);
+                    toAdd.toString().contains(mimeMessage.getHeader("To", null)));
 
             //test cc address
             if (ccAdd.size() > 0)
             {
                 assertTrue("got wrong Cc: address from mail",
-                    ccAdd.toString().indexOf(mimeMessage.getHeader("Cc", null))
-                        != -1);
+                    ccAdd.toString().contains(mimeMessage.getHeader("Cc", null)));
             }
 
             //test bcc address
             if (bccAdd.size() > 0)
             {
                 assertTrue("got wrong Bcc: address from mail",
-                    bccAdd.toString().indexOf(mimeMessage.getHeader("Bcc", null))
-                        != -1);
+                    bccAdd.toString().contains(mimeMessage.getHeader("Bcc", null)));
             }
         }
         catch (MessagingException me)
@@ -346,7 +344,7 @@ public abstract class AbstractEmailTest
                                        emailMessageBody.length()
                                        - AbstractEmailTest.BODY_END_PAD);
         assertTrue("didn't find expected content type in message body",
-                strMessageBody.indexOf(strSentContent) != -1);
+                strMessageBody.contains(strSentContent));
     }
 
     /**
@@ -384,7 +382,7 @@ public abstract class AbstractEmailTest
 
         // test message content
         assertTrue("didn't find expected message content in message body",
-                getMessageBody(emailMessage).indexOf(strMessage) != -1);
+                getMessageBody(emailMessage).contains(strMessage));
     }
 
     /**

Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/HtmlEmailTest.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/HtmlEmailTest.java?rev=1510676&r1=1510675&r2=1510676&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/HtmlEmailTest.java (original)
+++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/HtmlEmailTest.java Mon Aug  5 19:29:09 2013
@@ -128,7 +128,7 @@ public class HtmlEmailTest extends Abstr
             assertEquals(testCharsValid[i], this.email.getTextMsg());
 
             assertTrue(
-                this.email.getHtmlMsg().indexOf(testCharsValid[i]) != -1);
+                    this.email.getHtmlMsg().contains(testCharsValid[i]));
         }
 
         // ====================================================================
@@ -547,8 +547,8 @@ public class HtmlEmailTest extends Abstr
             false);
         
         // make sure that no double dots show up
-        assertTrue(this.email.getHtmlMsg().indexOf("3DTZC268X93337.zip") >= 0);
-        assertFalse(this.email.getHtmlMsg().indexOf("3DTZC268X93337..zip") >= 0);
+        assertTrue(this.email.getHtmlMsg().contains("3DTZC268X93337.zip"));
+        assertFalse(this.email.getHtmlMsg().contains("3DTZC268X93337..zip"));
     }
 
     /**

Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java?rev=1510676&r1=1510675&r2=1510676&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java (original)
+++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/ImageHtmlEmailTest.java Mon Aug  5 19:29:09 2013
@@ -95,7 +95,7 @@ public class ImageHtmlEmailTest extends 
         MimeMessage mimeMessage = fakeMailServer.getMessages().get(0).getMimeMessage();
 
         MimeMessageParser mimeMessageParser = new MimeMessageParser(mimeMessage).parse();
-        assertTrue(mimeMessageParser.getHtmlContent().indexOf("\"cid:") >= 0);
+        assertTrue(mimeMessageParser.getHtmlContent().contains("\"cid:"));
         assertTrue(mimeMessageParser.getAttachmentList().size() == 3);
     }
 
@@ -111,8 +111,7 @@ public class ImageHtmlEmailTest extends 
             email.setHtmlMsg(null);
             fail("Should fail here!");
         } catch (EmailException e) {
-            assertTrue(e.getMessage(), e.getMessage().indexOf(
-                    "Invalid message supplied") >= 0);
+            assertTrue(e.getMessage(), e.getMessage().contains("Invalid message supplied"));
         }
     }
 
@@ -128,8 +127,7 @@ public class ImageHtmlEmailTest extends 
             email.setHtmlMsg("");
             fail("Should fail here!");
         } catch (EmailException e) {
-            assertTrue(e.getMessage(), e.getMessage().indexOf(
-                    "Invalid message supplied") >= 0);
+            assertTrue(e.getMessage(), e.getMessage().contains("Invalid message supplied"));
         }
 
     }
@@ -238,7 +236,7 @@ public class ImageHtmlEmailTest extends 
         MimeMessageUtils.writeMimeMessage(mimeMessage, new File("./target/test-emails/testSendHTMLClassPathFile.eml"));
 
         MimeMessageParser mimeMessageParser = new MimeMessageParser(mimeMessage).parse();
-        assertTrue(mimeMessageParser.getHtmlContent().indexOf("\"cid:") >= 0);
+        assertTrue(mimeMessageParser.getHtmlContent().contains("\"cid:"));
         assertTrue(mimeMessageParser.getAttachmentList().size() == 1);
     }
 
@@ -281,7 +279,7 @@ public class ImageHtmlEmailTest extends 
         MimeMessageUtils.writeMimeMessage(mimeMessage, new File("./target/test-emails/testSendHTMLAutoFile.eml"));
 
         MimeMessageParser mimeMessageParser = new MimeMessageParser(mimeMessage).parse();
-        assertTrue(mimeMessageParser.getHtmlContent().indexOf("\"cid:") >= 0);
+        assertTrue(mimeMessageParser.getHtmlContent().contains("\"cid:"));
         assertTrue(mimeMessageParser.getAttachmentList().size() == 1);
     }
 
@@ -324,7 +322,7 @@ public class ImageHtmlEmailTest extends 
         MimeMessageUtils.writeMimeMessage(mimeMessage, new File("./target/test-emails/testSendHTMLAutoMultipleFiles.eml"));
 
         MimeMessageParser mimeMessageParser = new MimeMessageParser(mimeMessage).parse();
-        assertTrue(mimeMessageParser.getHtmlContent().indexOf("\"cid:") >= 0);
+        assertTrue(mimeMessageParser.getHtmlContent().contains("\"cid:"));
         assertTrue(mimeMessageParser.getAttachmentList().size() == 3);
     }
 

Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java?rev=1510676&r1=1510675&r2=1510676&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java (original)
+++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/InvalidInternetAddressTest.java Mon Aug  5 19:29:09 2013
@@ -153,7 +153,7 @@ public class InvalidInternetAddressTest 
             InternetAddress address = new InternetAddress(ARR_INVALID_EMAILS[i], "Joe");
 
             // N.B. validate() doesn't check addresses containing quotes or '['
-            boolean quoted = ARR_INVALID_EMAILS[i].indexOf("\"") >= 0;
+            boolean quoted = ARR_INVALID_EMAILS[i].contains("\"");
             int atIndex    = ARR_INVALID_EMAILS[i].indexOf("@");
             boolean domainBracket  = (atIndex >= 0)
                 && (ARR_INVALID_EMAILS[i].indexOf("[", atIndex)  >= 0);
@@ -207,7 +207,7 @@ public class InvalidInternetAddressTest 
             InternetAddress address = new InternetAddress(ARR_INVALID_EMAILS[i], "Joe", "UTF-8");
 
             // N.B. validate() doesn't check addresses containing quotes or '['
-            boolean quoted = ARR_INVALID_EMAILS[i].indexOf("\"") >= 0;
+            boolean quoted = ARR_INVALID_EMAILS[i].contains("\"");
             int atIndex    = ARR_INVALID_EMAILS[i].indexOf("@");
             boolean domainBracket  = (atIndex >= 0)
                 && (ARR_INVALID_EMAILS[i].indexOf("[", atIndex)  >= 0);

Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/MultiPartEmailTest.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/MultiPartEmailTest.java?rev=1510676&r1=1510675&r2=1510676&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/MultiPartEmailTest.java (original)
+++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/MultiPartEmailTest.java Mon Aug  5 19:29:09 2013
@@ -379,8 +379,7 @@ public class MultiPartEmailTest extends 
                 .getBodyPart(0)
                 .getDataHandler()
                 .getContentType()
-                .indexOf(strSubtype)
-                != -1);
+                .contains(strSubtype));
 
     }