- Revision
- 1221
- Author
- mauro
- Date
- 2009-09-05 06:25:34 -0500 (Sat, 05 Sep 2009)
Log Message
Renamed index to position in step monitor methods and textual output, as to better represent the method args language.
Modified Paths
- trunk/core/examples/trader/src/main/java/org/jbehave/examples/trader/TraderSteps.java
- trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/CandidateStep.java
- trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/PrintStreamStepMonitor.java
- trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/StepMonitor.java
Diff
Modified: trunk/core/examples/trader/src/main/java/org/jbehave/examples/trader/TraderSteps.java (1220 => 1221)
--- trunk/core/examples/trader/src/main/java/org/jbehave/examples/trader/TraderSteps.java 2009-09-05 10:20:58 UTC (rev 1220) +++ trunk/core/examples/trader/src/main/java/org/jbehave/examples/trader/TraderSteps.java 2009-09-05 11:25:34 UTC (rev 1221) @@ -18,7 +18,7 @@ import org.jbehave.scenario.annotations.When; import org.jbehave.scenario.parser.PrefixCapturingPatternBuilder; import org.jbehave.scenario.steps.ParameterConverters; -import org.jbehave.scenario.steps.SilentStepMonitor; +import org.jbehave.scenario.steps.PrintStreamStepMonitor; import org.jbehave.scenario.steps.StepMonitor; import org.jbehave.scenario.steps.Steps; import org.jbehave.scenario.steps.StepsConfiguration; @@ -31,7 +31,7 @@ public TraderSteps(ClassLoader classLoader) { super(configuration); - StepMonitor monitor = new SilentStepMonitor(); + StepMonitor monitor = new PrintStreamStepMonitor(); configuration.useParameterConverters(new ParameterConverters( monitor, new TraderConverter(mockTradePersister()))); configuration.usePatternBuilder(new PrefixCapturingPatternBuilder("%"));
Modified: trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/CandidateStep.java (1220 => 1221)
--- trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/CandidateStep.java 2009-09-05 10:20:58 UTC (rev 1220) +++ trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/CandidateStep.java 2009-09-05 11:25:34 UTC (rev 1221) @@ -65,15 +65,15 @@ this.paranamer = paranamer; } - public boolean matches(String step) { - String word = findStartingWord(step); + public boolean matches(String stepAsString) { + String word = findStartingWord(stepAsString); if (word == null) { return false; } - String trimmed = trimStartingWord(word, step); + String trimmed = trimStartingWord(word, stepAsString); Matcher matcher = pattern.matcher(trimmed); boolean matches = matcher.matches(); - stepMonitor.stepMatchesPattern(step, matches, pattern.pattern()); + stepMonitor.stepMatchesPattern(stepAsString, matches, pattern.pattern()); return matches; } @@ -99,44 +99,44 @@ Matcher matcher, Type[] types, String[] annotationNames, String[] parameterNames) { final Object[] args = new Object[types.length]; - for (int index = 0; index < types.length; index++) { - String arg = argForIndex(index, annotationNames, parameterNames, + for (int position = 0; position < types.length; position++) { + String arg = argForPosition(position, annotationNames, parameterNames, tableValues, matcher); - args[index] = parameterConverters.convert(arg, types[index]); + args[position] = parameterConverters.convert(arg, types[position]); } return args; } - private String argForIndex(int index, String[] annotationNames, + private String argForPosition(int position, String[] annotationNames, String[] parameterNames, Map<String, String> tableValues, Matcher matcher) { - int annotatedNameIndex = parameterIndex(annotationNames, index); - int parameterNameIndex = parameterIndex(parameterNames, index); + int annotatedNamePosition = parameterPosition(annotationNames, position); + int parameterNamePosition = parameterPosition(parameterNames, position); String arg = null; - if (annotatedNameIndex != -1 && isGroupName(annotationNames[index])) { - String name = annotationNames[index]; - stepMonitor.usingAnnotatedName(name, index); + if (annotatedNamePosition != -1 && isGroupName(annotationNames[position])) { + String name = annotationNames[position]; + stepMonitor.usingAnnotatedNameForArg(name, position); arg = getGroup(matcher, name); - } else if (parameterNameIndex != -1 - && isGroupName(parameterNames[index])) { - String name = parameterNames[index]; - stepMonitor.usingParameterName(name, index); + } else if (parameterNamePosition != -1 + && isGroupName(parameterNames[position])) { + String name = parameterNames[position]; + stepMonitor.usingParameterNameForArg(name, position); arg = getGroup(matcher, name); - } else if (annotatedNameIndex != -1 - && isTableFieldName(tableValues, annotationNames[index])) { - String name = annotationNames[index]; - stepMonitor.usingTableAnnotatedName(name, index); + } else if (annotatedNamePosition != -1 + && isTableFieldName(tableValues, annotationNames[position])) { + String name = annotationNames[position]; + stepMonitor.usingTableAnnotatedNameForArg(name, position); arg = getTableValue(tableValues, name); - } else if (parameterNameIndex != -1 - && isTableFieldName(tableValues, parameterNames[index])) { - String name = parameterNames[index]; - stepMonitor.usingTableParameterName(name, index); + } else if (parameterNamePosition != -1 + && isTableFieldName(tableValues, parameterNames[position])) { + String name = parameterNames[position]; + stepMonitor.usingTableParameterNameForArg(name, position); arg = getTableValue(tableValues, name); } else { - stepMonitor.usingNaturalOrder(index); - arg = matcher.group(index + 1); + stepMonitor.usingNaturalOrderForArg(position); + arg = matcher.group(position + 1); } - stepMonitor.foundArg(arg, index); + stepMonitor.foundArg(arg, position); return arg; } @@ -168,15 +168,15 @@ return false; } - private int parameterIndex(String[] names, int ix) { + private int parameterPosition(String[] names, int position) { if (names.length == 0) { return -1; } - String name = names[ix]; - for (int index = 0; index < names.length; index++) { - String annotatedName = names[index]; + String name = names[position]; + for (int i = 0; i < names.length; i++) { + String annotatedName = names[i]; if (annotatedName != null && name.equals(annotatedName)) { - return index; + return i; } } return -1;
Modified: trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/PrintStreamStepMonitor.java (1220 => 1221)
--- trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/PrintStreamStepMonitor.java 2009-09-05 10:20:58 UTC (rev 1220) +++ trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/PrintStreamStepMonitor.java 2009-09-05 11:25:34 UTC (rev 1221) @@ -15,13 +15,13 @@ private static final String STEP_MATCHES_PATTERN = "Step ''{0}'' {1} pattern ''{2}''"; private static final String MATCHES = "matches"; private static final String DOES_NOT_MATCH = "does not match"; - private static final String USING_NAME_FOR_INDEX = "Using {0} name ''{1}'' for index {2}"; + private static final String USING_NAME_FOR_ARG = "Using {0} name ''{1}'' for position {2}"; private static final String ANNOTATED = "annotated"; private static final String PARAMETER = "parameter"; private static final String TABLE_ANNOTATED = "table annotated"; private static final String TABLE_PARAMETER = "table parameter"; - private static final String USING_NATURAL_ORDER_FOR_INDEX = "Using natural order for index {0}"; - private static final String FOUND_ARG_FOR_INDEX = "Found argument ''{0}'' for index {1}"; + private static final String USING_NATURAL_ORDER_FOR_ARG = "Using natural order for position {0}"; + private static final String FOUND_ARG = "Found argument ''{0}'' for position {1}"; private final PrintStream output; @@ -50,33 +50,33 @@ print(output, step); } - public void usingAnnotatedName(String name, int index) { - String message = format(USING_NAME_FOR_INDEX, ANNOTATED, name, index); + public void usingAnnotatedNameForArg(String name, int position) { + String message = format(USING_NAME_FOR_ARG, ANNOTATED, name, position); print(output, message); } - public void usingParameterName(String name, int index) { - String message = format(USING_NAME_FOR_INDEX, PARAMETER, name, index); + public void usingParameterNameForArg(String name, int position) { + String message = format(USING_NAME_FOR_ARG, PARAMETER, name, position); print(output, message); } - public void usingTableAnnotatedName(String name, int index) { - String message = format(USING_NAME_FOR_INDEX, TABLE_ANNOTATED, name, index); + public void usingTableAnnotatedNameForArg(String name, int position) { + String message = format(USING_NAME_FOR_ARG, TABLE_ANNOTATED, name, position); print(output, message); } - public void usingTableParameterName(String name, int index) { - String message = format(USING_NAME_FOR_INDEX, TABLE_PARAMETER, name, index); + public void usingTableParameterNameForArg(String name, int position) { + String message = format(USING_NAME_FOR_ARG, TABLE_PARAMETER, name, position); print(output, message); } - public void usingNaturalOrder(int index) { - String message = format(USING_NATURAL_ORDER_FOR_INDEX, index); + public void usingNaturalOrderForArg(int position) { + String message = format(USING_NATURAL_ORDER_FOR_ARG, position); print(output, message); } - public void foundArg(String arg, int index) { - String message = format(FOUND_ARG_FOR_INDEX, arg, index); + public void foundArg(String arg, int position) { + String message = format(FOUND_ARG, arg, position); print(output, message); }
Modified: trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/StepMonitor.java (1220 => 1221)
--- trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/StepMonitor.java 2009-09-05 10:20:58 UTC (rev 1220) +++ trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/StepMonitor.java 2009-09-05 11:25:34 UTC (rev 1221) @@ -15,15 +15,15 @@ void performing(String step); - void usingAnnotatedName(String name, int index); + void usingAnnotatedNameForArg(String name, int position); - void usingParameterName(String name, int index); + void usingParameterNameForArg(String name, int position); - void usingTableAnnotatedName(String name, int index); + void usingTableAnnotatedNameForArg(String name, int position); - void usingTableParameterName(String name, int index); + void usingTableParameterNameForArg(String name, int position); - void usingNaturalOrder(int index); + void usingNaturalOrderForArg(int position); - void foundArg(String arg, int index); + void foundArg(String arg, int position); }
To unsubscribe from this list please visit:
