Fix remaining tests

fsprojects · Apr 3, 2022 · c01985f · c01985f
1 parent 7845667
commit c01985f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/src/FsUnit.Xunit/FsUnitTyped.fs b/src/FsUnit.Xunit/FsUnitTyped.fs
@@ -6,33 +6,37 @@ open FsUnit.Xunit
 [<AutoOpen>]
 module TopLevelOperators =
 
+    /// Asserts that `expected` is equal to `actual`.
+    /// The equality instance on `expected` is used.
     [<DebuggerStepThrough>]
     let shouldEqual<'a> (expected: 'a) (actual: 'a) =
-        should equal expected actual
+        should equal actual expected
 
+    /// Asserts that `expected` is not equal to `actual`.
+    /// The equality instance on `expected` is used.
     [<DebuggerStepThrough>]
     let shouldNotEqual<'a> (expected: 'a) (actual: 'a) =
-        expected |> should not' (equal actual)
+        should not' (equal actual) expected
 
     [<DebuggerStepThrough>]
-    let shouldContain<'a when 'a : equality> (x: 'a) (y: 'a seq) =
+    let shouldContain<'a when 'a: equality> (x: 'a) (y: 'a seq) =
         y |> should contain x
 
     [<DebuggerStepThrough>]
-    let shouldBeEmpty<'a> (list: 'a seq) =
+    let shouldBeEmpty<'a>(list: 'a seq) =
         list |> should be Empty
 
     [<DebuggerStepThrough>]
-    let shouldNotContain<'a when 'a : equality> (x: 'a) (y: 'a seq) =
+    let shouldNotContain<'a when 'a: equality> (x: 'a) (y: 'a seq) =
         if Seq.exists ((=) x) y then
             failwith $"Seq %A{y} should not contain %A{x}"
 
     [<DebuggerStepThrough>]
-    let shouldBeSmallerThan<'a when 'a : comparison> (x: 'a) (y: 'a) =
+    let shouldBeSmallerThan<'a when 'a: comparison> (x: 'a) (y: 'a) =
         should be (lessThan x) y
 
     [<DebuggerStepThrough>]
-    let shouldBeGreaterThan<'a when 'a : comparison> (x: 'a) (y: 'a) =
+    let shouldBeGreaterThan<'a when 'a: comparison> (x: 'a) (y: 'a) =
         should be (greaterThan x) y
 
     [<DebuggerStepThrough>]

diff --git a/tests/FsUnit.Xunit.Test/typed.shouldEqualTests.fs b/tests/FsUnit.Xunit.Test/typed.shouldEqualTests.fs
@@ -5,7 +5,6 @@ open System.Collections.Immutable
 open FsUnit.Xunit
 open Xunit
 open FsUnitTyped
-open FsUnit
 open System
 
 type AlwaysEqual() =
@@ -85,7 +84,12 @@ type ``shouldEqual Tests``() =
         |> Assert.Throws<MatchException>
         |> fun e ->
             e.Message
-            |> shouldEqual(sprintf "  Expected: Error \"Bar\" or Error \"Bar\"%s  But was:  Error \"Foo\"%s" Environment.NewLine Environment.NewLine)
+            |> shouldEqual(
+                sprintf
+                    "Exception of type 'FsUnit.Xunit+MatchException' was thrown.%sExpected: Equals Error \"Bar\"%sActual:   Error \"Foo\""
+                    Environment.NewLine
+                    Environment.NewLine
+            )
 
     [<Fact>]
     member __.``Error "Foo" should not equal Error "Bar"``() =
@@ -97,7 +101,12 @@ type ``shouldEqual Tests``() =
         |> Assert.Throws<MatchException>
         |> fun e ->
             e.Message
-            |> shouldEqual(sprintf "  Expected: not Equals Error \"Foo\"%sActual:  Error \"Foo\"%s" Environment.NewLine Environment.NewLine)
+            |> shouldEqual(
+                sprintf
+                    "Exception of type 'FsUnit.Xunit+MatchException' was thrown.%sExpected: not Equals Error \"Foo\"%sActual:   Error \"Foo\""
+                    Environment.NewLine
+                    Environment.NewLine
+            )
 
     [<Fact>]
     member this.``structural equality``() =