- Revision
- 1499
- Author
- mauro
- Date
- 2010-01-06 08:39:18 -0600 (Wed, 06 Jan 2010)
Log Message
Reverted CandidateStep behaviour verification wrt to system newline conversion, in order for it to pass on Windows. Changed name to better clarify intent.
Modified Paths
Diff
Modified: trunk/core/jbehave-core/src/behaviour/java/org/jbehave/scenario/steps/CandidateStepBehaviour.java (1498 => 1499)
--- trunk/core/jbehave-core/src/behaviour/java/org/jbehave/scenario/steps/CandidateStepBehaviour.java 2010-01-05 17:02:48 UTC (rev 1498) +++ trunk/core/jbehave-core/src/behaviour/java/org/jbehave/scenario/steps/CandidateStepBehaviour.java 2010-01-06 14:39:18 UTC (rev 1499) @@ -117,17 +117,17 @@ verify(reporter).successful("Then I live on the 1st floor"); } - @Test - public void shouldConvertWindowsNewlinesToUnix() throws Exception { + public void shouldConvertStringParameterValuesToUseSystemNewline() throws Exception { String windowsNewline = "\r\n"; String unixNewline = "\n"; + String systemNewline = System.getProperty("line.separator"); SomeSteps someSteps = new SomeSteps(); CandidateStep candidateStep = new CandidateStep("the grid should look like $grid", THEN, SomeSteps.class.getMethod( "aMethodWith", String.class), someSteps, PATTERN_BUILDER, new ParameterConverters(), startingWords); Step step = candidateStep.createFrom(tableRow, "Then the grid should look like" + windowsNewline + ".." + unixNewline + ".." + windowsNewline); step.perform(); - ensureThat((String) someSteps.args, equalTo(".." + unixNewline + ".." + unixNewline)); + ensureThat((String) someSteps.args, equalTo(".." + systemNewline + ".." + systemNewline)); } @Test
Modified: trunk/core/jbehave-pico/src/behaviour/java/org/jbehave/scenario/steps/pico/PicoEnabledCandidateStepBehaviour.java (1498 => 1499)
--- trunk/core/jbehave-pico/src/behaviour/java/org/jbehave/scenario/steps/pico/PicoEnabledCandidateStepBehaviour.java 2010-01-05 17:02:48 UTC (rev 1498) +++ trunk/core/jbehave-pico/src/behaviour/java/org/jbehave/scenario/steps/pico/PicoEnabledCandidateStepBehaviour.java 2010-01-06 14:39:18 UTC (rev 1499) @@ -135,7 +135,8 @@ } @Test - public void shouldConvertWindowsNewlinesToUnix() throws Exception { + public void shouldConvertStringParameterValuesToUseUnixNewline() throws Exception { + // conversion to system new line is done in ParameterConverters - still todo String windowsNewline = "\r\n"; String unixNewline = "\n"; parent.as(Characteristics.USE_NAMES).addComponent(SomeSteps.class);
To unsubscribe from this list please visit:
