Unit tests for #2828 (v2)

bradwilson · bradwilson · commit ca683935df91 · 2023-11-28T11:38:20.000-08:00
diff --git a/src/xunit.assert/Asserts b/src/xunit.assert/Asserts
@@ -1 +1 @@
-Subproject commit c35ef46d50ff0f6141cbab58c8aa746587eb9d3a
+Subproject commit 6e0a7cd70648f8bd1a94e08a827aae1297d5a775
diff --git a/test/test.xunit.assert/Asserts/EqualityAssertsTests.cs b/test/test.xunit.assert/Asserts/EqualityAssertsTests.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using Xunit;
 using Xunit.Sdk;
 
@@ -1046,6 +1047,53 @@ public bool Equals(IEnumerable? x, IEnumerable? y)
 				public int GetHashCode([DisallowNull] IEnumerable obj) =>
 					throw new NotImplementedException();
 			}
+
+			[Fact]
+			public void CollectionWithIEquatable_Equal()
+			{
+				var expected = new EnumerableEquatable<int> { 42, 2112 };
+				var actual = new EnumerableEquatable<int> { 2112, 42 };
+
+				Assert.Equal(expected, actual);
+			}
+
+			[Fact]
+			public void CollectionWithIEquatable_NotEqual()
+			{
+				var expected = new EnumerableEquatable<int> { 42, 2112 };
+				var actual = new EnumerableEquatable<int> { 2112, 2600 };
+
+				var ex = Record.Exception(() => Assert.Equal(expected, actual));
+
+				Assert.IsType<EqualException>(ex);
+				// No pointers because it's relying on IEquatable<>
+				Assert.Equal(
+					"Assert.Equal() Failure: Collections differ" + Environment.NewLine +
+					"Expected: [42, 2112]" + Environment.NewLine +
+					"Actual:   [2112, 2600]",
+					ex.Message
+				);
+			}
+
+			public sealed class EnumerableEquatable<T> :
+				IEnumerable<T>, IEquatable<EnumerableEquatable<T>>
+			{
+				List<T> values = new();
+
+				public void Add(T value) => values.Add(value);
+
+				public bool Equals(EnumerableEquatable<T>? other)
+				{
+					if (other == null)
+						return false;
+
+					return !values.Except(other.values).Any() && !other.values.Except(values).Any();
+				}
+
+				public IEnumerator<T> GetEnumerator() => values.GetEnumerator();
+
+				IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+			}
 		}
 
 		public class Dictionaries
@@ -3007,6 +3055,52 @@ public void NonZeroBoundedArrays_NotEqual()
 
 				Assert.NotEqual(expected, actual);
 			}
+
+			[Fact]
+			public void CollectionWithIEquatable_Equal()
+			{
+				var expected = new EnumerableEquatable<int> { 42, 2112 };
+				var actual = new EnumerableEquatable<int> { 2112, 42 };
+
+				var ex = Record.Exception(() => Assert.NotEqual(expected, actual));
+
+				Assert.IsType<NotEqualException>(ex);
+				Assert.Equal(
+					"Assert.NotEqual() Failure: Collections are equal" + Environment.NewLine +
+					"Expected: Not [42, 2112]" + Environment.NewLine +
+					"Actual:       [2112, 42]",
+					ex.Message
+				);
+			}
+
+			[Fact]
+			public void CollectionWithIEquatable_NotEqual()
+			{
+				var expected = new EnumerableEquatable<int> { 42, 2112 };
+				var actual = new EnumerableEquatable<int> { 2112, 2600 };
+
+				Assert.NotEqual(expected, actual);
+			}
+
+			public sealed class EnumerableEquatable<T> :
+				IEnumerable<T>, IEquatable<EnumerableEquatable<T>>
+			{
+				List<T> values = new();
+
+				public void Add(T value) => values.Add(value);
+
+				public bool Equals(EnumerableEquatable<T>? other)
+				{
+					if (other == null)
+						return false;
+
+					return !values.Except(other.values).Any() && !other.values.Except(values).Any();
+				}
+
+				public IEnumerator<T> GetEnumerator() => values.GetEnumerator();
+
+				IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+			}
 		}
 
 		public class Dictionaries
