cucumber · mpkorstanje · Oct 7, 2019 · Aug 28, 2019
diff --git a/core/src/main/java/io/cucumber/core/cli/Main.java b/core/src/main/java/io/cucumber/core/cli/Main.java
@@ -50,8 +50,8 @@ public static byte run(String[] argv, ClassLoader classLoader) {
 
         RuntimeOptions runtimeOptions = new CommandlineOptionsParser()
             .parse(argv)
-            .addDefaultFormatterIfNotPresent()
-            .addDefaultSummaryPrinterIfNotPresent()
+            .addDefaultFormatterIfAbsent()
+            .addDefaultSummaryPrinterIfAbsent()
             .build(systemOptions);
 
 

diff --git a/core/src/main/java/io/cucumber/core/options/PluginOption.java b/core/src/main/java/io/cucumber/core/options/PluginOption.java
@@ -1,9 +1,5 @@
 package io.cucumber.core.options;
 
-import io.cucumber.plugin.Plugin;
-import io.cucumber.plugin.SummaryPrinter;
-import io.cucumber.plugin.ConcurrentEventListener;
-import io.cucumber.plugin.EventListener;
 import io.cucumber.core.exception.CucumberException;
 import io.cucumber.core.logging.Logger;
 import io.cucumber.core.logging.LoggerFactory;
@@ -20,6 +16,10 @@
 import io.cucumber.core.plugin.TimelineFormatter;
 import io.cucumber.core.plugin.UnusedStepsSummaryPrinter;
 import io.cucumber.core.plugin.UsageFormatter;
+import io.cucumber.plugin.ConcurrentEventListener;
+import io.cucumber.plugin.EventListener;
+import io.cucumber.plugin.Plugin;
+import io.cucumber.plugin.SummaryPrinter;
 
 import java.util.HashMap;
 import java.util.regex.Matcher;
@@ -31,19 +31,19 @@ public class PluginOption implements Options.Plugin {
 
     private static final Pattern PLUGIN_WITH_ARGUMENT_PATTERN = Pattern.compile("([^:]+):(.*)");
     private static final HashMap<String, Class<? extends Plugin>> PLUGIN_CLASSES = new HashMap<String, Class<? extends Plugin>>() {{
-        put("junit", JUnitFormatter.class);
-        put("testng", TestNGFormatter.class);
+        put("default_summary", DefaultSummaryPrinter.class);
         put("html", HTMLFormatter.class);
+        put("json", JSONFormatter.class);
+        put("junit", JUnitFormatter.class);
+        put("null_summary", NullSummaryPrinter.class);
         put("pretty", PrettyFormatter.class);
         put("progress", ProgressFormatter.class);
-        put("json", JSONFormatter.class);
-        put("usage", UsageFormatter.class);
         put("rerun", RerunFormatter.class);
         put("summary", DefaultSummaryPrinter.class);
-        put("default_summary", DefaultSummaryPrinter.class);
-        put("null_summary", NullSummaryPrinter.class);
-        put("unused", UnusedStepsSummaryPrinter.class);
+        put("testng", TestNGFormatter.class);
         put("timeline", TimelineFormatter.class);
+        put("unused", UnusedStepsSummaryPrinter.class);
+        put("usage", UsageFormatter.class);
     }};
 
     // Refuse plugins known to implement the old API

diff --git a/core/src/main/java/io/cucumber/core/options/RuntimeOptions.java b/core/src/main/java/io/cucumber/core/options/RuntimeOptions.java
@@ -53,6 +53,17 @@ public static RuntimeOptions defaultOptions() {
         return new RuntimeOptions();
     }
 
+    void addDefaultFormatterIfAbsent(){
+        if (formatters.isEmpty()) {
+            formatters.add(PluginOption.parse("progress"));
+        }
+    }
+    void addDefaultSummaryPrinterIfAbsent(){
+        if (summaryPrinters.isEmpty()) {
+            summaryPrinters.add(PluginOption.parse("default_summary"));
+        }
+    }
+
     public int getCount() {
         return count;
     }

diff --git a/core/src/main/java/io/cucumber/core/options/RuntimeOptionsBuilder.java b/core/src/main/java/io/cucumber/core/options/RuntimeOptionsBuilder.java
@@ -30,6 +30,8 @@ public final class RuntimeOptionsBuilder {
     private PickleOrder parsedPickleOrder = null;
     private Integer parsedCount = null;
     private Class<? extends ObjectFactory> parsedObjectFactoryClass = null;
+    private boolean addDefaultSummaryPrinterIfAbsent;
+    private boolean addDefaultFormatterIfAbsent;
 
     public RuntimeOptionsBuilder addRerun(Collection<FeatureWithLines> featureWithLines) {
         if (parsedRerunPaths == null) {
@@ -124,6 +126,14 @@ public RuntimeOptions build(RuntimeOptions runtimeOptions) {
             runtimeOptions.setObjectFactoryClass(parsedObjectFactoryClass);
         }
 
+        if(addDefaultFormatterIfAbsent) {
+            runtimeOptions.addDefaultFormatterIfAbsent();
+        }
+
+        if(addDefaultSummaryPrinterIfAbsent) {
+            runtimeOptions.addDefaultSummaryPrinterIfAbsent();
+        }
+
         return runtimeOptions;
     }
 
@@ -185,13 +195,13 @@ public RuntimeOptionsBuilder setWip(boolean wip) {
         return this;
     }
 
-    public RuntimeOptionsBuilder addDefaultSummaryPrinterIfNotPresent() {
-        parsedPluginData.addDefaultSummaryPrinterIfNotPresent();
+    public RuntimeOptionsBuilder addDefaultSummaryPrinterIfAbsent() {
+        this.addDefaultSummaryPrinterIfAbsent = true;
         return this;
     }
 
-    public RuntimeOptionsBuilder addDefaultFormatterIfNotPresent() {
-        parsedPluginData.addDefaultFormatterIfNotPresent();
+    public RuntimeOptionsBuilder addDefaultFormatterIfAbsent() {
+        this.addDefaultFormatterIfAbsent = true;
         return this;
     }
 
@@ -214,18 +224,6 @@ void addPluginName(String name, boolean isAddPlugin) {
             }
         }
 
-        void addDefaultSummaryPrinterIfNotPresent() {
-            if (summaryPrinters.names.isEmpty()) {
-                addPluginName("summary", false);
-            }
-        }
-
-        void addDefaultFormatterIfNotPresent() {
-            if (formatters.names.isEmpty()) {
-                addPluginName("progress", false);
-            }
-        }
-
         void updateFormatters(List<Options.Plugin> formatter) {
             this.formatters.updateNameList(formatter);
         }

diff --git a/core/src/main/java/io/cucumber/core/plugin/DefaultSummaryPrinter.java b/core/src/main/java/io/cucumber/core/plugin/DefaultSummaryPrinter.java
@@ -30,17 +30,23 @@ private void handleSnippetsSuggestedEvent(SnippetsSuggestedEvent event) {
     private void print() {
         out.println();
         printStats();
-        out.println();
         printErrors();
         printSnippets();
+        out.println();
     }
 
     private void printStats() {
         stats.printStats(out);
+        out.println();
     }
 
     private void printErrors() {
-        for (Throwable error : stats.getErrors()) {
+        List<Throwable> errors = stats.getErrors();
+        if (errors.isEmpty()) {
+            return;
+        }
+        out.println();
+        for (Throwable error : errors) {
             error.printStackTrace(out);
             out.println();
         }
@@ -56,6 +62,7 @@ private void printSnippets() {
         out.println();
         for (String snippet : snippets) {
             out.println(snippet);
+            out.println();
         }
     }
 

diff --git a/core/src/test/java/io/cucumber/core/options/CucumberOptionsAnnotationParserTest.java b/core/src/test/java/io/cucumber/core/options/CucumberOptionsAnnotationParserTest.java
@@ -2,11 +2,11 @@
 
 import io.cucumber.core.backend.ObjectFactory;
 import io.cucumber.core.exception.CucumberException;
-import io.cucumber.plugin.Plugin;
 import io.cucumber.core.plugin.PluginFactory;
 import io.cucumber.core.plugin.Plugins;
 import io.cucumber.core.runtime.TimeServiceEventBus;
 import io.cucumber.core.snippets.SnippetType;
+import io.cucumber.plugin.Plugin;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.function.Executable;
 
@@ -50,8 +50,8 @@ void create_non_strict() {
      void create_without_options() {
         RuntimeOptions runtimeOptions = parser()
             .parse(WithoutOptions.class)
-            .addDefaultSummaryPrinterIfNotPresent()
-            .addDefaultFormatterIfNotPresent()
+            .addDefaultSummaryPrinterIfAbsent()
+            .addDefaultFormatterIfAbsent()
             .build();
 
         assertAll("Checking RuntimeOptions",
@@ -80,8 +80,8 @@ void create_without_options_with_base_class_without_options() {
         Class<?> subClassWithMonoChromeTrueClass = WithoutOptionsWithBaseClassWithoutOptions.class;
         RuntimeOptions runtimeOptions = parser()
             .parse(subClassWithMonoChromeTrueClass)
-            .addDefaultFormatterIfNotPresent()
-            .addDefaultSummaryPrinterIfNotPresent()
+            .addDefaultFormatterIfAbsent()
+            .addDefaultSummaryPrinterIfAbsent()
             .build();
         Plugins plugins = new Plugins(new PluginFactory(), runtimeOptions);
         plugins.setEventBusOnEventListenerPlugins(new TimeServiceEventBus(Clock.systemUTC()));
@@ -140,7 +140,7 @@ private String getRegexpPattern(Object pattern) {
      void create_default_summary_printer_when_no_summary_printer_plugin_is_defined() {
         RuntimeOptions runtimeOptions = parser()
             .parse(ClassWithNoSummaryPrinterPlugin.class)
-            .addDefaultSummaryPrinterIfNotPresent()
+            .addDefaultSummaryPrinterIfAbsent()
             .build();
         Plugins plugins = new Plugins(new PluginFactory(), runtimeOptions);
         plugins.setEventBusOnEventListenerPlugins(new TimeServiceEventBus(Clock.systemUTC()));

diff --git a/core/src/test/java/io/cucumber/core/options/RuntimeOptionsTest.java b/core/src/test/java/io/cucumber/core/options/RuntimeOptionsTest.java
@@ -165,7 +165,7 @@ void creates_html_formatter() {
     void creates_progress_formatter_as_default() {
         RuntimeOptions options = new CommandlineOptionsParser()
             .parse()
-            .addDefaultFormatterIfNotPresent()
+            .addDefaultFormatterIfAbsent()
             .build();
         Plugins plugins = new Plugins(new PluginFactory(), options);
         plugins.setEventBusOnEventListenerPlugins(new TimeServiceEventBus(Clock.systemUTC()));
@@ -177,7 +177,7 @@ void creates_progress_formatter_as_default() {
     void creates_default_summary_printer_when_no_summary_printer_plugin_is_specified() {
         RuntimeOptions options = new CommandlineOptionsParser()
             .parse("--plugin", "pretty")
-            .addDefaultSummaryPrinterIfNotPresent()
+            .addDefaultSummaryPrinterIfAbsent()
             .build();
         Plugins plugins = new Plugins(new PluginFactory(), options);
         plugins.setEventBusOnEventListenerPlugins(new TimeServiceEventBus(Clock.systemUTC()));

diff --git a/...es/java-calculator-testng/src/test/java/io/cucumber/examples/testng/ShoppingStepdefs.java b/...es/java-calculator-testng/src/test/java/io/cucumber/examples/testng/ShoppingStepdefs.java
@@ -1,6 +1,5 @@
 package io.cucumber.examples.testng;
 
-import io.cucumber.examples.testng.RpnCalculator;
 import io.cucumber.java.DataTableType;
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;

diff --git a/java/src/main/java/io/cucumber/java/JavaSnippet.java b/java/src/main/java/io/cucumber/java/JavaSnippet.java
@@ -11,6 +11,6 @@ public MessageFormat template() {
             "public void {2}({3}) '{'\n" +
             "    // {4}\n" +
             "{5}    throw new " + PendingException.class.getName() + "();\n" +
-            "'}'\n");
+            "'}'");
     }
 }
diff --git a/java8/src/main/java/io/cucumber/java8/Java8Snippet.java b/java8/src/main/java/io/cucumber/java8/Java8Snippet.java
@@ -10,6 +10,6 @@ public MessageFormat template() {
             "{0}(\"{1}\", ({3}) -> '{'\n" +
             "    // {4}\n" +
             "{5}    throw new " + PendingException.class.getName() + "();\n" +
-            "'}');\n");
+            "'}');");
     }
 }
diff --git a/junit/src/main/java/io/cucumber/junit/Cucumber.java b/junit/src/main/java/io/cucumber/junit/Cucumber.java
@@ -114,6 +114,7 @@ public Cucumber(Class clazz) throws InitializationError {
 
         RuntimeOptions runtimeOptions = new CucumberPropertiesParser()
             .parse(CucumberProperties.fromSystemProperties())
+            .addDefaultSummaryPrinterIfAbsent()
             .build(environmentOptions);
 
         // Next parse the junit options

diff --git a/testng/src/main/java/io/cucumber/testng/TestNGCucumberRunner.java b/testng/src/main/java/io/cucumber/testng/TestNGCucumberRunner.java
@@ -85,6 +85,7 @@ public TestNGCucumberRunner(Class clazz) {
 
         runtimeOptions = new CucumberPropertiesParser()
             .parse(CucumberProperties.fromSystemProperties())
+            .addDefaultSummaryPrinterIfAbsent()
             .build(environmentOptions);
 
         ClassLoader classLoader = clazz.getClassLoader();
@@ -111,26 +112,11 @@ public void runScenario(Pickle pickle) throws Throwable {
         runner.runPickle(cucumberPickle);
         testCaseResultListener.finishExecutionUnit();
 
-        if (testCaseResultListener.isPassed()) {
-            return;
+        if (!testCaseResultListener.isPassed()) {
+            // null pointer is covered by isPassed
+            // noinspection ConstantConditions
+            throw testCaseResultListener.getError();
         }
-
-        // Log the reason we skipped the test. TestNG doesn't provide it by
-        // default
-        Throwable error = testCaseResultListener.getError();
-        if (error instanceof SkipException) {
-            SkipException skipException = (SkipException) error;
-            if (skipException.isSkip()) {
-                System.out.println(format("Skipped scenario: '%s'. %s",
-                    cucumberPickle.getName(),
-                    skipException.getMessage()
-                ));
-            }
-        }
-
-        // null pointer is covered by isPassed
-        // noinspection ConstantConditions
-        throw error;
     }
 
     public void finish() {