You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tn...@apache.org on 2014/07/09 22:46:28 UTC
svn commit: r915608 [16/34] - in
/websites/production/commons/content/proper/commons-email: ./ apidocs/
apidocs/org/apache/commons/mail/ apidocs/org/apache/commons/mail/class-use/
apidocs/org/apache/commons/mail/resolver/ apidocs/org/apache/commons/mai...
Modified: websites/production/commons/content/proper/commons-email/testapidocs/src-html/org/apache/commons/mail/ImageHtmlEmailTest.html
==============================================================================
--- websites/production/commons/content/proper/commons-email/testapidocs/src-html/org/apache/commons/mail/ImageHtmlEmailTest.html (original)
+++ websites/production/commons/content/proper/commons-email/testapidocs/src-html/org/apache/commons/mail/ImageHtmlEmailTest.html Wed Jul 9 20:46:21 2014
@@ -76,7 +76,7 @@
<span class="sourceLineNo">068</span> // Create the email message<a name="line.68"></a>
<span class="sourceLineNo">069</span> getMailServer();<a name="line.69"></a>
<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span> String strSubject = "Test HTML Send default";<a name="line.71"></a>
+<span class="sourceLineNo">071</span> final String strSubject = "Test HTML Send default";<a name="line.71"></a>
<span class="sourceLineNo">072</span><a name="line.72"></a>
<span class="sourceLineNo">073</span> email = new MockImageHtmlEmailConcrete();<a name="line.73"></a>
<span class="sourceLineNo">074</span> email.setDataSourceResolver(new DataSourceUrlResolver(TEST_IMAGE_DIR.toURI().toURL(), TEST_IS_LENIENT));<a name="line.74"></a>
@@ -86,7 +86,7 @@
<span class="sourceLineNo">078</span> email.addTo(strTestMailTo);<a name="line.78"></a>
<span class="sourceLineNo">079</span> email.setSubject(strSubject);<a name="line.79"></a>
<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span> String html = loadUrlContent(TEST_HTML_URL);<a name="line.81"></a>
+<span class="sourceLineNo">081</span> final String html = loadUrlContent(TEST_HTML_URL);<a name="line.81"></a>
<span class="sourceLineNo">082</span><a name="line.82"></a>
<span class="sourceLineNo">083</span> // set the html message<a name="line.83"></a>
<span class="sourceLineNo">084</span> email.setHtmlMsg(html);<a name="line.84"></a>
@@ -100,9 +100,9 @@
<span class="sourceLineNo">092</span> fakeMailServer.stop();<a name="line.92"></a>
<span class="sourceLineNo">093</span><a name="line.93"></a>
<span class="sourceLineNo">094</span> assertEquals(1, fakeMailServer.getMessages().size());<a name="line.94"></a>
-<span class="sourceLineNo">095</span> MimeMessage mimeMessage = fakeMailServer.getMessages().get(0).getMimeMessage();<a name="line.95"></a>
+<span class="sourceLineNo">095</span> final MimeMessage mimeMessage = fakeMailServer.getMessages().get(0).getMimeMessage();<a name="line.95"></a>
<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span> MimeMessageParser mimeMessageParser = new MimeMessageParser(mimeMessage).parse();<a name="line.97"></a>
+<span class="sourceLineNo">097</span> final MimeMessageParser mimeMessageParser = new MimeMessageParser(mimeMessage).parse();<a name="line.97"></a>
<span class="sourceLineNo">098</span> assertTrue(mimeMessageParser.getHtmlContent().contains("\"cid:"));<a name="line.98"></a>
<span class="sourceLineNo">099</span> assertTrue(mimeMessageParser.getAttachmentList().size() == 3);<a name="line.99"></a>
<span class="sourceLineNo">100</span> }<a name="line.100"></a>
@@ -112,13 +112,13 @@
<span class="sourceLineNo">104</span> Logger.getLogger(ImageHtmlEmail.class.getName()).setLevel(Level.FINEST);<a name="line.104"></a>
<span class="sourceLineNo">105</span><a name="line.105"></a>
<span class="sourceLineNo">106</span> // Create the email message<a name="line.106"></a>
-<span class="sourceLineNo">107</span> ImageHtmlEmail email = new ImageHtmlEmail();<a name="line.107"></a>
+<span class="sourceLineNo">107</span> final ImageHtmlEmail email = new ImageHtmlEmail();<a name="line.107"></a>
<span class="sourceLineNo">108</span><a name="line.108"></a>
<span class="sourceLineNo">109</span> // set the html message<a name="line.109"></a>
<span class="sourceLineNo">110</span> try {<a name="line.110"></a>
<span class="sourceLineNo">111</span> email.setHtmlMsg(null);<a name="line.111"></a>
<span class="sourceLineNo">112</span> fail("Should fail here!");<a name="line.112"></a>
-<span class="sourceLineNo">113</span> } catch (EmailException e) {<a name="line.113"></a>
+<span class="sourceLineNo">113</span> } catch (final EmailException e) {<a name="line.113"></a>
<span class="sourceLineNo">114</span> assertTrue(e.getMessage(), e.getMessage().contains("Invalid message supplied"));<a name="line.114"></a>
<span class="sourceLineNo">115</span> }<a name="line.115"></a>
<span class="sourceLineNo">116</span> }<a name="line.116"></a>
@@ -128,13 +128,13 @@
<span class="sourceLineNo">120</span> Logger.getLogger(ImageHtmlEmail.class.getName()).setLevel(Level.FINEST);<a name="line.120"></a>
<span class="sourceLineNo">121</span><a name="line.121"></a>
<span class="sourceLineNo">122</span> // Create the email message<a name="line.122"></a>
-<span class="sourceLineNo">123</span> ImageHtmlEmail email = new ImageHtmlEmail();<a name="line.123"></a>
+<span class="sourceLineNo">123</span> final ImageHtmlEmail email = new ImageHtmlEmail();<a name="line.123"></a>
<span class="sourceLineNo">124</span><a name="line.124"></a>
<span class="sourceLineNo">125</span> // set the html message<a name="line.125"></a>
<span class="sourceLineNo">126</span> try {<a name="line.126"></a>
<span class="sourceLineNo">127</span> email.setHtmlMsg("");<a name="line.127"></a>
<span class="sourceLineNo">128</span> fail("Should fail here!");<a name="line.128"></a>
-<span class="sourceLineNo">129</span> } catch (EmailException e) {<a name="line.129"></a>
+<span class="sourceLineNo">129</span> } catch (final EmailException e) {<a name="line.129"></a>
<span class="sourceLineNo">130</span> assertTrue(e.getMessage(), e.getMessage().contains("Invalid message supplied"));<a name="line.130"></a>
<span class="sourceLineNo">131</span> }<a name="line.131"></a>
<span class="sourceLineNo">132</span><a name="line.132"></a>
@@ -146,7 +146,7 @@
<span class="sourceLineNo">138</span><a name="line.138"></a>
<span class="sourceLineNo">139</span> getMailServer();<a name="line.139"></a>
<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span> String strSubject = "Test HTML Send default with URL";<a name="line.141"></a>
+<span class="sourceLineNo">141</span> final String strSubject = "Test HTML Send default with URL";<a name="line.141"></a>
<span class="sourceLineNo">142</span><a name="line.142"></a>
<span class="sourceLineNo">143</span> // Create the email message<a name="line.143"></a>
<span class="sourceLineNo">144</span> email = new MockImageHtmlEmailConcrete();<a name="line.144"></a>
@@ -179,7 +179,7 @@
<span class="sourceLineNo">171</span> // Create the email message<a name="line.171"></a>
<span class="sourceLineNo">172</span> getMailServer();<a name="line.172"></a>
<span class="sourceLineNo">173</span><a name="line.173"></a>
-<span class="sourceLineNo">174</span> String strSubject = "Test HTML Send default with absolute local path";<a name="line.174"></a>
+<span class="sourceLineNo">174</span> final String strSubject = "Test HTML Send default with absolute local path";<a name="line.174"></a>
<span class="sourceLineNo">175</span><a name="line.175"></a>
<span class="sourceLineNo">176</span> // Create the email message<a name="line.176"></a>
<span class="sourceLineNo">177</span> email = new MockImageHtmlEmailConcrete();<a name="line.177"></a>
@@ -190,7 +190,7 @@
<span class="sourceLineNo">182</span> email.setSubject(strSubject);<a name="line.182"></a>
<span class="sourceLineNo">183</span> email.setDataSourceResolver(new DataSourceUrlResolver(TEST_IMAGE_DIR.toURI().toURL(), TEST_IS_LENIENT));<a name="line.183"></a>
<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span> File file = File.createTempFile("emailtest", ".tst");<a name="line.185"></a>
+<span class="sourceLineNo">185</span> final File file = File.createTempFile("emailtest", ".tst");<a name="line.185"></a>
<span class="sourceLineNo">186</span> FileUtils.writeStringToFile(file,<a name="line.186"></a>
<span class="sourceLineNo">187</span> "just some silly data that we won't be able to display anyway");<a name="line.187"></a>
<span class="sourceLineNo">188</span><a name="line.188"></a>
@@ -216,7 +216,7 @@
<span class="sourceLineNo">208</span> // Create the email message<a name="line.208"></a>
<span class="sourceLineNo">209</span> getMailServer();<a name="line.209"></a>
<span class="sourceLineNo">210</span><a name="line.210"></a>
-<span class="sourceLineNo">211</span> String strSubject = "Test HTML Send default";<a name="line.211"></a>
+<span class="sourceLineNo">211</span> final String strSubject = "Test HTML Send default";<a name="line.211"></a>
<span class="sourceLineNo">212</span><a name="line.212"></a>
<span class="sourceLineNo">213</span> email = new MockImageHtmlEmailConcrete();<a name="line.213"></a>
<span class="sourceLineNo">214</span> email.setDataSourceResolver(new DataSourceClassPathResolver("/", TEST_IS_LENIENT));<a name="line.214"></a>
@@ -226,7 +226,7 @@
<span class="sourceLineNo">218</span> email.addTo(strTestMailTo);<a name="line.218"></a>
<span class="sourceLineNo">219</span> email.setSubject(strSubject);<a name="line.219"></a>
<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span> String html = loadUrlContent(TEST2_HTML_URL);<a name="line.221"></a>
+<span class="sourceLineNo">221</span> final String html = loadUrlContent(TEST2_HTML_URL);<a name="line.221"></a>
<span class="sourceLineNo">222</span><a name="line.222"></a>
<span class="sourceLineNo">223</span> // set the html message<a name="line.223"></a>
<span class="sourceLineNo">224</span> email.setHtmlMsg(html);<a name="line.224"></a>
@@ -240,10 +240,10 @@
<span class="sourceLineNo">232</span> fakeMailServer.stop();<a name="line.232"></a>
<span class="sourceLineNo">233</span><a name="line.233"></a>
<span class="sourceLineNo">234</span> assertEquals(1, fakeMailServer.getMessages().size());<a name="line.234"></a>
-<span class="sourceLineNo">235</span> MimeMessage mimeMessage = fakeMailServer.getMessages().get(0).getMimeMessage();<a name="line.235"></a>
+<span class="sourceLineNo">235</span> final MimeMessage mimeMessage = fakeMailServer.getMessages().get(0).getMimeMessage();<a name="line.235"></a>
<span class="sourceLineNo">236</span> MimeMessageUtils.writeMimeMessage(mimeMessage, new File("./target/test-emails/testSendHTMLClassPathFile.eml"));<a name="line.236"></a>
<span class="sourceLineNo">237</span><a name="line.237"></a>
-<span class="sourceLineNo">238</span> MimeMessageParser mimeMessageParser = new MimeMessageParser(mimeMessage).parse();<a name="line.238"></a>
+<span class="sourceLineNo">238</span> final MimeMessageParser mimeMessageParser = new MimeMessageParser(mimeMessage).parse();<a name="line.238"></a>
<span class="sourceLineNo">239</span> assertTrue(mimeMessageParser.getHtmlContent().contains("\"cid:"));<a name="line.239"></a>
<span class="sourceLineNo">240</span> assertTrue(mimeMessageParser.getAttachmentList().size() == 1);<a name="line.240"></a>
<span class="sourceLineNo">241</span> }<a name="line.241"></a>
@@ -255,10 +255,10 @@
<span class="sourceLineNo">247</span> // Create the email message<a name="line.247"></a>
<span class="sourceLineNo">248</span> getMailServer();<a name="line.248"></a>
<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span> String strSubject = "Test HTML Send default";<a name="line.250"></a>
+<span class="sourceLineNo">250</span> final String strSubject = "Test HTML Send default";<a name="line.250"></a>
<span class="sourceLineNo">251</span><a name="line.251"></a>
<span class="sourceLineNo">252</span> email = new MockImageHtmlEmailConcrete();<a name="line.252"></a>
-<span class="sourceLineNo">253</span> DataSourceResolver dataSourceResolvers[] = new DataSourceResolver[2];<a name="line.253"></a>
+<span class="sourceLineNo">253</span> final DataSourceResolver dataSourceResolvers[] = new DataSourceResolver[2];<a name="line.253"></a>
<span class="sourceLineNo">254</span> dataSourceResolvers[0] = new DataSourceUrlResolver(new URL("http://foo"), true);<a name="line.254"></a>
<span class="sourceLineNo">255</span> dataSourceResolvers[1] = new DataSourceClassPathResolver("/", true);<a name="line.255"></a>
<span class="sourceLineNo">256</span><a name="line.256"></a>
@@ -269,7 +269,7 @@
<span class="sourceLineNo">261</span> email.addTo(strTestMailTo);<a name="line.261"></a>
<span class="sourceLineNo">262</span> email.setSubject(strSubject);<a name="line.262"></a>
<span class="sourceLineNo">263</span><a name="line.263"></a>
-<span class="sourceLineNo">264</span> String html = loadUrlContent(TEST2_HTML_URL);<a name="line.264"></a>
+<span class="sourceLineNo">264</span> final String html = loadUrlContent(TEST2_HTML_URL);<a name="line.264"></a>
<span class="sourceLineNo">265</span><a name="line.265"></a>
<span class="sourceLineNo">266</span> // set the html message<a name="line.266"></a>
<span class="sourceLineNo">267</span> email.setHtmlMsg(html);<a name="line.267"></a>
@@ -283,10 +283,10 @@
<span class="sourceLineNo">275</span> fakeMailServer.stop();<a name="line.275"></a>
<span class="sourceLineNo">276</span><a name="line.276"></a>
<span class="sourceLineNo">277</span> assertEquals(1, fakeMailServer.getMessages().size());<a name="line.277"></a>
-<span class="sourceLineNo">278</span> MimeMessage mimeMessage = fakeMailServer.getMessages().get(0).getMimeMessage();<a name="line.278"></a>
+<span class="sourceLineNo">278</span> final MimeMessage mimeMessage = fakeMailServer.getMessages().get(0).getMimeMessage();<a name="line.278"></a>
<span class="sourceLineNo">279</span> MimeMessageUtils.writeMimeMessage(mimeMessage, new File("./target/test-emails/testSendHTMLAutoFile.eml"));<a name="line.279"></a>
<span class="sourceLineNo">280</span><a name="line.280"></a>
-<span class="sourceLineNo">281</span> MimeMessageParser mimeMessageParser = new MimeMessageParser(mimeMessage).parse();<a name="line.281"></a>
+<span class="sourceLineNo">281</span> final MimeMessageParser mimeMessageParser = new MimeMessageParser(mimeMessage).parse();<a name="line.281"></a>
<span class="sourceLineNo">282</span> assertTrue(mimeMessageParser.getHtmlContent().contains("\"cid:"));<a name="line.282"></a>
<span class="sourceLineNo">283</span> assertTrue(mimeMessageParser.getAttachmentList().size() == 1);<a name="line.283"></a>
<span class="sourceLineNo">284</span> }<a name="line.284"></a>
@@ -298,10 +298,10 @@
<span class="sourceLineNo">290</span> // Create the email message<a name="line.290"></a>
<span class="sourceLineNo">291</span> getMailServer();<a name="line.291"></a>
<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span> String strSubject = "Test HTML Send default";<a name="line.293"></a>
+<span class="sourceLineNo">293</span> final String strSubject = "Test HTML Send default";<a name="line.293"></a>
<span class="sourceLineNo">294</span><a name="line.294"></a>
<span class="sourceLineNo">295</span> email = new MockImageHtmlEmailConcrete();<a name="line.295"></a>
-<span class="sourceLineNo">296</span> DataSourceResolver dataSourceResolver = new DataSourceClassPathResolver("/", true);<a name="line.296"></a>
+<span class="sourceLineNo">296</span> final DataSourceResolver dataSourceResolver = new DataSourceClassPathResolver("/", true);<a name="line.296"></a>
<span class="sourceLineNo">297</span><a name="line.297"></a>
<span class="sourceLineNo">298</span> email.setDataSourceResolver(dataSourceResolver);<a name="line.298"></a>
<span class="sourceLineNo">299</span> email.setHostName(strTestMailServer);<a name="line.299"></a>
@@ -310,7 +310,7 @@
<span class="sourceLineNo">302</span> email.addTo(strTestMailTo);<a name="line.302"></a>
<span class="sourceLineNo">303</span> email.setSubject(strSubject);<a name="line.303"></a>
<span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span> String html = "<p>First image <img src=\"images/contentTypeTest.gif\"/></p>" +<a name="line.305"></a>
+<span class="sourceLineNo">305</span> final String html = "<p>First image <img src=\"images/contentTypeTest.gif\"/></p>" +<a name="line.305"></a>
<span class="sourceLineNo">306</span> "<p>Second image <img src=\"images/contentTypeTest.jpg\"/></p>" +<a name="line.306"></a>
<span class="sourceLineNo">307</span> "<p>Third image <img src=\"images/contentTypeTest.png\"/></p>";<a name="line.307"></a>
<span class="sourceLineNo">308</span><a name="line.308"></a>
@@ -326,17 +326,17 @@
<span class="sourceLineNo">318</span> fakeMailServer.stop();<a name="line.318"></a>
<span class="sourceLineNo">319</span><a name="line.319"></a>
<span class="sourceLineNo">320</span> assertEquals(1, fakeMailServer.getMessages().size());<a name="line.320"></a>
-<span class="sourceLineNo">321</span> MimeMessage mimeMessage = fakeMailServer.getMessages().get(0).getMimeMessage();<a name="line.321"></a>
+<span class="sourceLineNo">321</span> final MimeMessage mimeMessage = fakeMailServer.getMessages().get(0).getMimeMessage();<a name="line.321"></a>
<span class="sourceLineNo">322</span> MimeMessageUtils.writeMimeMessage(mimeMessage, new File("./target/test-emails/testSendHTMLAutoMultipleFiles.eml"));<a name="line.322"></a>
<span class="sourceLineNo">323</span><a name="line.323"></a>
-<span class="sourceLineNo">324</span> MimeMessageParser mimeMessageParser = new MimeMessageParser(mimeMessage).parse();<a name="line.324"></a>
+<span class="sourceLineNo">324</span> final MimeMessageParser mimeMessageParser = new MimeMessageParser(mimeMessage).parse();<a name="line.324"></a>
<span class="sourceLineNo">325</span> assertTrue(mimeMessageParser.getHtmlContent().contains("\"cid:"));<a name="line.325"></a>
<span class="sourceLineNo">326</span> assertTrue(mimeMessageParser.getAttachmentList().size() == 3);<a name="line.326"></a>
<span class="sourceLineNo">327</span> }<a name="line.327"></a>
<span class="sourceLineNo">328</span><a name="line.328"></a>
<span class="sourceLineNo">329</span> @Test<a name="line.329"></a>
<span class="sourceLineNo">330</span> public void testRegex() {<a name="line.330"></a>
-<span class="sourceLineNo">331</span> Pattern pattern = Pattern.compile(ImageHtmlEmail.REGEX_IMG_SRC);<a name="line.331"></a>
+<span class="sourceLineNo">331</span> final Pattern pattern = Pattern.compile(ImageHtmlEmail.REGEX_IMG_SRC);<a name="line.331"></a>
<span class="sourceLineNo">332</span><a name="line.332"></a>
<span class="sourceLineNo">333</span> // ensure that the regex that we use is catching the cases correctly<a name="line.333"></a>
<span class="sourceLineNo">334</span> Matcher matcher = pattern<a name="line.334"></a>
@@ -419,7 +419,7 @@
<span class="sourceLineNo">411</span><a name="line.411"></a>
<span class="sourceLineNo">412</span> getMailServer();<a name="line.412"></a>
<span class="sourceLineNo">413</span><a name="line.413"></a>
-<span class="sourceLineNo">414</span> String strSubject = "Test HTML Send default with URL";<a name="line.414"></a>
+<span class="sourceLineNo">414</span> final String strSubject = "Test HTML Send default with URL";<a name="line.414"></a>
<span class="sourceLineNo">415</span><a name="line.415"></a>
<span class="sourceLineNo">416</span> // Create the email message<a name="line.416"></a>
<span class="sourceLineNo">417</span> email = new MockImageHtmlEmailConcrete();<a name="line.417"></a>
@@ -443,12 +443,12 @@
<span class="sourceLineNo">435</span> email.getCcAddresses(), email.getBccAddresses(), true);<a name="line.435"></a>
<span class="sourceLineNo">436</span> }<a name="line.436"></a>
<span class="sourceLineNo">437</span> <a name="line.437"></a>
-<span class="sourceLineNo">438</span> private String loadUrlContent(URL url) throws IOException {<a name="line.438"></a>
-<span class="sourceLineNo">439</span> InputStream stream = url.openStream();<a name="line.439"></a>
-<span class="sourceLineNo">440</span> StringBuilder html = new StringBuilder();<a name="line.440"></a>
+<span class="sourceLineNo">438</span> private String loadUrlContent(final URL url) throws IOException {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> final InputStream stream = url.openStream();<a name="line.439"></a>
+<span class="sourceLineNo">440</span> final StringBuilder html = new StringBuilder();<a name="line.440"></a>
<span class="sourceLineNo">441</span> try {<a name="line.441"></a>
-<span class="sourceLineNo">442</span> List<String> lines = IOUtils.readLines(stream);<a name="line.442"></a>
-<span class="sourceLineNo">443</span> for (String line : lines) {<a name="line.443"></a>
+<span class="sourceLineNo">442</span> final List<String> lines = IOUtils.readLines(stream);<a name="line.442"></a>
+<span class="sourceLineNo">443</span> for (final String line : lines) {<a name="line.443"></a>
<span class="sourceLineNo">444</span> html.append(line).append("\n");<a name="line.444"></a>
<span class="sourceLineNo">445</span> }<a name="line.445"></a>
<span class="sourceLineNo">446</span> } finally {<a name="line.446"></a>
Modified: websites/production/commons/content/proper/commons-email/testapidocs/src-html/org/apache/commons/mail/InvalidAddressTest.html
==============================================================================
--- websites/production/commons/content/proper/commons-email/testapidocs/src-html/org/apache/commons/mail/InvalidAddressTest.html (original)
+++ websites/production/commons/content/proper/commons-email/testapidocs/src-html/org/apache/commons/mail/InvalidAddressTest.html Wed Jul 9 20:46:21 2014
@@ -34,7 +34,7 @@
<span class="sourceLineNo">026</span> * JUnit test case for invalid Addresses in Email Class<a name="line.26"></a>
<span class="sourceLineNo">027</span> *<a name="line.27"></a>
<span class="sourceLineNo">028</span> * @since 1.0<a name="line.28"></a>
-<span class="sourceLineNo">029</span> * @version $Id: InvalidAddressTest.java 1460036 2013-03-22 22:38:21Z tn $<a name="line.29"></a>
+<span class="sourceLineNo">029</span> * @version $Id: InvalidAddressTest.java 1606709 2014-06-30 12:26:06Z ggregory $<a name="line.29"></a>
<span class="sourceLineNo">030</span> */<a name="line.30"></a>
<span class="sourceLineNo">031</span>public class InvalidAddressTest extends AbstractEmailTest<a name="line.31"></a>
<span class="sourceLineNo">032</span>{<a name="line.32"></a>
@@ -100,7 +100,7 @@
<span class="sourceLineNo">092</span> // Expected an exception to be thrown<a name="line.92"></a>
<span class="sourceLineNo">093</span> fail("setFrom " + i + " passed: " + ARR_INVALID_EMAILS[i]);<a name="line.93"></a>
<span class="sourceLineNo">094</span> }<a name="line.94"></a>
-<span class="sourceLineNo">095</span> catch (EmailException ignore)<a name="line.95"></a>
+<span class="sourceLineNo">095</span> catch (final EmailException ignore)<a name="line.95"></a>
<span class="sourceLineNo">096</span> {<a name="line.96"></a>
<span class="sourceLineNo">097</span> // Expected Result<a name="line.97"></a>
<span class="sourceLineNo">098</span> }<a name="line.98"></a>
@@ -124,7 +124,7 @@
<span class="sourceLineNo">116</span> // Expected an exception to be thrown<a name="line.116"></a>
<span class="sourceLineNo">117</span> fail("addTo " + i + " passed: " + ARR_INVALID_EMAILS[i]);<a name="line.117"></a>
<span class="sourceLineNo">118</span> }<a name="line.118"></a>
-<span class="sourceLineNo">119</span> catch (EmailException ignore)<a name="line.119"></a>
+<span class="sourceLineNo">119</span> catch (final EmailException ignore)<a name="line.119"></a>
<span class="sourceLineNo">120</span> {<a name="line.120"></a>
<span class="sourceLineNo">121</span> // Expected Result<a name="line.121"></a>
<span class="sourceLineNo">122</span> }<a name="line.122"></a>
@@ -148,7 +148,7 @@
<span class="sourceLineNo">140</span> // Expected an exception to be thrown<a name="line.140"></a>
<span class="sourceLineNo">141</span> fail("addCc " + i + " passed: " + ARR_INVALID_EMAILS[i]);<a name="line.141"></a>
<span class="sourceLineNo">142</span> }<a name="line.142"></a>
-<span class="sourceLineNo">143</span> catch (EmailException ignore)<a name="line.143"></a>
+<span class="sourceLineNo">143</span> catch (final EmailException ignore)<a name="line.143"></a>
<span class="sourceLineNo">144</span> {<a name="line.144"></a>
<span class="sourceLineNo">145</span> // Expected Result<a name="line.145"></a>
<span class="sourceLineNo">146</span> }<a name="line.146"></a>
@@ -172,7 +172,7 @@
<span class="sourceLineNo">164</span> // Expected an exception to be thrown<a name="line.164"></a>
<span class="sourceLineNo">165</span> fail("addBcc " + i + " passed: " + ARR_INVALID_EMAILS[i]);<a name="line.165"></a>
<span class="sourceLineNo">166</span> }<a name="line.166"></a>
-<span class="sourceLineNo">167</span> catch (EmailException ignore)<a name="line.167"></a>
+<span class="sourceLineNo">167</span> catch (final EmailException ignore)<a name="line.167"></a>
<span class="sourceLineNo">168</span> {<a name="line.168"></a>
<span class="sourceLineNo">169</span> // Expected Result<a name="line.169"></a>
<span class="sourceLineNo">170</span> }<a name="line.170"></a>
Modified: websites/production/commons/content/proper/commons-email/testapidocs/src-html/org/apache/commons/mail/InvalidInternetAddressTest.html
==============================================================================
--- websites/production/commons/content/proper/commons-email/testapidocs/src-html/org/apache/commons/mail/InvalidInternetAddressTest.html (original)
+++ websites/production/commons/content/proper/commons-email/testapidocs/src-html/org/apache/commons/mail/InvalidInternetAddressTest.html Wed Jul 9 20:46:21 2014
@@ -38,7 +38,7 @@
<span class="sourceLineNo">030</span> * JUnit test case demonstrating InternetAddress validation.<a name="line.30"></a>
<span class="sourceLineNo">031</span> *<a name="line.31"></a>
<span class="sourceLineNo">032</span> * @since 1.0<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * @version $Id: InvalidInternetAddressTest.java 1510676 2013-08-05 19:29:09Z britter $<a name="line.33"></a>
+<span class="sourceLineNo">033</span> * @version $Id: InvalidInternetAddressTest.java 1606710 2014-06-30 12:29:13Z ggregory $<a name="line.33"></a>
<span class="sourceLineNo">034</span> */<a name="line.34"></a>
<span class="sourceLineNo">035</span>public class InvalidInternetAddressTest extends AbstractEmailTest<a name="line.35"></a>
<span class="sourceLineNo">036</span>{<a name="line.36"></a>
@@ -85,176 +85,175 @@
<span class="sourceLineNo">077</span><a name="line.77"></a>
<span class="sourceLineNo">078</span> /**<a name="line.78"></a>
<span class="sourceLineNo">079</span> * Setup for a test<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * @throws Exception on any error<a name="line.80"></a>
-<span class="sourceLineNo">081</span> */<a name="line.81"></a>
-<span class="sourceLineNo">082</span> @Before<a name="line.82"></a>
-<span class="sourceLineNo">083</span> public void setUpInvalidInternetAddressTest()<a name="line.83"></a>
-<span class="sourceLineNo">084</span> {<a name="line.84"></a>
-<span class="sourceLineNo">085</span> try<a name="line.85"></a>
-<span class="sourceLineNo">086</span> {<a name="line.86"></a>
-<span class="sourceLineNo">087</span> validateMethod = InternetAddress.class.getMethod("validate", new Class [0]);<a name="line.87"></a>
-<span class="sourceLineNo">088</span> }<a name="line.88"></a>
-<span class="sourceLineNo">089</span> catch (Exception e)<a name="line.89"></a>
-<span class="sourceLineNo">090</span> {<a name="line.90"></a>
-<span class="sourceLineNo">091</span> assertEquals("Got wrong Exception when looking for validate()", NoSuchMethodException.class, e.getClass());<a name="line.91"></a>
-<span class="sourceLineNo">092</span> }<a name="line.92"></a>
-<span class="sourceLineNo">093</span> }<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span> @Test<a name="line.95"></a>
-<span class="sourceLineNo">096</span> public void testStrictConstructor() throws Exception<a name="line.96"></a>
-<span class="sourceLineNo">097</span> {<a name="line.97"></a>
-<span class="sourceLineNo">098</span> // ====================================================================<a name="line.98"></a>
-<span class="sourceLineNo">099</span> // Prove InternetAddress constructor is throwing exception.<a name="line.99"></a>
-<span class="sourceLineNo">100</span> // ====================================================================<a name="line.100"></a>
+<span class="sourceLineNo">080</span> */<a name="line.80"></a>
+<span class="sourceLineNo">081</span> @Before<a name="line.81"></a>
+<span class="sourceLineNo">082</span> public void setUpInvalidInternetAddressTest()<a name="line.82"></a>
+<span class="sourceLineNo">083</span> {<a name="line.83"></a>
+<span class="sourceLineNo">084</span> try<a name="line.84"></a>
+<span class="sourceLineNo">085</span> {<a name="line.85"></a>
+<span class="sourceLineNo">086</span> validateMethod = InternetAddress.class.getMethod("validate", new Class [0]);<a name="line.86"></a>
+<span class="sourceLineNo">087</span> }<a name="line.87"></a>
+<span class="sourceLineNo">088</span> catch (final Exception e)<a name="line.88"></a>
+<span class="sourceLineNo">089</span> {<a name="line.89"></a>
+<span class="sourceLineNo">090</span> assertEquals("Got wrong Exception when looking for validate()", NoSuchMethodException.class, e.getClass());<a name="line.90"></a>
+<span class="sourceLineNo">091</span> }<a name="line.91"></a>
+<span class="sourceLineNo">092</span> }<a name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span> @Test<a name="line.94"></a>
+<span class="sourceLineNo">095</span> public void testStrictConstructor() throws Exception<a name="line.95"></a>
+<span class="sourceLineNo">096</span> {<a name="line.96"></a>
+<span class="sourceLineNo">097</span> // ====================================================================<a name="line.97"></a>
+<span class="sourceLineNo">098</span> // Prove InternetAddress constructor is throwing exception.<a name="line.98"></a>
+<span class="sourceLineNo">099</span> // ====================================================================<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
<span class="sourceLineNo">101</span><a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span> // test Invalid Email addresses<a name="line.103"></a>
-<span class="sourceLineNo">104</span> for (int i = 0; i < ARR_INVALID_EMAILS.length; i++)<a name="line.104"></a>
-<span class="sourceLineNo">105</span> {<a name="line.105"></a>
-<span class="sourceLineNo">106</span><a name="line.106"></a>
-<span class="sourceLineNo">107</span> try<a name="line.107"></a>
-<span class="sourceLineNo">108</span> {<a name="line.108"></a>
-<span class="sourceLineNo">109</span> // Create Internet Address using "strict" constructor<a name="line.109"></a>
-<span class="sourceLineNo">110</span> new InternetAddress(ARR_INVALID_EMAILS[i]);<a name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span> // Expected an exception to be thrown<a name="line.112"></a>
-<span class="sourceLineNo">113</span> fail("Strict " + i + " passed: " + ARR_INVALID_EMAILS[i]);<a name="line.113"></a>
-<span class="sourceLineNo">114</span> }<a name="line.114"></a>
-<span class="sourceLineNo">115</span> catch (Exception ex)<a name="line.115"></a>
-<span class="sourceLineNo">116</span> {<a name="line.116"></a>
-<span class="sourceLineNo">117</span> // Expected Result<a name="line.117"></a>
-<span class="sourceLineNo">118</span> }<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span> }<a name="line.120"></a>
-<span class="sourceLineNo">121</span><a name="line.121"></a>
-<span class="sourceLineNo">122</span> // test valid 'quoted' Email addresses<a name="line.122"></a>
-<span class="sourceLineNo">123</span> try<a name="line.123"></a>
-<span class="sourceLineNo">124</span> {<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span> // Create Internet Address using "strict" constructor<a name="line.126"></a>
-<span class="sourceLineNo">127</span> new InternetAddress(VALID_QUOTED_EMAIL);<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span> }<a name="line.129"></a>
-<span class="sourceLineNo">130</span> catch (Exception ex)<a name="line.130"></a>
-<span class="sourceLineNo">131</span> {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> fail("Valid Quoted Email failed: " + VALID_QUOTED_EMAIL<a name="line.132"></a>
-<span class="sourceLineNo">133</span> + " - " + ex.getMessage());<a name="line.133"></a>
-<span class="sourceLineNo">134</span> }<a name="line.134"></a>
-<span class="sourceLineNo">135</span> }<a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span> @Test<a name="line.137"></a>
-<span class="sourceLineNo">138</span> public void testValidateMethod() throws Exception<a name="line.138"></a>
-<span class="sourceLineNo">139</span> {<a name="line.139"></a>
-<span class="sourceLineNo">140</span> if (validateMethod == null)<a name="line.140"></a>
-<span class="sourceLineNo">141</span> {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> return;<a name="line.142"></a>
-<span class="sourceLineNo">143</span> }<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span> // ====================================================================<a name="line.145"></a>
-<span class="sourceLineNo">146</span> // Prove InternetAddress constructor isn't throwing exception and<a name="line.146"></a>
-<span class="sourceLineNo">147</span> // the validate() method is<a name="line.147"></a>
-<span class="sourceLineNo">148</span> // ====================================================================<a name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span> for (int i = 0; i < ARR_INVALID_EMAILS.length; i++)<a name="line.150"></a>
-<span class="sourceLineNo">151</span> {<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span> InternetAddress address = new InternetAddress(ARR_INVALID_EMAILS[i], "Joe");<a name="line.153"></a>
-<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span> // N.B. validate() doesn't check addresses containing quotes or '['<a name="line.155"></a>
-<span class="sourceLineNo">156</span> boolean quoted = ARR_INVALID_EMAILS[i].contains("\"");<a name="line.156"></a>
-<span class="sourceLineNo">157</span> int atIndex = ARR_INVALID_EMAILS[i].indexOf("@");<a name="line.157"></a>
-<span class="sourceLineNo">158</span> boolean domainBracket = (atIndex >= 0)<a name="line.158"></a>
-<span class="sourceLineNo">159</span> && (ARR_INVALID_EMAILS[i].indexOf("[", atIndex) >= 0);<a name="line.159"></a>
-<span class="sourceLineNo">160</span> try<a name="line.160"></a>
-<span class="sourceLineNo">161</span> {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> validateMethod.invoke(address, (Object[]) null);<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span> if (!(quoted || domainBracket))<a name="line.164"></a>
-<span class="sourceLineNo">165</span> {<a name="line.165"></a>
-<span class="sourceLineNo">166</span> fail("Validate " + i + " passed: " + ARR_INVALID_EMAILS[i]);<a name="line.166"></a>
-<span class="sourceLineNo">167</span> }<a name="line.167"></a>
-<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span> catch (Exception ex)<a name="line.169"></a>
-<span class="sourceLineNo">170</span> {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> if (quoted || domainBracket)<a name="line.171"></a>
-<span class="sourceLineNo">172</span> {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> fail("Validate " + i + " failed: " + ARR_INVALID_EMAILS[i]<a name="line.173"></a>
-<span class="sourceLineNo">174</span> + " - " + ex.getMessage());<a name="line.174"></a>
-<span class="sourceLineNo">175</span> }<a name="line.175"></a>
-<span class="sourceLineNo">176</span> }<a name="line.176"></a>
-<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span> // test valid 'quoted' Email addresses<a name="line.179"></a>
-<span class="sourceLineNo">180</span> try<a name="line.180"></a>
-<span class="sourceLineNo">181</span> {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> validateMethod.invoke(new InternetAddress(VALID_QUOTED_EMAIL, "Joe"), (Object[]) null);<a name="line.182"></a>
-<span class="sourceLineNo">183</span> }<a name="line.183"></a>
-<span class="sourceLineNo">184</span> catch (Exception ex)<a name="line.184"></a>
-<span class="sourceLineNo">185</span> {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> fail("Valid Quoted Email failed: " + VALID_QUOTED_EMAIL<a name="line.186"></a>
-<span class="sourceLineNo">187</span> + " - " + ex.getMessage());<a name="line.187"></a>
-<span class="sourceLineNo">188</span> }<a name="line.188"></a>
-<span class="sourceLineNo">189</span> }<a name="line.189"></a>
-<span class="sourceLineNo">190</span><a name="line.190"></a>
-<span class="sourceLineNo">191</span> @Test<a name="line.191"></a>
-<span class="sourceLineNo">192</span> public void testValidateMethodCharset() throws Exception<a name="line.192"></a>
-<span class="sourceLineNo">193</span> {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> if (validateMethod == null)<a name="line.194"></a>
-<span class="sourceLineNo">195</span> {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> return;<a name="line.196"></a>
-<span class="sourceLineNo">197</span> }<a name="line.197"></a>
-<span class="sourceLineNo">198</span><a name="line.198"></a>
-<span class="sourceLineNo">199</span> // ====================================================================<a name="line.199"></a>
-<span class="sourceLineNo">200</span> // Prove InternetAddress constructor isn't throwing exception and<a name="line.200"></a>
-<span class="sourceLineNo">201</span> // the validate() method is<a name="line.201"></a>
-<span class="sourceLineNo">202</span> // ====================================================================<a name="line.202"></a>
-<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span> for (int i = 0; i < ARR_INVALID_EMAILS.length; i++)<a name="line.204"></a>
-<span class="sourceLineNo">205</span> {<a name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span> InternetAddress address = new InternetAddress(ARR_INVALID_EMAILS[i], "Joe", "UTF-8");<a name="line.207"></a>
-<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span> // N.B. validate() doesn't check addresses containing quotes or '['<a name="line.209"></a>
-<span class="sourceLineNo">210</span> boolean quoted = ARR_INVALID_EMAILS[i].contains("\"");<a name="line.210"></a>
-<span class="sourceLineNo">211</span> int atIndex = ARR_INVALID_EMAILS[i].indexOf("@");<a name="line.211"></a>
-<span class="sourceLineNo">212</span> boolean domainBracket = (atIndex >= 0)<a name="line.212"></a>
-<span class="sourceLineNo">213</span> && (ARR_INVALID_EMAILS[i].indexOf("[", atIndex) >= 0);<a name="line.213"></a>
-<span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span> try<a name="line.215"></a>
-<span class="sourceLineNo">216</span> {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> validateMethod.invoke(address, (Object[]) null);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> if (!(quoted || domainBracket))<a name="line.218"></a>
-<span class="sourceLineNo">219</span> {<a name="line.219"></a>
-<span class="sourceLineNo">220</span> fail("Validate " + i + " passed: " + ARR_INVALID_EMAILS[i]);<a name="line.220"></a>
-<span class="sourceLineNo">221</span> }<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span> catch (Exception ex)<a name="line.224"></a>
-<span class="sourceLineNo">225</span> {<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span> if (quoted || domainBracket)<a name="line.227"></a>
-<span class="sourceLineNo">228</span> {<a name="line.228"></a>
-<span class="sourceLineNo">229</span> fail("Validate " + i + " failed: " + ARR_INVALID_EMAILS[i]<a name="line.229"></a>
-<span class="sourceLineNo">230</span> + " - " + ex.getMessage());<a name="line.230"></a>
-<span class="sourceLineNo">231</span> }<a name="line.231"></a>
-<span class="sourceLineNo">232</span><a name="line.232"></a>
-<span class="sourceLineNo">233</span> }<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span> // test valid 'quoted' Email addresses<a name="line.237"></a>
-<span class="sourceLineNo">238</span> try<a name="line.238"></a>
-<span class="sourceLineNo">239</span> {<a name="line.239"></a>
-<span class="sourceLineNo">240</span> validateMethod.invoke(new InternetAddress(VALID_QUOTED_EMAIL, "Joe", "UTF-8"), (Object[]) null);<a name="line.240"></a>
-<span class="sourceLineNo">241</span> }<a name="line.241"></a>
-<span class="sourceLineNo">242</span> catch (Exception ex)<a name="line.242"></a>
-<span class="sourceLineNo">243</span> {<a name="line.243"></a>
-<span class="sourceLineNo">244</span> fail("Valid Quoted Email failed: " + VALID_QUOTED_EMAIL<a name="line.244"></a>
-<span class="sourceLineNo">245</span> + " - " + ex.getMessage());<a name="line.245"></a>
-<span class="sourceLineNo">246</span> }<a name="line.246"></a>
-<span class="sourceLineNo">247</span> }<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span>}<a name="line.249"></a>
+<span class="sourceLineNo">102</span> // test Invalid Email addresses<a name="line.102"></a>
+<span class="sourceLineNo">103</span> for (int i = 0; i < ARR_INVALID_EMAILS.length; i++)<a name="line.103"></a>
+<span class="sourceLineNo">104</span> {<a name="line.104"></a>
+<span class="sourceLineNo">105</span><a name="line.105"></a>
+<span class="sourceLineNo">106</span> try<a name="line.106"></a>
+<span class="sourceLineNo">107</span> {<a name="line.107"></a>
+<span class="sourceLineNo">108</span> // Create Internet Address using "strict" constructor<a name="line.108"></a>
+<span class="sourceLineNo">109</span> new InternetAddress(ARR_INVALID_EMAILS[i]);<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span> // Expected an exception to be thrown<a name="line.111"></a>
+<span class="sourceLineNo">112</span> fail("Strict " + i + " passed: " + ARR_INVALID_EMAILS[i]);<a name="line.112"></a>
+<span class="sourceLineNo">113</span> }<a name="line.113"></a>
+<span class="sourceLineNo">114</span> catch (final Exception ex)<a name="line.114"></a>
+<span class="sourceLineNo">115</span> {<a name="line.115"></a>
+<span class="sourceLineNo">116</span> // Expected Result<a name="line.116"></a>
+<span class="sourceLineNo">117</span> }<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span> }<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span> // test valid 'quoted' Email addresses<a name="line.121"></a>
+<span class="sourceLineNo">122</span> try<a name="line.122"></a>
+<span class="sourceLineNo">123</span> {<a name="line.123"></a>
+<span class="sourceLineNo">124</span><a name="line.124"></a>
+<span class="sourceLineNo">125</span> // Create Internet Address using "strict" constructor<a name="line.125"></a>
+<span class="sourceLineNo">126</span> new InternetAddress(VALID_QUOTED_EMAIL);<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span> }<a name="line.128"></a>
+<span class="sourceLineNo">129</span> catch (final Exception ex)<a name="line.129"></a>
+<span class="sourceLineNo">130</span> {<a name="line.130"></a>
+<span class="sourceLineNo">131</span> fail("Valid Quoted Email failed: " + VALID_QUOTED_EMAIL<a name="line.131"></a>
+<span class="sourceLineNo">132</span> + " - " + ex.getMessage());<a name="line.132"></a>
+<span class="sourceLineNo">133</span> }<a name="line.133"></a>
+<span class="sourceLineNo">134</span> }<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span> @Test<a name="line.136"></a>
+<span class="sourceLineNo">137</span> public void testValidateMethod() throws Exception<a name="line.137"></a>
+<span class="sourceLineNo">138</span> {<a name="line.138"></a>
+<span class="sourceLineNo">139</span> if (validateMethod == null)<a name="line.139"></a>
+<span class="sourceLineNo">140</span> {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> return;<a name="line.141"></a>
+<span class="sourceLineNo">142</span> }<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span> // ====================================================================<a name="line.144"></a>
+<span class="sourceLineNo">145</span> // Prove InternetAddress constructor isn't throwing exception and<a name="line.145"></a>
+<span class="sourceLineNo">146</span> // the validate() method is<a name="line.146"></a>
+<span class="sourceLineNo">147</span> // ====================================================================<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span> for (int i = 0; i < ARR_INVALID_EMAILS.length; i++)<a name="line.149"></a>
+<span class="sourceLineNo">150</span> {<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span> final InternetAddress address = new InternetAddress(ARR_INVALID_EMAILS[i], "Joe");<a name="line.152"></a>
+<span class="sourceLineNo">153</span><a name="line.153"></a>
+<span class="sourceLineNo">154</span> // N.B. validate() doesn't check addresses containing quotes or '['<a name="line.154"></a>
+<span class="sourceLineNo">155</span> final boolean quoted = ARR_INVALID_EMAILS[i].contains("\"");<a name="line.155"></a>
+<span class="sourceLineNo">156</span> final int atIndex = ARR_INVALID_EMAILS[i].indexOf("@");<a name="line.156"></a>
+<span class="sourceLineNo">157</span> final boolean domainBracket = atIndex >= 0<a name="line.157"></a>
+<span class="sourceLineNo">158</span> && ARR_INVALID_EMAILS[i].indexOf("[", atIndex) >= 0;<a name="line.158"></a>
+<span class="sourceLineNo">159</span> try<a name="line.159"></a>
+<span class="sourceLineNo">160</span> {<a name="line.160"></a>
+<span class="sourceLineNo">161</span> validateMethod.invoke(address, (Object[]) null);<a name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span> if (!(quoted || domainBracket))<a name="line.163"></a>
+<span class="sourceLineNo">164</span> {<a name="line.164"></a>
+<span class="sourceLineNo">165</span> fail("Validate " + i + " passed: " + ARR_INVALID_EMAILS[i]);<a name="line.165"></a>
+<span class="sourceLineNo">166</span> }<a name="line.166"></a>
+<span class="sourceLineNo">167</span> }<a name="line.167"></a>
+<span class="sourceLineNo">168</span> catch (final Exception ex)<a name="line.168"></a>
+<span class="sourceLineNo">169</span> {<a name="line.169"></a>
+<span class="sourceLineNo">170</span> if (quoted || domainBracket)<a name="line.170"></a>
+<span class="sourceLineNo">171</span> {<a name="line.171"></a>
+<span class="sourceLineNo">172</span> fail("Validate " + i + " failed: " + ARR_INVALID_EMAILS[i]<a name="line.172"></a>
+<span class="sourceLineNo">173</span> + " - " + ex.getMessage());<a name="line.173"></a>
+<span class="sourceLineNo">174</span> }<a name="line.174"></a>
+<span class="sourceLineNo">175</span> }<a name="line.175"></a>
+<span class="sourceLineNo">176</span> }<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span> // test valid 'quoted' Email addresses<a name="line.178"></a>
+<span class="sourceLineNo">179</span> try<a name="line.179"></a>
+<span class="sourceLineNo">180</span> {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> validateMethod.invoke(new InternetAddress(VALID_QUOTED_EMAIL, "Joe"), (Object[]) null);<a name="line.181"></a>
+<span class="sourceLineNo">182</span> }<a name="line.182"></a>
+<span class="sourceLineNo">183</span> catch (final Exception ex)<a name="line.183"></a>
+<span class="sourceLineNo">184</span> {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> fail("Valid Quoted Email failed: " + VALID_QUOTED_EMAIL<a name="line.185"></a>
+<span class="sourceLineNo">186</span> + " - " + ex.getMessage());<a name="line.186"></a>
+<span class="sourceLineNo">187</span> }<a name="line.187"></a>
+<span class="sourceLineNo">188</span> }<a name="line.188"></a>
+<span class="sourceLineNo">189</span><a name="line.189"></a>
+<span class="sourceLineNo">190</span> @Test<a name="line.190"></a>
+<span class="sourceLineNo">191</span> public void testValidateMethodCharset() throws Exception<a name="line.191"></a>
+<span class="sourceLineNo">192</span> {<a name="line.192"></a>
+<span class="sourceLineNo">193</span> if (validateMethod == null)<a name="line.193"></a>
+<span class="sourceLineNo">194</span> {<a name="line.194"></a>
+<span class="sourceLineNo">195</span> return;<a name="line.195"></a>
+<span class="sourceLineNo">196</span> }<a name="line.196"></a>
+<span class="sourceLineNo">197</span><a name="line.197"></a>
+<span class="sourceLineNo">198</span> // ====================================================================<a name="line.198"></a>
+<span class="sourceLineNo">199</span> // Prove InternetAddress constructor isn't throwing exception and<a name="line.199"></a>
+<span class="sourceLineNo">200</span> // the validate() method is<a name="line.200"></a>
+<span class="sourceLineNo">201</span> // ====================================================================<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span> for (int i = 0; i < ARR_INVALID_EMAILS.length; i++)<a name="line.203"></a>
+<span class="sourceLineNo">204</span> {<a name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
+<span class="sourceLineNo">206</span> final InternetAddress address = new InternetAddress(ARR_INVALID_EMAILS[i], "Joe", "UTF-8");<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span> // N.B. validate() doesn't check addresses containing quotes or '['<a name="line.208"></a>
+<span class="sourceLineNo">209</span> final boolean quoted = ARR_INVALID_EMAILS[i].contains("\"");<a name="line.209"></a>
+<span class="sourceLineNo">210</span> final int atIndex = ARR_INVALID_EMAILS[i].indexOf("@");<a name="line.210"></a>
+<span class="sourceLineNo">211</span> final boolean domainBracket = atIndex >= 0<a name="line.211"></a>
+<span class="sourceLineNo">212</span> && ARR_INVALID_EMAILS[i].indexOf("[", atIndex) >= 0;<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span> try<a name="line.214"></a>
+<span class="sourceLineNo">215</span> {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> validateMethod.invoke(address, (Object[]) null);<a name="line.216"></a>
+<span class="sourceLineNo">217</span> if (!(quoted || domainBracket))<a name="line.217"></a>
+<span class="sourceLineNo">218</span> {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> fail("Validate " + i + " passed: " + ARR_INVALID_EMAILS[i]);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> }<a name="line.220"></a>
+<span class="sourceLineNo">221</span><a name="line.221"></a>
+<span class="sourceLineNo">222</span> }<a name="line.222"></a>
+<span class="sourceLineNo">223</span> catch (final Exception ex)<a name="line.223"></a>
+<span class="sourceLineNo">224</span> {<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> if (quoted || domainBracket)<a name="line.226"></a>
+<span class="sourceLineNo">227</span> {<a name="line.227"></a>
+<span class="sourceLineNo">228</span> fail("Validate " + i + " failed: " + ARR_INVALID_EMAILS[i]<a name="line.228"></a>
+<span class="sourceLineNo">229</span> + " - " + ex.getMessage());<a name="line.229"></a>
+<span class="sourceLineNo">230</span> }<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span> }<a name="line.232"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">234</span> }<a name="line.234"></a>
+<span class="sourceLineNo">235</span><a name="line.235"></a>
+<span class="sourceLineNo">236</span> // test valid 'quoted' Email addresses<a name="line.236"></a>
+<span class="sourceLineNo">237</span> try<a name="line.237"></a>
+<span class="sourceLineNo">238</span> {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> validateMethod.invoke(new InternetAddress(VALID_QUOTED_EMAIL, "Joe", "UTF-8"), (Object[]) null);<a name="line.239"></a>
+<span class="sourceLineNo">240</span> }<a name="line.240"></a>
+<span class="sourceLineNo">241</span> catch (final Exception ex)<a name="line.241"></a>
+<span class="sourceLineNo">242</span> {<a name="line.242"></a>
+<span class="sourceLineNo">243</span> fail("Valid Quoted Email failed: " + VALID_QUOTED_EMAIL<a name="line.243"></a>
+<span class="sourceLineNo">244</span> + " - " + ex.getMessage());<a name="line.244"></a>
+<span class="sourceLineNo">245</span> }<a name="line.245"></a>
+<span class="sourceLineNo">246</span> }<a name="line.246"></a>
+<span class="sourceLineNo">247</span><a name="line.247"></a>
+<span class="sourceLineNo">248</span>}<a name="line.248"></a>
Modified: websites/production/commons/content/proper/commons-email/testapidocs/src-html/org/apache/commons/mail/MultiPartEmailTest.html
==============================================================================
--- websites/production/commons/content/proper/commons-email/testapidocs/src-html/org/apache/commons/mail/MultiPartEmailTest.html (original)
+++ websites/production/commons/content/proper/commons-email/testapidocs/src-html/org/apache/commons/mail/MultiPartEmailTest.html Wed Jul 9 20:46:21 2014
@@ -48,7 +48,7 @@
<span class="sourceLineNo">040</span> * JUnit test case for MultiPartEmail Class.<a name="line.40"></a>
<span class="sourceLineNo">041</span> *<a name="line.41"></a>
<span class="sourceLineNo">042</span> * @since 1.0<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * @version $Id: MultiPartEmailTest.java 1510687 2013-08-05 19:48:13Z britter $<a name="line.43"></a>
+<span class="sourceLineNo">043</span> * @version $Id: MultiPartEmailTest.java 1606709 2014-06-30 12:26:06Z ggregory $<a name="line.43"></a>
<span class="sourceLineNo">044</span> */<a name="line.44"></a>
<span class="sourceLineNo">045</span>@RunWith(PowerMockRunner.class)<a name="line.45"></a>
<span class="sourceLineNo">046</span>@PrepareForTest( { MockMultiPartEmailConcrete.class, URLDataSource.class })<a name="line.46"></a>
@@ -75,7 +75,7 @@
<span class="sourceLineNo">067</span> // ====================================================================<a name="line.67"></a>
<span class="sourceLineNo">068</span><a name="line.68"></a>
<span class="sourceLineNo">069</span> // without charset set<a name="line.69"></a>
-<span class="sourceLineNo">070</span> for (String validChar : testCharsValid)<a name="line.70"></a>
+<span class="sourceLineNo">070</span> for (final String validChar : testCharsValid)<a name="line.70"></a>
<span class="sourceLineNo">071</span> {<a name="line.71"></a>
<span class="sourceLineNo">072</span> this.email.setMsg(validChar);<a name="line.72"></a>
<span class="sourceLineNo">073</span> assertEquals(validChar, this.email.getMsg());<a name="line.73"></a>
@@ -83,7 +83,7 @@
<span class="sourceLineNo">075</span><a name="line.75"></a>
<span class="sourceLineNo">076</span> // with charset set<a name="line.76"></a>
<span class="sourceLineNo">077</span> this.email.setCharset(EmailConstants.US_ASCII);<a name="line.77"></a>
-<span class="sourceLineNo">078</span> for (String validChar : testCharsValid)<a name="line.78"></a>
+<span class="sourceLineNo">078</span> for (final String validChar : testCharsValid)<a name="line.78"></a>
<span class="sourceLineNo">079</span> {<a name="line.79"></a>
<span class="sourceLineNo">080</span> this.email.setMsg(validChar);<a name="line.80"></a>
<span class="sourceLineNo">081</span> assertEquals(validChar, this.email.getMsg());<a name="line.81"></a>
@@ -92,14 +92,14 @@
<span class="sourceLineNo">084</span> // ====================================================================<a name="line.84"></a>
<span class="sourceLineNo">085</span> // Test Exceptions<a name="line.85"></a>
<span class="sourceLineNo">086</span> // ====================================================================<a name="line.86"></a>
-<span class="sourceLineNo">087</span> for (String invalidChar : testCharsNotValid)<a name="line.87"></a>
+<span class="sourceLineNo">087</span> for (final String invalidChar : testCharsNotValid)<a name="line.87"></a>
<span class="sourceLineNo">088</span> {<a name="line.88"></a>
<span class="sourceLineNo">089</span> try<a name="line.89"></a>
<span class="sourceLineNo">090</span> {<a name="line.90"></a>
<span class="sourceLineNo">091</span> this.email.setMsg(invalidChar);<a name="line.91"></a>
<span class="sourceLineNo">092</span> fail("Should have thrown an exception");<a name="line.92"></a>
<span class="sourceLineNo">093</span> }<a name="line.93"></a>
-<span class="sourceLineNo">094</span> catch (EmailException e)<a name="line.94"></a>
+<span class="sourceLineNo">094</span> catch (final EmailException e)<a name="line.94"></a>
<span class="sourceLineNo">095</span> {<a name="line.95"></a>
<span class="sourceLineNo">096</span> assertTrue(true);<a name="line.96"></a>
<span class="sourceLineNo">097</span> }<a name="line.97"></a>
@@ -118,15 +118,15 @@
<span class="sourceLineNo">110</span> // ====================================================================<a name="line.110"></a>
<span class="sourceLineNo">111</span> this.getMailServer();<a name="line.111"></a>
<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span> String strSubject = "Test Multipart Send Subject";<a name="line.113"></a>
+<span class="sourceLineNo">113</span> final String strSubject = "Test Multipart Send Subject";<a name="line.113"></a>
<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span> EmailAttachment attachment = new EmailAttachment();<a name="line.115"></a>
+<span class="sourceLineNo">115</span> final EmailAttachment attachment = new EmailAttachment();<a name="line.115"></a>
<span class="sourceLineNo">116</span> attachment.setPath(testFile.getAbsolutePath());<a name="line.116"></a>
<span class="sourceLineNo">117</span> attachment.setDisposition(EmailAttachment.ATTACHMENT);<a name="line.117"></a>
<span class="sourceLineNo">118</span> attachment.setName("Test_Attachment");<a name="line.118"></a>
<span class="sourceLineNo">119</span> attachment.setDescription("Test Attachment Desc");<a name="line.119"></a>
<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span> MockMultiPartEmailConcrete testEmail =<a name="line.121"></a>
+<span class="sourceLineNo">121</span> final MockMultiPartEmailConcrete testEmail =<a name="line.121"></a>
<span class="sourceLineNo">122</span> new MockMultiPartEmailConcrete();<a name="line.122"></a>
<span class="sourceLineNo">123</span> testEmail.setHostName(this.strTestMailServer);<a name="line.123"></a>
<span class="sourceLineNo">124</span> testEmail.setSmtpPort(this.getMailServerPort());<a name="line.124"></a>
@@ -147,7 +147,7 @@
<span class="sourceLineNo">139</span><a name="line.139"></a>
<span class="sourceLineNo">140</span> testEmail.setMsg("Test Message");<a name="line.140"></a>
<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span> Map<String, String> ht = new HashMap<String, String>();<a name="line.142"></a>
+<span class="sourceLineNo">142</span> final Map<String, String> ht = new HashMap<String, String>();<a name="line.142"></a>
<span class="sourceLineNo">143</span> ht.put("X-Priority", "2");<a name="line.143"></a>
<span class="sourceLineNo">144</span> ht.put("Disposition-Notification-To", this.strTestMailFrom);<a name="line.144"></a>
<span class="sourceLineNo">145</span> ht.put("X-Mailer", "Sendmail");<a name="line.145"></a>
@@ -189,7 +189,7 @@
<span class="sourceLineNo">181</span> this.email.send();<a name="line.181"></a>
<span class="sourceLineNo">182</span> fail("Should have thrown an exception");<a name="line.182"></a>
<span class="sourceLineNo">183</span> }<a name="line.183"></a>
-<span class="sourceLineNo">184</span> catch (EmailException e)<a name="line.184"></a>
+<span class="sourceLineNo">184</span> catch (final EmailException e)<a name="line.184"></a>
<span class="sourceLineNo">185</span> {<a name="line.185"></a>
<span class="sourceLineNo">186</span> this.fakeMailServer.stop();<a name="line.186"></a>
<span class="sourceLineNo">187</span> }<a name="line.187"></a>
@@ -234,7 +234,7 @@
<span class="sourceLineNo">226</span> this.email.attach((EmailAttachment) null);<a name="line.226"></a>
<span class="sourceLineNo">227</span> fail("Should have thrown an exception");<a name="line.227"></a>
<span class="sourceLineNo">228</span> }<a name="line.228"></a>
-<span class="sourceLineNo">229</span> catch (EmailException e)<a name="line.229"></a>
+<span class="sourceLineNo">229</span> catch (final EmailException e)<a name="line.229"></a>
<span class="sourceLineNo">230</span> {<a name="line.230"></a>
<span class="sourceLineNo">231</span> assertTrue(true);<a name="line.231"></a>
<span class="sourceLineNo">232</span> }<a name="line.232"></a>
@@ -247,7 +247,7 @@
<span class="sourceLineNo">239</span> this.email.attach(attachment);<a name="line.239"></a>
<span class="sourceLineNo">240</span> fail("Should have thrown an exception");<a name="line.240"></a>
<span class="sourceLineNo">241</span> }<a name="line.241"></a>
-<span class="sourceLineNo">242</span> catch (EmailException e)<a name="line.242"></a>
+<span class="sourceLineNo">242</span> catch (final EmailException e)<a name="line.242"></a>
<span class="sourceLineNo">243</span> {<a name="line.243"></a>
<span class="sourceLineNo">244</span> assertTrue(true);<a name="line.244"></a>
<span class="sourceLineNo">245</span> }<a name="line.245"></a>
@@ -260,7 +260,7 @@
<span class="sourceLineNo">252</span> this.email.attach(attachment);<a name="line.252"></a>
<span class="sourceLineNo">253</span> fail("Should have thrown an exception");<a name="line.253"></a>
<span class="sourceLineNo">254</span> }<a name="line.254"></a>
-<span class="sourceLineNo">255</span> catch (EmailException e)<a name="line.255"></a>
+<span class="sourceLineNo">255</span> catch (final EmailException e)<a name="line.255"></a>
<span class="sourceLineNo">256</span> {<a name="line.256"></a>
<span class="sourceLineNo">257</span> assertTrue(true);<a name="line.257"></a>
<span class="sourceLineNo">258</span> }<a name="line.258"></a>
@@ -305,11 +305,11 @@
<span class="sourceLineNo">297</span> // null datasource<a name="line.297"></a>
<span class="sourceLineNo">298</span> try<a name="line.298"></a>
<span class="sourceLineNo">299</span> {<a name="line.299"></a>
-<span class="sourceLineNo">300</span> URLDataSource urlDs = null;<a name="line.300"></a>
+<span class="sourceLineNo">300</span> final URLDataSource urlDs = null;<a name="line.300"></a>
<span class="sourceLineNo">301</span> this.email.attach(urlDs, "Test Attachment", "Test Attachment Desc");<a name="line.301"></a>
<span class="sourceLineNo">302</span> fail("Should have thrown an exception");<a name="line.302"></a>
<span class="sourceLineNo">303</span> }<a name="line.303"></a>
-<span class="sourceLineNo">304</span> catch (EmailException e)<a name="line.304"></a>
+<span class="sourceLineNo">304</span> catch (final EmailException e)<a name="line.304"></a>
<span class="sourceLineNo">305</span> {<a name="line.305"></a>
<span class="sourceLineNo">306</span> assertTrue(true);<a name="line.306"></a>
<span class="sourceLineNo">307</span> }<a name="line.307"></a>
@@ -317,11 +317,11 @@
<span class="sourceLineNo">309</span> // invalid datasource<a name="line.309"></a>
<span class="sourceLineNo">310</span> try<a name="line.310"></a>
<span class="sourceLineNo">311</span> {<a name="line.311"></a>
-<span class="sourceLineNo">312</span> URLDataSource urlDs = new URLDataSource(createInvalidURL());<a name="line.312"></a>
+<span class="sourceLineNo">312</span> final URLDataSource urlDs = new URLDataSource(createInvalidURL());<a name="line.312"></a>
<span class="sourceLineNo">313</span> this.email.attach(urlDs, "Test Attachment", "Test Attachment Desc");<a name="line.313"></a>
<span class="sourceLineNo">314</span> fail("Should have thrown an exception");<a name="line.314"></a>
<span class="sourceLineNo">315</span> }<a name="line.315"></a>
-<span class="sourceLineNo">316</span> catch (EmailException e)<a name="line.316"></a>
+<span class="sourceLineNo">316</span> catch (final EmailException e)<a name="line.316"></a>
<span class="sourceLineNo">317</span> {<a name="line.317"></a>
<span class="sourceLineNo">318</span> assertTrue(true);<a name="line.318"></a>
<span class="sourceLineNo">319</span> }<a name="line.319"></a>
@@ -335,7 +335,7 @@
<span class="sourceLineNo">327</span> // resource on windows systems<a name="line.327"></a>
<span class="sourceLineNo">328</span> // ====================================================================<a name="line.328"></a>
<span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span> File tmpFile = File.createTempFile("attachment", ".eml");<a name="line.330"></a>
+<span class="sourceLineNo">330</span> final File tmpFile = File.createTempFile("attachment", ".eml");<a name="line.330"></a>
<span class="sourceLineNo">331</span> <a name="line.331"></a>
<span class="sourceLineNo">332</span> this.email.attach(<a name="line.332"></a>
<span class="sourceLineNo">333</span> new FileDataSource(tmpFile),<a name="line.333"></a>
@@ -351,8 +351,8 @@
<span class="sourceLineNo">343</span><a name="line.343"></a>
<span class="sourceLineNo">344</span> // setup<a name="line.344"></a>
<span class="sourceLineNo">345</span> this.email = new MockMultiPartEmailConcrete();<a name="line.345"></a>
-<span class="sourceLineNo">346</span> String strMessage = "hello";<a name="line.346"></a>
-<span class="sourceLineNo">347</span> String strContentType = "text/plain";<a name="line.347"></a>
+<span class="sourceLineNo">346</span> final String strMessage = "hello";<a name="line.346"></a>
+<span class="sourceLineNo">347</span> final String strContentType = "text/plain";<a name="line.347"></a>
<span class="sourceLineNo">348</span><a name="line.348"></a>
<span class="sourceLineNo">349</span> // add part<a name="line.349"></a>
<span class="sourceLineNo">350</span> this.email.addPart(strMessage, strContentType);<a name="line.350"></a>
@@ -374,7 +374,7 @@
<span class="sourceLineNo">366</span><a name="line.366"></a>
<span class="sourceLineNo">367</span> // setup<a name="line.367"></a>
<span class="sourceLineNo">368</span> this.email = new MockMultiPartEmailConcrete();<a name="line.368"></a>
-<span class="sourceLineNo">369</span> String strSubtype = "subtype/abc123";<a name="line.369"></a>
+<span class="sourceLineNo">369</span> final String strSubtype = "subtype/abc123";<a name="line.369"></a>
<span class="sourceLineNo">370</span><a name="line.370"></a>
<span class="sourceLineNo">371</span> // add part<a name="line.371"></a>
<span class="sourceLineNo">372</span> this.email.addPart(new MimeMultipart(strSubtype));<a name="line.372"></a>
@@ -391,7 +391,7 @@
<span class="sourceLineNo">383</span><a name="line.383"></a>
<span class="sourceLineNo">384</span> }<a name="line.384"></a>
<span class="sourceLineNo">385</span><a name="line.385"></a>
-<span class="sourceLineNo">386</span> /** @todo implement test for GetContainer */<a name="line.386"></a>
+<span class="sourceLineNo">386</span> /** TODO implement test for GetContainer */<a name="line.386"></a>
<span class="sourceLineNo">387</span> @Test<a name="line.387"></a>
<span class="sourceLineNo">388</span> public void testGetContainer()<a name="line.388"></a>
<span class="sourceLineNo">389</span> {<a name="line.389"></a>
@@ -409,7 +409,7 @@
<span class="sourceLineNo">401</span> this.email.init();<a name="line.401"></a>
<span class="sourceLineNo">402</span> fail("Should have thrown an exception");<a name="line.402"></a>
<span class="sourceLineNo">403</span> }<a name="line.403"></a>
-<span class="sourceLineNo">404</span> catch (IllegalStateException e)<a name="line.404"></a>
+<span class="sourceLineNo">404</span> catch (final IllegalStateException e)<a name="line.404"></a>
<span class="sourceLineNo">405</span> {<a name="line.405"></a>
<span class="sourceLineNo">406</span> assertTrue(true);<a name="line.406"></a>
<span class="sourceLineNo">407</span> }<a name="line.407"></a>
@@ -419,7 +419,7 @@
<span class="sourceLineNo">411</span> @Test<a name="line.411"></a>
<span class="sourceLineNo">412</span> public void testGetSetSubType()<a name="line.412"></a>
<span class="sourceLineNo">413</span> {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> for (String validChar : testCharsValid)<a name="line.414"></a>
+<span class="sourceLineNo">414</span> for (final String validChar : testCharsValid)<a name="line.414"></a>
<span class="sourceLineNo">415</span> {<a name="line.415"></a>
<span class="sourceLineNo">416</span> this.email.setSubType(validChar);<a name="line.416"></a>
<span class="sourceLineNo">417</span> assertEquals(validChar, this.email.getSubType());<a name="line.417"></a>