Fix issue with Cucumber driverLifecycle and move integration test to …

…right package
FluentLenium · Aug 24, 2016 · dd5e191 · dd5e191
1 parent cb73bfe
commit dd5e191
Show file tree

Hide file tree

Showing 19 changed files with 75 additions and 61 deletions.
diff --git a/fluentlenium-core/src/main/java/org/fluentlenium/adapter/FluentTestRunnerAdapter.java b/fluentlenium-core/src/main/java/org/fluentlenium/adapter/FluentTestRunnerAdapter.java
@@ -61,14 +61,14 @@ protected void starting(Class<?> testClass) {
      * @param testName  Test name
      */
     protected void starting(Class<?> testClass, String testName) {
-        EffectiveParameters<?> sharedParameters = this.sharedMutator.getEffectiveParameters(testClass, testName, getDriverLifecycle());
+        EffectiveParameters<?> parameters = this.sharedMutator.getEffectiveParameters(testClass, testName, getDriverLifecycle());
 
         SharedWebDriver sharedWebDriver = SharedWebDriverContainer.INSTANCE.getOrCreateDriver(new Supplier<WebDriver>() {
             @Override
             public WebDriver get() {
                 return FluentTestRunnerAdapter.this.newWebDriver();
             }
-        }, testClass, testName, sharedParameters.getDriverLifecycle());
+        }, parameters.getTestClass(), parameters.getTestName(), parameters.getDriverLifecycle());
 
         initFluent(sharedWebDriver.getDriver());
     }
