Fix exception bug in callmethod to return actual exception instead of…

… wrapped exception.
cwinland · May 29, 2024 · 5a193ce · 5a193ce
1 parent fa866bc
commit 5a193ce
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/FastMoq.Core/Mocker.cs b/FastMoq.Core/Mocker.cs
@@ -1270,7 +1270,19 @@ internal MockModel AddMock(Mock mock, Type type, bool overwrite = false, bool no
             ArgumentNullException.ThrowIfNull(method);
 
             var parameters = GetMethodArgData(method.GetMethodInfo(), CreateParamTypeDictionary(method.GetMethodInfo(), args));
-            return (T?) method.DynamicInvoke(parameters);
+            try
+            {
+                return (T?) method.DynamicInvoke(parameters);
+            }
+            catch (Exception ex)
+            {
+                if (ex is TargetInvocationException te && te.InnerException is { } e)
+                {
+                    throw e;
+                }
+
+                throw;
+            }
         }
 
         internal Dictionary<Type, object?> CreateParamTypeDictionary(MethodBase info, params object?[]? args)

diff --git a/FastMoq.Tests/MocksTests.cs b/FastMoq.Tests/MocksTests.cs
@@ -938,6 +938,11 @@ public void CallMethod_WithParams()
             result[4].Should().Be("");
         }
 
+        [Fact]
+        public void CallMethod_WithException()
+        {
+            Assert.Throws<ArgumentNullException>(() => Mocks.CallMethod<object?[]>(CallTestMethod, 4, null));
+        }
 
         private void CheckBestConstructor(object data, bool expected, bool nonPublic)
         {