- Revision
- 1490
- Author
- mauro
- Date
- 2010-01-04 03:36:55 -0600 (Mon, 04 Jan 2010)
Log Message
Tidying up.
Modified Paths
- trunk/core/jbehave-pico/src/behaviour/java/org/jbehave/scenario/steps/pico/PicoEnabledCandidateStepBehaviour.java
- trunk/core/jbehave-pico/src/main/java/org/jbehave/scenario/steps/pico/PicoEnabledCandidateStep.java
- trunk/core/jbehave-pico/src/main/java/org/jbehave/scenario/steps/pico/PicoEnabledSteps.java
Diff
Modified: trunk/core/jbehave-pico/src/behaviour/java/org/jbehave/scenario/steps/pico/PicoEnabledCandidateStepBehaviour.java (1489 => 1490)
--- trunk/core/jbehave-pico/src/behaviour/java/org/jbehave/scenario/steps/pico/PicoEnabledCandidateStepBehaviour.java 2010-01-04 00:21:01 UTC (rev 1489) +++ trunk/core/jbehave-pico/src/behaviour/java/org/jbehave/scenario/steps/pico/PicoEnabledCandidateStepBehaviour.java 2010-01-04 09:36:55 UTC (rev 1490) @@ -261,7 +261,7 @@ public void shouldCreateStepsOfDifferentTypesWithSameMatchingPattern() throws Throwable { parent.addComponent(NamedTypeSteps.class); NamedTypeSteps steps = parent.getComponent(NamedTypeSteps.class); - steps.withPicoContainer(parent); + steps.withParentContainer(parent); CandidateStep[] candidateSteps = steps.getSteps(); ensureThat(candidateSteps.length, equalTo(2)); guard(candidateSteps[0].createFrom(tableRow, "Given foo named xyz").perform()); @@ -281,7 +281,7 @@ public void shouldNotCreateStepOfWrongType() { parent.addComponent(NamedTypeSteps.class); NamedTypeSteps steps = parent.getComponent(NamedTypeSteps.class); - steps.withPicoContainer(parent); + steps.withParentContainer(parent); CandidateStep[] candidateSteps = steps.getSteps(); ensureThat(candidateSteps.length, equalTo(2)); candidateSteps[0].createFrom(tableRow, "Given foo named xyz").perform();
Modified: trunk/core/jbehave-pico/src/main/java/org/jbehave/scenario/steps/pico/PicoEnabledCandidateStep.java (1489 => 1490)
--- trunk/core/jbehave-pico/src/main/java/org/jbehave/scenario/steps/pico/PicoEnabledCandidateStep.java 2010-01-04 00:21:01 UTC (rev 1489) +++ trunk/core/jbehave-pico/src/main/java/org/jbehave/scenario/steps/pico/PicoEnabledCandidateStep.java 2010-01-04 09:36:55 UTC (rev 1490) @@ -1,25 +1,27 @@ package org.jbehave.scenario.steps.pico; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.Map; +import java.util.regex.Matcher; + import org.jbehave.scenario.errors.PendingError; import org.jbehave.scenario.parser.StepPatternBuilder; -import org.jbehave.scenario.steps.*; +import org.jbehave.scenario.steps.CandidateStep; +import org.jbehave.scenario.steps.CandidateSteps; +import org.jbehave.scenario.steps.ParameterConverters; +import org.jbehave.scenario.steps.Step; +import org.jbehave.scenario.steps.StepMonitor; +import org.jbehave.scenario.steps.StepResult; +import org.jbehave.scenario.steps.StepType; import org.picocontainer.Characteristics; import org.picocontainer.DefaultPicoContainer; import org.picocontainer.MutablePicoContainer; import org.picocontainer.PicoContainer; import org.picocontainer.injectors.MethodInjection; import org.picocontainer.injectors.Reinjection; -import org.picocontainer.injectors.Reinjector; import org.picocontainer.lifecycle.NullLifecycleStrategy; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Type; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.regex.Matcher; - public class PicoEnabledCandidateStep extends CandidateStep { private PicoContainer parent; @@ -35,26 +37,24 @@ protected Step createStep(final String stepAsString, Map<String, String> tableRow, Matcher matcher, final Method method, final StepMonitor stepMonitor, String[] groupNames) { - final MutablePicoContainer tempContainer = new DefaultPicoContainer(new Reinjection(new MethodInjection(method), parent), new NullLifecycleStrategy(), parent); + final MutablePicoContainer stepContainer = new DefaultPicoContainer(new Reinjection(new MethodInjection(method), parent), new NullLifecycleStrategy(), parent); - // populate named entries from tableRow - Set<String> keys = tableRow.keySet(); - for (String key : keys) { - tempContainer.addConfig(key, tableRow.get(key)); + // populate named entries from table data + for (String key : tableRow.keySet()) { + stepContainer.addConfig(key, tableRow.get(key)); } - // populate named entries from regex + // populate named entries from regex match for (String groupName : groupNames) { - String val = getGroup(matcher, groupName); - tempContainer.addConfig(groupName, val); + stepContainer.addConfig(groupName, getGroup(matcher, groupName)); } return new Step() { public StepResult perform() { try { stepMonitor.performing(stepAsString); - tempContainer.as(Characteristics.USE_NAMES).addComponent(method.getDeclaringClass()); - tempContainer.getComponent(method.getDeclaringClass()); + stepContainer.as(Characteristics.USE_NAMES).addComponent(method.getDeclaringClass()); + stepContainer.getComponent(method.getDeclaringClass()); return StepResult.success(stepAsString); } catch (Throwable t) { return failureWithOriginalException(stepAsString, t);
Modified: trunk/core/jbehave-pico/src/main/java/org/jbehave/scenario/steps/pico/PicoEnabledSteps.java (1489 => 1490)
--- trunk/core/jbehave-pico/src/main/java/org/jbehave/scenario/steps/pico/PicoEnabledSteps.java 2010-01-04 00:21:01 UTC (rev 1489) +++ trunk/core/jbehave-pico/src/main/java/org/jbehave/scenario/steps/pico/PicoEnabledSteps.java 2010-01-04 09:36:55 UTC (rev 1490) @@ -11,13 +11,9 @@ private PicoContainer parent; public PicoEnabledSteps() { + super(); } - public PicoEnabledSteps withPicoContainer(PicoContainer parent) { - this.parent = parent; - return this; - } - public PicoEnabledSteps(KeyWords keywords) { super(keywords); } @@ -26,14 +22,18 @@ super(converters); } - public PicoEnabledSteps(StepsConfiguration configuration) { super(configuration); } + public PicoEnabledSteps withParentContainer(PicoContainer parent) { + this.parent = parent; + return this; + } + protected CandidateStep createCandidateStep(Method method, StepType stepType, String stepPatternAsString, StepsConfiguration configuration) { if (parent == null) { - throw new NullPointerException("parent should be passed in via usePicoContainer(..)"); + throw new NullPointerException("Parent container should be provided via PicoEnabledSteps#withParentContainer(PicoContainer)"); } return new PicoEnabledCandidateStep(stepPatternAsString, stepType, method, this, configuration.getPatternBuilder(),
To unsubscribe from this list please visit:
