- Revision
- 1539
- Author
- mauro
- Date
- 2010-02-04 11:15:46 -0600 (Thu, 04 Feb 2010)
Log Message
JBEHAVE-163: Added verification of ignorable steps in the parser and reporter behaviours.
Modified Paths
- trunk/core/jbehave-core/src/behaviour/java/org/jbehave/scenario/parser/PatternScenarioParserBehaviour.java
- trunk/core/jbehave-core/src/behaviour/java/org/jbehave/scenario/reporters/DelegatingScenarioReporterBehaviour.java
- trunk/core/jbehave-core/src/behaviour/java/org/jbehave/scenario/reporters/PassSilentlyDecoratorBehaviour.java
- trunk/core/jbehave-core/src/behaviour/java/org/jbehave/scenario/reporters/PrintStreamScenarioReporterBehaviour.java
Diff
Modified: trunk/core/jbehave-core/src/behaviour/java/org/jbehave/scenario/parser/PatternScenarioParserBehaviour.java (1538 => 1539)
--- trunk/core/jbehave-core/src/behaviour/java/org/jbehave/scenario/parser/PatternScenarioParserBehaviour.java 2010-02-04 16:41:31 UTC (rev 1538) +++ trunk/core/jbehave-core/src/behaviour/java/org/jbehave/scenario/parser/PatternScenarioParserBehaviour.java 2010-02-04 17:15:46 UTC (rev 1539) @@ -25,13 +25,15 @@ public void shouldExtractGivensWhensAndThensFromSimpleScenarios() { StoryDefinition story = parser.defineStoryFrom( "Given a scenario" + NL + + "!-- ignore me" + NL + "When I parse it" + NL + "Then I should get steps", null); List<String> steps = story.getScenarios().get(0).getSteps(); ensureThat(steps.get(0), equalTo("Given a scenario")); - ensureThat(steps.get(1), equalTo("When I parse it")); - ensureThat(steps.get(2), equalTo("Then I should get steps")); + ensureThat(steps.get(1), equalTo("!-- ignore me")); + ensureThat(steps.get(2), equalTo("When I parse it")); + ensureThat(steps.get(3), equalTo("Then I should get steps")); } @Test @@ -40,13 +42,15 @@ "Given a scenario Givenly" + NL + "When I parse it to Whenever" + NL + "And I parse it to Anderson" + NL + + "!-- ignore me too" + NL + "Then I should get steps Thenact", null); List<String> steps = story.getScenarios().get(0).getSteps(); ensureThat(steps.get(0), equalTo("Given a scenario Givenly")); ensureThat(steps.get(1), equalTo("When I parse it to Whenever")); ensureThat(steps.get(2), equalTo("And I parse it to Anderson")); - ensureThat(steps.get(3), equalTo("Then I should get steps Thenact")); + ensureThat(steps.get(3), equalTo("!-- ignore me too")); + ensureThat(steps.get(4), equalTo("Then I should get steps Thenact")); } @Test @@ -112,6 +116,7 @@ "Scenario: A pending scenario" + NL + NL + "Given a step that's pending" + NL + "When I run the scenario" + NL + + "!-- A comment between steps" + NL + "Then I should see this in the output" + NL + "Scenario: A passing scenario" + NL + @@ -137,6 +142,7 @@ ensureThat(story.getScenarios().get(0).getSteps(), equalTo(asList( "Given a step that's pending", "When I run the scenario", + "!-- A comment between steps", "Then I should see this in the output" )));
Modified: trunk/core/jbehave-core/src/behaviour/java/org/jbehave/scenario/reporters/DelegatingScenarioReporterBehaviour.java (1538 => 1539)
--- trunk/core/jbehave-core/src/behaviour/java/org/jbehave/scenario/reporters/DelegatingScenarioReporterBehaviour.java 2010-02-04 16:41:31 UTC (rev 1538) +++ trunk/core/jbehave-core/src/behaviour/java/org/jbehave/scenario/reporters/DelegatingScenarioReporterBehaviour.java 2010-02-04 17:15:46 UTC (rev 1539) @@ -28,6 +28,7 @@ delegator.beforeScenario("My scenario 1"); delegator.givenScenarios(givenScenarios); delegator.successful("Given step 1.1"); + delegator.ignorable("!-- ignore me"); delegator.pending("When step 1.2"); delegator.notPerformed("Then step 1.3"); delegator.beforeExamples(asList("Given step <one>", "Then step <two>"), examplesTable); @@ -50,6 +51,7 @@ inOrder.verify(delegate).beforeScenario("My scenario 1"); inOrder.verify(delegate).givenScenarios(givenScenarios); inOrder.verify(delegate).successful("Given step 1.1"); + inOrder.verify(delegate).ignorable("!-- ignore me"); inOrder.verify(delegate).pending("When step 1.2"); inOrder.verify(delegate).notPerformed("Then step 1.3"); inOrder.verify(delegate).beforeExamples(asList("Given step <one>", "Then step <two>"), examplesTable);
Modified: trunk/core/jbehave-core/src/behaviour/java/org/jbehave/scenario/reporters/PassSilentlyDecoratorBehaviour.java (1538 => 1539)
--- trunk/core/jbehave-core/src/behaviour/java/org/jbehave/scenario/reporters/PassSilentlyDecoratorBehaviour.java 2010-02-04 16:41:31 UTC (rev 1538) +++ trunk/core/jbehave-core/src/behaviour/java/org/jbehave/scenario/reporters/PassSilentlyDecoratorBehaviour.java 2010-02-04 17:15:46 UTC (rev 1539) @@ -28,6 +28,7 @@ decorator.beforeStory(story, embeddedStory); decorator.beforeScenario("My scenario 1"); decorator.successful("Given step 1.1"); + decorator.ignorable("!-- ignore me"); decorator.successful("When step 1.2"); decorator.successful("Then step 1.3"); decorator.afterScenario(); @@ -57,6 +58,7 @@ verify(delegate, never()).beforeScenario("My scenario 1"); verify(delegate, never()).successful("Given step 1.1"); + verify(delegate, never()).ignorable("!-- ignore me"); verify(delegate, never()).successful("When step 1.2"); verify(delegate, never()).successful("Then step 1.3");
Modified: trunk/core/jbehave-core/src/behaviour/java/org/jbehave/scenario/reporters/PrintStreamScenarioReporterBehaviour.java (1538 => 1539)
--- trunk/core/jbehave-core/src/behaviour/java/org/jbehave/scenario/reporters/PrintStreamScenarioReporterBehaviour.java 2010-02-04 16:41:31 UTC (rev 1538) +++ trunk/core/jbehave-core/src/behaviour/java/org/jbehave/scenario/reporters/PrintStreamScenarioReporterBehaviour.java 2010-02-04 17:15:46 UTC (rev 1539) @@ -48,6 +48,7 @@ + "Scenario: I ask for a loan\n" + "GivenScenarios: [/given/scenario1,/given/scenario2]\n" + "Given I have a balance of $50\n" + + "!-- A comment\n" + "When I request $20\n" + "When I ask Liz for a loan of $100\n" + "Then I should have a balance of $30 (PENDING)\n" @@ -87,6 +88,7 @@ + "<div class=\"scenario\">\n<h2>Scenario: I ask for a loan</h2>\n" + "<div class=\"givenScenarios\">GivenScenarios: [/given/scenario1,/given/scenario2]</div>\n" + "<div class=\"step successful\">Given I have a balance of $50</div>\n" + + "<div class=\"step ignorable\">!-- A comment</div>\n" + "<div class=\"step successful\">When I request $20</div>\n" + "<div class=\"step successful\">When I ask Liz for a loan of $100</div>\n" + "<div class=\"step pending\">Then I should have a balance of $30 <span class=\"keyword pending\">(PENDING)</span></div>\n" @@ -131,6 +133,7 @@ + "<div class=\"scenario\">\n<h2>Scenario: I ask for a loan</h2>\n" + "<div class=\"givenScenarios\">GivenScenarios: [/given/scenario1,/given/scenario2]</div>\n" + "<div class=\"step successful\">Given I have a balance of $50</div>\n" + + "<div class=\"step ignorable\">!-- A comment</div>\n" + "<div class=\"step successful\">When I request $20</div>\n" + "<div class=\"step successful\">When I ask Liz for a loan of $100</div>\n" + "<div class=\"step pending\">Then I should have a balance of $30 <span class=\"keyword pending\">(PENDING)</span></div>\n" @@ -168,6 +171,7 @@ + "<scenario keyword=\"Scenario:\" title=\"I ask for a loan\">\n" + "<givenScenarios keyword=\"GivenScenarios:\"paths=\"[/given/scenario1,/given/scenario2]\"</givenScenarios>\n" + "<step outcome=\"successful\">Given I have a balance of $50</step>\n" + + "<step outcome=\"ignorable\">!-- A comment</step>\n" + "<step outcome=\"successful\">When I request $20</step>\n" + "<step outcome=\"successful\">When I ask Liz for a loan of $100</step>\n" + "<step outcome=\"pending\" keyword=\"PENDING\">Then I should have a balance of $30</step>\n" @@ -195,6 +199,7 @@ reporter.beforeScenario(title); reporter.givenScenarios(asList("/given/scenario1,/given/scenario2")); reporter.successful("Given I have a balance of $50"); + reporter.ignorable("!-- A comment"); reporter.successful("When I request $20"); reporter.successful("When I ask Liz for a loan of $100"); reporter.pending("Then I should have a balance of $30");
To unsubscribe from this list please visit:
