Issue 17 fix. Fluent scanner returns outer exception.

Author: mwhelan

NuGet/TestStack.BDDfy/TestStack.BDDfy.nuspec

@@ -2,7 +2,7 @@
 <package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>TestStack.BDDfy</id>
-    <version>3.14</version>
+    <version>3.15</version>
     <title>A simple to use and extend BDD framework for .Net programmers</title>
     <authors>Mehdi Khalili, Michael Whelan</authors>
     <owners>Mehdi Khalili, Michael Whelan</owners>

TestStack.BDDfy.Tests/Exceptions/OtherExceptions/WhenResolvingExceptionsFromDifferentScanners.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Xml;
+using NUnit.Framework;
+
+namespace TestStack.BDDfy.Tests.Exceptions.OtherExceptions
+{
+    public class WhenResolvingExceptionsFromDifferentScanners
+    {
+        private ExceptionThrowingTest<OuterException> _sut;
+
+        /// <summary>
+        /// Test to resolve issue where fluent scanner was returning the inner exception rather than the outer one.
+        /// Issue 17: https://github.com/TestStack/TestStack.BDDfy/issues/17
+        /// </summary>
+        [Test]
+        public void FluentScannerShouldReturnOriginalExceptionAndNotInnerException()
+        {
+            _sut = new ExceptionThrowingTest<OuterException>();
+            Assert.Throws<OuterException>(() => _sut.Execute(ThrowingMethods.Given, true));
+        }
+
+        [Test]
+        public void ReflectiveScannerShouldReturnOriginalExceptionAndNotTargetInvocationException()
+        {
+            _sut = new ExceptionThrowingTest<OuterException>();
+            Assert.Throws<OuterException>(() => _sut.Execute(ThrowingMethods.Given, false));
+        }
+
+        private class OuterException : Exception
+        {
+            public OuterException()
+                : base("outer", new XmlException("inner exception"))
+            {
+            }
+        }
+    }
+
+}

TestStack.BDDfy.Tests/TestStack.BDDfy.Tests.csproj

@@ -58,6 +58,7 @@
     <Compile Include="Configuration\BatchProcessorsTests.cs" />
     <Compile Include="Configuration\ProcessorPipelineTests.cs" />
     <Compile Include="Disposer\DisposingScenarios.cs" />
+    <Compile Include="Exceptions\OtherExceptions\WhenResolvingExceptionsFromDifferentScanners.cs" />
     <Compile Include="Exceptions\ThrowingMethods.cs" />
     <Compile Include="Exceptions\WhenAnInconclusiveTestIsRun.cs" />
     <Compile Include="Exceptions\ExceptionThrowingTest.cs" />

TestStack.BDDfy/Core/Scenario.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 
 namespace TestStack.BDDfy.Core
 {
@@ -48,7 +49,11 @@ public StepExecutionResult ExecuteStep(ExecutionStep executionStep)
             catch (Exception ex)
             {
                 // ToDo: more thought should be put into this. Is it safe to get the exception?
-                var exception = ex.InnerException ?? ex;
+                var exception = ex;
+                if (exception is TargetInvocationException)
+                {
+                    exception = ex.InnerException ?? ex;
+                }
 
                 if (exception is NotImplementedException)
                 {

TestStack.BDDfy/Properties/AssemblyInfo.cs

@@ -11,5 +11,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("3.14")]
-[assembly: AssemblyFileVersion("3.14")]
+[assembly: AssemblyVersion("3.15")]
+[assembly: AssemblyFileVersion("3.15")]