commons-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brit...@apache.org
Subject svn commit: r991782 [40/46] - in /websites/production/commons/content/proper/commons-fileupload: ./ apidocs/ apidocs/org/apache/commons/fileupload/ apidocs/org/apache/commons/fileupload/class-use/ apidocs/org/apache/commons/fileupload/disk/ apidocs/org...
Date Fri, 01 Jul 2016 05:48:38 GMT
Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/DiskFileItemSerializeTest.html
==============================================================================
--- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/DiskFileItemSerializeTest.html (original)
+++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/DiskFileItemSerializeTest.html Fri Jul  1 05:48:35 2016
@@ -39,259 +39,266 @@
 <a class="jxr_linenumber" name="L31" href="#L31">31</a>  <strong class="jxr_keyword">import</strong> java.io.OutputStream;
 <a class="jxr_linenumber" name="L32" href="#L32">32</a>  
 <a class="jxr_linenumber" name="L33" href="#L33">33</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.fileupload.disk.DiskFileItemFactory;
-<a class="jxr_linenumber" name="L34" href="#L34">34</a>  <strong class="jxr_keyword">import</strong> org.junit.Test;
-<a class="jxr_linenumber" name="L35" href="#L35">35</a>  
-<a class="jxr_linenumber" name="L36" href="#L36">36</a>  <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>  <em class="jxr_javadoccomment"> * Serialization Unit tests for</em>
-<a class="jxr_linenumber" name="L38" href="#L38">38</a>  <em class="jxr_javadoccomment"> *  {@link org.apache.commons.fileupload.disk.DiskFileItem}.</em>
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L40" href="#L40">40</a>  <em class="jxr_javadoccomment"> * @version $Id: DiskFileItemSerializeTest.java 1507048 2013-07-25 16:16:15Z markt $</em>
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>  <em class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/commons/fileupload/DiskFileItemSerializeTest.html">DiskFileItemSerializeTest</a> {
-<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">     * Content type for regular form items.</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>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String textContentType = <span class="jxr_string">"text/plain"</span>;
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>  
-<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>  <em class="jxr_javadoccomment">     * Very low threshold for testing memory versus disk options.</em>
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>  <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> threshold = 16;
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>  
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>      <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>  <em class="jxr_javadoccomment">     * Helper method to test creation of a field when a repository is used.</em>
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>  <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testInMemoryObject(byte[] testFieldValueBytes, File repository) {
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>          FileItem item = createFileItem(testFieldValueBytes, repository);
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.io.FileUtils;
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>  <strong class="jxr_keyword">import</strong> org.apache.commons.io.IOUtils;
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>  <strong class="jxr_keyword">import</strong> org.junit.After;
+<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.Test;
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  
+<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"> * Serialization Unit tests for</em>
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <em class="jxr_javadoccomment"> *  {@link org.apache.commons.fileupload.disk.DiskFileItem}.</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>  <em class="jxr_javadoccomment"> * @version $Id: DiskFileItemSerializeTest.java 1748498 2016-06-15 06:16:31Z jochen $</em>
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>  <em class="jxr_javadoccomment"> */</em>
+<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/fileupload/DiskFileItemSerializeTest.html">DiskFileItemSerializeTest</a> {
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>  
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>      <em class="jxr_comment">// Use a private repo to catch any files left over by tests</em>
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> File REPO = <strong class="jxr_keyword">new</strong> File(System.getProperty(<span class="jxr_string">"java.io.tmpdir"</span>), <span class="jxr_string">"diskfileitemrepo"</span>);
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>  
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>      @Before
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setUp() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>          <strong class="jxr_keyword">if</strong> (REPO.exists()) {
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>              FileUtils.deleteDirectory(REPO);
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>          }
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>          assertFalse(<span class="jxr_string">"Must not exist"</span>, REPO.exists());
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>          REPO.mkdir();
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>      }
 <a class="jxr_linenumber" name="L59" href="#L59">59</a>  
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>          <em class="jxr_comment">// Check state is as expected</em>
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>          assertTrue(<span class="jxr_string">"Initial: in memory"</span>, item.isInMemory());
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>          assertEquals(<span class="jxr_string">"Initial: size"</span>, item.getSize(), testFieldValueBytes.length);
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>          compareBytes(<span class="jxr_string">"Initial"</span>, item.get(), testFieldValueBytes);
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>  
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>          <em class="jxr_comment">// Serialize &amp; Deserialize</em>
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>          FileItem newItem = (FileItem)serializeDeserialize(item);
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>  
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>          <em class="jxr_comment">// Test deserialized content is as expected</em>
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>          assertTrue(<span class="jxr_string">"Check in memory"</span>, newItem.isInMemory());
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>          compareBytes(<span class="jxr_string">"Check"</span>, testFieldValueBytes, newItem.get());
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>  
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>          <em class="jxr_comment">// Compare FileItem's (except byte[])</em>
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>          compareFileItems(item, newItem);
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>      }
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>      
-<a class="jxr_linenumber" name="L76" href="#L76">76</a>      <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>  <em class="jxr_javadoccomment">     * Helper method to test creation of a field.</em>
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>  <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> testInMemoryObject(byte[] testFieldValueBytes) {
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>          testInMemoryObject(testFieldValueBytes, <strong class="jxr_keyword">null</strong>);
-<a class="jxr_linenumber" name="L81" href="#L81">81</a>      }
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>      
-<a class="jxr_linenumber" name="L83" href="#L83">83</a>      <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>  <em class="jxr_javadoccomment">     * Test creation of a field for which the amount of data falls below the</em>
-<a class="jxr_linenumber" name="L85" href="#L85">85</a>  <em class="jxr_javadoccomment">     * configured threshold.</em>
-<a class="jxr_linenumber" name="L86" href="#L86">86</a>  <em class="jxr_javadoccomment">     */</em>
-<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> testBelowThreshold() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L89" href="#L89">89</a>          <em class="jxr_comment">// Create the FileItem</em>
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>          byte[] testFieldValueBytes = createContentBytes(threshold - 1);
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>          testInMemoryObject(testFieldValueBytes);
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>      }
-<a class="jxr_linenumber" name="L93" href="#L93">93</a>  
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>      <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L95" href="#L95">95</a>  <em class="jxr_javadoccomment">     * Test creation of a field for which the amount of data equals the</em>
-<a class="jxr_linenumber" name="L96" href="#L96">96</a>  <em class="jxr_javadoccomment">     * configured threshold.</em>
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>  <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L98" href="#L98">98</a>      @Test
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testThreshold() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L100" href="#L100">100</a>         <em class="jxr_comment">// Create the FileItem</em>
-<a class="jxr_linenumber" name="L101" href="#L101">101</a>         byte[] testFieldValueBytes = createContentBytes(threshold);
-<a class="jxr_linenumber" name="L102" href="#L102">102</a>         testInMemoryObject(testFieldValueBytes);
-<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_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> <em class="jxr_javadoccomment">     * Test creation of a field for which the amount of data falls above the</em>
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> <em class="jxr_javadoccomment">     * configured threshold.</em>
-<a class="jxr_linenumber" name="L108" href="#L108">108</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L109" href="#L109">109</a>     @Test
-<a class="jxr_linenumber" name="L110" href="#L110">110</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testAboveThreshold() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L111" href="#L111">111</a>         <em class="jxr_comment">// Create the FileItem</em>
-<a class="jxr_linenumber" name="L112" href="#L112">112</a>         byte[] testFieldValueBytes = createContentBytes(threshold + 1);
-<a class="jxr_linenumber" name="L113" href="#L113">113</a>         FileItem item = createFileItem(testFieldValueBytes);
-<a class="jxr_linenumber" name="L114" href="#L114">114</a> 
-<a class="jxr_linenumber" name="L115" href="#L115">115</a>         <em class="jxr_comment">// Check state is as expected</em>
-<a class="jxr_linenumber" name="L116" href="#L116">116</a>         assertFalse(<span class="jxr_string">"Initial: in memory"</span>, item.isInMemory());
-<a class="jxr_linenumber" name="L117" href="#L117">117</a>         assertEquals(<span class="jxr_string">"Initial: size"</span>, item.getSize(), testFieldValueBytes.length);
-<a class="jxr_linenumber" name="L118" href="#L118">118</a>         compareBytes(<span class="jxr_string">"Initial"</span>, item.get(), testFieldValueBytes);
-<a class="jxr_linenumber" name="L119" href="#L119">119</a> 
-<a class="jxr_linenumber" name="L120" href="#L120">120</a>         <em class="jxr_comment">// Serialize &amp; Deserialize</em>
-<a class="jxr_linenumber" name="L121" href="#L121">121</a>         FileItem newItem = (FileItem)serializeDeserialize(item);
-<a class="jxr_linenumber" name="L122" href="#L122">122</a> 
-<a class="jxr_linenumber" name="L123" href="#L123">123</a>         <em class="jxr_comment">// Test deserialized content is as expected</em>
-<a class="jxr_linenumber" name="L124" href="#L124">124</a>         assertFalse(<span class="jxr_string">"Check in memory"</span>, newItem.isInMemory());
-<a class="jxr_linenumber" name="L125" href="#L125">125</a>         compareBytes(<span class="jxr_string">"Check"</span>, testFieldValueBytes, newItem.get());
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> 
-<a class="jxr_linenumber" name="L127" href="#L127">127</a>         <em class="jxr_comment">// Compare FileItem's (except byte[])</em>
-<a class="jxr_linenumber" name="L128" href="#L128">128</a>         compareFileItems(item, newItem);
-<a class="jxr_linenumber" name="L129" href="#L129">129</a>     }
-<a class="jxr_linenumber" name="L130" href="#L130">130</a>     
-<a class="jxr_linenumber" name="L131" href="#L131">131</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> <em class="jxr_javadoccomment">     * Test serialization and deserialization when repository is not null.</em>
-<a class="jxr_linenumber" name="L133" href="#L133">133</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L134" href="#L134">134</a>     @Test
-<a class="jxr_linenumber" name="L135" href="#L135">135</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testValidRepository() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L136" href="#L136">136</a>         <em class="jxr_comment">// Create the FileItem</em>
-<a class="jxr_linenumber" name="L137" href="#L137">137</a>         byte[] testFieldValueBytes = createContentBytes(threshold);
-<a class="jxr_linenumber" name="L138" href="#L138">138</a>         File repository = <strong class="jxr_keyword">new</strong> File(System.getProperty(<span class="jxr_string">"java.io.tmpdir"</span>));
-<a class="jxr_linenumber" name="L139" href="#L139">139</a>         testInMemoryObject(testFieldValueBytes, repository);
-<a class="jxr_linenumber" name="L140" href="#L140">140</a>     }
-<a class="jxr_linenumber" name="L141" href="#L141">141</a>     
-<a class="jxr_linenumber" name="L142" href="#L142">142</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> <em class="jxr_javadoccomment">     * Test deserialization fails when repository is not valid.</em>
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L145" href="#L145">145</a>     @Test(expected=IOException.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L146" href="#L146">146</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testInvalidRepository() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L147" href="#L147">147</a>         <em class="jxr_comment">// Create the FileItem</em>
-<a class="jxr_linenumber" name="L148" href="#L148">148</a>         byte[] testFieldValueBytes = createContentBytes(threshold);
-<a class="jxr_linenumber" name="L149" href="#L149">149</a>         File repository = <strong class="jxr_keyword">new</strong> File(System.getProperty(<span class="jxr_string">"java.io.tmpdir"</span>) + <span class="jxr_string">"file"</span>);
-<a class="jxr_linenumber" name="L150" href="#L150">150</a>         FileItem item = createFileItem(testFieldValueBytes, repository);
-<a class="jxr_linenumber" name="L151" href="#L151">151</a>         deserialize(serialize(item));
-<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>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> <em class="jxr_javadoccomment">     * Test deserialization fails when repository contains a null character.</em>
-<a class="jxr_linenumber" name="L156" href="#L156">156</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L157" href="#L157">157</a>     @Test(expected=IOException.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L158" href="#L158">158</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testInvalidRepositoryWithNullChar() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L159" href="#L159">159</a>         <em class="jxr_comment">// Create the FileItem</em>
-<a class="jxr_linenumber" name="L160" href="#L160">160</a>         byte[] testFieldValueBytes = createContentBytes(threshold);
-<a class="jxr_linenumber" name="L161" href="#L161">161</a>         File repository = <strong class="jxr_keyword">new</strong> File(System.getProperty(<span class="jxr_string">"java.io.tmpdir"</span>) + <span class="jxr_string">"\0"</span>);
-<a class="jxr_linenumber" name="L162" href="#L162">162</a>         FileItem item = createFileItem(testFieldValueBytes, repository);
-<a class="jxr_linenumber" name="L163" href="#L163">163</a>         deserialize(serialize(item));
-<a class="jxr_linenumber" name="L164" href="#L164">164</a>     }
-<a class="jxr_linenumber" name="L165" href="#L165">165</a> 
-<a class="jxr_linenumber" name="L166" href="#L166">166</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L167" href="#L167">167</a> <em class="jxr_javadoccomment">     * Compare FileItem's (except the byte[] content)</em>
-<a class="jxr_linenumber" name="L168" href="#L168">168</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L169" href="#L169">169</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> compareFileItems(FileItem origItem, FileItem newItem) {
-<a class="jxr_linenumber" name="L170" href="#L170">170</a>         assertTrue(<span class="jxr_string">"Compare: is in Memory"</span>,   origItem.isInMemory()   == newItem.isInMemory());
-<a class="jxr_linenumber" name="L171" href="#L171">171</a>         assertTrue(<span class="jxr_string">"Compare: is Form Field"</span>,  origItem.isFormField()  == newItem.isFormField());
-<a class="jxr_linenumber" name="L172" href="#L172">172</a>         assertEquals(<span class="jxr_string">"Compare: Field Name"</span>,   origItem.getFieldName(),   newItem.getFieldName());
-<a class="jxr_linenumber" name="L173" href="#L173">173</a>         assertEquals(<span class="jxr_string">"Compare: Content Type"</span>, origItem.getContentType(), newItem.getContentType());
-<a class="jxr_linenumber" name="L174" href="#L174">174</a>         assertEquals(<span class="jxr_string">"Compare: File Name"</span>,    origItem.getName(),        newItem.getName());
-<a class="jxr_linenumber" name="L175" href="#L175">175</a>     }
-<a class="jxr_linenumber" name="L176" href="#L176">176</a> 
-<a class="jxr_linenumber" name="L177" href="#L177">177</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L178" href="#L178">178</a> <em class="jxr_javadoccomment">     * Compare content bytes.</em>
-<a class="jxr_linenumber" name="L179" href="#L179">179</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L180" href="#L180">180</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> compareBytes(String text, byte[] origBytes, byte[] newBytes) {
-<a class="jxr_linenumber" name="L181" href="#L181">181</a>         assertNotNull(<span class="jxr_string">"origBytes must not be null"</span>, origBytes);
-<a class="jxr_linenumber" name="L182" href="#L182">182</a>         assertNotNull(<span class="jxr_string">"newBytes must not be null"</span>, newBytes);
-<a class="jxr_linenumber" name="L183" href="#L183">183</a>         assertEquals(text + <span class="jxr_string">" byte[] length"</span>, origBytes.length, newBytes.length);
-<a class="jxr_linenumber" name="L184" href="#L184">184</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i &lt; origBytes.length; i++) {
-<a class="jxr_linenumber" name="L185" href="#L185">185</a>             assertEquals(text + <span class="jxr_string">" byte["</span> + i + <span class="jxr_string">"]"</span>, origBytes[i], newBytes[i]);
-<a class="jxr_linenumber" name="L186" href="#L186">186</a>         }
-<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_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L190" href="#L190">190</a> <em class="jxr_javadoccomment">     * Create content bytes of a specified size.</em>
-<a class="jxr_linenumber" name="L191" href="#L191">191</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L192" href="#L192">192</a>     <strong class="jxr_keyword">private</strong> byte[] createContentBytes(<strong class="jxr_keyword">int</strong> size) {
-<a class="jxr_linenumber" name="L193" href="#L193">193</a>         StringBuilder buffer = <strong class="jxr_keyword">new</strong> StringBuilder(size);
-<a class="jxr_linenumber" name="L194" href="#L194">194</a>         byte count = 0;
-<a class="jxr_linenumber" name="L195" href="#L195">195</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i &lt; size; i++) {
-<a class="jxr_linenumber" name="L196" href="#L196">196</a>             buffer.append(count+<span class="jxr_string">""</span>);
-<a class="jxr_linenumber" name="L197" href="#L197">197</a>             count++;
-<a class="jxr_linenumber" name="L198" href="#L198">198</a>             <strong class="jxr_keyword">if</strong> (count &gt; 9) {
-<a class="jxr_linenumber" name="L199" href="#L199">199</a>                 count = 0;
-<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>         <strong class="jxr_keyword">return</strong> buffer.toString().getBytes();
-<a class="jxr_linenumber" name="L203" href="#L203">203</a>     }
-<a class="jxr_linenumber" name="L204" href="#L204">204</a> 
-<a class="jxr_linenumber" name="L205" href="#L205">205</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L206" href="#L206">206</a> <em class="jxr_javadoccomment">     * Create a FileItem with the specfied content bytes and repository.</em>
-<a class="jxr_linenumber" name="L207" href="#L207">207</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L208" href="#L208">208</a>     <strong class="jxr_keyword">private</strong> FileItem createFileItem(byte[] contentBytes, File repository) {
-<a class="jxr_linenumber" name="L209" href="#L209">209</a>         FileItemFactory factory = <strong class="jxr_keyword">new</strong> DiskFileItemFactory(threshold, repository);
-<a class="jxr_linenumber" name="L210" href="#L210">210</a>         String textFieldName = <span class="jxr_string">"textField"</span>;
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>      @After
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> tearDown() {
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>          <strong class="jxr_keyword">for</strong>(File file : FileUtils.listFiles(REPO, <strong class="jxr_keyword">null</strong>, <strong class="jxr_keyword">true</strong>)) {
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>              System.out.println(<span class="jxr_string">"Found leftover file "</span> + file);
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>          }
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>          REPO.delete();
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>          assertFalse(REPO + <span class="jxr_string">" is not empty"</span>, REPO.exists());
+<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_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>  <em class="jxr_javadoccomment">     * Content type for regular form items.</em>
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>  <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String textContentType = <span class="jxr_string">"text/plain"</span>;
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>  
+<a class="jxr_linenumber" name="L74" href="#L74">74</a>      <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>  <em class="jxr_javadoccomment">     * Very low threshold for testing memory versus disk options.</em>
+<a class="jxr_linenumber" name="L76" href="#L76">76</a>  <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">int</strong> threshold = 16;
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>  
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>      <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>  <em class="jxr_javadoccomment">     * Helper method to test creation of a field when a repository is used.</em>
+<a class="jxr_linenumber" name="L81" href="#L81">81</a>  <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testInMemoryObject(byte[] testFieldValueBytes, File repository) {
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>          FileItem item = createFileItem(testFieldValueBytes, repository);
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>  
+<a class="jxr_linenumber" name="L85" href="#L85">85</a>          <em class="jxr_comment">// Check state is as expected</em>
+<a class="jxr_linenumber" name="L86" href="#L86">86</a>          assertTrue(<span class="jxr_string">"Initial: in memory"</span>, item.isInMemory());
+<a class="jxr_linenumber" name="L87" href="#L87">87</a>          assertEquals(<span class="jxr_string">"Initial: size"</span>, item.getSize(), testFieldValueBytes.length);
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>          compareBytes(<span class="jxr_string">"Initial"</span>, item.get(), testFieldValueBytes);
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>          item.delete();
+<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>      <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>  <em class="jxr_javadoccomment">     * Helper method to test creation of a field.</em>
+<a class="jxr_linenumber" name="L94" href="#L94">94</a>  <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> testInMemoryObject(byte[] testFieldValueBytes) {
+<a class="jxr_linenumber" name="L96" href="#L96">96</a>          testInMemoryObject(testFieldValueBytes, REPO);
+<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_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L100" href="#L100">100</a> <em class="jxr_javadoccomment">     * Test creation of a field for which the amount of data falls below the</em>
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> <em class="jxr_javadoccomment">     * configured threshold.</em>
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L103" href="#L103">103</a>     @Test
+<a class="jxr_linenumber" name="L104" href="#L104">104</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testBelowThreshold() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L105" href="#L105">105</a>         <em class="jxr_comment">// Create the FileItem</em>
+<a class="jxr_linenumber" name="L106" href="#L106">106</a>         byte[] testFieldValueBytes = createContentBytes(threshold - 1);
+<a class="jxr_linenumber" name="L107" href="#L107">107</a>         testInMemoryObject(testFieldValueBytes);
+<a class="jxr_linenumber" name="L108" href="#L108">108</a>     }
+<a class="jxr_linenumber" name="L109" href="#L109">109</a> 
+<a class="jxr_linenumber" name="L110" href="#L110">110</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> <em class="jxr_javadoccomment">     * Test creation of a field for which the amount of data equals the</em>
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> <em class="jxr_javadoccomment">     * configured threshold.</em>
+<a class="jxr_linenumber" name="L113" href="#L113">113</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L114" href="#L114">114</a>     @Test
+<a class="jxr_linenumber" name="L115" href="#L115">115</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testThreshold() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L116" href="#L116">116</a>         <em class="jxr_comment">// Create the FileItem</em>
+<a class="jxr_linenumber" name="L117" href="#L117">117</a>         byte[] testFieldValueBytes = createContentBytes(threshold);
+<a class="jxr_linenumber" name="L118" href="#L118">118</a>         testInMemoryObject(testFieldValueBytes);
+<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>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> <em class="jxr_javadoccomment">     * Test creation of a field for which the amount of data falls above the</em>
+<a class="jxr_linenumber" name="L123" href="#L123">123</a> <em class="jxr_javadoccomment">     * configured threshold.</em>
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L125" href="#L125">125</a>     @Test
+<a class="jxr_linenumber" name="L126" href="#L126">126</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testAboveThreshold() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L127" href="#L127">127</a>         <em class="jxr_comment">// Create the FileItem</em>
+<a class="jxr_linenumber" name="L128" href="#L128">128</a>         byte[] testFieldValueBytes = createContentBytes(threshold + 1);
+<a class="jxr_linenumber" name="L129" href="#L129">129</a>         FileItem item = createFileItem(testFieldValueBytes);
+<a class="jxr_linenumber" name="L130" href="#L130">130</a> 
+<a class="jxr_linenumber" name="L131" href="#L131">131</a>         <em class="jxr_comment">// Check state is as expected</em>
+<a class="jxr_linenumber" name="L132" href="#L132">132</a>         assertFalse(<span class="jxr_string">"Initial: in memory"</span>, item.isInMemory());
+<a class="jxr_linenumber" name="L133" href="#L133">133</a>         assertEquals(<span class="jxr_string">"Initial: size"</span>, item.getSize(), testFieldValueBytes.length);
+<a class="jxr_linenumber" name="L134" href="#L134">134</a>         compareBytes(<span class="jxr_string">"Initial"</span>, item.get(), testFieldValueBytes);
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> 
+<a class="jxr_linenumber" name="L136" href="#L136">136</a>         item.delete();
+<a class="jxr_linenumber" name="L137" href="#L137">137</a>     }
+<a class="jxr_linenumber" name="L138" href="#L138">138</a>     
+<a class="jxr_linenumber" name="L139" href="#L139">139</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> <em class="jxr_javadoccomment">     * Test serialization and deserialization when repository is not null.</em>
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L142" href="#L142">142</a>     @Test
+<a class="jxr_linenumber" name="L143" href="#L143">143</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testValidRepository() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L144" href="#L144">144</a>         <em class="jxr_comment">// Create the FileItem</em>
+<a class="jxr_linenumber" name="L145" href="#L145">145</a>         byte[] testFieldValueBytes = createContentBytes(threshold);
+<a class="jxr_linenumber" name="L146" href="#L146">146</a>         testInMemoryObject(testFieldValueBytes, REPO);
+<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>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> <em class="jxr_javadoccomment">     * Test deserialization fails when repository is not valid.</em>
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L152" href="#L152">152</a>     @Test(expected=IOException.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L153" href="#L153">153</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testInvalidRepository() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L154" href="#L154">154</a>         <em class="jxr_comment">// Create the FileItem</em>
+<a class="jxr_linenumber" name="L155" href="#L155">155</a>         byte[] testFieldValueBytes = createContentBytes(threshold);
+<a class="jxr_linenumber" name="L156" href="#L156">156</a>         File repository = <strong class="jxr_keyword">new</strong> File(System.getProperty(<span class="jxr_string">"java.io.tmpdir"</span>), <span class="jxr_string">"file"</span>);
+<a class="jxr_linenumber" name="L157" href="#L157">157</a>         FileItem item = createFileItem(testFieldValueBytes, repository);
+<a class="jxr_linenumber" name="L158" href="#L158">158</a>         deserialize(serialize(item));
+<a class="jxr_linenumber" name="L159" href="#L159">159</a>     }
+<a class="jxr_linenumber" name="L160" href="#L160">160</a>     
+<a class="jxr_linenumber" name="L161" href="#L161">161</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> <em class="jxr_javadoccomment">     * Test deserialization fails when repository contains a null character.</em>
+<a class="jxr_linenumber" name="L163" href="#L163">163</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L164" href="#L164">164</a>     @Test(expected=IOException.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L165" href="#L165">165</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testInvalidRepositoryWithNullChar() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L166" href="#L166">166</a>         <em class="jxr_comment">// Create the FileItem</em>
+<a class="jxr_linenumber" name="L167" href="#L167">167</a>         byte[] testFieldValueBytes = createContentBytes(threshold);
+<a class="jxr_linenumber" name="L168" href="#L168">168</a>         File repository = <strong class="jxr_keyword">new</strong> File(System.getProperty(<span class="jxr_string">"java.io.tmpdir"</span>), <span class="jxr_string">"\0"</span>);
+<a class="jxr_linenumber" name="L169" href="#L169">169</a>         FileItem item = createFileItem(testFieldValueBytes, repository);
+<a class="jxr_linenumber" name="L170" href="#L170">170</a>         deserialize(serialize(item));
+<a class="jxr_linenumber" name="L171" href="#L171">171</a>     }
+<a class="jxr_linenumber" name="L172" href="#L172">172</a> 
+<a class="jxr_linenumber" name="L173" href="#L173">173</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> <em class="jxr_javadoccomment">     * Compare FileItem's (except the byte[] content)</em>
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L176" href="#L176">176</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> compareFileItems(FileItem origItem, FileItem newItem) {
+<a class="jxr_linenumber" name="L177" href="#L177">177</a>         assertTrue(<span class="jxr_string">"Compare: is in Memory"</span>,   origItem.isInMemory()   == newItem.isInMemory());
+<a class="jxr_linenumber" name="L178" href="#L178">178</a>         assertTrue(<span class="jxr_string">"Compare: is Form Field"</span>,  origItem.isFormField()  == newItem.isFormField());
+<a class="jxr_linenumber" name="L179" href="#L179">179</a>         assertEquals(<span class="jxr_string">"Compare: Field Name"</span>,   origItem.getFieldName(),   newItem.getFieldName());
+<a class="jxr_linenumber" name="L180" href="#L180">180</a>         assertEquals(<span class="jxr_string">"Compare: Content Type"</span>, origItem.getContentType(), newItem.getContentType());
+<a class="jxr_linenumber" name="L181" href="#L181">181</a>         assertEquals(<span class="jxr_string">"Compare: File Name"</span>,    origItem.getName(),        newItem.getName());
+<a class="jxr_linenumber" name="L182" href="#L182">182</a>     }
+<a class="jxr_linenumber" name="L183" href="#L183">183</a> 
+<a class="jxr_linenumber" name="L184" href="#L184">184</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> <em class="jxr_javadoccomment">     * Compare content bytes.</em>
+<a class="jxr_linenumber" name="L186" href="#L186">186</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L187" href="#L187">187</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> compareBytes(String text, byte[] origBytes, byte[] newBytes) {
+<a class="jxr_linenumber" name="L188" href="#L188">188</a>         assertNotNull(<span class="jxr_string">"origBytes must not be null"</span>, origBytes);
+<a class="jxr_linenumber" name="L189" href="#L189">189</a>         assertNotNull(<span class="jxr_string">"newBytes must not be null"</span>, newBytes);
+<a class="jxr_linenumber" name="L190" href="#L190">190</a>         assertEquals(text + <span class="jxr_string">" byte[] length"</span>, origBytes.length, newBytes.length);
+<a class="jxr_linenumber" name="L191" href="#L191">191</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i &lt; origBytes.length; i++) {
+<a class="jxr_linenumber" name="L192" href="#L192">192</a>             assertEquals(text + <span class="jxr_string">" byte["</span> + i + <span class="jxr_string">"]"</span>, origBytes[i], newBytes[i]);
+<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> 
+<a class="jxr_linenumber" name="L196" href="#L196">196</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L197" href="#L197">197</a> <em class="jxr_javadoccomment">     * Create content bytes of a specified size.</em>
+<a class="jxr_linenumber" name="L198" href="#L198">198</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L199" href="#L199">199</a>     <strong class="jxr_keyword">private</strong> byte[] createContentBytes(<strong class="jxr_keyword">int</strong> size) {
+<a class="jxr_linenumber" name="L200" href="#L200">200</a>         StringBuilder buffer = <strong class="jxr_keyword">new</strong> StringBuilder(size);
+<a class="jxr_linenumber" name="L201" href="#L201">201</a>         byte count = 0;
+<a class="jxr_linenumber" name="L202" href="#L202">202</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i &lt; size; i++) {
+<a class="jxr_linenumber" name="L203" href="#L203">203</a>             buffer.append(count+<span class="jxr_string">""</span>);
+<a class="jxr_linenumber" name="L204" href="#L204">204</a>             count++;
+<a class="jxr_linenumber" name="L205" href="#L205">205</a>             <strong class="jxr_keyword">if</strong> (count &gt; 9) {
+<a class="jxr_linenumber" name="L206" href="#L206">206</a>                 count = 0;
+<a class="jxr_linenumber" name="L207" href="#L207">207</a>             }
+<a class="jxr_linenumber" name="L208" href="#L208">208</a>         }
+<a class="jxr_linenumber" name="L209" href="#L209">209</a>         <strong class="jxr_keyword">return</strong> buffer.toString().getBytes();
+<a class="jxr_linenumber" name="L210" href="#L210">210</a>     }
 <a class="jxr_linenumber" name="L211" href="#L211">211</a> 
-<a class="jxr_linenumber" name="L212" href="#L212">212</a>         FileItem item = factory.createItem(
-<a class="jxr_linenumber" name="L213" href="#L213">213</a>                 textFieldName,
-<a class="jxr_linenumber" name="L214" href="#L214">214</a>                 textContentType,
-<a class="jxr_linenumber" name="L215" href="#L215">215</a>                 <strong class="jxr_keyword">true</strong>,
-<a class="jxr_linenumber" name="L216" href="#L216">216</a>                 <span class="jxr_string">"My File Name"</span>
-<a class="jxr_linenumber" name="L217" href="#L217">217</a>         );
-<a class="jxr_linenumber" name="L218" href="#L218">218</a>         <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L219" href="#L219">219</a>             OutputStream os = item.getOutputStream();
-<a class="jxr_linenumber" name="L220" href="#L220">220</a>             os.write(contentBytes);
-<a class="jxr_linenumber" name="L221" href="#L221">221</a>             os.close();
-<a class="jxr_linenumber" name="L222" href="#L222">222</a>         } <strong class="jxr_keyword">catch</strong>(IOException e) {
-<a class="jxr_linenumber" name="L223" href="#L223">223</a>             fail(<span class="jxr_string">"Unexpected IOException"</span> + e);
-<a class="jxr_linenumber" name="L224" href="#L224">224</a>         }
-<a class="jxr_linenumber" name="L225" href="#L225">225</a> 
-<a class="jxr_linenumber" name="L226" href="#L226">226</a>         <strong class="jxr_keyword">return</strong> item;
-<a class="jxr_linenumber" name="L227" href="#L227">227</a> 
-<a class="jxr_linenumber" name="L228" href="#L228">228</a>     }
-<a class="jxr_linenumber" name="L229" href="#L229">229</a>     
-<a class="jxr_linenumber" name="L230" href="#L230">230</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L231" href="#L231">231</a> <em class="jxr_javadoccomment">     * Create a FileItem with the specfied content bytes.</em>
-<a class="jxr_linenumber" name="L232" href="#L232">232</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L233" href="#L233">233</a>     <strong class="jxr_keyword">private</strong> FileItem createFileItem(byte[] contentBytes) {
-<a class="jxr_linenumber" name="L234" href="#L234">234</a>         <strong class="jxr_keyword">return</strong> createFileItem(contentBytes, <strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="L212" href="#L212">212</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L213" href="#L213">213</a> <em class="jxr_javadoccomment">     * Create a FileItem with the specfied content bytes and repository.</em>
+<a class="jxr_linenumber" name="L214" href="#L214">214</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L215" href="#L215">215</a>     <strong class="jxr_keyword">private</strong> FileItem createFileItem(byte[] contentBytes, File repository) {
+<a class="jxr_linenumber" name="L216" href="#L216">216</a>         FileItemFactory factory = <strong class="jxr_keyword">new</strong> DiskFileItemFactory(threshold, repository);
+<a class="jxr_linenumber" name="L217" href="#L217">217</a>         String textFieldName = <span class="jxr_string">"textField"</span>;
+<a class="jxr_linenumber" name="L218" href="#L218">218</a> 
+<a class="jxr_linenumber" name="L219" href="#L219">219</a>         FileItem item = factory.createItem(
+<a class="jxr_linenumber" name="L220" href="#L220">220</a>                 textFieldName,
+<a class="jxr_linenumber" name="L221" href="#L221">221</a>                 textContentType,
+<a class="jxr_linenumber" name="L222" href="#L222">222</a>                 <strong class="jxr_keyword">true</strong>,
+<a class="jxr_linenumber" name="L223" href="#L223">223</a>                 <span class="jxr_string">"My File Name"</span>
+<a class="jxr_linenumber" name="L224" href="#L224">224</a>         );
+<a class="jxr_linenumber" name="L225" href="#L225">225</a>         <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L226" href="#L226">226</a>             OutputStream os = item.getOutputStream();
+<a class="jxr_linenumber" name="L227" href="#L227">227</a>             os.write(contentBytes);
+<a class="jxr_linenumber" name="L228" href="#L228">228</a>             os.close();
+<a class="jxr_linenumber" name="L229" href="#L229">229</a>         } <strong class="jxr_keyword">catch</strong>(IOException e) {
+<a class="jxr_linenumber" name="L230" href="#L230">230</a>             fail(<span class="jxr_string">"Unexpected IOException"</span> + e);
+<a class="jxr_linenumber" name="L231" href="#L231">231</a>         }
+<a class="jxr_linenumber" name="L232" href="#L232">232</a> 
+<a class="jxr_linenumber" name="L233" href="#L233">233</a>         <strong class="jxr_keyword">return</strong> item;
+<a class="jxr_linenumber" name="L234" href="#L234">234</a> 
 <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>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L238" href="#L238">238</a> <em class="jxr_javadoccomment">     * Do serialization</em>
+<a class="jxr_linenumber" name="L238" href="#L238">238</a> <em class="jxr_javadoccomment">     * Create a FileItem with the specfied content bytes.</em>
 <a class="jxr_linenumber" name="L239" href="#L239">239</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L240" href="#L240">240</a>     <strong class="jxr_keyword">private</strong> ByteArrayOutputStream serialize(Object target) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L241" href="#L241">241</a>         ByteArrayOutputStream baos = <strong class="jxr_keyword">new</strong> ByteArrayOutputStream();
-<a class="jxr_linenumber" name="L242" href="#L242">242</a>         ObjectOutputStream oos = <strong class="jxr_keyword">new</strong> ObjectOutputStream(baos);
-<a class="jxr_linenumber" name="L243" href="#L243">243</a>         oos.writeObject(target);
-<a class="jxr_linenumber" name="L244" href="#L244">244</a>         oos.flush();
-<a class="jxr_linenumber" name="L245" href="#L245">245</a>         oos.close();
-<a class="jxr_linenumber" name="L246" href="#L246">246</a>         <strong class="jxr_keyword">return</strong> baos;
-<a class="jxr_linenumber" name="L247" href="#L247">247</a>     }
-<a class="jxr_linenumber" name="L248" href="#L248">248</a>     
-<a class="jxr_linenumber" name="L249" href="#L249">249</a>     <em class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L250" href="#L250">250</a> <em class="jxr_javadoccomment">     * Do deserialization</em>
-<a class="jxr_linenumber" name="L251" href="#L251">251</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L252" href="#L252">252</a>     <strong class="jxr_keyword">private</strong> Object deserialize(ByteArrayOutputStream baos) <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L253" href="#L253">253</a>         Object result = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L254" href="#L254">254</a>         ByteArrayInputStream bais =
-<a class="jxr_linenumber" name="L255" href="#L255">255</a>                 <strong class="jxr_keyword">new</strong> ByteArrayInputStream(baos.toByteArray());
-<a class="jxr_linenumber" name="L256" href="#L256">256</a>         ObjectInputStream ois = <strong class="jxr_keyword">new</strong> ObjectInputStream(bais);
-<a class="jxr_linenumber" name="L257" href="#L257">257</a>         result = ois.readObject();
-<a class="jxr_linenumber" name="L258" href="#L258">258</a>         bais.close();
-<a class="jxr_linenumber" name="L259" href="#L259">259</a> 
-<a class="jxr_linenumber" name="L260" href="#L260">260</a>         <strong class="jxr_keyword">return</strong> result;
-<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_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L264" href="#L264">264</a> <em class="jxr_javadoccomment">     * Do serialization and deserialization.</em>
-<a class="jxr_linenumber" name="L265" href="#L265">265</a> <em class="jxr_javadoccomment">     */</em>
-<a class="jxr_linenumber" name="L266" href="#L266">266</a>     <strong class="jxr_keyword">private</strong> Object serializeDeserialize(Object target) {
-<a class="jxr_linenumber" name="L267" href="#L267">267</a>         <em class="jxr_comment">// Serialize the test object</em>
-<a class="jxr_linenumber" name="L268" href="#L268">268</a>         ByteArrayOutputStream baos = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L269" href="#L269">269</a>         <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L270" href="#L270">270</a>             baos = serialize(target);
-<a class="jxr_linenumber" name="L271" href="#L271">271</a>         } <strong class="jxr_keyword">catch</strong> (Exception e) {
-<a class="jxr_linenumber" name="L272" href="#L272">272</a>             fail(<span class="jxr_string">"Exception during serialization: "</span> + e);
-<a class="jxr_linenumber" name="L273" href="#L273">273</a>         }
-<a class="jxr_linenumber" name="L274" href="#L274">274</a>         
-<a class="jxr_linenumber" name="L275" href="#L275">275</a>         <em class="jxr_comment">// Deserialize the test object</em>
-<a class="jxr_linenumber" name="L276" href="#L276">276</a>         Object result = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="L277" href="#L277">277</a>         <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L278" href="#L278">278</a>             result = deserialize(baos);
-<a class="jxr_linenumber" name="L279" href="#L279">279</a>         } <strong class="jxr_keyword">catch</strong> (Exception e) {
-<a class="jxr_linenumber" name="L280" href="#L280">280</a>             fail(<span class="jxr_string">"Exception during deserialization: "</span> + e);
-<a class="jxr_linenumber" name="L281" href="#L281">281</a>         }
-<a class="jxr_linenumber" name="L282" href="#L282">282</a>         
-<a class="jxr_linenumber" name="L283" href="#L283">283</a>         <strong class="jxr_keyword">return</strong> result;
-<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> }
+<a class="jxr_linenumber" name="L240" href="#L240">240</a>     <strong class="jxr_keyword">private</strong> FileItem createFileItem(byte[] contentBytes) {
+<a class="jxr_linenumber" name="L241" href="#L241">241</a>         <strong class="jxr_keyword">return</strong> createFileItem(contentBytes, REPO);
+<a class="jxr_linenumber" name="L242" href="#L242">242</a>     }
+<a class="jxr_linenumber" name="L243" href="#L243">243</a>     
+<a class="jxr_linenumber" name="L244" href="#L244">244</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L245" href="#L245">245</a> <em class="jxr_javadoccomment">     * Do serialization</em>
+<a class="jxr_linenumber" name="L246" href="#L246">246</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L247" href="#L247">247</a>     <strong class="jxr_keyword">private</strong> ByteArrayOutputStream serialize(Object target) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L248" href="#L248">248</a>         ByteArrayOutputStream baos = <strong class="jxr_keyword">new</strong> ByteArrayOutputStream();
+<a class="jxr_linenumber" name="L249" href="#L249">249</a>         ObjectOutputStream oos = <strong class="jxr_keyword">new</strong> ObjectOutputStream(baos);
+<a class="jxr_linenumber" name="L250" href="#L250">250</a>         oos.writeObject(target);
+<a class="jxr_linenumber" name="L251" href="#L251">251</a>         oos.flush();
+<a class="jxr_linenumber" name="L252" href="#L252">252</a>         oos.close();
+<a class="jxr_linenumber" name="L253" href="#L253">253</a>         <strong class="jxr_keyword">return</strong> baos;
+<a class="jxr_linenumber" name="L254" href="#L254">254</a>     }
+<a class="jxr_linenumber" name="L255" href="#L255">255</a>     
+<a class="jxr_linenumber" name="L256" href="#L256">256</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L257" href="#L257">257</a> <em class="jxr_javadoccomment">     * Do deserialization</em>
+<a class="jxr_linenumber" name="L258" href="#L258">258</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L259" href="#L259">259</a>     <strong class="jxr_keyword">private</strong> Object deserialize(ByteArrayOutputStream baos) <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L260" href="#L260">260</a>         Object result = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L261" href="#L261">261</a>         ByteArrayInputStream bais =
+<a class="jxr_linenumber" name="L262" href="#L262">262</a>                 <strong class="jxr_keyword">new</strong> ByteArrayInputStream(baos.toByteArray());
+<a class="jxr_linenumber" name="L263" href="#L263">263</a>         ObjectInputStream ois = <strong class="jxr_keyword">new</strong> ObjectInputStream(bais);
+<a class="jxr_linenumber" name="L264" href="#L264">264</a>         result = ois.readObject();
+<a class="jxr_linenumber" name="L265" href="#L265">265</a>         bais.close();
+<a class="jxr_linenumber" name="L266" href="#L266">266</a> 
+<a class="jxr_linenumber" name="L267" href="#L267">267</a>         <strong class="jxr_keyword">return</strong> result;
+<a class="jxr_linenumber" name="L268" href="#L268">268</a>     }
+<a class="jxr_linenumber" name="L269" href="#L269">269</a>     
+<a class="jxr_linenumber" name="L270" href="#L270">270</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L271" href="#L271">271</a> <em class="jxr_javadoccomment">     * Do serialization and deserialization.</em>
+<a class="jxr_linenumber" name="L272" href="#L272">272</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L273" href="#L273">273</a>     <strong class="jxr_keyword">private</strong> Object serializeDeserialize(Object target) {
+<a class="jxr_linenumber" name="L274" href="#L274">274</a>         <em class="jxr_comment">// Serialize the test object</em>
+<a class="jxr_linenumber" name="L275" href="#L275">275</a>         ByteArrayOutputStream baos = <strong class="jxr_keyword">null</strong>;
+<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>             baos = serialize(target);
+<a class="jxr_linenumber" name="L278" href="#L278">278</a>         } <strong class="jxr_keyword">catch</strong> (Exception e) {
+<a class="jxr_linenumber" name="L279" href="#L279">279</a>             fail(<span class="jxr_string">"Exception during serialization: "</span> + e);
+<a class="jxr_linenumber" name="L280" href="#L280">280</a>         }
+<a class="jxr_linenumber" name="L281" href="#L281">281</a>         
+<a class="jxr_linenumber" name="L282" href="#L282">282</a>         <em class="jxr_comment">// Deserialize the test object</em>
+<a class="jxr_linenumber" name="L283" href="#L283">283</a>         Object result = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="L284" href="#L284">284</a>         <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L285" href="#L285">285</a>             result = deserialize(baos);
+<a class="jxr_linenumber" name="L286" href="#L286">286</a>         } <strong class="jxr_keyword">catch</strong> (Exception e) {
+<a class="jxr_linenumber" name="L287" href="#L287">287</a>             fail(<span class="jxr_string">"Exception during deserialization: "</span> + e);
+<a class="jxr_linenumber" name="L288" href="#L288">288</a>         }
+<a class="jxr_linenumber" name="L289" href="#L289">289</a>         IOUtils.closeQuietly(baos);
+<a class="jxr_linenumber" name="L290" href="#L290">290</a>         <strong class="jxr_keyword">return</strong> result;
+<a class="jxr_linenumber" name="L291" href="#L291">291</a>     }
+<a class="jxr_linenumber" name="L292" href="#L292">292</a> 
+<a class="jxr_linenumber" name="L293" href="#L293">293</a> }
 </pre>
 <hr/>
 <div id="footer">Copyright &#169; 2002&#x2013;2016 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>

Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/ProgressListenerTest.html
==============================================================================
--- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/ProgressListenerTest.html (original)
+++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/ProgressListenerTest.html Fri Jul  1 05:48:35 2016
@@ -38,7 +38,7 @@
 <a class="jxr_linenumber" name="L30" href="#L30">30</a>  <em class="jxr_javadoccomment">/**</em>
 <a class="jxr_linenumber" name="L31" href="#L31">31</a>  <em class="jxr_javadoccomment"> * Tests the progress listener.</em>
 <a class="jxr_linenumber" name="L32" href="#L32">32</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <em class="jxr_javadoccomment"> * @version $Id: ProgressListenerTest.java 1454693 2013-03-09 12:30:27Z simonetripodi $</em>
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>  <em class="jxr_javadoccomment"> * @version $Id: ProgressListenerTest.java 1568661 2014-02-15 18:23:24Z sebb $</em>
 <a class="jxr_linenumber" name="L34" href="#L34">34</a>  <em class="jxr_javadoccomment"> */</em>
 <a class="jxr_linenumber" name="L35" href="#L35">35</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/commons/fileupload/ProgressListenerTest.html">ProgressListenerTest</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/commons/fileupload/FileUploadTestCase.html">FileUploadTestCase</a> {
 <a class="jxr_linenumber" name="L36" href="#L36">36</a>  
@@ -128,12 +128,13 @@
 <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>             assertEquals(-1, istream.read());
-<a class="jxr_linenumber" name="L123" href="#L123">123</a>         }
-<a class="jxr_linenumber" name="L124" href="#L124">124</a>         assertTrue(!iter.hasNext());
-<a class="jxr_linenumber" name="L125" href="#L125">125</a>         listener.checkFinished();
-<a class="jxr_linenumber" name="L126" href="#L126">126</a>     }
-<a class="jxr_linenumber" name="L127" href="#L127">127</a> 
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> }
+<a class="jxr_linenumber" name="L123" href="#L123">123</a>             istream.close();
+<a class="jxr_linenumber" name="L124" href="#L124">124</a>         }
+<a class="jxr_linenumber" name="L125" href="#L125">125</a>         assertTrue(!iter.hasNext());
+<a class="jxr_linenumber" name="L126" href="#L126">126</a>         listener.checkFinished();
+<a class="jxr_linenumber" name="L127" href="#L127">127</a>     }
+<a class="jxr_linenumber" name="L128" href="#L128">128</a> 
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> }
 </pre>
 <hr/>
 <div id="footer">Copyright &#169; 2002&#x2013;2016 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>

Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/ServletFileUploadTest.html
==============================================================================
--- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/ServletFileUploadTest.html (original)
+++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/ServletFileUploadTest.html Fri Jul  1 05:48:35 2016
@@ -44,7 +44,7 @@
 <a class="jxr_linenumber" name="L36" href="#L36">36</a>  <em class="jxr_javadoccomment">/**</em>
 <a class="jxr_linenumber" name="L37" href="#L37">37</a>  <em class="jxr_javadoccomment"> * Unit tests {@link org.apache.commons.fileupload.DiskFileUpload}.</em>
 <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"> * @version $Id: ServletFileUploadTest.java 1564788 2014-02-05 14:36:41Z markt $</em>
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>  <em class="jxr_javadoccomment"> * @version $Id: ServletFileUploadTest.java 1638215 2014-11-11 16:46:12Z tn $</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>  @SuppressWarnings({<span class="jxr_string">"deprecation"</span>, <span class="jxr_string">"javadoc"</span>}) <em class="jxr_comment">// unit tests for deprecated class</em>
 <a class="jxr_linenumber" name="L42" href="#L42">42</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/commons/fileupload/ServletFileUploadTest.html">ServletFileUploadTest</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/commons/fileupload/FileUploadTestCase.html">FileUploadTestCase</a> {
@@ -404,19 +404,56 @@
 <a class="jxr_linenumber" name="L396" href="#L396">396</a>         assertEquals(2, mappedParameters.get(<span class="jxr_string">"multi"</span>).size());
 <a class="jxr_linenumber" name="L397" href="#L397">397</a>     }
 <a class="jxr_linenumber" name="L398" href="#L398">398</a> 
-<a class="jxr_linenumber" name="L399" href="#L399">399</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> assertHeaders(String[] pHeaderNames, String[] pHeaderValues,
-<a class="jxr_linenumber" name="L400" href="#L400">400</a>                                FileItem pItem, <strong class="jxr_keyword">int</strong> pIndex) {
-<a class="jxr_linenumber" name="L401" href="#L401">401</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0;  i &lt; pHeaderNames.length;  i++) {
-<a class="jxr_linenumber" name="L402" href="#L402">402</a>             <strong class="jxr_keyword">final</strong> String value = pItem.getHeaders().getHeader(pHeaderNames[i]);
-<a class="jxr_linenumber" name="L403" href="#L403">403</a>             <strong class="jxr_keyword">if</strong> (i == pIndex) {
-<a class="jxr_linenumber" name="L404" href="#L404">404</a>                 assertEquals(pHeaderValues[i], value);
-<a class="jxr_linenumber" name="L405" href="#L405">405</a>             } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L406" href="#L406">406</a>                 assertNull(value);
-<a class="jxr_linenumber" name="L407" href="#L407">407</a>             }
-<a class="jxr_linenumber" name="L408" href="#L408">408</a>         }
-<a class="jxr_linenumber" name="L409" href="#L409">409</a>     }
-<a class="jxr_linenumber" name="L410" href="#L410">410</a> 
-<a class="jxr_linenumber" name="L411" href="#L411">411</a> }
+<a class="jxr_linenumber" name="L399" href="#L399">399</a>     <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="L400" href="#L400">400</a> <em class="jxr_javadoccomment">     * Test for &lt;a href="<a href="http://issues.apache.org/jira/browse/FILEUPLOAD-239" target="alexandria_uri">http://issues.apache.org/jira/browse/FILEUPLOAD-239</a>"&gt;FILEUPLOAD-239&lt;/a&gt;</em>
+<a class="jxr_linenumber" name="L401" href="#L401">401</a> <em class="jxr_javadoccomment">     */</em>
+<a class="jxr_linenumber" name="L402" href="#L402">402</a>     @Test
+<a class="jxr_linenumber" name="L403" href="#L403">403</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testContentTypeAttachment()
+<a class="jxr_linenumber" name="L404" href="#L404">404</a>             <strong class="jxr_keyword">throws</strong> IOException, FileUploadException {
+<a class="jxr_linenumber" name="L405" href="#L405">405</a>         List&lt;FileItem&gt; fileItems = parseUpload(
+<a class="jxr_linenumber" name="L406" href="#L406">406</a>         		<span class="jxr_string">"-----1234\r\n"</span> +
+<a class="jxr_linenumber" name="L407" href="#L407">407</a>         		<span class="jxr_string">"content-disposition: form-data; name=\&quot;field1\&quot;\r\n"</span> +
+<a class="jxr_linenumber" name="L408" href="#L408">408</a>         		<span class="jxr_string">"\r\n"</span> +
+<a class="jxr_linenumber" name="L409" href="#L409">409</a>         		<span class="jxr_string">"Joe Blow\r\n"</span> +
+<a class="jxr_linenumber" name="L410" href="#L410">410</a>         		<span class="jxr_string">"-----1234\r\n"</span> +
+<a class="jxr_linenumber" name="L411" href="#L411">411</a>         		<span class="jxr_string">"content-disposition: form-data; name=\&quot;pics\&quot;\r\n"</span> +
+<a class="jxr_linenumber" name="L412" href="#L412">412</a>         		<span class="jxr_string">"Content-type: multipart/mixed, boundary=---9876\r\n"</span> +
+<a class="jxr_linenumber" name="L413" href="#L413">413</a>         		<span class="jxr_string">"\r\n"</span> +
+<a class="jxr_linenumber" name="L414" href="#L414">414</a>         		<span class="jxr_string">"-----9876\r\n"</span> +
+<a class="jxr_linenumber" name="L415" href="#L415">415</a>         		<span class="jxr_string">"Content-disposition: attachment; filename=\&quot;file1.txt\&quot;\r\n"</span> +
+<a class="jxr_linenumber" name="L416" href="#L416">416</a>         		<span class="jxr_string">"Content-Type: text/plain\r\n"</span> +
+<a class="jxr_linenumber" name="L417" href="#L417">417</a>         		<span class="jxr_string">"\r\n"</span> + 
+<a class="jxr_linenumber" name="L418" href="#L418">418</a>         		<span class="jxr_string">"... contents of file1.txt ...\r\n"</span> +
+<a class="jxr_linenumber" name="L419" href="#L419">419</a>         		<span class="jxr_string">"-----9876--\r\n"</span> +
+<a class="jxr_linenumber" name="L420" href="#L420">420</a>         		<span class="jxr_string">"-----1234--\r\n"</span>);        				
+<a class="jxr_linenumber" name="L421" href="#L421">421</a>         assertEquals(2, fileItems.size());
+<a class="jxr_linenumber" name="L422" href="#L422">422</a> 
+<a class="jxr_linenumber" name="L423" href="#L423">423</a>         FileItem field = fileItems.get(0);
+<a class="jxr_linenumber" name="L424" href="#L424">424</a>         assertEquals(<span class="jxr_string">"field1"</span>, field.getFieldName());
+<a class="jxr_linenumber" name="L425" href="#L425">425</a>         assertTrue(field.isFormField());
+<a class="jxr_linenumber" name="L426" href="#L426">426</a>         assertEquals(<span class="jxr_string">"Joe Blow"</span>, field.getString());
+<a class="jxr_linenumber" name="L427" href="#L427">427</a> 
+<a class="jxr_linenumber" name="L428" href="#L428">428</a>         FileItem file = fileItems.get(1);
+<a class="jxr_linenumber" name="L429" href="#L429">429</a>         assertEquals(<span class="jxr_string">"pics"</span>, file.getFieldName());
+<a class="jxr_linenumber" name="L430" href="#L430">430</a>         assertFalse(file.isFormField());
+<a class="jxr_linenumber" name="L431" href="#L431">431</a>         assertEquals(<span class="jxr_string">"... contents of file1.txt ..."</span>, file.getString());
+<a class="jxr_linenumber" name="L432" href="#L432">432</a>         assertEquals(<span class="jxr_string">"text/plain"</span>, file.getContentType());
+<a class="jxr_linenumber" name="L433" href="#L433">433</a>         assertEquals(<span class="jxr_string">"file1.txt"</span>, file.getName());
+<a class="jxr_linenumber" name="L434" href="#L434">434</a>     }
+<a class="jxr_linenumber" name="L435" href="#L435">435</a> 
+<a class="jxr_linenumber" name="L436" href="#L436">436</a>     <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> assertHeaders(String[] pHeaderNames, String[] pHeaderValues,
+<a class="jxr_linenumber" name="L437" href="#L437">437</a>                                FileItem pItem, <strong class="jxr_keyword">int</strong> pIndex) {
+<a class="jxr_linenumber" name="L438" href="#L438">438</a>         <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0;  i &lt; pHeaderNames.length;  i++) {
+<a class="jxr_linenumber" name="L439" href="#L439">439</a>             <strong class="jxr_keyword">final</strong> String value = pItem.getHeaders().getHeader(pHeaderNames[i]);
+<a class="jxr_linenumber" name="L440" href="#L440">440</a>             <strong class="jxr_keyword">if</strong> (i == pIndex) {
+<a class="jxr_linenumber" name="L441" href="#L441">441</a>                 assertEquals(pHeaderValues[i], value);
+<a class="jxr_linenumber" name="L442" href="#L442">442</a>             } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L443" href="#L443">443</a>                 assertNull(value);
+<a class="jxr_linenumber" name="L444" href="#L444">444</a>             }
+<a class="jxr_linenumber" name="L445" href="#L445">445</a>         }
+<a class="jxr_linenumber" name="L446" href="#L446">446</a>     }
+<a class="jxr_linenumber" name="L447" href="#L447">447</a> 
+<a class="jxr_linenumber" name="L448" href="#L448">448</a> }
 </pre>
 <hr/>
 <div id="footer">Copyright &#169; 2002&#x2013;2016 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</div>

Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/SizesTest.html
==============================================================================
--- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/SizesTest.html (original)
+++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/SizesTest.html Fri Jul  1 05:48:35 2016
@@ -47,7 +47,7 @@
 <a class="jxr_linenumber" name="L39" href="#L39">39</a>  <em class="jxr_javadoccomment">/**</em>
 <a class="jxr_linenumber" name="L40" href="#L40">40</a>  <em class="jxr_javadoccomment"> * Unit test for items with varying sizes.</em>
 <a class="jxr_linenumber" name="L41" href="#L41">41</a>  <em class="jxr_javadoccomment"> *</em>
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <em class="jxr_javadoccomment"> * @version $Id: SizesTest.java 1458684 2013-03-20 08:31:53Z simonetripodi $</em>
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>  <em class="jxr_javadoccomment"> * @version $Id: SizesTest.java 1568663 2014-02-15 18:26:14Z sebb $</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>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../org/apache/commons/fileupload/SizesTest.html">SizesTest</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../org/apache/commons/fileupload/FileUploadTestCase.html">FileUploadTestCase</a> {
 <a class="jxr_linenumber" name="L45" href="#L45">45</a>  
@@ -263,25 +263,25 @@
 <a class="jxr_linenumber" name="L255" href="#L255">255</a>         assertEquals(<span class="jxr_string">"file1"</span>, item.getFieldName());
 <a class="jxr_linenumber" name="L256" href="#L256">256</a>         assertEquals(<span class="jxr_string">"foo1.tab"</span>, item.getName());
 <a class="jxr_linenumber" name="L257" href="#L257">257</a> 
-<a class="jxr_linenumber" name="L258" href="#L258">258</a>         <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L259" href="#L259">259</a>             InputStream stream = item.openStream();
-<a class="jxr_linenumber" name="L260" href="#L260">260</a>             ByteArrayOutputStream baos = <strong class="jxr_keyword">new</strong> ByteArrayOutputStream();
-<a class="jxr_linenumber" name="L261" href="#L261">261</a>             Streams.copy(stream, baos, <strong class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="L262" href="#L262">262</a>         } <strong class="jxr_keyword">catch</strong> (FileUploadIOException e) {
-<a class="jxr_linenumber" name="L263" href="#L263">263</a>             fail(e.getMessage());
-<a class="jxr_linenumber" name="L264" href="#L264">264</a>         }
-<a class="jxr_linenumber" name="L265" href="#L265">265</a> 
-<a class="jxr_linenumber" name="L266" href="#L266">266</a>         <em class="jxr_comment">// the second item is over the size max, thus we expect an error</em>
-<a class="jxr_linenumber" name="L267" href="#L267">267</a>         <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L268" href="#L268">268</a>             <em class="jxr_comment">// the header is still within size max -&gt; this shall still succeed</em>
-<a class="jxr_linenumber" name="L269" href="#L269">269</a>             assertTrue(it.hasNext());
-<a class="jxr_linenumber" name="L270" href="#L270">270</a>         } <strong class="jxr_keyword">catch</strong> (SizeException e) {
-<a class="jxr_linenumber" name="L271" href="#L271">271</a>             fail();
-<a class="jxr_linenumber" name="L272" href="#L272">272</a>         }
-<a class="jxr_linenumber" name="L273" href="#L273">273</a> 
-<a class="jxr_linenumber" name="L274" href="#L274">274</a>         item = it.next();
-<a class="jxr_linenumber" name="L275" href="#L275">275</a> 
-<a class="jxr_linenumber" name="L276" href="#L276">276</a>         <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L258" href="#L258">258</a>         {
+<a class="jxr_linenumber" name="L259" href="#L259">259</a>             @SuppressWarnings(<span class="jxr_string">"resource"</span>) <em class="jxr_comment">// Streams.copy closes the input file</em>
+<a class="jxr_linenumber" name="L260" href="#L260">260</a>             InputStream stream = item.openStream();
+<a class="jxr_linenumber" name="L261" href="#L261">261</a>             ByteArrayOutputStream baos = <strong class="jxr_keyword">new</strong> ByteArrayOutputStream();
+<a class="jxr_linenumber" name="L262" href="#L262">262</a>             Streams.copy(stream, baos, <strong class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="L263" href="#L263">263</a>         }
+<a class="jxr_linenumber" name="L264" href="#L264">264</a> 
+<a class="jxr_linenumber" name="L265" href="#L265">265</a>         <em class="jxr_comment">// the second item is over the size max, thus we expect an error</em>
+<a class="jxr_linenumber" name="L266" href="#L266">266</a>         <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L267" href="#L267">267</a>             <em class="jxr_comment">// the header is still within size max -&gt; this shall still succeed</em>
+<a class="jxr_linenumber" name="L268" href="#L268">268</a>             assertTrue(it.hasNext());
+<a class="jxr_linenumber" name="L269" href="#L269">269</a>         } <strong class="jxr_keyword">catch</strong> (SizeException e) {
+<a class="jxr_linenumber" name="L270" href="#L270">270</a>             fail();
+<a class="jxr_linenumber" name="L271" href="#L271">271</a>         }
+<a class="jxr_linenumber" name="L272" href="#L272">272</a> 
+<a class="jxr_linenumber" name="L273" href="#L273">273</a>         item = it.next();
+<a class="jxr_linenumber" name="L274" href="#L274">274</a> 
+<a class="jxr_linenumber" name="L275" href="#L275">275</a>         <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L276" href="#L276">276</a>             @SuppressWarnings(<span class="jxr_string">"resource"</span>) <em class="jxr_comment">// Streams.copy closes the input file</em>
 <a class="jxr_linenumber" name="L277" href="#L277">277</a>             InputStream stream = item.openStream();
 <a class="jxr_linenumber" name="L278" href="#L278">278</a>             ByteArrayOutputStream baos = <strong class="jxr_keyword">new</strong> ByteArrayOutputStream();
 <a class="jxr_linenumber" name="L279" href="#L279">279</a>             Streams.copy(stream, baos, <strong class="jxr_keyword">true</strong>);

Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/package-frame.html
==============================================================================
--- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/package-frame.html (original)
+++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/package-frame.html Fri Jul  1 05:48:35 2016
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-		<title>Apache Commons FileUpload 1.3.2 Reference Package org.apache.commons.fileupload</title>
+		<title>Apache Commons FileUpload 1.4-SNAPSHOT Reference Package org.apache.commons.fileupload</title>
 		<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/package-summary.html
==============================================================================
--- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/package-summary.html (original)
+++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/package-summary.html Fri Jul  1 05:48:35 2016
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-		<title>Apache Commons FileUpload 1.3.2 Reference Package org.apache.commons.fileupload</title>
+		<title>Apache Commons FileUpload 1.4-SNAPSHOT Reference Package org.apache.commons.fileupload</title>
 		<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/util/mime/package-frame.html
==============================================================================
--- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/util/mime/package-frame.html (original)
+++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/util/mime/package-frame.html Fri Jul  1 05:48:35 2016
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-		<title>Apache Commons FileUpload 1.3.2 Reference Package org.apache.commons.fileupload.util.mime</title>
+		<title>Apache Commons FileUpload 1.4-SNAPSHOT Reference Package org.apache.commons.fileupload.util.mime</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/util/mime/package-summary.html
==============================================================================
--- websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/util/mime/package-summary.html (original)
+++ websites/production/commons/content/proper/commons-fileupload/xref-test/org/apache/commons/fileupload/util/mime/package-summary.html Fri Jul  1 05:48:35 2016
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-		<title>Apache Commons FileUpload 1.3.2 Reference Package org.apache.commons.fileupload.util.mime</title>
+		<title>Apache Commons FileUpload 1.4-SNAPSHOT Reference Package org.apache.commons.fileupload.util.mime</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/overview-frame.html
==============================================================================
--- websites/production/commons/content/proper/commons-fileupload/xref-test/overview-frame.html (original)
+++ websites/production/commons/content/proper/commons-fileupload/xref-test/overview-frame.html Fri Jul  1 05:48:35 2016
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-		<title>Apache Commons FileUpload 1.3.2 Reference</title>
+		<title>Apache Commons FileUpload 1.4-SNAPSHOT Reference</title>
 		<link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: websites/production/commons/content/proper/commons-fileupload/xref-test/overview-summary.html
==============================================================================
--- websites/production/commons/content/proper/commons-fileupload/xref-test/overview-summary.html (original)
+++ websites/production/commons/content/proper/commons-fileupload/xref-test/overview-summary.html Fri Jul  1 05:48:35 2016
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-		<title>Apache Commons FileUpload 1.3.2 Reference</title>
+		<title>Apache Commons FileUpload 1.4-SNAPSHOT Reference</title>
 		<link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" />
 	</head>
 	<body>
@@ -24,7 +24,7 @@
 	        </ul>
       	</div>
 		
-		      	<h2>Apache Commons FileUpload 1.3.2 Reference</h2>
+		      	<h2>Apache Commons FileUpload 1.4-SNAPSHOT Reference</h2>
 
 		<table class="summary">
         	<thead>

Modified: websites/production/commons/content/proper/commons-fileupload/xref/index.html
==============================================================================
--- websites/production/commons/content/proper/commons-fileupload/xref/index.html (original)
+++ websites/production/commons/content/proper/commons-fileupload/xref/index.html Fri Jul  1 05:48:35 2016
@@ -4,7 +4,7 @@
 <!-- this is a JXR report set -->
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-		<title>Apache Commons FileUpload 1.3.2 Reference</title>
+		<title>Apache Commons FileUpload 1.4-SNAPSHOT Reference</title>
 	</head>
     <frameset cols="20%,80%">
 		<frameset rows="30%,70%">



Mime
View raw message