fix cucumberjvm2 examples processing (via allure-framework#388)

Artem Eroshenko · baev · commit d5d5c9025208 · 2019-09-07T21:23:40.000+02:00
diff --git a/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/AllureCucumber2Jvm.java b/allure-cucumber2-jvm/src/main/java/io/qameta/allure/cucumber2jvm/AllureCucumber2Jvm.java
@@ -35,6 +35,7 @@
 import gherkin.ast.Feature;
 import gherkin.ast.ScenarioDefinition;
 import gherkin.ast.ScenarioOutline;
+import gherkin.ast.TableCell;
 import gherkin.pickles.PickleCell;
 import gherkin.pickles.PickleRow;
 import gherkin.pickles.PickleTable;
@@ -52,7 +53,6 @@
 import java.io.ByteArrayInputStream;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Deque;
 import java.util.HashMap;
@@ -291,21 +291,24 @@ private Status translateTestCaseStatus(final Result testCaseResult) {
     }
 
     private List<Parameter> getExamplesAsParameters(final ScenarioOutline scenarioOutline) {
-        final List<Parameter> parameterList = new ArrayList<>();
-        final List<Examples> scenarioOutlineList = scenarioOutline.getExamples().stream()
-                .filter(examples -> examples.getLocation().getLine() + 2 == currentTestCase.getLine())
-                .collect(Collectors.toList());
-
-        scenarioOutlineList.forEach(examples -> examples.getTableBody()
-                .forEach(tableRow -> {
-                    IntStream.range(0, examples.getTableHeader().getCells().size())
-                            .forEach(consumer -> {
-                                final String name = examples.getTableHeader().getCells().get(consumer).getValue();
-                                final String value = tableRow.getCells().get(consumer).getValue();
-                                parameterList.add(new Parameter().setName(name).setValue(value));
-                            });
-                }));
-        return parameterList;
+        final int gap = 2;
+        final Optional<Examples> examplesBlock = scenarioOutline.getExamples().stream()
+                .filter(e -> currentTestCase.getLine() >= e.getLocation().getLine() + gap)
+                .filter(e -> currentTestCase.getLine() < e.getLocation().getLine() + e.getTableBody().size() + gap)
+                .findFirst();
+
+        if (examplesBlock.isPresent()) {
+            final Examples examples = examplesBlock.get();
+            final int rowIndex = currentTestCase.getLine() - examples.getLocation().getLine() - gap;
+            final List<TableCell> names = examples.getTableHeader().getCells();
+            final List<TableCell> values = examples.getTableBody().get(rowIndex).getCells();
+            return IntStream.range(0, examplesBlock.get().getTableHeader().getCells().size()).mapToObj(index -> {
+                final String name = names.get(index).getValue();
+                final String value = values.get(index).getValue();
+                return new Parameter().setName(name).setValue(value);
+            }).collect(Collectors.toList());
+        }
+        return Collections.emptyList();
     }
 
     private void createDataTableAttachment(final PickleTable pickleTable) {
diff --git a/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/AllureCucumber2JvmTest.java b/allure-cucumber2-jvm/src/test/java/io/qameta/allure/cucumber2jvm/AllureCucumber2JvmTest.java
@@ -280,14 +280,19 @@ void shouldAddParametersFromExamples() {
         assertThat(testResults)
                 .hasSize(2);
 
+        assertThat(testResults.get(0).getParameters())
+                .hasSize(3);
+
+        assertThat(testResults.get(1).getParameters())
+                .hasSize(3);
+
         assertThat(testResults)
                 .flatExtracting(TestResult::getParameters)
                 .extracting(Parameter::getName, Parameter::getValue)
                 .containsExactlyInAnyOrder(
                         tuple("a", "1"), tuple("b", "3"), tuple("result", "4"),
                         tuple("a", "2"), tuple("b", "4"), tuple("result", "6")
                 );
-
     }
 
     @AllureFeatures.Parameters
diff --git a/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/AllureCucumber3JvmTest.java b/allure-cucumber3-jvm/src/test/java/io/qameta/allure/cucumber3jvm/AllureCucumber3JvmTest.java
@@ -269,6 +269,12 @@ void shouldAddParametersFromExamples() {
         assertThat(testResults)
                 .hasSize(2);
 
+        assertThat(testResults.get(0).getParameters())
+                .hasSize(3);
+
+        assertThat(testResults.get(1).getParameters())
+                .hasSize(3);
+
         assertThat(testResults)
                 .flatExtracting(TestResult::getParameters)
                 .extracting(Parameter::getName, Parameter::getValue)
diff --git a/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java b/allure-cucumber4-jvm/src/test/java/io/qameta/allure/cucumber4jvm/AllureCucumber4JvmTest.java
@@ -301,13 +301,20 @@ void shouldAddParametersFromExamples() {
         assertThat(testResults)
                 .hasSize(2);
 
+        assertThat(testResults.get(0).getParameters())
+                .hasSize(3);
+
+        assertThat(testResults.get(1).getParameters())
+                .hasSize(3);
+
         assertThat(testResults)
                 .flatExtracting(TestResult::getParameters)
                 .extracting(Parameter::getName, Parameter::getValue)
                 .containsExactlyInAnyOrder(
                         tuple("a", "1"), tuple("b", "3"), tuple("result", "4"),
                         tuple("a", "2"), tuple("b", "4"), tuple("result", "6")
                 );
+
     }
 
     @AllureFeatures.Parameters
