Merge pull request #647 from ocsurfnut/RestoreAsyncSupport

#542 - Restore Async Step Method Support - Await Task Before Continuing
SpecFlowOSS · Jul 14, 2016 · 194d0b3 · 194d0b3
2 parents 80e5fc0 + 7452c90
commit 194d0b3
Show file tree

Hide file tree

Showing 8 changed files with 548 additions and 203 deletions.
diff --git a/Runtime/Bindings/BindingInvoker.cs b/Runtime/Bindings/BindingInvoker.cs
@@ -14,6 +14,8 @@
 
 namespace TechTalk.SpecFlow.Bindings
 {
+    using System.Threading.Tasks;
+
     public class BindingInvoker : IBindingInvoker
     {
         protected readonly RuntimeConfiguration runtimeConfiguration;
@@ -43,6 +45,12 @@ public virtual object InvokeBinding(IBinding binding, IContextManager contextMan
                         Array.Copy(arguments, 0, invokeArgs, 1, arguments.Length);
                     invokeArgs[0] = contextManager;
                     result = bindingAction.DynamicInvoke(invokeArgs);
+
+                    if (result is Task)
+                    {
+                        ((Task)result).Wait();
+                    }
+
                     stopwatch.Stop();
                 }
 
@@ -64,6 +72,12 @@ public virtual object InvokeBinding(IBinding binding, IContextManager contextMan
                 ex = ex.PreserveStackTrace(errorProvider.GetMethodText(binding.Method));
                 throw ex;
             }
+            catch (AggregateException aggregateEx)
+            {
+                var ex = aggregateEx.InnerExceptions.First();
+                ex = ex.PreserveStackTrace(errorProvider.GetMethodText(binding.Method));
+                throw ex;
+            }
         }
 
         protected virtual CultureInfoScope CreateCultureInfoScope(IContextManager contextManager)

diff --git a/Tests/RuntimeTests/StepExecutionTests.cs b/Tests/RuntimeTests/StepExecutionTests.cs
@@ -1,8 +1,8 @@
 using System;
-using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using NUnit.Framework;
 using Rhino.Mocks;
-using TechTalk.SpecFlow.Infrastructure;
 using TestStatus = TechTalk.SpecFlow.Infrastructure.TestStatus;
 
 namespace TechTalk.SpecFlow.RuntimeTests
@@ -75,6 +75,13 @@ public virtual void DistinguishByTableParam2(Table table)
         {
 
         }
+
+
+        [Given("Returns a Task")]
+        public virtual Task ReturnsATask()
+        {
+            throw new NotSupportedException("should be mocked");
+        }
     }
 
     [Binding]
@@ -275,6 +282,54 @@ public void SholdRaiseBindingErrorIfWrongParamNumber()
             MockRepository.VerifyAll();
         }
 
+        [Test]
+        public void SholdCallBindingThatReturnsTask()
+        {
+            StepExecutionTestsBindings bindingInstance;
+            TestRunner testRunner = GetTestRunnerFor(out bindingInstance);
+
+            bool taskFinished = false;
+
+            bindingInstance.Expect(b => b.ReturnsATask()).Return(Task.Factory.StartNew(() =>
+                {
+                    Thread.Sleep(800);
+                    taskFinished = true;
+                }));
+
+            MockRepository.ReplayAll();
+
+            testRunner.Given("Returns a Task");
+            Assert.IsTrue(taskFinished);
+            Assert.AreEqual(TestStatus.OK, GetLastTestStatus());
+            MockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void SholdCallBindingThatReturnsTaskAndReportError()
+        {
+            StepExecutionTestsBindings bindingInstance;
+            TestRunner testRunner = GetTestRunnerFor(out bindingInstance);
+
+            bool taskFinished = false;
+
+            bindingInstance.Expect(b => b.ReturnsATask()).Return(Task.Factory.StartNew(() =>
+                {
+                    Thread.Sleep(800);
+                    taskFinished = true;
+                    throw new Exception("catch meee");
+                }));
+
+            MockRepository.ReplayAll();
+
+            testRunner.Given("Returns a Task");
+            Assert.IsTrue(taskFinished);
+            Assert.AreEqual(TestStatus.TestError, GetLastTestStatus());
+            Assert.AreEqual("catch meee", ContextManagerStub.ScenarioContext.TestError.Message);
+
+            MockRepository.VerifyAll();
+        }
+
+
 
     }
 }
diff --git a/Tests/TechTalk.SpecFlow.Specs/App.config b/Tests/TechTalk.SpecFlow.Specs/App.config
@@ -3,12 +3,11 @@
   <configSections>
     <section name="specFlow" type="TechTalk.SpecFlow.Configuration.ConfigurationSectionHandler, TechTalk.SpecFlow" />
   </configSections>
-
   <appSettings>
     <add key="testProjectFolder" value="SpecFlowTestProject" />
   </appSettings>
   <specFlow>
     <unitTestProvider name="NUnit" />
     <generator allowRowTests="false" />
-  <!-- For additional details on SpecFlow configuration options see http://go.specflow.org/doc-config --></specFlow>
+  </specFlow>
 </configuration>