[jbehave-scm] [888] trunk/jbehave-core/src/java/org/jbehave: [Liz] Tidying up before the next bit; added a couple of examples and moved some files around

Sun, 24 Aug 2008 07:14:01 -0700

Title: [888] trunk/jbehave-core/src/java/org/jbehave: [Liz] Tidying up before the next bit; added a couple of examples and moved some files around
Revision
888
Author
sirenian
Date
2008-08-24 09:07:13 -0500 (Sun, 24 Aug 2008)

Log Message

[Liz] Tidying up before the next bit; added a couple of examples and moved some files around


Modified Paths




Added Paths




Removed Paths

Diff

Modified: trunk/jbehave-core/src/behaviour/org/jbehave/scenario/ScenarioBehaviour.java (887 => 888)

--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/ScenarioBehaviour.java	2008-08-23 15:06:43 UTC (rev 887)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/ScenarioBehaviour.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -10,6 +10,7 @@
 import org.jbehave.scenario.definition.Blurb;
 import org.jbehave.scenario.errors.ErrorStrategy;
 import org.jbehave.scenario.parser.ScenarioDefiner;
+import org.jbehave.scenario.reporters.ScenarioReporter;
 import org.jbehave.scenario.steps.PendingStepStrategy;
 import org.jbehave.scenario.steps.StepCreator;
 import org.jbehave.scenario.steps.Steps;

Modified: trunk/jbehave-core/src/behaviour/org/jbehave/scenario/ScenarioRunnerBehaviour.java (887 => 888)

--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/ScenarioRunnerBehaviour.java	2008-08-23 15:06:43 UTC (rev 887)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/ScenarioRunnerBehaviour.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -12,6 +12,7 @@
 import org.jbehave.scenario.definition.Blurb;
 import org.jbehave.scenario.errors.ErrorStrategy;
 import org.jbehave.scenario.errors.ErrorStrategyInWhichWeTrustTheReporter;
+import org.jbehave.scenario.reporters.ScenarioReporter;
 import org.jbehave.scenario.steps.CandidateStep;
 import org.jbehave.scenario.steps.PendingStepStrategy;
 import org.jbehave.scenario.steps.Step;

Added: trunk/jbehave-core/src/behaviour/org/jbehave/scenario/errors/ErrorStrategyBehaviour.java (0 => 888)

--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/errors/ErrorStrategyBehaviour.java	                        (rev 0)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/errors/ErrorStrategyBehaviour.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -0,0 +1,16 @@
+package org.jbehave.scenario.errors;
+
+import org.junit.Test;
+
+public class ErrorStrategyBehaviour {
+
+	@Test(expected=IllegalStateException.class)
+	public void shouldAllowErrorsToBeRethrown() throws Throwable {
+		ErrorStrategy.RETHROW.handleError(new IllegalStateException());
+	}
+	
+	@Test
+	public void shouldAllowErrorsToBeSwallowed() throws Throwable {
+		ErrorStrategy.SILENT.handleError(new IllegalStateException());
+	}
+}

Added: trunk/jbehave-core/src/behaviour/org/jbehave/scenario/errors/ErrorStrategyInWhichWeTrustTheReporterBehaviour.java (0 => 888)

--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/errors/ErrorStrategyInWhichWeTrustTheReporterBehaviour.java	                        (rev 0)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/errors/ErrorStrategyInWhichWeTrustTheReporterBehaviour.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -0,0 +1,20 @@
+package org.jbehave.scenario.errors;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.jbehave.Ensure.ensureThat;
+
+import org.junit.Test;
+
+public class ErrorStrategyInWhichWeTrustTheReporterBehaviour {
+
+	@Test
+	public void shouldBreakTheBuildAndTellUsToCheckTheOutput() throws Throwable {
+		ErrorStrategy errorStrategy = new ErrorStrategyInWhichWeTrustTheReporter();
+		try {
+			errorStrategy.handleError(null);
+		} catch (AssertionError e) {
+			ensureThat(e.getMessage(), equalTo("An error occurred while running the scenarios; please check output for details."));
+		}
+		
+	}
+}

Modified: trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/PrefixCapturingPatternBuilderBehaviour.java (887 => 888)

--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/PrefixCapturingPatternBuilderBehaviour.java	2008-08-23 15:06:43 UTC (rev 887)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/PrefixCapturingPatternBuilderBehaviour.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -6,7 +6,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jbehave.scenario.parser.PrefixCapturingPatternBuilder;
 import org.junit.Test;

