[jbehave-scm] [1217] trunk/core/jbehave-core/src/behaviour/org/jbehave/scenario: Clean up of behaviour code.

Sat, 05 Sep 2009 01:37:18 -0700

Title: [1217] trunk/core/jbehave-core/src/behaviour/org/jbehave/scenario: Clean up of behaviour code.

Diff

Modified: trunk/core/examples/trader/src/main/java/org/jbehave/examples/trader/converters/TraderConverter.java (1216 => 1217)

--- trunk/core/examples/trader/src/main/java/org/jbehave/examples/trader/converters/TraderConverter.java	2009-09-05 08:20:28 UTC (rev 1216)
+++ trunk/core/examples/trader/src/main/java/org/jbehave/examples/trader/converters/TraderConverter.java	2009-09-05 08:37:10 UTC (rev 1217)
@@ -15,7 +15,7 @@
     }
 
     public boolean accept(Type type) {
-        if (type instanceof Class) {
+        if (type instanceof Class<?>) {
             return Trader.class.isAssignableFrom((Class<?>) type);
         }
         return false;

Deleted: trunk/core/jbehave-core/src/behaviour/org/jbehave/scenario/container.xml (1216 => 1217)

--- trunk/core/jbehave-core/src/behaviour/org/jbehave/scenario/container.xml	2009-09-05 08:20:28 UTC (rev 1216)
+++ trunk/core/jbehave-core/src/behaviour/org/jbehave/scenario/container.xml	2009-09-05 08:37:10 UTC (rev 1217)
@@ -1 +0,0 @@
-<container/>
\ No newline at end of file

Modified: trunk/core/jbehave-core/src/behaviour/org/jbehave/scenario/steps/CandidateStepBehaviour.java (1216 => 1217)

--- trunk/core/jbehave-core/src/behaviour/org/jbehave/scenario/steps/CandidateStepBehaviour.java	2009-09-05 08:20:28 UTC (rev 1216)
+++ trunk/core/jbehave-core/src/behaviour/org/jbehave/scenario/steps/CandidateStepBehaviour.java	2009-09-05 08:37:10 UTC (rev 1217)
@@ -21,7 +21,6 @@
 import org.jbehave.scenario.parser.StepPatternBuilder;
 import org.jbehave.scenario.reporters.ScenarioReporter;
 import org.junit.Test;
-import org.junit.Ignore;
 
 public class CandidateStepBehaviour {

Modified: trunk/core/jbehave-core/src/behaviour/org/jbehave/scenario/steps/StepsBehaviour.java (1216 => 1217)

--- trunk/core/jbehave-core/src/behaviour/org/jbehave/scenario/steps/StepsBehaviour.java	2009-09-05 08:20:28 UTC (rev 1216)
+++ trunk/core/jbehave-core/src/behaviour/org/jbehave/scenario/steps/StepsBehaviour.java	2009-09-05 08:37:10 UTC (rev 1217)
@@ -167,11 +167,6 @@
         private int whens;
         private int thens;
 
-        private boolean before;
-        private boolean afterAny;
-        private boolean afterSuccess;
-        private boolean afterFailure;
-
         @org.jbehave.scenario.annotations.Given("a given")
         @org.jbehave.scenario.annotations.Alias("a given alias")
         public void given() {
@@ -190,26 +185,6 @@
             thens++;
         }
 
-        @org.jbehave.scenario.annotations.BeforeScenario
-        public void beforeScenarios() {
-        	before = true;
-        }
-
-        @org.jbehave.scenario.annotations.AfterScenario
-        public void afterAnyScenarios() {
-        	afterAny = true;
-        }
-
-        @org.jbehave.scenario.annotations.AfterScenario(uponOutcome=AfterScenario.Outcome.SUCCESS)
-        public void afterSuccessfulScenarios() {
-        	afterSuccess = true;
-        }
-
-        @org.jbehave.scenario.annotations.AfterScenario(uponOutcome=AfterScenario.Outcome.FAILURE)
-        public void afterUnsuccessfulScenarios() {
-        	afterFailure = true;
-        }
-
     }
 
     public static class DuplicateSteps extends Steps {

Modified: trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/Steps.java (1216 => 1217)

--- trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/Steps.java	2009-09-05 08:20:28 UTC (rev 1216)
+++ trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/Steps.java	2009-09-05 08:37:10 UTC (rev 1217)
@@ -127,7 +127,7 @@
 		return steps.toArray(new CandidateStep[steps.size()]);
 	}
 
-	void createCandidateStep(List<CandidateStep> steps, Method method,
+	private void createCandidateStep(List<CandidateStep> steps, Method method,
 			String stepAsString) {
 		checkForDuplicateCandidateSteps(steps, stepAsString);
         CandidateStep step = new CandidateStep(stepAsString, method, this, configuration

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to