(#147) TestUtils.Exceptions: remove Option from the return type

codingteam · Oct 31, 2021 · 86c86b6 · 86c86b6
1 parent 56079de
commit 86c86b6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Emulsion.Tests/Database/DatabaseStructureTests.fs b/Emulsion.Tests/Database/DatabaseStructureTests.fs
@@ -29,6 +29,6 @@ let ``Unique constraint should hold``(): unit =
         let! ex = Async.AwaitTask(Assert.ThrowsAnyAsync(fun() ->
             upcast Async.StartAsTask(DataStorage.transaction settings addNewContent)
         ))
-        let sqlEx = Exceptions.unwrap<SqliteException> ex |> Option.get
+        let sqlEx = Exceptions.unwrap<SqliteException> ex
         Assert.Contains("UNIQUE constraint failed", sqlEx.Message)
     })
diff --git a/Emulsion.Tests/TestUtils/Exceptions.fs b/Emulsion.Tests/TestUtils/Exceptions.fs
@@ -3,9 +3,9 @@
 open System
 open Microsoft.EntityFrameworkCore
 
-let rec unwrap<'a when 'a :> Exception>(ex: Exception): 'a option =
+let rec unwrap<'a when 'a :> Exception>(ex: Exception): 'a =
     match ex with
-    | :? 'a as ex -> Some ex
+    | :? 'a as ex -> ex
     | :? AggregateException as ax when ax.InnerExceptions.Count = 1 -> unwrap(Seq.exactlyOne ax.InnerExceptions)
     | :? DbUpdateException as dx when not(isNull dx.InnerException) -> unwrap dx.InnerException
     | _ -> failwithf $"Unable to unwrap the following exception into {typeof<'a>.FullName}:\n{ex}"