[jbehave-scm] [1580] trunk/core/examples/trader/src/main/java/org/jbehave/examples/trader: JBEHAVE-162: Better priority_matching.scenario

Sun, 21 Feb 2010 15:04:28 -0800

Title: [1580] trunk/core/examples/trader/src/main/java/org/jbehave/examples/trader: JBEHAVE-162: Better priority_matching.scenario

Diff

Modified: trunk/core/examples/trader/src/main/java/org/jbehave/examples/trader/TraderScenario.java (1579 => 1580)

--- trunk/core/examples/trader/src/main/java/org/jbehave/examples/trader/TraderScenario.java	2010-02-21 22:15:22 UTC (rev 1579)
+++ trunk/core/examples/trader/src/main/java/org/jbehave/examples/trader/TraderScenario.java	2010-02-21 23:04:22 UTC (rev 1580)
@@ -32,18 +32,18 @@
 
 public class TraderScenario extends JUnitScenario {
 
-    private static ScenarioNameResolver converter = new UnderscoredCamelCaseResolver(".scenario");
+    private static ScenarioNameResolver resolver = new UnderscoredCamelCaseResolver(".scenario");
 
     public TraderScenario(final Class<? extends RunnableScenario> scenarioClass) {
         super(new PropertyBasedConfiguration() {
             @Override
             public ScenarioDefiner forDefiningScenarios() {
-                return new ClasspathScenarioDefiner(converter, new PatternScenarioParser(keywords()));
+                return new ClasspathScenarioDefiner(resolver, new PatternScenarioParser(keywords()));
             }
 
             @Override
             public ScenarioReporter forReportingScenarios() {
-                return new ScenarioReporterBuilder(new FilePrintStreamFactory(scenarioClass, converter))
+                return new ScenarioReporterBuilder(new FilePrintStreamFactory(scenarioClass, resolver))
                             .with(CONSOLE)
                             .with(TXT)
                             .with(HTML)

Modified: trunk/core/examples/trader/src/main/java/org/jbehave/examples/trader/scenarios/PriorityMatching.java (1579 => 1580)

--- trunk/core/examples/trader/src/main/java/org/jbehave/examples/trader/scenarios/PriorityMatching.java	2010-02-21 22:15:22 UTC (rev 1579)
+++ trunk/core/examples/trader/src/main/java/org/jbehave/examples/trader/scenarios/PriorityMatching.java	2010-02-21 23:04:22 UTC (rev 1580)
@@ -1,5 +1,10 @@
 package org.jbehave.examples.trader.scenarios;
 
+import static org.jbehave.scenario.reporters.ScenarioReporterBuilder.Format.CONSOLE;
+import static org.jbehave.scenario.reporters.ScenarioReporterBuilder.Format.HTML;
+import static org.jbehave.scenario.reporters.ScenarioReporterBuilder.Format.TXT;
+import static org.jbehave.scenario.reporters.ScenarioReporterBuilder.Format.XML;
+
 import org.jbehave.examples.trader.PriorityMatchingSteps;
 import org.jbehave.scenario.JUnitScenario;
 import org.jbehave.scenario.MostUsefulConfiguration;
@@ -7,19 +12,35 @@
 import org.jbehave.scenario.parser.PatternScenarioParser;
 import org.jbehave.scenario.parser.PrefixCapturingPatternBuilder;
 import org.jbehave.scenario.parser.ScenarioDefiner;
+import org.jbehave.scenario.parser.ScenarioNameResolver;
 import org.jbehave.scenario.parser.UnderscoredCamelCaseResolver;
+import org.jbehave.scenario.reporters.FilePrintStreamFactory;
+import org.jbehave.scenario.reporters.ScenarioReporter;
+import org.jbehave.scenario.reporters.ScenarioReporterBuilder;
 import org.jbehave.scenario.steps.StepsConfiguration;
 import org.jbehave.scenario.steps.StepsFactory;
 
 public class PriorityMatching extends JUnitScenario {
 
+    private static ScenarioNameResolver resolver = new UnderscoredCamelCaseResolver(".scenario");
+
     public PriorityMatching() {
         super(new MostUsefulConfiguration() {
             @Override
             public ScenarioDefiner forDefiningScenarios() {
-                return new ClasspathScenarioDefiner(new UnderscoredCamelCaseResolver(".scenario"),
-                        new PatternScenarioParser(keywords()));
+                return new ClasspathScenarioDefiner(resolver, new PatternScenarioParser(keywords()));
             }
+            
+            @Override
+            public ScenarioReporter forReportingScenarios() {
+                return new ScenarioReporterBuilder(new FilePrintStreamFactory(PriorityMatching.class, resolver))
+                            .with(CONSOLE)
+                            .with(TXT)
+                            .with(HTML)
+                            .with(XML)
+                            .build();
+            }
+
         });
 
         StepsConfiguration configuration = new StepsConfiguration();

Modified: trunk/core/examples/trader/src/main/java/org/jbehave/examples/trader/scenarios/priority_matching.scenario (1579 => 1580)

--- trunk/core/examples/trader/src/main/java/org/jbehave/examples/trader/scenarios/priority_matching.scenario	2010-02-21 22:15:22 UTC (rev 1579)
+++ trunk/core/examples/trader/src/main/java/org/jbehave/examples/trader/scenarios/priority_matching.scenario	2010-02-21 23:04:22 UTC (rev 1580)
@@ -1,4 +1,8 @@
-Scenario: A scenario that verifies priority matching of steps
+Scenario: A scenario that verifies priority matching of steps, with the less-greedy pattern given higher priority
 
-Given a step that has exactly one parameter
-Then the parameter value is "parameter"
\ No newline at end of file
+!-- Matching regex "a step that has $param"
+Given a step that has a parameter
+Then the parameter value is "a parameter"
+!-- Matching regex "a step that has exactly one $param"
+Given a step that has exactly one of the parameters
+Then the parameter value is "of the parameters"
\ No newline at end of file

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to