- Revision
- 1204
- Author
- mauro
- Date
- 2009-08-26 16:13:41 -0500 (Wed, 26 Aug 2009)
Log Message
Simplified SeleniumSteps by getting Selenium from the SeleniumStepsConfiguration.
Modified Paths
Diff
Modified: trunk/web/web-selenium/src/main/java/org/jbehave/web/selenium/SeleniumSteps.java (1203 => 1204)
--- trunk/web/web-selenium/src/main/java/org/jbehave/web/selenium/SeleniumSteps.java 2009-08-26 20:37:05 UTC (rev 1203) +++ trunk/web/web-selenium/src/main/java/org/jbehave/web/selenium/SeleniumSteps.java 2009-08-26 21:13:41 UTC (rev 1204) @@ -30,19 +30,19 @@ this(new StepsConfiguration()); } - public SeleniumSteps(Selenium selenium) { - this(new StepsConfiguration(), selenium); - } - public SeleniumSteps(StepsConfiguration configuration){ super(configuration); this.selenium = createSelenium(); this.runner = createConditionRunner(selenium); } - public SeleniumSteps(StepsConfiguration configuration, Selenium selenium){ + public SeleniumSteps(Selenium selenium) { + this(new SeleniumStepsConfiguration(selenium, new SeleniumContext())); + } + + public SeleniumSteps(SeleniumStepsConfiguration configuration){ super(configuration); - this.selenium = selenium; + this.selenium = configuration.getSelenium(); this.runner = createConditionRunner(selenium); }
Modified: trunk/web/web-selenium/src/main/java/org/jbehave/web/selenium/SeleniumStepsConfiguration.java (1203 => 1204)
--- trunk/web/web-selenium/src/main/java/org/jbehave/web/selenium/SeleniumStepsConfiguration.java 2009-08-26 20:37:05 UTC (rev 1203) +++ trunk/web/web-selenium/src/main/java/org/jbehave/web/selenium/SeleniumStepsConfiguration.java 2009-08-26 21:13:41 UTC (rev 1204) @@ -8,12 +8,19 @@ public class SeleniumStepsConfiguration extends StepsConfiguration { + private final Selenium selenium; + public SeleniumStepsConfiguration(Selenium selenium, SeleniumContext seleniumContext) { this(selenium, seleniumContext, new SilentStepMonitor()); } public SeleniumStepsConfiguration(Selenium selenium, SeleniumContext seleniumContext, StepMonitor stepMonitor) { + this.selenium = selenium; useMonitor(new SeleniumStepsMonitor(selenium, seleniumContext, stepMonitor)); } + public Selenium getSelenium() { + return selenium; + } + }
Modified: trunk/web/web-selenium/src/test/java/org/jbehave/web/selenium/SeleniumStepsTest.java (1203 => 1204)
--- trunk/web/web-selenium/src/test/java/org/jbehave/web/selenium/SeleniumStepsTest.java 2009-08-26 20:37:05 UTC (rev 1203) +++ trunk/web/web-selenium/src/test/java/org/jbehave/web/selenium/SeleniumStepsTest.java 2009-08-26 21:13:41 UTC (rev 1204) @@ -25,8 +25,8 @@ private final Configuration configuration = new MostUsefulConfiguration(); private final ScenarioParser parser = new PatternScenarioParser(); private final ScenarioRunner runner = new ScenarioRunner(); - private final Selenium mockedSelenium = mockery.mock(Selenium.class); - private final ConditionRunner mockRunner = mockery + private final Selenium selenium = mockery.mock(Selenium.class); + private final ConditionRunner conditionRunner = mockery .mock(ConditionRunner.class); @Test @@ -37,20 +37,21 @@ + "When a test is executed" + NL + "Then a tester is a happy hopper"; mockery.checking(new Expectations(){{ - one(mockedSelenium).start(); - one(mockedSelenium).close(); - one(mockedSelenium).stop(); + exactly(3).of(selenium).setContext(with(any(String.class))); + one(selenium).start(); + one(selenium).close(); + one(selenium).stop(); }}); - Steps steps = new MySteps(){ + Steps steps = new MySteps(selenium){ @Override protected ConditionRunner createConditionRunner(Selenium selenium) { - return mockRunner; + return conditionRunner; } @Override protected Selenium createSelenium() { - return mockedSelenium; + return selenium; } }; @@ -65,15 +66,16 @@ + "When a test is executed" + NL + "Then a tester is a happy hopper"; mockery.checking(new Expectations(){{ - one(mockedSelenium).start(); - one(mockedSelenium).close(); - one(mockedSelenium).stop(); + exactly(3).of(selenium).setContext(with(any(String.class))); + one(selenium).start(); + one(selenium).close(); + one(selenium).stop(); }}); - Steps steps = new MySteps(mockedSelenium){ + Steps steps = new MySteps(selenium){ @Override protected ConditionRunner createConditionRunner(Selenium selenium) { - return mockRunner; + return conditionRunner; } };
To unsubscribe from this list please visit:
