Extracted static allocations of collation instances only used by tests.

Author: RyanLamansky

SqlServerSimulator.Tests.Internal/CollationTests.cs

@@ -9,23 +9,27 @@ namespace SqlServerSimulator;
 /// name-resolution surface (<see cref="Collation.TryGet"/> /
 /// <see cref="Collation.IsRecognized"/>) are exercised in the public
 /// <c>CollationBehaviorTests</c> / <c>CollationMetadataTests</c> /
-/// <c>LikeTests</c>; this file keeps only the dormant comparers
-/// (<see cref="Collation.Latin1General100CiAs"/>,
-/// <see cref="Collation.Latin1GeneralCiAs"/>,
-/// <see cref="Collation.Latin1GeneralCsAs"/>,
-/// <see cref="Collation.Latin1GeneralBin"/>) and the internal-only null
-/// handling of <see cref="Collation.Default"/>'s
-/// <see cref="IComparer{T}"/> / <see cref="IEqualityComparer{T}"/>
-/// contracts. The dormant algorithms exist in the code but aren't called
-/// from any public SQL site (every string op outside the LIKE
-/// case-sensitivity flag still goes through <see cref="Collation.Default"/>
-/// — see <c>docs/claude/database-options.md</c>); the tests pin the
-/// dormant contract so the algorithms behave correctly once routing
-/// lands.
+/// <c>LikeTests</c>; this file keeps the non-default-collation algorithm
+/// contracts and the internal-only null handling of
+/// <see cref="Collation.Default"/>'s <see cref="IComparer{T}"/> /
+/// <see cref="IEqualityComparer{T}"/> contracts. The non-default
+/// algorithms exist in the code but aren't called from any public SQL
+/// site (every string op outside the LIKE case-sensitivity flag still
+/// goes through <see cref="Collation.Default"/> — see
+/// <c>docs/claude/database-options.md</c>); the tests pin the contract
+/// so the algorithms behave correctly once routing lands.
 /// </summary>
 [TestClass]
 public sealed class CollationTests
 {
+    private static readonly Collation Latin1General100CiAs = Collation.TryGet("Latin1_General_100_CI_AS")!;
+
+    private static readonly Collation Latin1GeneralCiAs = Collation.TryGet("Latin1_General_CI_AS")!;
+
+    private static readonly Collation Latin1GeneralCsAs = Collation.TryGet("Latin1_General_CS_AS")!;
+
+    private static readonly Collation Latin1GeneralBin = Collation.TryGet("Latin1_General_BIN")!;
+
     // ---- SQL_Latin1_General_CP1_CI_AS — internal-only contracts ----
 
     /// <summary>
@@ -53,16 +57,16 @@ public void Sql_NullHandling()
     [TestMethod]
     public void Win100_AsciiCaseFolding_EqualAndOrderedSame()
     {
-        IsTrue(Collation.Latin1General100CiAs.Equals("abc", "ABC"));
-        AreEqual(0, Collation.Latin1General100CiAs.Compare("abc", "ABC"));
-        AreEqual(Collation.Latin1General100CiAs.GetHashCode("abc"), Collation.Latin1General100CiAs.GetHashCode("ABC"));
+        IsTrue(Latin1General100CiAs.Equals("abc", "ABC"));
+        AreEqual(0, Latin1General100CiAs.Compare("abc", "ABC"));
+        AreEqual(Latin1General100CiAs.GetHashCode("abc"), Latin1General100CiAs.GetHashCode("ABC"));
     }
 
     [TestMethod]
     public void Win100_AccentSensitive()
     {
-        IsFalse(Collation.Latin1General100CiAs.Equals("e", "é"));
-        AreNotEqual(0, Collation.Latin1General100CiAs.Compare("e", "é"));
+        IsFalse(Latin1General100CiAs.Equals("e", "é"));
+        AreNotEqual(0, Latin1General100CiAs.Compare("e", "é"));
     }
 
     [TestMethod]
@@ -72,16 +76,16 @@ public void Win100_ApostropheIsPrimaryWeightZero_InSort()
         // MIN of ('Aaronsburg', "'Aiea") is 'Aaronsburg' under
         // Latin1_General_100_CI_AS because the apostrophe drops out of
         // the primary sort key, leaving "Aiea" > "Aaronsburg".
-        IsLessThan(0, Collation.Latin1General100CiAs.Compare("Aaronsburg", "'Aiea"));
-        AreEqual(0, Collation.Latin1General100CiAs.Compare("'A", "A"));
-        AreEqual(0, Collation.Latin1General100CiAs.Compare("O'Brien", "OBrien"));
+        IsLessThan(0, Latin1General100CiAs.Compare("Aaronsburg", "'Aiea"));
+        AreEqual(0, Latin1General100CiAs.Compare("'A", "A"));
+        AreEqual(0, Latin1General100CiAs.Compare("O'Brien", "OBrien"));
     }
 
     [TestMethod]
     public void Win100_HyphenIsPrimaryWeightZero_InSort()
     {
-        AreEqual(0, Collation.Latin1General100CiAs.Compare("co-op", "coop"));
-        AreEqual(0, Collation.Latin1General100CiAs.Compare("re-do", "redo"));
+        AreEqual(0, Latin1General100CiAs.Compare("co-op", "coop"));
+        AreEqual(0, Latin1General100CiAs.Compare("re-do", "redo"));
     }
 
     [TestMethod]
