diff --git a/archetypes/jbehave-guice-archetype/src/main/resources/archetype-resources/src/main/java/MyStories.java b/archetypes/jbehave-guice-archetype/src/main/resources/archetype-resources/src/main/java/MyStories.java index da3088f65..81a5b576c 100755 --- a/archetypes/jbehave-guice-archetype/src/main/resources/archetype-resources/src/main/java/MyStories.java +++ b/archetypes/jbehave-guice-archetype/src/main/resources/archetype-resources/src/main/java/MyStories.java @@ -55,7 +55,7 @@ public class MyStories extends JUnitStories { public MyStories() { configuredEmbedder().embedderControls().doGenerateViewAfterStories(true).doIgnoreFailureInStories(true) - .doIgnoreFailureInView(true).useThreads(2).useStoryTimeoutInSecs(60); + .doIgnoreFailureInView(true).useThreads(2).useStoryTimeouts("60"); } @Override diff --git a/archetypes/jbehave-needle-archetype/src/main/resources/archetype-resources/src/main/java/MyStories.java b/archetypes/jbehave-needle-archetype/src/main/resources/archetype-resources/src/main/java/MyStories.java index 4e36a873f..c915ca7d1 100644 --- a/archetypes/jbehave-needle-archetype/src/main/resources/archetype-resources/src/main/java/MyStories.java +++ b/archetypes/jbehave-needle-archetype/src/main/resources/archetype-resources/src/main/java/MyStories.java @@ -56,7 +56,7 @@ public class MyStories extends JUnitStories { public MyStories() { configuredEmbedder().embedderControls().doGenerateViewAfterStories(true).doIgnoreFailureInStories(true) - .doIgnoreFailureInView(true).useThreads(2).useStoryTimeoutInSecs(60); + .doIgnoreFailureInView(true).useThreads(2).useStoryTimeouts("60"); } @Override diff --git a/archetypes/jbehave-pico-archetype/src/main/resources/archetype-resources/src/main/java/MyStories.java b/archetypes/jbehave-pico-archetype/src/main/resources/archetype-resources/src/main/java/MyStories.java index 040531713..1483a7d3d 100755 --- a/archetypes/jbehave-pico-archetype/src/main/resources/archetype-resources/src/main/java/MyStories.java +++ b/archetypes/jbehave-pico-archetype/src/main/resources/archetype-resources/src/main/java/MyStories.java @@ -55,7 +55,7 @@ public class MyStories extends JUnitStories { public MyStories() { configuredEmbedder().embedderControls().doGenerateViewAfterStories(true).doIgnoreFailureInStories(true) - .doIgnoreFailureInView(true).useThreads(2).useStoryTimeoutInSecs(60); + .doIgnoreFailureInView(true).useThreads(2).useStoryTimeouts("60"); } @Override diff --git a/archetypes/jbehave-simple-archetype/src/main/resources/archetype-resources/src/main/java/MyStories.java b/archetypes/jbehave-simple-archetype/src/main/resources/archetype-resources/src/main/java/MyStories.java index a4b13d10c..30dd0b156 100755 --- a/archetypes/jbehave-simple-archetype/src/main/resources/archetype-resources/src/main/java/MyStories.java +++ b/archetypes/jbehave-simple-archetype/src/main/resources/archetype-resources/src/main/java/MyStories.java @@ -49,7 +49,7 @@ public class MyStories extends JUnitStories { public MyStories() { configuredEmbedder().embedderControls().doGenerateViewAfterStories(true).doIgnoreFailureInStories(true) - .doIgnoreFailureInView(true).useThreads(2).useStoryTimeoutInSecs(60); + .doIgnoreFailureInView(true).useThreads(2).useStoryTimeouts("60"); } @Override diff --git a/archetypes/jbehave-spring-archetype/src/main/resources/archetype-resources/src/main/java/MyStories.java b/archetypes/jbehave-spring-archetype/src/main/resources/archetype-resources/src/main/java/MyStories.java index f6c11ca27..584b456a4 100755 --- a/archetypes/jbehave-spring-archetype/src/main/resources/archetype-resources/src/main/java/MyStories.java +++ b/archetypes/jbehave-spring-archetype/src/main/resources/archetype-resources/src/main/java/MyStories.java @@ -53,7 +53,7 @@ public class MyStories extends JUnitStories { public MyStories() { configuredEmbedder().embedderControls().doGenerateViewAfterStories(true).doIgnoreFailureInStories(true) - .doIgnoreFailureInView(true).useThreads(2).useStoryTimeoutInSecs(60); + .doIgnoreFailureInView(true).useThreads(2).useStoryTimeouts("60"); } @Override diff --git a/distribution/src/site/content/configuration.html b/distribution/src/site/content/configuration.html index 3cde91ab7..01f43ed28 100755 --- a/distribution/src/site/content/configuration.html +++ b/distribution/src/site/content/configuration.html @@ -50,7 +50,7 @@

Using AnnotatedEmbedder

@Configure(storyControls = MyStoryControls.class, storyLoader = MyStoryLoader.class, storyReporterBuilder = MyReportBuilder.class, parameterConverters = { MyDateConverter.class }) @UsingEmbedder(embedder = Embedder.class, generateViewAfterStories = true, ignoreFailureInStories = true, ignoreFailureInView = true, verboseFailures = true, - storyTimeoutInSecs = 100, threads = 2, metaFilters = "-skip") + storyTimeouts = "100", threads = 2, metaFilters = "-skip") @UsingSteps(instances = { TraderSteps.class, BeforeAfterSteps.class, AndSteps.class, CalendarSteps.class, PriorityMatchingSteps.class, SandpitSteps.class, SearchSteps.class }) public class AnnotatedTraderEmbedder extends InjectableEmbedder { @@ -119,7 +119,7 @@

Using AnnotationBuilder

@Configure(storyLoader = MyStoryLoader.class, storyReporterBuilder = MyReportBuilder.class, parameterConverters = { MyDateConverter.class }) @UsingEmbedder(embedder = Embedder.class, generateViewAfterStories = true, ignoreFailureInStories = true, ignoreFailureInView = true, verboseFailures = true, - storyTimeoutInSecs = 100, threads = 2, metaFilters = "-skip") + storyTimeouts = "100", threads = 2, metaFilters = "-skip") @UsingSteps(instances = { TraderSteps.class, BeforeAfterSteps.class, AndSteps.class, CalendarSteps.class, PriorityMatchingSteps.class, SandpitSteps.class }) public class TraderAnnotatedEmbedder { @@ -193,7 +193,7 @@

Using ConfigurableEmbedder

public TraderStory() { configuredEmbedder().embedderControls().doGenerateViewAfterStories(true).doIgnoreFailureInStories(true) - .doIgnoreFailureInView(true).useThreads(2).useStoryTimeoutInSecs(60); + .doIgnoreFailureInView(true).useThreads(2).useStoryTimeouts("60"); // Uncomment to set meta filter, which can also be set via Maven // configuredEmbedder().useMetaFilters(Arrays.asList("+theme parametrisation")); } diff --git a/distribution/src/site/content/developing-stories.html b/distribution/src/site/content/developing-stories.html index 89d9f8889..2dacaf051 100755 --- a/distribution/src/site/content/developing-stories.html +++ b/distribution/src/site/content/developing-stories.html @@ -154,7 +154,7 @@

JUnit-enabled Embeddables

public TraderStory() { configuredEmbedder().embedderControls().doGenerateViewAfterStories(true).doIgnoreFailureInStories(true) - .doIgnoreFailureInView(true).useThreads(2).useStoryTimeoutInSecs(60); + .doIgnoreFailureInView(true).useThreads(2).useStoryTimeouts("60"); // Uncomment to set meta filter, which can also be set via Maven // configuredEmbedder().useMetaFilters(Arrays.asList("+theme parametrisation")); } @@ -212,7 +212,7 @@

JUnit-enabled Embeddables

public TraderStories() { configuredEmbedder().embedderControls().doGenerateViewAfterStories(true).doIgnoreFailureInStories(false) - .doIgnoreFailureInView(true).doVerboseFailures(true).useThreads(2).useStoryTimeoutInSecs(60); + .doIgnoreFailureInView(true).doVerboseFailures(true).useThreads(2).useStoryTimeouts("60"); //configuredEmbedder().useEmbedderControls(new PropertyBasedEmbedderControls()); } diff --git a/distribution/src/site/content/maven-goals.html b/distribution/src/site/content/maven-goals.html index 530160f54..bb90baa56 100755 --- a/distribution/src/site/content/maven-goals.html +++ b/distribution/src/site/content/maven-goals.html @@ -50,11 +50,10 @@

Maven Goals

  • ignoreFailureInStories: [true|false], defaults to false
  • ignoreFailureInView: [true|false], defaults to false
  • generateViewAfterStories: [true|false], defaults to true
    • -
  • storyTimeoutInSecs: defaults to 300
    • -
  • storyTimeoutInSecsByPath: defaults to 300 (the default of storyTimeoutInSecs)
    • +
  • storyTimeouts: defaults to 300
  • failOnStoryTimeout: [true|false], defaults to false
  • threads: defaults to 1
    • @@ -65,10 +64,8 @@

    Maven Goals

    href="javadoc/core/org/jbehave/core/io/StoryFinder.html">StoryFinder -Performance Testing: You can make use of -storyTimeoutInSecs and storyTimeoutInSecsByPath to ensure -tests run under the time(s) specified - +Performance Testing: You can make use of storyTimeouts to ensure tests run under the + time(s) specified

    In addition, the unpack-view-resources goal supports the properties:

    diff --git a/distribution/src/site/content/reporting-stories.html b/distribution/src/site/content/reporting-stories.html index b92c25e98..7fdffbce4 100755 --- a/distribution/src/site/content/reporting-stories.html +++ b/distribution/src/site/content/reporting-stories.html @@ -56,7 +56,7 @@

    Story Reporters

    public TraderStory() { configuredEmbedder().embedderControls().doGenerateViewAfterStories(true).doIgnoreFailureInStories(true) - .doIgnoreFailureInView(true).useThreads(2).useStoryTimeoutInSecs(60); + .doIgnoreFailureInView(true).useThreads(2).useStoryTimeouts("60"); // Uncomment to set meta filter, which can also be set via Maven // configuredEmbedder().useMetaFilters(Arrays.asList("+theme parametrisation")); } diff --git a/examples/failing/pom.xml b/examples/failing/pom.xml index b51bce017..042f98e71 100755 --- a/examples/failing/pom.xml +++ b/examples/failing/pom.xml @@ -50,8 +50,7 @@ true ${ignore.failure.in.stories} ${ignore.failure.in.view} - 300 - **/and_*.story:8,**/*calendar.story:15 + **/and_*.story:8,**/*calendar.story:15,300 ${threads} ${meta.filter} diff --git a/examples/performance/pom.xml b/examples/performance/pom.xml index 0eb5a20fe..17047a277 100755 --- a/examples/performance/pom.xml +++ b/examples/performance/pom.xml @@ -48,7 +48,7 @@ false ${threads} - ${story.timeout.in.secs} + ${story.timeout.in.secs} true ${ignore.failure.in.stories} true diff --git a/examples/threads/pom.xml b/examples/threads/pom.xml index f60566d01..935611f37 100644 --- a/examples/threads/pom.xml +++ b/examples/threads/pom.xml @@ -53,7 +53,7 @@ false ${threads} - ${story.timeout.in.secs} + ${story.timeout.in.secs} true ${ignore.failure.in.stories} true diff --git a/jbehave-core/src/main/java/org/jbehave/core/embedder/DelegatingEmbedderMonitor.java b/jbehave-core/src/main/java/org/jbehave/core/embedder/DelegatingEmbedderMonitor.java index ca732453c..907b2fe34 100755 --- a/jbehave-core/src/main/java/org/jbehave/core/embedder/DelegatingEmbedderMonitor.java +++ b/jbehave-core/src/main/java/org/jbehave/core/embedder/DelegatingEmbedderMonitor.java @@ -183,11 +183,6 @@ public void usingControls(EmbedderControls embedderControls) { delegates.forEach(d -> d.usingControls(embedderControls)); } - @Override - public void invalidTimeoutFormat(String path) { - delegates.forEach(d -> d.invalidTimeoutFormat(path)); - } - @Override public void usingTimeout(String path, long timeout) { delegates.forEach(d -> d.usingTimeout(path, timeout)); diff --git a/jbehave-core/src/main/java/org/jbehave/core/embedder/EmbedderMonitor.java b/jbehave-core/src/main/java/org/jbehave/core/embedder/EmbedderMonitor.java index edb7e426e..267f5d02f 100755 --- a/jbehave-core/src/main/java/org/jbehave/core/embedder/EmbedderMonitor.java +++ b/jbehave-core/src/main/java/org/jbehave/core/embedder/EmbedderMonitor.java @@ -73,8 +73,6 @@ void mapsViewGenerationFailed(File outputDirectory, StoryMaps storyMaps, Propert void usingControls(EmbedderControls embedderControls); - void invalidTimeoutFormat(String path); - void usingTimeout(String path, long timeout); } diff --git a/jbehave-core/src/main/java/org/jbehave/core/embedder/NullEmbedderMonitor.java b/jbehave-core/src/main/java/org/jbehave/core/embedder/NullEmbedderMonitor.java index 55e90e463..dbd762b08 100644 --- a/jbehave-core/src/main/java/org/jbehave/core/embedder/NullEmbedderMonitor.java +++ b/jbehave-core/src/main/java/org/jbehave/core/embedder/NullEmbedderMonitor.java @@ -162,11 +162,6 @@ public void usingControls(EmbedderControls embedderControls) { // Do nothing by default } - @Override - public void invalidTimeoutFormat(String path) { - // Do nothing by default - } - @Override public void usingTimeout(String path, long timeout) { // Do nothing by default diff --git a/jbehave-core/src/main/java/org/jbehave/core/embedder/PrintingEmbedderMonitor.java b/jbehave-core/src/main/java/org/jbehave/core/embedder/PrintingEmbedderMonitor.java index d2fc6e9d8..bfef82627 100755 --- a/jbehave-core/src/main/java/org/jbehave/core/embedder/PrintingEmbedderMonitor.java +++ b/jbehave-core/src/main/java/org/jbehave/core/embedder/PrintingEmbedderMonitor.java @@ -182,15 +182,6 @@ public void usingExecutorService(ExecutorService executorService) { public void usingControls(EmbedderControls embedderControls) { print("Using controls %s", embedderControls); } - - - @Override - public void invalidTimeoutFormat(String path) { - print("Failed to set specific story timeout for story %s because 'storyTimeoutInSecsByPath' has incorrect " - + "format", path); - print("'storyTimeoutInSecsByPath' must be a CSV of regex expressions matching story paths. E.g. \"*/long/*" - + ".story:5000,*/short/*.story:200\""); - } @Override public void usingTimeout(String path, long timeout) { diff --git a/jbehave-maven-plugin/src/main/java/org/jbehave/mojo/AbstractEmbedderMojo.java b/jbehave-maven-plugin/src/main/java/org/jbehave/mojo/AbstractEmbedderMojo.java index def5e5f5e..fd4a21409 100755 --- a/jbehave-maven-plugin/src/main/java/org/jbehave/mojo/AbstractEmbedderMojo.java +++ b/jbehave-maven-plugin/src/main/java/org/jbehave/mojo/AbstractEmbedderMojo.java @@ -501,14 +501,6 @@ public void usingExecutorService(ExecutorService executorService) { public void usingControls(EmbedderControls embedderControls) { getLog().info("Using controls " + embedderControls); } - - @Override - public void invalidTimeoutFormat(String path) { - getLog().warn("Failed to set specific story timeout for story " + path - + " because 'storyTimeoutInSecsByPath' has incorrect format"); - getLog().warn("'storyTimeoutInSecsByPath' must be a CSV of regex expressions matching story paths. " - + "E.g. \"*/long/*.story:5000,*/short/*.story:200\""); - } @Override public void usingTimeout(String path, long timeout) {