added But ExecAttr & refactored exec attr tests

Author: MehdiK

TestStack.BDDfy.Tests/Scanner/WhenTestClassUsesExecutableAttributes.cs

@@ -42,6 +42,9 @@ public void AndThen() { }
 
             [AndGiven]
             public void SomeOtherPartOfTheGiven() { }
+
+            [But]
+            public void IDontWantThisToBeTrue() { }
         }
 
         [SetUp]
@@ -59,166 +62,69 @@ private static string GetStepTextFromMethodName(Action methodInfoAction)
         [Test]
         public void DecoratedMethodsAreReturned()
         {
-            Assert.That(_steps.Count, Is.EqualTo(7));
-        }
-
-        Step GivenStep
-        {
-            get
-            {
-                return _steps.Single(s => s.Title == "Given");
-            }
-        }
-
-        [Test]
-        public void GivenStep_IsFoundAsSetupState()
-        {
-            Assert.That(GivenStep.ExecutionOrder, Is.EqualTo(ExecutionOrder.SetupState));
-        }
-
-        [Test]
-        public void GivenStep_DoesNotAssert()
-        {
-            Assert.IsFalse(GivenStep.Asserts);
-        }
-
-        [Test]
-        public void GivenStep_TextIsFetchedFromMethodName()
-        {
-            Assert.That(GivenStep.Title.Trim(), Is.EqualTo(GetStepTextFromMethodName(_typeWithAttribute.Given)));
-        }
-
-        Step AndGivenStep
-        {
-            get
-            {
-                return _steps.Single(s => s.Title.Trim() == "Some other part of the given");
-            }
-        }
-
-        [Test]
-        public void AndGivenIsFoundAsConsequtiveSetupState()
-        {
-            Assert.That(AndGivenStep.ExecutionOrder, Is.EqualTo(ExecutionOrder.ConsecutiveSetupState));
-        }
-
-        [Test]
-        public void AndGivenStepDoesNotAssert()
-        {
-            Assert.IsFalse(AndGivenStep.Asserts);
-        }
-
-        [Test]
-        public void AndGivenStepTextIsFetchedFromMethodName()
-        {
-            Assert.That(AndGivenStep.Title.Trim(), Is.EqualTo(GetStepTextFromMethodName(_typeWithAttribute.SomeOtherPartOfTheGiven)));
-        }
-
-        Step WhenStep
-        {
-            get
-            {
-                return _steps.Single(s => s.Title == TypeWithAttribute.MethodTextForWhenSomethingHappens);
-            }
-        }
-
-        [Test]
-        public void WhenStep_IsFoundAsTransitionStep()
-        {
-            Assert.That(WhenStep.ExecutionOrder, Is.EqualTo(ExecutionOrder.Transition));
-        }
-
-        [Test]
-        public void WhenStep_StepTextIsFetchedFromExecutableAttribute()
-        {
-            Assert.That(WhenStep.Title, Is.EqualTo(TypeWithAttribute.MethodTextForWhenSomethingHappens));
+            Assert.That(_steps.Count, Is.EqualTo(8));
         }
 
         [Test]
-        public void WhenStep_StepDoesNotAssert()
-        {
-            Assert.IsFalse(WhenStep.Asserts);
-        }
-
-        Step TheOtherPartOfWhenStep
+        public void Given()
         {
-            get
-            {
-                return _steps.Single(s => s.Title.Trim() == "The other part of when");
-            }
+            var givenStep = _steps.Single(s => s.Title == "Given"); 
+            Assert.That(givenStep.ExecutionOrder, Is.EqualTo(ExecutionOrder.SetupState));
+            Assert.IsFalse(givenStep.Asserts);
+            Assert.That(givenStep.Title.Trim(), Is.EqualTo(GetStepTextFromMethodName(_typeWithAttribute.Given)));
         }
 
         [Test]
-        public void TheOtherPartOfWhenStep_IsFoundAsConsecutiveTransition()
+        public void AndGiven()
         {
-            Assert.That(TheOtherPartOfWhenStep.ExecutionOrder, Is.EqualTo(ExecutionOrder.ConsecutiveTransition));
+            var step = _steps.Single(s => s.Title.Trim() == "Some other part of the given");
+            Assert.That(step.ExecutionOrder, Is.EqualTo(ExecutionOrder.ConsecutiveSetupState));
+            Assert.IsFalse(step.Asserts);
+            Assert.That(step.Title.Trim(), Is.EqualTo(GetStepTextFromMethodName(_typeWithAttribute.SomeOtherPartOfTheGiven)));
         }
 
         [Test]
