commit d88167c3f684c0ea75c65279e395030ccf622c17
Author: Mauro Talevi <[email protected]>
AuthorDate: Wed, 7 May 2014 10:05:01 +0200
Commit: Mauro Talevi <[email protected]>
CommitDate: Wed, 7 May 2014 10:05:01 +0200
JBEHAVE-1014: Fixed the templateable rendering of lifecycle outcomes.
diff --git
a/jbehave-core/src/main/java/org/jbehave/core/reporters/TemplateableOutput.java
b/jbehave-core/src/main/java/org/jbehave/core/reporters/TemplateableOutput.java
index 5d64501..f7e22c7 100644
---
a/jbehave-core/src/main/java/org/jbehave/core/reporters/TemplateableOutput.java
+++
b/jbehave-core/src/main/java/org/jbehave/core/reporters/TemplateableOutput.java
@@ -1,5 +1,10 @@
package org.jbehave.core.reporters;
+import static org.jbehave.core.steps.StepCreator.PARAMETER_TABLE_END;
+import static org.jbehave.core.steps.StepCreator.PARAMETER_TABLE_START;
+import static org.jbehave.core.steps.StepCreator.PARAMETER_VALUE_END;
+import static org.jbehave.core.steps.StepCreator.PARAMETER_VALUE_START;
+
import java.io.File;
import java.io.FileWriter;
import java.io.Writer;
@@ -8,11 +13,13 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
+import org.jbehave.core.annotations.AfterScenario.Outcome;
import org.jbehave.core.configuration.Keywords;
import org.jbehave.core.model.ExamplesTable;
import org.jbehave.core.model.GivenStories;
@@ -28,11 +35,6 @@ import freemarker.ext.beans.BeansWrapper;
import freemarker.template.TemplateHashModel;
import freemarker.template.TemplateModelException;
-import static org.jbehave.core.steps.StepCreator.PARAMETER_TABLE_END;
-import static org.jbehave.core.steps.StepCreator.PARAMETER_TABLE_START;
-import static org.jbehave.core.steps.StepCreator.PARAMETER_VALUE_END;
-import static org.jbehave.core.steps.StepCreator.PARAMETER_VALUE_START;
-
/**
* <p>
* Story reporter that outputs to a template.
@@ -333,6 +335,10 @@ public class TemplateableOutput implements StoryReporter {
return keywords.duration();
}
+ public String getOutcome(){
+ return keywords.outcome();
+ }
+
public String getYes() {
return keywords.yes();
}
@@ -457,6 +463,14 @@ public class TemplateableOutput implements StoryReporter {
return lifecycle.getAfterSteps();
}
+ public Set<Outcome> getOutcomes(){
+ return lifecycle.getOutcomes();
+ }
+
+ public List<String> getAfterSteps(Outcome outcome){
+ return lifecycle.getAfterSteps(outcome);
+ }
+
}
public static class OutputScenario {