- Revision
- 1004
- Author
- mauro
- Date
- 2008-11-02 03:41:01 -0600 (Sun, 02 Nov 2008)
Log Message
JBEHAVE-127: Fixed bug that prevented use of numbers in the scenario file names.
Modified Paths
Diff
Modified: trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/CasePreservingResolverBehaviour.java (1003 => 1004)
--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/CasePreservingResolverBehaviour.java 2008-11-02 09:22:42 UTC (rev 1003) +++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/CasePreservingResolverBehaviour.java 2008-11-02 09:41:01 UTC (rev 1004) @@ -15,8 +15,20 @@ equalTo("org/jbehave/scenario/parser/CamelCase.scenario")); } - + + @Test + public void shouldResolveClassNamePreservingCaseWithNumbers() { + CasePreservingResolver resolver = new CasePreservingResolver(".scenario"); + ensureThat(resolver.resolve(CamelCaseWith3Dates.class), + equalTo("org/jbehave/scenario/parser/CamelCaseWith3Dates.scenario")); + + } + static class CamelCase extends JUnitScenario { } + + static class CamelCaseWith3Dates extends JUnitScenario { + + } }
Modified: trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/UnderscoredCamelCaseResolverBehaviour.java (1003 => 1004)
--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/UnderscoredCamelCaseResolverBehaviour.java 2008-11-02 09:22:42 UTC (rev 1003) +++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/UnderscoredCamelCaseResolverBehaviour.java 2008-11-02 09:41:01 UTC (rev 1004) @@ -16,6 +16,7 @@ } + @Test public void shouldResolveCamelCasedClassNameToUnderscoredNameWithExtension() { UnderscoredCamelCaseResolver resolver = new UnderscoredCamelCaseResolver(".scenario"); @@ -24,6 +25,14 @@ } + @Test + public void shouldResolveCamelCasedClassNameWithNumbers() { + UnderscoredCamelCaseResolver resolver = new UnderscoredCamelCaseResolver(); + ensureThat(resolver.resolve(CamelCaseWith3Dates.class), + equalTo("org/jbehave/scenario/parser/camel_case_with_3_dates")); + + } + static class CamelCaseScenario extends JUnitScenario { } @@ -31,4 +40,8 @@ static class CamelCase extends JUnitScenario { } + + static class CamelCaseWith3Dates extends JUnitScenario { + + } }
Modified: trunk/jbehave-core/src/java/org/jbehave/scenario/parser/UnderscoredCamelCaseResolver.java (1003 => 1004)
--- trunk/jbehave-core/src/java/org/jbehave/scenario/parser/UnderscoredCamelCaseResolver.java 2008-11-02 09:22:42 UTC (rev 1003) +++ trunk/jbehave-core/src/java/org/jbehave/scenario/parser/UnderscoredCamelCaseResolver.java 2008-11-02 09:41:01 UTC (rev 1004) @@ -18,14 +18,15 @@ */ public class UnderscoredCamelCaseResolver implements ScenarioNameResolver { - private static final String DOT_REGEX = "\\."; + private static final String EMPTY = ""; + private static final String DOT_REGEX = "\\."; private static final String SLASH = "/"; - private static final String PATTERN = "([A-Z].*?)([A-Z]|\\z)"; + private static final String PATTERN = "([A-Z0-9].*?)([A-Z0-9]|\\z)"; private static final String UNDERSCORE = "_"; private final String extension; public UnderscoredCamelCaseResolver() { - this(""); + this(EMPTY); } public UnderscoredCamelCaseResolver(String extension) {
To unsubscribe from this list please visit:
