Added ExecutionOrder.Initialize to distinguish Context/Setup from Given

Author: mwhelan

TestStack.BDDfy.Tests/Scanner/WhenTestClassFollowsGivenWhenThenNamingConvention.cs

@@ -15,6 +15,8 @@ public class WhenTestClassFollowsGivenWhenThenNamingConvention
 
         private class TypeWithoutAttribute
         {
+            public void EstablishContext() {}
+            public void Setup(){} 
             public void AndThenAnotherThingIsTrue() {}
             public void AndWhenSomethingElseHappens() {}
             public void And_When_another_THING_Happens() {}
@@ -41,7 +43,7 @@ public void Setup()
         [Test]
         public void AllMethodsFollowingTheNamingConventionAreReturnedAsSteps()
         {
-            Assert.That(_steps.Count, Is.EqualTo(14));
+            Assert.That(_steps.Count, Is.EqualTo(16));
         }
 
         private static void AssertStep(ExecutionStep step, string stepTitle, ExecutionOrder order, bool asserts = false, bool shouldReport = true)
@@ -53,87 +55,99 @@ private static void AssertStep(ExecutionStep step, string stepTitle, ExecutionOr
         }
 
         [Test]
-        public void GivenIsReturnedFirst()
+        public void EndsWithContext_IsReturnedFirst()
         {
-            AssertStep(_steps[0], "Given some state", ExecutionOrder.SetupState);
+            AssertStep(_steps[0], "Establish context", ExecutionOrder.Initialize, false, false);
+        }
+
+        [Test]
+        public void Setup_IsReturnedSecond()
+        {
+            AssertStep(_steps[1], "Setup", ExecutionOrder.Initialize, false, false);
+        }
+
+        [Test]
+        public void Given_IsTurnedIntoA_Given_Step()
+        {
+            AssertStep(_steps[2], "Given some state", ExecutionOrder.SetupState);
         }
 
         [Test]
         public void AndGiven_IsTurnedIntoAn_AndGiven_Step()
         {
-            AssertStep(_steps[1], "And another state", ExecutionOrder.ConsecutiveSetupState);
+            AssertStep(_steps[3], "And another state", ExecutionOrder.ConsecutiveSetupState);
         }
 
         [Test]
         public void And_Given_IsTurnedIntoAn_AndGiven_Step()
         {
-            AssertStep(_steps[2], "And Some OTHER state", ExecutionOrder.ConsecutiveSetupState);
+            AssertStep(_steps[4], "And Some OTHER state", ExecutionOrder.ConsecutiveSetupState);
         }
 
         [Test]
         public void AndGiven_InAnUnderscoredMethod_IsTurnedIntoAn_AndGiven_Step()
         {
-            AssertStep(_steps[3], "And some other initial state", ExecutionOrder.ConsecutiveSetupState);
+            AssertStep(_steps[5], "And some other initial state", ExecutionOrder.ConsecutiveSetupState);
         }
 
         [Test]
         public void WhenIsReturnedAfterGivens()
         {
-            AssertStep(_steps[4], "When something happens", ExecutionOrder.Transition);
+            AssertStep(_steps[6], "When something happens", ExecutionOrder.Transition);
         }
 
         [Test]
         public void AndWhenIsTurnedIntoAn_AndWhen_Step()
         {
-            AssertStep(_steps[5], "And something else happens", ExecutionOrder.ConsecutiveTransition);
+            AssertStep(_steps[7], "And something else happens", ExecutionOrder.ConsecutiveTransition);
         }
 
         [Test]
         public void And_When_IsTurnedIntoAn_AndWhen_Step()
         {
-            AssertStep(_steps[6], "And another THING Happens", ExecutionOrder.ConsecutiveTransition);
+            AssertStep(_steps[8], "And another THING Happens", ExecutionOrder.ConsecutiveTransition);
         }
 
         [Test]
         public void ThenIsReturnedAfterWhens()
         {
-            AssertStep(_steps[7], "Then something is true", ExecutionOrder.Assertion, true);
+            AssertStep(_steps[9], "Then something is true", ExecutionOrder.Assertion, true);
         }
 
         [Test]
         public void AndThen_IsReturnedAsAn_AndThen_StepAfterThen()
         {
-            AssertStep(_steps[8], "And another thing is true", ExecutionOrder.ConsecutiveAssertion, true);
+            AssertStep(_steps[10], "And another thing is true", ExecutionOrder.ConsecutiveAssertion, true);
         }
 
         [Test]
         public void And_IsReturnedAsAn_AndThen_Step()
         {
-            AssertStep(_steps[9], "And something else too", ExecutionOrder.ConsecutiveAssertion, true);
+            AssertStep(_steps[11], "And something else too", ExecutionOrder.ConsecutiveAssertion, true);
         }
 
         [Test]
         public void And_IsReturnedAsAn_AndThen_WithTheRightCasing()
         {
-            AssertStep(_steps[10], "And YET another thing", ExecutionOrder.ConsecutiveAssertion, true);
+            AssertStep(_steps[12], "And YET another thing", ExecutionOrder.ConsecutiveAssertion, true);
         }
 
         [Test]
         public void AndThen_IsReturnedAsAn_AndThen_WithUnderscoredMethodName()
         {
-            AssertStep(_steps[11], "And something else", ExecutionOrder.ConsecutiveAssertion, true);
+            AssertStep(_steps[13], "And something else", ExecutionOrder.ConsecutiveAssertion, true);
         }
 
         [Test]
         public void And_Then_IsReturnedAsAn_AndThen_WithUnderscoredMethodName()
         {
-            AssertStep(_steps[12], "And there was that one time", ExecutionOrder.ConsecutiveAssertion, true);
+            AssertStep(_steps[14], "And there was that one time", ExecutionOrder.ConsecutiveAssertion, true);
         }
 
         [Test]
         public void TearDownMethodIsReturnedInTheCorrectSpot()
         {
-            AssertStep(_steps[13], "Tear down", ExecutionOrder.TearDown, asserts:false, shouldReport:false);
+            AssertStep(_steps[15], "Tear down", ExecutionOrder.TearDown, asserts:false, shouldReport:false);
         }
     }
 }

