增加单元测试

Author: xljiulang

WebApiClientCore.Test/BuildinExtensions/AttributeExtensionsTest.cs

@@ -6,32 +6,16 @@ namespace WebApiClientCore.Test.BuildinExtensions
 {
     public class AttributeExtensionsTest
     {
-        interface IAttribute
-        {
-        }
 
-        class MyAttribute : Attribute, IAttribute
+        class MyAttribute : Attribute
         {
         }
 
-        class YourAttribute : Attribute, IAttribute
+        class YourAttribute : Attribute
         {
         }
 
-        class MyClass
-        {
-            [My]
-            public int Age { get; set; }
-
-            [My, Your]
-            public string Name { get; set; }
-
-            public void Set(int age, [My, Your] string name)
-            {
-            }
-        }
-
-        class D1
+        class Class1
         {
             public void M1()
             {
@@ -42,16 +26,36 @@ public void M2()
             {
             }
         }
-         
+
+        [My]
+        interface Inteface1
+        {
+        }
+
+        [My]
+        interface Interface2 : Inteface1
+        {
+        }
+
+        [Your]
+        [My]
+        interface Interface3 : Interface2
+        {
+        }
+
+
 
         [Fact]
         public void GetAttributesTest()
         {
-            var m1 = typeof(D1).GetMethod("M1");
-            var m2 = typeof(D1).GetMethod("M2");
+            var m1 = typeof(Class1).GetMethod("M1");
+            var m2 = typeof(Class1).GetMethod("M2");
 
             Assert.True(m1.GetAttributes<MyAttribute>().Count() == 0);
             Assert.True(m2.GetAttributes<MyAttribute>().Count() == 1);
+
+            Assert.Equal(2, typeof(Interface2).GetAttributes<Attribute>(inclueBases: true).Count());
+            Assert.Equal(4, typeof(Interface3).GetAttributes<Attribute>(inclueBases: true).Count());
         }
     }
 }

WebApiClientCore/ApiActionDescriptor.cs

@@ -87,14 +87,14 @@ public ApiActionDescriptor(MethodInfo method, Type? interfaceType = default)
             // 接口特性优先于方法所在类型的特性
             var actionAttributes = method
                 .GetAttributes<IApiActionAttribute>()
-                .Concat(interfaceType.GetAttributes<IApiActionAttribute>())
+                .Concat(interfaceType.GetAttributes<IApiActionAttribute>(inclueBases: true))
                 .Distinct(MultiplableComparer<IApiActionAttribute>.Default)
                 .OrderBy(item => item.OrderIndex)
                 .ToReadOnlyList();
 
             var filterAttributes = method
                 .GetAttributes<IApiFilterAttribute>()
-                .Concat(interfaceType.GetAttributes<IApiFilterAttribute>())
+                .Concat(interfaceType.GetAttributes<IApiFilterAttribute>(inclueBases: true))
                 .Distinct(MultiplableComparer<IApiFilterAttribute>.Default)
                 .OrderBy(item => item.OrderIndex)
                 .Where(item => item.Enable)

WebApiClientCore/ApiReturnDescriptor.cs

@@ -62,7 +62,7 @@ public ApiReturnDescriptor(MethodInfo method, Type interfaceType)
             this.DataType = dataType;
             this.Attributes = method
                 .GetAttributes<IApiReturnAttribute>()
-                .Concat(interfaceType.GetAttributes<IApiReturnAttribute>())
+                .Concat(interfaceType.GetAttributes<IApiReturnAttribute>(inclueBases: true))
                 .Concat(GetDefaultAttributes(dataType))
                 .Distinct(MultiplableComparer<IApiReturnAttribute>.Default)
                 .OrderBy(item => item.OrderIndex)

WebApiClientCore/BuildinExtensions/AttributeExtensions.cs

@@ -44,17 +44,20 @@ public static IEnumerable<TAttribute> GetAttributes<TAttribute>(this ParameterIn
         }
 
         /// <summary>
-        /// 获取接口以及其基础接口定义的特性
+        /// 获取接口定义的特性
         /// </summary>
         /// <typeparam name="TAttribute"></typeparam>
-        /// <param name="interfaceType">接口类型</param> 
+        /// <param name="interfaceType">接口类型</param>
+        /// <param name="inclueBases">是否包括基础接口定义的特性</param> 
         /// <returns></returns>
-        public static IEnumerable<TAttribute> GetAttributes<TAttribute>(this Type interfaceType) where TAttribute : class
+        public static IEnumerable<TAttribute> GetAttributes<TAttribute>(this Type interfaceType, bool inclueBases) where TAttribute : class
         {
-            return new[] { interfaceType }
-                .Concat(interfaceType.GetInterfaces())
-                .SelectMany(item => item.GetCustomAttributes()
-                .OfType<TAttribute>());
+            var types = Enumerable.Repeat(interfaceType, 1);
+            if (inclueBases == true)
+            {
+                types = types.Concat(interfaceType.GetInterfaces());
+            }
+            return types.SelectMany(item => item.GetCustomAttributes().OfType<TAttribute>());
         }
     }
 }