commit 011c085c3d640e5b2d948fbeb9a951b1bcd0a6f1 Author: Mauro Talevi <mauro.tal...@aquilonia.org> AuthorDate: Sun Apr 29 12:43:37 2012 +0200 Commit: Mauro Talevi <mauro.tal...@aquilonia.org> CommitDate: Sun Apr 29 12:43:37 2012 +0200
JBEHAVE-774: CrossReference is now passed the meta filter by the Embedder. diff --git a/jbehave-core/src/main/java/org/jbehave/core/embedder/Embedder.java b/jbehave-core/src/main/java/org/jbehave/core/embedder/Embedder.java index 62043d1..f7adc8e 100755 --- a/jbehave-core/src/main/java/org/jbehave/core/embedder/Embedder.java +++ b/jbehave-core/src/main/java/org/jbehave/core/embedder/Embedder.java @@ -199,6 +199,9 @@ public class Embedder { StoryRunner storyRunner = storyRunner(); StoryManager storyManager = createStoryManager(); MetaFilter filter = metaFilter(); + if ( configuration.storyReporterBuilder().hasCrossReference() ){ + configuration.storyReporterBuilder().crossReference().withMetaFilter(filter.asString()); + } BatchFailures failures = new BatchFailures(embedderControls.verboseFailures()); // run before stories diff --git a/jbehave-core/src/main/java/org/jbehave/core/reporters/CrossReference.java b/jbehave-core/src/main/java/org/jbehave/core/reporters/CrossReference.java index 13bf6d3..69efc58 100755 --- a/jbehave-core/src/main/java/org/jbehave/core/reporters/CrossReference.java +++ b/jbehave-core/src/main/java/org/jbehave/core/reporters/CrossReference.java @@ -43,6 +43,7 @@ public class CrossReference extends Format { private Set<String> failingStories = new HashSet<String>(); private Set<String> stepsPerformed = new HashSet<String>(); private PendingStepStrategy pendingStepStrategy = new PassingUponPendingStep(); + private String metaFilter = ""; private boolean doJson = true; private boolean doXml = true; private boolean excludeStoriesWithNoExecutedScenarios = false; @@ -71,6 +72,11 @@ public class CrossReference extends Format { return this; } + public CrossReference withMetaFilter(String metaFilter){ + this.metaFilter = metaFilter; + return this; + } + public CrossReference withPendingStepStrategy(PendingStepStrategy pendingStepStrategy) { this.pendingStepStrategy = pendingStepStrategy; return this; @@ -91,6 +97,10 @@ public class CrossReference extends Format { return this; } + public String getMetaFilter() { + return metaFilter; + } + public StepMonitor getStepMonitor() { return stepMonitor; } @@ -146,14 +156,6 @@ public class CrossReference extends Format { } - /** - * Override this if the metaFilter is important to you in the Story - * Navigator output - */ - public String getMetaFilter() { - return ""; - } - @SuppressWarnings("serial") public static class XrefOutputFailed extends RuntimeException {