@@ -90,27 +94,27 @@ public void Win100_Equality_IsStrictAboutSymbols_NotJustSort()
         // Probe-confirmed: 'OBrien' = 'O''Brien' returns 0 even under
         // Windows-100 CI_AS. The primary-weight-zero treatment only
         // applies to sort/MIN/MAX, not to '='.
-        IsFalse(Collation.Latin1General100CiAs.Equals("O'Brien", "OBrien"));
-        IsFalse(Collation.Latin1General100CiAs.Equals("'A", "A"));
-        IsFalse(Collation.Latin1General100CiAs.Equals("co-op", "coop"));
+        IsFalse(Latin1General100CiAs.Equals("O'Brien", "OBrien"));
+        IsFalse(Latin1General100CiAs.Equals("'A", "A"));
+        IsFalse(Latin1General100CiAs.Equals("co-op", "coop"));
     }
 
     [TestMethod]
     public void Win100_HashCode_AgreesWithEquals()
     {
-        AreEqual(Collation.Latin1General100CiAs.GetHashCode("AbC"), Collation.Latin1General100CiAs.GetHashCode("abc"));
+        AreEqual(Latin1General100CiAs.GetHashCode("AbC"), Latin1General100CiAs.GetHashCode("abc"));
         // And differs for strings the equality side distinguishes.
-        AreNotEqual(Collation.Latin1General100CiAs.GetHashCode("O'Brien"), Collation.Latin1General100CiAs.GetHashCode("OBrien"));
+        AreNotEqual(Latin1General100CiAs.GetHashCode("O'Brien"), Latin1General100CiAs.GetHashCode("OBrien"));
     }
 
     [TestMethod]
     public void Win100_NullHandling()
     {
-        IsTrue(Collation.Latin1General100CiAs.Equals(null, null));
-        IsFalse(Collation.Latin1General100CiAs.Equals(null, "x"));
-        AreEqual(0, Collation.Latin1General100CiAs.Compare(null, null));
-        IsLessThan(0, Collation.Latin1General100CiAs.Compare(null, "x"));
-        IsGreaterThan(0, Collation.Latin1General100CiAs.Compare("x", null));
+        IsTrue(Latin1General100CiAs.Equals(null, null));
+        IsFalse(Latin1General100CiAs.Equals(null, "x"));
+        AreEqual(0, Latin1General100CiAs.Compare(null, null));
+        IsLessThan(0, Latin1General100CiAs.Compare(null, "x"));
+        IsGreaterThan(0, Latin1General100CiAs.Compare("x", null));
     }
 
     // ---- Latin1_General_CI_AS (Windows-style pre-v100) ----
@@ -122,21 +126,21 @@ public void Win80_BehavesLikeWin100_ForAsciiAndLatin1()
         // v100 are identical (the v100 update changed ordering for non-
         // Latin scripts and a handful of newly-added supplementary code
         // points; none reach the regression bar).
-        IsTrue(Collation.Latin1GeneralCiAs.Equals("abc", "ABC"));
-        AreEqual(0, Collation.Latin1GeneralCiAs.Compare("'A", "A"));
-        IsFalse(Collation.Latin1GeneralCiAs.Equals("'A", "A"));
-        IsLessThan(0, Collation.Latin1GeneralCiAs.Compare("Aaronsburg", "'Aiea"));
+        IsTrue(Latin1GeneralCiAs.Equals("abc", "ABC"));
+        AreEqual(0, Latin1GeneralCiAs.Compare("'A", "A"));
+        IsFalse(Latin1GeneralCiAs.Equals("'A", "A"));
+        IsLessThan(0, Latin1GeneralCiAs.Compare("Aaronsburg", "'Aiea"));
     }
 
     [TestMethod]
     public void Win80_HashCode_AgreesWithEquals()
