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:48:14 UTC
svn commit: r1510687 - in
/commons/proper/email/trunk/src/test/java/org/apache/commons/mail:
EmailAttachmentTest.java EmailLiveTest.java HtmlEmailTest.java
MultiPartEmailTest.java SimpleEmailTest.java
Author: britter
Date: Mon Aug 5 19:48:13 2013
New Revision: 1510687
URL: http://svn.apache.org/r1510687
Log:
Replace indexed for loops with enhanced for loops
Modified:
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailAttachmentTest.java
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailLiveTest.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/MultiPartEmailTest.java
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/SimpleEmailTest.java
Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailAttachmentTest.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailAttachmentTest.java?rev=1510687&r1=1510686&r2=1510687&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailAttachmentTest.java (original)
+++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailAttachmentTest.java Mon Aug 5 19:48:13 2013
@@ -43,30 +43,30 @@ public class EmailAttachmentTest extends
@Test
public void testGetSetDescription()
{
- for (int i = 0; i < testCharsValid.length; i++)
+ for (String validChar : testCharsValid)
{
- attachment.setDescription(testCharsValid[i]);
- assertEquals(testCharsValid[i], attachment.getDescription());
+ attachment.setDescription(validChar);
+ assertEquals(validChar, attachment.getDescription());
}
}
@Test
public void testGetSetName()
{
- for (int i = 0; i < testCharsValid.length; i++)
+ for (String validChar : testCharsValid)
{
- attachment.setName(testCharsValid[i]);
- assertEquals(testCharsValid[i], attachment.getName());
+ attachment.setName(validChar);
+ assertEquals(validChar, attachment.getName());
}
}
@Test
public void testGetSetPath()
{
- for (int i = 0; i < testCharsValid.length; i++)
+ for (String validChar : testCharsValid)
{
- attachment.setPath(testCharsValid[i]);
- assertEquals(testCharsValid[i], attachment.getPath());
+ attachment.setPath(validChar);
+ assertEquals(validChar, attachment.getPath());
}
}
@@ -79,9 +79,9 @@ public class EmailAttachmentTest extends
"http://www.apache.org/",
"http://foo.notexisting.org" };
- for (int i = 0; i < tests.length; i++)
+ for (String urlString : tests)
{
- URL testURL = new URL(tests[i]);
+ URL testURL = new URL(urlString);
attachment.setURL(testURL);
assertEquals(testURL, attachment.getURL());
}
@@ -90,10 +90,10 @@ public class EmailAttachmentTest extends
@Test
public void testGetSetDisposition()
{
- for (int i = 0; i < testCharsValid.length; i++)
+ for (String validChar : testCharsValid)
{
- attachment.setDisposition(testCharsValid[i]);
- assertEquals(testCharsValid[i], attachment.getDisposition());
+ attachment.setDisposition(validChar);
+ assertEquals(validChar, attachment.getDisposition());
}
}
Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailLiveTest.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailLiveTest.java?rev=1510687&r1=1510686&r2=1510687&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailLiveTest.java (original)
+++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailLiveTest.java Mon Aug 5 19:48:13 2013
@@ -350,9 +350,8 @@ public class EmailLiveTest extends Abstr
{
transport.connect();
- for(int i=0; i<emails.size(); i++)
+ for (SimpleEmail personalizedEmail : emails)
{
- Email personalizedEmail = emails.get(i);
MimeMessage mimeMessage = personalizedEmail.getMimeMessage();
Transport.send(mimeMessage);
System.out.println("Successfully sent the following email : " + mimeMessage.getMessageID());
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=1510687&r1=1510686&r2=1510687&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:48:13 2013
@@ -62,20 +62,20 @@ public class HtmlEmailTest extends Abstr
// ====================================================================
// Test Success
// ====================================================================
- for (int i = 0; i < testCharsValid.length; i++)
+ for (String validChar : testCharsValid)
{
- this.email.setTextMsg(testCharsValid[i]);
- assertEquals(testCharsValid[i], this.email.getTextMsg());
+ this.email.setTextMsg(validChar);
+ assertEquals(validChar, this.email.getTextMsg());
}
// ====================================================================
// Test Exception
// ====================================================================
- for (int i = 0; i < this.testCharsNotValid.length; i++)
+ for (String invalidChar : this.testCharsNotValid)
{
try
{
- this.email.setTextMsg(this.testCharsNotValid[i]);
+ this.email.setTextMsg(invalidChar);
fail("Should have thrown an exception");
}
catch (EmailException e)
@@ -92,20 +92,20 @@ public class HtmlEmailTest extends Abstr
// ====================================================================
// Test Success
// ====================================================================
- for (int i = 0; i < testCharsValid.length; i++)
+ for (String validChar : testCharsValid)
{
- this.email.setHtmlMsg(testCharsValid[i]);
- assertEquals(testCharsValid[i], this.email.getHtmlMsg());
+ this.email.setHtmlMsg(validChar);
+ assertEquals(validChar, this.email.getHtmlMsg());
}
// ====================================================================
// Test Exception
// ====================================================================
- for (int i = 0; i < this.testCharsNotValid.length; i++)
+ for (String invalidChar : this.testCharsNotValid)
{
try
{
- this.email.setHtmlMsg(this.testCharsNotValid[i]);
+ this.email.setHtmlMsg(invalidChar);
fail("Should have thrown an exception");
}
catch (EmailException e)
@@ -122,23 +122,23 @@ public class HtmlEmailTest extends Abstr
// ====================================================================
// Test Success
// ====================================================================
- for (int i = 0; i < testCharsValid.length; i++)
+ for (String validChar : testCharsValid)
{
- this.email.setMsg(testCharsValid[i]);
- assertEquals(testCharsValid[i], this.email.getTextMsg());
+ this.email.setMsg(validChar);
+ assertEquals(validChar, this.email.getTextMsg());
assertTrue(
- this.email.getHtmlMsg().contains(testCharsValid[i]));
+ this.email.getHtmlMsg().contains(validChar));
}
// ====================================================================
// Test Exception
// ====================================================================
- for (int i = 0; i < this.testCharsNotValid.length; i++)
+ for (String invalidChar : this.testCharsNotValid)
{
try
{
- this.email.setMsg(this.testCharsNotValid[i]);
+ this.email.setMsg(invalidChar);
fail("Should have thrown an exception");
}
catch (EmailException e)
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=1510687&r1=1510686&r2=1510687&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:48:13 2013
@@ -67,28 +67,28 @@ public class MultiPartEmailTest extends
// ====================================================================
// without charset set
- for (int i = 0; i < testCharsValid.length; i++)
+ for (String validChar : testCharsValid)
{
- this.email.setMsg(testCharsValid[i]);
- assertEquals(testCharsValid[i], this.email.getMsg());
+ this.email.setMsg(validChar);
+ assertEquals(validChar, this.email.getMsg());
}
// with charset set
this.email.setCharset(EmailConstants.US_ASCII);
- for (int i = 0; i < testCharsValid.length; i++)
+ for (String validChar : testCharsValid)
{
- this.email.setMsg(testCharsValid[i]);
- assertEquals(testCharsValid[i], this.email.getMsg());
+ this.email.setMsg(validChar);
+ assertEquals(validChar, this.email.getMsg());
}
// ====================================================================
// Test Exceptions
// ====================================================================
- for (int i = 0; i < testCharsNotValid.length; i++)
+ for (String invalidChar : testCharsNotValid)
{
try
{
- this.email.setMsg(testCharsNotValid[i]);
+ this.email.setMsg(invalidChar);
fail("Should have thrown an exception");
}
catch (EmailException e)
@@ -411,10 +411,10 @@ public class MultiPartEmailTest extends
@Test
public void testGetSetSubType()
{
- for (int i = 0; i < testCharsValid.length; i++)
+ for (String validChar : testCharsValid)
{
- this.email.setSubType(testCharsValid[i]);
- assertEquals(testCharsValid[i], this.email.getSubType());
+ this.email.setSubType(validChar);
+ assertEquals(validChar, this.email.getSubType());
}
}
}
Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/SimpleEmailTest.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/SimpleEmailTest.java?rev=1510687&r1=1510686&r2=1510687&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/SimpleEmailTest.java (original)
+++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/SimpleEmailTest.java Mon Aug 5 19:48:13 2013
@@ -48,20 +48,20 @@ public class SimpleEmailTest extends Abs
// ====================================================================
// Test Success
// ====================================================================
- for (int i = 0; i < testCharsValid.length; i++)
+ for (String validChar : testCharsValid)
{
- this.email.setMsg(testCharsValid[i]);
- assertEquals(testCharsValid[i], this.email.getMsg());
+ this.email.setMsg(validChar);
+ assertEquals(validChar, this.email.getMsg());
}
// ====================================================================
// Test Exception
// ====================================================================
- for (int i = 0; i < this.testCharsNotValid.length; i++)
+ for (String invalidChar : this.testCharsNotValid)
{
try
{
- this.email.setMsg(this.testCharsNotValid[i]);
+ this.email.setMsg(invalidChar);
fail("Should have thrown an exception");
}
catch (EmailException e)