Localise the UndefinedStepTracker in the Runtime

Localise the UndefinedStepTracker in the Runtime and remove that
argument from the constructor. Use that the optionalGlue argument is
null, as the cue to let the Runtime create the default RuntimeGlue.
When the optionalGlue argument is not null, the glue injected with that
argument will be used by the Runtime.

Author: brasmusson

core/src/main/java/cucumber/runtime/Runtime.java

@@ -44,7 +44,7 @@ public class Runtime implements UnreportedStepExecutor {
     private static final byte ERRORS = 0x1;
 
     private final SummaryCounter summaryCounter;
-    final UndefinedStepsTracker undefinedStepsTracker;
+    final UndefinedStepsTracker undefinedStepsTracker = new UndefinedStepsTracker();
 
     private final Glue glue;
     private final RuntimeOptions runtimeOptions;
@@ -60,22 +60,19 @@ public class Runtime implements UnreportedStepExecutor {
     private ScenarioImpl scenarioResult = null;
 
     public static Runtime createRuntime(ResourceLoader resourceLoader, ClassLoader classLoader, RuntimeOptions runtimeOptions) {
-        UndefinedStepsTracker undefinedStepsTracker = new UndefinedStepsTracker();
-        return new Runtime(resourceLoader, classLoader, loadBackends(resourceLoader, classLoader), runtimeOptions,
-                undefinedStepsTracker, new RuntimeGlue(undefinedStepsTracker, new LocalizedXStreams(classLoader)));
+        return new Runtime(resourceLoader, classLoader, loadBackends(resourceLoader, classLoader), runtimeOptions, null);
     }
 
     public Runtime(ResourceLoader resourceLoader, ClassLoader classLoader, Collection<? extends Backend> backends,
-            RuntimeOptions runtimeOptions, UndefinedStepsTracker undefinedStepsTracker, RuntimeGlue glue) {
+            RuntimeOptions runtimeOptions, RuntimeGlue optionalGlue) {
         if (backends.isEmpty()) {
             throw new CucumberException("No backends were found. Please make sure you have a backend module on your CLASSPATH.");
         }
         this.resourceLoader = resourceLoader;
         this.classLoader = classLoader;
         this.backends = backends;
         this.runtimeOptions = runtimeOptions;
-        this.undefinedStepsTracker = undefinedStepsTracker;
-        this.glue = glue;
+        this.glue = optionalGlue != null ? optionalGlue : new RuntimeGlue(undefinedStepsTracker, new LocalizedXStreams(classLoader));
         this.summaryCounter = new SummaryCounter(runtimeOptions.monochrome);
 
         for (Backend backend : backends) {

core/src/test/java/cucumber/runtime/RuntimeTest.java

@@ -5,7 +5,6 @@
 import cucumber.runtime.io.ClasspathResourceLoader;
 import cucumber.runtime.io.ResourceLoader;
 import cucumber.runtime.model.CucumberFeature;
-import cucumber.runtime.xstream.LocalizedXStreams;
 import gherkin.I18n;
 import gherkin.formatter.JSONFormatter;
 import gherkin.formatter.Reporter;
@@ -369,14 +368,12 @@ private Runtime createRuntime(String... runtimeArgs) {
 
     public static Runtime createRuntime(ResourceLoader resourceLoader, ClassLoader classLoader,
             Collection<? extends Backend> backends, RuntimeOptions runtimeOptions) {
-        UndefinedStepsTracker undefinedStepsTracker = new UndefinedStepsTracker();
-        return new Runtime(resourceLoader, classLoader, backends, runtimeOptions, undefinedStepsTracker,
-                new RuntimeGlue(undefinedStepsTracker, new LocalizedXStreams(classLoader)));
+        return new Runtime(resourceLoader, classLoader, backends, runtimeOptions, null);
     }
 
     public static Runtime createRuntime(ResourceLoader resourceLoader, ClassLoader classLoader,
             Collection<Backend> backends, RuntimeOptions runtimeOptions, RuntimeGlue glue) {
-        return new Runtime(resourceLoader, classLoader, backends, runtimeOptions, new UndefinedStepsTracker(), glue);
+        return new Runtime(resourceLoader, classLoader, backends, runtimeOptions, glue);
     }
 
     private Runtime createRuntimeWithMockedGlue(StepDefinitionMatch match, String... runtimeArgs) {
@@ -403,7 +400,7 @@ private Runtime createRuntimeWithMockedGlue(StepDefinitionMatch match, boolean i
         mockHook(glue, hook, isBefore);
         Collection<Backend> backends = Arrays.asList(backend);
 
-        return new Runtime(resourceLoader, classLoader, backends, runtimeOptions, new UndefinedStepsTracker(), glue);
+        return createRuntime(resourceLoader, classLoader, backends, runtimeOptions, glue);
     }
 
     private void mockMatch(RuntimeGlue glue, StepDefinitionMatch match, boolean isAmbiguous) {

java/src/test/java/cucumber/runtime/java/JavaStepDefinitionTest.java

@@ -6,12 +6,9 @@
 import cucumber.runtime.DuplicateStepDefinitionException;
 import cucumber.runtime.Glue;
 import cucumber.runtime.Runtime;
-import cucumber.runtime.RuntimeGlue;
 import cucumber.runtime.RuntimeOptions;
-import cucumber.runtime.UndefinedStepsTracker;
 import cucumber.runtime.io.ClasspathResourceLoader;
 import cucumber.runtime.io.ResourceLoader;
-import cucumber.runtime.xstream.LocalizedXStreams;
 import gherkin.I18n;
 import gherkin.formatter.Reporter;
 import gherkin.formatter.model.Comment;
@@ -153,8 +150,6 @@ private <T> Set<T> asSet(T... items) {
 
     private Runtime createRuntime(ResourceLoader resourceLoader, ClassLoader classLoader,
         Collection<? extends Backend> backends, RuntimeOptions runtimeOptions) {
-      UndefinedStepsTracker undefinedStepsTracker = new UndefinedStepsTracker();
-      return new Runtime(resourceLoader, classLoader, backends, runtimeOptions, undefinedStepsTracker,
-              new RuntimeGlue(undefinedStepsTracker, new LocalizedXStreams(classLoader)));
+      return new Runtime(resourceLoader, classLoader, backends, runtimeOptions, null);
     }
 }