[jbehave-scm] [jbehave] [606] trunk/.settings: [dn] removed Outcome.setExpectationIn(World) - first stage of simplicating story runner

Fri, 01 Dec 2006 12:40:22 -0800

Title: [jbehave] [606] trunk/.settings: [dn] removed Outcome.setExpectationIn(World) - first stage of simplicating story runner
Revision
606
Author
tastapod
Date
2006-12-01 14:38:52 -0600 (Fri, 01 Dec 2006)

Log Message

[dn] removed Outcome.setExpectationIn(World) - first stage of simplicating story runner


Modified Paths




Removed Paths


    

  • trunk/core/src/behaviour/jbehave/core/story/visitor/
    • 

  • trunk/core/src/behaviour/mock/
    •

Diff

Modified: trunk/.settings/org.eclipse.jdt.core.prefs (605 => 606)

--- trunk/.settings/org.eclipse.jdt.core.prefs	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/.settings/org.eclipse.jdt.core.prefs	2006-12-01 20:38:52 UTC (rev 606)
@@ -1,12 +1,62 @@
-#Fri Jun 02 09:30:35 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.3
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=ignore
-org.eclipse.jdt.core.compiler.source=1.3
+#Fri Dec 01 20:29:19 GMT 2006
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=ignore
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=ignore
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.4

Modified: trunk/.settings/org.eclipse.jdt.ui.prefs (605 => 606)

--- trunk/.settings/org.eclipse.jdt.ui.prefs	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/.settings/org.eclipse.jdt.ui.prefs	2006-12-01 20:38:52 UTC (rev 606)
@@ -1,4 +1,4 @@
-#Fri Oct 28 13:50:20 BST 2005
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
+#Fri Dec 01 17:43:50 GMT 2006
+eclipse.preferences.version=1
+internal.default.compliance=user
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>

Modified: trunk/core/src/behaviour/jbehave/core/story/SimpleStory.java (605 => 606)

--- trunk/core/src/behaviour/jbehave/core/story/SimpleStory.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/core/src/behaviour/jbehave/core/story/SimpleStory.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -70,29 +70,17 @@
         }
     }
 
