Title: [883] trunk: [Liz] Pending exceptions can now be made to fail the build, and steps can be made partially pending by throwing PendingError
Revision 883
Author sirenian
Date 2008-08-18 13:34:12 -0500 (Mon, 18 Aug 2008)
Log Message
[Liz] Pending exceptions can now be made to fail the build, and steps can be made partially pending by throwing PendingError
Modified Paths
trunk/build.xml
trunk/examples/noughtsandcrosses/src/scenario/com/lunivore/noughtsandcrosses/players_can_take_turns
trunk/examples/noughtsandcrosses/src/scenario/com/lunivore/noughtsandcrosses/steps/GridSteps.java
trunk/examples/noughtsandcrosses/src/scenario/com/lunivore/noughtsandcrosses/three_in_a_row_wins
trunk/examples/trader/src/main/java/org/jbehave/examples/trader/scenarios/StatusAlertCanBeActivated.java
trunk/examples/trader/src/main/java/org/jbehave/examples/trader/scenarios/StatusAlertIsNeverActivated.java
trunk/jbehave-core/src/behaviour/org/jbehave/scenario/ScenarioBehaviour.java
trunk/jbehave-core/src/behaviour/org/jbehave/scenario/ScenarioRunnerBehaviour.java
trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/scenarios/MyMultipleScenario.java
trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/scenarios/MyPendingScenario.java
trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/StepResultBehaviour.java
trunk/jbehave-core/src/java/org/jbehave/scenario/Scenario.java
trunk/jbehave-core/src/java/org/jbehave/scenario/ScenarioReporter.java
trunk/jbehave-core/src/java/org/jbehave/scenario/ScenarioRunner.java
trunk/jbehave-core/src/java/org/jbehave/scenario/steps/CandidateStep.java
trunk/jbehave-core/src/java/org/jbehave/scenario/steps/PendingStep.java
trunk/jbehave-core/src/java/org/jbehave/scenario/steps/StepResult.java
Added Paths
trunk/jbehave-core/src/behaviour/org/jbehave/scenario/PropertyBasedConfigurationBehaviour.java
trunk/jbehave-core/src/java/org/jbehave/Configuration.java
trunk/jbehave-core/src/java/org/jbehave/scenario/PropertyBasedConfiguration.java
trunk/jbehave-core/src/java/org/jbehave/scenario/steps/ErrorStrategy.java
trunk/jbehave-core/src/java/org/jbehave/scenario/steps/PendingError.java
trunk/jbehave-core/src/java/org/jbehave/scenario/steps/PendingStepStrategy.java
Removed Paths
trunk/jbehave-core/src/java/org/jbehave/OurTechnique.java
trunk/jbehave-core/src/java/org/jbehave/Technique.java
Diff
Modified: trunk/build.xml (882 => 883)
--- trunk/build.xml 2008-07-29 12:22:35 UTC (rev 882)
+++ trunk/build.xml 2008-08-18 18:34:12 UTC (rev 883)
@@ -22,7 +22,7 @@
property name=jbehave.zip location=${working.dir}/jbehave-${version}.zip /
property name=dist.dir location=${working.dir}/${version} /
property name=jbehave.jar location=${dist.dir}/jbehave-${version}.jar /
- property name=jbehave.src.zip location=${dist.dir}/jbehave-${version}-src.zip /
+ property name=jbehave.src.jar location=${dist.dir}/jbehave-${version}-src.jar /
property name=website.dist.dir location=${dist.dir}/website /
property name=javadoc.dist.dir location=${website.dist.dir}/javadoc/${version} /
@@ -191,6 +191,7 @@
description=Produces a jar file in the distribution directory.
depends=jbehave-classes
jar basedir=${jbehave.classes} jarfile=${jbehave.jar} /
+jar basedir=${jbehave.source} jarfile=${jbehave.src.jar} /
/target
target name=jbehave-src-zip description=Assembles the source jar.
Modified: trunk/examples/noughtsandcrosses/src/scenario/com/lunivore/noughtsandcrosses/players_can_take_turns (882 => 883)
--- trunk/examples/noughtsandcrosses/src/scenario/com/lunivore/noughtsandcrosses/players_can_take_turns 2008-07-29 12:22:35 UTC (rev 882)
+++ trunk/examples/noughtsandcrosses/src/scenario/com/lunivore/noughtsandcrosses/players_can_take_turns 2008-08-18 18:34:12 UTC (rev 883)
@@ -17,4 +17,3 @@
Then the grid should look like
XO.
...
-...
Modified: trunk/examples/noughtsandcrosses/src/scenario/com/lunivore/noughtsandcrosses/steps/GridSteps.java (882 => 883)
--- trunk/examples/noughtsandcrosses/src/scenario/com/lunivore/noughtsandcrosses/steps/GridSteps.java 2008-07-29 12:22:35 UTC (rev 882)
+++ trunk/examples/noughtsandcrosses/src/scenario/com/lunivore/noughtsandcrosses/steps/GridSteps.java 2008-08-18 18:34:12 UTC (rev 883)
@@ -13,6 +13,7 @@
import org.jbehave.scenario.annotations.Given;
import org.jbehave.scenario.annotations.Then;
import org.jbehave.scenario.annotations.When;
+import org.jbehave.scenario.steps.PendingError;
import org.jbehave.scenario.steps.Steps;
import org.lunivore.tyburn.WindowControl;
Modified: trunk/examples/noughtsandcrosses/src/scenario/com/lunivore/noughtsandcrosses/three_in_a_row_wins (882 => 883)
--- trunk/examples/noughtsandcrosses/src/scenario/com/lunivore/noughtsandcrosses/three_in_a_row_wins 2008-07-29 12:22:35 UTC (rev 882)
+++ trunk/examples/noughtsandcrosses/src/scenario/com/lunivore/noughtsandcrosses/three_in_a_row_wins 2008-08-18 18:34:12 UTC (rev 883)
@@ -1,4 +1,4 @@
-Given the grid looks like