Use the same class to create all TestContextManagers

Use the first class found with spring annotation, to create the
TestContextManagers for all glue classes.

Author: brasmusson

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

@@ -154,15 +154,7 @@ private <T> T getTestInstance(final Class<T> type) {
         try {
             T instance = createTest(type);
 
-            if (dependsOnSpringContext(type)) {
-                CucumberTestContextManager contextManager = new CucumberTestContextManager(type);
-                contextManager.setParentOnApplicationContext(applicationContext);
-                contextManager.prepareTestInstance(instance);
-                contextManager.beforeTestClass();
-
-                contextManagersByClass.put(type, contextManager);
-            } else if (type.getName().equals("cucumber.api.spring.SpringTransactionHooks") &&
-                    stepClassWithSpringContext != null) {
+            if (stepClassWithSpringContext != null) {
                 TestContextManager contextManager = new TestContextManager(stepClassWithSpringContext);
                 contextManager.prepareTestInstance(instance);
                 contextManager.beforeTestClass();

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

@@ -2,11 +2,9 @@
 
 import cucumber.api.java.en.Then;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
 
 import static org.junit.Assert.assertEquals;
 
-@ContextConfiguration("classpath:cucumber.xml")
 public class AnotherStepDef {
 
     @Autowired

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

@@ -2,9 +2,7 @@
 
 import cucumber.api.java.en.Given;
 import cucumber.api.java.en.When;
-import org.springframework.test.context.ContextConfiguration;
 
-@ContextConfiguration("classpath:cucumber.xml")
 public class OneStepDef {
     int cucumbers;
 

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

@@ -1,8 +1,11 @@
 package cucumber.runtime.java.spring;
 
-import org.junit.Test;
-
 import cucumber.runtime.java.ObjectFactory;
+import cucumber.runtime.java.spring_contextconfig.BellyStepdefs;
+import cucumber.runtime.java.spring_contextconfig.WithSpringAnnotations;
+import cucumber.runtime.java.spring_contexthierarchyconfig.WithContextHierarchyAnnotation;
+import cucumber.runtime.java.spring_dirtiescontextconfig.DirtiesContextBellyStepDefs;
+import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -36,12 +39,14 @@ public void shouldGiveUsNewStepInstancesForEachScenario() {
     public void shouldNeverCreateNewApplicationBeanInstances() {
         // Feature 1
         final ObjectFactory factory1 = new SpringFactory();
+        factory1.addClass(BellyStepdefs.class);
         factory1.start();
         final BellyBean o1 = factory1.getInstance(BellyStepdefs.class).getBellyBean();
         factory1.stop();
 
         // Feature 2
         final ObjectFactory factory2 = new SpringFactory();
+        factory2.addClass(BellyStepdefs.class);
         factory2.start();
         final BellyBean o2 = factory2.getInstance(BellyStepdefs.class).getBellyBean();
         factory2.stop();

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

@@ -4,13 +4,11 @@
 import cucumber.api.java.Before;
 import cucumber.api.java.en.Given;
 import cucumber.api.java.en.Then;
-import org.springframework.test.context.ContextConfiguration;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-@ContextConfiguration("classpath:cucumber.xml")
 public class TransactionStepDefs {
 
     @Given("^a feature with the @txn annotation$")

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

@@ -1,7 +1,9 @@
-package cucumber.runtime.java.spring;
+package cucumber.runtime.java.spring_contextconfig;
 
 import cucumber.api.java.en.Given;
 import cucumber.api.java.en.Then;
+import cucumber.runtime.java.spring.Belly;
+import cucumber.runtime.java.spring.BellyBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 

spring/src/test/java/cucumber/runtime/java/spring/BellyStepdefs.java renamed to spring/src/test/java/cucumber/runtime/java/spring_contextconfig/BellyStepdefs.java

@@ -0,0 +1,17 @@
+package cucumber.runtime.java.spring_contextconfig;
+
+import cucumber.api.CucumberOptions;
+
+import cucumber.api.junit.Cucumber;
+import org.junit.runner.RunWith;
+
+@RunWith(Cucumber.class)
+@CucumberOptions(glue = {"cucumber.runtime.java.spring_contextconfig",
+                "cucumber.runtime.java.spring",
+                "cucumber.api.spring"},
+        features = {"classpath:cucumber/runtime/java/spring/cukes.feature",
+                "classpath:cucumber/runtime/java/spring/xmlBasedSpring.feature",
+                "classpath:cucumber/runtime/java/spring/stepdefinjection.feature",
+                "classpath:cucumber/runtime/java/spring/transaction.feature"})
+public class RunCukesTest {
+}

spring/src/test/java/cucumber/runtime/java/spring_contextconfig/RunCukesTest.java

@@ -1,5 +1,6 @@
-package cucumber.runtime.java.spring;
+package cucumber.runtime.java.spring_contextconfig;
 
+import cucumber.runtime.java.spring.DummyComponent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.test.context.ContextConfiguration;
@@ -24,4 +25,5 @@ public boolean isAutowired() {
     public String getProperty() {
         return property;
     }
+
 }

spring/src/test/java/cucumber/runtime/java/spring/WithSpringAnnotations.java renamed to spring/src/test/java/cucumber/runtime/java/spring_contextconfig/WithSpringAnnotations.java

@@ -1,7 +1,7 @@
-package cucumber.runtime.java.spring;
+package cucumber.runtime.java.spring_contexthierarchyconfig;
 
+import cucumber.runtime.java.spring.DummyComponent;
 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;
 

spring/src/test/java/cucumber/runtime/java/spring/WithContextHierarchyAnnotation.java renamed to spring/src/test/java/cucumber/runtime/java/spring_contexthierarchyconfig/WithContextHierarchyAnnotation.java

@@ -1,12 +1,13 @@
-package cucumber.runtime.java.spring;
+package cucumber.runtime.java.spring_dirtiescontextconfig;
 
+import cucumber.api.java.en.Given;
+import cucumber.api.java.en.Then;
+import cucumber.runtime.java.spring.Belly;
+import cucumber.runtime.java.spring.BellyBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-
 import static org.junit.Assert.assertEquals;
 
 @ContextConfiguration("classpath:cucumber.xml")

spring/src/test/java/cucumber/runtime/java/spring/DirtiesContextBellyStepDefs.java renamed to spring/src/test/java/cucumber/runtime/java/spring_dirtiescontextconfig/DirtiesContextBellyStepDefs.java

@@ -0,0 +1,12 @@
+package cucumber.runtime.java.spring_dirtiescontextconfig;
+
+import cucumber.api.CucumberOptions;
+
+import cucumber.api.junit.Cucumber;
+import org.junit.runner.RunWith;
+
+@RunWith(Cucumber.class)
+@CucumberOptions(glue = {"cucumber.runtime.java.spring_dirtiescontextconfig", "cucumber.runtime.java.spring"},
+        features = {"classpath:cucumber/runtime/java/spring/dirtyCukes.feature"})
+public class RunCukesTest {
+}

spring/src/test/java/cucumber/runtime/java/spring_dirtiescontextconfig/RunCukesTest.java

@@ -0,0 +1,12 @@
+package cucumber.runtime.java.spring_webappconfig;
+
+import cucumber.api.CucumberOptions;
+
+import cucumber.api.junit.Cucumber;
+import org.junit.runner.RunWith;
+
+@RunWith(Cucumber.class)
+@CucumberOptions(glue = {"cucumber.runtime.java.spring_webappconfig"},
+        features = {"classpath:cucumber/runtime/java/spring/springinjection.feature"})
+public class RunCukesTest {
+}

spring/src/test/java/cucumber/runtime/java/spring_webappconfig/RunCukesTest.java

@@ -1,4 +1,4 @@
-package cucumber.runtime.java.spring;
+package cucumber.runtime.java.spring_webappconfig;
 
 import cucumber.api.java.en.Given;
 import cucumber.api.java.en.Then;