Fixed #176 Exception when executing single Cucumber scenario

citrusframework · Dec 9, 2016 · e0107f3 · e0107f3
1 parent aa7dd95
commit e0107f3
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 7 deletions.
diff --git a/modules/citrus-cucumber/src/main/java/cucumber/runtime/java/CitrusObjectFactory.java b/modules/citrus-cucumber/src/main/java/cucumber/runtime/java/CitrusObjectFactory.java
@@ -23,14 +23,18 @@
 import com.consol.citrus.dsl.design.TestDesigner;
 import com.consol.citrus.dsl.runner.DefaultTestRunner;
 import com.consol.citrus.dsl.runner.TestRunner;
-import cucumber.runtime.CucumberException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Christoph Deppisch
  * @since 2.6
  */
 public class CitrusObjectFactory extends DefaultJavaObjectFactory {
 
+    /** Logger */
+    private static Logger log = LoggerFactory.getLogger(CitrusObjectFactory.class);
+
     /** Test designer */
     private TestDesigner designer;
 
@@ -55,11 +59,19 @@ public CitrusObjectFactory() {
 
     @Override
     public boolean addClass(Class<?> clazz) {
-        InjectionMode requiredMode = InjectionMode.analyseMode(clazz, mode);
+        InjectionMode fallback;
+        if (mode == null) {
+            fallback = InjectionMode.valueOf(System.getProperty("citrus.cucumber.injection.mode", InjectionMode.DESIGNER.name()));
+        } else {
+            fallback = mode;
+        }
+
+        InjectionMode requiredMode = InjectionMode.analyseMode(clazz, fallback);
         if (mode == null) {
             mode = requiredMode;
         } else if (!mode.equals(requiredMode)) {
-            throw new CucumberException("Illegal mix of test designer and runner mode within test run");
+            log.warn(String.format("Ignoring class of injection type '%s' as current injection mode is '%s'", requiredMode, mode));
+            return false;
         }
 
         return super.addClass(clazz);

diff --git a/...citrus-cucumber/src/main/java/cucumber/runtime/java/spring/CitrusSpringObjectFactory.java b/...citrus-cucumber/src/main/java/cucumber/runtime/java/spring/CitrusSpringObjectFactory.java
@@ -26,13 +26,18 @@
 import cucumber.runtime.CucumberException;
 import cucumber.runtime.java.CitrusBackend;
 import cucumber.runtime.java.InjectionMode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Christoph Deppisch
  * @since 2.6
  */
 public class CitrusSpringObjectFactory extends SpringFactory {
 
+    /** Logger */
+    private static Logger log = LoggerFactory.getLogger(CitrusSpringObjectFactory.class);
+
     /** Test designer */
     private TestDesigner designer;
 
@@ -57,11 +62,19 @@ public CitrusSpringObjectFactory() {
 
     @Override
     public boolean addClass(Class<?> clazz) {
-        InjectionMode requiredMode = InjectionMode.analyseMode(clazz, mode);
+        InjectionMode fallback;
+        if (mode == null) {
+            fallback = InjectionMode.valueOf(System.getProperty("citrus.cucumber.injection.mode", InjectionMode.DESIGNER.name()));
+        } else {
+            fallback = mode;
+        }
+
+        InjectionMode requiredMode = InjectionMode.analyseMode(clazz, fallback);
         if (mode == null) {
             mode = requiredMode;
         } else if (!mode.equals(requiredMode)) {
-            throw new CucumberException("Illegal mix of test designer and runner mode within test run");
+            log.warn(String.format("Ignoring class of injection type '%s' as current injection mode is '%s'", requiredMode, mode));
+            return false;
         }
 
         return super.addClass(clazz);
@@ -88,8 +101,13 @@ public void start() {
     @Override
     public <T> T getInstance(Class<T> type) {
         if (context == null) {
-            context = super.getInstance(TestContext.class);
-            CitrusBackend.initializeCitrus(context.getApplicationContext());
+            try {
+                context = super.getInstance(TestContext.class);
+                CitrusBackend.initializeCitrus(context.getApplicationContext());
+            } catch (CucumberException e) {
+                log.warn("Failed to get proper TestContext from Cucumber Spring application context: " + e.getMessage());
+                context = CitrusBackend.getCitrus().createTestContext();
+            }
 
             if (TestContext.class.isAssignableFrom(type)) {
                 return (T) context;