xunit/xunit#2913: Assert.Equivalent behaves incorrectly with decimal …

…values
xunit · Apr 9, 2024 · 884e685 · 884e685
1 parent 1c6ea08
commit 884e685
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/Sdk/AssertHelper.cs b/Sdk/AssertHelper.cs
@@ -7,6 +7,7 @@
 #pragma warning disable CS8603
 #pragma warning disable CS8604
 #pragma warning disable CS8621
+#pragma warning disable CS8625
 #endif
 
 using System;
@@ -266,8 +267,16 @@ static IEnumerable<T> ToEnumerableImpl<T>(IAsyncEnumerable<T> data)
 			out object converted)
 #endif
 		{
-			converted = Convert.ChangeType(value, targetType, CultureInfo.CurrentCulture);
-			return converted != null;
+			try
+			{
+				converted = Convert.ChangeType(value, targetType, CultureInfo.CurrentCulture);
+				return converted != null;
+			}
+			catch (InvalidCastException)
+			{
+				converted = null;
+				return false;
+			}
 		}
 
 #if XUNIT_NULLABLE
@@ -335,7 +344,7 @@ static IEnumerable<T> ToEnumerableImpl<T>(IAsyncEnumerable<T> data)
 				var actualTypeInfo = actualType.GetTypeInfo();
 
 				// Primitive types, enums and strings should just fall back to their Equals implementation
-				if (expectedTypeInfo.IsPrimitive || expectedTypeInfo.IsEnum || expectedType == typeof(string))
+				if (expectedTypeInfo.IsPrimitive || expectedTypeInfo.IsEnum || expectedType == typeof(string) || expectedType == typeof(decimal))
 					return VerifyEquivalenceIntrinsics(expected, actual, prefix);
 
 				// DateTime and DateTimeOffset need to be compared via IComparable (because of a circular