Update to simplified version of AutoMockedDataAttribute

Author: Krusen

BencodeNET.Tests/AutoMockedDataAttribute.cs

@@ -5,25 +5,31 @@
 
 namespace BencodeNET.Tests
 {
-    public class AutoMockedDataAttribute : AutoDataAttribute
+    public class AutoMockedDataAttribute : CompositeDataAttribute
     {
         public AutoMockedDataAttribute()
-            : base(() => new Fixture().Customize(new AutoNSubstituteCustomization {ConfigureMembers = true}))
+            : this(new BaseAutoMockedDataAttribute())
         { }
-    }
 
-    public class InlineAutoMockedDataAttribute : CompositeDataAttribute
-    {
-        public InlineAutoMockedDataAttribute()
-            : this(new AutoMockedDataAttribute())
+        public AutoMockedDataAttribute(params object[] values)
+            : this(new BaseAutoMockedDataAttribute(), values)
         { }
 
-        public InlineAutoMockedDataAttribute(params object[] values)
-            : this(new AutoMockedDataAttribute(), values)
+        private AutoMockedDataAttribute(BaseAutoMockedDataAttribute baseAutoDataAttribute, params object[] values)
+            : base(new InlineDataAttribute(values), baseAutoDataAttribute)
         { }
 
-        public InlineAutoMockedDataAttribute(AutoMockedDataAttribute autoDataAttributeAttribute, params object[] values)
-            : base(new InlineDataAttribute(values), autoDataAttributeAttribute)
-        { }
+        private class BaseAutoMockedDataAttribute : AutoDataAttribute
+        {
+            public BaseAutoMockedDataAttribute()
+                : base(Configure)
+            {
+            }
+
+            private static IFixture Configure()
+            {
+                return new Fixture().Customize(new AutoNSubstituteCustomization { ConfigureMembers = true });
+            }
+        }
     }
 }

BencodeNET.Tests/Torrents/TorrentParserTests.cs

@@ -130,10 +130,10 @@ public void CreationDate_InvalidValue_ReturnsEpoch()
         }
 
         [Theory]
-        [InlineAutoMockedData("utf8")]
-        [InlineAutoMockedData("UTF8")]
-        [InlineAutoMockedData("utf-8")]
-        [InlineAutoMockedData("UTF-8")]
+        [AutoMockedData("utf8")]
+        [AutoMockedData("UTF8")]
+        [AutoMockedData("utf-8")]
+        [AutoMockedData("UTF-8")]
         public void Encoding_UTF8_CanBeParsed(string encoding)
         {
             // Arrange
@@ -149,8 +149,8 @@ public void Encoding_UTF8_CanBeParsed(string encoding)
         }
 
         [Theory]
-        [InlineAutoMockedData("ascii")]
-        [InlineAutoMockedData("ASCII")]
+        [AutoMockedData("ascii")]
+        [AutoMockedData("ASCII")]
         public void Encoding_ASCII_CanBeParsed(string encoding)
         {
             // Arrange
@@ -166,10 +166,10 @@ public void Encoding_ASCII_CanBeParsed(string encoding)
         }
 
         [Theory]
-        [InlineAutoMockedData("")]
-        [InlineAutoMockedData("asdf")]
-        [InlineAutoMockedData("1")]
-        [InlineAutoMockedData("UTF 8")]
+        [AutoMockedData("")]
+        [AutoMockedData("asdf")]
+        [AutoMockedData("1")]
+        [AutoMockedData("UTF 8")]
         public void Encoding_InvalidValidAsNull(string encoding)
         {
             // Arrange
@@ -220,11 +220,11 @@ public void Info_Pieces_IsParsed([RepeatCount(20)] byte[] pieces)
         }
 
         [Theory]
-        [InlineAutoMockedData(-1, false)]
-        [InlineAutoMockedData(0, false)]
-        [InlineAutoMockedData(1, true)]
-        [InlineAutoMockedData(42, false)]
-        [InlineAutoMockedData(12345, false)]
+        [AutoMockedData(-1, false)]
+        [AutoMockedData(0, false)]
+        [AutoMockedData(1, true)]
+        [AutoMockedData(42, false)]
+        [AutoMockedData(12345, false)]
         public void Info_Private_ShouldBeTrueOnlyIfValueIsOne(int value, bool expectedResult)
         {
             // Arrange

BencodeNET.Tests/Torrents/TorrentTests.cs

@@ -189,9 +189,9 @@ public void PiecesAsHexString_Set_NullThrowsArgumentException()
         }
 
         [Theory]
-        [InlineAutoMockedData("qwer")]
-        [InlineAutoMockedData("123456789012345678901234567890123456789")]
-        [InlineAutoMockedData("12345678901234567890123456789012345678901")]
+        [AutoMockedData("qwer")]
+        [AutoMockedData("123456789012345678901234567890123456789")]
+        [AutoMockedData("12345678901234567890123456789012345678901")]
         public void PiecesAsHexString_Set_LengthNotMultipleOf40ShouldThrowArgumentException(string value)
         {
             var torrent = new Torrent();
@@ -200,15 +200,15 @@ public void PiecesAsHexString_Set_LengthNotMultipleOf40ShouldThrowArgumentExcept
         }
 
         [Theory]
-        [InlineAutoMockedData("a")]
-        [InlineAutoMockedData("b")]
-        [InlineAutoMockedData("c")]
-        [InlineAutoMockedData("G")]
-        [InlineAutoMockedData("H")]
-        [InlineAutoMockedData("T")]
-        [InlineAutoMockedData(".")]
-        [InlineAutoMockedData("*")]
-        [InlineAutoMockedData("[")]
+        [AutoMockedData("a")]
+        [AutoMockedData("b")]
+        [AutoMockedData("c")]
+        [AutoMockedData("G")]
+        [AutoMockedData("H")]
+        [AutoMockedData("T")]
+        [AutoMockedData(".")]
+        [AutoMockedData("*")]
+        [AutoMockedData("[")]
         public void PiecesAsHexString_Set_ValueWithNonUppercaseHexCharacterShouldThrowArgumentException(string value)
         {
             var torrent = new Torrent();