Added BaseAttributeTestBuilderWithOrderAndType base class.

Author: IvayloGoranov

src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Attributes/BaseAttributeTestBuilderWithOrderAndType.cs

@@ -0,0 +1,41 @@
+namespace MyTested.AspNetCore.Mvc.Builders.Attributes
+{
+    using System;
+    using Internal.TestContexts;
+    using Utilities;
+
+    public abstract class BaseAttributeTestBuilderWithOrderAndType<TAttribute> : BaseAttributeTestBuilderWithOrder<TAttribute>
+        where TAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BaseAttributeTestBuilderWithOrderAndType{TAttribute}"/> class.
+        /// </summary>
+        /// <param name="testContext"><see cref="ComponentTestContext"/> containing data about the currently executed assertion chain.</param>
+        /// <param name="attributeName">Attribute name to use in case of failed validation.</param>
+        /// <param name="failedValidationAction">Action to call in case of failed validation.</param>
+        protected BaseAttributeTestBuilderWithOrderAndType(
+            ComponentTestContext testContext,
+            string attributeName,
+            Action<string, string> failedValidationAction)
+            : base(testContext, attributeName, failedValidationAction)
+        {
+        }
+
+        protected virtual void ValidateType(Type type, Func<TAttribute, Type> getTypeValueFunc)
+        {
+            this.Attribute = (TAttribute)Activator.CreateInstance(typeof(TAttribute), type);
+            this.Validations.Add((expected, actual) =>
+            {
+                var expectedType = getTypeValueFunc(expected);
+                var actualType = getTypeValueFunc(actual);
+
+                if (Reflection.AreDifferentTypes(expectedType, actualType))
+                {
+                    this.FailedValidationAction(
+                        $"{this.ExceptionMessagePrefix}'{expectedType.ToFriendlyTypeName()}' type",
+                        $"in fact found '{actualType.ToFriendlyTypeName()}'");
+                }
+            });
+        }
+    }
+}

src/MyTested.AspNetCore.Mvc.Controllers.Attributes/Builders/Attributes/MiddlewareFilterAttributeTestBuilder.cs

@@ -9,7 +9,7 @@
     /// <summary>
     /// Used for testing <see cref="MiddlewareFilterAttribute"/>.
     /// </summary>
-    public class MiddlewareFilterAttributeTestBuilder : BaseAttributeTestBuilderWithOrder<MiddlewareFilterAttribute>,
+    public class MiddlewareFilterAttributeTestBuilder : BaseAttributeTestBuilderWithOrderAndType<MiddlewareFilterAttribute>,
         IAndMiddlewareFilterAttributeTestBuilder
     {
         /// <summary>
@@ -26,20 +26,7 @@ public MiddlewareFilterAttributeTestBuilder(
         /// <inheritdoc />
         public IAndMiddlewareFilterAttributeTestBuilder OfType(Type configurationType)
         {
-            this.Attribute = new MiddlewareFilterAttribute(configurationType);
-            this.Validations.Add((expected, actual) =>
-            {
-                var expectedType = expected.ConfigurationType;
-                var actualType = actual.ConfigurationType;
-
-                if (Reflection.AreDifferentTypes(expectedType, actualType))
-                {
-                    this.FailedValidationAction(
-                        $"{this.ExceptionMessagePrefix}'{expectedType.ToFriendlyTypeName()}' type",
-                        $"in fact found '{actualType.ToFriendlyTypeName()}'");
-                }
-            });
-
+            this.ValidateType(configurationType, attr => attr.ConfigurationType);
             return this;
         }
 

src/MyTested.AspNetCore.Mvc.Controllers.Attributes/Builders/Attributes/ServiceFilterAttributeTestBuilder.cs

@@ -9,7 +9,7 @@
     /// <summary>
     /// Used for testing <see cref="ServiceFilterAttribute"/>.
     /// </summary>
-    public class ServiceFilterAttributeTestBuilder : BaseAttributeTestBuilderWithOrder<ServiceFilterAttribute>,
+    public class ServiceFilterAttributeTestBuilder : BaseAttributeTestBuilderWithOrderAndType<ServiceFilterAttribute>,
         IAndServiceFilterAttributeTestBuilder
     {
         /// <summary>
@@ -26,20 +26,7 @@ public ServiceFilterAttributeTestBuilder(
         /// <inheritdoc />
         public IAndServiceFilterAttributeTestBuilder OfType(Type type)
         {
-            this.Attribute = new ServiceFilterAttribute(type);
-            this.Validations.Add((expected, actual) =>
-            {
-                var expectedType = expected.ServiceType;
-                var actualType = actual.ServiceType;
-
-                if (Reflection.AreDifferentTypes(expectedType, actualType))
-                {
-                    this.FailedValidationAction(
-                        $"{this.ExceptionMessagePrefix}'{expectedType.ToFriendlyTypeName()}' type",
-                        $"in fact found '{actualType.ToFriendlyTypeName()}'");
-                }
-            });
-
+            this.ValidateType(type, attr => attr.ServiceType);
             return this;
         }
 

src/MyTested.AspNetCore.Mvc.Controllers.Attributes/Builders/Attributes/TypeFilterAttributeTestBuilder.cs

@@ -12,7 +12,7 @@
     /// <summary>
     /// Used for testing <see cref="TypeFilterAttribute"/>.
     /// </summary>
-    public class TypeFilterAttributeTestBuilder : BaseAttributeTestBuilderWithOrder<TypeFilterAttribute>,
+    public class TypeFilterAttributeTestBuilder : BaseAttributeTestBuilderWithOrderAndType<TypeFilterAttribute>,
         IAndTypeFilterAttributeTestBuilder
     {
         /// <summary>
@@ -29,20 +29,7 @@ public TypeFilterAttributeTestBuilder(
         /// <inheritdoc />
         public IAndTypeFilterAttributeTestBuilder OfType(Type type)
         {
-            this.Attribute = new TypeFilterAttribute(type);
-            this.Validations.Add((expected, actual) =>
-            {
-                var expectedType = expected.ImplementationType;
-                var actualType = actual.ImplementationType;
-
-                if (Reflection.AreDifferentTypes(expectedType, actualType))
-                {
-                    this.FailedValidationAction(
-                        $"{this.ExceptionMessagePrefix}'{expectedType.ToFriendlyTypeName()}' type",
-                        $"in fact found '{actualType.ToFriendlyTypeName()}'");
-                }
-            });
-
+            this.ValidateType(type, attr => attr.ImplementationType);
             return this;
         }