From 42019a17bf69a929266dc5a042b9e0354bf81b23 Mon Sep 17 00:00:00 2001
From: Piotr Zajac <p.zajac@accenture.com>
Date: Mon, 28 Apr 2025 12:16:32 +0200
Subject: [PATCH] Remove AutoFixture.Xunit2 dependency from
 CustomizeAttributeComparer

---
 .../Comparers/CustomizeAttributeComparerTests.cs      |  2 +-
 .../Attributes/AutoDataAdapterAttribute.cs            |  2 +-
 .../Comparers/CustomizeAttributeComparer.cs           | 11 ++++-------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/Objectivity.AutoFixture.XUnit2.Core.Tests/Comparers/CustomizeAttributeComparerTests.cs b/src/Objectivity.AutoFixture.XUnit2.Core.Tests/Comparers/CustomizeAttributeComparerTests.cs
index 0bb58199..10672a10 100644
--- a/src/Objectivity.AutoFixture.XUnit2.Core.Tests/Comparers/CustomizeAttributeComparerTests.cs
+++ b/src/Objectivity.AutoFixture.XUnit2.Core.Tests/Comparers/CustomizeAttributeComparerTests.cs
@@ -12,7 +12,7 @@
     [Trait("Category", "Comparers")]
     public class CustomizeAttributeComparerTests
     {
-        private static readonly CustomizeAttributeComparer Comparer = new();
+        private static readonly CustomizeAttributeComparer<FrozenAttribute> Comparer = new();
         private static readonly CustomizeWithAttribute CustomizeAttribute = new(typeof(DoNotThrowOnRecursionCustomization));
         private static readonly FrozenAttribute FrozenAttribute = new();
 
diff --git a/src/Objectivity.AutoFixture.XUnit2.Core/Attributes/AutoDataAdapterAttribute.cs b/src/Objectivity.AutoFixture.XUnit2.Core/Attributes/AutoDataAdapterAttribute.cs
index 9057264e..83cad92e 100644
--- a/src/Objectivity.AutoFixture.XUnit2.Core/Attributes/AutoDataAdapterAttribute.cs
+++ b/src/Objectivity.AutoFixture.XUnit2.Core/Attributes/AutoDataAdapterAttribute.cs
@@ -46,7 +46,7 @@ private void CustomizeFixture(ParameterInfo p)
         {
             var customizeAttributes = p.GetCustomAttributes()
                 .OfType<IParameterCustomizationSource>()
-                .OrderBy(x => x, new CustomizeAttributeComparer());
+                .OrderBy(x => x, new CustomizeAttributeComparer<FrozenAttribute>());
 
             foreach (var ca in customizeAttributes)
             {
diff --git a/src/Objectivity.AutoFixture.XUnit2.Core/Comparers/CustomizeAttributeComparer.cs b/src/Objectivity.AutoFixture.XUnit2.Core/Comparers/CustomizeAttributeComparer.cs
index db3366f1..149fb219 100644
--- a/src/Objectivity.AutoFixture.XUnit2.Core/Comparers/CustomizeAttributeComparer.cs
+++ b/src/Objectivity.AutoFixture.XUnit2.Core/Comparers/CustomizeAttributeComparer.cs
@@ -3,17 +3,14 @@
     using System.Collections.Generic;
 
     using global::AutoFixture;
-    using global::AutoFixture.Xunit2;
 
-    /// <summary>
-    /// Direct copy from the AutoFixture source code as the original class is internal.
-    /// </summary>
-    internal class CustomizeAttributeComparer : Comparer<IParameterCustomizationSource>
+    internal class CustomizeAttributeComparer<T> : Comparer<IParameterCustomizationSource>
+        where T : IParameterCustomizationSource
     {
         public override int Compare(IParameterCustomizationSource x, IParameterCustomizationSource y)
         {
-            var isXFrozen = x is FrozenAttribute;
-            var isYFrozen = y is FrozenAttribute;
+            var isXFrozen = x is T;
+            var isYFrozen = y is T;
 
             if (isXFrozen && !isYFrozen)
             {