[Core] Remove --strict and --no-strict options

Cucumber executes scenarios in strict mode by default. Fixes: #1788
cucumber · Apr 3, 2021 · 464d1c1 · 464d1c1
1 parent 8c0a477
commit 464d1c1
Show file tree

Hide file tree

Showing 20 changed files with 37 additions and 181 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Deprecated
 
 ### Removed
+ * [Core] Removed `--strict` and `--no-strict` options ([#1788](https://github.com/cucumber/cucumber-jvm/issues/1788) M.P. Korstanje)
+  - Cucumber executes scenarios in strict mode by default
 
 ### Fixed
 

diff --git a/core/README.md b/core/README.md
@@ -28,8 +28,6 @@ cucumber.execution.limit=       # number of scenarios to execute (CLI only).
   
 cucumber.execution.order=       # lexical, reverse, random or random:[seed] (CLI only). default: lexical
 
-cucumber.execution.strict=      # true or false. default: false.
-
 cucumber.execution.wip=         # true or false. default: false.
                                 # Fails if there any passing scenarios
                                 # CLI only.   

diff --git a/core/src/main/java/io/cucumber/core/cli/CommandlineOptions.java b/core/src/main/java/io/cucumber/core/cli/CommandlineOptions.java
@@ -47,11 +47,6 @@ public final class CommandlineOptions {
     public static final String DRY_RUN = "--dry-run";
     public static final String DRY_RUN_SHORT = "-d";
 
-    public static final String NO_STRICT = "--no-strict";
-
-    public static final String STRICT = "--strict";
-    public static final String STRICT_SHORT = "-s";
-
     public static final String NO_MONOCHROME = "--no-monochrome";
 
     public static final String MONOCHROME = "--monochrome";

diff --git a/core/src/main/java/io/cucumber/core/options/CommandlineOptionsParser.java b/core/src/main/java/io/cucumber/core/options/CommandlineOptionsParser.java
@@ -42,16 +42,13 @@
 import static io.cucumber.core.cli.CommandlineOptions.NAME_SHORT;
 import static io.cucumber.core.cli.CommandlineOptions.NO_DRY_RUN;
 import static io.cucumber.core.cli.CommandlineOptions.NO_MONOCHROME;
-import static io.cucumber.core.cli.CommandlineOptions.NO_STRICT;
 import static io.cucumber.core.cli.CommandlineOptions.NO_SUMMARY;
 import static io.cucumber.core.cli.CommandlineOptions.OBJECT_FACTORY;
 import static io.cucumber.core.cli.CommandlineOptions.ORDER;
 import static io.cucumber.core.cli.CommandlineOptions.PLUGIN;
 import static io.cucumber.core.cli.CommandlineOptions.PLUGIN_SHORT;
 import static io.cucumber.core.cli.CommandlineOptions.PUBLISH;
 import static io.cucumber.core.cli.CommandlineOptions.SNIPPETS;
-import static io.cucumber.core.cli.CommandlineOptions.STRICT;
-import static io.cucumber.core.cli.CommandlineOptions.STRICT_SHORT;
 import static io.cucumber.core.cli.CommandlineOptions.TAGS;
 import static io.cucumber.core.cli.CommandlineOptions.TAGS_SHORT;
 import static io.cucumber.core.cli.CommandlineOptions.THREADS;
@@ -141,14 +138,8 @@ private RuntimeOptionsBuilder parse(List<String> args) {
                 parsedOptions.setDryRun(true);
             } else if (arg.equals(NO_DRY_RUN)) {
                 parsedOptions.setDryRun(false);
-            } else if (arg.equals(NO_STRICT)) {
-                out.println("--no-strict is no longer effective");
-                exitCode = 1;
-                return parsedOptions;
             } else if (arg.equals(NO_SUMMARY)) {
                 parsedOptions.setNoSummary();
-            } else if (arg.equals(STRICT) || arg.equals(STRICT_SHORT)) {
-                log.warn(() -> "--strict is enabled by default. This option will be removed in a future release.");
             } else if (arg.equals(MONOCHROME) || arg.equals(MONOCHROME_SHORT)) {
                 parsedOptions.setMonochrome(true);
             } else if (arg.equals(NO_MONOCHROME)) {

diff --git a/core/src/main/java/io/cucumber/core/options/Constants.java b/core/src/main/java/io/cucumber/core/options/Constants.java
@@ -45,16 +45,6 @@ public final class Constants {
      */
     public static final String EXECUTION_ORDER_PROPERTY_NAME = "cucumber.execution.order";
 
-    /**
-     * Property name used to disable strict execution: {@value}
-     * <p>
-     * When using strict execution Cucumber will treat undefined and pending
-     * steps as errors.
-     * <p>
-     * By default, strict execution is enabled.
-     */
-    public static final String EXECUTION_STRICT_PROPERTY_NAME = "cucumber.execution.strict";
-
     /**
      * Property name used to enable wip execution: {@value}
      * <p>

diff --git a/core/src/main/java/io/cucumber/core/options/CucumberOptionsAnnotationParser.java b/core/src/main/java/io/cucumber/core/options/CucumberOptionsAnnotationParser.java
@@ -40,7 +40,6 @@ public RuntimeOptionsBuilder parse(Class<?> clazz) {
                 addTags(classWithOptions, options, args);
                 addPlugins(options, args);
                 addPublish(options, args);
-                addStrict(options, args);
                 addName(options, args);
                 addSnippets(options, args);
                 addGlue(options, args);
@@ -94,13 +93,6 @@ private void addPublish(CucumberOptions options, RuntimeOptionsBuilder args) {
         }
     }
 
-    private void addStrict(CucumberOptions options, RuntimeOptionsBuilder args) {
-        if (!options.strict()) {
-            throw new CucumberException(
-                "@CucumberOptions(strict=false) is no longer supported. Please use strict=true");
-        }
-    }
-
     private void addName(CucumberOptions options, RuntimeOptionsBuilder args) {
         for (String name : options.name()) {
             Pattern pattern = Pattern.compile(name);
@@ -196,8 +188,6 @@ public interface CucumberOptions {
 
         boolean dryRun();
 
-        boolean strict();
-
         String[] features();
 
         String[] glue();

diff --git a/core/src/main/java/io/cucumber/core/options/CucumberPropertiesParser.java b/core/src/main/java/io/cucumber/core/options/CucumberPropertiesParser.java
@@ -19,7 +19,6 @@
 import static io.cucumber.core.options.Constants.EXECUTION_DRY_RUN_PROPERTY_NAME;
 import static io.cucumber.core.options.Constants.EXECUTION_LIMIT_PROPERTY_NAME;
 import static io.cucumber.core.options.Constants.EXECUTION_ORDER_PROPERTY_NAME;
-import static io.cucumber.core.options.Constants.EXECUTION_STRICT_PROPERTY_NAME;
 import static io.cucumber.core.options.Constants.FEATURES_PROPERTY_NAME;
 import static io.cucumber.core.options.Constants.FILTER_NAME_PROPERTY_NAME;
 import static io.cucumber.core.options.Constants.FILTER_TAGS_PROPERTY_NAME;
@@ -60,11 +59,6 @@ public RuntimeOptionsBuilder parse(Map<String, String> properties) {
             PickleOrderParser::parse,
             builder::setPickleOrder);
 
-        parse(properties,
-            EXECUTION_STRICT_PROPERTY_NAME,
-            BooleanString::parseBoolean,
-            CucumberPropertiesParser::errorOnNonStrict);
-
         parseAll(properties,
             FEATURES_PROPERTY_NAME,
             splitAndThenFlatMap(CucumberPropertiesParser::parseFeatureFile),
@@ -134,13 +128,6 @@ private <T> void parse(
         parseAll(properties, propertyName, parser.andThen(Collections::singletonList), setter);
     }
 
-    private static void errorOnNonStrict(Boolean strict) {
-        if (!strict) {
-            throw new CucumberException(EXECUTION_STRICT_PROPERTY_NAME
-                    + "=false is no longer effective. Please use =true (the default) or remove this property");
-        }
-    }
-
     private <T> void parseAll(
             Map<String, String> properties, String propertyName, Function<String, Collection<T>> parser,
             Consumer<T> setter

diff --git a/core/src/main/resources/io/cucumber/core/options/USAGE.txt b/core/src/main/resources/io/cucumber/core/options/USAGE.txt
@@ -117,8 +117,6 @@ cucumber.execution.limit=       # number of scenarios to execute (CLI only).
 
 cucumber.execution.order=       # lexical, reverse, random or random:[seed] (CLI only). default: lexical
 
-cucumber.execution.strict=      # true or false. default: false.
-
 cucumber.execution.wip=         # true or false. default: false.
                                 # Fails if there any passing scenarios
                                 # CLI only.

diff --git a/core/src/test/java/io/cucumber/core/options/CommandlineOptionsParserTest.java b/core/src/test/java/io/cucumber/core/options/CommandlineOptionsParserTest.java
@@ -421,7 +421,7 @@ void set_monochrome_on_color_aware_formatters() {
     @Test
     void set_strict_on_strict_aware_formatters() {
         RuntimeOptions options = parser
-                .parse("--strict", "--plugin", AwareFormatter.class.getName())
+                .parse("--plugin", AwareFormatter.class.getName())
                 .build();
         Plugins plugins = new Plugins(new PluginFactory(), options);
         plugins.setEventBusOnEventListenerPlugins(new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID));

diff --git a/core/src/test/java/io/cucumber/core/options/CucumberOptions.java b/core/src/test/java/io/cucumber/core/options/CucumberOptions.java
@@ -13,8 +13,6 @@
 
     boolean dryRun() default false;
 
-    boolean strict() default true;
-
     String[] features() default {};
 
     String[] glue() default {};

diff --git a/core/src/test/java/io/cucumber/core/options/CucumberOptionsAnnotationParserTest.java b/core/src/test/java/io/cucumber/core/options/CucumberOptionsAnnotationParserTest.java
@@ -258,16 +258,6 @@ private static class Snippets {
         // empty
     }
 
-    @CucumberOptions(strict = true)
-    private static class Strict {
-        // empty
-    }
-
-    @CucumberOptions
-    private static class NotStrict {
-        // empty
-    }
-
     @CucumberOptions(name = { "name1", "name2" })
     private static class MultipleNames {
         // empty
@@ -387,11 +377,6 @@ public boolean dryRun() {
             return annotation.dryRun();
         }
 
-        @Override
-        public boolean strict() {
-            return annotation.strict();
-        }
-
         @Override
         public String[] features() {
             return annotation.features();

diff --git a/core/src/test/java/io/cucumber/core/plugin/StatsTest.java b/core/src/test/java/io/cucumber/core/plugin/StatsTest.java
@@ -207,7 +207,7 @@ void should_print_failed_ambiguous_scenarios() {
     }
 
     @Test
-    void should_print_failed_ambiguous_pending_undefined_scenarios_if_strict() {
+    void should_print_failed_ambiguous_pending_undefined_scenarios() {
         Stats counter = createMonochromeSummaryCounter();
         ByteArrayOutputStream baos = new ByteArrayOutputStream();