fix issue with the @table annotation when combining numberedRows with…

… columnTitles (fixes #166)
TNG · Nov 11, 2015 · 0eb2ec6 · 0eb2ec6
1 parent 97af18e
commit 0eb2ec6
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Fixed issue with primitive arrays and the @Table annotation [#162](https://github.com/TNG/JGiven/issues/162)
 * Fixed an issue when using the `@Table` parameter that could lead to unwanted parameters in the data table [#161](https://github.com/TNG/JGiven/issues/161)
 * Fixed an issue with the Maven Plugin where the customJsFile parameter actually set the customCssFile parameter [#167](https://github.com/TNG/JGiven/issues/167)
+* Fixed an issue with the @Table annotation when combining numberedRows with columnTitles [#166](https://github.com/TNG/JGiven/issues/166)
 
 ## New Features
 

diff --git a/jgiven-core/src/main/java/com/tngtech/jgiven/report/model/DataTable.java b/jgiven-core/src/main/java/com/tngtech/jgiven/report/model/DataTable.java
@@ -1,7 +1,9 @@
 package com.tngtech.jgiven.report.model;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import com.google.common.collect.Lists;
 import com.tngtech.jgiven.annotation.Table.HeaderType;
 import com.tngtech.jgiven.impl.util.AssertionUtil;
 
@@ -22,7 +24,17 @@ public class DataTable {
 
     public DataTable( HeaderType headerType, List<List<String>> data ) {
         this.headerType = headerType;
-        this.data = data;
+        this.data = copy( data );
+    }
+
+    private List<List<String>> copy( List<List<String>> data ) {
+        List<List<String>> dataCopy = Lists.newArrayListWithExpectedSize( data.size() );
+
+        for( List<String> row : data ) {
+            dataCopy.add( new ArrayList<String>( row ) );
+        }
+
+        return dataCopy;
     }
 
     public HeaderType getHeaderType() {

diff --git a/jgiven-examples/src/test/java/com/tngtech/jgiven/examples/datatable/DataTableExamples.java b/jgiven-examples/src/test/java/com/tngtech/jgiven/examples/datatable/DataTableExamples.java
@@ -52,6 +52,10 @@ public void a_list_of_POJOs_with_numbered_rows(
 
         public void a_list_of_POJOs_with_numbered_rows_and_custom_header(
                 @Table( numberedRowsHeader = "Counter" ) TestCustomer... testCustomer ) {}
+
+        public void a_two_dimensional_array_with_numbered_rows(
+                @Table( numberedRows = true, columnTitles = "t" ) Object[][] testCustomer ) {}
+
     }
 
     static class TestCustomer {
@@ -131,4 +135,11 @@ public void parameter_tables_can_have_numbered_rows_with_custom_headers() {
             new TestCustomer( "Lee Smith", "lee@smith.com" )
             );
     }
+
+    @Test
+    public void two_dimensional_arrays_can_be_numbered() {
+        given().a_two_dimensional_array_with_numbered_rows( new Object[][] {
+            { "a" },
+            { "b" } } );
+    }
 }