@@ -109,9 +109,9 @@ protected void finished(Class<?> testClass, String testName) {
         DriverLifecycle driverLifecycle = getDriverLifecycle();
 
         if (driverLifecycle == DriverLifecycle.METHOD) {
-            EffectiveParameters<?> sharedParameters = this.sharedMutator.getEffectiveParameters(testClass, testName, driverLifecycle);
+            EffectiveParameters<?> parameters = this.sharedMutator.getEffectiveParameters(testClass, testName, driverLifecycle);
 
-            SharedWebDriver sharedWebDriver = SharedWebDriverContainer.INSTANCE.getDriver(sharedParameters.getTestClass(), sharedParameters.getTestName(), sharedParameters.getDriverLifecycle());
+            SharedWebDriver sharedWebDriver = SharedWebDriverContainer.INSTANCE.getDriver(parameters.getTestClass(), parameters.getTestName(), parameters.getDriverLifecycle());
             if (sharedWebDriver != null) {
                 SharedWebDriverContainer.INSTANCE.quit(sharedWebDriver);
             }

diff --git a/fluentlenium-cucumber/pom.xml b/fluentlenium-cucumber/pom.xml
@@ -79,7 +79,7 @@
                 </executions>
                 <configuration>
                     <includes>
-                        <include>**/BasicRunner.java</include>
+                        <include>**/integration/**/*</include>
                     </includes>
                 </configuration>
             </plugin>

diff --git a/...cucumber/src/main/java/org/fluentlenium/cucumber/adapter/FluentCucumberSharedMutator.java b/...cucumber/src/main/java/org/fluentlenium/cucumber/adapter/FluentCucumberSharedMutator.java
@@ -1,19 +1,20 @@
 package org.fluentlenium.cucumber.adapter;
 
 import org.fluentlenium.adapter.SharedMutator;
+import org.fluentlenium.configuration.ConfigurationException;
 import org.fluentlenium.configuration.ConfigurationProperties;
 import org.fluentlenium.configuration.ConfigurationProperties.DriverLifecycle;
 
 /**
  * Cucumber implementation of {@link SharedMutator}, replacing testClass with a null reference as it doesn't make sense
+ * and raising a {@link org.fluentlenium.configuration.ConfigurationException} when {@link DriverLifecycle#CLASS} is given.
  * to link {@link org.openqa.selenium.WebDriver} instances with classes defining Step.
  */
 public class FluentCucumberSharedMutator implements SharedMutator {
     @Override
     public <T> EffectiveParameters<T> getEffectiveParameters(Class<T> testClass, String testName, DriverLifecycle driverLifecycle) {
-        if (driverLifecycle == DriverLifecycle.METHOD) {
-            // It has no sense to use METHOD lifecycle in Cucumber.
-            driverLifecycle = DriverLifecycle.CLASS;
+        if (driverLifecycle == DriverLifecycle.CLASS) {
+            throw new ConfigurationException("Cucumber doesn't support CLASS driverLifecycle.");
         }
         return new EffectiveParameters<>(null, testName, driverLifecycle);
     }

diff --git a/...mber/src/test/java/org/fluentlenium/cucumber/adapter/FluentCucumberSharedMutatorTest.java b/...mber/src/test/java/org/fluentlenium/cucumber/adapter/FluentCucumberSharedMutatorTest.java
@@ -0,0 +1,47 @@
+package org.fluentlenium.cucumber.adapter;
+
+import org.assertj.core.api.Assertions;
+import org.assertj.core.api.ThrowableAssert;
+import org.fluentlenium.adapter.SharedMutator;
+import org.fluentlenium.configuration.ConfigurationException;
+import org.fluentlenium.configuration.ConfigurationProperties;
+import org.fluentlenium.configuration.ConfigurationProperties.DriverLifecycle;
+import org.fluentlenium.cucumber.adapter.FluentCucumberSharedMutator;
+import org.junit.Before;
+import org.junit.Test;
+
+public class FluentCucumberSharedMutatorTest {
+    private FluentCucumberSharedMutator sharedMutator;
+
+    @Before
+    public void before() {
+        sharedMutator = new FluentCucumberSharedMutator();
+    }
+
+    @Test
+    public void testCucumberMutator() {
+        final Class<?> testClass = Object.class;
+        final String testName = "test";
+        DriverLifecycle driverLifecycle = DriverLifecycle.JVM;
+
+        SharedMutator.EffectiveParameters<?> parameters = sharedMutator.getEffectiveParameters(testClass, testName, driverLifecycle);
+
+        Assertions.assertThat(parameters.getTestClass()).isNull();
+        Assertions.assertThat(parameters.getTestName()).isEqualTo(testName);
+        Assertions.assertThat(parameters.getDriverLifecycle()).isEqualTo(DriverLifecycle.JVM);
+    }
+
+    @Test
+    public void testCucumberMutatorWithClassLifecycle() {
+        final Class<?> testClass = Object.class;
+        final String testName = "test";
+        final DriverLifecycle driverLifecycle = DriverLifecycle.CLASS;
+
+        Assertions.assertThatThrownBy(new ThrowableAssert.ThrowingCallable() {
+            @Override
+            public void call() throws Throwable {
+                sharedMutator.getEffectiveParameters(testClass, testName, driverLifecycle);
+            }
+        }).isExactlyInstanceOf(ConfigurationException.class).hasMessage("Cucumber doesn't support CLASS driverLifecycle.");
+    }
+}
diff --git a/...rg/fluentlenium/cucumber/BasicRunner.java → ...ium/cucumber/integration/BasicRunner.java b/...rg/fluentlenium/cucumber/BasicRunner.java → ...ium/cucumber/integration/BasicRunner.java
@@ -1,11 +1,11 @@
-package org.fluentlenium.cucumber;
+package org.fluentlenium.cucumber.integration;
 
 import cucumber.api.CucumberOptions;
 import cucumber.api.junit.Cucumber;
 import org.junit.runner.RunWith;
 
 @RunWith(Cucumber.class)
-@CucumberOptions(features = "classpath:org/fluentlenium/cucumber", format = {"pretty", "html:target/cucumber", "json:target/cucumber.json"})
+@CucumberOptions(features = "classpath:org/fluentlenium/cucumber/integration", format = {"pretty", "html:target/cucumber", "json:target/cucumber.json"})
 public class BasicRunner {
 
 

diff --git a/...fluentlenium/cucumber/page/LocalPage.java → .../cucumber/integration/page/LocalPage.java b/...fluentlenium/cucumber/page/LocalPage.java → .../cucumber/integration/page/LocalPage.java
@@ -1,7 +1,7 @@
-package org.fluentlenium.cucumber.page;
+package org.fluentlenium.cucumber.integration.page;
 
 import org.fluentlenium.core.FluentPage;
-import org.fluentlenium.integration.util.UrlUtil;
+import org.fluentlenium.cucumber.integration.utils.UrlUtil;
 
 public class LocalPage extends FluentPage {
 

diff --git a/...luentlenium/cucumber/page/LocalPage2.java → ...cucumber/integration/page/LocalPage2.java b/...luentlenium/cucumber/page/LocalPage2.java → ...cucumber/integration/page/LocalPage2.java
@@ -1,7 +1,7 @@
-package org.fluentlenium.cucumber.page;
+package org.fluentlenium.cucumber.integration.page;
 
 import org.fluentlenium.core.FluentPage;
-import org.fluentlenium.integration.util.UrlUtil;
+import org.fluentlenium.cucumber.integration.utils.UrlUtil;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...ucumber/step/SimpleFeatureMultiStep1.java → ...gration/step/SimpleFeatureMultiStep1.java b/...ucumber/step/SimpleFeatureMultiStep1.java → ...gration/step/SimpleFeatureMultiStep1.java
@@ -1,18 +1,15 @@
-package org.fluentlenium.cucumber.step;
+package org.fluentlenium.cucumber.integration.step;
 
 import cucumber.api.Scenario;
 import cucumber.api.java.After;
 import cucumber.api.java.Before;
 import cucumber.api.java.en.Given;
-import org.fluentlenium.configuration.ConfigurationProperties;
-import org.fluentlenium.configuration.FluentConfiguration;
 import org.fluentlenium.core.annotation.Page;
 import org.fluentlenium.cucumber.adapter.FluentCucumberTest;
-import org.fluentlenium.cucumber.page.LocalPage;
+import org.fluentlenium.cucumber.integration.page.LocalPage;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.htmlunit.HtmlUnitDriver;
 
-@FluentConfiguration(driverLifecycle = ConfigurationProperties.DriverLifecycle.CLASS)
 public class SimpleFeatureMultiStep1 extends FluentCucumberTest {
 
     @Page

diff --git a/...ucumber/step/SimpleFeatureMultiStep2.java → ...gration/step/SimpleFeatureMultiStep2.java b/...ucumber/step/SimpleFeatureMultiStep2.java → ...gration/step/SimpleFeatureMultiStep2.java
@@ -1,19 +1,16 @@
-package org.fluentlenium.cucumber.step;
+package org.fluentlenium.cucumber.integration.step;
 
 import cucumber.api.Scenario;
 import cucumber.api.java.After;
 import cucumber.api.java.Before;
 import cucumber.api.java.en.Then;
 import cucumber.api.java.en.When;
-import org.fluentlenium.configuration.ConfigurationProperties;
-import org.fluentlenium.configuration.FluentConfiguration;
 import org.fluentlenium.core.annotation.Page;
 import org.fluentlenium.cucumber.adapter.FluentCucumberTest;
-import org.fluentlenium.cucumber.page.LocalPage2;
+import org.fluentlenium.cucumber.integration.page.LocalPage2;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.htmlunit.HtmlUnitDriver;
 
-@FluentConfiguration(driverLifecycle = ConfigurationProperties.DriverLifecycle.METHOD)
 public class SimpleFeatureMultiStep2 extends FluentCucumberTest {
 
     @Page

diff --git a/...nium/cucumber/step/SimpleFeatureStep.java → ...r/integration/step/SimpleFeatureStep.java b/...nium/cucumber/step/SimpleFeatureStep.java → ...r/integration/step/SimpleFeatureStep.java
@@ -1,4 +1,4 @@
-package org.fluentlenium.cucumber.step;
+package org.fluentlenium.cucumber.integration.step;
 
 import cucumber.api.Scenario;
 import cucumber.api.java.After;
@@ -10,7 +10,7 @@
 import org.fluentlenium.configuration.FluentConfiguration;
 import org.fluentlenium.core.annotation.Page;
 import org.fluentlenium.cucumber.adapter.FluentCucumberTest;
-import org.fluentlenium.cucumber.page.LocalPage;
+import org.fluentlenium.cucumber.integration.page.LocalPage;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.htmlunit.HtmlUnitDriver;
 

diff --git a/...cumber/step/SimpleScenarioMultiStep1.java → ...ration/step/SimpleScenarioMultiStep1.java b/...cumber/step/SimpleScenarioMultiStep1.java → ...ration/step/SimpleScenarioMultiStep1.java
@@ -1,4 +1,4 @@
-package org.fluentlenium.cucumber.step;
+package org.fluentlenium.cucumber.integration.step;
 
 import cucumber.api.Scenario;
 import cucumber.api.java.After;
@@ -8,7 +8,7 @@
 import org.fluentlenium.configuration.FluentConfiguration;
 import org.fluentlenium.core.annotation.Page;
 import org.fluentlenium.cucumber.adapter.FluentCucumberTest;
-import org.fluentlenium.cucumber.page.LocalPage;
+import org.fluentlenium.cucumber.integration.page.LocalPage;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.htmlunit.HtmlUnitDriver;
 

diff --git a/...cumber/step/SimpleScenarioMultiStep2.java → ...ration/step/SimpleScenarioMultiStep2.java b/...cumber/step/SimpleScenarioMultiStep2.java → ...ration/step/SimpleScenarioMultiStep2.java
@@ -1,4 +1,4 @@
-package org.fluentlenium.cucumber.step;
+package org.fluentlenium.cucumber.integration.step;
 
 import cucumber.api.Scenario;
 import cucumber.api.java.After;
@@ -9,7 +9,7 @@
 import org.fluentlenium.configuration.FluentConfiguration;
 import org.fluentlenium.core.annotation.Page;
 import org.fluentlenium.cucumber.adapter.FluentCucumberTest;
-import org.fluentlenium.cucumber.page.LocalPage;
+import org.fluentlenium.cucumber.integration.page.LocalPage;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.htmlunit.HtmlUnitDriver;
 

diff --git a/...ium/cucumber/step/SimpleScenarioStep.java → .../integration/step/SimpleScenarioStep.java b/...ium/cucumber/step/SimpleScenarioStep.java → .../integration/step/SimpleScenarioStep.java
@@ -1,20 +1,17 @@
-package org.fluentlenium.cucumber.step;
+package org.fluentlenium.cucumber.integration.step;
 
 import cucumber.api.Scenario;
 import cucumber.api.java.After;
 import cucumber.api.java.Before;
 import cucumber.api.java.en.Given;
 import cucumber.api.java.en.Then;
 import cucumber.api.java.en.When;
-import org.fluentlenium.configuration.ConfigurationProperties;
-import org.fluentlenium.configuration.FluentConfiguration;
 import org.fluentlenium.core.annotation.Page;
 import org.fluentlenium.cucumber.adapter.FluentCucumberTest;
-import org.fluentlenium.cucumber.page.LocalPage;
+import org.fluentlenium.cucumber.integration.page.LocalPage;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.htmlunit.HtmlUnitDriver;
 
-@FluentConfiguration(driverLifecycle = ConfigurationProperties.DriverLifecycle.CLASS)
 public class SimpleScenarioStep extends FluentCucumberTest {
 
     @Page

diff --git a/...luentlenium/integration/util/UrlUtil.java → ...m/cucumber/integration/utils/UrlUtil.java b/...luentlenium/integration/util/UrlUtil.java → ...m/cucumber/integration/utils/UrlUtil.java
@@ -1,4 +1,4 @@
-package org.fluentlenium.integration.util;
+package org.fluentlenium.cucumber.integration.utils;
 
 import java.net.URL;
 

diff --git a/...ucumber/src/test/java/org/fluentlenium/cucumber/page/FluentCucumberSharedMutatorTest.java b/...ucumber/src/test/java/org/fluentlenium/cucumber/page/FluentCucumberSharedMutatorTest.java
diff --git a/...luentlenium/cucumber/basicFeature.feature → ...cucumber/integration/basicFeature.feature b/...luentlenium/cucumber/basicFeature.feature → ...cucumber/integration/basicFeature.feature
diff --git a/...um/cucumber/basicMultiStepFeature.feature → ...integration/basicMultiStepFeature.feature b/...um/cucumber/basicMultiStepFeature.feature → ...integration/basicMultiStepFeature.feature
diff --git a/...m/cucumber/basicMultiStepScenario.feature → ...ntegration/basicMultiStepScenario.feature b/...m/cucumber/basicMultiStepScenario.feature → ...ntegration/basicMultiStepScenario.feature
diff --git a/...uentlenium/cucumber/basicScenario.feature → ...ucumber/integration/basicScenario.feature b/...uentlenium/cucumber/basicScenario.feature → ...ucumber/integration/basicScenario.feature