Title: [983] trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/StepsBehaviour.java: More consistent variable and method names in steps behaviour.
Revision
983
Author
mauro
Date
2008-10-19 05:31:55 -0500 (Sun, 19 Oct 2008)

Log Message

More consistent variable and method names in steps behaviour.

Modified Paths


Diff

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

--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/StepsBehaviour.java	2008-10-19 10:05:51 UTC (rev 982)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/StepsBehaviour.java	2008-10-19 10:31:55 UTC (rev 983)
@@ -42,7 +42,7 @@
     	ensureThat(executableSteps.size(), equalTo(3));
     	
     	executableSteps.get(0).perform();
-    	ensureThat(steps.afterAll);
+    	ensureThat(steps.afterAny);
     	
     	executableSteps.get(1).perform();
     	ensureThat(steps.afterSuccess);
@@ -57,14 +57,14 @@
     	List<Step> executableSteps = steps.runAfterScenario();
     	
     	executableSteps.get(0).doNotPerform();
-    	ensureThat(steps.afterAll); // @AfterScenario can be run after all scenarios
+    	ensureThat(steps.afterAny); // @AfterScenario is run after scenarios of any outcome 
     	
 		executableSteps.get(1).doNotPerform();
-		ensureThat(!steps.afterSuccess);
+		ensureThat(!steps.afterSuccess); // @AfterScenario(uponOutcome=SUCCESS) is run after successful scenarios
 		
 		
 		executableSteps.get(2).perform();
-		ensureThat(!steps.afterUnsuccess);
+		ensureThat(!steps.afterUnsuccess); // @AfterScenario(uponOutcome=FAILURE) is run after unsuccessful scenarios
 	
     }
     
@@ -75,7 +75,7 @@
         private boolean then;
         
         private boolean before;
-        private boolean afterAll;
+        private boolean afterAny;
         private boolean afterSuccess;
         private boolean afterUnsuccess;
         
@@ -100,8 +100,8 @@
         }
         
         @org.jbehave.scenario.annotations.AfterScenario
-        public void afterAllScenarios() {
-        	afterAll = true;
+        public void afterAnyScenarios() {
+        	afterAny = true;
         }
         
         @org.jbehave.scenario.annotations.AfterScenario(uponOutcome=AfterScenario.Outcome.SUCCESS)


To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to