Allow step title placeholders when matching variable is passed in as well as the parameter name matching

Jake Ginnivan · Jake Ginnivan · commit 2c4b919691b8 · 2014-05-02T22:14:03.000+01:00
diff --git a/TestStack.BDDfy.Tests/Processors/TestRunnerTests.cs b/TestStack.BDDfy.Tests/Processors/TestRunnerTests.cs
@@ -14,11 +14,11 @@ public class TestRunnerTests
         [Test]
         public void InitialisesScenarioWithExampleBeforeRunning()
         {
-            const int ExpectedValue = 1;
+            const int expectedValue = 1;
             int actualValue = 0;
             var exampleTable = new ExampleTable("ExampleValue")
             {
-                ExpectedValue
+                expectedValue
             }.Single();
 
             var sut = new TestRunner();
@@ -31,7 +31,7 @@ public void InitialisesScenarioWithExampleBeforeRunning()
 
             sut.Process(story);
 
-            Assert.AreEqual(ExpectedValue, actualValue);
+            Assert.AreEqual(expectedValue, actualValue);
         }
     }
 }
diff --git a/TestStack.BDDfy.Tests/Scanner/FluentScanner/FluentWithExamples.cs b/TestStack.BDDfy.Tests/Scanner/FluentScanner/FluentWithExamples.cs
@@ -32,9 +32,9 @@ public void FluentCanBeUsedWithExamples()
             Approvals.Verify(textReporter.ToString());
         }
 
-        private void GivenIntWithValue(int inlineVariable)
+        private void GivenIntWithValue(int differentName)
         {
-            inlineVariable.ShouldBeOneOf(1, 2);
+            differentName.ShouldBeOneOf(1, 2);
         }
 
         [Test]
diff --git a/TestStack.BDDfy/Processors/ScenarioExecutor.cs b/TestStack.BDDfy/Processors/ScenarioExecutor.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using System.Linq;
 using System.Reflection;
-using System.Web.Compilation;
 
 namespace TestStack.BDDfy.Processors
 {
diff --git a/TestStack.BDDfy/Scanners/StepScanners/Examples/ExampleTable.cs b/TestStack.BDDfy/Scanners/StepScanners/Examples/ExampleTable.cs
@@ -86,6 +86,9 @@ static object[] GetValues(string row)
 
         public static bool HeaderMatches(string header, string name)
         {
+            if (name == null)
+                return false;
+
             return Sanitise(name).Equals(Sanitise(header), StringComparison.InvariantCultureIgnoreCase);
         }
 
diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScanner.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScanner.cs
@@ -147,18 +147,19 @@ private StepTitle CreateTitle(string stepTextTemplate, bool includeInputsInStepT
                     {
                         var parameters = methodInfo.GetParameters();
                         var stringFlatInputs =
-                            flatInputArray
+                            inputArguments
                                 .Select((a, i) => new { ParameterName = parameters[i].Name, Value = a })
                                 .Select(i =>
                                 {
                                     if (_testContext.Examples != null)
                                     {
-
-                                        var matchingHeader = _testContext.Examples.Headers.SingleOrDefault(header => ExampleTable.HeaderMatches(header, i.ParameterName));
+                                        var matchingHeader = _testContext.Examples.Headers
+                                            .SingleOrDefault(header => ExampleTable.HeaderMatches(header, i.ParameterName) ||
+                                            ExampleTable.HeaderMatches(header, i.Value.Name));
                                         if (matchingHeader != null)
                                             return string.Format("<{0}>", matchingHeader);
                                     }
-                                    return i.Value.ToString();
+                                    return i.Value.Value.FlattenArray();
                                 })
                                 .ToArray();
                         stepTitle = stepTitle + " " + string.Join(", ", stringFlatInputs);

Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,11 @@ public class TestRunnerTests`
`14`	`14`	`[Test]`
`15`	`15`	`public void InitialisesScenarioWithExampleBeforeRunning()`
`16`	`16`	`{`
`17`		`- const int ExpectedValue = 1;`
	`17`	`+ const int expectedValue = 1;`
`18`	`18`	`int actualValue = 0;`
`19`	`19`	`var exampleTable = new ExampleTable("ExampleValue")`
`20`	`20`	`{`
`21`		`- ExpectedValue`
	`21`	`+ expectedValue`
`22`	`22`	`}.Single();`
`23`	`23`
`24`	`24`	`var sut = new TestRunner();`
`@@ -31,7 +31,7 @@ public void InitialisesScenarioWithExampleBeforeRunning()`
`31`	`31`
`32`	`32`	`sut.Process(story);`
`33`	`33`
`34`		`- Assert.AreEqual(ExpectedValue, actualValue);`
	`34`	`+ Assert.AreEqual(expectedValue, actualValue);`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,9 @@ public void FluentCanBeUsedWithExamples()`
`32`	`32`	`Approvals.Verify(textReporter.ToString());`
`33`	`33`	`}`
`34`	`34`
`35`		`- private void GivenIntWithValue(int inlineVariable)`
	`35`	`+ private void GivenIntWithValue(int differentName)`
`36`	`36`	`{`
`37`		`- inlineVariable.ShouldBeOneOf(1, 2);`
	`37`	`+ differentName.ShouldBeOneOf(1, 2);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Linq;`
`3`	`3`	`using System.Reflection;`
`4`		`-using System.Web.Compilation;`
`5`	`4`
`6`	`5`	`namespace TestStack.BDDfy.Processors`
`7`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,9 @@ static object[] GetValues(string row)`
`86`	`86`
`87`	`87`	`public static bool HeaderMatches(string header, string name)`
`88`	`88`	`{`
	`89`	`+ if (name == null)`
	`90`	`+ return false;`
	`91`	`+`
`89`	`92`	`return Sanitise(name).Equals(Sanitise(header), StringComparison.InvariantCultureIgnoreCase);`
`90`	`93`	`}`
`91`	`94`
Original file line number	Diff line number	Diff line change
`@@ -147,18 +147,19 @@ private StepTitle CreateTitle(string stepTextTemplate, bool includeInputsInStepT`
`147`	`147`	`{`
`148`	`148`	`var parameters = methodInfo.GetParameters();`
`149`	`149`	`var stringFlatInputs =`
`150`		`- flatInputArray`
	`150`	`+ inputArguments`
`151`	`151`	`.Select((a, i) => new { ParameterName = parameters[i].Name, Value = a })`
`152`	`152`	`.Select(i =>`
`153`	`153`	`{`
`154`	`154`	`if (_testContext.Examples != null)`
`155`	`155`	`{`
`156`		`-`
`157`		`- var matchingHeader = _testContext.Examples.Headers.SingleOrDefault(header => ExampleTable.HeaderMatches(header, i.ParameterName));`
	`156`	`+ var matchingHeader = _testContext.Examples.Headers`
	`157`	`+ .SingleOrDefault(header => ExampleTable.HeaderMatches(header, i.ParameterName) \|\|`
	`158`	`+ ExampleTable.HeaderMatches(header, i.Value.Name));`
`158`	`159`	`if (matchingHeader != null)`
`159`	`160`	`return string.Format("<{0}>", matchingHeader);`
`160`	`161`	`}`
`161`		`- return i.Value.ToString();`
	`162`	`+ return i.Value.Value.FlattenArray();`
`162`	`163`	`})`
`163`	`164`	`.ToArray();`
`164`	`165`	`stepTitle = stepTitle + " " + string.Join(", ", stringFlatInputs);`