Merge pull request #134 from JakeGinnivan/LocalVariableExamplePlaceholders

MehdiK · MehdiK · commit a40075de47b4 · 2014-05-04T04:45:57.000-04:00
Can now declare a local variable inside the test method, and BDDfy will ...
diff --git a/TestStack.BDDfy.Tests/Processors/TestRunnerTests.cs b/TestStack.BDDfy.Tests/Processors/TestRunnerTests.cs
@@ -14,24 +14,24 @@ 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();
             Action<object> action = o => actualValue = ExampleValue;
             var steps = new List<Step> { new Step(action, new StepTitle("A Step"), true, ExecutionOrder.Initialize, true) };
 
-            var scenarioWithExample = new Scenario("id", this, steps, "Scenario Text", exampleTable);
+            var scenarioWithExample = new Scenario("id", this, steps, "Scenario Text", exampleTable, new List<StepArgument>());
             var story = new Story(new StoryMetadata(typeof(TestRunnerTests), new StoryNarrativeAttribute()),
                 new[] { scenarioWithExample });
 
             sut.Process(story);
 
-            Assert.AreEqual(ExpectedValue, actualValue);
+            Assert.AreEqual(expectedValue, actualValue);
         }
     }
 }
diff --git a/TestStack.BDDfy.Tests/Reporters/Html/ClassicReportBuilderTests.ShouldProduceExpectedHtml.approved.txt b/TestStack.BDDfy.Tests/Reporters/Html/ClassicReportBuilderTests.ShouldProduceExpectedHtml.approved.txt
@@ -104,7 +104,7 @@ body{margin:0;padding:0;padding-bottom:40px;max-width:100%;background-color:#fff
                     <li class='step Failed  Assertion canToggle' data-toggle-target='step-3-3' >
                       <span>Then no money is dispensed [Exception Message: 'Boom']</span>
                       <div class='step FailedException' id='step-3-3'>
-                        <code>   at TestStack.BDDfy.Tests.Reporters.ReportTestData.GetScenarios(Boolean includeFailingScenario, Boolean includeExamples) in ...\ReportTestData.cs:line 90</code>
+                        <code>   at TestStack.BDDfy.Tests.Reporters.ReportTestData.GetScenarios(Boolean includeFailingScenario, Boolean includeExamples) in ...\ReportTestData.cs:line 89</code>
                       </div>
                     </li>
                   </ul>
diff --git a/TestStack.BDDfy.Tests/Reporters/Html/ClassicReportBuilderTests.ShouldProduceExpectedHtmlWithExamples.approved.txt b/TestStack.BDDfy.Tests/Reporters/Html/ClassicReportBuilderTests.ShouldProduceExpectedHtmlWithExamples.approved.txt
@@ -115,7 +115,7 @@ body{margin:0;padding:0;padding-bottom:40px;max-width:100%;background-color:#fff
 With
 New lines</span>
                             <div class='step' id='step-1-19'>
-                              <code>   at TestStack.BDDfy.Tests.Reporters.ReportTestData.GetScenarios(Boolean includeFailingScenario, Boolean includeExamples) in ...\ReportTestData.cs:line 113</code>
+                              <code>   at TestStack.BDDfy.Tests.Reporters.ReportTestData.GetScenarios(Boolean includeFailingScenario, Boolean includeExamples) in ...\ReportTestData.cs:line 112</code>
                             </div>
                           </td>
                         </tr>
diff --git a/TestStack.BDDfy.Tests/Reporters/Html/MetroReportBuilderTests.ShouldProduceExpectedHtmlWithExamples.approved.txt b/TestStack.BDDfy.Tests/Reporters/Html/MetroReportBuilderTests.ShouldProduceExpectedHtmlWithExamples.approved.txt
@@ -126,7 +126,7 @@ html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abb
 With
 New lines</span>
                             <div class='step FailedException' id='step-1-19'>
-                              <code>   at TestStack.BDDfy.Tests.Reporters.ReportTestData.GetScenarios(Boolean includeFailingScenario, Boolean includeExamples) in ...\ReportTestData.cs:line 113</code>
+                              <code>   at TestStack.BDDfy.Tests.Reporters.ReportTestData.GetScenarios(Boolean includeFailingScenario, Boolean includeExamples) in ...\ReportTestData.cs:line 112</code>
                             </div>
                           </td>
                         </tr>
diff --git a/TestStack.BDDfy.Tests/Reporters/MarkDown/MarkDownReportBuilderTests.ShouldProduceExpectedMarkdownWithExamples.approved.txt b/TestStack.BDDfy.Tests/Reporters/MarkDown/MarkDownReportBuilderTests.ShouldProduceExpectedMarkdownWithExamples.approved.txt
@@ -16,7 +16,7 @@
 
 #### Exceptions:
     1. Boom With New lines
-       at TestStack.BDDfy.Tests.Reporters.ReportTestData.GetScenarios(Boolean includeFailingScenario, Boolean includeExamples) in ...\ReportTestData.cs:line 113
+       at TestStack.BDDfy.Tests.Reporters.ReportTestData.GetScenarios(Boolean includeFailingScenario, Boolean includeExamples) in ...\ReportTestData.cs:line 112
 
 ## Story: Happiness
  **As a person**  
diff --git a/TestStack.BDDfy.Tests/Reporters/ReportTestData.cs b/TestStack.BDDfy.Tests/Reporters/ReportTestData.cs
@@ -1,20 +1,19 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace TestStack.BDDfy.Tests.Reporters
 {
     using System.Linq;
 
     public class ReportTestData
     {
-        private int _idCount = 0;
+        private int _idCount;
 
         public IEnumerable<Story> CreateTwoStoriesEachWithOneFailingScenarioAndOnePassingScenarioWithThreeStepsOfFiveMilliseconds()
         {
             var storyMetadata1 = new StoryMetadata(typeof(RegularAccountHolderStory), "As a person", "I want ice cream", "So that I can be happy", "Happiness");
             var storyMetadata2 = new StoryMetadata(typeof(GoldAccountHolderStory), "As an account holder", "I want to withdraw cash", "So that I can get money when the bank is closed", "Account holder withdraws cash");
-            var stories = new List<Story>()
+            var stories = new List<Story>
             {
                 new Story(storyMetadata1, GetScenarios(false, false)),
                 new Story(storyMetadata2, GetScenarios(true, false))
@@ -30,7 +29,7 @@ public IEnumerable<Story> CreateMixContainingEachTypeOfOutcome()
 
             const StoryMetadata testThatReportWorksWithNoStory = null;
 
-            var stories = new List<Story>()
+            var stories = new List<Story>
             {
                 new Story(storyMetadata1, GetOneOfEachScenarioResult()),
                 new Story(storyMetadata2, GetOneOfEachScenarioResult()),
@@ -48,7 +47,7 @@ public IEnumerable<Story> CreateMixContainingEachTypeOfOutcomeWithOneScenarioPer
 
             const StoryMetadata testThatReportWorksWithNoStory = null;
 
-            var stories = new List<Story>()
+            var stories = new List<Story>
             {
                 new Story(storyMetadata1, new Scenario(typeof(HappyPathScenario), GetHappyExecutionSteps(), "Happy Path Scenario [for Happiness]")),
                 new Story(storyMetadata1, new Scenario(typeof(SadPathScenario), GetFailingExecutionSteps(), "Sad Path Scenario [for Happiness]")),
@@ -119,8 +118,8 @@ private Scenario[] GetScenarios(bool includeFailingScenario, bool includeExample
                 }
                 return new List<Scenario>
                 {
-                    new Scenario(exampleId, typeof(ExampleScenario), GetExampleExecutionSteps(), "Example Scenario", exampleTable.ElementAt(0)),
-                    new Scenario(exampleId, typeof(ExampleScenario), exampleExecutionSteps, "Example Scenario", exampleTable.ElementAt(1))
+                    new Scenario(exampleId, typeof(ExampleScenario), GetExampleExecutionSteps(), "Example Scenario", exampleTable.ElementAt(0), new List<StepArgument>()),
+                    new Scenario(exampleId, typeof(ExampleScenario), exampleExecutionSteps, "Example Scenario", exampleTable.ElementAt(1), new List<StepArgument>())
                 }.ToArray();
             }
 
@@ -133,7 +132,7 @@ private Scenario[] GetScenarios(bool includeFailingScenario, bool includeExample
 
         private Scenario[] GetOneOfEachScenarioResult()
         {
-            var scenarios = new List<Scenario>()
+            var scenarios = new List<Scenario>
             {
                 new Scenario(typeof(HappyPathScenario), GetHappyExecutionSteps(), "Happy Path Scenario"),
                 new Scenario(typeof(SadPathScenario), GetSadExecutionSteps(), "Sad Path Scenario"),
diff --git a/TestStack.BDDfy.Tests/Scanner/FluentScanner/ExpressionExtensionsTests.cs b/TestStack.BDDfy.Tests/Scanner/FluentScanner/ExpressionExtensionsTests.cs
@@ -68,7 +68,7 @@ public void MethodWithInputs(ContainerType subContainer)
 
         object[] GetArguments(Expression<Action<ClassUnderTest>> action, ClassUnderTest instance)
         {
-            return action.ExtractArguments(instance).ToArray();
+            return action.ExtractArguments(instance).Select(o => o.Value).ToArray();
         }
 
         int _input1 = 1;
diff --git a/TestStack.BDDfy.Tests/Scanner/FluentScanner/FluentWithExamples.Inline.approved.txt b/TestStack.BDDfy.Tests/Scanner/FluentScanner/FluentWithExamples.Inline.approved.txt
@@ -0,0 +1,9 @@
+﻿
+Scenario: Inline
+	Given int with value <Inline Variable>
+
+Examples: 
+| Inline Variable |
+| 1               |
+| 2               |
+
diff --git a/TestStack.BDDfy.Tests/Scanner/FluentScanner/FluentWithExamples.cs b/TestStack.BDDfy.Tests/Scanner/FluentScanner/FluentWithExamples.cs
@@ -32,6 +32,27 @@ public void FluentCanBeUsedWithExamples()
             Approvals.Verify(textReporter.ToString());
         }
 
+        private void GivenIntWithValue(int differentName)
+        {
+            differentName.ShouldBeOneOf(1, 2);
+        }
+
+        [Test]
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public void Inline()
+        {
+            // ReSharper disable once ConvertToConstant.Local
+            var inlineVariable = 0;
+            var story = this
+                .Given(_ => GivenIntWithValue(inlineVariable))
+                .WithExamples(new ExampleTable("Inline Variable") { 1, 2 })
+                .BDDfy();
+
+            var textReporter = new TextReporter();
+            textReporter.Process(story);
+            Approvals.Verify(textReporter.ToString());
+        }
+
         [Test]
         [MethodImpl(MethodImplOptions.NoInlining)]
         public void ExampleTypeMismatch()
diff --git a/TestStack.BDDfy/Processors/ScenarioExecutor.cs b/TestStack.BDDfy/Processors/ScenarioExecutor.cs
@@ -18,13 +18,23 @@ public void InitializeScenario()
             if (_scenario.Example == null) 
                 return;
 
+            var type = _scenario.TestObject.GetType();
+            var memberInfos = type
+                .GetMembers(BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public)
+                .Where(m => m is FieldInfo || m is PropertyInfo)
+                .Where(m => !m.Name.EndsWith("BackingField"))
+                .ToArray();
+
+            var possibleTargets = memberInfos
+                .OfType<FieldInfo>()
+                .Select(f => new StepArgument(f, _scenario.TestObject))
+                .Union(memberInfos.OfType<PropertyInfo>().Select(m => new StepArgument(m, _scenario.TestObject)))
+                .Union(_scenario.Arguments)
+                .ToArray();
+
             foreach (var cell in _scenario.Example.Values)
             {
-                var type = _scenario.TestObject.GetType();
-                var matchingMembers = type
-                    .GetMembers(BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public)
-                    .Where(m => m is FieldInfo || m is PropertyInfo)
-                    .Where(m => !m.Name.EndsWith("BackingField"))
+                var matchingMembers = possibleTargets
                     .Where(n => cell.MatchesName(n.Name))
                     .ToArray();
 
@@ -33,13 +43,7 @@ public void InitializeScenario()
 
                 foreach (var matchingMember in matchingMembers)
                 {
-                    var prop = matchingMember as PropertyInfo;
-                    if (prop != null)
-                        prop.SetValue(_scenario.TestObject, cell.GetValue(prop.PropertyType), null);
-
-                    var field = matchingMember as FieldInfo;
-                    if (field != null)
-                        field.SetValue(_scenario.TestObject, cell.GetValue(field.FieldType));
+                    matchingMember.SetValue(cell.GetValue(matchingMember.ArgumentType));
                 }
             }
         }
diff --git a/TestStack.BDDfy/Scanners/ScenarioScanners/FluentScenarioScanner.cs b/TestStack.BDDfy/Scanners/ScenarioScanners/FluentScenarioScanner.cs
@@ -8,11 +8,13 @@ namespace TestStack.BDDfy
     public class FluentScenarioScanner : IScenarioScanner
     {
         private readonly string _title;
+        private readonly List<StepArgument> _arguments;
         private readonly List<Step> _steps;
 
-        public FluentScenarioScanner(List<Step> steps, string title)
+        public FluentScenarioScanner(List<Step> steps, string title, List<StepArgument> arguments)
         {
             _title = title;
+            _arguments = arguments;
             _steps = steps;
         }
 
@@ -23,7 +25,7 @@ public IEnumerable<Scenario> Scan(ITestContext testContext)
             {
                 var scenarioId = Configurator.IdGenerator.GetScenarioId();
                 return testContext.Examples.Select(example =>
-                    new Scenario(scenarioId, testContext.TestObject, CloneSteps(_steps), scenarioText, example));
+                    new Scenario(scenarioId, testContext.TestObject, CloneSteps(_steps), scenarioText, example, _arguments));
             }
 
             return new[] { new Scenario(testContext.TestObject, _steps, scenarioText) };
diff --git a/TestStack.BDDfy/Scanners/ScenarioScanners/ReflectiveScenarioScanner.cs b/TestStack.BDDfy/Scanners/ScenarioScanners/ReflectiveScenarioScanner.cs
@@ -47,7 +47,7 @@ public virtual IEnumerable<Scenario> Scan(ITestContext testContext)
             {
                 var steps = ScanScenarioForSteps(testContext, example);
                 var orderedSteps = steps.OrderBy(o => o.ExecutionOrder).ThenBy(o => o.ExecutionSubOrder).ToList();
-                yield return new Scenario(scenarioId, testContext.TestObject, orderedSteps, scenarioTitle, example);
+                yield return new Scenario(scenarioId, testContext.TestObject, orderedSteps, scenarioTitle, example, new List<StepArgument>());
             }
         }
 
diff --git a/TestStack.BDDfy/Scanners/StepScanners/ArgumentCleaningExtensions.cs b/TestStack.BDDfy/Scanners/StepScanners/ArgumentCleaningExtensions.cs
@@ -1,11 +1,12 @@
 ﻿using System;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace TestStack.BDDfy
 {
     internal static class ArgumentCleaningExtensions
     {
-        internal static object[] FlattenArrays(this object[] inputs)
+        internal static object[] FlattenArrays(this IEnumerable<object> inputs)
         {
             return inputs.Select(FlattenArray).ToArray();
         }
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/ExpressionExtensions.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/ExpressionExtensions.cs
diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScanner.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScanner.cs
diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/StepArgument.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/StepArgument.cs
diff --git a/TestStack.BDDfy/Scenario.cs b/TestStack.BDDfy/Scenario.cs
diff --git a/TestStack.BDDfy/TestStack.BDDfy.csproj b/TestStack.BDDfy/TestStack.BDDfy.csproj

Original file line number	Diff line number	Diff line change
`@@ -14,24 +14,24 @@ 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();`
`25`	`25`	`Action<object> action = o => actualValue = ExampleValue;`
`26`	`26`	`var steps = new List<Step> { new Step(action, new StepTitle("A Step"), true, ExecutionOrder.Initialize, true) };`
`27`	`27`
`28`		`- var scenarioWithExample = new Scenario("id", this, steps, "Scenario Text", exampleTable);`
	`28`	`+ var scenarioWithExample = new Scenario("id", this, steps, "Scenario Text", exampleTable, new List<StepArgument>());`
`29`	`29`	`var story = new Story(new StoryMetadata(typeof(TestRunnerTests), new StoryNarrativeAttribute()),`
`30`	`30`	`new[] { scenarioWithExample });`
`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
`@@ -1,20 +1,19 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`	`3`
`5`	`4`	`namespace TestStack.BDDfy.Tests.Reporters`
`6`	`5`	`{`
`7`	`6`	`using System.Linq;`
`8`	`7`
`9`	`8`	`public class ReportTestData`
`10`	`9`	`{`
`11`		`- private int _idCount = 0;`
	`10`	`+ private int _idCount;`
`12`	`11`
`13`	`12`	`public IEnumerable<Story> CreateTwoStoriesEachWithOneFailingScenarioAndOnePassingScenarioWithThreeStepsOfFiveMilliseconds()`
`14`	`13`	`{`
`15`	`14`	`var storyMetadata1 = new StoryMetadata(typeof(RegularAccountHolderStory), "As a person", "I want ice cream", "So that I can be happy", "Happiness");`
`16`	`15`	`var storyMetadata2 = new StoryMetadata(typeof(GoldAccountHolderStory), "As an account holder", "I want to withdraw cash", "So that I can get money when the bank is closed", "Account holder withdraws cash");`
`17`		`- var stories = new List<Story>()`
	`16`	`+ var stories = new List<Story>`
`18`	`17`	`{`
`19`	`18`	`new Story(storyMetadata1, GetScenarios(false, false)),`
`20`	`19`	`new Story(storyMetadata2, GetScenarios(true, false))`
`@@ -30,7 +29,7 @@ public IEnumerable<Story> CreateMixContainingEachTypeOfOutcome()`
`30`	`29`
`31`	`30`	`const StoryMetadata testThatReportWorksWithNoStory = null;`
`32`	`31`
`33`		`- var stories = new List<Story>()`
	`32`	`+ var stories = new List<Story>`
`34`	`33`	`{`
`35`	`34`	`new Story(storyMetadata1, GetOneOfEachScenarioResult()),`
`36`	`35`	`new Story(storyMetadata2, GetOneOfEachScenarioResult()),`
`@@ -48,7 +47,7 @@ public IEnumerable<Story> CreateMixContainingEachTypeOfOutcomeWithOneScenarioPer`
`48`	`47`
`49`	`48`	`const StoryMetadata testThatReportWorksWithNoStory = null;`
`50`	`49`
`51`		`- var stories = new List<Story>()`
	`50`	`+ var stories = new List<Story>`
`52`	`51`	`{`
`53`	`52`	`new Story(storyMetadata1, new Scenario(typeof(HappyPathScenario), GetHappyExecutionSteps(), "Happy Path Scenario [for Happiness]")),`
`54`	`53`	`new Story(storyMetadata1, new Scenario(typeof(SadPathScenario), GetFailingExecutionSteps(), "Sad Path Scenario [for Happiness]")),`
`@@ -119,8 +118,8 @@ private Scenario[] GetScenarios(bool includeFailingScenario, bool includeExample`
`119`	`118`	`}`
`120`	`119`	`return new List<Scenario>`
`121`	`120`	`{`
`122`		`- new Scenario(exampleId, typeof(ExampleScenario), GetExampleExecutionSteps(), "Example Scenario", exampleTable.ElementAt(0)),`
`123`		`- new Scenario(exampleId, typeof(ExampleScenario), exampleExecutionSteps, "Example Scenario", exampleTable.ElementAt(1))`
	`121`	`+ new Scenario(exampleId, typeof(ExampleScenario), GetExampleExecutionSteps(), "Example Scenario", exampleTable.ElementAt(0), new List<StepArgument>()),`
	`122`	`+ new Scenario(exampleId, typeof(ExampleScenario), exampleExecutionSteps, "Example Scenario", exampleTable.ElementAt(1), new List<StepArgument>())`
`124`	`123`	`}.ToArray();`
`125`	`124`	`}`
`126`	`125`
`@@ -133,7 +132,7 @@ private Scenario[] GetScenarios(bool includeFailingScenario, bool includeExample`
`133`	`132`
`134`	`133`	`private Scenario[] GetOneOfEachScenarioResult()`
`135`	`134`	`{`
`136`		`- var scenarios = new List<Scenario>()`
	`135`	`+ var scenarios = new List<Scenario>`
`137`	`136`	`{`
`138`	`137`	`new Scenario(typeof(HappyPathScenario), GetHappyExecutionSteps(), "Happy Path Scenario"),`
`139`	`138`	`new Scenario(typeof(SadPathScenario), GetSadExecutionSteps(), "Sad Path Scenario"),`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public void MethodWithInputs(ContainerType subContainer)`
`68`	`68`
`69`	`69`	`object[] GetArguments(Expression<Action<ClassUnderTest>> action, ClassUnderTest instance)`
`70`	`70`	`{`
`71`		`- return action.ExtractArguments(instance).ToArray();`
	`71`	`+ return action.ExtractArguments(instance).Select(o => o.Value).ToArray();`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`int _input1 = 1;`