Update for number-and-pickle-if-parameterized

Author: mpkorstanje

cucumber-junit-platform-engine/README.md

@@ -433,7 +433,7 @@ cucumber.junit-platform.naming-strategy.long.example-name=     # number, number-
                                                                # long naming strategy is used
                                                                
 cucumber.junit-platform.naming-strategy.surefire.example-name= # number or pickle.
-                                                               # default: number
+                                                               # default: number-and-pickle-if-parameterized
                                                                # Use example number or pickle name for examples when
                                                                # surefire naming strategy is used
 

cucumber-junit-platform-engine/src/main/java/io/cucumber/junit/platform/engine/Constants.java

@@ -135,11 +135,11 @@ public final class Constants {
      * {@code Feature Name - Rule Name - Scenario Name - Examples Name - Example #N }.
      * This is useful for tools that only report the test name such as Gradle.
      * <p>
-     * When the {@code surefire} naming strategy is used nodes are named such
-     * that the Surefire makes sense. The feature name will be rendered as the
-     * class name. The long name without the feature will be rendered as the
-     * test\ method name. For example:
-     * {@code Feature Name.Rule Name - Scenario Name - Examples Name - Example #N }.
+     * When the {@code surefire} naming strategy is used nodes are named such that
+     * the Surefire output makes sense. The feature name will be rendered as the
+     * class name. The long name without the feature will be rendered as the test
+     * method name. For example:
+     * {@code Feature Name.Rule Name - Scenario Name - Examples Name - Example #N}.
      */
     @API(status = Status.EXPERIMENTAL, since = "7.0.0")
     public static final String JUNIT_PLATFORM_NAMING_STRATEGY_PROPERTY_NAME = "cucumber.junit-platform.naming-strategy";

cucumber-junit-platform-engine/src/main/java/io/cucumber/junit/platform/engine/DefaultNamingStrategyProvider.java

@@ -39,7 +39,7 @@ NamingStrategy create(ConfigurationParameters configuration) {
         NamingStrategy create(ConfigurationParameters configuration) {
             return configuration.get(JUNIT_PLATFORM_SUREFIRE_NAMING_STRATEGY_EXAMPLE_NAME_PROPERTY_NAME)
                     .map(DefaultNamingStrategyProvider::parseStrategy)
-                    .orElse(DefaultNamingStrategyProvider::exampleNumberStrategy)
+                    .orElse(DefaultNamingStrategyProvider::exampleNumberAndPickleIfParameterizedStrategy)
                     .apply(DefaultNamingStrategyProvider::surefireStrategy);
         }
     };

cucumber-junit-platform-engine/src/test/java/io/cucumber/junit/platform/engine/FeatureResolverTest.java

@@ -221,12 +221,12 @@ void shortNamesWithPickleNamesIfParameterized() {
     }
 
     @Test
-    void surefireNames() {
+    void surefireNamesWithPickleNamesIfParameterized() {
         configurationParameters = new MapConfigurationParameters(
             JUNIT_PLATFORM_NAMING_STRATEGY_PROPERTY_NAME, "surefire");
 
-        TestDescriptor example = getExample();
-        assertEquals("A scenario outline - With some text - Example #1.1",
+        TestDescriptor example = getParametrizedExample();
+        assertEquals("A scenario with <example> - Examples - Example #1.1: A scenario with A",
             example.getDisplayName());
 
         TestDescriptor examples = example.getParent().get();
@@ -235,7 +235,7 @@ void surefireNames() {
 
         TestDescriptor feature = examples.getParent().get();
         assertEquals("A feature with scenario outlines",
-            examples.getDisplayName());
+                feature.getDisplayName());
     }
 
     private TestDescriptor getExample() {

cucumber-junit-platform-engine/src/test/resources/io/cucumber/junit/platform/engine/feature-with-outline.feature

@@ -48,3 +48,15 @@ Feature: A feature with scenario outlines
       | example |
       | A       |
       | B       |
+  
+  @ScenarioOutlineTag
+  Scenario Outline: A scenario with <example>
+    Given a parameterized scenario outline
+    When it is executed
+    Then <example> is used
+
+    @Example1Tag
+    Examples:
+      | example |
+      | A       |
+      | B       |