JBEHAVE-1604 Fix loading of chained tables without user properties

Author: uarlouski

jbehave-core/src/main/java/org/jbehave/core/model/ExamplesTable.java

@@ -369,12 +369,10 @@ public String asString() {
             return EMPTY_VALUE;
         }
         StringBuilder sb = new StringBuilder();
-        for (TableProperties properties : tablePropertiesQueue) {
-            String propertiesAsString = properties.getPropertiesAsString();
-            if (!propertiesAsString.isEmpty()) {
-                sb.append(properties.asString()).append(lastTableProperties().getRowSeparator());
-            }
-        }
+        tablePropertiesQueue.stream().filter(t -> !t.isEmpty())
+                                     .map(TableProperties::asString)
+                                     .forEach(props -> sb.append(props)
+                                                         .append(lastTableProperties().getRowSeparator()));
         sb.append(ExamplesTableStringBuilder.buildExamplesTableString(lastTableProperties(), getHeaders(),
                 tableRows.getRows()));
 
@@ -558,6 +556,10 @@ public Properties getProperties() {
         public String getPropertiesAsString() {
             return propertiesAsString;
         }
+
+        public boolean isEmpty() {
+            return getPropertiesAsString().trim().isEmpty();
+        }
     }
 
     static final class TablePropertiesQueue {

jbehave-core/src/main/java/org/jbehave/core/model/ExamplesTableFactory.java

@@ -108,7 +108,8 @@ public ExamplesTable createExamplesTable(String input) {
 
             String table = tablePropertiesQueue.getTable();
             if (isExternal(tablePropertiesQueue.getTable(), headProperties)) {
-                table = target.stream().map(TableProperties::asString)
+                table = target.stream().filter(t -> !t.isEmpty())
+                                       .map(TableProperties::asString)
                                        .collect(Collectors.joining(
                                                System.lineSeparator(),
                                                "",

jbehave-core/src/test/java/org/jbehave/core/model/ExamplesTableFactoryBehaviour.java

@@ -208,6 +208,20 @@ void shouldLoadTableFromAnotherTableContainingTableReference() {
         ensureRowContentIs(rows, 2, asList("STK2", "17.0", "16.0", "ON"));
     }
 
+    @Test
+    void shouldLoadTableFromAnotherTableContainingTableReferenceAndNoTableProperties() {
+        // Given
+        ExamplesTableFactory factory = new ExamplesTableFactory(new LoadFromClasspath(), new TableTransformers());
+        // When
+        ExamplesTable table = factory.createExamplesTable("data-simple-reference.table");
+
+        // Then
+        assertThat(table.getHeaders(), equalTo(asList("Language")));
+        List<Map<String, String>> rows = table.getRows();
+        assertThat(rows.size(), equalTo(1));
+        ensureRowContentIs(rows, 0, asList("Java"));
+    }
+
     private void ensureRowContentIs(List<Map<String, String>> rows, int row, List<String> expected) {
         assertThat(new ArrayList<>(rows.get(row).values()), equalTo(expected));
     }

jbehave-core/src/test/resources/data-simple-reference.table

@@ -0,0 +1 @@
+data-simple.table

jbehave-core/src/test/resources/data-simple.table

@@ -0,0 +1,2 @@
+|Language|
+|Java    |