TestStack.BDDfy/Core/ExecutionOrder.cs

@@ -27,12 +27,13 @@ namespace TestStack.BDDfy.Core
 {
     public enum ExecutionOrder
     {
-        SetupState = 1,
-        ConsecutiveSetupState = 2,
-        Transition = 3,
-        ConsecutiveTransition = 4,
-        Assertion = 5,
-        ConsecutiveAssertion = 6,
-        TearDown = 7
+        Initialize = 1,
+        SetupState = 2,
+        ConsecutiveSetupState = 3,
+        Transition = 4,
+        ConsecutiveTransition = 5,
+        Assertion = 6,
+        ConsecutiveAssertion = 7,
+        TearDown = 8
     }
 }

TestStack.BDDfy/Scanners/StepScanners/MethodName/DefaultMethodNameStepScanner.cs

@@ -35,8 +35,8 @@ public DefaultMethodNameStepScanner()
                 CleanupTheStepText,
                 new[]
                 {
-                    new MethodNameMatcher(s => s.EndsWith("Context", StringComparison.OrdinalIgnoreCase), false, ExecutionOrder.SetupState, false),
-                    new MethodNameMatcher(s => s.Equals("Setup", StringComparison.OrdinalIgnoreCase), false, ExecutionOrder.SetupState, false),
+                    new MethodNameMatcher(s => s.EndsWith("Context", StringComparison.OrdinalIgnoreCase), false, ExecutionOrder.Initialize, false),
+                    new MethodNameMatcher(s => s.Equals("Setup", StringComparison.OrdinalIgnoreCase), false, ExecutionOrder.Initialize, false),
                     new MethodNameMatcher(s => s.StartsWith("Given", StringComparison.OrdinalIgnoreCase), false, ExecutionOrder.SetupState, true),
                     new MethodNameMatcher(s => s.StartsWith("AndGiven", StringComparison.OrdinalIgnoreCase), false, ExecutionOrder.ConsecutiveSetupState, true),
                     new MethodNameMatcher(s => s.StartsWith("And_Given_", StringComparison.OrdinalIgnoreCase), false, ExecutionOrder.ConsecutiveSetupState, true),