Merge pull request cucumber#590 from martinlau/master

Using spring @ContextHierarchy to manage multiple @ContextConfiguration's breaks with 1.1.5

Author: Dmytro Chyzhykov

spring/src/main/java/cucumber/runtime/java/spring/SpringFactory.java

@@ -14,6 +14,7 @@
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.GenericXmlApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.ContextHierarchy;
 import org.springframework.test.context.TestContextManager;
 
 import cucumber.runtime.CucumberException;
@@ -168,6 +169,7 @@ protected <T> T createTest(Class<T> type) throws Exception {
     }
 
     private boolean dependsOnSpringContext(Class<?> type) {
-        return type.isAnnotationPresent(ContextConfiguration.class);
+        return type.isAnnotationPresent(ContextConfiguration.class)
+            || type.isAnnotationPresent(ContextHierarchy.class);
     }
 }

spring/src/test/java/cucumber/runtime/java/spring/SpringFactoryTest.java

@@ -63,6 +63,18 @@ public void shouldRespectCommonAnnotationsInStepDefs() {
         assertTrue(stepdef.isAutowired());
     }
 
+    @Test
+    public void shouldRespectContextHierarchyInStepDefs() {
+        final ObjectFactory factory = new SpringFactory();
+        factory.addClass(WithContextHierarchyAnnotation.class);
+        factory.start();
+        WithContextHierarchyAnnotation stepdef = factory.getInstance(WithContextHierarchyAnnotation.class);
+        factory.stop();
+
+        assertNotNull(stepdef);
+        assertTrue(stepdef.isAutowired());
+    }
+
     @Test
     public void shouldRespectDirtiesContextAnnotationsInStepDefs() {
         final ObjectFactory factory = new SpringFactory();

spring/src/test/java/cucumber/runtime/java/spring/WithContextHierarchyAnnotation.java

@@ -0,0 +1,22 @@
+package cucumber.runtime.java.spring;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.ContextHierarchy;
+
+@ContextHierarchy(@ContextConfiguration("classpath:cucumber.xml"))
+public class WithContextHierarchyAnnotation {
+
+    private boolean autowired;
+
+    @Autowired
+    public void setAutowiredCollaborator(DummyComponent collaborator) {
+        autowired = true;
+    }
+
+    public boolean isAutowired() {
+        return autowired;
+    }
+
+}