commit 6c1c0065a6d33a92d8e20cd39a67a3be04555917
Author: Mauro Talevi <[email protected]>
AuthorDate: Wed Apr 4 12:10:01 2012 +0100
Commit: Mauro Talevi <[email protected]>
CommitDate: Wed Apr 4 12:10:01 2012 +0100
JBEHAVE-757: Configuerd use of SameThreadExecutors.
diff --git a/examples/trader-runner-webdriver/pom.xml
b/examples/trader-runner-webdriver/pom.xml
index 7d92291..55bf571 100644
--- a/examples/trader-runner-webdriver/pom.xml
+++ b/examples/trader-runner-webdriver/pom.xml
@@ -106,13 +106,20 @@
<includes>
<include>**/*Stories.java</include>
</includes>
-
<embedderClass>org.jbehave.web.examples.trader.webdriver.TraderWebStories$SameThreadEmbedder</embedderClass>
+
<executorsClass>org.jbehave.core.embedder.executors.SameThreadExecutors</executorsClass>
</configuration>
<goals>
<goal>run-stories-as-embeddables</goal>
</goals>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>11.0.1</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
diff --git
a/examples/trader-runner-webdriver/src/main/java/org/jbehave/web/examples/trader/webdriver/TraderWebStories.java
b/examples/trader-runner-webdriver/src/main/java/org/jbehave/web/examples/trader/webdriver/TraderWebStories.java
index 240ddc4..f60287e 100644
---
a/examples/trader-runner-webdriver/src/main/java/org/jbehave/web/examples/trader/webdriver/TraderWebStories.java
+++
b/examples/trader-runner-webdriver/src/main/java/org/jbehave/web/examples/trader/webdriver/TraderWebStories.java
@@ -4,7 +4,7 @@ import java.util.List;
import org.jbehave.core.Embeddable;
import org.jbehave.core.configuration.Configuration;
-import org.jbehave.core.embedder.Embedder;
+import org.jbehave.core.embedder.executors.SameThreadExecutors;
import org.jbehave.core.io.LoadFromClasspath;
import org.jbehave.core.io.StoryFinder;
import org.jbehave.core.junit.JUnitStories;
@@ -25,8 +25,6 @@ import org.jbehave.web.selenium.WebDriverProvider;
import org.jbehave.web.selenium.WebDriverScreenshotOnFailure;
import org.jbehave.web.selenium.WebDriverSteps;
-import com.google.common.util.concurrent.MoreExecutors;
-
import static java.util.Arrays.asList;
import static org.jbehave.core.io.CodeLocations.codeLocationFromClass;
import static org.jbehave.core.reporters.Format.CONSOLE;
@@ -44,7 +42,7 @@ public class TraderWebStories extends JUnitStories {
public TraderWebStories() {
if ( lifecycleSteps instanceof PerStoriesWebDriverSteps ){
-
configuredEmbedder().useExecutorService(MoreExecutors.sameThreadExecutor());
+ configuredEmbedder().useExecutorService(new
SameThreadExecutors().create(configuredEmbedder().embedderControls()));
}
}
@@ -78,11 +76,4 @@ public class TraderWebStories extends JUnitStories {
.findPaths(codeLocationFromClass(this.getClass()).getFile(),
asList("**/*.story"), null);
}
- public static class SameThreadEmbedder extends Embedder {
-
- public SameThreadEmbedder() {
- useExecutorService(MoreExecutors.sameThreadExecutor());
- }
-
- }
}