commit 048369afccd832721ed44fb68115cf1037f111dd
Author: Mauro Talevi <mauro.tal...@aquilonia.org>
AuthorDate: Tue, 6 May 2014 14:34:54 +0200
Commit: Mauro Talevi <mauro.tal...@aquilonia.org>
CommitDate: Tue, 6 May 2014 14:34:54 +0200
JBEHAVE-1014: Fixed CrossReferenceBehaviour.
diff --git
a/jbehave-core/src/main/java/org/jbehave/core/embedder/PerformableTree.java
b/jbehave-core/src/main/java/org/jbehave/core/embedder/PerformableTree.java
index 0e7ccf2..009f534 100644
--- a/jbehave-core/src/main/java/org/jbehave/core/embedder/PerformableTree.java
+++ b/jbehave-core/src/main/java/org/jbehave/core/embedder/PerformableTree.java
@@ -33,7 +33,7 @@ import org.jbehave.core.steps.InjectableStepsFactory;
import org.jbehave.core.steps.PendingStepMethodGenerator;
import org.jbehave.core.steps.Step;
import org.jbehave.core.steps.StepCollector.Stage;
-import org.jbehave.core.steps.StepCreator.ParameterisedStep;
+import org.jbehave.core.steps.StepCreator.ParametrisedStep;
import org.jbehave.core.steps.StepCreator.PendingStep;
import org.jbehave.core.steps.StepResult;
import org.jbehave.core.steps.Timer;
@@ -309,8 +309,8 @@ public class PerformableTree {
public State run(Step step, List<StepResult> results, StoryReporter
reporter,
UUIDExceptionWrapper storyFailureIfItHappened) {
- if (step instanceof ParameterisedStep) {
- ((ParameterisedStep) step).describeTo(reporter);
+ if (step instanceof ParametrisedStep) {
+ ((ParametrisedStep) step).describeTo(reporter);
}
StepResult result = step.perform(storyFailureIfItHappened);
results.add(result);
diff --git a/jbehave-core/src/test/java/org/jbehave/core/reporters/xref.json
b/jbehave-core/src/test/java/org/jbehave/core/reporters/xref.json
index f1cd428..69a6a71 100644
--- a/jbehave-core/src/test/java/org/jbehave/core/reporters/xref.json
+++ b/jbehave-core/src/test/java/org/jbehave/core/reporters/xref.json
@@ -70,13 +70,13 @@
}
},
"lifecycle": {
- "beforeSteps": [
- []
- ],
- "afterSteps": [
+ "before": {
+ "steps": [
[]
]
},
+ "after": []
+ },
"scenarios": []
},
"localizedNarrative": "In order to renovate my house\nAs a customer\nI
want to get a loan",
diff --git a/jbehave-core/src/test/java/org/jbehave/core/reporters/xref.xml
b/jbehave-core/src/test/java/org/jbehave/core/reporters/xref.xml
index 7bec4f3..4a9058a 100644
--- a/jbehave-core/src/test/java/org/jbehave/core/reporters/xref.xml
+++ b/jbehave-core/src/test/java/org/jbehave/core/reporters/xref.xml
@@ -55,12 +55,12 @@
</examplesTable>
</givenStories>
<lifecycle>
- <beforeSteps class="java.util.Arrays$ArrayList">
- <a class="string-array"/>
- </beforeSteps>
- <afterSteps class="java.util.Arrays$ArrayList">
+ <before>
+ <steps class="java.util.Arrays$ArrayList">
<a class="string-array"/>
- </afterSteps>
+ </steps>
+ </before>
+ <after/>
</lifecycle>
<scenarios/>
</story>
