CSV-113 Check whether ISE/IAE are being used appropriately

sebbASF · sebbASF · commit 88a7e755e61e · 2014-05-07T22:12:56.000Z
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1593148 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -40,6 +40,7 @@ The <action> type attribute can be add,update,fix,remove.
   <body>
 
     <release version="1.0" date="TBD" description="First release">
+        <action issue="CSV-113" type="fix" dev="sebb">Check whether ISE/IAE are being used appropriately</action>
         <action issue="CSV-114" type="fix" dev="sebb">CSVFormat constructor should reject a header array with duplicate entries</action>
         <action issue="CSV-112" type="fix" dev="britter">HeaderMap is inconsistent when it is parsed from an input with duplicate columns names</action>
         <action issue="CSV-111" type="fix" dev="ggregory">CSVRecord.toMap() fails if row length shorter than header length</action>
diff --git a/src/main/java/org/apache/commons/csv/CSVParser.java b/src/main/java/org/apache/commons/csv/CSVParser.java
@@ -236,7 +236,7 @@ public static CSVParser parse(final URL url, final Charset charset, final CSVFor
      * @throws IllegalArgumentException
      *             If the parameters of the format are inconsistent or if either reader or format are null.
      * @throws IOException
-     *             If an I/O error occurs
+     *             If there is a problem reading the header or skipping the first record
      */
     public CSVParser(final Reader reader, final CSVFormat format) throws IOException {
         Assertions.notNull(reader, "reader");
@@ -352,6 +352,7 @@ public <T extends Collection<CSVRecord>> T getRecords(T records) throws IOExcept
      * Initializes the name to index mapping if the format defines a header.
      *
      * @return null if the format has no header.
+     * @throws IOException if there is a problem reading the header or skipping the first record
      */
     private Map<String, Integer> initializeHeader() throws IOException {
         Map<String, Integer> hdrMap = null;
@@ -377,7 +378,7 @@ private Map<String, Integer> initializeHeader() throws IOException {
             if (header != null) {
                 for (int i = 0; i < header.length; i++) {
                     if (hdrMap.containsKey(header[i])) {
-                        throw new IllegalStateException("The header contains duplicate names: " +
+                        throw new IllegalArgumentException("The header contains duplicate names: " +
                                 Arrays.toString(header));
                     }
                     hdrMap.put(header[i], Integer.valueOf(i));
diff --git a/src/test/java/org/apache/commons/csv/CSVParserTest.java b/src/test/java/org/apache/commons/csv/CSVParserTest.java
@@ -492,7 +492,7 @@ public void testGetHeaderMap() throws Exception {
         parser.close();
     }
 
-    @Test(expected = IllegalStateException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void testDuplicateHeaderEntries() throws Exception {
         CSVParser.parse("a,b,a\n1,2,3\nx,y,z", CSVFormat.DEFAULT.withHeader(new String[]{}));
     }

Original file line number	Diff line number	Diff line change
`@@ -492,7 +492,7 @@ public void testGetHeaderMap() throws Exception {`
`492`	`492`	`parser.close();`
`493`	`493`	`}`
`494`	`494`
`495`		`- @Test(expected = IllegalStateException.class)`
	`495`	`+ @Test(expected = IllegalArgumentException.class)`
`496`	`496`	`public void testDuplicateHeaderEntries() throws Exception {`
`497`	`497`	`CSVParser.parse("a,b,a\n1,2,3\nx,y,z", CSVFormat.DEFAULT.withHeader(new String[]{}));`
`498`	`498`	`}`