Merge #658. Update History.md.

Author: brasmusson

History.md

@@ -1,5 +1,6 @@
 ## [1-1-6-SNAPSHOT (Git master)](https://github.com/cucumber/cucumber-jvm/compare/v1.1.5...master)
 
+* [Core] More precise handling of the XStream errors. ([#657](https://github.com/cucumber/cucumber-jvm/issues/657), [#658](https://github.com/cucumber/cucumber-jvm/pull/658) Mykola Gurov)
 * [Core] Performance improvement: URLOutputStream can write several bytes, not just one-by-one. ([#654](https://github.com/cucumber/cucumber-jvm/issues/654) Aslak Hellesøy)
 * [Core] Add support for transposed tables. ([#382](https://github.com/cucumber/cucumber-jvm/issues/382), [#635](https://github.com/cucumber/cucumber-jvm/pull/635), Roberto Lo Giacco)
 * [Examples] Fixed concurrency bugs in Webbit Selenium example (Aslak Hellesøy)

core/src/main/java/cucumber/runtime/table/TableConverter.java

@@ -107,8 +107,14 @@ private <T> List<T> toListOfComplexType(DataTable dataTable, Class<T> itemType)
             return Collections.unmodifiableList((List<T>) xStream.unmarshal(reader));
         } catch (AbstractReflectionConverter.UnknownFieldException e) {
             throw new CucumberException(e.getShortMessage());
+        } catch (AbstractReflectionConverter.DuplicateFieldException e) {
+            throw new CucumberException(e.getShortMessage());
         } catch (ConversionException e) {
-            throw new CucumberException(String.format("Can't assign null value to one of the primitive fields in %s. Please use boxed types.", e.get("class")));
+            if (e.getCause() instanceof NullPointerException) {
+                throw new CucumberException(String.format("Can't assign null value to one of the primitive fields in %s. Please use boxed types.", e.get("class")));
+            } else {
+                throw new CucumberException(e);
+            }
         }
     }
 

core/src/test/java/cucumber/runtime/table/ToDataTableTest.java

@@ -81,6 +81,20 @@ public void gives_a_nice_error_message_when_primitive_field_is_null() {
         }
     }
 
+    @Test
+    public void gives_a_meaningfull_error_message_when_field_is_repeated() {
+        try {
+            tc.toList(UserPojo.class, TableParser.parse("" +
+                    "| credits     | credits     |\n" +
+                    "| 5           | 5           |\n" +
+                    "", PARAMETER_INFO)
+            );
+            fail();
+        } catch (CucumberException e) {
+            assertEquals("Duplicate field credits", e.getMessage());
+        }
+    }
+
     @Test
     public void converts_list_of_beans_to_table_with_explicit_columns() {
         List<UserPojo> users = tc.toList(UserPojo.class, personTable());