fixup! test: shared contracts of the map modules, run for HashMap and IMap

The assertion helpers of `main` are static classes since the foundation was merged, so the call
sites of the map tests use them: `ExceptionAssert.Same (paramName, oracle, actual, message)` in
`MapContract` and `OverrideAssert.OptionMatches (expected, actual, message)` in the `Option`
tests of `HashMap` and `IMap`.

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

Author: xperiandri

tests/FSharp.Collections.Immutable.Tests/Contracts/MapContract.fs

@@ -39,7 +39,7 @@ type BindingPredicate =
 /// <para>
 /// Every map module mirrors the FSharp.Core <c>Map</c> module (ADR 0001, D6), so the map contracts take no
 /// <see cref="T:FSharp.Collections.Immutable.Tests.Mirror"/>: they compare the exceptions with the <c>Map</c> oracle through
-/// <c>ExceptionAssert.same</c>, and <c>Mirror</c> stays about the sequence-like modules.
+/// <c>ExceptionAssert.Same</c>, and <c>Mirror</c> stays about the sequence-like modules.
 /// </para>
 /// <para>
 /// A hash map enumerates its bindings in an unspecified order. The contracts compare whole maps as bindings sorted by key,
@@ -72,7 +72,7 @@ type MapContractBase<'M>
 
     /// Asserts that a function of the module throws what the same function of the FSharp.Core Map module throws.
     member _.ThrowsLikeMap (oracle : unit -> 'A, actual : unit -> 'R, message : string) =
-        ExceptionAssert.same paramName (oracle >> ignore) (actual >> ignore) $"%s{name}: %s{message}"
+        ExceptionAssert.Same (paramName, oracle >> ignore, actual >> ignore, $"%s{name}: %s{message}")
 
 /// <summary>
 /// The contract of the reading functions that every map module provides: <c>HashMap</c>, <c>SortedMap</c>, <c>IMap</c>

tests/FSharp.Collections.Immutable.Tests/HashMap/HashMapOptionTests.fs

@@ -30,19 +30,21 @@ type HashMapOptionTests () =
     member _.``tryFind returns an option`` (key : int) =
         let found : string option = HashMap.tryFind key table
 
-        OverrideAssert.optionMatches
-            (FSharp.Collections.Immutable.HashMap.tryFind key table)
-            found
+        OverrideAssert.OptionMatches (
+            FSharp.Collections.Immutable.HashMap.tryFind key table,
+            found,
             "Option.HashMap.tryFind must match the default"
+        )
 
     [<TestMethod; DataRow 5; DataRow 1>]
     member _.``tryGetKey returns an option`` (key : int) =
         let found : int option = HashMap.tryGetKey key table
 
-        OverrideAssert.optionMatches
-            (FSharp.Collections.Immutable.HashMap.tryGetKey key table)
-            found
+        OverrideAssert.OptionMatches (
+            FSharp.Collections.Immutable.HashMap.tryGetKey key table,
+            found,
             "Option.HashMap.tryGetKey must match the default"
+        )
 
     [<TestMethod>]
     member _.``pick takes a chooser of options`` () =
@@ -58,21 +60,23 @@ type HashMapOptionTests () =
     member _.``tryFindKey returns an option`` (predicate : BindingPredicate) =
         let found : int option = HashMap.tryFindKey predicate.Matches table
 
-        OverrideAssert.optionMatches
-            (FSharp.Collections.Immutable.HashMap.tryFindKey predicate.Matches table)
-            found
+        OverrideAssert.OptionMatches (
+            FSharp.Collections.Immutable.HashMap.tryFindKey predicate.Matches table,
+            found,
             "Option.HashMap.tryFindKey must match the default"
+        )
 
     [<TestMethod>]
     member _.``tryPick takes a chooser of options and returns an option`` () =
         let found : int option = HashMap.tryPick negatedIfNegative table
 
-        OverrideAssert.optionMatches
-            (FSharp.Collections.Immutable.HashMap.tryPick
+        OverrideAssert.OptionMatches (
+            FSharp.Collections.Immutable.HashMap.tryPick
                 (fun key value -> negatedIfNegative key value |> ValueOption.ofOption)
-                table)
-            found
+                table,
+            found,
             "Option.HashMap.tryPick must match the default"
+        )
 
         let nothing : int option = HashMap.tryPick (fun _ _ -> None) table
         Assert.AreEqual<int option>(None, nothing, "Option.HashMap.tryPick must return None when the chooser returns nothing")

tests/FSharp.Collections.Immutable.Tests/HashMap/IMapOptionTests.fs

@@ -30,19 +30,21 @@ type IMapOptionTests () =
     member _.``tryFind returns an option`` (key : int) =
         let found : string option = IMap.tryFind key table
 
-        OverrideAssert.optionMatches
-            (FSharp.Collections.Immutable.IMap.tryFind key table)
-            found
+        OverrideAssert.OptionMatches (
+            FSharp.Collections.Immutable.IMap.tryFind key table,
+            found,
             "Option.IMap.tryFind must match the default"
+        )
 
     [<TestMethod; DataRow 5; DataRow 1>]
     member _.``tryGetKey returns an option`` (key : int) =
         let found : int option = IMap.tryGetKey key table
 
-        OverrideAssert.optionMatches
-            (FSharp.Collections.Immutable.IMap.tryGetKey key table)
-            found
+        OverrideAssert.OptionMatches (
+            FSharp.Collections.Immutable.IMap.tryGetKey key table,
+            found,
             "Option.IMap.tryGetKey must match the default"
+        )
 
     [<TestMethod>]
     member _.``pick takes a chooser of options`` () =
@@ -58,21 +60,21 @@ type IMapOptionTests () =
     member _.``tryFindKey returns an option`` (predicate : BindingPredicate) =
         let found : int option = IMap.tryFindKey predicate.Matches table
 
-        OverrideAssert.optionMatches
-            (FSharp.Collections.Immutable.IMap.tryFindKey predicate.Matches table)
-            found
+        OverrideAssert.OptionMatches (
+            FSharp.Collections.Immutable.IMap.tryFindKey predicate.Matches table,
+            found,
             "Option.IMap.tryFindKey must match the default"
+        )
 
     [<TestMethod>]
     member _.``tryPick takes a chooser of options and returns an option`` () =
         let found : int option = IMap.tryPick negatedIfNegative table
 
-        OverrideAssert.optionMatches
-            (FSharp.Collections.Immutable.IMap.tryPick
-                (fun key value -> negatedIfNegative key value |> ValueOption.ofOption)
-                table)
-            found
+        OverrideAssert.OptionMatches (
+            FSharp.Collections.Immutable.IMap.tryPick (fun key value -> negatedIfNegative key value |> ValueOption.ofOption) table,
+            found,
             "Option.IMap.tryPick must match the default"
+        )
 
     [<TestMethod; DataRow 5; DataRow 1>]
     member _.``change takes a function of options as Map.change does`` (key : int) =