refactored DefaultMethodNameStepScanner & MethodNameMatcher

Author: MehdiK

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

@@ -5,25 +5,22 @@ namespace TestStack.BDDfy
     public class DefaultMethodNameStepScanner : MethodNameStepScanner
     {
         public DefaultMethodNameStepScanner()
-            : base(CleanupTheStepText,
-                new[]
-                {
-                    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),
-                    new MethodNameMatcher(s => s.StartsWith("When", StringComparison.OrdinalIgnoreCase), false, ExecutionOrder.Transition, true),
-                    new MethodNameMatcher(s => s.StartsWith("AndWhen", StringComparison.OrdinalIgnoreCase), false, ExecutionOrder.ConsecutiveTransition, true),
-                    new MethodNameMatcher(s => s.StartsWith("And_When_", StringComparison.OrdinalIgnoreCase), false, ExecutionOrder.ConsecutiveTransition, true),
-                    new MethodNameMatcher(s => s.StartsWith("Then", StringComparison.OrdinalIgnoreCase), true, ExecutionOrder.Assertion, true),
-                    new MethodNameMatcher(s => s.StartsWith("And", StringComparison.OrdinalIgnoreCase), true, ExecutionOrder.ConsecutiveAssertion, true),
-                    new MethodNameMatcher(s => s.StartsWith("AndThen", StringComparison.OrdinalIgnoreCase), true, ExecutionOrder.ConsecutiveAssertion, true),
-                    new MethodNameMatcher(s => s.StartsWith("And_Then_", StringComparison.OrdinalIgnoreCase), true, ExecutionOrder.ConsecutiveAssertion, true),
-                    new MethodNameMatcher(s => s.StartsWith("But", StringComparison.OrdinalIgnoreCase), true, ExecutionOrder.ConsecutiveAssertion, true),
-                    new MethodNameMatcher(s => s.StartsWith("TearDown", StringComparison.OrdinalIgnoreCase), false, ExecutionOrder.TearDown, false)
-                })
+            : base(CleanupTheStepText)
         {
+            AddMatcher(new MethodNameMatcher(s => s.EndsWith("Context", StringComparison.OrdinalIgnoreCase), ExecutionOrder.Initialize) { ShouldReport = false });
+            AddMatcher(new MethodNameMatcher(s => s.Equals("Setup", StringComparison.OrdinalIgnoreCase), ExecutionOrder.Initialize) { ShouldReport = false });
+            AddMatcher(new MethodNameMatcher(s => s.StartsWith("Given", StringComparison.OrdinalIgnoreCase), ExecutionOrder.SetupState));
+            AddMatcher(new MethodNameMatcher(s => s.StartsWith("AndGiven", StringComparison.OrdinalIgnoreCase), ExecutionOrder.ConsecutiveSetupState));
+            AddMatcher(new MethodNameMatcher(s => s.StartsWith("And_Given_", StringComparison.OrdinalIgnoreCase), ExecutionOrder.ConsecutiveSetupState));
+            AddMatcher(new MethodNameMatcher(s => s.StartsWith("When", StringComparison.OrdinalIgnoreCase), ExecutionOrder.Transition));
+            AddMatcher(new MethodNameMatcher(s => s.StartsWith("AndWhen", StringComparison.OrdinalIgnoreCase), ExecutionOrder.ConsecutiveTransition));
+            AddMatcher(new MethodNameMatcher(s => s.StartsWith("And_When_", StringComparison.OrdinalIgnoreCase), ExecutionOrder.ConsecutiveTransition));
+            AddMatcher(new MethodNameMatcher(s => s.StartsWith("Then", StringComparison.OrdinalIgnoreCase), ExecutionOrder.Assertion) { Asserts = true });
+            AddMatcher(new MethodNameMatcher(s => s.StartsWith("And", StringComparison.OrdinalIgnoreCase), ExecutionOrder.ConsecutiveAssertion) { Asserts = true });
+            AddMatcher(new MethodNameMatcher(s => s.StartsWith("AndThen", StringComparison.OrdinalIgnoreCase), ExecutionOrder.ConsecutiveAssertion) { Asserts = true });
+            AddMatcher(new MethodNameMatcher(s => s.StartsWith("And_Then_", StringComparison.OrdinalIgnoreCase), ExecutionOrder.ConsecutiveAssertion) { Asserts = true });
+            AddMatcher(new MethodNameMatcher(s => s.StartsWith("But", StringComparison.OrdinalIgnoreCase), ExecutionOrder.ConsecutiveAssertion) { Asserts = true });
+            AddMatcher(new MethodNameMatcher(s => s.StartsWith("TearDown", StringComparison.OrdinalIgnoreCase), ExecutionOrder.TearDown) { ShouldReport = false });
         }
 
         static string CleanupTheStepText(string stepText)

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

@@ -5,16 +5,23 @@ namespace TestStack.BDDfy
     public class MethodNameMatcher
     {
         public MethodNameMatcher(Predicate<string> isMethodOfInterest, bool asserts, ExecutionOrder executionOrder, bool shouldReport)
+            : this(isMethodOfInterest, executionOrder)
         {
-            IsMethodOfInterest = isMethodOfInterest;
             Asserts = asserts;
-            ExecutionOrder = executionOrder;
             ShouldReport = shouldReport;
         }
 
+        public MethodNameMatcher(Predicate<string> isMethodOfInterest, ExecutionOrder executionOrder)
+        {
+            IsMethodOfInterest = isMethodOfInterest;
+            ExecutionOrder = executionOrder;
+            Asserts = false;
+            ShouldReport = true;
+        }
+
         public Predicate<string> IsMethodOfInterest { get; private set; }
-        public bool Asserts { get; private set; }
-        public bool ShouldReport { get; private set; }
+        public bool Asserts { get; set; }
+        public bool ShouldReport { get; set; }
         public ExecutionOrder ExecutionOrder { get; private set; }
     }
 }

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

@@ -38,12 +38,23 @@ namespace TestStack.BDDfy
     public class MethodNameStepScanner : IStepScanner
     {
         private readonly Func<string, string> _stepTextTransformer;
-        private readonly MethodNameMatcher[] _matchers;
+        private readonly List<MethodNameMatcher> _matchers;
 
         public MethodNameStepScanner(Func<string, string> stepTextTransformer, params MethodNameMatcher[] matchers)
         {
             _stepTextTransformer = stepTextTransformer;
-            _matchers = matchers;
+            _matchers = matchers.ToList();
+        }
+
+        public MethodNameStepScanner(Func<string, string> stepTextTransformer)
+        {
+            _stepTextTransformer = stepTextTransformer;
+            _matchers = new List<MethodNameMatcher>();
+        }
+
+        protected void AddMatcher(MethodNameMatcher matcher)
+        {
+            _matchers.Add(matcher);
         }
 
         public IEnumerable<Step> Scan(ITestContext testContext, MethodInfo method)