Merge branch 'master' of github.com:cucumber/cucumber-jvm

# By Aslak Hellesøy (1) and bayrhammerklaus (1)
# Via Aslak Hellesøy
* 'master' of github.com:cucumber/cucumber-jvm:
  Attribution. Fix broken test. Closes #568
  #568 Inherit Information of @Cucumber.Options

Author: mfellner

History.md

@@ -1,5 +1,6 @@
 ## [Git master](https://github.com/cucumber/cucumber-jvm/compare/v1.1.4...master)
 
+* [JUnit] Inherit Information of @Cucumber.Options ([#568](https://github.com/cucumber/cucumber-jvm/issues/568) Klaus Bayrhammer)
 * [JUnit] JUnitFormatter does not put required name attribute in testsuite root element ([#480](https://github.com/cucumber/cucumber-jvm/pull/480), [#477](https://github.com/cucumber/cucumber-jvm/issues/477) ericmaxwell2003)
 * [Core] Output embedded text in HTML report ([#501](https://github.com/cucumber/cucumber-jvm/pull/501) Tom Dunstan)
 * [Core] Fix for Lexing Error message not useful ([#519](https://github.com/cucumber/cucumber-jvm/issues/519), [#523](https://github.com/cucumber/cucumber-jvm/pull/523) Alpar Gal)

junit/src/main/java/cucumber/runtime/junit/RuntimeOptionsFactory.java

@@ -16,23 +16,33 @@ public RuntimeOptionsFactory(Class clazz) {
     }
 
     public RuntimeOptions create() {
+        List<String> args = buildArgsFromOptions();
+
+        return new RuntimeOptions(System.getProperties(), args.toArray(new String[args.size()]));
+    }
+
+    private List<String> buildArgsFromOptions() {
         List<String> args = new ArrayList<String>();
-        Cucumber.Options options = getOptions(clazz);
-
-        addDryRun(options, args);
-        addMonochrome(options, args);
-        addGlue(options, args, clazz);
-        addTags(options, args);
-        addFormats(options, args);
-        addFeatures(options, args, clazz);
-        addStrict(options, args);
-        addName(options, args);
-        addDotCucumber(options, args);
-        addSnippets(options, args);
-
-        RuntimeOptions runtimeOptions = new RuntimeOptions(System.getProperties(), args.toArray(new String[args.size()]));
-
-        return runtimeOptions;
+
+        for (Class classWithOptions = clazz; hasSuperClass(classWithOptions); classWithOptions = classWithOptions.getSuperclass()) {
+            Cucumber.Options options = getOptions(classWithOptions);
+
+            addDryRun(options, args);
+            addMonochrome(options, args);
+            addGlue(options, args, classWithOptions);
+            addTags(options, args);
+            addFormats(options, args);
+            addFeatures(options, args, classWithOptions);
+            addStrict(options, args);
+            addName(options, args);
+            addDotCucumber(options, args);
+            addSnippets(options, args);
+        }
+        return args;
+    }
+
+    private boolean hasSuperClass(Class classWithOptions) {
+        return classWithOptions != Object.class;
     }
 
     private void addDotCucumber(Cucumber.Options options, List<String> args) {

junit/src/test/java/cucumber/runtime/junit/RuntimeOptionsFactoryTest.java

@@ -1,8 +1,11 @@
 package cucumber.runtime.junit;
 
+import cucumber.api.SnippetType;
 import cucumber.api.junit.Cucumber;
 import cucumber.runtime.RuntimeOptions;
-import cucumber.api.SnippetType;
+import gherkin.formatter.Formatter;
+import gherkin.formatter.JSONFormatter;
+import gherkin.formatter.PrettyFormatter;
 import org.junit.Test;
 
 import java.net.MalformedURLException;
@@ -94,6 +97,26 @@ public void finds_path_for_class_in_toplevel_package() {
         assertEquals("", packageName("TopLevelClass"));
     }
 
+    @Test
+    public void inherit_formatter_from_baseclass() {
+        RuntimeOptionsFactory runtimeOptionsFactory = new RuntimeOptionsFactory(SubClassWithFormatter.class);
+        RuntimeOptions runtimeOptions = runtimeOptionsFactory.create();
+
+        List<Formatter> formatters = runtimeOptions.getFormatters();
+        assertEquals(2, formatters.size());
+        assertTrue(formatters.get(0) instanceof PrettyFormatter);
+        assertTrue(formatters.get(1) instanceof JSONFormatter);
+    }
+
+    @Test
+    public void override_monochrome_flag_from_baseclass() {
+        RuntimeOptionsFactory runtimeOptionsFactory = new RuntimeOptionsFactory(SubClassWithMonoChromeTrue.class);
+        RuntimeOptions runtimeOptions = runtimeOptionsFactory.create();
+
+        assertTrue(runtimeOptions.isMonochrome());
+    }
+
+
     @Cucumber.Options(snippets = SnippetType.CAMELCASE)
     static class Snippets {
         // empty
@@ -132,4 +155,24 @@ static class DotCucumberUrl {
     static class WithoutOptions {
         // empty
     }
+
+    @Cucumber.Options(format = "pretty")
+    static class SubClassWithFormatter extends BaseClassWithFormatter {
+        // empty
+    }
+
+    @Cucumber.Options(format = "json:outFile")
+    static class BaseClassWithFormatter {
+        // empty
+    }
+
+    @Cucumber.Options(monochrome = true)
+    static class SubClassWithMonoChromeTrue extends BaseClassWithMonoChromeFalse {
+        // empty
+    }
+
+    @Cucumber.Options(monochrome = false)
+    static class BaseClassWithMonoChromeFalse {
+        // empty
+    }
 }