fixup! test: SortedMap against the map contracts and the order of Map

Calls the assertion helpers of `main`: `ExceptionAssert.Same`, `OverrideAssert.OptionMatches`
and `OverrideAssert.PairMatches`, which replace the curried functions of the former modules
in the tests of `minKeyValue`, `maxKeyValue` and the `Option` and `Tuple` namespaces.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

Author: xperiandri

tests/FSharp.Collections.Immutable.Tests/SortedMap/SortedMapOptionTests.fs

@@ -55,19 +55,21 @@ type SortedMapOptionTests () =
     member _.``tryFind returns an option`` (key : int) =
         let found : string option = SortedMap.tryFind key table
 
-        OverrideAssert.optionMatches
-            (FSharp.Collections.Immutable.SortedMap.tryFind key table)
-            found
+        OverrideAssert.OptionMatches (
+            FSharp.Collections.Immutable.SortedMap.tryFind key table,
+            found,
             "Option.SortedMap.tryFind must match the default"
+        )
 
     [<TestMethod; DataRow 5; DataRow 1>]
     member _.``tryGetKey returns an option`` (key : int) =
         let found : int option = SortedMap.tryGetKey key table
 
-        OverrideAssert.optionMatches
-            (FSharp.Collections.Immutable.SortedMap.tryGetKey key table)
-            found
+        OverrideAssert.OptionMatches (
+            FSharp.Collections.Immutable.SortedMap.tryGetKey key table,
+            found,
             "Option.SortedMap.tryGetKey must match the default"
+        )
 
     [<TestMethod>]
     member _.``pick takes a chooser of options as Map.pick does`` () =
@@ -89,10 +91,11 @@ type SortedMapOptionTests () =
             "Option.SortedMap.tryFindKey must find the first key in the order of the keys, as Map.tryFindKey does"
         )
 
-        OverrideAssert.optionMatches
-            (FSharp.Collections.Immutable.SortedMap.tryFindKey predicate.Matches table)
-            found
+        OverrideAssert.OptionMatches (
+            FSharp.Collections.Immutable.SortedMap.tryFindKey predicate.Matches table,
+            found,
             "Option.SortedMap.tryFindKey must match the default"
+        )
 
     [<TestMethod>]
     member _.``tryPick takes a chooser of options and returns an option as Map.tryPick does`` () =

tests/FSharp.Collections.Immutable.Tests/SortedMap/SortedMapTests.fs

@@ -730,19 +730,21 @@ type SortedMapTests () =
 
     [<TestMethod>]
     member _.``minKeyValue throws for an empty map as Map does`` () =
-        ExceptionAssert.same
-            id
-            (fun () -> Map.minKeyValue Map.empty<int, string> |> ignore)
-            (fun () -> SortedMap.minKeyValue SortedMap.empty<int, string> |> ignore)
+        ExceptionAssert.Same (
+            id,
+            (fun () -> Map.minKeyValue Map.empty<int, string> |> ignore),
+            (fun () -> SortedMap.minKeyValue SortedMap.empty<int, string> |> ignore),
             "SortedMap.minKeyValue must reject an empty map"
+        )
 
     [<TestMethod>]
     member _.``maxKeyValue throws for an empty map as Map does`` () =
-        ExceptionAssert.same
-            id
-            (fun () -> Map.maxKeyValue Map.empty<int, string> |> ignore)
-            (fun () -> SortedMap.maxKeyValue SortedMap.empty<int, string> |> ignore)
+        ExceptionAssert.Same (
+            id,
+            (fun () -> Map.maxKeyValue Map.empty<int, string> |> ignore),
+            (fun () -> SortedMap.maxKeyValue SortedMap.empty<int, string> |> ignore),
             "SortedMap.maxKeyValue must reject an empty map"
+        )
 
     [<TestMethod>]
     member _.``singleton binds the key to the value`` () =

tests/FSharp.Collections.Immutable.Tests/SortedMap/SortedMapTupleTests.fs

@@ -49,38 +49,42 @@ type SortedMapTupleTests () =
         let largest : int * string = SortedMap.maxKeyValue table
         Assert.AreEqual<int * string>(Map.maxKeyValue oracle, largest, "Tuple.SortedMap.maxKeyValue must match Map.maxKeyValue")
 
-        OverrideAssert.pairMatches
-            (FSharp.Collections.Immutable.SortedMap.maxKeyValue table)
-            largest
+        OverrideAssert.PairMatches (
+            FSharp.Collections.Immutable.SortedMap.maxKeyValue table,
+            largest,
             "Tuple.SortedMap.maxKeyValue must match the default"
+        )
 
-        ExceptionAssert.same
-            id
-            (fun () -> Map.maxKeyValue Map.empty<int, string> |> ignore)
+        ExceptionAssert.Same (
+            id,
+            (fun () -> Map.maxKeyValue Map.empty<int, string> |> ignore),
             (fun () ->
                 SortedMap.maxKeyValue FSharp.Collections.Immutable.SortedMap.empty<int, string>
                 |> ignore
-            )
+            ),
             "Tuple.SortedMap.maxKeyValue must reject an empty map as Map.maxKeyValue does"
+        )
 
     [<TestMethod>]
     member _.``minKeyValue returns a reference tuple as Map.minKeyValue does`` () =
         let smallest : int * string = SortedMap.minKeyValue table
         Assert.AreEqual<int * string>(Map.minKeyValue oracle, smallest, "Tuple.SortedMap.minKeyValue must match Map.minKeyValue")
 
-        OverrideAssert.pairMatches
-            (FSharp.Collections.Immutable.SortedMap.minKeyValue table)
-            smallest
+        OverrideAssert.PairMatches (
+            FSharp.Collections.Immutable.SortedMap.minKeyValue table,
+            smallest,
             "Tuple.SortedMap.minKeyValue must match the default"
+        )
 
-        ExceptionAssert.same
-            id
-            (fun () -> Map.minKeyValue Map.empty<int, string> |> ignore)
+        ExceptionAssert.Same (
+            id,
+            (fun () -> Map.minKeyValue Map.empty<int, string> |> ignore),
             (fun () ->
                 SortedMap.minKeyValue FSharp.Collections.Immutable.SortedMap.empty<int, string>
                 |> ignore
-            )
+            ),
             "Tuple.SortedMap.minKeyValue must reject an empty map as Map.minKeyValue does"
+        )
 
     [<TestMethod>]
     member _.``partition returns a reference tuple`` () =