-    public static class PlainTextRendererShouldWork extends
-            OutcomeUsingMiniMock {
-        public void setExpectationIn(World world) {
-        }
-
+    public static class PlainTextRendererShouldWork extends OutcomeUsingMiniMock {
         public void verify(World world) {
         }
     }
 
-    public static class PlainTextRendererShouldStillWork extends
-            OutcomeUsingMiniMock {
-        public void setExpectationIn(World world) {
-        }
-
+    public static class PlainTextRendererShouldStillWork extends OutcomeUsingMiniMock {
         public void verify(World world) {
         }
     }
 
-    public static class BehaviourClassShouldNotFail extends
-            OutcomeUsingMiniMock {
-        public void setExpectationIn(World world) {
-        }
-
+    public static class BehaviourClassShouldNotFail extends OutcomeUsingMiniMock {
         public void verify(World world) {
         }
     }

Modified: trunk/core/src/behaviour/jbehave/core/story/domain/EventOutcomeStepBehaviour.java (605 => 606)

--- trunk/core/src/behaviour/jbehave/core/story/domain/EventOutcomeStepBehaviour.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/core/src/behaviour/jbehave/core/story/domain/EventOutcomeStepBehaviour.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -7,13 +7,12 @@
 
 public class EventOutcomeStepBehaviour extends UsingMiniMock {
 
-    public void shouldSetUpOutcomeThenMakeEventOccurThenVerifyOutcomeWhenPerformed() {
+    public void shouldMakeEventOccurThenVerifyOutcomeWhenPerformed() {
         Mock event = mock(Event.class);
         Mock outcome = mock(Outcome.class);
         World world = (World)stub(World.class);
         
-        outcome.expects("setExpectationIn").with(world);
-        event.expects("occurIn").with(world).after(outcome, "setExpectationIn");
+        event.expects("occurIn").with(world);
         outcome.expects("verify").with(world).after(event, "occurIn");
         
         EventOutcomeStep step = new EventOutcomeStep((Event)event, (Outcome)outcome);

Modified: trunk/core/src/behaviour/jbehave/core/story/domain/OutcomesBehaviour.java (605 => 606)

--- trunk/core/src/behaviour/jbehave/core/story/domain/OutcomesBehaviour.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/core/src/behaviour/jbehave/core/story/domain/OutcomesBehaviour.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -16,32 +16,7 @@
 	}
 	
 	protected Class componentType() { return Outcome.class; }
-	
-	public void shouldTellComponentsToSetExpectationsInWorld() throws Exception {
-		// given...
-		Mock component1 = mockComponent("component1");
-		Mock component2 = mockComponent("component2");
-		World world = (World)stub(World.class);
-		Outcome outcomes = new Outcomes(new Outcome[] {(Outcome) component1, (Outcome) component2});
-		
-		// do what a real Outcome would do
-		InvocationHandler dispatchItselfToRenderer = new InvocationHandler() {
-			public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-				((Renderer)args[0]).renderOutcome((Outcome)proxy);
-				return null;
-			}
-		};
-		component1.stubs("narrateTo").with(isA(Renderer.class)).will(dispatchItselfToRenderer);
-		component2.stubs("narrateTo").with(isA(Renderer.class)).will(dispatchItselfToRenderer);
-		
-		// expect...
-		component1.expects("setExpectationIn").with(world);
-		component2.expects("setExpectationIn").with(world).after(component1, "setExpectationIn");
 
-		// when...
-		outcomes.setExpectationIn(world);
-	}
-
 	public void shouldTellComponentsToVerifyWorld() throws Exception {
 		// given...
 		Mock component1 = mockComponent("component1");

Modified: trunk/core/src/behaviour/jbehave/core/story/domain/ScenarioUsingMiniMockBehaviour.java (605 => 606)

--- trunk/core/src/behaviour/jbehave/core/story/domain/ScenarioUsingMiniMockBehaviour.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/core/src/behaviour/jbehave/core/story/domain/ScenarioUsingMiniMockBehaviour.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -27,8 +27,7 @@
 
         // expect...
         given.expects("setUp").with(world);
-        outcome.expects("setExpectationIn").with(world).after(given, "setUp");
-        event.expects("occurIn").with(world).after(outcome, "setExpectationIn");
+        event.expects("occurIn").with(world).after(given, "setUp");
         outcome.expects("verify").with(world).after(event, "occurIn");
         
         // when...
@@ -71,7 +70,6 @@
     	};
     	
     	Outcome outcome = new OutcomeUsingMiniMock(){
-			public void setExpectationIn(World world) {}
 			public void verify(World world) {}
 		};

Modified: trunk/core/src/behaviour/jbehave/core/story/stories/outcomes/BartenderDeniesJoe.java (605 => 606)

--- trunk/core/src/behaviour/jbehave/core/story/stories/outcomes/BartenderDeniesJoe.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/core/src/behaviour/jbehave/core/story/stories/outcomes/BartenderDeniesJoe.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -5,14 +5,6 @@
 
 public class BartenderDeniesJoe extends OutcomeUsingMiniMock {
 
-    public void setExpectationIn(World world) {
-        // TODO Auto-generated method stub
-
-    }
-
     public void verify(World world) {
-        // TODO Auto-generated method stub
-
     }
-
 }

Modified: trunk/core/src/behaviour/jbehave/core/story/stories/outcomes/BartenderServesJoe.java (605 => 606)

--- trunk/core/src/behaviour/jbehave/core/story/stories/outcomes/BartenderServesJoe.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/core/src/behaviour/jbehave/core/story/stories/outcomes/BartenderServesJoe.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -4,15 +4,6 @@
 import jbehave.core.story.domain.World;
 
 public class BartenderServesJoe extends OutcomeUsingMiniMock {
-
-    public void setExpectationIn(World world) {
-        // TODO Auto-generated method stub
-
-    }
-
     public void verify(World world) {
-        // TODO Auto-generated method stub
-
     }
-
 }

Modified: trunk/core/src/behaviour/jbehave/core/story/stories/outcomes/JoeIsHappy.java (605 => 606)

--- trunk/core/src/behaviour/jbehave/core/story/stories/outcomes/JoeIsHappy.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/core/src/behaviour/jbehave/core/story/stories/outcomes/JoeIsHappy.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -4,15 +4,6 @@
 import jbehave.core.story.domain.World;
 
 public class JoeIsHappy extends OutcomeUsingMiniMock {
-
-    public void setExpectationIn(World world) {
-        // TODO Auto-generated method stub
-
-    }
-
     public void verify(World world) {
-        // TODO Auto-generated method stub
-
     }
-
 }

Modified: trunk/core/src/behaviour/jbehave/core/story/stories/outcomes/JoeIsUnhappy.java (605 => 606)

--- trunk/core/src/behaviour/jbehave/core/story/stories/outcomes/JoeIsUnhappy.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/core/src/behaviour/jbehave/core/story/stories/outcomes/JoeIsUnhappy.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -4,15 +4,6 @@
 import jbehave.core.story.domain.World;
 
 public class JoeIsUnhappy extends OutcomeUsingMiniMock {
-
-    public void setExpectationIn(World world) {
-        // TODO Auto-generated method stub
-
-    }
-
     public void verify(World world) {
-        // TODO Auto-generated method stub
-
     }
-
 }

Modified: trunk/core/src/java/jbehave/core/story/domain/EventOutcomeStep.java (605 => 606)

--- trunk/core/src/java/jbehave/core/story/domain/EventOutcomeStep.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/core/src/java/jbehave/core/story/domain/EventOutcomeStep.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -13,7 +13,6 @@
     }
 
     public void perform(World world) {
-        outcome.setExpectationIn(world);
         event.occurIn(world);
         outcome.verify(world);
     }

Modified: trunk/core/src/java/jbehave/core/story/domain/Outcome.java (605 => 606)

--- trunk/core/src/java/jbehave/core/story/domain/Outcome.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/core/src/java/jbehave/core/story/domain/Outcome.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -21,6 +21,5 @@
  * @see Outcomes
  */
 public interface Outcome extends ScenarioComponent {
-    void setExpectationIn(World world);
     void verify(World world);
 }
\ No newline at end of file

Modified: trunk/core/src/java/jbehave/core/story/domain/OutcomeUsingMiniMock.java (605 => 606)

--- trunk/core/src/java/jbehave/core/story/domain/OutcomeUsingMiniMock.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/core/src/java/jbehave/core/story/domain/OutcomeUsingMiniMock.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -19,7 +19,6 @@
  * @author <a href="" PROTECTED]">Dan North</a>
  */
 public abstract class OutcomeUsingMiniMock extends UsingMiniMock implements Outcome {
-    public abstract void setExpectationIn(World world);
     public abstract void verify(World world);
 	public void narrateTo(Renderer renderer) {
 		renderer.renderOutcome(this);

Modified: trunk/core/src/java/jbehave/core/story/domain/Outcomes.java (605 => 606)

--- trunk/core/src/java/jbehave/core/story/domain/Outcomes.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/core/src/java/jbehave/core/story/domain/Outcomes.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -33,12 +33,6 @@
         this(new Outcome[] {outcome1, outcome2, outcome3});
     }
     
-	public void setExpectationIn(final World world) {
-		for(int i = 0; i < outcomes.length; i++) {
-		    outcomes[i].setExpectationIn(world);
-        }
-	}
-
 	public void verify(final World world) {
         for(int i = 0; i < outcomes.length; i++) {
             outcomes[i].verify(world);
@@ -57,5 +51,4 @@
         buffer.append("]");
         return buffer.toString();
     }
-
 }

Modified: trunk/core/src/java/jbehave/core/story/domain/ScenarioUsingMiniMock.java (605 => 606)

--- trunk/core/src/java/jbehave/core/story/domain/ScenarioUsingMiniMock.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/core/src/java/jbehave/core/story/domain/ScenarioUsingMiniMock.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -63,8 +63,8 @@
  * @author <a href="" PROTECTED]">Elizabeth Keogh</a>
  */
 public class ScenarioUsingMiniMock extends UsingMiniMock implements Scenario {
-    protected final Given given;
-    protected final Step step;
+    protected Given given;
+    protected Step step;
     
     public ScenarioUsingMiniMock(Event event, Outcome outcome) {
         this(Givens.NULL, event, outcome);

Modified: trunk/examples/atm/src/stories/example/atm/outcomes/ATMShouldDispenseCash.java (605 => 606)

--- trunk/examples/atm/src/stories/example/atm/outcomes/ATMShouldDispenseCash.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/examples/atm/src/stories/example/atm/outcomes/ATMShouldDispenseCash.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -13,10 +13,6 @@
 
 
 public class ATMShouldDispenseCash extends OutcomeUsingMiniMock {
-    public void setExpectationIn(World world) {
-        
-    }
-    
     public void verify(World world) {
         // dispensed 20
     }

Modified: trunk/examples/atm/src/stories/example/atm/outcomes/ATMShouldRefuseCash.java (605 => 606)

--- trunk/examples/atm/src/stories/example/atm/outcomes/ATMShouldRefuseCash.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/examples/atm/src/stories/example/atm/outcomes/ATMShouldRefuseCash.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -14,9 +14,6 @@
 
 public class ATMShouldRefuseCash extends OutcomeUsingMiniMock {
 
-    public void setExpectationIn(World world) {
-    }
-    
     public void verify(World world) {
         // refuse cash
     }

Modified: trunk/examples/atm/src/stories/example/atm/outcomes/ATMShouldRetainBankCard.java (605 => 606)

--- trunk/examples/atm/src/stories/example/atm/outcomes/ATMShouldRetainBankCard.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/examples/atm/src/stories/example/atm/outcomes/ATMShouldRetainBankCard.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -13,10 +13,6 @@
 
 
 public class ATMShouldRetainBankCard extends OutcomeUsingMiniMock {
-    public void setExpectationIn(World world) {
-        throw new RuntimeException("oops");
-    }
-
     public void verify(World world) {
         // keep bank card
     }

Modified: trunk/examples/atm/src/stories/example/atm/outcomes/ATMShouldReturnBankCardToCustomer.java (605 => 606)

--- trunk/examples/atm/src/stories/example/atm/outcomes/ATMShouldReturnBankCardToCustomer.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/examples/atm/src/stories/example/atm/outcomes/ATMShouldReturnBankCardToCustomer.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -13,9 +13,6 @@
 
 
 public class ATMShouldReturnBankCardToCustomer extends OutcomeUsingMiniMock {
-    public void setExpectationIn(World world) {
-    }
-
     public void verify(World world) {
         // return bank card
     }

Modified: trunk/examples/atm/src/stories/example/atm/outcomes/AccountBalanceShouldBeReduced.java (605 => 606)

--- trunk/examples/atm/src/stories/example/atm/outcomes/AccountBalanceShouldBeReduced.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/examples/atm/src/stories/example/atm/outcomes/AccountBalanceShouldBeReduced.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -16,9 +16,6 @@
 /** balance = balance - 20 */
 public class AccountBalanceShouldBeReduced extends OutcomeUsingMiniMock {
 
-    public void setExpectationIn(World world) {
-    }
-    
     public void verify(World world) {
         Ensure.pending();
     }

Modified: trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheGlyphSegmentsShouldBecomeJunk.java (605 => 606)

--- trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheGlyphSegmentsShouldBecomeJunk.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheGlyphSegmentsShouldBecomeJunk.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -12,22 +12,15 @@
 import jbehave.core.story.domain.World;
 
 public class TheGlyphSegmentsShouldBecomeJunk extends HellboundOutcome {
-
-    private Segments expectedSegments;
-    private Color expectedColor;
-
-    public void setExpectationIn(World world) {
-        
-        expectedSegments = new Segments(
+    public void verifyAnyTimeIn(World world) {
+        Segments expectedSegments = new Segments(
                 new Segment(2, 11),
                 new Segment(3, 11),
                 new Segment(4, 11),
                 new Segment(3, 12)
         );
-        expectedColor = Hellbound.COLORMAP.getColorFor(GlyphType.JUNK);
-    }
-
-    public void verifyAnyTimeIn(World world) {
+        Color expectedColor = Hellbound.COLORMAP.getColorFor(GlyphType.JUNK);
+        
         RenderedPit pit = getPit(world);
         Ensure.that(pit, contains(expectedSegments, expectedColor));
     }

Modified: trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheGlyphShouldBeCentredAtTheTopOfThePit.java (605 => 606)

--- trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheGlyphShouldBeCentredAtTheTopOfThePit.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheGlyphShouldBeCentredAtTheTopOfThePit.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -11,22 +11,12 @@
 import com.sirenian.hellbound.gui.RenderedPit;
 import com.sirenian.hellbound.stories.WorldKey;
 
-public class TheGlyphShouldBeCentredAtTheTopOfThePit extends
-		HellboundOutcome {
-
-	private Segments expectedSegments;
-    private Color expectedColor;
-
-    public void setExpectationIn(World world) {
-		GlyphType type = GlyphType.T;
-		expectedSegments = type.getSegments(0).movedRight(3);
-        expectedColor = Hellbound.COLORMAP.getColorFor(GlyphType.T);
-	}
-
+public class TheGlyphShouldBeCentredAtTheTopOfThePit extends HellboundOutcome {
 	public void verifyAnyTimeIn(World world) {
+	    GlyphType type = GlyphType.T;
+	    Segments expectedSegments = type.getSegments(0).movedRight(3);
+	    Color expectedColor = Hellbound.COLORMAP.getColorFor(GlyphType.T);
 		RenderedPit graphics = (RenderedPit) world.get(WorldKey.PIT, null);
         Ensure.that(graphics, contains(expectedSegments, expectedColor));
 	}
-
-
 }

Modified: trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheGlyphShouldFallToTheBottom.java (605 => 606)

--- trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheGlyphShouldFallToTheBottom.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheGlyphShouldFallToTheBottom.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -12,21 +12,14 @@
 import com.sirenian.hellbound.gui.RenderedPit;
 
 public class TheGlyphShouldFallToTheBottom extends HellboundOutcome {
-
-    private Segments expectedSegments;
-	private Color expectedColor;
-
-	public void setExpectationIn(World world) {
-        expectedSegments = new Segments(
-        		new Segment(2, 11),
-        		new Segment(3, 11),
-        		new Segment(4, 11),
-        		new Segment(3, 12)
-        );
-        expectedColor = Hellbound.COLORMAP.getColorFor(GlyphType.T);
-    }
-
     public void verifyAnyTimeIn(World world) {
+        Segments expectedSegments = new Segments(
+                new Segment(2, 11),
+                new Segment(3, 11),
+                new Segment(4, 11),
+                new Segment(3, 12)
+        );
+        Color expectedColor = Hellbound.COLORMAP.getColorFor(GlyphType.T);
         RenderedPit pit = getPit(world);
         Ensure.that(pit, contains(expectedSegments, expectedColor));
     }

Modified: trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheGlyphShouldMoveDownwards.java (605 => 606)

--- trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheGlyphShouldMoveDownwards.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheGlyphShouldMoveDownwards.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -11,18 +11,10 @@
 import com.sirenian.hellbound.gui.RenderedPit;
 
 public class TheGlyphShouldMoveDownwards extends HellboundOutcome {
-
-    private Segments expectedSegments;
-	private Color expectedColor;
-    
-	public void setExpectationIn(World world) {
-        expectedSegments = T_SHAPE_AT_TOP.movedDown();
-        expectedColor = Hellbound.COLORMAP.getColorFor(GlyphType.T);
-	}
-
 	public void verifyAnyTimeIn(World world) {
+	    Segments expectedSegments = T_SHAPE_AT_TOP.movedDown();
+	    Color expectedColor = Hellbound.COLORMAP.getColorFor(GlyphType.T);
         RenderedPit pit = getPit(world);
         Ensure.that(pit, contains(expectedSegments, expectedColor));
 	}
-
 }

Modified: trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheGlyphShouldMoveRight.java (605 => 606)

--- trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheGlyphShouldMoveRight.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheGlyphShouldMoveRight.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -10,18 +10,10 @@
 import com.sirenian.hellbound.stories.WorldKey;
 
 public class TheGlyphShouldMoveRight extends HellboundOutcome {
-
-    private Segments expectedSegments;
-    private Color expectedColor;
-
-    public void setExpectationIn(World world) {
-        expectedSegments = T_SHAPE_AT_TOP.movedRight();
-        expectedColor =  Hellbound.COLORMAP.getColorFor(GlyphType.T);
-    }
-    
     protected void verifyAnyTimeIn(World world) {
+        Segments expectedSegments = T_SHAPE_AT_TOP.movedRight();
+        Color expectedColor =  Hellbound.COLORMAP.getColorFor(GlyphType.T);
         Object pit = world.get(WorldKey.PIT);
         ensureThat(pit, contains(expectedSegments, expectedColor));
     }
-
 }

Modified: trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheGlyphShouldTurnToOneQuarter.java (605 => 606)

--- trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheGlyphShouldTurnToOneQuarter.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheGlyphShouldTurnToOneQuarter.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -3,15 +3,6 @@
 import jbehave.core.story.domain.World;
 
 public class TheGlyphShouldTurnToOneQuarter extends HellboundOutcome {
-
     protected void verifyAnyTimeIn(World world) {
-        // TODO Auto-generated method stub
-
     }
-
-    public void setExpectationIn(World world) {
-        // TODO Auto-generated method stub
-
-    }
-
 }

Modified: trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheGlyphTurnsToThreeQuarters.java (605 => 606)

--- trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheGlyphTurnsToThreeQuarters.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheGlyphTurnsToThreeQuarters.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -3,15 +3,6 @@
 import jbehave.core.story.domain.World;
 
 public class TheGlyphTurnsToThreeQuarters extends HellboundOutcome {
-
     protected void verifyAnyTimeIn(World world) {
-        // TODO Auto-generated method stub
-
     }
-
-    public void setExpectationIn(World world) {
-        // TODO Auto-generated method stub
-
-    }
-
 }

Modified: trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheGlyphTurnsToTwoQuarters.java (605 => 606)

--- trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheGlyphTurnsToTwoQuarters.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheGlyphTurnsToTwoQuarters.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -3,15 +3,6 @@
 import jbehave.core.story.domain.World;
 
 public class TheGlyphTurnsToTwoQuarters extends HellboundOutcome {
-
     protected void verifyAnyTimeIn(World world) {
-        // TODO Auto-generated method stub
-
     }
-
-    public void setExpectationIn(World world) {
-        // TODO Auto-generated method stub
-
-    }
-
 }

Modified: trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheHeartbeatShouldBeSkipped.java (605 => 606)

--- trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheHeartbeatShouldBeSkipped.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheHeartbeatShouldBeSkipped.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -6,9 +6,6 @@
 import jbehave.core.story.domain.World;
 
 public class TheHeartbeatShouldBeSkipped extends HellboundOutcome {
-
-    public void setExpectationIn(World world) {}
-    
     protected void verifyAnyTimeIn(World world) {       
         ForcedHeartbeat heartbeat = (ForcedHeartbeat) world.get(WorldKey.HEARTBEAT);
         ensureThat(heartbeat.wasSkipped());

Modified: trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheNextGlyphShouldAppear.java (605 => 606)

--- trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheNextGlyphShouldAppear.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/examples/hellbound/src/stories/com/sirenian/hellbound/outcomes/TheNextGlyphShouldAppear.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -4,15 +4,6 @@
 
 
 public class TheNextGlyphShouldAppear extends HellboundOutcome {
-
-    public void setExpectationIn(World world) {
-        // TODO Auto-generated method stub
-
-    }
-
     public void verifyAnyTimeIn(World world) {
-        // TODO Auto-generated method stub
-
     }
-
 }

Modified: trunk/examples/hellbound/src/stories/com/sirenian/hellbound/scenarios/TheGlyphShouldFallOntoTheJunk.java (605 => 606)

--- trunk/examples/hellbound/src/stories/com/sirenian/hellbound/scenarios/TheGlyphShouldFallOntoTheJunk.java	2006-12-01 20:03:40 UTC (rev 605)
+++ trunk/examples/hellbound/src/stories/com/sirenian/hellbound/scenarios/TheGlyphShouldFallOntoTheJunk.java	2006-12-01 20:38:52 UTC (rev 606)
@@ -5,14 +5,6 @@
 import com.sirenian.hellbound.outcomes.HellboundOutcome;
 
 public class TheGlyphShouldFallOntoTheJunk extends HellboundOutcome {
-
-    public void setExpectationIn(World world) {
-        
-    }
-    
     protected void verifyAnyTimeIn(World world) {
-        // TODO Auto-generated method stub
-
     }
-
 }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to