commons-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t.@apache.org
Subject svn commit: r952406 [34/42] - 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 Sat, 23 May 2015 06:51:00 GMT
Modified: websites/production/commons/content/proper/commons-email/xref-test/org/apache/commons/mail/HtmlEmailTest.html
==============================================================================
--- websites/production/commons/content/proper/commons-email/xref-test/org/apache/commons/mail/HtmlEmailTest.html (original)
+++ websites/production/commons/content/proper/commons-email/xref-test/org/apache/commons/mail/HtmlEmailTest.html Sat May 23 06:50:57 2015
@@ -24,735 +24,747 @@
 <a class="jxr_linenumber" name="L16" href="#L16">16</a>  <em class="jxr_comment"> */</em>
 <a class="jxr_linenumber" name="L17" href="#L17">17</a>  <strong class="jxr_keyword">package</strong> org.apache.commons.mail;
 <a class="jxr_linenumber" name="L18" href="#L18">18</a>  
-<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.Assert.*;
-<a class="jxr_linenumber" name="L20" href="#L20">20</a>  
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> java.io.File;
-<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> java.io.IOException;
-<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> java.net.URL;
-<a class="jxr_linenumber" name="L24" href="#L24">24</a>  <strong class="jxr_keyword">import</strong> java.util.List;
-<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> javax.activation.DataSource;
-<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> javax.activation.FileDataSource;
-<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> javax.mail.internet.MimeMessage;
-<a class="jxr_linenumber" name="L28" href="#L28">28</a>  
-<a class="jxr_linenumber" name="L29" href="#L29">29</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.mail.mocks.MockHtmlEmailConcrete;
-<a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.mail.settings.EmailConfiguration;
-<a class="jxr_linenumber" name="L31" href="#L31">31</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.mail.util.MimeMessageParser;
-<a class="jxr_linenumber" name="L32" href="#L32">32</a>  <strong class="jxr_keyword">import</strong> org.junit.Before;
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <strong class="jxr_keyword">import</strong> org.junit.Test;
-<a class="jxr_linenumber" name="L34" href="#L34">34</a>  <strong class="jxr_keyword">import</strong> org.junit.runner.RunWith;
-<a class="jxr_linenumber" name="L35" href="#L35">35</a>  <strong class="jxr_keyword">import</strong> org.powermock.core.classloader.annotations.PrepareForTest;
-<a class="jxr_linenumber" name="L36" href="#L36">36</a>  <strong class="jxr_keyword">import</strong> org.powermock.modules.junit4.PowerMockRunner;
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>  
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <em class="jxr_javadoccomment"> * JUnit test case for HtmlEmail Class.</em>
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <em class="jxr_javadoccomment"> * @since 1.0</em>
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <em class="jxr_javadoccomment"> * @version $Id: HtmlEmailTest.java 1606709 2014-06-30 12:26:06Z ggregory $</em>
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>  <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>  @RunWith(PowerMockRunner.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>  @PrepareForTest( { MockHtmlEmailConcrete.<strong class="jxr_keyword">class</strong> })
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/commons/mail/HtmlEmailTest.html">HtmlEmailTest</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/commons/mail/AbstractEmailTest.html">AbstractEmailTest</a>
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>  {
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>      <strong class="jxr_keyword">private</strong> <a href="../../../../org/apache/commons/mail/mocks/MockHtmlEmailConcrete.html">MockHtmlEmailConcrete</a> email;
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>  
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>      @Before
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setUpHtmlEmailTest()
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>      {
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>          <em class="jxr_comment">// reusable objects to be used across multiple tests</em>
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>          <strong class="jxr_keyword">this</strong>.email = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/mail/mocks/MockHtmlEmailConcrete.html">MockHtmlEmailConcrete</a>();
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>      }
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>  
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>      @Test
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testGetSetTextMsg() <strong class="jxr_keyword">throws</strong> EmailException
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>      {
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>          <em class="jxr_comment">// ====================================================================</em>
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>          <em class="jxr_comment">// Test Success</em>
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>          <em class="jxr_comment">// ====================================================================</em>
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>          <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> String validChar : testCharsValid)
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>          {
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>              <strong class="jxr_keyword">this</strong>.email.setTextMsg(validChar);
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>              assertEquals(validChar, <strong class="jxr_keyword">this</strong>.email.getTextMsg());
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>          }
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>  
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>          <em class="jxr_comment">// ====================================================================</em>
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>          <em class="jxr_comment">// Test Exception</em>
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>          <em class="jxr_comment">// ====================================================================</em>
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>          <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> String invalidChar : <strong class="jxr_keyword">this</strong>.testCharsNotValid)
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>          {
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>              <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>              {
-<a class="jxr_linenumber" name="L76" href="#L76">76</a>                  <strong class="jxr_keyword">this</strong>.email.setTextMsg(invalidChar);
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>                  fail(<span class="jxr_string">"Should have thrown an exception"</span>);
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>              }
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>              <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> EmailException e)
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>              {
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>                  assertTrue(<strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>              }
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>          }
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>  
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>      }
-<a class="jxr_linenumber" name="L86" href="#L86">86</a>  
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>      @Test
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testGetSetHtmlMsg() <strong class="jxr_keyword">throws</strong> EmailException
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>      {
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>          <em class="jxr_comment">// ====================================================================</em>
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>          <em class="jxr_comment">// Test Success</em>
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>          <em class="jxr_comment">// ====================================================================</em>
-<a class="jxr_linenumber" name="L93" href="#L93">93</a>          <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> String validChar : testCharsValid)
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>          {
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>              <strong class="jxr_keyword">this</strong>.email.setHtmlMsg(validChar);
-<a class="jxr_linenumber" name="L96" href="#L96">96</a>              assertEquals(validChar, <strong class="jxr_keyword">this</strong>.email.getHtmlMsg());
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>          }
-<a class="jxr_linenumber" name="L98" href="#L98">98</a>  
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>          <em class="jxr_comment">// ====================================================================</em>
-<a class="jxr_linenumber" name="L100" href="#L100">100</a>         <em class="jxr_comment">// Test Exception</em>
-<a class="jxr_linenumber" name="L101" href="#L101">101</a>         <em class="jxr_comment">// ====================================================================</em>
-<a class="jxr_linenumber" name="L102" href="#L102">102</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> String invalidChar : <strong class="jxr_keyword">this</strong>.testCharsNotValid)
-<a class="jxr_linenumber" name="L103" href="#L103">103</a>         {
-<a class="jxr_linenumber" name="L104" href="#L104">104</a>             <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L105" href="#L105">105</a>             {
-<a class="jxr_linenumber" name="L106" href="#L106">106</a>                 <strong class="jxr_keyword">this</strong>.email.setHtmlMsg(invalidChar);
-<a class="jxr_linenumber" name="L107" href="#L107">107</a>                 fail(<span class="jxr_string">"Should have thrown an exception"</span>);
-<a class="jxr_linenumber" name="L108" href="#L108">108</a>             }
-<a class="jxr_linenumber" name="L109" href="#L109">109</a>             <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> EmailException e)
-<a class="jxr_linenumber" name="L110" href="#L110">110</a>             {
-<a class="jxr_linenumber" name="L111" href="#L111">111</a>                 assertTrue(<strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="L112" href="#L112">112</a>             }
-<a class="jxr_linenumber" name="L113" href="#L113">113</a>         }
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> 
-<a class="jxr_linenumber" name="L115" href="#L115">115</a>     }
-<a class="jxr_linenumber" name="L116" href="#L116">116</a> 
-<a class="jxr_linenumber" name="L117" href="#L117">117</a>     @Test
-<a class="jxr_linenumber" name="L118" href="#L118">118</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testGetSetMsg() <strong class="jxr_keyword">throws</strong> EmailException
-<a class="jxr_linenumber" name="L119" href="#L119">119</a>     {
-<a class="jxr_linenumber" name="L120" href="#L120">120</a>         <em class="jxr_comment">// ====================================================================</em>
-<a class="jxr_linenumber" name="L121" href="#L121">121</a>         <em class="jxr_comment">// Test Success</em>
-<a class="jxr_linenumber" name="L122" href="#L122">122</a>         <em class="jxr_comment">// ====================================================================</em>
-<a class="jxr_linenumber" name="L123" href="#L123">123</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> String validChar : testCharsValid)
-<a class="jxr_linenumber" name="L124" href="#L124">124</a>         {
-<a class="jxr_linenumber" name="L125" href="#L125">125</a>             <strong class="jxr_keyword">this</strong>.email.setMsg(validChar);
-<a class="jxr_linenumber" name="L126" href="#L126">126</a>             assertEquals(validChar, <strong class="jxr_keyword">this</strong>.email.getTextMsg());
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> 
-<a class="jxr_linenumber" name="L128" href="#L128">128</a>             assertTrue(
-<a class="jxr_linenumber" name="L129" href="#L129">129</a>                     <strong class="jxr_keyword">this</strong>.email.getHtmlMsg().contains(validChar));
-<a class="jxr_linenumber" name="L130" href="#L130">130</a>         }
-<a class="jxr_linenumber" name="L131" href="#L131">131</a> 
-<a class="jxr_linenumber" name="L132" href="#L132">132</a>         <em class="jxr_comment">// ====================================================================</em>
-<a class="jxr_linenumber" name="L133" href="#L133">133</a>         <em class="jxr_comment">// Test Exception</em>
-<a class="jxr_linenumber" name="L134" href="#L134">134</a>         <em class="jxr_comment">// ====================================================================</em>
-<a class="jxr_linenumber" name="L135" href="#L135">135</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> String invalidChar : <strong class="jxr_keyword">this</strong>.testCharsNotValid)
-<a class="jxr_linenumber" name="L136" href="#L136">136</a>         {
-<a class="jxr_linenumber" name="L137" href="#L137">137</a>             <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L138" href="#L138">138</a>             {
-<a class="jxr_linenumber" name="L139" href="#L139">139</a>                 <strong class="jxr_keyword">this</strong>.email.setMsg(invalidChar);
-<a class="jxr_linenumber" name="L140" href="#L140">140</a>                 fail(<span class="jxr_string">"Should have thrown an exception"</span>);
-<a class="jxr_linenumber" name="L141" href="#L141">141</a>             }
-<a class="jxr_linenumber" name="L142" href="#L142">142</a>             <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> EmailException e)
-<a class="jxr_linenumber" name="L143" href="#L143">143</a>             {
-<a class="jxr_linenumber" name="L144" href="#L144">144</a>                 assertTrue(<strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="L145" href="#L145">145</a>             }
-<a class="jxr_linenumber" name="L146" href="#L146">146</a>         }
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> 
-<a class="jxr_linenumber" name="L148" href="#L148">148</a>     }
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> 
-<a class="jxr_linenumber" name="L150" href="#L150">150</a>     @Test
-<a class="jxr_linenumber" name="L151" href="#L151">151</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testEmbedUrl() <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="L152" href="#L152">152</a>     {
-<a class="jxr_linenumber" name="L153" href="#L153">153</a>         <em class="jxr_comment">// ====================================================================</em>
-<a class="jxr_linenumber" name="L154" href="#L154">154</a>         <em class="jxr_comment">// Test Success</em>
-<a class="jxr_linenumber" name="L155" href="#L155">155</a>         <em class="jxr_comment">// ====================================================================</em>
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> 
-<a class="jxr_linenumber" name="L157" href="#L157">157</a>         <strong class="jxr_keyword">final</strong> String strEmbed =
-<a class="jxr_linenumber" name="L158" href="#L158">158</a>             <strong class="jxr_keyword">this</strong>.email.embed(<strong class="jxr_keyword">new</strong> URL(<strong class="jxr_keyword">this</strong>.strTestURL), <span class="jxr_string">"Test name"</span>);
-<a class="jxr_linenumber" name="L159" href="#L159">159</a>         assertNotNull(strEmbed);
-<a class="jxr_linenumber" name="L160" href="#L160">160</a>         assertEquals(HtmlEmail.CID_LENGTH, strEmbed.length());
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> 
-<a class="jxr_linenumber" name="L162" href="#L162">162</a>         <em class="jxr_comment">// if we embed the same name again, do we get the same content ID</em>
-<a class="jxr_linenumber" name="L163" href="#L163">163</a>         <em class="jxr_comment">// back?</em>
-<a class="jxr_linenumber" name="L164" href="#L164">164</a>         <strong class="jxr_keyword">final</strong> String testCid =
-<a class="jxr_linenumber" name="L165" href="#L165">165</a>             <strong class="jxr_keyword">this</strong>.email.embed(<strong class="jxr_keyword">new</strong> URL(<strong class="jxr_keyword">this</strong>.strTestURL), <span class="jxr_string">"Test name"</span>);
-<a class="jxr_linenumber" name="L166" href="#L166">166</a>         assertEquals(strEmbed, testCid);
+<a class="jxr_linenumber" name="L19" href="#L19">19</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.Assert.assertEquals;
+<a class="jxr_linenumber" name="L20" href="#L20">20</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.Assert.assertFalse;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.Assert.assertNotNull;
+<a class="jxr_linenumber" name="L22" href="#L22">22</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.Assert.assertTrue;
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>  <strong class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong> org.junit.Assert.fail;
+<a class="jxr_linenumber" name="L24" href="#L24">24</a>  
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>  <strong class="jxr_keyword">import</strong> java.io.File;
+<a class="jxr_linenumber" name="L26" href="#L26">26</a>  <strong class="jxr_keyword">import</strong> java.io.IOException;
+<a class="jxr_linenumber" name="L27" href="#L27">27</a>  <strong class="jxr_keyword">import</strong> java.net.URL;
+<a class="jxr_linenumber" name="L28" href="#L28">28</a>  <strong class="jxr_keyword">import</strong> java.util.List;
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>  
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>  <strong class="jxr_keyword">import</strong> javax.activation.DataSource;
+<a class="jxr_linenumber" name="L31" href="#L31">31</a>  <strong class="jxr_keyword">import</strong> javax.activation.FileDataSource;
+<a class="jxr_linenumber" name="L32" href="#L32">32</a>  <strong class="jxr_keyword">import</strong> javax.mail.internet.MimeMessage;
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.mail.mocks.MockHtmlEmailConcrete;
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.mail.settings.EmailConfiguration;
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.mail.util.MimeMessageParser;
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>  <strong class="jxr_keyword">import</strong> org.junit.Before;
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <strong class="jxr_keyword">import</strong> org.junit.Ignore;
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <strong class="jxr_keyword">import</strong> org.junit.Test;
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <strong class="jxr_keyword">import</strong> org.junit.runner.RunWith;
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <strong class="jxr_keyword">import</strong> org.powermock.core.classloader.annotations.PrepareForTest;
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <strong class="jxr_keyword">import</strong> org.powermock.modules.junit4.PowerMockRunner;
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>  
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>  <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>  <em class="jxr_javadoccomment"> * JUnit test case for HtmlEmail Class.</em>
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>  <em class="jxr_javadoccomment"> *</em>
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>  <em class="jxr_javadoccomment"> * @since 1.0</em>
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>  <em class="jxr_javadoccomment"> * @version $Id: HtmlEmailTest.java 1647983 2014-12-26 14:25:27Z tn $</em>
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>  <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>  @RunWith(PowerMockRunner.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>  @PrepareForTest( { MockHtmlEmailConcrete.<strong class="jxr_keyword">class</strong> })
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/commons/mail/HtmlEmailTest.html">HtmlEmailTest</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/commons/mail/AbstractEmailTest.html">AbstractEmailTest</a>
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>  {
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>      <strong class="jxr_keyword">private</strong> <a href="../../../../org/apache/commons/mail/mocks/MockHtmlEmailConcrete.html">MockHtmlEmailConcrete</a> email;
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>  
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>      @Before
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setUpHtmlEmailTest()
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>      {
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>          <em class="jxr_comment">// reusable objects to be used across multiple tests</em>
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>          <strong class="jxr_keyword">this</strong>.email = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/mail/mocks/MockHtmlEmailConcrete.html">MockHtmlEmailConcrete</a>();
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>      }
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>  
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>      @Test
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testGetSetTextMsg() <strong class="jxr_keyword">throws</strong> EmailException
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>      {
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>          <em class="jxr_comment">// ====================================================================</em>
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>          <em class="jxr_comment">// Test Success</em>
+<a class="jxr_linenumber" name="L68" href="#L68">68</a>          <em class="jxr_comment">// ====================================================================</em>
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>          <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> String validChar : testCharsValid)
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>          {
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>              <strong class="jxr_keyword">this</strong>.email.setTextMsg(validChar);
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>              assertEquals(validChar, <strong class="jxr_keyword">this</strong>.email.getTextMsg());
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>          }
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>  
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>          <em class="jxr_comment">// ====================================================================</em>
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>          <em class="jxr_comment">// Test Exception</em>
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>          <em class="jxr_comment">// ====================================================================</em>
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>          <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> String invalidChar : <strong class="jxr_keyword">this</strong>.testCharsNotValid)
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>          {
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>              <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>              {
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>                  <strong class="jxr_keyword">this</strong>.email.setTextMsg(invalidChar);
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>                  fail(<span class="jxr_string">"Should have thrown an exception"</span>);
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>              }
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>              <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> EmailException e)
+<a class="jxr_linenumber" name="L86" href="#L86">86</a>              {
+<a class="jxr_linenumber" name="L87" href="#L87">87</a>                  assertTrue(<strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>              }
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>          }
+<a class="jxr_linenumber" name="L90" href="#L90">90</a>  
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>      }
+<a class="jxr_linenumber" name="L92" href="#L92">92</a>  
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>      @Test
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testGetSetHtmlMsg() <strong class="jxr_keyword">throws</strong> EmailException
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>      {
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>          <em class="jxr_comment">// ====================================================================</em>
+<a class="jxr_linenumber" name="L97" href="#L97">97</a>          <em class="jxr_comment">// Test Success</em>
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>          <em class="jxr_comment">// ====================================================================</em>
+<a class="jxr_linenumber" name="L99" href="#L99">99</a>          <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> String validChar : testCharsValid)
+<a class="jxr_linenumber" name="L100" href="#L100">100</a>         {
+<a class="jxr_linenumber" name="L101" href="#L101">101</a>             <strong class="jxr_keyword">this</strong>.email.setHtmlMsg(validChar);
+<a class="jxr_linenumber" name="L102" href="#L102">102</a>             assertEquals(validChar, <strong class="jxr_keyword">this</strong>.email.getHtmlMsg());
+<a class="jxr_linenumber" name="L103" href="#L103">103</a>         }
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> 
+<a class="jxr_linenumber" name="L105" href="#L105">105</a>         <em class="jxr_comment">// ====================================================================</em>
+<a class="jxr_linenumber" name="L106" href="#L106">106</a>         <em class="jxr_comment">// Test Exception</em>
+<a class="jxr_linenumber" name="L107" href="#L107">107</a>         <em class="jxr_comment">// ====================================================================</em>
+<a class="jxr_linenumber" name="L108" href="#L108">108</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> String invalidChar : <strong class="jxr_keyword">this</strong>.testCharsNotValid)
+<a class="jxr_linenumber" name="L109" href="#L109">109</a>         {
+<a class="jxr_linenumber" name="L110" href="#L110">110</a>             <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L111" href="#L111">111</a>             {
+<a class="jxr_linenumber" name="L112" href="#L112">112</a>                 <strong class="jxr_keyword">this</strong>.email.setHtmlMsg(invalidChar);
+<a class="jxr_linenumber" name="L113" href="#L113">113</a>                 fail(<span class="jxr_string">"Should have thrown an exception"</span>);
+<a class="jxr_linenumber" name="L114" href="#L114">114</a>             }
+<a class="jxr_linenumber" name="L115" href="#L115">115</a>             <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> EmailException e)
+<a class="jxr_linenumber" name="L116" href="#L116">116</a>             {
+<a class="jxr_linenumber" name="L117" href="#L117">117</a>                 assertTrue(<strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="L118" href="#L118">118</a>             }
+<a class="jxr_linenumber" name="L119" href="#L119">119</a>         }
+<a class="jxr_linenumber" name="L120" href="#L120">120</a> 
+<a class="jxr_linenumber" name="L121" href="#L121">121</a>     }
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> 
+<a class="jxr_linenumber" name="L123" href="#L123">123</a>     @Test
+<a class="jxr_linenumber" name="L124" href="#L124">124</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testGetSetMsg() <strong class="jxr_keyword">throws</strong> EmailException
+<a class="jxr_linenumber" name="L125" href="#L125">125</a>     {
+<a class="jxr_linenumber" name="L126" href="#L126">126</a>         <em class="jxr_comment">// ====================================================================</em>
+<a class="jxr_linenumber" name="L127" href="#L127">127</a>         <em class="jxr_comment">// Test Success</em>
+<a class="jxr_linenumber" name="L128" href="#L128">128</a>         <em class="jxr_comment">// ====================================================================</em>
+<a class="jxr_linenumber" name="L129" href="#L129">129</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> String validChar : testCharsValid)
+<a class="jxr_linenumber" name="L130" href="#L130">130</a>         {
+<a class="jxr_linenumber" name="L131" href="#L131">131</a>             <strong class="jxr_keyword">this</strong>.email.setMsg(validChar);
+<a class="jxr_linenumber" name="L132" href="#L132">132</a>             assertEquals(validChar, <strong class="jxr_keyword">this</strong>.email.getTextMsg());
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> 
+<a class="jxr_linenumber" name="L134" href="#L134">134</a>             assertTrue(
+<a class="jxr_linenumber" name="L135" href="#L135">135</a>                     <strong class="jxr_keyword">this</strong>.email.getHtmlMsg().contains(validChar));
+<a class="jxr_linenumber" name="L136" href="#L136">136</a>         }
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> 
+<a class="jxr_linenumber" name="L138" href="#L138">138</a>         <em class="jxr_comment">// ====================================================================</em>
+<a class="jxr_linenumber" name="L139" href="#L139">139</a>         <em class="jxr_comment">// Test Exception</em>
+<a class="jxr_linenumber" name="L140" href="#L140">140</a>         <em class="jxr_comment">// ====================================================================</em>
+<a class="jxr_linenumber" name="L141" href="#L141">141</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> String invalidChar : <strong class="jxr_keyword">this</strong>.testCharsNotValid)
+<a class="jxr_linenumber" name="L142" href="#L142">142</a>         {
+<a class="jxr_linenumber" name="L143" href="#L143">143</a>             <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L144" href="#L144">144</a>             {
+<a class="jxr_linenumber" name="L145" href="#L145">145</a>                 <strong class="jxr_keyword">this</strong>.email.setMsg(invalidChar);
+<a class="jxr_linenumber" name="L146" href="#L146">146</a>                 fail(<span class="jxr_string">"Should have thrown an exception"</span>);
+<a class="jxr_linenumber" name="L147" href="#L147">147</a>             }
+<a class="jxr_linenumber" name="L148" href="#L148">148</a>             <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> EmailException e)
+<a class="jxr_linenumber" name="L149" href="#L149">149</a>             {
+<a class="jxr_linenumber" name="L150" href="#L150">150</a>                 assertTrue(<strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="L151" href="#L151">151</a>             }
+<a class="jxr_linenumber" name="L152" href="#L152">152</a>         }
+<a class="jxr_linenumber" name="L153" href="#L153">153</a> 
+<a class="jxr_linenumber" name="L154" href="#L154">154</a>     }
+<a class="jxr_linenumber" name="L155" href="#L155">155</a> 
+<a class="jxr_linenumber" name="L156" href="#L156">156</a>     @Test
+<a class="jxr_linenumber" name="L157" href="#L157">157</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testEmbedUrl() <strong class="jxr_keyword">throws</strong> Exception
+<a class="jxr_linenumber" name="L158" href="#L158">158</a>     {
+<a class="jxr_linenumber" name="L159" href="#L159">159</a>         <em class="jxr_comment">// ====================================================================</em>
+<a class="jxr_linenumber" name="L160" href="#L160">160</a>         <em class="jxr_comment">// Test Success</em>
+<a class="jxr_linenumber" name="L161" href="#L161">161</a>         <em class="jxr_comment">// ====================================================================</em>
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> 
+<a class="jxr_linenumber" name="L163" href="#L163">163</a>         <strong class="jxr_keyword">final</strong> String strEmbed =
+<a class="jxr_linenumber" name="L164" href="#L164">164</a>             <strong class="jxr_keyword">this</strong>.email.embed(<strong class="jxr_keyword">new</strong> URL(<strong class="jxr_keyword">this</strong>.strTestURL), <span class="jxr_string">"Test name"</span>);
+<a class="jxr_linenumber" name="L165" href="#L165">165</a>         assertNotNull(strEmbed);
+<a class="jxr_linenumber" name="L166" href="#L166">166</a>         assertEquals(HtmlEmail.CID_LENGTH, strEmbed.length());
 <a class="jxr_linenumber" name="L167" href="#L167">167</a> 
-<a class="jxr_linenumber" name="L168" href="#L168">168</a>         <em class="jxr_comment">// if we embed the same URL under a different name, is the content ID</em>
-<a class="jxr_linenumber" name="L169" href="#L169">169</a>         <em class="jxr_comment">// unique?</em>
-<a class="jxr_linenumber" name="L170" href="#L170">170</a>         <strong class="jxr_keyword">final</strong> String newCid =
-<a class="jxr_linenumber" name="L171" href="#L171">171</a>             <strong class="jxr_keyword">this</strong>.email.embed(<strong class="jxr_keyword">new</strong> URL(<strong class="jxr_keyword">this</strong>.strTestURL), <span class="jxr_string">"Test name 2"</span>);
-<a class="jxr_linenumber" name="L172" href="#L172">172</a>         assertFalse(strEmbed.equals(newCid));
+<a class="jxr_linenumber" name="L168" href="#L168">168</a>         <em class="jxr_comment">// if we embed the same name again, do we get the same content ID</em>
+<a class="jxr_linenumber" name="L169" href="#L169">169</a>         <em class="jxr_comment">// back?</em>
+<a class="jxr_linenumber" name="L170" href="#L170">170</a>         <strong class="jxr_keyword">final</strong> String testCid =
+<a class="jxr_linenumber" name="L171" href="#L171">171</a>             <strong class="jxr_keyword">this</strong>.email.embed(<strong class="jxr_keyword">new</strong> URL(<strong class="jxr_keyword">this</strong>.strTestURL), <span class="jxr_string">"Test name"</span>);
+<a class="jxr_linenumber" name="L172" href="#L172">172</a>         assertEquals(strEmbed, testCid);
 <a class="jxr_linenumber" name="L173" href="#L173">173</a> 
-<a class="jxr_linenumber" name="L174" href="#L174">174</a>         <em class="jxr_comment">// ====================================================================</em>
-<a class="jxr_linenumber" name="L175" href="#L175">175</a>         <em class="jxr_comment">// Test Exceptions</em>
-<a class="jxr_linenumber" name="L176" href="#L176">176</a>         <em class="jxr_comment">// ====================================================================</em>
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> 
-<a class="jxr_linenumber" name="L178" href="#L178">178</a>         <em class="jxr_comment">// Does an invalid URL throw an exception?</em>
-<a class="jxr_linenumber" name="L179" href="#L179">179</a>         <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L180" href="#L180">180</a>         {
-<a class="jxr_linenumber" name="L181" href="#L181">181</a>             <strong class="jxr_keyword">this</strong>.email.embed(createInvalidURL(), <span class="jxr_string">"Bad URL"</span>);
-<a class="jxr_linenumber" name="L182" href="#L182">182</a>             fail(<span class="jxr_string">"Should have thrown an exception"</span>);
-<a class="jxr_linenumber" name="L183" href="#L183">183</a>         }
-<a class="jxr_linenumber" name="L184" href="#L184">184</a>         <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> EmailException e)
-<a class="jxr_linenumber" name="L185" href="#L185">185</a>         {
-<a class="jxr_linenumber" name="L186" href="#L186">186</a>             <em class="jxr_comment">// expected</em>
-<a class="jxr_linenumber" name="L187" href="#L187">187</a>         }
-<a class="jxr_linenumber" name="L188" href="#L188">188</a> 
-<a class="jxr_linenumber" name="L189" href="#L189">189</a>         <em class="jxr_comment">// if we try to embed a different URL under a previously used name,</em>
-<a class="jxr_linenumber" name="L190" href="#L190">190</a>         <em class="jxr_comment">// does it complain?</em>
-<a class="jxr_linenumber" name="L191" href="#L191">191</a>         <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L192" href="#L192">192</a>         {
-<a class="jxr_linenumber" name="L193" href="#L193">193</a>             <strong class="jxr_keyword">this</strong>.email.embed(<strong class="jxr_keyword">new</strong> URL(<span class="jxr_string">"http://www.google.com"</span>), <span class="jxr_string">"Test name"</span>);
-<a class="jxr_linenumber" name="L194" href="#L194">194</a>             fail(<span class="jxr_string">"shouldn't be able to use an existing name with a different URL!"</span>);
-<a class="jxr_linenumber" name="L195" href="#L195">195</a>         }
-<a class="jxr_linenumber" name="L196" href="#L196">196</a>         <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> EmailException e)
-<a class="jxr_linenumber" name="L197" href="#L197">197</a>         {
-<a class="jxr_linenumber" name="L198" href="#L198">198</a>             <em class="jxr_comment">// expected</em>
-<a class="jxr_linenumber" name="L199" href="#L199">199</a>         }
-<a class="jxr_linenumber" name="L200" href="#L200">200</a>     }
-<a class="jxr_linenumber" name="L201" href="#L201">201</a> 
-<a class="jxr_linenumber" name="L202" href="#L202">202</a>     @Test
-<a class="jxr_linenumber" name="L203" href="#L203">203</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testEmbedFile() <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="L204" href="#L204">204</a>     {
-<a class="jxr_linenumber" name="L205" href="#L205">205</a>         <em class="jxr_comment">// ====================================================================</em>
-<a class="jxr_linenumber" name="L206" href="#L206">206</a>         <em class="jxr_comment">// Test Success</em>
-<a class="jxr_linenumber" name="L207" href="#L207">207</a>         <em class="jxr_comment">// ====================================================================</em>
-<a class="jxr_linenumber" name="L208" href="#L208">208</a> 
-<a class="jxr_linenumber" name="L209" href="#L209">209</a>         <strong class="jxr_keyword">final</strong> File file = File.createTempFile(<span class="jxr_string">"testEmbedFile"</span>, <span class="jxr_string">"txt"</span>);
-<a class="jxr_linenumber" name="L210" href="#L210">210</a>         file.deleteOnExit();
-<a class="jxr_linenumber" name="L211" href="#L211">211</a>         <strong class="jxr_keyword">final</strong> String strEmbed = <strong class="jxr_keyword">this</strong>.email.embed(file);
-<a class="jxr_linenumber" name="L212" href="#L212">212</a>         assertNotNull(strEmbed);
-<a class="jxr_linenumber" name="L213" href="#L213">213</a>         assertEquals(<span class="jxr_string">"generated CID has wrong length"</span>,
-<a class="jxr_linenumber" name="L214" href="#L214">214</a>                 HtmlEmail.CID_LENGTH, strEmbed.length());
-<a class="jxr_linenumber" name="L215" href="#L215">215</a> 
-<a class="jxr_linenumber" name="L216" href="#L216">216</a>         <em class="jxr_comment">// if we embed the same file again, do we get the same content ID</em>
-<a class="jxr_linenumber" name="L217" href="#L217">217</a>         <em class="jxr_comment">// back?</em>
-<a class="jxr_linenumber" name="L218" href="#L218">218</a>         <strong class="jxr_keyword">final</strong> String testCid =
-<a class="jxr_linenumber" name="L219" href="#L219">219</a>             <strong class="jxr_keyword">this</strong>.email.embed(file);
-<a class="jxr_linenumber" name="L220" href="#L220">220</a>         assertEquals(<span class="jxr_string">"didn't get same CID after embedding same file twice"</span>,
-<a class="jxr_linenumber" name="L221" href="#L221">221</a>                 strEmbed, testCid);
-<a class="jxr_linenumber" name="L222" href="#L222">222</a> 
-<a class="jxr_linenumber" name="L223" href="#L223">223</a>         <em class="jxr_comment">// if we embed a new file, is the content ID unique?</em>
-<a class="jxr_linenumber" name="L224" href="#L224">224</a>         <strong class="jxr_keyword">final</strong> File otherFile = File.createTempFile(<span class="jxr_string">"testEmbedFile2"</span>, <span class="jxr_string">"txt"</span>);
-<a class="jxr_linenumber" name="L225" href="#L225">225</a>         otherFile.deleteOnExit();
-<a class="jxr_linenumber" name="L226" href="#L226">226</a>         <strong class="jxr_keyword">final</strong> String newCid = <strong class="jxr_keyword">this</strong>.email.embed(otherFile);
-<a class="jxr_linenumber" name="L227" href="#L227">227</a>         assertFalse(<span class="jxr_string">"didn't get unique CID from embedding new file"</span>,
-<a class="jxr_linenumber" name="L228" href="#L228">228</a>                 strEmbed.equals(newCid));
-<a class="jxr_linenumber" name="L229" href="#L229">229</a>     }
-<a class="jxr_linenumber" name="L230" href="#L230">230</a> 
-<a class="jxr_linenumber" name="L231" href="#L231">231</a>     @Test
-<a class="jxr_linenumber" name="L232" href="#L232">232</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testEmbedUrlAndFile() <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="L233" href="#L233">233</a>     {
-<a class="jxr_linenumber" name="L234" href="#L234">234</a>         <strong class="jxr_keyword">final</strong> File tmpFile = File.createTempFile(<span class="jxr_string">"testfile"</span>, <span class="jxr_string">"txt"</span>);
-<a class="jxr_linenumber" name="L235" href="#L235">235</a>         tmpFile.deleteOnExit();
-<a class="jxr_linenumber" name="L236" href="#L236">236</a>         <strong class="jxr_keyword">final</strong> String fileCid = <strong class="jxr_keyword">this</strong>.email.embed(tmpFile);
-<a class="jxr_linenumber" name="L237" href="#L237">237</a> 
-<a class="jxr_linenumber" name="L238" href="#L238">238</a>         <strong class="jxr_keyword">final</strong> URL fileUrl = tmpFile.toURI().toURL();
-<a class="jxr_linenumber" name="L239" href="#L239">239</a>         <strong class="jxr_keyword">final</strong> String urlCid = <strong class="jxr_keyword">this</strong>.email.embed(fileUrl, <span class="jxr_string">"urlName"</span>);
-<a class="jxr_linenumber" name="L240" href="#L240">240</a> 
-<a class="jxr_linenumber" name="L241" href="#L241">241</a>         assertFalse(<span class="jxr_string">"file and URL cids should be different even for same resource"</span>,
-<a class="jxr_linenumber" name="L242" href="#L242">242</a>                 fileCid.equals(urlCid));
-<a class="jxr_linenumber" name="L243" href="#L243">243</a>     }
-<a class="jxr_linenumber" name="L244" href="#L244">244</a> 
-<a class="jxr_linenumber" name="L245" href="#L245">245</a>     @Test
-<a class="jxr_linenumber" name="L246" href="#L246">246</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testEmbedDataSource() <strong class="jxr_keyword">throws</strong> Exception
-<a class="jxr_linenumber" name="L247" href="#L247">247</a>     {
-<a class="jxr_linenumber" name="L248" href="#L248">248</a>         <strong class="jxr_keyword">final</strong> File tmpFile = File.createTempFile(<span class="jxr_string">"testEmbedDataSource"</span>, <span class="jxr_string">"txt"</span>);
-<a class="jxr_linenumber" name="L249" href="#L249">249</a>         tmpFile.deleteOnExit();
-<a class="jxr_linenumber" name="L250" href="#L250">250</a>         <strong class="jxr_keyword">final</strong> FileDataSource dataSource = <strong class="jxr_keyword">new</strong> FileDataSource(tmpFile);
-<a class="jxr_linenumber" name="L251" href="#L251">251</a> 
-<a class="jxr_linenumber" name="L252" href="#L252">252</a>         <em class="jxr_comment">// does embedding a datasource without a name fail?</em>
-<a class="jxr_linenumber" name="L253" href="#L253">253</a>         <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L254" href="#L254">254</a>         {
-<a class="jxr_linenumber" name="L255" href="#L255">255</a>             <strong class="jxr_keyword">this</strong>.email.embed(dataSource, <span class="jxr_string">""</span>);
-<a class="jxr_linenumber" name="L256" href="#L256">256</a>             fail(<span class="jxr_string">"embedding with an empty string for a name should fail"</span>);
-<a class="jxr_linenumber" name="L257" href="#L257">257</a>         }
-<a class="jxr_linenumber" name="L258" href="#L258">258</a>         <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> EmailException e)
-<a class="jxr_linenumber" name="L259" href="#L259">259</a>         {
-<a class="jxr_linenumber" name="L260" href="#L260">260</a>             <em class="jxr_comment">// expected</em>
-<a class="jxr_linenumber" name="L261" href="#L261">261</a>         }
-<a class="jxr_linenumber" name="L262" href="#L262">262</a> 
-<a class="jxr_linenumber" name="L263" href="#L263">263</a>         <em class="jxr_comment">// properly embed the datasource</em>
-<a class="jxr_linenumber" name="L264" href="#L264">264</a>         <strong class="jxr_keyword">final</strong> String cid = <strong class="jxr_keyword">this</strong>.email.embed(dataSource, <span class="jxr_string">"testname"</span>);
-<a class="jxr_linenumber" name="L265" href="#L265">265</a> 
-<a class="jxr_linenumber" name="L266" href="#L266">266</a>         <em class="jxr_comment">// does embedding the same datasource under the same name return</em>
-<a class="jxr_linenumber" name="L267" href="#L267">267</a>         <em class="jxr_comment">// the original cid?</em>
-<a class="jxr_linenumber" name="L268" href="#L268">268</a>         <strong class="jxr_keyword">final</strong> String sameCid = <strong class="jxr_keyword">this</strong>.email.embed(dataSource, <span class="jxr_string">"testname"</span>);
-<a class="jxr_linenumber" name="L269" href="#L269">269</a>         assertEquals(<span class="jxr_string">"didn't get same CID for embedding same datasource twice"</span>,
-<a class="jxr_linenumber" name="L270" href="#L270">270</a>                 cid, sameCid);
+<a class="jxr_linenumber" name="L174" href="#L174">174</a>         <em class="jxr_comment">// if we embed the same URL under a different name, is the content ID</em>
+<a class="jxr_linenumber" name="L175" href="#L175">175</a>         <em class="jxr_comment">// unique?</em>
+<a class="jxr_linenumber" name="L176" href="#L176">176</a>         <strong class="jxr_keyword">final</strong> String newCid =
+<a class="jxr_linenumber" name="L177" href="#L177">177</a>             <strong class="jxr_keyword">this</strong>.email.embed(<strong class="jxr_keyword">new</strong> URL(<strong class="jxr_keyword">this</strong>.strTestURL), <span class="jxr_string">"Test name 2"</span>);
+<a class="jxr_linenumber" name="L178" href="#L178">178</a>         assertFalse(strEmbed.equals(newCid));
+<a class="jxr_linenumber" name="L179" href="#L179">179</a> 
+<a class="jxr_linenumber" name="L180" href="#L180">180</a>         <em class="jxr_comment">// ====================================================================</em>
+<a class="jxr_linenumber" name="L181" href="#L181">181</a>         <em class="jxr_comment">// Test Exceptions</em>
+<a class="jxr_linenumber" name="L182" href="#L182">182</a>         <em class="jxr_comment">// ====================================================================</em>
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> 
+<a class="jxr_linenumber" name="L184" href="#L184">184</a>         <em class="jxr_comment">// Does an invalid URL throw an exception?</em>
+<a class="jxr_linenumber" name="L185" href="#L185">185</a>         <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L186" href="#L186">186</a>         {
+<a class="jxr_linenumber" name="L187" href="#L187">187</a>             <strong class="jxr_keyword">this</strong>.email.embed(createInvalidURL(), <span class="jxr_string">"Bad URL"</span>);
+<a class="jxr_linenumber" name="L188" href="#L188">188</a>             fail(<span class="jxr_string">"Should have thrown an exception"</span>);
+<a class="jxr_linenumber" name="L189" href="#L189">189</a>         }
+<a class="jxr_linenumber" name="L190" href="#L190">190</a>         <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> EmailException e)
+<a class="jxr_linenumber" name="L191" href="#L191">191</a>         {
+<a class="jxr_linenumber" name="L192" href="#L192">192</a>             <em class="jxr_comment">// expected</em>
+<a class="jxr_linenumber" name="L193" href="#L193">193</a>         }
+<a class="jxr_linenumber" name="L194" href="#L194">194</a> 
+<a class="jxr_linenumber" name="L195" href="#L195">195</a>         <em class="jxr_comment">// if we try to embed a different URL under a previously used name,</em>
+<a class="jxr_linenumber" name="L196" href="#L196">196</a>         <em class="jxr_comment">// does it complain?</em>
+<a class="jxr_linenumber" name="L197" href="#L197">197</a>         <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L198" href="#L198">198</a>         {
+<a class="jxr_linenumber" name="L199" href="#L199">199</a>             <strong class="jxr_keyword">this</strong>.email.embed(<strong class="jxr_keyword">new</strong> URL(<span class="jxr_string">"http://www.google.com"</span>), <span class="jxr_string">"Test name"</span>);
+<a class="jxr_linenumber" name="L200" href="#L200">200</a>             fail(<span class="jxr_string">"shouldn't be able to use an existing name with a different URL!"</span>);
+<a class="jxr_linenumber" name="L201" href="#L201">201</a>         }
+<a class="jxr_linenumber" name="L202" href="#L202">202</a>         <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> EmailException e)
+<a class="jxr_linenumber" name="L203" href="#L203">203</a>         {
+<a class="jxr_linenumber" name="L204" href="#L204">204</a>             <em class="jxr_comment">// expected</em>
+<a class="jxr_linenumber" name="L205" href="#L205">205</a>         }
+<a class="jxr_linenumber" name="L206" href="#L206">206</a>     }
+<a class="jxr_linenumber" name="L207" href="#L207">207</a> 
+<a class="jxr_linenumber" name="L208" href="#L208">208</a>     @Test
+<a class="jxr_linenumber" name="L209" href="#L209">209</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testEmbedFile() <strong class="jxr_keyword">throws</strong> Exception
+<a class="jxr_linenumber" name="L210" href="#L210">210</a>     {
+<a class="jxr_linenumber" name="L211" href="#L211">211</a>         <em class="jxr_comment">// ====================================================================</em>
+<a class="jxr_linenumber" name="L212" href="#L212">212</a>         <em class="jxr_comment">// Test Success</em>
+<a class="jxr_linenumber" name="L213" href="#L213">213</a>         <em class="jxr_comment">// ====================================================================</em>
+<a class="jxr_linenumber" name="L214" href="#L214">214</a> 
+<a class="jxr_linenumber" name="L215" href="#L215">215</a>         <strong class="jxr_keyword">final</strong> File file = File.createTempFile(<span class="jxr_string">"testEmbedFile"</span>, <span class="jxr_string">"txt"</span>);
+<a class="jxr_linenumber" name="L216" href="#L216">216</a>         file.deleteOnExit();
+<a class="jxr_linenumber" name="L217" href="#L217">217</a>         <strong class="jxr_keyword">final</strong> String strEmbed = <strong class="jxr_keyword">this</strong>.email.embed(file);
+<a class="jxr_linenumber" name="L218" href="#L218">218</a>         assertNotNull(strEmbed);
+<a class="jxr_linenumber" name="L219" href="#L219">219</a>         assertEquals(<span class="jxr_string">"generated CID has wrong length"</span>,
+<a class="jxr_linenumber" name="L220" href="#L220">220</a>                 HtmlEmail.CID_LENGTH, strEmbed.length());
+<a class="jxr_linenumber" name="L221" href="#L221">221</a> 
+<a class="jxr_linenumber" name="L222" href="#L222">222</a>         <em class="jxr_comment">// if we embed the same file again, do we get the same content ID</em>
+<a class="jxr_linenumber" name="L223" href="#L223">223</a>         <em class="jxr_comment">// back?</em>
+<a class="jxr_linenumber" name="L224" href="#L224">224</a>         <strong class="jxr_keyword">final</strong> String testCid =
+<a class="jxr_linenumber" name="L225" href="#L225">225</a>             <strong class="jxr_keyword">this</strong>.email.embed(file);
+<a class="jxr_linenumber" name="L226" href="#L226">226</a>         assertEquals(<span class="jxr_string">"didn't get same CID after embedding same file twice"</span>,
+<a class="jxr_linenumber" name="L227" href="#L227">227</a>                 strEmbed, testCid);
+<a class="jxr_linenumber" name="L228" href="#L228">228</a> 
+<a class="jxr_linenumber" name="L229" href="#L229">229</a>         <em class="jxr_comment">// if we embed a new file, is the content ID unique?</em>
+<a class="jxr_linenumber" name="L230" href="#L230">230</a>         <strong class="jxr_keyword">final</strong> File otherFile = File.createTempFile(<span class="jxr_string">"testEmbedFile2"</span>, <span class="jxr_string">"txt"</span>);
+<a class="jxr_linenumber" name="L231" href="#L231">231</a>         otherFile.deleteOnExit();
+<a class="jxr_linenumber" name="L232" href="#L232">232</a>         <strong class="jxr_keyword">final</strong> String newCid = <strong class="jxr_keyword">this</strong>.email.embed(otherFile);
+<a class="jxr_linenumber" name="L233" href="#L233">233</a>         assertFalse(<span class="jxr_string">"didn't get unique CID from embedding new file"</span>,
+<a class="jxr_linenumber" name="L234" href="#L234">234</a>                 strEmbed.equals(newCid));
+<a class="jxr_linenumber" name="L235" href="#L235">235</a>     }
+<a class="jxr_linenumber" name="L236" href="#L236">236</a> 
+<a class="jxr_linenumber" name="L237" href="#L237">237</a>     @Test
+<a class="jxr_linenumber" name="L238" href="#L238">238</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testEmbedUrlAndFile() <strong class="jxr_keyword">throws</strong> Exception
+<a class="jxr_linenumber" name="L239" href="#L239">239</a>     {
+<a class="jxr_linenumber" name="L240" href="#L240">240</a>         <strong class="jxr_keyword">final</strong> File tmpFile = File.createTempFile(<span class="jxr_string">"testfile"</span>, <span class="jxr_string">"txt"</span>);
+<a class="jxr_linenumber" name="L241" href="#L241">241</a>         tmpFile.deleteOnExit();
+<a class="jxr_linenumber" name="L242" href="#L242">242</a>         <strong class="jxr_keyword">final</strong> String fileCid = <strong class="jxr_keyword">this</strong>.email.embed(tmpFile);
+<a class="jxr_linenumber" name="L243" href="#L243">243</a> 
+<a class="jxr_linenumber" name="L244" href="#L244">244</a>         <strong class="jxr_keyword">final</strong> URL fileUrl = tmpFile.toURI().toURL();
+<a class="jxr_linenumber" name="L245" href="#L245">245</a>         <strong class="jxr_keyword">final</strong> String urlCid = <strong class="jxr_keyword">this</strong>.email.embed(fileUrl, <span class="jxr_string">"urlName"</span>);
+<a class="jxr_linenumber" name="L246" href="#L246">246</a> 
+<a class="jxr_linenumber" name="L247" href="#L247">247</a>         assertFalse(<span class="jxr_string">"file and URL cids should be different even for same resource"</span>,
+<a class="jxr_linenumber" name="L248" href="#L248">248</a>                 fileCid.equals(urlCid));
+<a class="jxr_linenumber" name="L249" href="#L249">249</a>     }
+<a class="jxr_linenumber" name="L250" href="#L250">250</a> 
+<a class="jxr_linenumber" name="L251" href="#L251">251</a>     @Test
+<a class="jxr_linenumber" name="L252" href="#L252">252</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testEmbedDataSource() <strong class="jxr_keyword">throws</strong> Exception
+<a class="jxr_linenumber" name="L253" href="#L253">253</a>     {
+<a class="jxr_linenumber" name="L254" href="#L254">254</a>         <strong class="jxr_keyword">final</strong> File tmpFile = File.createTempFile(<span class="jxr_string">"testEmbedDataSource"</span>, <span class="jxr_string">"txt"</span>);
+<a class="jxr_linenumber" name="L255" href="#L255">255</a>         tmpFile.deleteOnExit();
+<a class="jxr_linenumber" name="L256" href="#L256">256</a>         <strong class="jxr_keyword">final</strong> FileDataSource dataSource = <strong class="jxr_keyword">new</strong> FileDataSource(tmpFile);
+<a class="jxr_linenumber" name="L257" href="#L257">257</a> 
+<a class="jxr_linenumber" name="L258" href="#L258">258</a>         <em class="jxr_comment">// does embedding a datasource without a name fail?</em>
+<a class="jxr_linenumber" name="L259" href="#L259">259</a>         <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L260" href="#L260">260</a>         {
+<a class="jxr_linenumber" name="L261" href="#L261">261</a>             <strong class="jxr_keyword">this</strong>.email.embed(dataSource, <span class="jxr_string">""</span>);
+<a class="jxr_linenumber" name="L262" href="#L262">262</a>             fail(<span class="jxr_string">"embedding with an empty string for a name should fail"</span>);
+<a class="jxr_linenumber" name="L263" href="#L263">263</a>         }
+<a class="jxr_linenumber" name="L264" href="#L264">264</a>         <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> EmailException e)
+<a class="jxr_linenumber" name="L265" href="#L265">265</a>         {
+<a class="jxr_linenumber" name="L266" href="#L266">266</a>             <em class="jxr_comment">// expected</em>
+<a class="jxr_linenumber" name="L267" href="#L267">267</a>         }
+<a class="jxr_linenumber" name="L268" href="#L268">268</a> 
+<a class="jxr_linenumber" name="L269" href="#L269">269</a>         <em class="jxr_comment">// properly embed the datasource</em>
+<a class="jxr_linenumber" name="L270" href="#L270">270</a>         <strong class="jxr_keyword">final</strong> String cid = <strong class="jxr_keyword">this</strong>.email.embed(dataSource, <span class="jxr_string">"testname"</span>);
 <a class="jxr_linenumber" name="L271" href="#L271">271</a> 
-<a class="jxr_linenumber" name="L272" href="#L272">272</a>         <em class="jxr_comment">// does embedding another datasource under the same name fail?</em>
-<a class="jxr_linenumber" name="L273" href="#L273">273</a>         <strong class="jxr_keyword">final</strong> File anotherFile = File.createTempFile(<span class="jxr_string">"testEmbedDataSource2"</span>, <span class="jxr_string">"txt"</span>);
-<a class="jxr_linenumber" name="L274" href="#L274">274</a>         anotherFile.deleteOnExit();
-<a class="jxr_linenumber" name="L275" href="#L275">275</a>         <strong class="jxr_keyword">final</strong> FileDataSource anotherDS = <strong class="jxr_keyword">new</strong> FileDataSource(anotherFile);
-<a class="jxr_linenumber" name="L276" href="#L276">276</a>         <strong class="jxr_keyword">try</strong>
-<a class="jxr_linenumber" name="L277" href="#L277">277</a>         {
-<a class="jxr_linenumber" name="L278" href="#L278">278</a>             <strong class="jxr_keyword">this</strong>.email.embed(anotherDS, <span class="jxr_string">"testname"</span>);
-<a class="jxr_linenumber" name="L279" href="#L279">279</a>         }
-<a class="jxr_linenumber" name="L280" href="#L280">280</a>         <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> EmailException e)
-<a class="jxr_linenumber" name="L281" href="#L281">281</a>         {
-<a class="jxr_linenumber" name="L282" href="#L282">282</a>             <em class="jxr_comment">// expected</em>
-<a class="jxr_linenumber" name="L283" href="#L283">283</a>         }
-<a class="jxr_linenumber" name="L284" href="#L284">284</a>     }
-<a class="jxr_linenumber" name="L285" href="#L285">285</a> 
-<a class="jxr_linenumber" name="L286" href="#L286">286</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L287" href="#L287">287</a> <em class="jxr_javadoccomment">     * @throws EmailException when bad addresses and attachments are used</em>
-<a class="jxr_linenumber" name="L288" href="#L288">288</a> <em class="jxr_javadoccomment">     * @throws IOException if creating a temp file, URL or sending fails</em>
-<a class="jxr_linenumber" name="L289" href="#L289">289</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L290" href="#L290">290</a>     @Test
-<a class="jxr_linenumber" name="L291" href="#L291">291</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSend() <strong class="jxr_keyword">throws</strong> EmailException, IOException
-<a class="jxr_linenumber" name="L292" href="#L292">292</a>     {
-<a class="jxr_linenumber" name="L293" href="#L293">293</a>         <strong class="jxr_keyword">final</strong> EmailAttachment attachment = <strong class="jxr_keyword">new</strong> EmailAttachment();
-<a class="jxr_linenumber" name="L294" href="#L294">294</a>         File testFile = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L295" href="#L295">295</a> 
-<a class="jxr_linenumber" name="L296" href="#L296">296</a>         <em class="jxr_javadoccomment">/** File to used to test file attachments (Must be valid) */</em>
-<a class="jxr_linenumber" name="L297" href="#L297">297</a>         testFile = File.createTempFile(<span class="jxr_string">"commons-email-testfile"</span>, <span class="jxr_string">".txt"</span>);
-<a class="jxr_linenumber" name="L298" href="#L298">298</a>         testFile.deleteOnExit();
-<a class="jxr_linenumber" name="L299" href="#L299">299</a> 
-<a class="jxr_linenumber" name="L300" href="#L300">300</a>         <em class="jxr_comment">// ====================================================================</em>
-<a class="jxr_linenumber" name="L301" href="#L301">301</a>         <em class="jxr_comment">// Test Success</em>
-<a class="jxr_linenumber" name="L302" href="#L302">302</a>         <em class="jxr_comment">// ====================================================================</em>
-<a class="jxr_linenumber" name="L303" href="#L303">303</a>         <strong class="jxr_keyword">this</strong>.getMailServer();
-<a class="jxr_linenumber" name="L304" href="#L304">304</a> 
-<a class="jxr_linenumber" name="L305" href="#L305">305</a>         String strSubject = <span class="jxr_string">"Test HTML Send #1 Subject (w charset)"</span>;
-<a class="jxr_linenumber" name="L306" href="#L306">306</a> 
-<a class="jxr_linenumber" name="L307" href="#L307">307</a>         <strong class="jxr_keyword">this</strong>.email = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/mail/mocks/MockHtmlEmailConcrete.html">MockHtmlEmailConcrete</a>();
-<a class="jxr_linenumber" name="L308" href="#L308">308</a>         <strong class="jxr_keyword">this</strong>.email.setHostName(<strong class="jxr_keyword">this</strong>.strTestMailServer);
-<a class="jxr_linenumber" name="L309" href="#L309">309</a>         <strong class="jxr_keyword">this</strong>.email.setSmtpPort(<strong class="jxr_keyword">this</strong>.getMailServerPort());
-<a class="jxr_linenumber" name="L310" href="#L310">310</a>         <strong class="jxr_keyword">this</strong>.email.setFrom(<strong class="jxr_keyword">this</strong>.strTestMailFrom);
-<a class="jxr_linenumber" name="L311" href="#L311">311</a>         <strong class="jxr_keyword">this</strong>.email.addTo(<strong class="jxr_keyword">this</strong>.strTestMailTo);
+<a class="jxr_linenumber" name="L272" href="#L272">272</a>         <em class="jxr_comment">// does embedding the same datasource under the same name return</em>
+<a class="jxr_linenumber" name="L273" href="#L273">273</a>         <em class="jxr_comment">// the original cid?</em>
+<a class="jxr_linenumber" name="L274" href="#L274">274</a>         <strong class="jxr_keyword">final</strong> String sameCid = <strong class="jxr_keyword">this</strong>.email.embed(dataSource, <span class="jxr_string">"testname"</span>);
+<a class="jxr_linenumber" name="L275" href="#L275">275</a>         assertEquals(<span class="jxr_string">"didn't get same CID for embedding same datasource twice"</span>,
+<a class="jxr_linenumber" name="L276" href="#L276">276</a>                 cid, sameCid);
+<a class="jxr_linenumber" name="L277" href="#L277">277</a> 
+<a class="jxr_linenumber" name="L278" href="#L278">278</a>         <em class="jxr_comment">// does embedding another datasource under the same name fail?</em>
+<a class="jxr_linenumber" name="L279" href="#L279">279</a>         <strong class="jxr_keyword">final</strong> File anotherFile = File.createTempFile(<span class="jxr_string">"testEmbedDataSource2"</span>, <span class="jxr_string">"txt"</span>);
+<a class="jxr_linenumber" name="L280" href="#L280">280</a>         anotherFile.deleteOnExit();
+<a class="jxr_linenumber" name="L281" href="#L281">281</a>         <strong class="jxr_keyword">final</strong> FileDataSource anotherDS = <strong class="jxr_keyword">new</strong> FileDataSource(anotherFile);
+<a class="jxr_linenumber" name="L282" href="#L282">282</a>         <strong class="jxr_keyword">try</strong>
+<a class="jxr_linenumber" name="L283" href="#L283">283</a>         {
+<a class="jxr_linenumber" name="L284" href="#L284">284</a>             <strong class="jxr_keyword">this</strong>.email.embed(anotherDS, <span class="jxr_string">"testname"</span>);
+<a class="jxr_linenumber" name="L285" href="#L285">285</a>         }
+<a class="jxr_linenumber" name="L286" href="#L286">286</a>         <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> EmailException e)
+<a class="jxr_linenumber" name="L287" href="#L287">287</a>         {
+<a class="jxr_linenumber" name="L288" href="#L288">288</a>             <em class="jxr_comment">// expected</em>
+<a class="jxr_linenumber" name="L289" href="#L289">289</a>         }
+<a class="jxr_linenumber" name="L290" href="#L290">290</a>     }
+<a class="jxr_linenumber" name="L291" href="#L291">291</a> 
+<a class="jxr_linenumber" name="L292" href="#L292">292</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L293" href="#L293">293</a> <em class="jxr_javadoccomment">     * @throws EmailException when bad addresses and attachments are used</em>
+<a class="jxr_linenumber" name="L294" href="#L294">294</a> <em class="jxr_javadoccomment">     * @throws IOException if creating a temp file, URL or sending fails</em>
+<a class="jxr_linenumber" name="L295" href="#L295">295</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L296" href="#L296">296</a>     @Test
+<a class="jxr_linenumber" name="L297" href="#L297">297</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testSend() <strong class="jxr_keyword">throws</strong> EmailException, IOException
+<a class="jxr_linenumber" name="L298" href="#L298">298</a>     {
+<a class="jxr_linenumber" name="L299" href="#L299">299</a>         <strong class="jxr_keyword">final</strong> EmailAttachment attachment = <strong class="jxr_keyword">new</strong> EmailAttachment();
+<a class="jxr_linenumber" name="L300" href="#L300">300</a>         File testFile = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L301" href="#L301">301</a> 
+<a class="jxr_linenumber" name="L302" href="#L302">302</a>         <em class="jxr_javadoccomment">/** File to used to test file attachments (Must be valid) */</em>
+<a class="jxr_linenumber" name="L303" href="#L303">303</a>         testFile = File.createTempFile(<span class="jxr_string">"commons-email-testfile"</span>, <span class="jxr_string">".txt"</span>);
+<a class="jxr_linenumber" name="L304" href="#L304">304</a>         testFile.deleteOnExit();
+<a class="jxr_linenumber" name="L305" href="#L305">305</a> 
+<a class="jxr_linenumber" name="L306" href="#L306">306</a>         <em class="jxr_comment">// ====================================================================</em>
+<a class="jxr_linenumber" name="L307" href="#L307">307</a>         <em class="jxr_comment">// Test Success</em>
+<a class="jxr_linenumber" name="L308" href="#L308">308</a>         <em class="jxr_comment">// ====================================================================</em>
+<a class="jxr_linenumber" name="L309" href="#L309">309</a>         <strong class="jxr_keyword">this</strong>.getMailServer();
+<a class="jxr_linenumber" name="L310" href="#L310">310</a> 
+<a class="jxr_linenumber" name="L311" href="#L311">311</a>         String strSubject = <span class="jxr_string">"Test HTML Send #1 Subject (w charset)"</span>;
 <a class="jxr_linenumber" name="L312" href="#L312">312</a> 
-<a class="jxr_linenumber" name="L313" href="#L313">313</a>         <em class="jxr_javadoccomment">/** File to used to test file attachmetns (Must be valid) */</em>
-<a class="jxr_linenumber" name="L314" href="#L314">314</a>         attachment.setName(<span class="jxr_string">"Test Attachment"</span>);
-<a class="jxr_linenumber" name="L315" href="#L315">315</a>         attachment.setDescription(<span class="jxr_string">"Test Attachment Desc"</span>);
-<a class="jxr_linenumber" name="L316" href="#L316">316</a>         attachment.setPath(testFile.getAbsolutePath());
-<a class="jxr_linenumber" name="L317" href="#L317">317</a>         <strong class="jxr_keyword">this</strong>.email.attach(attachment);
+<a class="jxr_linenumber" name="L313" href="#L313">313</a>         <strong class="jxr_keyword">this</strong>.email = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/mail/mocks/MockHtmlEmailConcrete.html">MockHtmlEmailConcrete</a>();
+<a class="jxr_linenumber" name="L314" href="#L314">314</a>         <strong class="jxr_keyword">this</strong>.email.setHostName(<strong class="jxr_keyword">this</strong>.strTestMailServer);
+<a class="jxr_linenumber" name="L315" href="#L315">315</a>         <strong class="jxr_keyword">this</strong>.email.setSmtpPort(<strong class="jxr_keyword">this</strong>.getMailServerPort());
+<a class="jxr_linenumber" name="L316" href="#L316">316</a>         <strong class="jxr_keyword">this</strong>.email.setFrom(<strong class="jxr_keyword">this</strong>.strTestMailFrom);
+<a class="jxr_linenumber" name="L317" href="#L317">317</a>         <strong class="jxr_keyword">this</strong>.email.addTo(<strong class="jxr_keyword">this</strong>.strTestMailTo);
 <a class="jxr_linenumber" name="L318" href="#L318">318</a> 
-<a class="jxr_linenumber" name="L319" href="#L319">319</a>         <strong class="jxr_keyword">this</strong>.email.setAuthentication(<strong class="jxr_keyword">this</strong>.strTestUser, <strong class="jxr_keyword">this</strong>.strTestPasswd);
-<a class="jxr_linenumber" name="L320" href="#L320">320</a> 
-<a class="jxr_linenumber" name="L321" href="#L321">321</a>         <strong class="jxr_keyword">this</strong>.email.setCharset(EmailConstants.ISO_8859_1);
-<a class="jxr_linenumber" name="L322" href="#L322">322</a>         <strong class="jxr_keyword">this</strong>.email.setSubject(strSubject);
-<a class="jxr_linenumber" name="L323" href="#L323">323</a> 
-<a class="jxr_linenumber" name="L324" href="#L324">324</a>         <strong class="jxr_keyword">final</strong> URL url = <strong class="jxr_keyword">new</strong> URL(EmailConfiguration.TEST_URL);
-<a class="jxr_linenumber" name="L325" href="#L325">325</a>         <strong class="jxr_keyword">final</strong> String cid = <strong class="jxr_keyword">this</strong>.email.embed(url, <span class="jxr_string">"Apache Logo"</span>);
+<a class="jxr_linenumber" name="L319" href="#L319">319</a>         <em class="jxr_javadoccomment">/** File to used to test file attachmetns (Must be valid) */</em>
+<a class="jxr_linenumber" name="L320" href="#L320">320</a>         attachment.setName(<span class="jxr_string">"Test Attachment"</span>);
+<a class="jxr_linenumber" name="L321" href="#L321">321</a>         attachment.setDescription(<span class="jxr_string">"Test Attachment Desc"</span>);
+<a class="jxr_linenumber" name="L322" href="#L322">322</a>         attachment.setPath(testFile.getAbsolutePath());
+<a class="jxr_linenumber" name="L323" href="#L323">323</a>         <strong class="jxr_keyword">this</strong>.email.attach(attachment);
+<a class="jxr_linenumber" name="L324" href="#L324">324</a> 
+<a class="jxr_linenumber" name="L325" href="#L325">325</a>         <em class="jxr_comment">//this.email.setAuthentication(this.strTestUser, this.strTestPasswd);</em>
 <a class="jxr_linenumber" name="L326" href="#L326">326</a> 
-<a class="jxr_linenumber" name="L327" href="#L327">327</a>         <strong class="jxr_keyword">final</strong> String strHtmlMsg =
-<a class="jxr_linenumber" name="L328" href="#L328">328</a>             <span class="jxr_string">"&lt;html&gt;The Apache logo - &lt;img src=\&quot;cid:"</span> + cid + <span class="jxr_string">"\&quot;&gt;&lt;html&gt;"</span>;
+<a class="jxr_linenumber" name="L327" href="#L327">327</a>         <strong class="jxr_keyword">this</strong>.email.setCharset(EmailConstants.ISO_8859_1);
+<a class="jxr_linenumber" name="L328" href="#L328">328</a>         <strong class="jxr_keyword">this</strong>.email.setSubject(strSubject);
 <a class="jxr_linenumber" name="L329" href="#L329">329</a> 
-<a class="jxr_linenumber" name="L330" href="#L330">330</a>         <strong class="jxr_keyword">this</strong>.email.setHtmlMsg(strHtmlMsg);
-<a class="jxr_linenumber" name="L331" href="#L331">331</a>         <strong class="jxr_keyword">this</strong>.email.setTextMsg(
-<a class="jxr_linenumber" name="L332" href="#L332">332</a>             <span class="jxr_string">"Your email client does not support HTML emails"</span>);
-<a class="jxr_linenumber" name="L333" href="#L333">333</a> 
-<a class="jxr_linenumber" name="L334" href="#L334">334</a>         <strong class="jxr_keyword">this</strong>.email.send();
-<a class="jxr_linenumber" name="L335" href="#L335">335</a>         <strong class="jxr_keyword">this</strong>.fakeMailServer.stop();
-<a class="jxr_linenumber" name="L336" href="#L336">336</a>         <em class="jxr_comment">// validate txt message</em>
-<a class="jxr_linenumber" name="L337" href="#L337">337</a>         validateSend(
-<a class="jxr_linenumber" name="L338" href="#L338">338</a>             <strong class="jxr_keyword">this</strong>.fakeMailServer,
-<a class="jxr_linenumber" name="L339" href="#L339">339</a>             strSubject,
-<a class="jxr_linenumber" name="L340" href="#L340">340</a>             <strong class="jxr_keyword">this</strong>.email.getTextMsg(),
-<a class="jxr_linenumber" name="L341" href="#L341">341</a>             <strong class="jxr_keyword">this</strong>.email.getFromAddress(),
-<a class="jxr_linenumber" name="L342" href="#L342">342</a>             <strong class="jxr_keyword">this</strong>.email.getToAddresses(),
-<a class="jxr_linenumber" name="L343" href="#L343">343</a>             <strong class="jxr_keyword">this</strong>.email.getCcAddresses(),
-<a class="jxr_linenumber" name="L344" href="#L344">344</a>             <strong class="jxr_keyword">this</strong>.email.getBccAddresses(),
-<a class="jxr_linenumber" name="L345" href="#L345">345</a>             <strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="L346" href="#L346">346</a> 
-<a class="jxr_linenumber" name="L347" href="#L347">347</a>         <em class="jxr_comment">// validate html message</em>
-<a class="jxr_linenumber" name="L348" href="#L348">348</a>         validateSend(
-<a class="jxr_linenumber" name="L349" href="#L349">349</a>             <strong class="jxr_keyword">this</strong>.fakeMailServer,
-<a class="jxr_linenumber" name="L350" href="#L350">350</a>             strSubject,
-<a class="jxr_linenumber" name="L351" href="#L351">351</a>             <strong class="jxr_keyword">this</strong>.email.getHtmlMsg(),
-<a class="jxr_linenumber" name="L352" href="#L352">352</a>             <strong class="jxr_keyword">this</strong>.email.getFromAddress(),
-<a class="jxr_linenumber" name="L353" href="#L353">353</a>             <strong class="jxr_keyword">this</strong>.email.getToAddresses(),
-<a class="jxr_linenumber" name="L354" href="#L354">354</a>             <strong class="jxr_keyword">this</strong>.email.getCcAddresses(),
-<a class="jxr_linenumber" name="L355" href="#L355">355</a>             <strong class="jxr_keyword">this</strong>.email.getBccAddresses(),
-<a class="jxr_linenumber" name="L356" href="#L356">356</a>             false);
-<a class="jxr_linenumber" name="L357" href="#L357">357</a> 
-<a class="jxr_linenumber" name="L358" href="#L358">358</a>         <em class="jxr_comment">// validate attachment</em>
-<a class="jxr_linenumber" name="L359" href="#L359">359</a>         validateSend(
-<a class="jxr_linenumber" name="L360" href="#L360">360</a>             <strong class="jxr_keyword">this</strong>.fakeMailServer,
-<a class="jxr_linenumber" name="L361" href="#L361">361</a>             strSubject,
-<a class="jxr_linenumber" name="L362" href="#L362">362</a>             attachment.getName(),
-<a class="jxr_linenumber" name="L363" href="#L363">363</a>             <strong class="jxr_keyword">this</strong>.email.getFromAddress(),
-<a class="jxr_linenumber" name="L364" href="#L364">364</a>             <strong class="jxr_keyword">this</strong>.email.getToAddresses(),
-<a class="jxr_linenumber" name="L365" href="#L365">365</a>             <strong class="jxr_keyword">this</strong>.email.getCcAddresses(),
-<a class="jxr_linenumber" name="L366" href="#L366">366</a>             <strong class="jxr_keyword">this</strong>.email.getBccAddresses(),
-<a class="jxr_linenumber" name="L367" href="#L367">367</a>             false);
-<a class="jxr_linenumber" name="L368" href="#L368">368</a> 
-<a class="jxr_linenumber" name="L369" href="#L369">369</a>         <strong class="jxr_keyword">this</strong>.getMailServer();
-<a class="jxr_linenumber" name="L370" href="#L370">370</a> 
-<a class="jxr_linenumber" name="L371" href="#L371">371</a>         <strong class="jxr_keyword">this</strong>.email = <strong class="jxr_keyword">new</strong> <a href="../../../../org/apache/commons/mail/mocks/MockHtmlEmailConcrete.html">MockHtmlEmailConcrete</a>();
-<a class="jxr_linenumber" name="L372" href="#L372">372</a>         <strong class="jxr_keyword">this</strong>.email.setHostName(<strong class="jxr_keyword">this</strong>.strTestMailServer);
-<a class="jxr_linenumber" name="L373" href="#L373">373</a>         <strong class="jxr_keyword">this</strong>.email.setSmtpPort(<strong class="jxr_keyword">this</strong>.getMailServerPort());
-<a class="jxr_linenumber" name="L374" href="#L374">374</a>         <strong class="jxr_keyword">this</strong>.email.setFrom(<strong class="jxr_keyword">this</strong>.strTestMailFrom);
-<a class="jxr_linenumber" name="L375" href="#L375">375</a>         <strong class="jxr_keyword">this</strong>.email.addTo(<strong class="jxr_keyword">this</strong>.strTestMailTo);
+<a class="jxr_linenumber" name="L330" href="#L330">330</a>         <strong class="jxr_keyword">final</strong> URL url = <strong class="jxr_keyword">new</strong> URL(EmailConfiguration.TEST_URL);
+<a class="jxr_linenumber" name="L331" href="#L331">331</a>         <strong class="jxr_keyword">final</strong> String cid = <strong class="jxr_keyword">this</strong>.email.embed(url, <span class="jxr_string">"Apache Logo"</span>);
+<a class="jxr_linenumber" name="L332" href="#L332">332</a> 
+<a class="jxr_linenumber" name="L333" href="#L333">333</a>         <strong class="jxr_keyword">final</strong> String strHtmlMsg =
+<a class="jxr_linenumber" name="L334" href="#L334">334</a>             <span class="jxr_string">"&lt;html&gt;The Apache logo - &lt;img src=\&quot;cid:"</span> + cid + <span class="jxr_string">"\&quot;&gt;&lt;html&gt;"</span>;
+<a class="jxr_linenumber" name="L335" href="#L335">335</a> 
+<a class="jxr_linenumber" name="L336" href="#L336">336</a>         <strong class="jxr_keyword">this</strong>.email.setHtmlMsg(strHtmlMsg);
+<a class="jxr_linenumber" name="L337" href="#L337">337</a>         <strong class="jxr_keyword">this</strong>.email.setTextMsg(
+<a class="jxr_linenumber" name="L338" href="#L338">338</a>             <span class="jxr_string">"Your email client does not support HTML emails"</span>);
+<a class="jxr_linenumber" name="L339" href="#L339">339</a> 
+<a class="jxr_linenumber" name="L340" href="#L340">340</a>         <strong class="jxr_keyword">this</strong>.email.send();
+<a class="jxr_linenumber" name="L341" href="#L341">341</a>         <strong class="jxr_keyword">this</strong>.fakeMailServer.stop();
+<a class="jxr_linenumber" name="L342" href="#L342">342</a>         <em class="jxr_comment">// validate txt message</em>
+<a class="jxr_linenumber" name="L343" href="#L343">343</a>         validateSend(
+<a class="jxr_linenumber" name="L344" href="#L344">344</a>             <strong class="jxr_keyword">this</strong>.fakeMailServer,
+<a class="jxr_linenumber" name="L345" href="#L345">345</a>             strSubject,
+<a class="jxr_linenumber" name="L346" href="#L346">346</a>             <strong class="jxr_keyword">this</strong>.email.getTextMsg(),
+<a class="jxr_linenumber" name="L347" href="#L347">347</a>             <strong class="jxr_keyword">this</strong>.email.getFromAddress(),
+<a class="jxr_linenumber" name="L348" href="#L348">348</a>             <strong class="jxr_keyword">this</strong>.email.getToAddresses(),
+<a class="jxr_linenumber" name="L349" href="#L349">349</a>             <strong class="jxr_keyword">this</strong>.email.getCcAddresses(),
+<a class="jxr_linenumber" name="L350" href="#L350">350</a>             <strong class="jxr_keyword">this</strong>.email.getBccAddresses(),
+<a class="jxr_linenumber" name="L351" href="#L351">351</a>             <strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="L352" href="#L352">352</a> 
+<a class="jxr_linenumber" name="L353" href="#L353">353</a>         <em class="jxr_comment">// validate html message</em>
+<a class="jxr_linenumber" name="L354" href="#L354">354</a>         validateSend(
+<a class="jxr_linenumber" name="L355" href="#L355">355</a>             <strong class="jxr_keyword">this</strong>.fakeMailServer,
+<a class="jxr_linenumber" name="L356" href="#L356">356</a>             strSubject,
+<a class="jxr_linenumber" name="L357" href="#L357">357</a>             <strong class="jxr_keyword">this</strong>.email.getHtmlMsg(),
+<a class="jxr_linenumber" name="L358" href="#L358">358</a>             <strong class="jxr_keyword">this</strong>.email.getFromAddress(),
+<a class="jxr_linenumber" name="L359" href="#L359">359</a>             <strong class="jxr_keyword">this</strong>.email.getToAddresses(),
+<a class="jxr_linenumber" name="L360" href="#L360">360</a>             <strong class="jxr_keyword">this</strong>.email.getCcAddresses(),
+<a class="jxr_linenumber" name="L361" href="#L361">361</a>             <strong class="jxr_keyword">this</strong>.email.getBccAddresses(),
+<a class="jxr_linenumber" name="L362" href="#L362">362</a>             false);
+<a class="jxr_linenumber" name="L363" href="#L363">363</a> 
+<a class="jxr_linenumber" name="L364" href="#L364">364</a>         <em class="jxr_comment">// validate attachment</em>
+<a class="jxr_linenumber" name="L365" href="#L365">365</a>         validateSend(
+<a class="jxr_linenumber" name="L366" href="#L366">366</a>             <strong class="jxr_keyword">this</strong>.fakeMailServer,
+<a class="jxr_linenumber" name="L367" href="#L367">367</a>             strSubject,
+<a class="jxr_linenumber" name="L368" href="#L368">368</a>             attachment.getName(),
+<a class="jxr_linenumber" name="L369" href="#L369">369</a>             <strong class="jxr_keyword">this</strong>.email.getFromAddress(),
+<a class="jxr_linenumber" name="L370" href="#L370">370</a>             <strong class="jxr_keyword">this</strong>.email.getToAddresses(),
+<a class="jxr_linenumber" name="L371" href="#L371">371</a>             <strong class="jxr_keyword">this</strong>.email.getCcAddresses(),
+<a class="jxr_linenumber" name="L372" href="#L372">372</a>             <strong class="jxr_keyword">this</strong>.email.getBccAddresses(),
+<a class="jxr_linenumber" name="L373" href="#L373">373</a>             false);
+<a class="jxr_linenumber" name="L374" href="#L374">374</a> 
+<a class="jxr_linenumber" name="L375" href="#L375">375</a>         <strong class="jxr_keyword">this</strong>.getMailServer();
 <a class="jxr_linenumber" name="L376" href="#L376">376</a> 
-<a class="jxr_linenumber" name="L377" href="#L377">377</a>         <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">this</strong>.strTestUser != <strong class="jxr_keyword">null</strong> &amp;&amp; <strong class="jxr_keyword">this</strong>.strTestPasswd != <strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L378" href="#L378">378</a>         {
-<a class="jxr_linenumber" name="L379" href="#L379">379</a>             <strong class="jxr_keyword">this</strong>.email.setAuthentication(
-<a class="jxr_linenumber" name="L380" href="#L380">380</a>                 <strong class="jxr_keyword">this</strong>.strTestUser,

[... 744 lines stripped ...]


Mime
View raw message