[jbehave-scm] [945] trunk/jbehave-core/src/java/org/jbehave/scenario: Renamed Scenario interface to RunnableScenario to ensure backward compat with 2.0.x

Wed, 24 Sep 2008 10:46:47 -0700

Title: [945] trunk/jbehave-core/src/java/org/jbehave/scenario: Renamed Scenario interface to RunnableScenario to ensure backward compat with 2.0.x

Diff

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

--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/ScenarioBehaviour.java	2008-09-21 22:54:41 UTC (rev 944)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/ScenarioBehaviour.java	2008-09-24 17:46:41 UTC (rev 945)
@@ -29,7 +29,7 @@
         ScenarioRunner runner = mock(ScenarioRunner.class);
         MockedConfiguration configuration = new MockedConfiguration();
         Steps steps = mock(Steps.class);
-        Scenario scenario = new MyScenario(runner, configuration, steps);
+        RunnableScenario scenario = new MyScenario(runner, configuration, steps);
         
         StoryDefinition storyDefinition = new StoryDefinition(Blurb.EMPTY, Collections.EMPTY_LIST);
         stub(configuration.scenarioDefiner.loadScenarioDefinitionsFor(MyScenario.class)).toReturn(storyDefinition);

Modified: trunk/jbehave-core/src/java/org/jbehave/scenario/AbstractScenario.java (944 => 945)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/AbstractScenario.java	2008-09-21 22:54:41 UTC (rev 944)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/AbstractScenario.java	2008-09-24 17:46:41 UTC (rev 945)
@@ -36,23 +36,23 @@
  * for the steps defined in the text scenario.</li>
  * <ol>
  */
-public abstract class AbstractScenario implements Scenario {
+public abstract class AbstractScenario implements RunnableScenario {
 
     private final Configuration configuration;
     private final ScenarioRunner scenarioRunner;
     private final Steps[] candidateSteps;
-    private final Class<? extends Scenario> scenarioClass;
+    private final Class<? extends RunnableScenario> scenarioClass;
 
-    public AbstractScenario(Class<? extends Scenario> scenarioClass, Steps... candidateSteps) {
+    public AbstractScenario(Class<? extends RunnableScenario> scenarioClass, Steps... candidateSteps) {
         this(scenarioClass, new PropertyBasedConfiguration(), candidateSteps);
     }
 
-    public AbstractScenario(Class<? extends Scenario> scenarioClass, Configuration configuration,
+    public AbstractScenario(Class<? extends RunnableScenario> scenarioClass, Configuration configuration,
             Steps... candidateSteps) {
         this(scenarioClass, new ScenarioRunner(), configuration, candidateSteps);
     }
 
-    public AbstractScenario(Class<? extends Scenario> scenarioClass, ScenarioRunner scenarioRunner,
+    public AbstractScenario(Class<? extends RunnableScenario> scenarioClass, ScenarioRunner scenarioRunner,
             Configuration configuration, Steps... candidateSteps) {
         this.scenarioClass = scenarioClass;
         this.configuration = configuration;

Modified: trunk/jbehave-core/src/java/org/jbehave/scenario/JUnitScenario.java (944 => 945)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/JUnitScenario.java	2008-09-21 22:54:41 UTC (rev 944)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/JUnitScenario.java	2008-09-24 17:46:41 UTC (rev 945)
@@ -22,10 +22,10 @@
  * 
  * @see AbstractScenario
  */
-public abstract class JUnitScenario extends TestCase implements Scenario {
+public abstract class JUnitScenario extends TestCase implements RunnableScenario {
 
     private final Class<? extends JUnitScenario> decoratorClass = this.getClass();
-    private final Scenario delegate;
+    private final RunnableScenario delegate;
 
     public JUnitScenario(Steps... candidateSteps) {
         this.delegate = new JUnitScenarioDelegate(decoratorClass, candidateSteps);
@@ -39,7 +39,7 @@
         this.delegate = new JUnitScenarioDelegate(decoratorClass, scenarioRunner, configuration, candidateSteps);
     }
 
-    public JUnitScenario(Scenario delegate) {
+    public JUnitScenario(RunnableScenario delegate) {
         this.delegate = delegate;
 
     }
@@ -51,7 +51,7 @@
 
     /**
      * A JUnit 3-compatibile runnable method which simply delegates
-     * [EMAIL PROTECTED] Scenario#runScenario()}
+     * [EMAIL PROTECTED] RunnableScenario#runScenario()}
      * 
      * @throws Throwable
      */
@@ -61,16 +61,16 @@
 
     public static class JUnitScenarioDelegate extends AbstractScenario {
 
-        public JUnitScenarioDelegate(Class<? extends Scenario> decoratorClass, Steps... candidateSteps) {
+        public JUnitScenarioDelegate(Class<? extends RunnableScenario> decoratorClass, Steps... candidateSteps) {
             super(decoratorClass, candidateSteps);
         }
 
-        public JUnitScenarioDelegate(Class<? extends Scenario> decoratorClass, Configuration configuration,
+        public JUnitScenarioDelegate(Class<? extends RunnableScenario> decoratorClass, Configuration configuration,
                 Steps... candidateSteps) {
             super(decoratorClass, configuration, candidateSteps);
         }
 
-        public JUnitScenarioDelegate(Class<? extends Scenario> decoratorClass, ScenarioRunner scenarioRunner,
+        public JUnitScenarioDelegate(Class<? extends RunnableScenario> decoratorClass, ScenarioRunner scenarioRunner,
                 Configuration configuration, Steps... candidateSteps) {
             super(decoratorClass, scenarioRunner, configuration, candidateSteps);
         }

Copied: trunk/jbehave-core/src/java/org/jbehave/scenario/RunnableScenario.java (from rev 932, trunk/jbehave-core/src/java/org/jbehave/scenario/Scenario.java) (0 => 945)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/RunnableScenario.java	                        (rev 0)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/RunnableScenario.java	2008-09-24 17:46:41 UTC (rev 945)
@@ -0,0 +1,20 @@
+package org.jbehave.scenario;
+
+/**
+ * <p>
+ * Scenario represents the main interface to run a scenario.
+ * </p>
+ * <p>
+ * Typically users will need to extend an abstract implementation, such as
+ * [EMAIL PROTECTED] AbstractScenario} or a decorator scenarios, such as
+ * [EMAIL PROTECTED] JUnitScenario}, which also provide support for test frameworks.
+ * </p>
+ * 
+ * @see AbstractScenario
+ * @see JUnitScenario
+ */
+public interface RunnableScenario {
+
+    void runScenario() throws Throwable;
+
+}

Property changes: trunk/jbehave-core/src/java/org/jbehave/scenario/RunnableScenario.java

Name: svn:mergeinfo
   +

Deleted: trunk/jbehave-core/src/java/org/jbehave/scenario/Scenario.java (944 => 945)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/Scenario.java	2008-09-21 22:54:41 UTC (rev 944)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/Scenario.java	2008-09-24 17:46:41 UTC (rev 945)
@@ -1,20 +0,0 @@
-package org.jbehave.scenario;
-
-/**
- * <p>
- * Scenario represents the main interface to run a scenario.
- * </p>
- * <p>
- * Typically users will need to extend an abstract implementation, such as
- * [EMAIL PROTECTED] AbstractScenario} or a decorator scenarios, such as
- * [EMAIL PROTECTED] JUnitScenario}, which also provide support for test frameworks.
- * </p>
- * 
- * @see AbstractScenario
- * @see JUnitScenario
- */
-public interface Scenario {
-
-    void runScenario() throws Throwable;
-
-}

Modified: trunk/jbehave-core/src/java/org/jbehave/scenario/parser/CasePreservingResolver.java (944 => 945)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/parser/CasePreservingResolver.java	2008-09-21 22:54:41 UTC (rev 944)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/parser/CasePreservingResolver.java	2008-09-24 17:46:41 UTC (rev 945)
@@ -1,6 +1,6 @@
 package org.jbehave.scenario.parser;
 
-import org.jbehave.scenario.Scenario;
+import org.jbehave.scenario.RunnableScenario;
 
 /**
  * <p>
@@ -23,7 +23,7 @@
         this.extension = extension;
     }
 
-    public String resolve(Class<? extends Scenario> scenarioClass) {
+    public String resolve(Class<? extends RunnableScenario> scenarioClass) {
         String packageDir = scenarioClass.getPackage().getName().replaceAll(DOT_REGEX, SLASH);
         return packageDir + SLASH + scenarioClass.getSimpleName() + extension;
     }

Modified: trunk/jbehave-core/src/java/org/jbehave/scenario/parser/ClasspathScenarioDefiner.java (944 => 945)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/parser/ClasspathScenarioDefiner.java	2008-09-21 22:54:41 UTC (rev 944)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/parser/ClasspathScenarioDefiner.java	2008-09-24 17:46:41 UTC (rev 945)
@@ -4,7 +4,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.jbehave.scenario.Scenario;
+import org.jbehave.scenario.RunnableScenario;
 import org.jbehave.scenario.definition.StoryDefinition;
 import org.jbehave.scenario.errors.InvalidScenarioResourceException;
 import org.jbehave.scenario.errors.ScenarioNotFoundException;
@@ -43,12 +43,12 @@
         this.classLoader = classLoader;
     }
 
-    public StoryDefinition loadScenarioDefinitionsFor(Class<? extends Scenario> scenarioClass) {
+    public StoryDefinition loadScenarioDefinitionsFor(Class<? extends RunnableScenario> scenarioClass) {
         String wholeFileAsString = asString(loadInputStreamFor(scenarioClass));
         return parser.defineStoryFrom(wholeFileAsString);
     }
 
-    private InputStream loadInputStreamFor(Class<? extends Scenario> scenarioClass) {
+    private InputStream loadInputStreamFor(Class<? extends RunnableScenario> scenarioClass) {
         String scenarioName = resolver.resolve(scenarioClass);
         InputStream stream = classLoader.getResourceAsStream(scenarioName);
         if (stream == null) {

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

--- trunk/jbehave-core/src/java/org/jbehave/scenario/parser/ScenarioDefiner.java	2008-09-21 22:54:41 UTC (rev 944)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/parser/ScenarioDefiner.java	2008-09-24 17:46:41 UTC (rev 945)
@@ -1,6 +1,6 @@
 package org.jbehave.scenario.parser;
 
-import org.jbehave.scenario.Scenario;
+import org.jbehave.scenario.RunnableScenario;
 import org.jbehave.scenario.definition.StoryDefinition;
 
 /**
@@ -10,6 +10,6 @@
  */
 public interface ScenarioDefiner {
 
-    StoryDefinition loadScenarioDefinitionsFor(Class<? extends Scenario> scenarioClass);
+    StoryDefinition loadScenarioDefinitionsFor(Class<? extends RunnableScenario> scenarioClass);
 
 }

Modified: trunk/jbehave-core/src/java/org/jbehave/scenario/parser/ScenarioNameResolver.java (944 => 945)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/parser/ScenarioNameResolver.java	2008-09-21 22:54:41 UTC (rev 944)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/parser/ScenarioNameResolver.java	2008-09-24 17:46:41 UTC (rev 945)
@@ -1,6 +1,6 @@
 package org.jbehave.scenario.parser;
 
-import org.jbehave.scenario.Scenario;
+import org.jbehave.scenario.RunnableScenario;
 
 /**
  * <p>
@@ -10,6 +10,6 @@
  */
 public interface ScenarioNameResolver {
 
-    String resolve(Class<? extends Scenario> scenarioClass);
+    String resolve(Class<? extends RunnableScenario> scenarioClass);
 
 }

Modified: trunk/jbehave-core/src/java/org/jbehave/scenario/parser/UnderscoredCamelCaseResolver.java (944 => 945)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/parser/UnderscoredCamelCaseResolver.java	2008-09-21 22:54:41 UTC (rev 944)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/parser/UnderscoredCamelCaseResolver.java	2008-09-24 17:46:41 UTC (rev 945)
@@ -3,7 +3,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jbehave.scenario.Scenario;
+import org.jbehave.scenario.RunnableScenario;
 
 /**
  * <p>
@@ -32,7 +32,7 @@
         this.extension = extension;
     }
 
-    public String resolve(Class<? extends Scenario> scenarioClass) {
+    public String resolve(Class<? extends RunnableScenario> scenarioClass) {
         String packageDir = scenarioClass.getPackage().getName().replaceAll(DOT_REGEX, SLASH);
         Matcher matcher = Pattern.compile(PATTERN).matcher(scenarioClass.getSimpleName());
         int startAt = 0;

Modified: trunk/jbehave-maven-plugin/src/main/java/org/jbehave/mojo/AbstractScenarioMojo.java (944 => 945)

--- trunk/jbehave-maven-plugin/src/main/java/org/jbehave/mojo/AbstractScenarioMojo.java	2008-09-21 22:54:41 UTC (rev 944)
+++ trunk/jbehave-maven-plugin/src/main/java/org/jbehave/mojo/AbstractScenarioMojo.java	2008-09-24 17:46:41 UTC (rev 945)
@@ -6,7 +6,7 @@
 
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.jbehave.scenario.Scenario;
+import org.jbehave.scenario.RunnableScenario;
 import org.jbehave.scenario.parser.ScenarioClassNameFinder;
 
 /**
@@ -133,7 +133,7 @@
      * @return A List of Scenarios
      * @throws MojoExecutionException
      */
-    protected List<Scenario> scenarios() throws MojoExecutionException {
+    protected List<RunnableScenario> scenarios() throws MojoExecutionException {
         List<String> names = scenarioClassNames;
         if (names == null || names.isEmpty()) {
             names = findScenarioClassNames();
@@ -143,7 +143,7 @@
         }
         try {
             ScenarioClassLoader classLoader = createScenarioClassLoader();
-            List<Scenario> scenarios = new ArrayList<Scenario>();
+            List<RunnableScenario> scenarios = new ArrayList<RunnableScenario>();
             for (String name : names) {
                 scenarios.add(classLoader.newScenario(name));
             }

Modified: trunk/jbehave-maven-plugin/src/main/java/org/jbehave/mojo/ScenarioClassLoader.java (944 => 945)

--- trunk/jbehave-maven-plugin/src/main/java/org/jbehave/mojo/ScenarioClassLoader.java	2008-09-21 22:54:41 UTC (rev 944)
+++ trunk/jbehave-maven-plugin/src/main/java/org/jbehave/mojo/ScenarioClassLoader.java	2008-09-24 17:46:41 UTC (rev 945)
@@ -7,7 +7,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jbehave.scenario.Scenario;
+import org.jbehave.scenario.RunnableScenario;
 
 /**
  * Extends URLClassLoader to instantiate Scenarios.
@@ -17,7 +17,7 @@
 public class ScenarioClassLoader extends URLClassLoader {
 
     public ScenarioClassLoader(List<String> classpathElements) throws MalformedURLException {
-        super(classpathURLs(classpathElements), Scenario.class.getClassLoader());
+        super(classpathURLs(classpathElements), RunnableScenario.class.getClassLoader());
     }
 
     public ScenarioClassLoader(List<String> classpathElements, ClassLoader parent) throws MalformedURLException {
@@ -30,14 +30,14 @@
      * @param scenarioClassName the name of the Scenario class
      * @return A Scenario instance
      */
-    public Scenario newScenario(String scenarioClassName) {
+    public RunnableScenario newScenario(String scenarioClassName) {
         try {
-            Scenario scenario = (Scenario) loadClass(scenarioClassName, true).getConstructor(ClassLoader.class)
+            RunnableScenario scenario = (RunnableScenario) loadClass(scenarioClassName, true).getConstructor(ClassLoader.class)
                     .newInstance(this);
             Thread.currentThread().setContextClassLoader(this);
             return scenario;
         } catch (ClassCastException e) {
-            String message = "The scenario '" + scenarioClassName + "' must be of type '" + Scenario.class.getName()
+            String message = "The scenario '" + scenarioClassName + "' must be of type '" + RunnableScenario.class.getName()
                     + "'";
             throw new RuntimeException(message, e);
         } catch (Exception e) {

Modified: trunk/jbehave-maven-plugin/src/main/java/org/jbehave/mojo/ScenarioRunnerMojo.java (944 => 945)

--- trunk/jbehave-maven-plugin/src/main/java/org/jbehave/mojo/ScenarioRunnerMojo.java	2008-09-21 22:54:41 UTC (rev 944)
+++ trunk/jbehave-maven-plugin/src/main/java/org/jbehave/mojo/ScenarioRunnerMojo.java	2008-09-24 17:46:41 UTC (rev 945)
@@ -2,7 +2,7 @@
 
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.jbehave.scenario.Scenario;
+import org.jbehave.scenario.RunnableScenario;
 
 /**
  * Mojo to run scenarios
@@ -13,7 +13,7 @@
 public class ScenarioRunnerMojo extends AbstractScenarioMojo {
 
     public void execute() throws MojoExecutionException, MojoFailureException {
-        for (Scenario scenario : scenarios()) {
+        for (RunnableScenario scenario : scenarios()) {
             try {
                 getLog().info("Running scenario " + scenario.getClass().getName());
                 scenario.runScenario();

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to