Modified: trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/ScenarioClassNameFinderBehaviour.java (887 => 888)

--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/ScenarioClassNameFinderBehaviour.java	2008-08-23 15:06:43 UTC (rev 887)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/ScenarioClassNameFinderBehaviour.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -6,6 +6,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.jbehave.scenario.errors.InvalidScenarioClassPathException;
 import org.junit.Test;
 
 public class ScenarioClassNameFinderBehaviour {

Modified: trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/ScenarioFileLoaderBehaviour.java (887 => 888)

--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/ScenarioFileLoaderBehaviour.java	2008-08-23 15:06:43 UTC (rev 887)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/ScenarioFileLoaderBehaviour.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -7,6 +7,8 @@
 import java.io.InputStream;
 
 import org.jbehave.scenario.Scenario;
+import org.jbehave.scenario.errors.InvalidScenarioResourceException;
+import org.jbehave.scenario.errors.ScenarioNotFoundException;
 import org.jbehave.scenario.parser.scenarios.MyPendingScenario;
 import org.junit.Test;

Modified: trunk/jbehave-core/src/behaviour/org/jbehave/scenario/reporters/PassSilentlyDecoratorBehaviour.java (887 => 888)

--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/reporters/PassSilentlyDecoratorBehaviour.java	2008-08-23 15:06:43 UTC (rev 887)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/reporters/PassSilentlyDecoratorBehaviour.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -1,11 +1,10 @@
 package org.jbehave.scenario.reporters;
 
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
-import org.jbehave.scenario.ScenarioReporter;
 import org.jbehave.scenario.definition.Blurb;
 import org.junit.Test;
 import org.mockito.InOrder;

Modified: trunk/jbehave-core/src/behaviour/org/jbehave/scenario/reporters/PrintStreamScenarioReporterBehaviour.java (887 => 888)

--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/reporters/PrintStreamScenarioReporterBehaviour.java	2008-08-23 15:06:43 UTC (rev 887)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/reporters/PrintStreamScenarioReporterBehaviour.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -6,7 +6,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 
-import org.jbehave.scenario.ScenarioReporter;
 import org.junit.Test;

Modified: trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/CandidateStepBehaviour.java (887 => 888)

--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/CandidateStepBehaviour.java	2008-08-23 15:06:43 UTC (rev 887)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/CandidateStepBehaviour.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -6,9 +6,9 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-import org.jbehave.scenario.ScenarioReporter;
 import org.jbehave.scenario.parser.PrefixCapturingPatternBuilder;
 import org.jbehave.scenario.parser.StepPatternBuilder;
+import org.jbehave.scenario.reporters.ScenarioReporter;
 import org.junit.Test;
 
 public class CandidateStepBehaviour {

Modified: trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/StepResultBehaviour.java (887 => 888)

--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/StepResultBehaviour.java	2008-08-23 15:06:43 UTC (rev 887)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/StepResultBehaviour.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -3,7 +3,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-import org.jbehave.scenario.ScenarioReporter;
+import org.jbehave.scenario.reporters.ScenarioReporter;
 import org.junit.Test;

Added: trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/UnmatchedToPendingStepCreatorBehaviour.java (0 => 888)

--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/UnmatchedToPendingStepCreatorBehaviour.java	                        (rev 0)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/UnmatchedToPendingStepCreatorBehaviour.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -0,0 +1,56 @@
+package org.jbehave.scenario.steps;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.stub;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.jbehave.Ensure.ensureThat;
+
+import org.jbehave.scenario.ScenarioDefinition;
+import org.jbehave.scenario.errors.PendingError;
+import org.junit.Test;
+
+public class UnmatchedToPendingStepCreatorBehaviour {
+
+	@Test
+	public void shouldMatchUpStepsAndScenarioDefinitionToCreateExecutableSteps() {
+		// Given
+		UnmatchedToPendingStepCreator creator = new UnmatchedToPendingStepCreator();
+		
+		CandidateStep candidate = mock(CandidateStep.class);
+		Steps steps = mock(Steps.class);
+		Step executableStep = mock(Step.class);
+		
+		stub(candidate.matches("my step")).toReturn(true);
+		stub(candidate.createFrom("my step")).toReturn(executableStep);
+		stub(steps.getSteps()).toReturn(new CandidateStep[] {candidate});
+		
+		// When
+		Step[] executableSteps = creator.createStepsFrom(new ScenarioDefinition("", "my step"), steps);
+		
+		// Then
+		ensureThat(executableSteps.length, equalTo(1));
+		ensureThat(executableSteps[0], equalTo(executableStep));
+	}
+
+	@Test
+	public void shouldProvidePendingStepsForAnyStepsWhichAreNotAvailable() {
+		// Given
+		UnmatchedToPendingStepCreator creator = new UnmatchedToPendingStepCreator();
+		
+		CandidateStep candidate = mock(CandidateStep.class);
+		Steps steps = mock(Steps.class);
+		Step executableStep = mock(Step.class);
+		
+		stub(candidate.matches("my step")).toReturn(false);
+		stub(candidate.createFrom("my step")).toReturn(executableStep);
+		stub(steps.getSteps()).toReturn(new CandidateStep[] {candidate});
+		
+		// When
+		Step[] executableSteps = creator.createStepsFrom(new ScenarioDefinition("", "my step"), steps);
+		
+		// Then
+		ensureThat(executableSteps.length, equalTo(1));
+		StepResult result = executableSteps[0].perform();
+		ensureThat(result.getThrowable().getMessage(), equalTo("Pending: my step"));
+	}
+}

Modified: trunk/jbehave-core/src/java/org/jbehave/Configuration.java (887 => 888)

--- trunk/jbehave-core/src/java/org/jbehave/Configuration.java	2008-08-23 15:06:43 UTC (rev 887)
+++ trunk/jbehave-core/src/java/org/jbehave/Configuration.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -1,8 +1,8 @@
 package org.jbehave;
 
-import org.jbehave.scenario.ScenarioReporter;
 import org.jbehave.scenario.errors.ErrorStrategy;
 import org.jbehave.scenario.parser.ScenarioDefiner;
+import org.jbehave.scenario.reporters.ScenarioReporter;
 import org.jbehave.scenario.steps.PendingStepStrategy;
 import org.jbehave.scenario.steps.StepCreator;

Modified: trunk/jbehave-core/src/java/org/jbehave/scenario/PropertyBasedConfiguration.java (887 => 888)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/PropertyBasedConfiguration.java	2008-08-23 15:06:43 UTC (rev 887)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/PropertyBasedConfiguration.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -8,6 +8,7 @@
 import org.jbehave.scenario.parser.UnderscoredCamelCaseResolver;
 import org.jbehave.scenario.reporters.PassSilentlyDecorator;
 import org.jbehave.scenario.reporters.PrintStreamScenarioReporter;
+import org.jbehave.scenario.reporters.ScenarioReporter;
 import org.jbehave.scenario.steps.PendingStepStrategy;
 import org.jbehave.scenario.steps.StepCreator;
 import org.jbehave.scenario.steps.UnmatchedToPendingStepCreator;

Deleted: trunk/jbehave-core/src/java/org/jbehave/scenario/ScenarioReporter.java (887 => 888)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/ScenarioReporter.java	2008-08-23 15:06:43 UTC (rev 887)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/ScenarioReporter.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -1,29 +0,0 @@
-package org.jbehave.scenario;
-
-import org.jbehave.scenario.definition.Blurb;
-
-/**
- * Allows the runner to report the state of running scenario steps.
- * 
- * @author Elizabeth Keogh
- */
-public interface ScenarioReporter {
-
-	void beforeScenario(String title);
-	
-	void afterScenario();
-	
-    void successful(String step);
-
-    void pending(String step);
-
-    void notPerformed(String step);
-
-    void failed(String step, Throwable e);
-
-	void beforeStory(Blurb blurb);
-
-	void afterStory();
-
-
-}

Modified: trunk/jbehave-core/src/java/org/jbehave/scenario/ScenarioRunner.java (887 => 888)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/ScenarioRunner.java	2008-08-23 15:06:43 UTC (rev 887)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/ScenarioRunner.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -3,6 +3,7 @@
 import org.jbehave.Configuration;
 import org.jbehave.scenario.errors.ErrorStrategy;
 import org.jbehave.scenario.errors.PendingError;
+import org.jbehave.scenario.reporters.ScenarioReporter;
 import org.jbehave.scenario.steps.PendingStepStrategy;
 import org.jbehave.scenario.steps.Step;
 import org.jbehave.scenario.steps.StepResult;

Copied: trunk/jbehave-core/src/java/org/jbehave/scenario/errors/InvalidScenarioClassPathException.java (from rev 884, trunk/jbehave-core/src/java/org/jbehave/scenario/parser/InvalidScenarioClassPathException.java) (0 => 888)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/errors/InvalidScenarioClassPathException.java	                        (rev 0)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/errors/InvalidScenarioClassPathException.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -0,0 +1,15 @@
+package org.jbehave.scenario.errors;
+
+/**
+ * Thrown when a scenario class path is not valid
+ * 
+ * @author Mauro Talevi
+ */
[EMAIL PROTECTED]("serial")
+public class InvalidScenarioClassPathException extends RuntimeException {
+
+    public InvalidScenarioClassPathException(String message) {
+        super(message);
+    }
+
+}

Copied: trunk/jbehave-core/src/java/org/jbehave/scenario/errors/InvalidScenarioResourceException.java (from rev 884, trunk/jbehave-core/src/java/org/jbehave/scenario/parser/InvalidScenarioResourceException.java) (0 => 888)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/errors/InvalidScenarioResourceException.java	                        (rev 0)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/errors/InvalidScenarioResourceException.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -0,0 +1,15 @@
+package org.jbehave.scenario.errors;
+
+/**
+ * Thrown when a scenario resource is not valid
+ * 
+ * @author Mauro Talevi
+ */
[EMAIL PROTECTED]("serial")
+public class InvalidScenarioResourceException extends RuntimeException {
+
+    public InvalidScenarioResourceException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+}

Copied: trunk/jbehave-core/src/java/org/jbehave/scenario/errors/ScenarioNotFoundException.java (from rev 884, trunk/jbehave-core/src/java/org/jbehave/scenario/parser/ScenarioNotFoundException.java) (0 => 888)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/errors/ScenarioNotFoundException.java	                        (rev 0)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/errors/ScenarioNotFoundException.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -0,0 +1,15 @@
+package org.jbehave.scenario.errors;
+
+/**
+ * Thrown when a scenario is not found by the classloader
+ * 
+ * @author Mauro Talevi
+ */
[EMAIL PROTECTED]("serial")
+public class ScenarioNotFoundException extends RuntimeException {
+
+    public ScenarioNotFoundException(String message) {
+        super(message);
+    }
+
+}

Deleted: trunk/jbehave-core/src/java/org/jbehave/scenario/parser/InvalidScenarioClassPathException.java (887 => 888)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/parser/InvalidScenarioClassPathException.java	2008-08-23 15:06:43 UTC (rev 887)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/parser/InvalidScenarioClassPathException.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -1,15 +0,0 @@
-package org.jbehave.scenario.parser;
-
-/**
- * Thrown when a scenario class path is not valid
- * 
- * @author Mauro Talevi
- */
[EMAIL PROTECTED]("serial")
-public class InvalidScenarioClassPathException extends RuntimeException {
-
-    public InvalidScenarioClassPathException(String message) {
-        super(message);
-    }
-
-}

Deleted: trunk/jbehave-core/src/java/org/jbehave/scenario/parser/InvalidScenarioResourceException.java (887 => 888)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/parser/InvalidScenarioResourceException.java	2008-08-23 15:06:43 UTC (rev 887)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/parser/InvalidScenarioResourceException.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -1,15 +0,0 @@
-package org.jbehave.scenario.parser;
-
-/**
- * Thrown when a scenario resource is not valid
- * 
- * @author Mauro Talevi
- */
[EMAIL PROTECTED]("serial")
-public class InvalidScenarioResourceException extends RuntimeException {
-
-    public InvalidScenarioResourceException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-}

Modified: trunk/jbehave-core/src/java/org/jbehave/scenario/parser/ScenarioClassNameFinder.java (887 => 888)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/parser/ScenarioClassNameFinder.java	2008-08-23 15:06:43 UTC (rev 887)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/parser/ScenarioClassNameFinder.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -5,6 +5,7 @@
 import java.util.List;
 
 import org.apache.tools.ant.DirectoryScanner;
+import org.jbehave.scenario.errors.InvalidScenarioClassPathException;
 
 /**
  * Finds scenario class names from a base directory

Modified: trunk/jbehave-core/src/java/org/jbehave/scenario/parser/ScenarioDefiner.java (887 => 888)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/parser/ScenarioDefiner.java	2008-08-23 15:06:43 UTC (rev 887)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/parser/ScenarioDefiner.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -1,7 +1,5 @@
 package org.jbehave.scenario.parser;
 
-import java.util.List;
-
 import org.jbehave.scenario.Scenario;
 import org.jbehave.scenario.StoryDefinition;

Modified: trunk/jbehave-core/src/java/org/jbehave/scenario/parser/ScenarioFileLoader.java (887 => 888)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/parser/ScenarioFileLoader.java	2008-08-23 15:06:43 UTC (rev 887)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/parser/ScenarioFileLoader.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -6,6 +6,8 @@
 
 import org.jbehave.scenario.Scenario;
 import org.jbehave.scenario.StoryDefinition;
+import org.jbehave.scenario.errors.InvalidScenarioResourceException;
+import org.jbehave.scenario.errors.ScenarioNotFoundException;
 
 public class ScenarioFileLoader implements ScenarioDefiner {
 	private final ScenarioFileNameResolver resolver;

Deleted: trunk/jbehave-core/src/java/org/jbehave/scenario/parser/ScenarioNotFoundException.java (887 => 888)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/parser/ScenarioNotFoundException.java	2008-08-23 15:06:43 UTC (rev 887)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/parser/ScenarioNotFoundException.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -1,15 +0,0 @@
-package org.jbehave.scenario.parser;
-
-/**
- * Thrown when a scenario is not found by the classloader
- * 
- * @author Mauro Talevi
- */
[EMAIL PROTECTED]("serial")
-public class ScenarioNotFoundException extends RuntimeException {
-
-    public ScenarioNotFoundException(String message) {
-        super(message);
-    }
-
-}

Modified: trunk/jbehave-core/src/java/org/jbehave/scenario/reporters/PassSilentlyDecorator.java (887 => 888)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/reporters/PassSilentlyDecorator.java	2008-08-23 15:06:43 UTC (rev 887)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/reporters/PassSilentlyDecorator.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbehave.scenario.ScenarioReporter;
 import org.jbehave.scenario.definition.Blurb;
 
 /**

Modified: trunk/jbehave-core/src/java/org/jbehave/scenario/reporters/PrintStreamScenarioReporter.java (887 => 888)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/reporters/PrintStreamScenarioReporter.java	2008-08-23 15:06:43 UTC (rev 887)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/reporters/PrintStreamScenarioReporter.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -2,7 +2,6 @@
 
 import java.io.PrintStream;
 
-import org.jbehave.scenario.ScenarioReporter;
 import org.jbehave.scenario.definition.Blurb;
 
 public class PrintStreamScenarioReporter implements ScenarioReporter {

Copied: trunk/jbehave-core/src/java/org/jbehave/scenario/reporters/ScenarioReporter.java (from rev 886, trunk/jbehave-core/src/java/org/jbehave/scenario/ScenarioReporter.java) (0 => 888)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/reporters/ScenarioReporter.java	                        (rev 0)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/reporters/ScenarioReporter.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -0,0 +1,29 @@
+package org.jbehave.scenario.reporters;
+
+import org.jbehave.scenario.definition.Blurb;
+
+/**
+ * Allows the runner to report the state of running scenario steps.
+ * 
+ * @author Elizabeth Keogh
+ */
+public interface ScenarioReporter {
+
+	void beforeScenario(String title);
+	
+	void afterScenario();
+	
+    void successful(String step);
+
+    void pending(String step);
+
+    void notPerformed(String step);
+
+    void failed(String step, Throwable e);
+
+	void beforeStory(Blurb blurb);
+
+	void afterStory();
+
+
+}

Modified: trunk/jbehave-core/src/java/org/jbehave/scenario/steps/StepResult.java (887 => 888)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/steps/StepResult.java	2008-08-23 15:06:43 UTC (rev 887)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/steps/StepResult.java	2008-08-24 14:07:13 UTC (rev 888)
@@ -1,7 +1,7 @@
 package org.jbehave.scenario.steps;
 
-import org.jbehave.scenario.ScenarioReporter;
 import org.jbehave.scenario.errors.PendingError;
+import org.jbehave.scenario.reporters.ScenarioReporter;
 
 
 public abstract class StepResult {

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to