Include pickle name if parameterized

mpkorstanje · mpkorstanje · commit 516506422afc · 2024-05-26T03:36:03.000+02:00
diff --git a/cucumber-core/src/test/java/io/cucumber/core/plugin/TeamCityPluginTest.java b/cucumber-core/src/test/java/io/cucumber/core/plugin/TeamCityPluginTest.java
@@ -72,7 +72,7 @@ void should_handle_scenario_outline() {
                 "##teamcity[testSuiteStarted timestamp = '1970-01-01T12:00:00.000+0000' locationHint = '" + location
                 + "path/test.feature:5' name = 'examples name']\n" +
                 "##teamcity[testSuiteStarted timestamp = '1970-01-01T12:00:00.000+0000' locationHint = '" + location
-                + "path/test.feature:7' name = 'Example #1.1']\n" +
+                + "path/test.feature:7' name = 'Example #1.1 - name 1']\n" +
                 "##teamcity[customProgressStatus type = 'testStarted' timestamp = '1970-01-01T12:00:00.000+0000']\n" +
                 "##teamcity[testStarted timestamp = '1970-01-01T12:00:00.000+0000' locationHint = '" + location
                 + "path/test.feature:3' captureStandardOutput = 'true' name = 'first step']\n" +
@@ -83,9 +83,10 @@ void should_handle_scenario_outline() {
                 "##teamcity[testFinished timestamp = '1970-01-01T12:00:00.000+0000' duration = '0' name = 'second step']\n"
                 +
                 "##teamcity[customProgressStatus type = 'testFinished' timestamp = '1970-01-01T12:00:00.000+0000']\n" +
-                "##teamcity[testSuiteFinished timestamp = '1970-01-01T12:00:00.000+0000' name = 'Example #1.1']\n" +
+                "##teamcity[testSuiteFinished timestamp = '1970-01-01T12:00:00.000+0000' name = 'Example #1.1 - name 1']\n"
+                +
                 "##teamcity[testSuiteStarted timestamp = '1970-01-01T12:00:00.000+0000' locationHint = '" + location
-                + "path/test.feature:8' name = 'Example #1.2']\n" +
+                + "path/test.feature:8' name = 'Example #1.2 - name 2']\n" +
                 "##teamcity[customProgressStatus type = 'testStarted' timestamp = '1970-01-01T12:00:00.000+0000']\n" +
                 "##teamcity[testStarted timestamp = '1970-01-01T12:00:00.000+0000' locationHint = '" + location
                 + "path/test.feature:3' captureStandardOutput = 'true' name = 'first step']\n" +
@@ -96,7 +97,8 @@ void should_handle_scenario_outline() {
                 "##teamcity[testFinished timestamp = '1970-01-01T12:00:00.000+0000' duration = '0' name = 'third step']\n"
                 +
                 "##teamcity[customProgressStatus type = 'testFinished' timestamp = '1970-01-01T12:00:00.000+0000']\n" +
-                "##teamcity[testSuiteFinished timestamp = '1970-01-01T12:00:00.000+0000' name = 'Example #1.2']\n" +
+                "##teamcity[testSuiteFinished timestamp = '1970-01-01T12:00:00.000+0000' name = 'Example #1.2 - name 2']\n"
+                +
                 "##teamcity[customProgressStatus testsCategory = '' count = '0' timestamp = '1970-01-01T12:00:00.000+0000']\n"
                 +
                 "##teamcity[testSuiteFinished timestamp = '1970-01-01T12:00:00.000+0000' name = 'examples name']\n" +
diff --git a/cucumber-gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesExample.java b/cucumber-gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesExample.java
@@ -8,12 +8,16 @@
 
 final class GherkinMessagesExample implements Node.Example {
 
+    private final GherkinMessagesFeature feature;
     private final TableRow tableRow;
     private final int examplesIndex;
     private final int rowIndex;
     private final Node parent;
 
-    GherkinMessagesExample(Node parent, TableRow tableRow, int examplesIndex, int rowIndex) {
+    GherkinMessagesExample(
+            GherkinMessagesFeature feature, Node parent, TableRow tableRow, int examplesIndex, int rowIndex
+    ) {
+        this.feature = feature;
         this.parent = parent;
         this.tableRow = tableRow;
         this.examplesIndex = examplesIndex;
@@ -32,7 +36,18 @@ public Optional<String> getKeyword() {
 
     @Override
     public Optional<String> getName() {
-        return Optional.of("Example #" + examplesIndex + "." + rowIndex);
+        String pickleName = feature.getPickleAt(this).getName();
+        boolean parameterized = !parent.getParent()
+                .filter(GherkinMessagesScenarioOutline.class::isInstance)
+                .flatMap(Node::getName)
+                .map(pickleName::equals)
+                .orElse(true);
+
+        StringBuilder builder = new StringBuilder("Example #" + examplesIndex + "." + rowIndex);
+        if (parameterized) {
+            builder.append(" - ").append(pickleName);
+        }
+        return Optional.of(builder.toString());
     }
 
     @Override
diff --git a/cucumber-gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesExamples.java b/cucumber-gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesExamples.java
@@ -11,18 +11,23 @@
 
 final class GherkinMessagesExamples implements Node.Examples {
 
+    private final GherkinMessagesFeature feature;
     private final io.cucumber.messages.types.Examples examples;
     private final List<Example> children;
     private final Location location;
     private final Node parent;
 
-    GherkinMessagesExamples(Node parent, io.cucumber.messages.types.Examples examples, int examplesIndex) {
+    GherkinMessagesExamples(
+            GherkinMessagesFeature feature, Node parent, io.cucumber.messages.types.Examples examples, int examplesIndex
+    ) {
+        this.feature = feature;
         this.parent = parent;
         this.examples = examples;
         this.location = GherkinMessagesLocation.from(examples.getLocation());
         AtomicInteger row = new AtomicInteger(1);
         this.children = examples.getTableBody().stream()
-                .map(tableRow -> new GherkinMessagesExample(this, tableRow, examplesIndex, row.getAndIncrement()))
+                .map(tableRow -> new GherkinMessagesExample(feature, this, tableRow, examplesIndex,
+                    row.getAndIncrement()))
                 .collect(Collectors.toList());
     }
 
diff --git a/cucumber-gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesFeature.java b/cucumber-gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesFeature.java
@@ -46,12 +46,12 @@ final class GherkinMessagesFeature implements Feature {
 
     private Node mapRuleOrScenario(FeatureChild featureChild) {
         if (featureChild.getRule().isPresent()) {
-            return new GherkinMessagesRule(this, featureChild.getRule().get());
+            return new GherkinMessagesRule(this, this, featureChild.getRule().get());
         }
 
         io.cucumber.messages.types.Scenario scenario = featureChild.getScenario().get();
         if (!scenario.getExamples().isEmpty()) {
-            return new GherkinMessagesScenarioOutline(this, scenario);
+            return new GherkinMessagesScenarioOutline(this, this, scenario);
         }
         return new GherkinMessagesScenario(this, scenario);
     }
diff --git a/cucumber-gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesRule.java b/cucumber-gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesRule.java
@@ -15,7 +15,7 @@ final class GherkinMessagesRule implements Node.Rule {
     private final io.cucumber.messages.types.Rule rule;
     private final List<Node> children;
 
-    GherkinMessagesRule(Node parent, io.cucumber.messages.types.Rule rule) {
+    GherkinMessagesRule(GherkinMessagesFeature feature, Node parent, io.cucumber.messages.types.Rule rule) {
         this.parent = parent;
         this.rule = rule;
         this.children = rule.getChildren().stream()
@@ -24,7 +24,7 @@ final class GherkinMessagesRule implements Node.Rule {
                 .map(Optional::get)
                 .map(scenario -> {
                     if (!scenario.getExamples().isEmpty()) {
-                        return new GherkinMessagesScenarioOutline(this, scenario);
+                        return new GherkinMessagesScenarioOutline(feature, this, scenario);
                     } else {
                         return new GherkinMessagesScenario(this, scenario);
                     }
diff --git a/cucumber-gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesScenarioOutline.java b/cucumber-gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesScenarioOutline.java
@@ -15,12 +15,14 @@ final class GherkinMessagesScenarioOutline implements Node.ScenarioOutline {
     private final List<Examples> children;
     private final Node parent;
 
-    GherkinMessagesScenarioOutline(Node parent, io.cucumber.messages.types.Scenario scenario) {
+    GherkinMessagesScenarioOutline(
+            GherkinMessagesFeature feature, Node parent, io.cucumber.messages.types.Scenario scenario
+    ) {
         this.parent = parent;
         this.scenario = scenario;
         AtomicInteger examplesIndex = new AtomicInteger(1);
         this.children = scenario.getExamples().stream()
-                .map(examples -> new GherkinMessagesExamples(this, examples, examplesIndex.getAndIncrement()))
+                .map(examples -> new GherkinMessagesExamples(feature, this, examples, examplesIndex.getAndIncrement()))
                 .collect(Collectors.toList());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -46,12 +46,12 @@ final class GherkinMessagesFeature implements Feature {`
`46`	`46`
`47`	`47`	`private Node mapRuleOrScenario(FeatureChild featureChild) {`
`48`	`48`	`if (featureChild.getRule().isPresent()) {`
`49`		`- return new GherkinMessagesRule(this, featureChild.getRule().get());`
	`49`	`+ return new GherkinMessagesRule(this, this, featureChild.getRule().get());`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`io.cucumber.messages.types.Scenario scenario = featureChild.getScenario().get();`
`53`	`53`	`if (!scenario.getExamples().isEmpty()) {`
`54`		`- return new GherkinMessagesScenarioOutline(this, scenario);`
	`54`	`+ return new GherkinMessagesScenarioOutline(this, this, scenario);`
`55`	`55`	`}`
`56`	`56`	`return new GherkinMessagesScenario(this, scenario);`
`57`	`57`	`}`