Modified:
websites/production/commons/content/proper/commons-csv/xref-test/org/apache/commons/csv/CSVRecordTest.html
==============================================================================
---
websites/production/commons/content/proper/commons-csv/xref-test/org/apache/commons/csv/CSVRecordTest.html
(original)
+++
websites/production/commons/content/proper/commons-csv/xref-test/org/apache/commons/csv/CSVRecordTest.html
Thu Aug 14 19:48:06 2014
@@ -26,170 +26,180 @@
<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.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.assertNull;
-<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>
-<a class="jxr_linenumber" name="L24" href="#L24">24</a> <strong
class="jxr_keyword">import</strong> java.io.IOException;
-<a class="jxr_linenumber" name="L25" href="#L25">25</a> <strong
class="jxr_keyword">import</strong> java.util.ArrayList;
-<a class="jxr_linenumber" name="L26" href="#L26">26</a> <strong
class="jxr_keyword">import</strong> java.util.Collections;
-<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong
class="jxr_keyword">import</strong> java.util.HashMap;
-<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong
class="jxr_keyword">import</strong> java.util.Map;
-<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong
class="jxr_keyword">import</strong> java.util.TreeMap;
-<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong
class="jxr_keyword">import</strong> java.util.concurrent.ConcurrentHashMap;
-<a class="jxr_linenumber" name="L31" href="#L31">31</a>
-<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong
class="jxr_keyword">import</strong> org.junit.Assert;
-<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong
class="jxr_keyword">import</strong> org.junit.Before;
-<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> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong>
<a
href="../../../../org/apache/commons/csv/CSVRecordTest.html">CSVRecordTest</a> {
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>
-<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong
class="jxr_keyword">private</strong> enum <a
href="../../../../org/apache/commons/csv/CSVRecordTest.html">EnumFixture</a> {
UNKNOWN_COLUMN }
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>
-<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong
class="jxr_keyword">private</strong> String[] values;
-<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong
class="jxr_keyword">private</strong> CSVRecord record, recordWithHeader;
-<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong
class="jxr_keyword">private</strong> Map<String, Integer> header;
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>
-<a class="jxr_linenumber" name="L44" href="#L44">44</a> @Before
-<a class="jxr_linenumber" name="L45" href="#L45">45</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="L46" href="#L46">46</a> values =
<strong class="jxr_keyword">new</strong> String[] { <span
class="jxr_string">"A"</span>, <span class="jxr_string">"B"</span>, <span
class="jxr_string">"C"</span> };
-<a class="jxr_linenumber" name="L47" href="#L47">47</a> record =
<strong class="jxr_keyword">new</strong> CSVRecord(values, <strong
class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>,
0);
-<a class="jxr_linenumber" name="L48" href="#L48">48</a> header =
<strong class="jxr_keyword">new</strong> HashMap<String, Integer>();
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>
header.put(<span class="jxr_string">"first"</span>, Integer.valueOf(0));
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>
header.put(<span class="jxr_string">"second"</span>, Integer.valueOf(1));
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>
header.put(<span class="jxr_string">"third"</span>, Integer.valueOf(2));
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>
recordWithHeader = <strong class="jxr_keyword">new</strong> CSVRecord(values,
header, <strong class="jxr_keyword">null</strong>, 0);
-<a class="jxr_linenumber" name="L53" href="#L53">53</a> }
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>
-<a class="jxr_linenumber" name="L55" href="#L55">55</a> @Test
-<a class="jxr_linenumber" name="L56" href="#L56">56</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testGetInt() {
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>
assertEquals(values[0], record.get(0));
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>
assertEquals(values[1], record.get(1));
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>
assertEquals(values[2], record.get(2));
-<a class="jxr_linenumber" name="L60" href="#L60">60</a> }
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>
-<a class="jxr_linenumber" name="L62" href="#L62">62</a> @Test
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testGetString() {
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>
assertEquals(values[0], recordWithHeader.get(<span
class="jxr_string">"first"</span>));
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>
assertEquals(values[1], recordWithHeader.get(<span
class="jxr_string">"second"</span>));
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>
assertEquals(values[2], recordWithHeader.get(<span
class="jxr_string">"third"</span>));
-<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> @Test(expected =
IllegalArgumentException.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L70" href="#L70">70</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testGetStringInconsistentRecord() {
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>
header.put(<span class="jxr_string">"fourth"</span>, Integer.valueOf(4));
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>
recordWithHeader.get(<span class="jxr_string">"fourth"</span>);
-<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> @Test(expected =
IllegalStateException.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L76" href="#L76">76</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testGetStringNoHeader() {
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>
record.get(<span class="jxr_string">"first"</span>);
-<a class="jxr_linenumber" name="L78" href="#L78">78</a> }
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>
-<a class="jxr_linenumber" name="L80" href="#L80">80</a> @Test(expected =
IllegalArgumentException.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L81" href="#L81">81</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testGetUnmappedEnum() {
-<a class="jxr_linenumber" name="L82" href="#L82">82</a>
assertNull(recordWithHeader.get(EnumFixture.UNKNOWN_COLUMN));
-<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> @Test(expected =
IllegalArgumentException.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L86" href="#L86">86</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testGetUnmappedName() {
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>
assertNull(recordWithHeader.get(<span class="jxr_string">"fourth"</span>));
-<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> @Test(expected =
ArrayIndexOutOfBoundsException.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L91" href="#L91">91</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testGetUnmappedNegativeInt() {
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>
assertNull(recordWithHeader.get(Integer.MIN_VALUE));
-<a class="jxr_linenumber" name="L93" href="#L93">93</a> }
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>
-<a class="jxr_linenumber" name="L95" href="#L95">95</a> @Test(expected =
ArrayIndexOutOfBoundsException.<strong class="jxr_keyword">class</strong>)
-<a class="jxr_linenumber" name="L96" href="#L96">96</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testGetUnmappedPositiveInt() {
-<a class="jxr_linenumber" name="L97" href="#L97">97</a>
assertNull(recordWithHeader.get(Integer.MAX_VALUE));
-<a class="jxr_linenumber" name="L98" href="#L98">98</a> }
-<a class="jxr_linenumber" name="L99" href="#L99">99</a>
-<a class="jxr_linenumber" name="L100" href="#L100">100</a> @Test
-<a class="jxr_linenumber" name="L101" href="#L101">101</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testIsConsistent() {
-<a class="jxr_linenumber" name="L102" href="#L102">102</a>
assertTrue(record.isConsistent());
-<a class="jxr_linenumber" name="L103" href="#L103">103</a>
assertTrue(recordWithHeader.isConsistent());
-<a class="jxr_linenumber" name="L104" href="#L104">104</a>
-<a class="jxr_linenumber" name="L105" href="#L105">105</a>
header.put(<span class="jxr_string">"fourth"</span>, Integer.valueOf(4));
-<a class="jxr_linenumber" name="L106" href="#L106">106</a>
assertFalse(recordWithHeader.isConsistent());
-<a class="jxr_linenumber" name="L107" href="#L107">107</a> }
-<a class="jxr_linenumber" name="L108" href="#L108">108</a>
-<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>
testIsMapped() {
-<a class="jxr_linenumber" name="L111" href="#L111">111</a>
assertFalse(record.isMapped(<span class="jxr_string">"first"</span>));
-<a class="jxr_linenumber" name="L112" href="#L112">112</a>
assertTrue(recordWithHeader.isMapped(<span class="jxr_string">"first"</span>));
-<a class="jxr_linenumber" name="L113" href="#L113">113</a>
assertFalse(recordWithHeader.isMapped(<span
class="jxr_string">"fourth"</span>));
-<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> @Test
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testIsSet() {
-<a class="jxr_linenumber" name="L118" href="#L118">118</a>
assertFalse(record.isSet(<span class="jxr_string">"first"</span>));
-<a class="jxr_linenumber" name="L119" href="#L119">119</a>
assertTrue(recordWithHeader.isSet(<span class="jxr_string">"first"</span>));
-<a class="jxr_linenumber" name="L120" href="#L120">120</a>
assertFalse(recordWithHeader.isSet(<span class="jxr_string">"fourth"</span>));
-<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>
testIterator() {
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> <strong
class="jxr_keyword">int</strong> i = 0;
-<a class="jxr_linenumber" name="L126" href="#L126">126</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong>
String value : record) {
-<a class="jxr_linenumber" name="L127" href="#L127">127</a>
assertEquals(values[i], value);
-<a class="jxr_linenumber" name="L128" href="#L128">128</a> i++;
-<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>
-<a class="jxr_linenumber" name="L132" href="#L132">132</a> @Test
-<a class="jxr_linenumber" name="L133" href="#L133">133</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testPutInMap() {
-<a class="jxr_linenumber" name="L134" href="#L134">134</a> <strong
class="jxr_keyword">final</strong> Map<String, String> map = <strong
class="jxr_keyword">new</strong> ConcurrentHashMap<String, String>();
-<a class="jxr_linenumber" name="L135" href="#L135">135</a> <strong
class="jxr_keyword">this</strong>.recordWithHeader.putIn(map);
-<a class="jxr_linenumber" name="L136" href="#L136">136</a> <strong
class="jxr_keyword">this</strong>.validateMap(map, false);
-<a class="jxr_linenumber" name="L137" href="#L137">137</a> <em
class="jxr_comment">// Test that we can compile with assigment to the same map
as the param.</em>
-<a class="jxr_linenumber" name="L138" href="#L138">138</a> <strong
class="jxr_keyword">final</strong> TreeMap<String, String> map2 =
recordWithHeader.putIn(<strong class="jxr_keyword">new</strong>
TreeMap<String, String>());
-<a class="jxr_linenumber" name="L139" href="#L139">139</a> <strong
class="jxr_keyword">this</strong>.validateMap(map2, false);
-<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> @Test
-<a class="jxr_linenumber" name="L143" href="#L143">143</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testRemoveAndAddColumns() <strong class="jxr_keyword">throws</strong>
IOException {
-<a class="jxr_linenumber" name="L144" href="#L144">144</a> <em
class="jxr_comment">// do:</em>
-<a class="jxr_linenumber" name="L145" href="#L145">145</a> <strong
class="jxr_keyword">final</strong> CSVPrinter printer = <strong
class="jxr_keyword">new</strong> CSVPrinter(<strong
class="jxr_keyword">new</strong> StringBuilder(), CSVFormat.DEFAULT);
-<a class="jxr_linenumber" name="L146" href="#L146">146</a> <strong
class="jxr_keyword">final</strong> Map<String, String> map =
recordWithHeader.toMap();
-<a class="jxr_linenumber" name="L147" href="#L147">147</a>
map.remove(<span class="jxr_string">"OldColumn"</span>);
-<a class="jxr_linenumber" name="L148" href="#L148">148</a>
map.put(<span class="jxr_string">"ZColumn"</span>, <span
class="jxr_string">"NewValue"</span>);
-<a class="jxr_linenumber" name="L149" href="#L149">149</a> <em
class="jxr_comment">// check:</em>
-<a class="jxr_linenumber" name="L150" href="#L150">150</a> <strong
class="jxr_keyword">final</strong> ArrayList<String> list = <strong
class="jxr_keyword">new</strong> ArrayList<String>(map.values());
-<a class="jxr_linenumber" name="L151" href="#L151">151</a>
Collections.sort(list);
-<a class="jxr_linenumber" name="L152" href="#L152">152</a>
printer.printRecord(list);
-<a class="jxr_linenumber" name="L153" href="#L153">153</a>
Assert.assertEquals(<span class="jxr_string">"A,B,C,NewValue"</span> +
CSVFormat.DEFAULT.getRecordSeparator(), printer.getOut().toString());
-<a class="jxr_linenumber" name="L154" href="#L154">154</a>
printer.close();
-<a class="jxr_linenumber" name="L155" href="#L155">155</a> }
-<a class="jxr_linenumber" name="L156" href="#L156">156</a>
-<a class="jxr_linenumber" name="L157" href="#L157">157</a> @Test
-<a class="jxr_linenumber" name="L158" href="#L158">158</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testToMap() {
-<a class="jxr_linenumber" name="L159" href="#L159">159</a> <strong
class="jxr_keyword">final</strong> Map<String, String> map = <strong
class="jxr_keyword">this</strong>.recordWithHeader.toMap();
-<a class="jxr_linenumber" name="L160" href="#L160">160</a> <strong
class="jxr_keyword">this</strong>.validateMap(map, <strong
class="jxr_keyword">true</strong>);
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> }
-<a class="jxr_linenumber" name="L162" href="#L162">162</a>
-<a class="jxr_linenumber" name="L163" href="#L163">163</a> @Test
-<a class="jxr_linenumber" name="L164" href="#L164">164</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testToMapWithShortRecord() <strong class="jxr_keyword">throws</strong>
Exception {
-<a class="jxr_linenumber" name="L165" href="#L165">165</a> <strong
class="jxr_keyword">final</strong> CSVParser parser = CSVParser.parse(<span
class="jxr_string">"a,b"</span>, CSVFormat.DEFAULT.withHeader(<span
class="jxr_string">"A"</span>, <span class="jxr_string">"B"</span>, <span
class="jxr_string">"C"</span>));
-<a class="jxr_linenumber" name="L166" href="#L166">166</a> <strong
class="jxr_keyword">final</strong> CSVRecord shortRec =
parser.iterator().next();
-<a class="jxr_linenumber" name="L167" href="#L167">167</a>
shortRec.toMap();
-<a class="jxr_linenumber" name="L168" href="#L168">168</a> }
-<a class="jxr_linenumber" name="L169" href="#L169">169</a>
-<a class="jxr_linenumber" name="L170" href="#L170">170</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong>
validateMap(<strong class="jxr_keyword">final</strong> Map<String,
String> map, <strong class="jxr_keyword">final</strong> <strong
class="jxr_keyword">boolean</strong> allowsNulls) {
-<a class="jxr_linenumber" name="L171" href="#L171">171</a>
assertTrue(map.containsKey(<span class="jxr_string">"first"</span>));
-<a class="jxr_linenumber" name="L172" href="#L172">172</a>
assertTrue(map.containsKey(<span class="jxr_string">"second"</span>));
-<a class="jxr_linenumber" name="L173" href="#L173">173</a>
assertTrue(map.containsKey(<span class="jxr_string">"third"</span>));
-<a class="jxr_linenumber" name="L174" href="#L174">174</a>
assertFalse(map.containsKey(<span class="jxr_string">"fourth"</span>));
-<a class="jxr_linenumber" name="L175" href="#L175">175</a> <strong
class="jxr_keyword">if</strong> (allowsNulls) {
-<a class="jxr_linenumber" name="L176" href="#L176">176</a>
assertFalse(map.containsKey(<strong class="jxr_keyword">null</strong>));
-<a class="jxr_linenumber" name="L177" href="#L177">177</a> }
-<a class="jxr_linenumber" name="L178" href="#L178">178</a>
assertEquals(<span class="jxr_string">"A"</span>, map.get(<span
class="jxr_string">"first"</span>));
-<a class="jxr_linenumber" name="L179" href="#L179">179</a>
assertEquals(<span class="jxr_string">"B"</span>, map.get(<span
class="jxr_string">"second"</span>));
-<a class="jxr_linenumber" name="L180" href="#L180">180</a>
assertEquals(<span class="jxr_string">"C"</span>, map.get(<span
class="jxr_string">"third"</span>));
-<a class="jxr_linenumber" name="L181" href="#L181">181</a>
assertEquals(<strong class="jxr_keyword">null</strong>, map.get(<span
class="jxr_string">"fourth"</span>));
-<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> }
+<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.assertNull;
+<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.assertTrue;
+<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.IOException;
+<a class="jxr_linenumber" name="L26" href="#L26">26</a> <strong
class="jxr_keyword">import</strong> java.util.ArrayList;
+<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong
class="jxr_keyword">import</strong> java.util.Collections;
+<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong
class="jxr_keyword">import</strong> java.util.HashMap;
+<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong
class="jxr_keyword">import</strong> java.util.Map;
+<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong
class="jxr_keyword">import</strong> java.util.TreeMap;
+<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong
class="jxr_keyword">import</strong> java.util.concurrent.ConcurrentHashMap;
+<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.junit.Assert;
+<a class="jxr_linenumber" name="L34" href="#L34">34</a> <strong
class="jxr_keyword">import</strong> org.junit.Before;
+<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong
class="jxr_keyword">import</strong> org.junit.Test;
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>
+<a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong>
<a
href="../../../../org/apache/commons/csv/CSVRecordTest.html">CSVRecordTest</a> {
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>
+<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong
class="jxr_keyword">private</strong> enum <a
href="../../../../org/apache/commons/csv/CSVRecordTest.html">EnumFixture</a> {
UNKNOWN_COLUMN }
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>
+<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong
class="jxr_keyword">private</strong> String[] values;
+<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong
class="jxr_keyword">private</strong> CSVRecord record, recordWithHeader;
+<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong
class="jxr_keyword">private</strong> Map<String, Integer> header;
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>
+<a class="jxr_linenumber" name="L45" href="#L45">45</a> @Before
+<a class="jxr_linenumber" name="L46" href="#L46">46</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="L47" href="#L47">47</a> values =
<strong class="jxr_keyword">new</strong> String[] { <span
class="jxr_string">"A"</span>, <span class="jxr_string">"B"</span>, <span
class="jxr_string">"C"</span> };
+<a class="jxr_linenumber" name="L48" href="#L48">48</a> record =
<strong class="jxr_keyword">new</strong> CSVRecord(values, <strong
class="jxr_keyword">null</strong>, <strong class="jxr_keyword">null</strong>,
0);
+<a class="jxr_linenumber" name="L49" href="#L49">49</a> header =
<strong class="jxr_keyword">new</strong> HashMap<String, Integer>();
+<a class="jxr_linenumber" name="L50" href="#L50">50</a>
header.put(<span class="jxr_string">"first"</span>, Integer.valueOf(0));
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>
header.put(<span class="jxr_string">"second"</span>, Integer.valueOf(1));
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>
header.put(<span class="jxr_string">"third"</span>, Integer.valueOf(2));
+<a class="jxr_linenumber" name="L53" href="#L53">53</a>
recordWithHeader = <strong class="jxr_keyword">new</strong> CSVRecord(values,
header, <strong class="jxr_keyword">null</strong>, 0);
+<a class="jxr_linenumber" name="L54" href="#L54">54</a> }
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>
+<a class="jxr_linenumber" name="L56" href="#L56">56</a> @Test
+<a class="jxr_linenumber" name="L57" href="#L57">57</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testGetInt() {
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>
assertEquals(values[0], record.get(0));
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>
assertEquals(values[1], record.get(1));
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>
assertEquals(values[2], record.get(2));
+<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>
testGetString() {
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>
assertEquals(values[0], recordWithHeader.get(<span
class="jxr_string">"first"</span>));
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>
assertEquals(values[1], recordWithHeader.get(<span
class="jxr_string">"second"</span>));
+<a class="jxr_linenumber" name="L67" href="#L67">67</a>
assertEquals(values[2], recordWithHeader.get(<span
class="jxr_string">"third"</span>));
+<a class="jxr_linenumber" name="L68" href="#L68">68</a> }
+<a class="jxr_linenumber" name="L69" href="#L69">69</a>
+<a class="jxr_linenumber" name="L70" href="#L70">70</a> @Test(expected =
IllegalArgumentException.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L71" href="#L71">71</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testGetStringInconsistentRecord() {
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>
header.put(<span class="jxr_string">"fourth"</span>, Integer.valueOf(4));
+<a class="jxr_linenumber" name="L73" href="#L73">73</a>
recordWithHeader.get(<span class="jxr_string">"fourth"</span>);
+<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> @Test(expected =
IllegalStateException.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L77" href="#L77">77</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testGetStringNoHeader() {
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>
record.get(<span class="jxr_string">"first"</span>);
+<a class="jxr_linenumber" name="L79" href="#L79">79</a> }
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>
+<a class="jxr_linenumber" name="L81" href="#L81">81</a> @Test(expected =
IllegalArgumentException.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L82" href="#L82">82</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testGetUnmappedEnum() {
+<a class="jxr_linenumber" name="L83" href="#L83">83</a>
assertNull(recordWithHeader.get(EnumFixture.UNKNOWN_COLUMN));
+<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> @Test(expected =
IllegalArgumentException.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L87" href="#L87">87</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testGetUnmappedName() {
+<a class="jxr_linenumber" name="L88" href="#L88">88</a>
assertNull(recordWithHeader.get(<span class="jxr_string">"fourth"</span>));
+<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> @Test(expected =
ArrayIndexOutOfBoundsException.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L92" href="#L92">92</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testGetUnmappedNegativeInt() {
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>
assertNull(recordWithHeader.get(Integer.MIN_VALUE));
+<a class="jxr_linenumber" name="L94" href="#L94">94</a> }
+<a class="jxr_linenumber" name="L95" href="#L95">95</a>
+<a class="jxr_linenumber" name="L96" href="#L96">96</a> @Test(expected =
ArrayIndexOutOfBoundsException.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L97" href="#L97">97</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testGetUnmappedPositiveInt() {
+<a class="jxr_linenumber" name="L98" href="#L98">98</a>
assertNull(recordWithHeader.get(Integer.MAX_VALUE));
+<a class="jxr_linenumber" name="L99" href="#L99">99</a> }
+<a class="jxr_linenumber" name="L100" href="#L100">100</a>
+<a class="jxr_linenumber" name="L101" href="#L101">101</a> @Test
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testIsConsistent() {
+<a class="jxr_linenumber" name="L103" href="#L103">103</a>
assertTrue(record.isConsistent());
+<a class="jxr_linenumber" name="L104" href="#L104">104</a>
assertTrue(recordWithHeader.isConsistent());
+<a class="jxr_linenumber" name="L105" href="#L105">105</a>
+<a class="jxr_linenumber" name="L106" href="#L106">106</a>
header.put(<span class="jxr_string">"fourth"</span>, Integer.valueOf(4));
+<a class="jxr_linenumber" name="L107" href="#L107">107</a>
assertFalse(recordWithHeader.isConsistent());
+<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> @Test
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testIsMapped() {
+<a class="jxr_linenumber" name="L112" href="#L112">112</a>
assertFalse(record.isMapped(<span class="jxr_string">"first"</span>));
+<a class="jxr_linenumber" name="L113" href="#L113">113</a>
assertTrue(recordWithHeader.isMapped(<span class="jxr_string">"first"</span>));
+<a class="jxr_linenumber" name="L114" href="#L114">114</a>
assertFalse(recordWithHeader.isMapped(<span
class="jxr_string">"fourth"</span>));
+<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>
testIsSet() {
+<a class="jxr_linenumber" name="L119" href="#L119">119</a>
assertFalse(record.isSet(<span class="jxr_string">"first"</span>));
+<a class="jxr_linenumber" name="L120" href="#L120">120</a>
assertTrue(recordWithHeader.isSet(<span class="jxr_string">"first"</span>));
+<a class="jxr_linenumber" name="L121" href="#L121">121</a>
assertFalse(recordWithHeader.isSet(<span class="jxr_string">"fourth"</span>));
+<a class="jxr_linenumber" name="L122" href="#L122">122</a> }
+<a class="jxr_linenumber" name="L123" href="#L123">123</a>
+<a class="jxr_linenumber" name="L124" href="#L124">124</a> @Test
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testIterator() {
+<a class="jxr_linenumber" name="L126" href="#L126">126</a> <strong
class="jxr_keyword">int</strong> i = 0;
+<a class="jxr_linenumber" name="L127" href="#L127">127</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong>
String value : record) {
+<a class="jxr_linenumber" name="L128" href="#L128">128</a>
assertEquals(values[i], value);
+<a class="jxr_linenumber" name="L129" href="#L129">129</a> i++;
+<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>
+<a class="jxr_linenumber" name="L133" href="#L133">133</a> @Test
+<a class="jxr_linenumber" name="L134" href="#L134">134</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testPutInMap() {
+<a class="jxr_linenumber" name="L135" href="#L135">135</a> <strong
class="jxr_keyword">final</strong> Map<String, String> map = <strong
class="jxr_keyword">new</strong> ConcurrentHashMap<String, String>();
+<a class="jxr_linenumber" name="L136" href="#L136">136</a> <strong
class="jxr_keyword">this</strong>.recordWithHeader.putIn(map);
+<a class="jxr_linenumber" name="L137" href="#L137">137</a> <strong
class="jxr_keyword">this</strong>.validateMap(map, false);
+<a class="jxr_linenumber" name="L138" href="#L138">138</a> <em
class="jxr_comment">// Test that we can compile with assigment to the same map
as the param.</em>
+<a class="jxr_linenumber" name="L139" href="#L139">139</a> <strong
class="jxr_keyword">final</strong> TreeMap<String, String> map2 =
recordWithHeader.putIn(<strong class="jxr_keyword">new</strong>
TreeMap<String, String>());
+<a class="jxr_linenumber" name="L140" href="#L140">140</a> <strong
class="jxr_keyword">this</strong>.validateMap(map2, false);
+<a class="jxr_linenumber" name="L141" href="#L141">141</a> }
+<a class="jxr_linenumber" name="L142" href="#L142">142</a>
+<a class="jxr_linenumber" name="L143" href="#L143">143</a> @Test
+<a class="jxr_linenumber" name="L144" href="#L144">144</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testRemoveAndAddColumns() <strong class="jxr_keyword">throws</strong>
IOException {
+<a class="jxr_linenumber" name="L145" href="#L145">145</a> <em
class="jxr_comment">// do:</em>
+<a class="jxr_linenumber" name="L146" href="#L146">146</a> <strong
class="jxr_keyword">final</strong> CSVPrinter printer = <strong
class="jxr_keyword">new</strong> CSVPrinter(<strong
class="jxr_keyword">new</strong> StringBuilder(), CSVFormat.DEFAULT);
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> <strong
class="jxr_keyword">final</strong> Map<String, String> map =
recordWithHeader.toMap();
+<a class="jxr_linenumber" name="L148" href="#L148">148</a>
map.remove(<span class="jxr_string">"OldColumn"</span>);
+<a class="jxr_linenumber" name="L149" href="#L149">149</a>
map.put(<span class="jxr_string">"ZColumn"</span>, <span
class="jxr_string">"NewValue"</span>);
+<a class="jxr_linenumber" name="L150" href="#L150">150</a> <em
class="jxr_comment">// check:</em>
+<a class="jxr_linenumber" name="L151" href="#L151">151</a> <strong
class="jxr_keyword">final</strong> ArrayList<String> list = <strong
class="jxr_keyword">new</strong> ArrayList<String>(map.values());
+<a class="jxr_linenumber" name="L152" href="#L152">152</a>
Collections.sort(list);
+<a class="jxr_linenumber" name="L153" href="#L153">153</a>
printer.printRecord(list);
+<a class="jxr_linenumber" name="L154" href="#L154">154</a>
Assert.assertEquals(<span class="jxr_string">"A,B,C,NewValue"</span> +
CSVFormat.DEFAULT.getRecordSeparator(), printer.getOut().toString());
+<a class="jxr_linenumber" name="L155" href="#L155">155</a>
printer.close();
+<a class="jxr_linenumber" name="L156" href="#L156">156</a> }
+<a class="jxr_linenumber" name="L157" href="#L157">157</a>
+<a class="jxr_linenumber" name="L158" href="#L158">158</a> @Test
+<a class="jxr_linenumber" name="L159" href="#L159">159</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testToMap() {
+<a class="jxr_linenumber" name="L160" href="#L160">160</a> <strong
class="jxr_keyword">final</strong> Map<String, String> map = <strong
class="jxr_keyword">this</strong>.recordWithHeader.toMap();
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> <strong
class="jxr_keyword">this</strong>.validateMap(map, <strong
class="jxr_keyword">true</strong>);
+<a class="jxr_linenumber" name="L162" href="#L162">162</a> }
+<a class="jxr_linenumber" name="L163" href="#L163">163</a>
+<a class="jxr_linenumber" name="L164" href="#L164">164</a> @Test
+<a class="jxr_linenumber" name="L165" href="#L165">165</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testToMapWithShortRecord() <strong class="jxr_keyword">throws</strong>
Exception {
+<a class="jxr_linenumber" name="L166" href="#L166">166</a> <strong
class="jxr_keyword">final</strong> CSVParser parser = CSVParser.parse(<span
class="jxr_string">"a,b"</span>, CSVFormat.DEFAULT.withHeader(<span
class="jxr_string">"A"</span>, <span class="jxr_string">"B"</span>, <span
class="jxr_string">"C"</span>));
+<a class="jxr_linenumber" name="L167" href="#L167">167</a> <strong
class="jxr_keyword">final</strong> CSVRecord shortRec =
parser.iterator().next();
+<a class="jxr_linenumber" name="L168" href="#L168">168</a>
shortRec.toMap();
+<a class="jxr_linenumber" name="L169" href="#L169">169</a> }
+<a class="jxr_linenumber" name="L170" href="#L170">170</a>
+<a class="jxr_linenumber" name="L171" href="#L171">171</a> @Test
+<a class="jxr_linenumber" name="L172" href="#L172">172</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testToMapWithNoHeader() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L173" href="#L173">173</a> <strong
class="jxr_keyword">final</strong> CSVParser parser = CSVParser.parse(<span
class="jxr_string">"a,b"</span>, CSVFormat.newFormat(','));
+<a class="jxr_linenumber" name="L174" href="#L174">174</a> <strong
class="jxr_keyword">final</strong> CSVRecord shortRec =
parser.iterator().next();
+<a class="jxr_linenumber" name="L175" href="#L175">175</a> <strong
class="jxr_keyword">final</strong> Map<String, String> map =
shortRec.toMap();
+<a class="jxr_linenumber" name="L176" href="#L176">176</a>
assertNotNull(<span class="jxr_string">"Map is not null."</span>, map);
+<a class="jxr_linenumber" name="L177" href="#L177">177</a>
assertTrue(<span class="jxr_string">"Map is empty."</span>, map.isEmpty());
+<a class="jxr_linenumber" name="L178" href="#L178">178</a> }
+<a class="jxr_linenumber" name="L179" href="#L179">179</a>
+<a class="jxr_linenumber" name="L180" href="#L180">180</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong>
validateMap(<strong class="jxr_keyword">final</strong> Map<String,
String> map, <strong class="jxr_keyword">final</strong> <strong
class="jxr_keyword">boolean</strong> allowsNulls) {
+<a class="jxr_linenumber" name="L181" href="#L181">181</a>
assertTrue(map.containsKey(<span class="jxr_string">"first"</span>));
+<a class="jxr_linenumber" name="L182" href="#L182">182</a>
assertTrue(map.containsKey(<span class="jxr_string">"second"</span>));
+<a class="jxr_linenumber" name="L183" href="#L183">183</a>
assertTrue(map.containsKey(<span class="jxr_string">"third"</span>));
+<a class="jxr_linenumber" name="L184" href="#L184">184</a>
assertFalse(map.containsKey(<span class="jxr_string">"fourth"</span>));
+<a class="jxr_linenumber" name="L185" href="#L185">185</a> <strong
class="jxr_keyword">if</strong> (allowsNulls) {
+<a class="jxr_linenumber" name="L186" href="#L186">186</a>
assertFalse(map.containsKey(<strong class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L187" href="#L187">187</a> }
+<a class="jxr_linenumber" name="L188" href="#L188">188</a>
assertEquals(<span class="jxr_string">"A"</span>, map.get(<span
class="jxr_string">"first"</span>));
+<a class="jxr_linenumber" name="L189" href="#L189">189</a>
assertEquals(<span class="jxr_string">"B"</span>, map.get(<span
class="jxr_string">"second"</span>));
+<a class="jxr_linenumber" name="L190" href="#L190">190</a>
assertEquals(<span class="jxr_string">"C"</span>, map.get(<span
class="jxr_string">"third"</span>));
+<a class="jxr_linenumber" name="L191" href="#L191">191</a>
assertEquals(<strong class="jxr_keyword">null</strong>, map.get(<span
class="jxr_string">"fourth"</span>));
+<a class="jxr_linenumber" name="L192" href="#L192">192</a> }
+<a class="jxr_linenumber" name="L193" href="#L193">193</a>
+<a class="jxr_linenumber" name="L194" href="#L194">194</a> }
</pre>
<hr/>
<div id="footer">Copyright © 2014 <a href="http://www.apache.org/";>The
Apache Software Foundation</a>. All rights reserved.</div>
Modified:
websites/production/commons/content/proper/commons-csv/xref-test/org/apache/commons/csv/LexerTest.html
==============================================================================
---
websites/production/commons/content/proper/commons-csv/xref-test/org/apache/commons/csv/LexerTest.html
(original)
+++
websites/production/commons/content/proper/commons-csv/xref-test/org/apache/commons/csv/LexerTest.html
Thu Aug 14 19:48:06 2014
@@ -49,7 +49,7 @@
<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"> *</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: LexerTest.java 1522876 2013-09-13
11:26:59Z britter $</em>
+<a class="jxr_linenumber" name="L44" href="#L44">44</a> <em
class="jxr_javadoccomment"> * @version $Id: LexerTest.java 1612352 2014-07-21
17:18:20Z ggregory $</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/csv/LexerTest.html">LexerTest</a> {
<a class="jxr_linenumber" name="L47" href="#L47">47</a>
@@ -130,7 +130,7 @@
<a class="jxr_linenumber" name="L122" href="#L122">122</a>
<span class="jxr_string">"third,line,#no-comment\n"</span>+
<a class="jxr_linenumber" name="L123" href="#L123">123</a>
<span class="jxr_string">"# penultimate comment\n"</span>+
<a class="jxr_linenumber" name="L124" href="#L124">124</a>
<span class="jxr_string">"# Final comment\n"</span>;
-<a class="jxr_linenumber" name="L125" href="#L125">125</a> <strong
class="jxr_keyword">final</strong> CSVFormat format =
CSVFormat.DEFAULT.withCommentStart('#');
+<a class="jxr_linenumber" name="L125" href="#L125">125</a> <strong
class="jxr_keyword">final</strong> CSVFormat format =
CSVFormat.DEFAULT.withCommentMarker('#');
<a class="jxr_linenumber" name="L126" href="#L126">126</a> <strong
class="jxr_keyword">final</strong> Lexer parser = getLexer(code, format);
<a class="jxr_linenumber" name="L127" href="#L127">127</a>
<a class="jxr_linenumber" name="L128" href="#L128">128</a>
assertThat(parser.nextToken(<strong class="jxr_keyword">new</strong> Token()),
matches(TOKEN, <span class="jxr_string">"first"</span>));
@@ -166,7 +166,7 @@
<a class="jxr_linenumber" name="L158" href="#L158">158</a>
<span class="jxr_string">"\n"</span>+ <em
class="jxr_comment">// 6b</em>
<a class="jxr_linenumber" name="L159" href="#L159">159</a>
<span class="jxr_string">"\n"</span>+ <em
class="jxr_comment">// 6c</em>
<a class="jxr_linenumber" name="L160" href="#L160">160</a>
<span class="jxr_string">"# Final comment\n"</span>; <em
class="jxr_comment">// 7</em>
-<a class="jxr_linenumber" name="L161" href="#L161">161</a> <strong
class="jxr_keyword">final</strong> CSVFormat format =
CSVFormat.DEFAULT.withCommentStart('#').withIgnoreEmptyLines(false);
+<a class="jxr_linenumber" name="L161" href="#L161">161</a> <strong
class="jxr_keyword">final</strong> CSVFormat format =
CSVFormat.DEFAULT.withCommentMarker('#').withIgnoreEmptyLines(false);
<a class="jxr_linenumber" name="L162" href="#L162">162</a>
assertFalse(<span class="jxr_string">"Should not ignore empty lines"</span>,
format.getIgnoreEmptyLines());
<a class="jxr_linenumber" name="L163" href="#L163">163</a>
<a class="jxr_linenumber" name="L164" href="#L164">164</a> <strong
class="jxr_keyword">final</strong> Lexer parser = getLexer(code, format);
@@ -206,7 +206,7 @@
<a class="jxr_linenumber" name="L198" href="#L198">198</a> <em
class="jxr_comment"> */</em>
<a class="jxr_linenumber" name="L199" href="#L199">199</a> <strong
class="jxr_keyword">final</strong> String code = <span
class="jxr_string">"a,\\,,b\\\n\\,,"</span>;
<a class="jxr_linenumber" name="L200" href="#L200">200</a> <strong
class="jxr_keyword">final</strong> CSVFormat format = CSVFormat.DEFAULT;
-<a class="jxr_linenumber" name="L201" href="#L201">201</a>
assertFalse(format.isEscaping());
+<a class="jxr_linenumber" name="L201" href="#L201">201</a>
assertFalse(format.isEscapeCharacterSet());
<a class="jxr_linenumber" name="L202" href="#L202">202</a> <strong
class="jxr_keyword">final</strong> Lexer parser = getLexer(code, format);
<a class="jxr_linenumber" name="L203" href="#L203">203</a>
<a class="jxr_linenumber" name="L204" href="#L204">204</a>
assertThat(parser.nextToken(<strong class="jxr_keyword">new</strong> Token()),
matches(TOKEN, <span class="jxr_string">"a"</span>));
@@ -228,7 +228,7 @@
<a class="jxr_linenumber" name="L220" href="#L220">220</a> <em
class="jxr_comment"> */</em>
<a class="jxr_linenumber" name="L221" href="#L221">221</a> <strong
class="jxr_keyword">final</strong> String code = <span
class="jxr_string">"a,\\,,b\\\\\n\\,,\\\nc,d\\\r\ne"</span>;
<a class="jxr_linenumber" name="L222" href="#L222">222</a> <strong
class="jxr_keyword">final</strong> CSVFormat format =
formatWithEscaping.withIgnoreEmptyLines(false);
-<a class="jxr_linenumber" name="L223" href="#L223">223</a>
assertTrue(format.isEscaping());
+<a class="jxr_linenumber" name="L223" href="#L223">223</a>
assertTrue(format.isEscapeCharacterSet());
<a class="jxr_linenumber" name="L224" href="#L224">224</a> <strong
class="jxr_keyword">final</strong> Lexer parser = getLexer(code, format);
<a class="jxr_linenumber" name="L225" href="#L225">225</a>
<a class="jxr_linenumber" name="L226" href="#L226">226</a>
assertThat(parser.nextToken(<strong class="jxr_keyword">new</strong> Token()),
matches(TOKEN, <span class="jxr_string">"a"</span>));
@@ -287,7 +287,7 @@
<a class="jxr_linenumber" name="L279" href="#L279">279</a> <em
class="jxr_comment"> * ;;</em>
<a class="jxr_linenumber" name="L280" href="#L280">280</a> <em
class="jxr_comment"> */</em>
<a class="jxr_linenumber" name="L281" href="#L281">281</a> <strong
class="jxr_keyword">final</strong> String code = <span class="jxr_string">"a;'b
and '' more\n'\n!comment;;;;\n;;"</span>;
-<a class="jxr_linenumber" name="L282" href="#L282">282</a> <strong
class="jxr_keyword">final</strong> CSVFormat format =
CSVFormat.DEFAULT.withQuoteChar('\'').withCommentStart('!').withDelimiter(';');
+<a class="jxr_linenumber" name="L282" href="#L282">282</a> <strong
class="jxr_keyword">final</strong> CSVFormat format =
CSVFormat.DEFAULT.withQuote('\'').withCommentMarker('!').withDelimiter(';');
<a class="jxr_linenumber" name="L283" href="#L283">283</a> <strong
class="jxr_keyword">final</strong> Lexer parser = getLexer(code, format);
<a class="jxr_linenumber" name="L284" href="#L284">284</a>
assertThat(parser.nextToken(<strong class="jxr_keyword">new</strong> Token()),
matches(TOKEN, <span class="jxr_string">"a"</span>));
<a class="jxr_linenumber" name="L285" href="#L285">285</a>
assertThat(parser.nextToken(<strong class="jxr_keyword">new</strong> Token()),
matches(EORECORD, <span class="jxr_string">"b and ' more\n"</span>));
Modified:
websites/production/commons/content/proper/commons-csv/xref-test/org/apache/commons/csv/package-frame.html
==============================================================================
---
websites/production/commons/content/proper/commons-csv/xref-test/org/apache/commons/csv/package-frame.html
(original)
+++
websites/production/commons/content/proper/commons-csv/xref-test/org/apache/commons/csv/package-frame.html
Thu Aug 14 19:48:06 2014
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html;
charset=UTF-8" />
- <title>Apache Commons CSV 1.0-SNAPSHOT Reference Package
org.apache.commons.csv</title>
+ <title>Apache Commons CSV 1.0 Reference Package
org.apache.commons.csv</title>
<link rel="stylesheet" type="text/css"
href="../../../../stylesheet.css" title="style" />
</head>
<body>
Modified:
websites/production/commons/content/proper/commons-csv/xref-test/org/apache/commons/csv/package-summary.html
==============================================================================
---
websites/production/commons/content/proper/commons-csv/xref-test/org/apache/commons/csv/package-summary.html
(original)
+++
websites/production/commons/content/proper/commons-csv/xref-test/org/apache/commons/csv/package-summary.html
Thu Aug 14 19:48:06 2014
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html;
charset=UTF-8" />
- <title>Apache Commons CSV 1.0-SNAPSHOT Reference Package
org.apache.commons.csv</title>
+ <title>Apache Commons CSV 1.0 Reference Package
org.apache.commons.csv</title>
<link rel="stylesheet" type="text/css"
href="../../../../stylesheet.css" title="style" />
</head>
<body>
Modified:
websites/production/commons/content/proper/commons-csv/xref-test/org/apache/commons/csv/perf/PerformanceTest.html
==============================================================================
---
websites/production/commons/content/proper/commons-csv/xref-test/org/apache/commons/csv/perf/PerformanceTest.html
(original)
+++
websites/production/commons/content/proper/commons-csv/xref-test/org/apache/commons/csv/perf/PerformanceTest.html
Thu Aug 14 19:48:06 2014
@@ -82,7 +82,7 @@
<a class="jxr_linenumber" name="L74" href="#L74">74</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong>
CSVRecord record : format.parse(in)) {
<a class="jxr_linenumber" name="L75" href="#L75">75</a>
recordCount++;
<a class="jxr_linenumber" name="L76" href="#L76">76</a> <strong
class="jxr_keyword">if</strong> (traverseColumns) {
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>
<strong class="jxr_keyword">for</strong> (<strong
class="jxr_keyword">final</strong> String value : record) {
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>
<strong class="jxr_keyword">for</strong> (@SuppressWarnings(<span
class="jxr_string">"unused"</span>) <strong class="jxr_keyword">final</strong>
String value : record) {
<a class="jxr_linenumber" name="L78" href="#L78">78</a>
<em class="jxr_comment">// do nothing for now</em>
<a class="jxr_linenumber" name="L79" href="#L79">79</a> }
<a class="jxr_linenumber" name="L80" href="#L80">80</a> }
Modified:
websites/production/commons/content/proper/commons-csv/xref-test/org/apache/commons/csv/perf/package-frame.html
==============================================================================
---
websites/production/commons/content/proper/commons-csv/xref-test/org/apache/commons/csv/perf/package-frame.html
(original)
+++
websites/production/commons/content/proper/commons-csv/xref-test/org/apache/commons/csv/perf/package-frame.html
Thu Aug 14 19:48:06 2014
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html;
charset=UTF-8" />
- <title>Apache Commons CSV 1.0-SNAPSHOT Reference Package
org.apache.commons.csv.perf</title>
+ <title>Apache Commons CSV 1.0 Reference Package
org.apache.commons.csv.perf</title>
<link rel="stylesheet" type="text/css"
href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified:
websites/production/commons/content/proper/commons-csv/xref-test/org/apache/commons/csv/perf/package-summary.html
==============================================================================
---
websites/production/commons/content/proper/commons-csv/xref-test/org/apache/commons/csv/perf/package-summary.html
(original)
+++
websites/production/commons/content/proper/commons-csv/xref-test/org/apache/commons/csv/perf/package-summary.html
Thu Aug 14 19:48:06 2014
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html;
charset=UTF-8" />
- <title>Apache Commons CSV 1.0-SNAPSHOT Reference Package
org.apache.commons.csv.perf</title>
+ <title>Apache Commons CSV 1.0 Reference Package
org.apache.commons.csv.perf</title>
<link rel="stylesheet" type="text/css"
href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified:
websites/production/commons/content/proper/commons-csv/xref-test/overview-frame.html
==============================================================================
---
websites/production/commons/content/proper/commons-csv/xref-test/overview-frame.html
(original)
+++
websites/production/commons/content/proper/commons-csv/xref-test/overview-frame.html
Thu Aug 14 19:48:06 2014
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html;
charset=UTF-8" />
- <title>Apache Commons CSV 1.0-SNAPSHOT Reference</title>
+ <title>Apache Commons CSV 1.0 Reference</title>
<link rel="stylesheet" type="text/css" href="stylesheet.css"
title="style" />
</head>
<body>
Modified:
websites/production/commons/content/proper/commons-csv/xref-test/overview-summary.html
==============================================================================
---
websites/production/commons/content/proper/commons-csv/xref-test/overview-summary.html
(original)
+++
websites/production/commons/content/proper/commons-csv/xref-test/overview-summary.html
Thu Aug 14 19:48:06 2014
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html;
charset=UTF-8" />
- <title>Apache Commons CSV 1.0-SNAPSHOT Reference</title>
+ <title>Apache Commons CSV 1.0 Reference</title>
<link rel="stylesheet" type="text/css" href="stylesheet.css"
title="style" />
</head>
<body>
@@ -24,7 +24,7 @@
</ul>
</div>
- <h2>Apache Commons CSV 1.0-SNAPSHOT Reference</h2>
+ <h2>Apache Commons CSV 1.0 Reference</h2>
<table class="summary">
<thead>
Modified:
websites/production/commons/content/proper/commons-csv/xref/allclasses-frame.html
==============================================================================
---
websites/production/commons/content/proper/commons-csv/xref/allclasses-frame.html
(original)
+++
websites/production/commons/content/proper/commons-csv/xref/allclasses-frame.html
Thu Aug 14 19:48:06 2014
@@ -36,7 +36,7 @@
<a href="org/apache/commons/csv/Lexer.html"
target="classFrame">Lexer</a>
</li>
<li>
- <a href="org/apache/commons/csv/Quote.html"
target="classFrame">Quote</a>
+ <a href="org/apache/commons/csv/QuoteMode.html"
target="classFrame">QuoteMode</a>
</li>
<li>
<a href="org/apache/commons/csv/Token.html"
target="classFrame">Token</a>
Modified: websites/production/commons/content/proper/commons-csv/xref/index.html
==============================================================================
--- websites/production/commons/content/proper/commons-csv/xref/index.html
(original)
+++ websites/production/commons/content/proper/commons-csv/xref/index.html Thu
Aug 14 19:48:06 2014
@@ -4,7 +4,7 @@
<!-- this is a JXR report set -->
<head>
<meta http-equiv="content-type" content="text/html;
charset=UTF-8" />
- <title>Apache Commons CSV 1.0-SNAPSHOT Reference</title>
+ <title>Apache Commons CSV 1.0 Reference</title>
</head>
<frameset cols="20%,80%">
<frameset rows="30%,70%">
