Added member type validation for stringlength attribute relay (#1366)

AutoFixture · Feb 20, 2023 · 42ccdd5 · 42ccdd5
1 parent 6153ad1
commit 42ccdd5
Show file tree

Hide file tree

Showing 12 changed files with 318 additions and 59 deletions.
diff --git a/Src/AutoFixture/DataAnnotations/NumericRangedRequestRelay.cs b/Src/AutoFixture/DataAnnotations/NumericRangedRequestRelay.cs
@@ -12,10 +12,9 @@ public class NumericRangedRequestRelay : ISpecimenBuilder
         /// <inheritdoc />
         public object Create(object request, ISpecimenContext context)
         {
-            if (context == null) throw new ArgumentNullException(nameof(context));
+            if (context is null) throw new ArgumentNullException(nameof(context));
 
-            var rangedRequest = request as RangedRequest;
-            if (rangedRequest == null)
+            if (request is not RangedRequest rangedRequest)
                 return new NoSpecimen();
 
             if (!rangedRequest.MemberType.IsNumberType())

diff --git a/Src/AutoFixture/DataAnnotations/RangeAttributeRelay.cs b/Src/AutoFixture/DataAnnotations/RangeAttributeRelay.cs
@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-using System.Reflection;
 using AutoFixture.Kernel;
 
 namespace AutoFixture.DataAnnotations
@@ -33,21 +32,20 @@ public IRequestMemberTypeResolver RequestMemberTypeResolver
         /// </returns>
         public object Create(object request, ISpecimenContext context)
         {
-            if (context == null) throw new ArgumentNullException(nameof(context));
+            if (context is null) throw new ArgumentNullException(nameof(context));
 
             var rangeAttribute = TypeEnvy.GetAttribute<RangeAttribute>(request);
-            if (rangeAttribute == null)
+            if (rangeAttribute is null)
             {
                 return new NoSpecimen();
             }
 
             var memberType = this.GetMemberType(rangeAttribute, request);
-            var rangedRequest =
-                new RangedRequest(
-                    memberType,
-                    rangeAttribute.OperandType,
-                    rangeAttribute.Minimum,
-                    rangeAttribute.Maximum);
+            var rangedRequest = new RangedRequest(
+                memberType,
+                rangeAttribute.OperandType,
+                rangeAttribute.Minimum,
+                rangeAttribute.Maximum);
 
             return context.Resolve(rangedRequest);
         }

diff --git a/Src/AutoFixture/DataAnnotations/StringLengthAttributeRelay.cs b/Src/AutoFixture/DataAnnotations/StringLengthAttributeRelay.cs
@@ -9,6 +9,17 @@ namespace AutoFixture.DataAnnotations
     /// </summary>
     public class StringLengthAttributeRelay : ISpecimenBuilder
     {
+        private IRequestMemberTypeResolver requestMemberTypeResolver = new RequestMemberTypeResolver();
+
+        /// <summary>
+        /// Gets or sets the current IRequestMemberTypeResolver.
+        /// </summary>
+        public IRequestMemberTypeResolver RequestMemberTypeResolver
+        {
+            get => this.requestMemberTypeResolver;
+            set => this.requestMemberTypeResolver = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
         /// <summary>
         /// Creates a new specimen based on a specified length of characters that are allowed.
         /// </summary>
@@ -21,23 +32,34 @@ public class StringLengthAttributeRelay : ISpecimenBuilder
         /// </returns>
         public object Create(object request, ISpecimenContext context)
         {
-            if (request == null)
+            if (context is null) throw new ArgumentNullException(nameof(context));
+
+            if (request is null)
             {
                 return new NoSpecimen();
             }
 
-            if (context == null)
+            var attribute = TypeEnvy.GetAttribute<StringLengthAttribute>(request);
+            if (attribute is null)
             {
-                throw new ArgumentNullException(nameof(context));
+                return new NoSpecimen();
+            }
+
+            if (!this.RequestMemberTypeResolver.TryGetMemberType(request, out var memberType))
+            {
+                return new NoSpecimen();
             }
 
-            var stringLengthAttribute = TypeEnvy.GetAttribute<StringLengthAttribute>(request);
-            if (stringLengthAttribute == null)
+            if (memberType != typeof(string))
             {
                 return new NoSpecimen();
             }
 
-            return context.Resolve(new ConstrainedStringRequest(stringLengthAttribute.MinimumLength, stringLengthAttribute.MaximumLength));
+            var stringRequest = new ConstrainedStringRequest(
+                attribute.MinimumLength,
+                attribute.MaximumLength);
+
+            return context.Resolve(stringRequest);
         }
     }
-}
+}
diff --git a/Src/AutoFixtureUnitTest/DataAnnotations/StringLengthArgumentSupportTests.cs b/Src/AutoFixtureUnitTest/DataAnnotations/StringLengthArgumentSupportTests.cs
@@ -11,11 +11,14 @@ public void FixtureCorrectlyCreatesShortText()
         {
             // Arrange
             var fixture = new Fixture();
+
             // Act
             var actual = fixture.Create<ClassWithShortStringLengthConstrainedConstructorArgument>();
+
             // Assert
             Assert.True(
-                actual.ShortText.Length <= ClassWithShortStringLengthConstrainedConstructorArgument.ShortTextMaximumLength,
+                actual.ShortText.Length <=
+                ClassWithShortStringLengthConstrainedConstructorArgument.ShortTextMaximumLength,
                 "AutoFixture should respect [StringLength] attribute on constructor arguments.");
         }
 
@@ -24,8 +27,10 @@ public void FixtureCorrectlyCreatesLongText()
         {
             // Arrange
             var fixture = new Fixture();
+
             // Act
             var actual = fixture.Create<ClassWithLongStringLengthConstrainedConstructorArgument>();
+
             // Assert
             Assert.Equal(
                 ClassWithLongStringLengthConstrainedConstructorArgument.LongTextLength,
@@ -38,7 +43,7 @@ private class ClassWithShortStringLengthConstrainedConstructorArgument
             public readonly string ShortText;
 
             public ClassWithShortStringLengthConstrainedConstructorArgument(
-                [StringLength(ShortTextMaximumLength)]string shortText)
+                [StringLength(ShortTextMaximumLength)] string shortText)
             {
                 this.ShortText = shortText;
             }
@@ -50,10 +55,10 @@ private class ClassWithLongStringLengthConstrainedConstructorArgument
             public readonly string LongText;
 
             public ClassWithLongStringLengthConstrainedConstructorArgument(
-                [StringLength(LongTextLength, MinimumLength = LongTextLength)]string longText)
+                [StringLength(LongTextLength, MinimumLength = LongTextLength)] string longText)
             {
                 this.LongText = longText;
             }
         }
     }
-}
+}