commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t.@apache.org
Subject svn commit: r915608 [15/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...
Date Wed, 09 Jul 2014 20:46:28 GMT
Modified: websites/production/commons/content/proper/commons-email/testapidocs/src-html/org/apache/commons/mail/HtmlEmailTest.html
==============================================================================
--- websites/production/commons/content/proper/commons-email/testapidocs/src-html/org/apache/commons/mail/HtmlEmailTest.html (original)
+++ websites/production/commons/content/proper/commons-email/testapidocs/src-html/org/apache/commons/mail/HtmlEmailTest.html Wed Jul  9 20:46:21 2014
@@ -29,731 +29,728 @@
 <span class="sourceLineNo">021</span>import java.io.File;<a name="line.21"></a>
 <span class="sourceLineNo">022</span>import java.io.IOException;<a name="line.22"></a>
 <span class="sourceLineNo">023</span>import java.net.URL;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import java.util.HashMap;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import java.util.List;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import java.util.Map;<a name="line.26"></a>
-<span class="sourceLineNo">027</span><a name="line.27"></a>
-<span class="sourceLineNo">028</span>import javax.activation.DataSource;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import javax.activation.FileDataSource;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import javax.mail.internet.MimeMessage;<a name="line.30"></a>
-<span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.commons.mail.mocks.MockHtmlEmailConcrete;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.commons.mail.settings.EmailConfiguration;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.commons.mail.util.MimeMessageParser;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.junit.Before;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.junit.Test;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.junit.runner.RunWith;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.powermock.core.classloader.annotations.PrepareForTest;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.powermock.modules.junit4.PowerMockRunner;<a name="line.39"></a>
-<span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span>/**<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * JUnit test case for HtmlEmail Class.<a name="line.42"></a>
-<span class="sourceLineNo">043</span> *<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * @since 1.0<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * @version $Id: HtmlEmailTest.java 1532531 2013-10-15 21:13:11Z tn $<a name="line.45"></a>
-<span class="sourceLineNo">046</span> */<a name="line.46"></a>
-<span class="sourceLineNo">047</span>@RunWith(PowerMockRunner.class)<a name="line.47"></a>
-<span class="sourceLineNo">048</span>@PrepareForTest( { MockHtmlEmailConcrete.class })<a name="line.48"></a>
-<span class="sourceLineNo">049</span>public class HtmlEmailTest extends AbstractEmailTest<a name="line.49"></a>
-<span class="sourceLineNo">050</span>{<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    private MockHtmlEmailConcrete email;<a name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span>    @Before<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    public void setUpHtmlEmailTest()<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    {<a name="line.55"></a>
-<span class="sourceLineNo">056</span>        // reusable objects to be used across multiple tests<a name="line.56"></a>
-<span class="sourceLineNo">057</span>        this.email = new MockHtmlEmailConcrete();<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    }<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>    @Test<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    public void testGetSetTextMsg() throws EmailException<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    {<a name="line.62"></a>
-<span class="sourceLineNo">063</span>        // ====================================================================<a name="line.63"></a>
-<span class="sourceLineNo">064</span>        // Test Success<a name="line.64"></a>
-<span class="sourceLineNo">065</span>        // ====================================================================<a name="line.65"></a>
-<span class="sourceLineNo">066</span>        for (String validChar : testCharsValid)<a name="line.66"></a>
-<span class="sourceLineNo">067</span>        {<a name="line.67"></a>
-<span class="sourceLineNo">068</span>            this.email.setTextMsg(validChar);<a name="line.68"></a>
-<span class="sourceLineNo">069</span>            assertEquals(validChar, this.email.getTextMsg());<a name="line.69"></a>
-<span class="sourceLineNo">070</span>        }<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span>        // ====================================================================<a name="line.72"></a>
-<span class="sourceLineNo">073</span>        // Test Exception<a name="line.73"></a>
-<span class="sourceLineNo">074</span>        // ====================================================================<a name="line.74"></a>
-<span class="sourceLineNo">075</span>        for (String invalidChar : this.testCharsNotValid)<a name="line.75"></a>
-<span class="sourceLineNo">076</span>        {<a name="line.76"></a>
-<span class="sourceLineNo">077</span>            try<a name="line.77"></a>
-<span class="sourceLineNo">078</span>            {<a name="line.78"></a>
-<span class="sourceLineNo">079</span>                this.email.setTextMsg(invalidChar);<a name="line.79"></a>
-<span class="sourceLineNo">080</span>                fail("Should have thrown an exception");<a name="line.80"></a>
-<span class="sourceLineNo">081</span>            }<a name="line.81"></a>
-<span class="sourceLineNo">082</span>            catch (EmailException e)<a name="line.82"></a>
-<span class="sourceLineNo">083</span>            {<a name="line.83"></a>
-<span class="sourceLineNo">084</span>                assertTrue(true);<a name="line.84"></a>
-<span class="sourceLineNo">085</span>            }<a name="line.85"></a>
-<span class="sourceLineNo">086</span>        }<a name="line.86"></a>
-<span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span>    }<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>    @Test<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    public void testGetSetHtmlMsg() throws EmailException<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 Success<a name="line.94"></a>
-<span class="sourceLineNo">095</span>        // ====================================================================<a name="line.95"></a>
-<span class="sourceLineNo">096</span>        for (String validChar : testCharsValid)<a name="line.96"></a>
-<span class="sourceLineNo">097</span>        {<a name="line.97"></a>
-<span class="sourceLineNo">098</span>            this.email.setHtmlMsg(validChar);<a name="line.98"></a>
-<span class="sourceLineNo">099</span>            assertEquals(validChar, this.email.getHtmlMsg());<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 Exception<a name="line.103"></a>
-<span class="sourceLineNo">104</span>        // ====================================================================<a name="line.104"></a>
-<span class="sourceLineNo">105</span>        for (String invalidChar : this.testCharsNotValid)<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>                this.email.setHtmlMsg(invalidChar);<a name="line.109"></a>
-<span class="sourceLineNo">110</span>                fail("Should have thrown an exception");<a name="line.110"></a>
-<span class="sourceLineNo">111</span>            }<a name="line.111"></a>
-<span class="sourceLineNo">112</span>            catch (EmailException e)<a name="line.112"></a>
-<span class="sourceLineNo">113</span>            {<a name="line.113"></a>
-<span class="sourceLineNo">114</span>                assertTrue(true);<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>
-<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>    @Test<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    public void testGetSetMsg() throws EmailException<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    {<a name="line.122"></a>
-<span class="sourceLineNo">123</span>        // ====================================================================<a name="line.123"></a>
-<span class="sourceLineNo">124</span>        // Test Success<a name="line.124"></a>
-<span class="sourceLineNo">125</span>        // ====================================================================<a name="line.125"></a>
-<span class="sourceLineNo">126</span>        for (String validChar : testCharsValid)<a name="line.126"></a>
-<span class="sourceLineNo">127</span>        {<a name="line.127"></a>
-<span class="sourceLineNo">128</span>            this.email.setMsg(validChar);<a name="line.128"></a>
-<span class="sourceLineNo">129</span>            assertEquals(validChar, this.email.getTextMsg());<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span>            assertTrue(<a name="line.131"></a>
-<span class="sourceLineNo">132</span>                    this.email.getHtmlMsg().contains(validChar));<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 Exception<a name="line.136"></a>
-<span class="sourceLineNo">137</span>        // ====================================================================<a name="line.137"></a>
-<span class="sourceLineNo">138</span>        for (String invalidChar : this.testCharsNotValid)<a name="line.138"></a>
-<span class="sourceLineNo">139</span>        {<a name="line.139"></a>
-<span class="sourceLineNo">140</span>            try<a name="line.140"></a>
-<span class="sourceLineNo">141</span>            {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>                this.email.setMsg(invalidChar);<a name="line.142"></a>
-<span class="sourceLineNo">143</span>                fail("Should have thrown an exception");<a name="line.143"></a>
-<span class="sourceLineNo">144</span>            }<a name="line.144"></a>
-<span class="sourceLineNo">145</span>            catch (EmailException e)<a name="line.145"></a>
-<span class="sourceLineNo">146</span>            {<a name="line.146"></a>
-<span class="sourceLineNo">147</span>                assertTrue(true);<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><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>    @Test<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    public void testEmbedUrl() throws Exception<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    {<a name="line.155"></a>
-<span class="sourceLineNo">156</span>        // ====================================================================<a name="line.156"></a>
-<span class="sourceLineNo">157</span>        // Test Success<a name="line.157"></a>
-<span class="sourceLineNo">158</span>        // ====================================================================<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span>        String strEmbed =<a name="line.160"></a>
-<span class="sourceLineNo">161</span>            this.email.embed(new URL(this.strTestURL), "Test name");<a name="line.161"></a>
-<span class="sourceLineNo">162</span>        assertNotNull(strEmbed);<a name="line.162"></a>
-<span class="sourceLineNo">163</span>        assertEquals(HtmlEmail.CID_LENGTH, strEmbed.length());<a name="line.163"></a>
-<span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span>        // if we embed the same name again, do we get the same content ID<a name="line.165"></a>
-<span class="sourceLineNo">166</span>        // back?<a name="line.166"></a>
-<span class="sourceLineNo">167</span>        String testCid =<a name="line.167"></a>
-<span class="sourceLineNo">168</span>            this.email.embed(new URL(this.strTestURL), "Test name");<a name="line.168"></a>
-<span class="sourceLineNo">169</span>        assertEquals(strEmbed, testCid);<a name="line.169"></a>
-<span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span>        // if we embed the same URL under a different name, is the content ID<a name="line.171"></a>
-<span class="sourceLineNo">172</span>        // unique?<a name="line.172"></a>
-<span class="sourceLineNo">173</span>        String newCid =<a name="line.173"></a>
-<span class="sourceLineNo">174</span>            this.email.embed(new URL(this.strTestURL), "Test name 2");<a name="line.174"></a>
-<span class="sourceLineNo">175</span>        assertFalse(strEmbed.equals(newCid));<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 Exceptions<a name="line.178"></a>
-<span class="sourceLineNo">179</span>        // ====================================================================<a name="line.179"></a>
-<span class="sourceLineNo">180</span><a name="line.180"></a>
-<span class="sourceLineNo">181</span>        // Does an invalid URL throw an exception?<a name="line.181"></a>
-<span class="sourceLineNo">182</span>        try<a name="line.182"></a>
-<span class="sourceLineNo">183</span>        {<a name="line.183"></a>
-<span class="sourceLineNo">184</span>            this.email.embed(createInvalidURL(), "Bad URL");<a name="line.184"></a>
-<span class="sourceLineNo">185</span>            fail("Should have thrown an exception");<a name="line.185"></a>
-<span class="sourceLineNo">186</span>        }<a name="line.186"></a>
-<span class="sourceLineNo">187</span>        catch (EmailException e)<a name="line.187"></a>
-<span class="sourceLineNo">188</span>        {<a name="line.188"></a>
-<span class="sourceLineNo">189</span>            // expected<a name="line.189"></a>
-<span class="sourceLineNo">190</span>        }<a name="line.190"></a>
-<span class="sourceLineNo">191</span><a name="line.191"></a>
-<span class="sourceLineNo">192</span>        // if we try to embed a different URL under a previously used name,<a name="line.192"></a>
-<span class="sourceLineNo">193</span>        // does it complain?<a name="line.193"></a>
-<span class="sourceLineNo">194</span>        try<a name="line.194"></a>
-<span class="sourceLineNo">195</span>        {<a name="line.195"></a>
-<span class="sourceLineNo">196</span>            this.email.embed(new URL("http://www.google.com"), "Test name");<a name="line.196"></a>
-<span class="sourceLineNo">197</span>            fail("shouldn't be able to use an existing name with a different URL!");<a name="line.197"></a>
-<span class="sourceLineNo">198</span>        }<a name="line.198"></a>
-<span class="sourceLineNo">199</span>        catch (EmailException e)<a name="line.199"></a>
-<span class="sourceLineNo">200</span>        {<a name="line.200"></a>
-<span class="sourceLineNo">201</span>            // expected<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><a name="line.204"></a>
-<span class="sourceLineNo">205</span>    @Test<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    public void testEmbedFile() throws Exception<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    {<a name="line.207"></a>
-<span class="sourceLineNo">208</span>        // ====================================================================<a name="line.208"></a>
-<span class="sourceLineNo">209</span>        // Test Success<a name="line.209"></a>
-<span class="sourceLineNo">210</span>        // ====================================================================<a name="line.210"></a>
-<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span>        File file = File.createTempFile("testEmbedFile", "txt");<a name="line.212"></a>
-<span class="sourceLineNo">213</span>        file.deleteOnExit();<a name="line.213"></a>
-<span class="sourceLineNo">214</span>        String strEmbed = this.email.embed(file);<a name="line.214"></a>
-<span class="sourceLineNo">215</span>        assertNotNull(strEmbed);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>        assertEquals("generated CID has wrong length",<a name="line.216"></a>
-<span class="sourceLineNo">217</span>                HtmlEmail.CID_LENGTH, strEmbed.length());<a name="line.217"></a>
-<span class="sourceLineNo">218</span><a name="line.218"></a>
-<span class="sourceLineNo">219</span>        // if we embed the same file again, do we get the same content ID<a name="line.219"></a>
-<span class="sourceLineNo">220</span>        // back?<a name="line.220"></a>
-<span class="sourceLineNo">221</span>        String testCid =<a name="line.221"></a>
-<span class="sourceLineNo">222</span>            this.email.embed(file);<a name="line.222"></a>
-<span class="sourceLineNo">223</span>        assertEquals("didn't get same CID after embedding same file twice",<a name="line.223"></a>
-<span class="sourceLineNo">224</span>                strEmbed, testCid);<a name="line.224"></a>
-<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span>        // if we embed a new file, is the content ID unique?<a name="line.226"></a>
-<span class="sourceLineNo">227</span>        File otherFile = File.createTempFile("testEmbedFile2", "txt");<a name="line.227"></a>
-<span class="sourceLineNo">228</span>        otherFile.deleteOnExit();<a name="line.228"></a>
-<span class="sourceLineNo">229</span>        String newCid = this.email.embed(otherFile);<a name="line.229"></a>
-<span class="sourceLineNo">230</span>        assertFalse("didn't get unique CID from embedding new file",<a name="line.230"></a>
-<span class="sourceLineNo">231</span>                strEmbed.equals(newCid));<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>    @Test<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    public void testEmbedUrlAndFile() throws Exception<a name="line.235"></a>
-<span class="sourceLineNo">236</span>    {<a name="line.236"></a>
-<span class="sourceLineNo">237</span>        File tmpFile = File.createTempFile("testfile", "txt");<a name="line.237"></a>
-<span class="sourceLineNo">238</span>        tmpFile.deleteOnExit();<a name="line.238"></a>
-<span class="sourceLineNo">239</span>        String fileCid = this.email.embed(tmpFile);<a name="line.239"></a>
+<span class="sourceLineNo">024</span>import java.util.List;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import javax.activation.DataSource;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import javax.activation.FileDataSource;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import javax.mail.internet.MimeMessage;<a name="line.27"></a>
+<span class="sourceLineNo">028</span><a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.commons.mail.mocks.MockHtmlEmailConcrete;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.commons.mail.settings.EmailConfiguration;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.commons.mail.util.MimeMessageParser;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.junit.Before;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.junit.Test;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.junit.runner.RunWith;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.powermock.core.classloader.annotations.PrepareForTest;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.powermock.modules.junit4.PowerMockRunner;<a name="line.36"></a>
+<span class="sourceLineNo">037</span><a name="line.37"></a>
+<span class="sourceLineNo">038</span>/**<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * JUnit test case for HtmlEmail Class.<a name="line.39"></a>
+<span class="sourceLineNo">040</span> *<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * @since 1.0<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * @version $Id: HtmlEmailTest.java 1606709 2014-06-30 12:26:06Z ggregory $<a name="line.42"></a>
+<span class="sourceLineNo">043</span> */<a name="line.43"></a>
+<span class="sourceLineNo">044</span>@RunWith(PowerMockRunner.class)<a name="line.44"></a>
+<span class="sourceLineNo">045</span>@PrepareForTest( { MockHtmlEmailConcrete.class })<a name="line.45"></a>
+<span class="sourceLineNo">046</span>public class HtmlEmailTest extends AbstractEmailTest<a name="line.46"></a>
+<span class="sourceLineNo">047</span>{<a name="line.47"></a>
+<span class="sourceLineNo">048</span>    private MockHtmlEmailConcrete email;<a name="line.48"></a>
+<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">050</span>    @Before<a name="line.50"></a>
+<span class="sourceLineNo">051</span>    public void setUpHtmlEmailTest()<a name="line.51"></a>
+<span class="sourceLineNo">052</span>    {<a name="line.52"></a>
+<span class="sourceLineNo">053</span>        // reusable objects to be used across multiple tests<a name="line.53"></a>
+<span class="sourceLineNo">054</span>        this.email = new MockHtmlEmailConcrete();<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    }<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span>    @Test<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    public void testGetSetTextMsg() throws EmailException<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    {<a name="line.59"></a>
+<span class="sourceLineNo">060</span>        // ====================================================================<a name="line.60"></a>
+<span class="sourceLineNo">061</span>        // Test Success<a name="line.61"></a>
+<span class="sourceLineNo">062</span>        // ====================================================================<a name="line.62"></a>
+<span class="sourceLineNo">063</span>        for (final String validChar : testCharsValid)<a name="line.63"></a>
+<span class="sourceLineNo">064</span>        {<a name="line.64"></a>
+<span class="sourceLineNo">065</span>            this.email.setTextMsg(validChar);<a name="line.65"></a>
+<span class="sourceLineNo">066</span>            assertEquals(validChar, this.email.getTextMsg());<a name="line.66"></a>
+<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>        // ====================================================================<a name="line.69"></a>
+<span class="sourceLineNo">070</span>        // Test Exception<a name="line.70"></a>
+<span class="sourceLineNo">071</span>        // ====================================================================<a name="line.71"></a>
+<span class="sourceLineNo">072</span>        for (final String invalidChar : this.testCharsNotValid)<a name="line.72"></a>
+<span class="sourceLineNo">073</span>        {<a name="line.73"></a>
+<span class="sourceLineNo">074</span>            try<a name="line.74"></a>
+<span class="sourceLineNo">075</span>            {<a name="line.75"></a>
+<span class="sourceLineNo">076</span>                this.email.setTextMsg(invalidChar);<a name="line.76"></a>
+<span class="sourceLineNo">077</span>                fail("Should have thrown an exception");<a name="line.77"></a>
+<span class="sourceLineNo">078</span>            }<a name="line.78"></a>
+<span class="sourceLineNo">079</span>            catch (final EmailException e)<a name="line.79"></a>
+<span class="sourceLineNo">080</span>            {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>                assertTrue(true);<a name="line.81"></a>
+<span class="sourceLineNo">082</span>            }<a name="line.82"></a>
+<span class="sourceLineNo">083</span>        }<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span>    }<a name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span>    @Test<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    public void testGetSetHtmlMsg() throws EmailException<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    {<a name="line.89"></a>
+<span class="sourceLineNo">090</span>        // ====================================================================<a name="line.90"></a>
+<span class="sourceLineNo">091</span>        // Test Success<a name="line.91"></a>
+<span class="sourceLineNo">092</span>        // ====================================================================<a name="line.92"></a>
+<span class="sourceLineNo">093</span>        for (final String validChar : testCharsValid)<a name="line.93"></a>
+<span class="sourceLineNo">094</span>        {<a name="line.94"></a>
+<span class="sourceLineNo">095</span>            this.email.setHtmlMsg(validChar);<a name="line.95"></a>
+<span class="sourceLineNo">096</span>            assertEquals(validChar, this.email.getHtmlMsg());<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>        // ====================================================================<a name="line.99"></a>
+<span class="sourceLineNo">100</span>        // Test Exception<a name="line.100"></a>
+<span class="sourceLineNo">101</span>        // ====================================================================<a name="line.101"></a>
+<span class="sourceLineNo">102</span>        for (final String invalidChar : this.testCharsNotValid)<a name="line.102"></a>
+<span class="sourceLineNo">103</span>        {<a name="line.103"></a>
+<span class="sourceLineNo">104</span>            try<a name="line.104"></a>
+<span class="sourceLineNo">105</span>            {<a name="line.105"></a>
+<span class="sourceLineNo">106</span>                this.email.setHtmlMsg(invalidChar);<a name="line.106"></a>
+<span class="sourceLineNo">107</span>                fail("Should have thrown an exception");<a name="line.107"></a>
+<span class="sourceLineNo">108</span>            }<a name="line.108"></a>
+<span class="sourceLineNo">109</span>            catch (final EmailException e)<a name="line.109"></a>
+<span class="sourceLineNo">110</span>            {<a name="line.110"></a>
+<span class="sourceLineNo">111</span>                assertTrue(true);<a name="line.111"></a>
+<span class="sourceLineNo">112</span>            }<a name="line.112"></a>
+<span class="sourceLineNo">113</span>        }<a name="line.113"></a>
+<span class="sourceLineNo">114</span><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>
+<span class="sourceLineNo">117</span>    @Test<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    public void testGetSetMsg() throws EmailException<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 Success<a name="line.121"></a>
+<span class="sourceLineNo">122</span>        // ====================================================================<a name="line.122"></a>
+<span class="sourceLineNo">123</span>        for (final String validChar : testCharsValid)<a name="line.123"></a>
+<span class="sourceLineNo">124</span>        {<a name="line.124"></a>
+<span class="sourceLineNo">125</span>            this.email.setMsg(validChar);<a name="line.125"></a>
+<span class="sourceLineNo">126</span>            assertEquals(validChar, this.email.getTextMsg());<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span>            assertTrue(<a name="line.128"></a>
+<span class="sourceLineNo">129</span>                    this.email.getHtmlMsg().contains(validChar));<a name="line.129"></a>
+<span class="sourceLineNo">130</span>        }<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>
+<span class="sourceLineNo">133</span>        // Test Exception<a name="line.133"></a>
+<span class="sourceLineNo">134</span>        // ====================================================================<a name="line.134"></a>
+<span class="sourceLineNo">135</span>        for (final String invalidChar : this.testCharsNotValid)<a name="line.135"></a>
+<span class="sourceLineNo">136</span>        {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>            try<a name="line.137"></a>
+<span class="sourceLineNo">138</span>            {<a name="line.138"></a>
+<span class="sourceLineNo">139</span>                this.email.setMsg(invalidChar);<a name="line.139"></a>
+<span class="sourceLineNo">140</span>                fail("Should have thrown an exception");<a name="line.140"></a>
+<span class="sourceLineNo">141</span>            }<a name="line.141"></a>
+<span class="sourceLineNo">142</span>            catch (final EmailException e)<a name="line.142"></a>
+<span class="sourceLineNo">143</span>            {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>                assertTrue(true);<a name="line.144"></a>
+<span class="sourceLineNo">145</span>            }<a name="line.145"></a>
+<span class="sourceLineNo">146</span>        }<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><a name="line.149"></a>
+<span class="sourceLineNo">150</span>    @Test<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    public void testEmbedUrl() throws Exception<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    {<a name="line.152"></a>
+<span class="sourceLineNo">153</span>        // ====================================================================<a name="line.153"></a>
+<span class="sourceLineNo">154</span>        // Test Success<a name="line.154"></a>
+<span class="sourceLineNo">155</span>        // ====================================================================<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span>        final String strEmbed =<a name="line.157"></a>
+<span class="sourceLineNo">158</span>            this.email.embed(new URL(this.strTestURL), "Test name");<a name="line.158"></a>
+<span class="sourceLineNo">159</span>        assertNotNull(strEmbed);<a name="line.159"></a>
+<span class="sourceLineNo">160</span>        assertEquals(HtmlEmail.CID_LENGTH, strEmbed.length());<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span>        // if we embed the same name again, do we get the same content ID<a name="line.162"></a>
+<span class="sourceLineNo">163</span>        // back?<a name="line.163"></a>
+<span class="sourceLineNo">164</span>        final String testCid =<a name="line.164"></a>
+<span class="sourceLineNo">165</span>            this.email.embed(new URL(this.strTestURL), "Test name");<a name="line.165"></a>
+<span class="sourceLineNo">166</span>        assertEquals(strEmbed, testCid);<a name="line.166"></a>
+<span class="sourceLineNo">167</span><a name="line.167"></a>
+<span class="sourceLineNo">168</span>        // if we embed the same URL under a different name, is the content ID<a name="line.168"></a>
+<span class="sourceLineNo">169</span>        // unique?<a name="line.169"></a>
+<span class="sourceLineNo">170</span>        final String newCid =<a name="line.170"></a>
+<span class="sourceLineNo">171</span>            this.email.embed(new URL(this.strTestURL), "Test name 2");<a name="line.171"></a>
+<span class="sourceLineNo">172</span>        assertFalse(strEmbed.equals(newCid));<a name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span>        // ====================================================================<a name="line.174"></a>
+<span class="sourceLineNo">175</span>        // Test Exceptions<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>        // Does an invalid URL throw an exception?<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>            this.email.embed(createInvalidURL(), "Bad URL");<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 (final EmailException e)<a name="line.184"></a>
+<span class="sourceLineNo">185</span>        {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>            // expected<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>        // if we try to embed a different URL under a previously used name,<a name="line.189"></a>
+<span class="sourceLineNo">190</span>        // does it complain?<a name="line.190"></a>
+<span class="sourceLineNo">191</span>        try<a name="line.191"></a>
+<span class="sourceLineNo">192</span>        {<a name="line.192"></a>
+<span class="sourceLineNo">193</span>            this.email.embed(new URL("http://www.google.com"), "Test name");<a name="line.193"></a>
+<span class="sourceLineNo">194</span>            fail("shouldn't be able to use an existing name with a different URL!");<a name="line.194"></a>
+<span class="sourceLineNo">195</span>        }<a name="line.195"></a>
+<span class="sourceLineNo">196</span>        catch (final EmailException e)<a name="line.196"></a>
+<span class="sourceLineNo">197</span>        {<a name="line.197"></a>
+<span class="sourceLineNo">198</span>            // expected<a name="line.198"></a>
+<span class="sourceLineNo">199</span>        }<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    }<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span>    @Test<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    public void testEmbedFile() throws Exception<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>        // Test Success<a name="line.206"></a>
+<span class="sourceLineNo">207</span>        // ====================================================================<a name="line.207"></a>
+<span class="sourceLineNo">208</span><a name="line.208"></a>
+<span class="sourceLineNo">209</span>        final File file = File.createTempFile("testEmbedFile", "txt");<a name="line.209"></a>
+<span class="sourceLineNo">210</span>        file.deleteOnExit();<a name="line.210"></a>
+<span class="sourceLineNo">211</span>        final String strEmbed = this.email.embed(file);<a name="line.211"></a>
+<span class="sourceLineNo">212</span>        assertNotNull(strEmbed);<a name="line.212"></a>
+<span class="sourceLineNo">213</span>        assertEquals("generated CID has wrong length",<a name="line.213"></a>
+<span class="sourceLineNo">214</span>                HtmlEmail.CID_LENGTH, strEmbed.length());<a name="line.214"></a>
+<span class="sourceLineNo">215</span><a name="line.215"></a>
+<span class="sourceLineNo">216</span>        // if we embed the same file again, do we get the same content ID<a name="line.216"></a>
+<span class="sourceLineNo">217</span>        // back?<a name="line.217"></a>
+<span class="sourceLineNo">218</span>        final String testCid =<a name="line.218"></a>
+<span class="sourceLineNo">219</span>            this.email.embed(file);<a name="line.219"></a>
+<span class="sourceLineNo">220</span>        assertEquals("didn't get same CID after embedding same file twice",<a name="line.220"></a>
+<span class="sourceLineNo">221</span>                strEmbed, testCid);<a name="line.221"></a>
+<span class="sourceLineNo">222</span><a name="line.222"></a>
+<span class="sourceLineNo">223</span>        // if we embed a new file, is the content ID unique?<a name="line.223"></a>
+<span class="sourceLineNo">224</span>        final File otherFile = File.createTempFile("testEmbedFile2", "txt");<a name="line.224"></a>
+<span class="sourceLineNo">225</span>        otherFile.deleteOnExit();<a name="line.225"></a>
+<span class="sourceLineNo">226</span>        final String newCid = this.email.embed(otherFile);<a name="line.226"></a>
+<span class="sourceLineNo">227</span>        assertFalse("didn't get unique CID from embedding new file",<a name="line.227"></a>
+<span class="sourceLineNo">228</span>                strEmbed.equals(newCid));<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    }<a name="line.229"></a>
+<span class="sourceLineNo">230</span><a name="line.230"></a>
+<span class="sourceLineNo">231</span>    @Test<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    public void testEmbedUrlAndFile() throws Exception<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    {<a name="line.233"></a>
+<span class="sourceLineNo">234</span>        final File tmpFile = File.createTempFile("testfile", "txt");<a name="line.234"></a>
+<span class="sourceLineNo">235</span>        tmpFile.deleteOnExit();<a name="line.235"></a>
+<span class="sourceLineNo">236</span>        final String fileCid = this.email.embed(tmpFile);<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span>        final URL fileUrl = tmpFile.toURI().toURL();<a name="line.238"></a>
+<span class="sourceLineNo">239</span>        final String urlCid = this.email.embed(fileUrl, "urlName");<a name="line.239"></a>
 <span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span>        URL fileUrl = tmpFile.toURI().toURL();<a name="line.241"></a>
-<span class="sourceLineNo">242</span>        String urlCid = this.email.embed(fileUrl, "urlName");<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span>        assertFalse("file and URL cids should be different even for same resource",<a name="line.244"></a>
-<span class="sourceLineNo">245</span>                fileCid.equals(urlCid));<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>    @Test<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    public void testEmbedDataSource() throws Exception<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    {<a name="line.250"></a>
-<span class="sourceLineNo">251</span>        File tmpFile = File.createTempFile("testEmbedDataSource", "txt");<a name="line.251"></a>
-<span class="sourceLineNo">252</span>        tmpFile.deleteOnExit();<a name="line.252"></a>
-<span class="sourceLineNo">253</span>        FileDataSource dataSource = new FileDataSource(tmpFile);<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span>        // does embedding a datasource without a name fail?<a name="line.255"></a>
-<span class="sourceLineNo">256</span>        try<a name="line.256"></a>
-<span class="sourceLineNo">257</span>        {<a name="line.257"></a>
-<span class="sourceLineNo">258</span>            this.email.embed(dataSource, "");<a name="line.258"></a>
-<span class="sourceLineNo">259</span>            fail("embedding with an empty string for a name should fail");<a name="line.259"></a>
-<span class="sourceLineNo">260</span>        }<a name="line.260"></a>
-<span class="sourceLineNo">261</span>        catch (EmailException e)<a name="line.261"></a>
-<span class="sourceLineNo">262</span>        {<a name="line.262"></a>
-<span class="sourceLineNo">263</span>            // expected<a name="line.263"></a>
-<span class="sourceLineNo">264</span>        }<a name="line.264"></a>
+<span class="sourceLineNo">241</span>        assertFalse("file and URL cids should be different even for same resource",<a name="line.241"></a>
+<span class="sourceLineNo">242</span>                fileCid.equals(urlCid));<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    }<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span>    @Test<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    public void testEmbedDataSource() throws Exception<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    {<a name="line.247"></a>
+<span class="sourceLineNo">248</span>        final File tmpFile = File.createTempFile("testEmbedDataSource", "txt");<a name="line.248"></a>
+<span class="sourceLineNo">249</span>        tmpFile.deleteOnExit();<a name="line.249"></a>
+<span class="sourceLineNo">250</span>        final FileDataSource dataSource = new FileDataSource(tmpFile);<a name="line.250"></a>
+<span class="sourceLineNo">251</span><a name="line.251"></a>
+<span class="sourceLineNo">252</span>        // does embedding a datasource without a name fail?<a name="line.252"></a>
+<span class="sourceLineNo">253</span>        try<a name="line.253"></a>
+<span class="sourceLineNo">254</span>        {<a name="line.254"></a>
+<span class="sourceLineNo">255</span>            this.email.embed(dataSource, "");<a name="line.255"></a>
+<span class="sourceLineNo">256</span>            fail("embedding with an empty string for a name should fail");<a name="line.256"></a>
+<span class="sourceLineNo">257</span>        }<a name="line.257"></a>
+<span class="sourceLineNo">258</span>        catch (final EmailException e)<a name="line.258"></a>
+<span class="sourceLineNo">259</span>        {<a name="line.259"></a>
+<span class="sourceLineNo">260</span>            // expected<a name="line.260"></a>
+<span class="sourceLineNo">261</span>        }<a name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span>        // properly embed the datasource<a name="line.263"></a>
+<span class="sourceLineNo">264</span>        final String cid = this.email.embed(dataSource, "testname");<a name="line.264"></a>
 <span class="sourceLineNo">265</span><a name="line.265"></a>
-<span class="sourceLineNo">266</span>        // properly embed the datasource<a name="line.266"></a>
-<span class="sourceLineNo">267</span>        String cid = this.email.embed(dataSource, "testname");<a name="line.267"></a>
-<span class="sourceLineNo">268</span><a name="line.268"></a>
-<span class="sourceLineNo">269</span>        // does embedding the same datasource under the same name return<a name="line.269"></a>
-<span class="sourceLineNo">270</span>        // the original cid?<a name="line.270"></a>
-<span class="sourceLineNo">271</span>        String sameCid = this.email.embed(dataSource, "testname");<a name="line.271"></a>
-<span class="sourceLineNo">272</span>        assertEquals("didn't get same CID for embedding same datasource twice",<a name="line.272"></a>
-<span class="sourceLineNo">273</span>                cid, sameCid);<a name="line.273"></a>
-<span class="sourceLineNo">274</span><a name="line.274"></a>
-<span class="sourceLineNo">275</span>        // does embedding another datasource under the same name fail?<a name="line.275"></a>
-<span class="sourceLineNo">276</span>        File anotherFile = File.createTempFile("testEmbedDataSource2", "txt");<a name="line.276"></a>
-<span class="sourceLineNo">277</span>        anotherFile.deleteOnExit();<a name="line.277"></a>
-<span class="sourceLineNo">278</span>        FileDataSource anotherDS = new FileDataSource(anotherFile);<a name="line.278"></a>
-<span class="sourceLineNo">279</span>        try<a name="line.279"></a>
-<span class="sourceLineNo">280</span>        {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>            this.email.embed(anotherDS, "testname");<a name="line.281"></a>
-<span class="sourceLineNo">282</span>        }<a name="line.282"></a>
-<span class="sourceLineNo">283</span>        catch (EmailException e)<a name="line.283"></a>
-<span class="sourceLineNo">284</span>        {<a name="line.284"></a>
-<span class="sourceLineNo">285</span>            // expected<a name="line.285"></a>
-<span class="sourceLineNo">286</span>        }<a name="line.286"></a>
-<span class="sourceLineNo">287</span>    }<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span>    /**<a name="line.289"></a>
-<span class="sourceLineNo">290</span>     * @throws EmailException when bad addresses and attachments are used<a name="line.290"></a>
-<span class="sourceLineNo">291</span>     * @throws IOException if creating a temp file, URL or sending fails<a name="line.291"></a>
-<span class="sourceLineNo">292</span>     */<a name="line.292"></a>
-<span class="sourceLineNo">293</span>    @Test<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    public void testSend() throws EmailException, IOException<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    {<a name="line.295"></a>
-<span class="sourceLineNo">296</span>        EmailAttachment attachment = new EmailAttachment();<a name="line.296"></a>
-<span class="sourceLineNo">297</span>        File testFile = null;<a name="line.297"></a>
-<span class="sourceLineNo">298</span><a name="line.298"></a>
-<span class="sourceLineNo">299</span>        /** File to used to test file attachments (Must be valid) */<a name="line.299"></a>
-<span class="sourceLineNo">300</span>        testFile = File.createTempFile("commons-email-testfile", ".txt");<a name="line.300"></a>
-<span class="sourceLineNo">301</span>        testFile.deleteOnExit();<a name="line.301"></a>
-<span class="sourceLineNo">302</span><a name="line.302"></a>
-<span class="sourceLineNo">303</span>        // ====================================================================<a name="line.303"></a>
-<span class="sourceLineNo">304</span>        // Test Success<a name="line.304"></a>
-<span class="sourceLineNo">305</span>        // ====================================================================<a name="line.305"></a>
-<span class="sourceLineNo">306</span>        this.getMailServer();<a name="line.306"></a>
-<span class="sourceLineNo">307</span><a name="line.307"></a>
-<span class="sourceLineNo">308</span>        String strSubject = "Test HTML Send #1 Subject (w charset)";<a name="line.308"></a>
-<span class="sourceLineNo">309</span><a name="line.309"></a>
-<span class="sourceLineNo">310</span>        this.email = new MockHtmlEmailConcrete();<a name="line.310"></a>
-<span class="sourceLineNo">311</span>        this.email.setHostName(this.strTestMailServer);<a name="line.311"></a>
-<span class="sourceLineNo">312</span>        this.email.setSmtpPort(this.getMailServerPort());<a name="line.312"></a>
-<span class="sourceLineNo">313</span>        this.email.setFrom(this.strTestMailFrom);<a name="line.313"></a>
-<span class="sourceLineNo">314</span>        this.email.addTo(this.strTestMailTo);<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span>        /** File to used to test file attachmetns (Must be valid) */<a name="line.316"></a>
-<span class="sourceLineNo">317</span>        attachment.setName("Test Attachment");<a name="line.317"></a>
-<span class="sourceLineNo">318</span>        attachment.setDescription("Test Attachment Desc");<a name="line.318"></a>
-<span class="sourceLineNo">319</span>        attachment.setPath(testFile.getAbsolutePath());<a name="line.319"></a>
-<span class="sourceLineNo">320</span>        this.email.attach(attachment);<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span>        this.email.setAuthentication(this.strTestUser, this.strTestPasswd);<a name="line.322"></a>
+<span class="sourceLineNo">266</span>        // does embedding the same datasource under the same name return<a name="line.266"></a>
+<span class="sourceLineNo">267</span>        // the original cid?<a name="line.267"></a>
+<span class="sourceLineNo">268</span>        final String sameCid = this.email.embed(dataSource, "testname");<a name="line.268"></a>
+<span class="sourceLineNo">269</span>        assertEquals("didn't get same CID for embedding same datasource twice",<a name="line.269"></a>
+<span class="sourceLineNo">270</span>                cid, sameCid);<a name="line.270"></a>
+<span class="sourceLineNo">271</span><a name="line.271"></a>
+<span class="sourceLineNo">272</span>        // does embedding another datasource under the same name fail?<a name="line.272"></a>
+<span class="sourceLineNo">273</span>        final File anotherFile = File.createTempFile("testEmbedDataSource2", "txt");<a name="line.273"></a>
+<span class="sourceLineNo">274</span>        anotherFile.deleteOnExit();<a name="line.274"></a>
+<span class="sourceLineNo">275</span>        final FileDataSource anotherDS = new FileDataSource(anotherFile);<a name="line.275"></a>
+<span class="sourceLineNo">276</span>        try<a name="line.276"></a>
+<span class="sourceLineNo">277</span>        {<a name="line.277"></a>
+<span class="sourceLineNo">278</span>            this.email.embed(anotherDS, "testname");<a name="line.278"></a>
+<span class="sourceLineNo">279</span>        }<a name="line.279"></a>
+<span class="sourceLineNo">280</span>        catch (final EmailException e)<a name="line.280"></a>
+<span class="sourceLineNo">281</span>        {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>            // expected<a name="line.282"></a>
+<span class="sourceLineNo">283</span>        }<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    }<a name="line.284"></a>
+<span class="sourceLineNo">285</span><a name="line.285"></a>
+<span class="sourceLineNo">286</span>    /**<a name="line.286"></a>
+<span class="sourceLineNo">287</span>     * @throws EmailException when bad addresses and attachments are used<a name="line.287"></a>
+<span class="sourceLineNo">288</span>     * @throws IOException if creating a temp file, URL or sending fails<a name="line.288"></a>
+<span class="sourceLineNo">289</span>     */<a name="line.289"></a>
+<span class="sourceLineNo">290</span>    @Test<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    public void testSend() throws EmailException, IOException<a name="line.291"></a>
+<span class="sourceLineNo">292</span>    {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>        final EmailAttachment attachment = new EmailAttachment();<a name="line.293"></a>
+<span class="sourceLineNo">294</span>        File testFile = null;<a name="line.294"></a>
+<span class="sourceLineNo">295</span><a name="line.295"></a>
+<span class="sourceLineNo">296</span>        /** File to used to test file attachments (Must be valid) */<a name="line.296"></a>
+<span class="sourceLineNo">297</span>        testFile = File.createTempFile("commons-email-testfile", ".txt");<a name="line.297"></a>
+<span class="sourceLineNo">298</span>        testFile.deleteOnExit();<a name="line.298"></a>
+<span class="sourceLineNo">299</span><a name="line.299"></a>
+<span class="sourceLineNo">300</span>        // ====================================================================<a name="line.300"></a>
+<span class="sourceLineNo">301</span>        // Test Success<a name="line.301"></a>
+<span class="sourceLineNo">302</span>        // ====================================================================<a name="line.302"></a>
+<span class="sourceLineNo">303</span>        this.getMailServer();<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span>        String strSubject = "Test HTML Send #1 Subject (w charset)";<a name="line.305"></a>
+<span class="sourceLineNo">306</span><a name="line.306"></a>
+<span class="sourceLineNo">307</span>        this.email = new MockHtmlEmailConcrete();<a name="line.307"></a>
+<span class="sourceLineNo">308</span>        this.email.setHostName(this.strTestMailServer);<a name="line.308"></a>
+<span class="sourceLineNo">309</span>        this.email.setSmtpPort(this.getMailServerPort());<a name="line.309"></a>
+<span class="sourceLineNo">310</span>        this.email.setFrom(this.strTestMailFrom);<a name="line.310"></a>
+<span class="sourceLineNo">311</span>        this.email.addTo(this.strTestMailTo);<a name="line.311"></a>
+<span class="sourceLineNo">312</span><a name="line.312"></a>
+<span class="sourceLineNo">313</span>        /** File to used to test file attachmetns (Must be valid) */<a name="line.313"></a>
+<span class="sourceLineNo">314</span>        attachment.setName("Test Attachment");<a name="line.314"></a>
+<span class="sourceLineNo">315</span>        attachment.setDescription("Test Attachment Desc");<a name="line.315"></a>
+<span class="sourceLineNo">316</span>        attachment.setPath(testFile.getAbsolutePath());<a name="line.316"></a>
+<span class="sourceLineNo">317</span>        this.email.attach(attachment);<a name="line.317"></a>
+<span class="sourceLineNo">318</span><a name="line.318"></a>
+<span class="sourceLineNo">319</span>        this.email.setAuthentication(this.strTestUser, this.strTestPasswd);<a name="line.319"></a>
+<span class="sourceLineNo">320</span><a name="line.320"></a>
+<span class="sourceLineNo">321</span>        this.email.setCharset(EmailConstants.ISO_8859_1);<a name="line.321"></a>
+<span class="sourceLineNo">322</span>        this.email.setSubject(strSubject);<a name="line.322"></a>
 <span class="sourceLineNo">323</span><a name="line.323"></a>
-<span class="sourceLineNo">324</span>        this.email.setCharset(EmailConstants.ISO_8859_1);<a name="line.324"></a>
-<span class="sourceLineNo">325</span>        this.email.setSubject(strSubject);<a name="line.325"></a>
+<span class="sourceLineNo">324</span>        final URL url = new URL(EmailConfiguration.TEST_URL);<a name="line.324"></a>
+<span class="sourceLineNo">325</span>        final String cid = this.email.embed(url, "Apache Logo");<a name="line.325"></a>
 <span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span>        URL url = new URL(EmailConfiguration.TEST_URL);<a name="line.327"></a>
-<span class="sourceLineNo">328</span>        String cid = this.email.embed(url, "Apache Logo");<a name="line.328"></a>
+<span class="sourceLineNo">327</span>        final String strHtmlMsg =<a name="line.327"></a>
+<span class="sourceLineNo">328</span>            "&lt;html&gt;The Apache logo - &lt;img src=\"cid:" + cid + "\"&gt;&lt;html&gt;";<a name="line.328"></a>
 <span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span>        String strHtmlMsg =<a name="line.330"></a>
-<span class="sourceLineNo">331</span>            "&lt;html&gt;The Apache logo - &lt;img src=\"cid:" + cid + "\"&gt;&lt;html&gt;";<a name="line.331"></a>
-<span class="sourceLineNo">332</span><a name="line.332"></a>
-<span class="sourceLineNo">333</span>        this.email.setHtmlMsg(strHtmlMsg);<a name="line.333"></a>
-<span class="sourceLineNo">334</span>        this.email.setTextMsg(<a name="line.334"></a>
-<span class="sourceLineNo">335</span>            "Your email client does not support HTML emails");<a name="line.335"></a>
-<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span>        this.email.send();<a name="line.337"></a>
-<span class="sourceLineNo">338</span>        this.fakeMailServer.stop();<a name="line.338"></a>
-<span class="sourceLineNo">339</span>        // validate txt message<a name="line.339"></a>
-<span class="sourceLineNo">340</span>        validateSend(<a name="line.340"></a>
-<span class="sourceLineNo">341</span>            this.fakeMailServer,<a name="line.341"></a>
-<span class="sourceLineNo">342</span>            strSubject,<a name="line.342"></a>
-<span class="sourceLineNo">343</span>            this.email.getTextMsg(),<a name="line.343"></a>
-<span class="sourceLineNo">344</span>            this.email.getFromAddress(),<a name="line.344"></a>
-<span class="sourceLineNo">345</span>            this.email.getToAddresses(),<a name="line.345"></a>
-<span class="sourceLineNo">346</span>            this.email.getCcAddresses(),<a name="line.346"></a>
-<span class="sourceLineNo">347</span>            this.email.getBccAddresses(),<a name="line.347"></a>
-<span class="sourceLineNo">348</span>            true);<a name="line.348"></a>
-<span class="sourceLineNo">349</span><a name="line.349"></a>
-<span class="sourceLineNo">350</span>        // validate html message<a name="line.350"></a>
-<span class="sourceLineNo">351</span>        validateSend(<a name="line.351"></a>
-<span class="sourceLineNo">352</span>            this.fakeMailServer,<a name="line.352"></a>
-<span class="sourceLineNo">353</span>            strSubject,<a name="line.353"></a>
-<span class="sourceLineNo">354</span>            this.email.getHtmlMsg(),<a name="line.354"></a>
-<span class="sourceLineNo">355</span>            this.email.getFromAddress(),<a name="line.355"></a>
-<span class="sourceLineNo">356</span>            this.email.getToAddresses(),<a name="line.356"></a>
-<span class="sourceLineNo">357</span>            this.email.getCcAddresses(),<a name="line.357"></a>
-<span class="sourceLineNo">358</span>            this.email.getBccAddresses(),<a name="line.358"></a>
-<span class="sourceLineNo">359</span>            false);<a name="line.359"></a>
-<span class="sourceLineNo">360</span><a name="line.360"></a>
-<span class="sourceLineNo">361</span>        // validate attachment<a name="line.361"></a>
-<span class="sourceLineNo">362</span>        validateSend(<a name="line.362"></a>
-<span class="sourceLineNo">363</span>            this.fakeMailServer,<a name="line.363"></a>
-<span class="sourceLineNo">364</span>            strSubject,<a name="line.364"></a>
-<span class="sourceLineNo">365</span>            attachment.getName(),<a name="line.365"></a>
-<span class="sourceLineNo">366</span>            this.email.getFromAddress(),<a name="line.366"></a>
-<span class="sourceLineNo">367</span>            this.email.getToAddresses(),<a name="line.367"></a>
-<span class="sourceLineNo">368</span>            this.email.getCcAddresses(),<a name="line.368"></a>
-<span class="sourceLineNo">369</span>            this.email.getBccAddresses(),<a name="line.369"></a>
-<span class="sourceLineNo">370</span>            false);<a name="line.370"></a>
-<span class="sourceLineNo">371</span><a name="line.371"></a>
-<span class="sourceLineNo">372</span>        this.getMailServer();<a name="line.372"></a>
-<span class="sourceLineNo">373</span><a name="line.373"></a>
-<span class="sourceLineNo">374</span>        this.email = new MockHtmlEmailConcrete();<a name="line.374"></a>
-<span class="sourceLineNo">375</span>        this.email.setHostName(this.strTestMailServer);<a name="line.375"></a>
-<span class="sourceLineNo">376</span>        this.email.setSmtpPort(this.getMailServerPort());<a name="line.376"></a>
-<span class="sourceLineNo">377</span>        this.email.setFrom(this.strTestMailFrom);<a name="line.377"></a>
-<span class="sourceLineNo">378</span>        this.email.addTo(this.strTestMailTo);<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span>        if (this.strTestUser != null &amp;&amp; this.strTestPasswd != null)<a name="line.380"></a>
-<span class="sourceLineNo">381</span>        {<a name="line.381"></a>
-<span class="sourceLineNo">382</span>            this.email.setAuthentication(<a name="line.382"></a>
-<span class="sourceLineNo">383</span>                this.strTestUser,<a name="line.383"></a>
-<span class="sourceLineNo">384</span>                this.strTestPasswd);<a name="line.384"></a>
-<span class="sourceLineNo">385</span>        }<a name="line.385"></a>
-<span class="sourceLineNo">386</span><a name="line.386"></a>
-<span class="sourceLineNo">387</span>        strSubject = "Test HTML Send #1 Subject (wo charset)";<a name="line.387"></a>
-<span class="sourceLineNo">388</span>        this.email.setSubject(strSubject);<a name="line.388"></a>
-<span class="sourceLineNo">389</span>        this.email.setTextMsg("Test message");<a name="line.389"></a>
-<span class="sourceLineNo">390</span><a name="line.390"></a>
-<span class="sourceLineNo">391</span>        this.email.send();<a name="line.391"></a>
-<span class="sourceLineNo">392</span>        this.fakeMailServer.stop();<a name="line.392"></a>
-<span class="sourceLineNo">393</span>        // validate txt message<a name="line.393"></a>
-<span class="sourceLineNo">394</span>        validateSend(<a name="line.394"></a>
-<span class="sourceLineNo">395</span>            this.fakeMailServer,<a name="line.395"></a>
-<span class="sourceLineNo">396</span>            strSubject,<a name="line.396"></a>
-<span class="sourceLineNo">397</span>            this.email.getTextMsg(),<a name="line.397"></a>
-<span class="sourceLineNo">398</span>            this.email.getFromAddress(),<a name="line.398"></a>
-<span class="sourceLineNo">399</span>            this.email.getToAddresses(),<a name="line.399"></a>
-<span class="sourceLineNo">400</span>            this.email.getCcAddresses(),<a name="line.400"></a>
-<span class="sourceLineNo">401</span>            this.email.getBccAddresses(),<a name="line.401"></a>
-<span class="sourceLineNo">402</span>            true);<a name="line.402"></a>
-<span class="sourceLineNo">403</span>    }<a name="line.403"></a>
-<span class="sourceLineNo">404</span><a name="line.404"></a>
-<span class="sourceLineNo">405</span>    @Test<a name="line.405"></a>
-<span class="sourceLineNo">406</span>    public void testSend2() throws Exception<a name="line.406"></a>
-<span class="sourceLineNo">407</span>    {<a name="line.407"></a>
-<span class="sourceLineNo">408</span>        // ====================================================================<a name="line.408"></a>
-<span class="sourceLineNo">409</span>        // Test Success<a name="line.409"></a>
-<span class="sourceLineNo">410</span>        // ====================================================================<a name="line.410"></a>
-<span class="sourceLineNo">411</span><a name="line.411"></a>
-<span class="sourceLineNo">412</span>        this.getMailServer();<a name="line.412"></a>
-<span class="sourceLineNo">413</span><a name="line.413"></a>
-<span class="sourceLineNo">414</span>        this.email = new MockHtmlEmailConcrete();<a name="line.414"></a>
-<span class="sourceLineNo">415</span>        this.email.setHostName(this.strTestMailServer);<a name="line.415"></a>
-<span class="sourceLineNo">416</span>        this.email.setSmtpPort(this.getMailServerPort());<a name="line.416"></a>
-<span class="sourceLineNo">417</span>        this.email.setFrom(this.strTestMailFrom);<a name="line.417"></a>
-<span class="sourceLineNo">418</span>        this.email.addTo(this.strTestMailTo);<a name="line.418"></a>
-<span class="sourceLineNo">419</span><a name="line.419"></a>
-<span class="sourceLineNo">420</span>        if (this.strTestUser != null &amp;&amp; this.strTestPasswd != null)<a name="line.420"></a>
-<span class="sourceLineNo">421</span>        {<a name="line.421"></a>
-<span class="sourceLineNo">422</span>            this.email.setAuthentication(<a name="line.422"></a>
-<span class="sourceLineNo">423</span>                this.strTestUser,<a name="line.423"></a>
-<span class="sourceLineNo">424</span>                this.strTestPasswd);<a name="line.424"></a>
-<span class="sourceLineNo">425</span>        }<a name="line.425"></a>
-<span class="sourceLineNo">426</span><a name="line.426"></a>
-<span class="sourceLineNo">427</span>        String strSubject = "Test HTML Send #2 Subject (wo charset)";<a name="line.427"></a>
-<span class="sourceLineNo">428</span>        this.email.setSubject(strSubject);<a name="line.428"></a>
-<span class="sourceLineNo">429</span>        this.email.setMsg("Test txt msg");<a name="line.429"></a>
-<span class="sourceLineNo">430</span><a name="line.430"></a>
-<span class="sourceLineNo">431</span>        this.email.send();<a name="line.431"></a>
-<span class="sourceLineNo">432</span>        this.fakeMailServer.stop();<a name="line.432"></a>
-<span class="sourceLineNo">433</span>        // validate txt message<a name="line.433"></a>
-<span class="sourceLineNo">434</span>        validateSend(<a name="line.434"></a>
-<span class="sourceLineNo">435</span>            this.fakeMailServer,<a name="line.435"></a>
-<span class="sourceLineNo">436</span>            strSubject,<a name="line.436"></a>
-<span class="sourceLineNo">437</span>            this.email.getTextMsg(),<a name="line.437"></a>
-<span class="sourceLineNo">438</span>            this.email.getFromAddress(),<a name="line.438"></a>
-<span class="sourceLineNo">439</span>            this.email.getToAddresses(),<a name="line.439"></a>
-<span class="sourceLineNo">440</span>            this.email.getCcAddresses(),<a name="line.440"></a>
-<span class="sourceLineNo">441</span>            this.email.getBccAddresses(),<a name="line.441"></a>
-<span class="sourceLineNo">442</span>            true);<a name="line.442"></a>
-<span class="sourceLineNo">443</span><a name="line.443"></a>
-<span class="sourceLineNo">444</span>        // validate html message<a name="line.444"></a>
-<span class="sourceLineNo">445</span>        validateSend(<a name="line.445"></a>
-<span class="sourceLineNo">446</span>            this.fakeMailServer,<a name="line.446"></a>
-<span class="sourceLineNo">447</span>            strSubject,<a name="line.447"></a>
-<span class="sourceLineNo">448</span>            this.email.getHtmlMsg(),<a name="line.448"></a>
-<span class="sourceLineNo">449</span>            this.email.getFromAddress(),<a name="line.449"></a>
-<span class="sourceLineNo">450</span>            this.email.getToAddresses(),<a name="line.450"></a>
-<span class="sourceLineNo">451</span>            this.email.getCcAddresses(),<a name="line.451"></a>
-<span class="sourceLineNo">452</span>            this.email.getBccAddresses(),<a name="line.452"></a>
-<span class="sourceLineNo">453</span>            false);<a name="line.453"></a>
-<span class="sourceLineNo">454</span><a name="line.454"></a>
-<span class="sourceLineNo">455</span>        this.getMailServer();<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span>        this.email = new MockHtmlEmailConcrete();<a name="line.457"></a>
-<span class="sourceLineNo">458</span>        this.email.setHostName(this.strTestMailServer);<a name="line.458"></a>
-<span class="sourceLineNo">459</span>        this.email.setFrom(this.strTestMailFrom);<a name="line.459"></a>
-<span class="sourceLineNo">460</span>        this.email.setSmtpPort(this.getMailServerPort());<a name="line.460"></a>
-<span class="sourceLineNo">461</span>        this.email.addTo(this.strTestMailTo);<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span>        if (this.strTestUser != null &amp;&amp; this.strTestPasswd != null)<a name="line.463"></a>
-<span class="sourceLineNo">464</span>        {<a name="line.464"></a>
-<span class="sourceLineNo">465</span>            this.email.setAuthentication(<a name="line.465"></a>
-<span class="sourceLineNo">466</span>                this.strTestUser,<a name="line.466"></a>
-<span class="sourceLineNo">467</span>                this.strTestPasswd);<a name="line.467"></a>
-<span class="sourceLineNo">468</span>        }<a name="line.468"></a>
-<span class="sourceLineNo">469</span><a name="line.469"></a>
-<span class="sourceLineNo">470</span>        strSubject = "Test HTML Send #2 Subject (w charset)";<a name="line.470"></a>
-<span class="sourceLineNo">471</span>        this.email.setCharset(EmailConstants.ISO_8859_1);<a name="line.471"></a>
-<span class="sourceLineNo">472</span>        this.email.setSubject(strSubject);<a name="line.472"></a>
-<span class="sourceLineNo">473</span>        this.email.setMsg("Test txt msg");<a name="line.473"></a>
-<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span>        this.email.send();<a name="line.475"></a>
-<span class="sourceLineNo">476</span>        this.fakeMailServer.stop();<a name="line.476"></a>
-<span class="sourceLineNo">477</span>        // validate txt message<a name="line.477"></a>
-<span class="sourceLineNo">478</span>        validateSend(<a name="line.478"></a>
-<span class="sourceLineNo">479</span>            this.fakeMailServer,<a name="line.479"></a>
-<span class="sourceLineNo">480</span>            strSubject,<a name="line.480"></a>
-<span class="sourceLineNo">481</span>            this.email.getTextMsg(),<a name="line.481"></a>
-<span class="sourceLineNo">482</span>            this.email.getFromAddress(),<a name="line.482"></a>
-<span class="sourceLineNo">483</span>            this.email.getToAddresses(),<a name="line.483"></a>
-<span class="sourceLineNo">484</span>            this.email.getCcAddresses(),<a name="line.484"></a>
-<span class="sourceLineNo">485</span>            this.email.getBccAddresses(),<a name="line.485"></a>
-<span class="sourceLineNo">486</span>            true);<a name="line.486"></a>
-<span class="sourceLineNo">487</span><a name="line.487"></a>
-<span class="sourceLineNo">488</span>        // validate html message<a name="line.488"></a>
-<span class="sourceLineNo">489</span>        validateSend(<a name="line.489"></a>
-<span class="sourceLineNo">490</span>            this.fakeMailServer,<a name="line.490"></a>
-<span class="sourceLineNo">491</span>            strSubject,<a name="line.491"></a>
-<span class="sourceLineNo">492</span>            this.email.getHtmlMsg(),<a name="line.492"></a>
-<span class="sourceLineNo">493</span>            this.email.getFromAddress(),<a name="line.493"></a>
-<span class="sourceLineNo">494</span>            this.email.getToAddresses(),<a name="line.494"></a>
-<span class="sourceLineNo">495</span>            this.email.getCcAddresses(),<a name="line.495"></a>
-<span class="sourceLineNo">496</span>            this.email.getBccAddresses(),<a name="line.496"></a>
-<span class="sourceLineNo">497</span>            false);<a name="line.497"></a>
-<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span>    }<a name="line.499"></a>
-<span class="sourceLineNo">500</span><a name="line.500"></a>
-<span class="sourceLineNo">501</span>    @Test<a name="line.501"></a>
-<span class="sourceLineNo">502</span>    public void testSendWithDefaultCharset() throws Exception<a name="line.502"></a>
-<span class="sourceLineNo">503</span>    {<a name="line.503"></a>
-<span class="sourceLineNo">504</span>        // ====================================================================<a name="line.504"></a>
-<span class="sourceLineNo">505</span>        // Test Success<a name="line.505"></a>
-<span class="sourceLineNo">506</span>        // ====================================================================<a name="line.506"></a>
-<span class="sourceLineNo">507</span><a name="line.507"></a>
-<span class="sourceLineNo">508</span>        System.setProperty(EmailConstants.MAIL_MIME_CHARSET, "iso-8859-15");<a name="line.508"></a>
-<span class="sourceLineNo">509</span><a name="line.509"></a>
-<span class="sourceLineNo">510</span>        this.getMailServer();<a name="line.510"></a>
-<span class="sourceLineNo">511</span><a name="line.511"></a>
-<span class="sourceLineNo">512</span>        this.email = new MockHtmlEmailConcrete();<a name="line.512"></a>
-<span class="sourceLineNo">513</span>        this.email.setHostName(this.strTestMailServer);<a name="line.513"></a>
-<span class="sourceLineNo">514</span>        this.email.setSmtpPort(this.getMailServerPort());<a name="line.514"></a>
-<span class="sourceLineNo">515</span>        this.email.setFrom(this.strTestMailFrom);<a name="line.515"></a>
-<span class="sourceLineNo">516</span>        this.email.addTo(this.strTestMailTo);<a name="line.516"></a>
-<span class="sourceLineNo">517</span><a name="line.517"></a>
-<span class="sourceLineNo">518</span>        if (this.strTestUser != null &amp;&amp; this.strTestPasswd != null)<a name="line.518"></a>
-<span class="sourceLineNo">519</span>        {<a name="line.519"></a>
-<span class="sourceLineNo">520</span>            this.email.setAuthentication(<a name="line.520"></a>
-<span class="sourceLineNo">521</span>                this.strTestUser,<a name="line.521"></a>
-<span class="sourceLineNo">522</span>                this.strTestPasswd);<a name="line.522"></a>
-<span class="sourceLineNo">523</span>        }<a name="line.523"></a>
-<span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span>        String strSubject = "Test HTML Send Subject (w default charset)";<a name="line.525"></a>
-<span class="sourceLineNo">526</span>        this.email.setSubject(strSubject);<a name="line.526"></a>
-<span class="sourceLineNo">527</span>        this.email.setMsg("Test txt msg ä"); // add non-ascii character, otherwise us-ascii will be used<a name="line.527"></a>
-<span class="sourceLineNo">528</span><a name="line.528"></a>
-<span class="sourceLineNo">529</span>        this.email.send();<a name="line.529"></a>
-<span class="sourceLineNo">530</span>        this.fakeMailServer.stop();<a name="line.530"></a>
-<span class="sourceLineNo">531</span>        // validate charset<a name="line.531"></a>
-<span class="sourceLineNo">532</span>        validateSend(<a name="line.532"></a>
-<span class="sourceLineNo">533</span>            this.fakeMailServer,<a name="line.533"></a>
-<span class="sourceLineNo">534</span>            strSubject,<a name="line.534"></a>
-<span class="sourceLineNo">535</span>            "charset=iso-8859-15",<a name="line.535"></a>
-<span class="sourceLineNo">536</span>            this.email.getFromAddress(),<a name="line.536"></a>
-<span class="sourceLineNo">537</span>            this.email.getToAddresses(),<a name="line.537"></a>
-<span class="sourceLineNo">538</span>            this.email.getCcAddresses(),<a name="line.538"></a>
-<span class="sourceLineNo">539</span>            this.email.getBccAddresses(),<a name="line.539"></a>
-<span class="sourceLineNo">540</span>            true);<a name="line.540"></a>
-<span class="sourceLineNo">541</span><a name="line.541"></a>
-<span class="sourceLineNo">542</span>        System.clearProperty(EmailConstants.MAIL_MIME_CHARSET);<a name="line.542"></a>
-<span class="sourceLineNo">543</span><a name="line.543"></a>
-<span class="sourceLineNo">544</span>    }<a name="line.544"></a>
-<span class="sourceLineNo">545</span><a name="line.545"></a>
-<span class="sourceLineNo">546</span>    /**<a name="line.546"></a>
-<span class="sourceLineNo">547</span>     * Create a HTML email containing an URL pointing to a ZIP file<a name="line.547"></a>
-<span class="sourceLineNo">548</span>     * to be downloaded. According to EMAIL-93 the resulting URL<a name="line.548"></a>
-<span class="sourceLineNo">549</span>     * "http://paradisedelivery.homeip.net/delivery/?file=TZC268X93337..zip"<a name="line.549"></a>
-<span class="sourceLineNo">550</span>     * contains TWO dots instead of one dot which breaks the link.<a name="line.550"></a>
-<span class="sourceLineNo">551</span>     */<a name="line.551"></a>
-<span class="sourceLineNo">552</span>    @Test<a name="line.552"></a>
-<span class="sourceLineNo">553</span>    public void testAddZipUrl() throws Exception<a name="line.553"></a>
-<span class="sourceLineNo">554</span>    {<a name="line.554"></a>
-<span class="sourceLineNo">555</span>        String htmlMsg =<a name="line.555"></a>
-<span class="sourceLineNo">556</span>                "Please click on the following link: &lt;br&gt;&lt;br&gt;" +<a name="line.556"></a>
-<span class="sourceLineNo">557</span>                "&lt;a href=\"http://paradisedelivery.homeip.net/delivery/?file=3DTZC268X93337.zip\"&gt;" +<a name="line.557"></a>
-<span class="sourceLineNo">558</span>                "http://paradisedelivery.homeip.net/delivery/?file=3DTZC268X93337.zip" +<a name="line.558"></a>
-<span class="sourceLineNo">559</span>                "&lt;/a&gt;&lt;br&gt;&lt;br&gt;Customer satisfaction is very important for us.";<a name="line.559"></a>
-<span class="sourceLineNo">560</span><a name="line.560"></a>
-<span class="sourceLineNo">561</span>        this.getMailServer();<a name="line.561"></a>
-<span class="sourceLineNo">562</span><a name="line.562"></a>
-<span class="sourceLineNo">563</span>        this.email = new MockHtmlEmailConcrete();<a name="line.563"></a>
-<span class="sourceLineNo">564</span>        this.email.setHostName(this.strTestMailServer);<a name="line.564"></a>
-<span class="sourceLineNo">565</span>        this.email.setSmtpPort(this.getMailServerPort());<a name="line.565"></a>
-<span class="sourceLineNo">566</span>        this.email.setFrom(this.strTestMailFrom);<a name="line.566"></a>
-<span class="sourceLineNo">567</span>        this.email.addTo(this.strTestMailTo);<a name="line.567"></a>
-<span class="sourceLineNo">568</span>        this.email.setCharset(EmailConstants.ISO_8859_1);<a name="line.568"></a>
-<span class="sourceLineNo">569</span><a name="line.569"></a>
-<span class="sourceLineNo">570</span>        if (this.strTestUser != null &amp;&amp; this.strTestPasswd != null)<a name="line.570"></a>
-<span class="sourceLineNo">571</span>        {<a name="line.571"></a>
-<span class="sourceLineNo">572</span>            this.email.setAuthentication(<a name="line.572"></a>
-<span class="sourceLineNo">573</span>                this.strTestUser,<a name="line.573"></a>
-<span class="sourceLineNo">574</span>                this.strTestPasswd);<a name="line.574"></a>
-<span class="sourceLineNo">575</span>        }<a name="line.575"></a>
-<span class="sourceLineNo">576</span><a name="line.576"></a>
-<span class="sourceLineNo">577</span>        String strSubject = "A dot (\".\") is appended to some ULRs of a HTML mail.";<a name="line.577"></a>
-<span class="sourceLineNo">578</span>        this.email.setSubject(strSubject);<a name="line.578"></a>
-<span class="sourceLineNo">579</span>        this.email.setHtmlMsg(htmlMsg);<a name="line.579"></a>
+<span class="sourceLineNo">330</span>        this.email.setHtmlMsg(strHtmlMsg);<a name="line.330"></a>
+<span class="sourceLineNo">331</span>        this.email.setTextMsg(<a name="line.331"></a>
+<span class="sourceLineNo">332</span>            "Your email client does not support HTML emails");<a name="line.332"></a>
+<span class="sourceLineNo">333</span><a name="line.333"></a>
+<span class="sourceLineNo">334</span>        this.email.send();<a name="line.334"></a>
+<span class="sourceLineNo">335</span>        this.fakeMailServer.stop();<a name="line.335"></a>
+<span class="sourceLineNo">336</span>        // validate txt message<a name="line.336"></a>
+<span class="sourceLineNo">337</span>        validateSend(<a name="line.337"></a>
+<span class="sourceLineNo">338</span>            this.fakeMailServer,<a name="line.338"></a>
+<span class="sourceLineNo">339</span>            strSubject,<a name="line.339"></a>
+<span class="sourceLineNo">340</span>            this.email.getTextMsg(),<a name="line.340"></a>
+<span class="sourceLineNo">341</span>            this.email.getFromAddress(),<a name="line.341"></a>
+<span class="sourceLineNo">342</span>            this.email.getToAddresses(),<a name="line.342"></a>
+<span class="sourceLineNo">343</span>            this.email.getCcAddresses(),<a name="line.343"></a>
+<span class="sourceLineNo">344</span>            this.email.getBccAddresses(),<a name="line.344"></a>
+<span class="sourceLineNo">345</span>            true);<a name="line.345"></a>
+<span class="sourceLineNo">346</span><a name="line.346"></a>
+<span class="sourceLineNo">347</span>        // validate html message<a name="line.347"></a>
+<span class="sourceLineNo">348</span>        validateSend(<a name="line.348"></a>
+<span class="sourceLineNo">349</span>            this.fakeMailServer,<a name="line.349"></a>
+<span class="sourceLineNo">350</span>            strSubject,<a name="line.350"></a>
+<span class="sourceLineNo">351</span>            this.email.getHtmlMsg(),<a name="line.351"></a>
+<span class="sourceLineNo">352</span>            this.email.getFromAddress(),<a name="line.352"></a>
+<span class="sourceLineNo">353</span>            this.email.getToAddresses(),<a name="line.353"></a>
+<span class="sourceLineNo">354</span>            this.email.getCcAddresses(),<a name="line.354"></a>
+<span class="sourceLineNo">355</span>            this.email.getBccAddresses(),<a name="line.355"></a>
+<span class="sourceLineNo">356</span>            false);<a name="line.356"></a>
+<span class="sourceLineNo">357</span><a name="line.357"></a>
+<span class="sourceLineNo">358</span>        // validate attachment<a name="line.358"></a>
+<span class="sourceLineNo">359</span>        validateSend(<a name="line.359"></a>
+<span class="sourceLineNo">360</span>            this.fakeMailServer,<a name="line.360"></a>
+<span class="sourceLineNo">361</span>            strSubject,<a name="line.361"></a>
+<span class="sourceLineNo">362</span>            attachment.getName(),<a name="line.362"></a>
+<span class="sourceLineNo">363</span>            this.email.getFromAddress(),<a name="line.363"></a>
+<span class="sourceLineNo">364</span>            this.email.getToAddresses(),<a name="line.364"></a>
+<span class="sourceLineNo">365</span>            this.email.getCcAddresses(),<a name="line.365"></a>
+<span class="sourceLineNo">366</span>            this.email.getBccAddresses(),<a name="line.366"></a>
+<span class="sourceLineNo">367</span>            false);<a name="line.367"></a>
+<span class="sourceLineNo">368</span><a name="line.368"></a>
+<span class="sourceLineNo">369</span>        this.getMailServer();<a name="line.369"></a>
+<span class="sourceLineNo">370</span><a name="line.370"></a>
+<span class="sourceLineNo">371</span>        this.email = new MockHtmlEmailConcrete();<a name="line.371"></a>
+<span class="sourceLineNo">372</span>        this.email.setHostName(this.strTestMailServer);<a name="line.372"></a>
+<span class="sourceLineNo">373</span>        this.email.setSmtpPort(this.getMailServerPort());<a name="line.373"></a>
+<span class="sourceLineNo">374</span>        this.email.setFrom(this.strTestMailFrom);<a name="line.374"></a>
+<span class="sourceLineNo">375</span>        this.email.addTo(this.strTestMailTo);<a name="line.375"></a>
+<span class="sourceLineNo">376</span><a name="line.376"></a>
+<span class="sourceLineNo">377</span>        if (this.strTestUser != null &amp;&amp; this.strTestPasswd != null)<a name="line.377"></a>
+<span class="sourceLineNo">378</span>        {<a name="line.378"></a>
+<span class="sourceLineNo">379</span>            this.email.setAuthentication(<a name="line.379"></a>
+<span class="sourceLineNo">380</span>                this.strTestUser,<a name="line.380"></a>
+<span class="sourceLineNo">381</span>                this.strTestPasswd);<a name="line.381"></a>
+<span class="sourceLineNo">382</span>        }<a name="line.382"></a>
+<span class="sourceLineNo">383</span><a name="line.383"></a>
+<span class="sourceLineNo">384</span>        strSubject = "Test HTML Send #1 Subject (wo charset)";<a name="line.384"></a>
+<span class="sourceLineNo">385</span>        this.email.setSubject(strSubject);<a name="line.385"></a>
+<span class="sourceLineNo">386</span>        this.email.setTextMsg("Test message");<a name="line.386"></a>
+<span class="sourceLineNo">387</span><a name="line.387"></a>
+<span class="sourceLineNo">388</span>        this.email.send();<a name="line.388"></a>
+<span class="sourceLineNo">389</span>        this.fakeMailServer.stop();<a name="line.389"></a>
+<span class="sourceLineNo">390</span>        // validate txt message<a name="line.390"></a>
+<span class="sourceLineNo">391</span>        validateSend(<a name="line.391"></a>
+<span class="sourceLineNo">392</span>            this.fakeMailServer,<a name="line.392"></a>
+<span class="sourceLineNo">393</span>            strSubject,<a name="line.393"></a>
+<span class="sourceLineNo">394</span>            this.email.getTextMsg(),<a name="line.394"></a>
+<span class="sourceLineNo">395</span>            this.email.getFromAddress(),<a name="line.395"></a>
+<span class="sourceLineNo">396</span>            this.email.getToAddresses(),<a name="line.396"></a>
+<span class="sourceLineNo">397</span>            this.email.getCcAddresses(),<a name="line.397"></a>
+<span class="sourceLineNo">398</span>            this.email.getBccAddresses(),<a name="line.398"></a>
+<span class="sourceLineNo">399</span>            true);<a name="line.399"></a>
+<span class="sourceLineNo">400</span>    }<a name="line.400"></a>
+<span class="sourceLineNo">401</span><a name="line.401"></a>
+<span class="sourceLineNo">402</span>    @Test<a name="line.402"></a>
+<span class="sourceLineNo">403</span>    public void testSend2() throws Exception<a name="line.403"></a>
+<span class="sourceLineNo">404</span>    {<a name="line.404"></a>
+<span class="sourceLineNo">405</span>        // ====================================================================<a name="line.405"></a>
+<span class="sourceLineNo">406</span>        // Test Success<a name="line.406"></a>
+<span class="sourceLineNo">407</span>        // ====================================================================<a name="line.407"></a>
+<span class="sourceLineNo">408</span><a name="line.408"></a>
+<span class="sourceLineNo">409</span>        this.getMailServer();<a name="line.409"></a>
+<span class="sourceLineNo">410</span><a name="line.410"></a>
+<span class="sourceLineNo">411</span>        this.email = new MockHtmlEmailConcrete();<a name="line.411"></a>

[... 500 lines stripped ...]


Mime
View raw message