Fix issue with xUnit20207 where value is already casted to ISet<T> or…

… IReadOnlySet<T>
xunit · Dec 30, 2023 · 336423e · 336423e
1 parent a39562e
commit 336423e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/src/xunit.analyzers.tests/Analyzers/X2000/SetEqualityAnalyzerTests.cs b/src/xunit.analyzers.tests/Analyzers/X2000/SetEqualityAnalyzerTests.cs
@@ -234,6 +234,29 @@ public void TestMethod() {{
 			await Verify.VerifyAnalyzer(LanguageVersion.CSharp7, new[] { code, customSetAndComparer });
 		}
 
+		[Fact]
+		public async void CastedSet_DoesNotTrigger()
+		{
+			var code = @"
+using Xunit;
+using System.Collections.Generic;
+
+public class TestClass {
+    [Fact]
+    public void TestMethod() {
+        var expected = new HashSet<string> { ""bar"", ""foo"" };
+        var actual = new HashSet<string> { ""foo"", ""bar"" };
+
+         Assert.Equal(expected, actual);
+         Assert.Equal(expected, (ISet<string>)actual);
+         Assert.Equal((ISet<string>)expected, actual);
+         Assert.Equal((ISet<string>)expected, (ISet<string>)actual);
+    }
+}";
+
+			await Verify.VerifyAnalyzer(code);
+		}
+
 		public static MatrixTheoryData<string, (string type, string initializer)> MethodAndTypeAndInitializer =>
 			new(
 				new[] { "Equal", "NotEqual" },

diff --git a/src/xunit.analyzers/X2000/SetEqualityAnalyzer.cs b/src/xunit.analyzers/X2000/SetEqualityAnalyzer.cs
@@ -56,6 +56,7 @@ protected override void AnalyzeInvocation(
 		var interface0Type =
 			collection0Type
 				.AllInterfaces
+				.Concat(new[] { collection0Type })
 				.Where(i => i.IsGenericType)
 				.FirstOrDefault(i => setInterfaces.Contains(i.ConstructUnboundGenericType()));
 
@@ -64,6 +65,7 @@ protected override void AnalyzeInvocation(
 		var interface1Type =
 			collection1Type
 				.AllInterfaces
+				.Concat(new[] { collection1Type })
 				.Where(i => i.IsGenericType)
 				.FirstOrDefault(i => setInterfaces.Contains(i.ConstructUnboundGenericType()));