Merge with master

Author: aslakhellesoy

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

@@ -13,6 +13,9 @@
 public class RuntimeOptionsFactory {
     private final Class clazz;
     private final Class<? extends Annotation>[] annotationClasses;
+    private boolean featuresSpecified = false;
+    private boolean glueSpecified = false;
+    private boolean formatSpecified = false;
 
     public RuntimeOptionsFactory(Class clazz, Class<? extends Annotation>[] annotationClasses) {
         this.clazz = clazz;
@@ -39,11 +42,14 @@ private List<String> buildArgsFromOptions() {
                     addName(options, args);
                     addDotCucumber(options, args);
                     addSnippets(options, args);
+                    addGlue(optionsArray, args);
+                    addFeatures(optionsArray, args);
                 }
             }
-            addGlue(optionsArray, args, classWithOptions);
-            addFeatures(optionsArray, args, classWithOptions);
         }
+        addDefaultFeaturePathIfNoFeaturePathIsSpecified(args, clazz);
+        addDefaultGlueIfNoGlueIsSpecified(args, clazz);
+        addDefaultFormatIfNoFormatIsSpecified(args);
         return args;
     }
 
@@ -92,37 +98,46 @@ private void addFormats(Annotation options, List<String> args) {
                 args.add("--format");
                 args.add(format);
             }
-        } else {
+            formatSpecified = true;
+        }
+    }
+
+    private void addDefaultFormatIfNoFormatIsSpecified(List<String> args) {
+        if (!formatSpecified) {
             args.add("--format");
             args.add("null");
         }
     }
 
-    private void addFeatures(Annotation[] optionsArray, List<String> args, Class clazz) {
-        boolean specified = false;
+    private void addFeatures(Annotation[] optionsArray, List<String> args) {
         for (Annotation options : optionsArray) {
             if (options != null && this.<String[]>invoke(options, "features").length != 0) {
                 Collections.addAll(args, this.<String[]>invoke(options, "features"));
-                specified = true;
+                featuresSpecified = true;
             }
         }
-        if (!specified) {
+    }
+
+    private void addDefaultFeaturePathIfNoFeaturePathIsSpecified(List<String> args, Class clazz) {
+        if (!featuresSpecified) {
             args.add(MultiLoader.CLASSPATH_SCHEME + packagePath(clazz));
         }
     }
 
-    private void addGlue(Annotation[] optionsArray, List<String> args, Class clazz) {
-        boolean specified = false;
+    private void addGlue(Annotation[] optionsArray, List<String> args) {
         for (Annotation options : optionsArray) {
             if (options != null && this.<String[]>invoke(options, "glue").length != 0) {
                 for (String glue : this.<String[]>invoke(options, "glue")) {
                     args.add("--glue");
                     args.add(glue);
                 }
-                specified = true;
+                glueSpecified = true;
             }
         }
-        if (!specified) {
+    }
+
+    private void addDefaultGlueIfNoGlueIsSpecified(List<String> args, Class clazz) {
+        if (!glueSpecified) {
             args.add("--glue");
             args.add(MultiLoader.CLASSPATH_SCHEME + packagePath(clazz));
         }

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

@@ -42,6 +42,18 @@ public void create_without_options() throws Exception {
         assertFalse(runtimeOptions.isStrict());
         assertEquals(asList("classpath:cucumber/runtime"), runtimeOptions.getFeaturePaths());
         assertEquals(asList("classpath:cucumber/runtime"), runtimeOptions.getGlue());
+        assertEquals(1, runtimeOptions.getFormatters().size());
+        assertEquals("cucumber.runtime.formatter.NullFormatter", runtimeOptions.getFormatters().get(0).getClass().getName());
+    }
+
+    @Test
+    public void create_without_options_with_base_class_without_options() throws Exception {
+        RuntimeOptionsFactory runtimeOptionsFactory = new RuntimeOptionsFactory(WithoutOptionsWithBaseClassWithoutOptions.class, new Class[]{CucumberOptions.class});
+        RuntimeOptions runtimeOptions = runtimeOptionsFactory.create();
+        assertEquals(asList("classpath:cucumber/runtime"), runtimeOptions.getFeaturePaths());
+        assertEquals(asList("classpath:cucumber/runtime"), runtimeOptions.getGlue());
+        assertEquals(1, runtimeOptions.getFormatters().size());
+        assertEquals("cucumber.runtime.formatter.NullFormatter", runtimeOptions.getFormatters().get(0).getClass().getName());
     }
 
     @Test
@@ -158,6 +170,10 @@ static class WithoutOptions {
         // empty
     }
 
+    static class WithoutOptionsWithBaseClassWithoutOptions extends WithoutOptions {
+        // empty
+    }
+
     @CucumberOptions(format = "pretty")
     static class SubClassWithFormatter extends BaseClassWithFormatter {
         // empty

testng/src/main/java/cucumber/api/testng/TestNGCucumberRunner.java

@@ -10,9 +10,6 @@
 import cucumber.runtime.io.ResourceLoaderClassFinder;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
 
 /**
  * Glue code for running Cucumber via TestNG.
@@ -33,11 +30,6 @@ public TestNGCucumberRunner(Class clazz) {
         RuntimeOptionsFactory runtimeOptionsFactory = new RuntimeOptionsFactory(clazz, new Class[]{CucumberOptions.class});
         RuntimeOptions runtimeOptions = runtimeOptionsFactory.create();
 
-        // remove duplicates from glue path.
-        List<String> uniqueGlue = new ArrayList<String>(new HashSet<String>(runtimeOptions.getGlue()));
-        runtimeOptions.getGlue().clear();
-        runtimeOptions.getGlue().addAll(uniqueGlue);
-
         TestNgReporter reporter = new TestNgReporter(System.out);
         runtimeOptions.addFormatter(reporter);
         ClassFinder classFinder = new ResourceLoaderClassFinder(resourceLoader, classLoader);