Merge pull request #220 from sergey-tihon/fix/i218

Support testFunc that return obj

.gitignore

@@ -90,6 +90,7 @@ docs/output/
 # Temp folder used for publishing docs
 temp/
 .vs/
+.idea/
 .fake/
 .fsdocs/
 tmp/

src/FsUnit.NUnit/FsUnit.fs

@@ -34,7 +34,8 @@ module TopLevelOperators =
 
         let y =
             match actual with
-            | :? (unit -> unit) -> box(TestDelegate(actual :?> unit -> unit))
+            | :? (unit -> unit) as testFunc -> box(TestDelegate(testFunc))
+            | :? (unit -> obj) as testFunc -> box(TestDelegate(testFunc >> ignore))
             | _ -> actual
 
         if isNull(box expression) then

src/FsUnit.Xunit/CustomMatchers.fs

@@ -65,13 +65,16 @@ let throw(t: Type) =
 
 let throwWithMessage (m: string) (t: Type) =
     let matches(f: obj) =
-        match f with
-        | :? (unit -> unit) as testFunc ->
+        let wrap testFunc =
             try
                 testFunc()
                 false
             with ex ->
                 ex.GetType() = t && ex.Message = m
+
+        match f with
+        | :? (unit -> unit) as testFunc -> wrap testFunc
+        | :? (unit -> obj) as testFunc -> wrap(testFunc >> ignore)
         | _ -> false
 
     CustomMatcher<obj>($"{string t} \"{m}\"", Func<_, _> matches)

tests/FsUnit.MsTest.Test/shouldFailTests.fs

@@ -2,6 +2,7 @@ namespace FsUnit.Test
 
 open Microsoft.VisualStudio.TestTools.UnitTesting
 open FsUnit.MsTest
+open System
 
 [<TestClass>]
 type ``shouldFail tests``() =
@@ -18,11 +19,16 @@ type ``shouldFail tests``() =
         shouldFail(fun () -> shouldFail id)
 
     [<TestMethod>]
-    member _.``shouldFaild should throw an exception``() =
+    member _.``shouldFail should throw an exception``() =
         (fun () -> shouldFail id)
         |> should throw typeof<AssertFailedException>
 
     [<TestMethod>]
-    member _.``shouldFaild should not throw an exception when fail``() =
+    member _.``shouldFail should not throw an exception when fail``() =
         (fun () -> shouldFail(fun () -> [] |> should contain 1))
         |> should not' (throw typeof<AssertFailedException>)
+
+    [<TestMethod>]
+    member _.``test raising exception``() =
+        fun () -> raise(ArgumentException "help")
+        |> should (throwWithMessage "help") typeof<ArgumentException>

tests/FsUnit.NUnit.Test/shouldFailTests.fs

@@ -1,5 +1,6 @@
 namespace FsUnit.Test
 
+open System
 open NUnit.Framework
 open FsUnit
 
@@ -18,11 +19,16 @@ type ``shouldFail tests``() =
         shouldFail(fun () -> shouldFail id)
 
     [<Test>]
-    member _.``shouldFaild should throw an exception``() =
+    member _.``shouldFail should throw an exception``() =
         (fun () -> shouldFail id)
         |> should throw typeof<NUnit.Framework.AssertionException>
 
     [<Test>]
-    member _.``shouldFaild should not throw an exception when fail``() =
+    member _.``shouldFail should not throw an exception when fail``() =
         (fun () -> shouldFail(fun () -> [] |> should contain 1))
         |> should not' (throw typeof<NUnit.Framework.AssertionException>)
+
+    [<Test>]
+    member _.``test raising exception``() =
+        fun () -> raise(ArgumentException "help")
+        |> should (throwWithMessage "help") typeof<ArgumentException>

tests/FsUnit.Xunit.Test/shouldFailTests.fs

@@ -1,5 +1,6 @@
 namespace FsUnit.Test
 
+open System
 open Xunit
 open FsUnit.Xunit
 
@@ -25,3 +26,8 @@ type ``shouldFail tests``() =
     member _.``shouldFail should not throw an exception when fail``() =
         (fun () -> shouldFail(fun () -> [] |> should contain 1))
         |> should not' (throw typeof<MatchException>)
+
+    [<Fact>]
+    member _.``test raising exception``() =
+        fun () -> raise(ArgumentException "help")
+        |> should (throwWithMessage "help") typeof<ArgumentException>