- Revision
- 1662
- Author
- mauro
- Date
- 2010-06-23 15:54:35 -0500 (Wed, 23 Jun 2010)
Log Message
Updated to latest core snapshot.
Modified Paths
- trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/ScenarioController.java
- trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/controllers/ScenarioControllerTest.java
- trunk/web/web-selenium/src/main/java/org/jbehave/web/selenium/SeleniumStepsMonitor.java
- trunk/web/web-selenium/src/test/java/org/jbehave/web/selenium/SeleniumPerScenarioStepsTest.java
- trunk/web/web-selenium/src/test/java/org/jbehave/web/selenium/SeleniumPerStoryStepsTest.java
- trunk/web/web-selenium/src/test/java/org/jbehave/web/selenium/SeleniumStepsConfigurationTest.java
Diff
Modified: trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/ScenarioController.java (1661 => 1662)
--- trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/ScenarioController.java 2010-06-07 22:09:39 UTC (rev 1661) +++ trunk/web/web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/ScenarioController.java 2010-06-23 20:54:35 UTC (rev 1662) @@ -64,7 +64,7 @@ try { outputStream.reset(); scenarioContext.clearFailureCause(); - scenarioRunner.run(storyDefinition(), configuration, true, steps); + scenarioRunner.run(storyDefinition(), configuration, false, steps); } catch (Throwable e) { scenarioContext.runFailedFor(e); }
Modified: trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/controllers/ScenarioControllerTest.java (1661 => 1662)
--- trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/controllers/ScenarioControllerTest.java 2010-06-07 22:09:39 UTC (rev 1661) +++ trunk/web/web-runner/src/test/java/org/jbehave/web/runner/waffle/controllers/ScenarioControllerTest.java 2010-06-23 20:54:35 UTC (rev 1662) @@ -1,6 +1,5 @@ package org.jbehave.web.runner.waffle.controllers; -import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -16,7 +15,6 @@ import org.jbehave.scenario.parser.PatternScenarioParser; import org.jbehave.scenario.parser.ScenarioParser; import org.jbehave.scenario.steps.Steps; -import org.jbehave.web.runner.waffle.controllers.ScenarioController; import org.junit.Test;
Modified: trunk/web/web-selenium/src/main/java/org/jbehave/web/selenium/SeleniumStepsMonitor.java (1661 => 1662)
--- trunk/web/web-selenium/src/main/java/org/jbehave/web/selenium/SeleniumStepsMonitor.java 2010-06-07 22:09:39 UTC (rev 1661) +++ trunk/web/web-selenium/src/main/java/org/jbehave/web/selenium/SeleniumStepsMonitor.java 2010-06-23 20:54:35 UTC (rev 1662) @@ -1,8 +1,10 @@ package org.jbehave.web.selenium; +import java.lang.reflect.Method; import java.lang.reflect.Type; import org.jbehave.scenario.steps.StepMonitor; +import org.jbehave.scenario.steps.StepType; import com.thoughtworks.selenium.Selenium; @@ -18,21 +20,11 @@ this.delegate = delegate; } - public void performing(String step){ - String context = seleniumContext.getCurrentScenario() + "<br>" + step; - selenium.setContext(context); - delegate.performing(step); - } - public void convertedValueOfType(String value, Type type, Object converted, Class<?> converterClass) { delegate.convertedValueOfType(value, type, converted, converterClass); } - public void stepMatchesPattern(String step, boolean matches, String pattern) { - delegate.stepMatchesPattern(step, matches, pattern); - } - public void foundArg(String arg, int position) { delegate.foundArg(arg, position); } @@ -57,4 +49,19 @@ delegate.usingTableParameterNameForArg(name, position); } + public void performing(String step, boolean dryRun) { + String context = seleniumContext.getCurrentScenario() + "<br>" + step; + selenium.setContext(context); + delegate.performing(step, dryRun); + } + + public void stepMatchesPattern(String step, boolean matches, String pattern, Method method, Object stepsInstance) { + delegate.stepMatchesPattern(step, matches, pattern, method, stepsInstance); + } + + public void stepMatchesType(String stepAsString, String previousAsString, boolean matchesType, StepType stepType, + Method method, Object stepsInstance) { + delegate.stepMatchesType(stepAsString, previousAsString, matchesType, stepType, method, stepsInstance); + } + } \ No newline at end of file
Modified: trunk/web/web-selenium/src/test/java/org/jbehave/web/selenium/SeleniumPerScenarioStepsTest.java (1661 => 1662)
--- trunk/web/web-selenium/src/test/java/org/jbehave/web/selenium/SeleniumPerScenarioStepsTest.java 2010-06-07 22:09:39 UTC (rev 1661) +++ trunk/web/web-selenium/src/test/java/org/jbehave/web/selenium/SeleniumPerScenarioStepsTest.java 2010-06-23 20:54:35 UTC (rev 1662) @@ -58,7 +58,7 @@ }; StoryDefinition definition = parser.defineStoryFrom(input, path); - runner.run(definition, configuration, true, steps); + runner.run(definition, configuration, false, steps); }
Modified: trunk/web/web-selenium/src/test/java/org/jbehave/web/selenium/SeleniumPerStoryStepsTest.java (1661 => 1662)
--- trunk/web/web-selenium/src/test/java/org/jbehave/web/selenium/SeleniumPerStoryStepsTest.java 2010-06-07 22:09:39 UTC (rev 1661) +++ trunk/web/web-selenium/src/test/java/org/jbehave/web/selenium/SeleniumPerStoryStepsTest.java 2010-06-23 20:54:35 UTC (rev 1662) @@ -57,7 +57,7 @@ }; StoryDefinition definition = parser.defineStoryFrom(input, path); - runner.run(definition, configuration, true, steps); + runner.run(definition, configuration, false, steps); }
Modified: trunk/web/web-selenium/src/test/java/org/jbehave/web/selenium/SeleniumStepsConfigurationTest.java (1661 => 1662)
--- trunk/web/web-selenium/src/test/java/org/jbehave/web/selenium/SeleniumStepsConfigurationTest.java 2010-06-07 22:09:39 UTC (rev 1661) +++ trunk/web/web-selenium/src/test/java/org/jbehave/web/selenium/SeleniumStepsConfigurationTest.java 2010-06-23 20:54:35 UTC (rev 1662) @@ -1,5 +1,7 @@ package org.jbehave.web.selenium; +import java.lang.reflect.Method; + import org.jbehave.scenario.steps.StepMonitor; import org.jmock.Expectations; import org.jmock.Mockery; @@ -22,14 +24,15 @@ SeleniumContext seleniumContext = new SeleniumContext(); String currentScenario = "current scenario"; final String step = "a step"; + final boolean dryRun = false; final String context = currentScenario + "<br>" + step; mockery.checking(new Expectations(){{ one(selenium).setContext(context); - one(stepMonitor).performing(step); + one(stepMonitor).performing(step, dryRun); }}); SeleniumStepsConfiguration configuration = new SeleniumStepsConfiguration(selenium, seleniumContext, stepMonitor); seleniumContext.setCurrentScenario(currentScenario); - configuration.getMonitor().performing(step); + configuration.getMonitor().performing(step, dryRun); } @Test @@ -41,13 +44,15 @@ final Class<String> converterClass = String.class; final String pattern = "pattern"; final boolean matches = true; + final Method method = null; + final Object stepsInstance = new Object(); mockery.checking(new Expectations(){{ one(stepMonitor).convertedValueOfType(value, type, converted, converterClass); - one(stepMonitor).stepMatchesPattern(step, matches, pattern); + one(stepMonitor).stepMatchesPattern(step, matches, pattern, method, stepsInstance); }}); SeleniumStepsMonitor monitor = new SeleniumStepsMonitor(selenium, new SeleniumContext(), stepMonitor); monitor.convertedValueOfType(value, type, converted, converterClass); - monitor.stepMatchesPattern(step, matches, pattern); + monitor.stepMatchesPattern(step, matches, pattern, method, stepsInstance); } }
To unsubscribe from this list please visit:
