Get TUnit.Assertions building

thomhurst · Dec 20, 2024 · b77e7e9 · b77e7e9
1 parent d88ddc7
commit b77e7e9
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 8 deletions.
diff --git a/TUnit.Assertions/AssertionBuilders/Groups/OrAssertionGroup.cs b/TUnit.Assertions/AssertionBuilders/Groups/OrAssertionGroup.cs
@@ -41,9 +41,8 @@ public OrAssertionGroup<TActual, TAssertionBuilder> Or(Func<TAssertionBuilder, I
 
     private void Push(TAssertionBuilder assertionBuilder, Func<TAssertionBuilder, InvokableAssertionBuilder<TActual>> assert)
     {
-        if (_assertConditions.Count > 0)
+        if (_assertConditions.TryPop(out var assertCondition))
         {
-            var assertCondition = _assertConditions.Pop();
             _assertConditions.Push(new OrAssertCondition<TActual>(assertCondition, assert(assertionBuilder).Assertions.Pop()));
         }
         else

diff --git a/TUnit.Assertions/Assertions/Generics/Conditions/EquivalentToExpectedValueAssertCondition.cs b/TUnit.Assertions/Assertions/Generics/Conditions/EquivalentToExpectedValueAssertCondition.cs
@@ -40,7 +40,7 @@ protected override AssertionResult GetResult(TActual? actualValue, TExpected? ex
                         {
                             MembersToIgnore = [.._ignoredMembers]
                         })),
-                    () => $"it is {string.Join(',', actualEnumerable)}");
+                    () => $"it is {string.Join(",", actualEnumerable)}");
         }
 
         bool? isEqual = null;
@@ -78,7 +78,7 @@ protected override AssertionResult GetResult(TActual? actualValue, TExpected? ex
             }
 
             return FailWithMessage($"""
-                                    {firstFailure.Type} {string.Join('.', firstFailure.NestedMemberNames)} did not match
+                                    {firstFailure.Type} {string.Join(".", firstFailure.NestedMemberNames)} did not match
                                     Expected: {Formatter.Format(firstFailure.Expected)}
                                     Received: {Formatter.Format(firstFailure.Actual)}
                                     """);

diff --git a/TUnit.Assertions/Compare.cs b/TUnit.Assertions/Compare.cs
@@ -83,7 +83,7 @@ private static IEnumerable<ComparisonFailure> CheckEquivalent<
             {
                 string?[] readOnlySpan = [..memberNames, $"[{i}]"];
 
-                if (options.MembersToIgnore.Contains(string.Join('.', readOnlySpan)))
+                if (options.MembersToIgnore.Contains(string.Join(".", readOnlySpan)))
                 {
                     continue;
                 }
@@ -106,7 +106,7 @@ private static IEnumerable<ComparisonFailure> CheckEquivalent<
         {
             string?[] readOnlySpan = [..memberNames, fieldName];
 
-            if (options.MembersToIgnore.Contains(string.Join('.', readOnlySpan)))
+            if (options.MembersToIgnore.Contains(string.Join(".", readOnlySpan)))
             {
                 continue;
             }
@@ -147,7 +147,7 @@ private static IEnumerable<ComparisonFailure> CheckEquivalent<
         {
             string?[] readOnlySpan = [..memberNames, propertyName];
 
-            if (options.MembersToIgnore.Contains(string.Join('.', readOnlySpan)))
+            if (options.MembersToIgnore.Contains(string.Join(".", readOnlySpan)))
             {
                 continue;
             }

diff --git a/TUnit.Engine/PolyfillExtensions.cs b/TUnit.Engine/PolyfillExtensions.cs
@@ -1,4 +1,6 @@
-namespace TUnit;
+using System.Diagnostics.CodeAnalysis;
+
+namespace TUnit;
 
 static class PolyfillExtensions
 {
@@ -8,6 +10,27 @@ internal static void Deconstruct<K, V>(this KeyValuePair<K, V> pair, out K key,
         val = pair.Value;
     }
 
+    internal static string ReplaceLineEndings(this string value, string replacement)
+    {
+        return value.Replace("\r\n", replacement)
+            .Replace("\n", replacement)
+            .Replace("\r", replacement);
+    }
+
+    internal static bool StartsWith(this string value, char ch) => value.Length > 0 && value[0] == ch;
+
+    internal static bool TryPop<T>(this Stack<T> stack, [MaybeNullWhen(false)] out T value)
+    {
+        if (stack.Count == 0)
+        {
+            value = default;
+            return false;
+        }
+
+        value = stack.Pop();
+        return true;
+    }
+
     internal static IOrderedEnumerable<T> Order<T>(this IEnumerable<T> source) => source.OrderBy(v => v);
 
     /// <summary>Returns the minimum value in a generic sequence according to a specified key selector function.</summary>