-        => AreEqual(Collation.Latin1GeneralCiAs.GetHashCode("AbC"), Collation.Latin1GeneralCiAs.GetHashCode("abc"));
+        => AreEqual(Latin1GeneralCiAs.GetHashCode("AbC"), Latin1GeneralCiAs.GetHashCode("abc"));
 
     // ---- Latin1_General_CS_AS ----
 
     [TestMethod]
     public void CsAs_AccentSensitive()
-        => IsFalse(Collation.Latin1GeneralCsAs.Equals("e", "é"));
+        => IsFalse(Latin1GeneralCsAs.Equals("e", "é"));
 
     // ---- Latin1_General_BIN ----
 
@@ -146,9 +150,11 @@ public void Bin_StrictCodepoint_DistinguishesNfdAndNfc()
         // NFC = single precomposed U+00E9; NFD = base 'e' + combining
         // U+0301. Ordinal compare treats them as distinct byte sequences;
         // CompareInfo-based comparers (Sql, Win100, CsAs) fold them.
+        // Spelled with escapes so editor / tool normalization can't collapse
+        // the two literals into the same encoded form.
         const string nfc = "é";
         const string nfd = "é";
-        IsFalse(Collation.Latin1GeneralBin.Equals(nfc, nfd));
+        IsFalse(Latin1GeneralBin.Equals(nfc, nfd));
         IsTrue(Collation.Default.Equals(nfc, nfd));
     }
 }

SqlServerSimulator/Collation.cs

@@ -75,53 +75,14 @@ private protected Collation()
     /// </summary>
     internal static Collation Default => defaultLazy.Value;
 
-    /// <summary>
-    /// Convenience accessor for the v100 Windows-style CI_AS variant.
-    /// Retained for the internal test surface that exercises the dormant
-    /// Windows-CI body directly; new call sites should use
-    /// <see cref="TryGet"/> with the literal name.
-    /// </summary>
-    internal static Collation Latin1General100CiAs => latin1General100CiAsLazy.Value;
-
-    /// <summary>
-    /// Convenience accessor for the pre-v100 Windows-style CI_AS variant.
-    /// Same retention rationale as <see cref="Latin1General100CiAs"/>.
-    /// </summary>
-    internal static Collation Latin1GeneralCiAs => latin1GeneralCiAsLazy.Value;
-
-    /// <summary>
-    /// Convenience accessor for the Windows-style CS_AS variant. Same
-    /// retention rationale as <see cref="Latin1General100CiAs"/>.
-    /// </summary>
-    internal static Collation Latin1GeneralCsAs => latin1GeneralCsAsLazy.Value;
-
-    /// <summary>
-    /// Convenience accessor for the pre-2005 binary collation (asymmetric
-    /// position-0-codeunit / position-1+-codepoint compare on nvarchar).
-    /// Same retention rationale as <see cref="Latin1General100CiAs"/>.
-    /// </summary>
-    internal static Collation Latin1GeneralBin => latin1GeneralBinLazy.Value;
-
-    // <see cref="Lazy{T}"/> wrappers defer the <see cref="TryGet"/> call
+    // <see cref="Lazy{T}"/> wrapper defers the <see cref="TryGet"/> call
     // until first access — the alternative (eager field initialization)
     // races the parser-state fields across partial-class file boundaries
     // and the textual-order guarantee for static-field initializers
     // doesn't cross those.
     private static readonly Lazy<Collation> defaultLazy =
         new(() => TryGet("SQL_Latin1_General_CP1_CI_AS")!);
 
-    private static readonly Lazy<Collation> latin1General100CiAsLazy =
-        new(() => TryGet("Latin1_General_100_CI_AS")!);
-
-    private static readonly Lazy<Collation> latin1GeneralCiAsLazy =
-        new(() => TryGet("Latin1_General_CI_AS")!);
-
-    private static readonly Lazy<Collation> latin1GeneralCsAsLazy =
-        new(() => TryGet("Latin1_General_CS_AS")!);
-
-    private static readonly Lazy<Collation> latin1GeneralBinLazy =
-        new(() => TryGet("Latin1_General_BIN")!);
-
     /// <summary>
     /// SQL Server's collation-coercibility resolution for two operands.
     /// Returns the winning <see cref="Collation"/> and <see cref="Coercibility"/>