-        public void TheOtherPartOfWhenStep_StepTextIsFetchedFromMethodName()
+        public void When()
         {
-            Assert.That(TheOtherPartOfWhenStep.Title.Trim(), Is.EqualTo(GetStepTextFromMethodName(_typeWithAttribute.TheOtherPartOfWhen)));
+            var step = _steps.Single(s => s.Title == TypeWithAttribute.MethodTextForWhenSomethingHappens);
+            Assert.That(step.ExecutionOrder, Is.EqualTo(ExecutionOrder.Transition));
+            Assert.That(step.Title, Is.EqualTo(TypeWithAttribute.MethodTextForWhenSomethingHappens));
+            Assert.IsFalse(step.Asserts);
         }
 
         [Test]
-        public void TheOtherPartOfWhenStep_StepDoesNotAssert()
+        public void TheOtherPartOfWhen()
         {
-            Assert.IsFalse(TheOtherPartOfWhenStep.Asserts);
+            var step = _steps.Single(s => s.Title.Trim() == "The other part of when");
+            Assert.That(step.ExecutionOrder, Is.EqualTo(ExecutionOrder.ConsecutiveTransition));
+            Assert.That(step.Title.Trim(), Is.EqualTo(GetStepTextFromMethodName(_typeWithAttribute.TheOtherPartOfWhen)));
+            Assert.IsFalse(step.Asserts);
         }
 
         [Test]
-        public void ThenStepsAreReturnedAsAssertingSteps()
+        public void ThenStepsWithArgs()
         {
-            var steps = ThenSteps.ToList();
+            var steps = _steps.Where(s => s.Title == "Then 1, 2" || s.Title == "Then 3, 4").ToList();
             Assert.IsTrue(steps.All(s => s.ExecutionOrder == ExecutionOrder.Assertion));
-        }
-
-        IEnumerable<Step> ThenSteps
-        {
-            get
-            {
-                return _steps.Where(s => s.Title == "Then 1, 2" || s.Title == "Then 3, 4");
-            }
-        }
-
-        [Test]
-        public void ThenSteps_DoAssert()
-        {
-            var steps = ThenSteps.ToList();
-            Assert.True(steps.All(s => s.Asserts));
-        }
-
-        [Test]        
-        public void ThenSteps_StepTextIsFetchedFromMethodNamePostfixedWithArguments()
-        {
-            var steps = ThenSteps.ToList();
+            Assert.IsTrue(steps.All(s => s.Asserts));
             Assert.IsTrue(steps.All(s => s.Title.EndsWith(" 1, 2") || s.Title.EndsWith(" 3, 4")));
         }
 
-        Step AndThenStep
-        {
-            get
-            {
-                return _steps.Single(s => s.Title.Trim() == TypeWithAttribute.MethodTextForAndThen);
-            }
-        }
-
-        [Test]
-        public void AndThenStep_IsFoundAndConsecutiveAssertingStep()
-        {
-            Assert.That(AndThenStep.ExecutionOrder, Is.EqualTo(ExecutionOrder.ConsecutiveAssertion));
-        }
-
         [Test]
-        public void AndThenStep_Asserts()
+        public void AndThen()
         {
-            Assert.IsTrue(AndThenStep.Asserts);
+            var step = _steps.Single(s => s.Title.Trim() == TypeWithAttribute.MethodTextForAndThen);
+            Assert.That(step.ExecutionOrder, Is.EqualTo(ExecutionOrder.ConsecutiveAssertion));
+            Assert.IsTrue(step.Asserts);
+            Assert.That(step.Title.Trim(), Is.EqualTo(TypeWithAttribute.MethodTextForAndThen));
         }
 
         [Test]
-        public void AndThenStep_StepTextIsFetchedFromExecutableAttribute()
+        public void But()
         {
-            Assert.That(AndThenStep.Title.Trim(), Is.EqualTo(TypeWithAttribute.MethodTextForAndThen));
+            var step = _steps.Single(s => s.Title == "I dont want this to be true");
+            Assert.That(step.ExecutionOrder, Is.EqualTo(ExecutionOrder.ConsecutiveAssertion));
+            Assert.IsTrue(step.Asserts);
         }
     }
 }

TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/ButAttribute.cs

@@ -0,0 +1,12 @@
+namespace TestStack.BDDfy
+{
+    public class ButAttribute : ExecutableAttribute
+    {
+        public ButAttribute() : this(null) { }
+
+        public ButAttribute(string stepTitle) : base(ExecutionOrder.ConsecutiveAssertion, stepTitle)
+        {
+            Asserts = true;
+        }
+    }
+}

TestStack.BDDfy/TestStack.BDDfy.csproj

@@ -115,6 +115,7 @@
     <Compile Include="Scanners\StepScanners\Examples\ExampleTable.cs" />
     <Compile Include="Scanners\StepScanners\Examples\ExampleValue.cs" />
     <Compile Include="Scanners\StepScanners\Examples\UnassignableExampleException.cs" />
+    <Compile Include="Scanners\StepScanners\ExecutableAttribute\GwtAttributes\ButAttribute.cs" />
     <Compile Include="Scanners\StepScanners\WithTagsExtensions.cs" />
     <Compile Include="Scanners\StepScanners\Fluent\FluentApi.cs">
       <AutoGen>True</AutoGen>