Merge branch '31-pick-up-steps' of https://github.com/oc/cucumber-jvm into oc-31-pick-up-steps

Author: aslakhellesoy

.gitignore

@@ -2,6 +2,8 @@
 .project
 .classpath
 *.iws
+*.iml
+*.ipr
 target
 chromedriver.log
 Gemfile.lock

core/src/main/java/cucumber/junit/Cucumber.java

@@ -49,6 +49,14 @@ public Cucumber(Class featureClass, final Runtime runtime) throws Initialization
         this.runtime = runtime;
         String pathName = featurePath(featureClass);
         parseFeature(pathName, filters(featureClass));
+        addAdditionalScanPaths(featureClass, this.runtime);
+    }
+
+    private void addAdditionalScanPaths(Class featureClass, final Runtime runtime) {
+        cucumber.junit.Feature featureAnnotation = (cucumber.junit.Feature) featureClass.getAnnotation(cucumber.junit.Feature.class);
+        if (featureAnnotation != null) {
+            runtime.addStepdefScanPath(featureAnnotation.packages());
+        }
     }
 
     private String featurePath(Class featureClass) {

core/src/main/java/cucumber/junit/Feature.java

@@ -13,4 +13,6 @@
     long[] lines() default {};
 
     String[] tags() default {};
+
+    String[] packages() default {};
 }

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

@@ -84,4 +84,13 @@ public World newWorld(Set<String> tags) {
         return new World(backends, this, tags);
     }
 
+    // XXX: should this be ctor initialized?
+    public void addStepdefScanPath(String[] packages) {
+        for (String packageName : packages) {
+            if(packageName.matches("^([a-z]\\w*\\.?)+$"))
+                backends.addAll(Resources.instantiateSubclasses(Backend.class, "cucumber.runtime", packageName));
+            else
+                throw new CucumberException("Additional package isn't valid: " + packageName);
+        }
+    }
 }

examples/java-calculator/src/test/java/cucumber/examples/java/scan/basic_arithmetic_with_scan_Test.java

@@ -0,0 +1,15 @@
+package cucumber.examples.java.scan;
+
+import cucumber.junit.Cucumber;
+import cucumber.junit.Feature;
+import org.junit.runner.RunWith;
+
+/**
+ * This test class tells JUnit to run a particular feature with Cucumber.
+ * Step definitions will be scanned underneath both this class' package, and
+ * underneath cucumber.examples.java.calculator. 
+ */
+@RunWith(Cucumber.class)
+@Feature(value = "basic_arithmetic.feature", packages = {"cucumber.examples.java.calculator"})
+public class basic_arithmetic_with_scan_Test {
+}