Add support for null as argument for the NUnit3 InlineAutoDataAttribu…

…te (#1129)
AutoFixture · Jun 13, 2019 · 9eb5953 · 9eb5953
1 parent bf99694
commit 9eb5953
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 10 deletions.
diff --git a/Src/AutoFixture.NUnit3.UnitTest/InlineAutoDataAttributeTest.cs b/Src/AutoFixture.NUnit3.UnitTest/InlineAutoDataAttributeTest.cs
@@ -11,12 +11,6 @@ namespace AutoFixture.NUnit3.UnitTest
     [TestFixture]
     public class InlineAutoDataAttributeTest
     {
-        [Test]
-        public void IfArguementsIsNullThenThrows()
-        {
-            Assert.Throws<ArgumentNullException>(() => new InlineAutoDataAttribute(null));
-        }
-
         [Test]
         public void IfExtendedWithNullFixtureThenThrows()
         {
@@ -109,6 +103,18 @@ public void InitializedWithArgumentsHasCorrectArguments()
             Assert.AreSame(expectedArguments, result);
         }
 
+        [Test]
+        public void ArgumentsIsNullBecomesObjectArrayWithNull()
+        {
+            // Arrange
+            var expectedArguments = new object[] { null };
+            var sut = new InlineAutoDataAttribute(null);
+            // Act
+            var result = sut.Arguments;
+            // Assert
+            Assert.AreEqual(expectedArguments, result);
+        }
+
         [TestCase("CreateWithFrozenAndFavorArrays")]
         [TestCase("CreateWithFavorArraysAndFrozen")]
         [TestCase("CreateWithFrozenAndFavorEnumerables")]
@@ -201,4 +207,4 @@ public void ShouldRecognizeAttributesImplementingIParameterCustomizationSource()
             Assert.True(customizationLog[0] is TypeWithIParameterCustomizationSourceUsage.Customization);
         }
     }
-}
+}
diff --git a/Src/AutoFixture.NUnit3.UnitTest/Scenario.cs b/Src/AutoFixture.NUnit3.UnitTest/Scenario.cs
@@ -393,5 +393,29 @@ public void InlineAutoDataCanBeUsedWithFrozen(int p1, int p2, [Frozen]string p3,
         {
             Assert.True(p.Length == 3);
         }
+
+        [Test]
+        [InlineAutoData(null)]
+        public void InlineAutoDataTakesNullAsParameterValue(string p1)
+        {
+            Assert.That(p1, Is.Null);
+        }
+
+        [Test]
+        [InlineAutoData(null)]
+        public void InlineAutoDataWithNullArgumentProvidesParameterValuesWhenMissing(string p1, string p2, string p3)
+        {
+            Assert.That(p1, Is.Null);
+            Assert.That(p2, Is.Not.Null);
+            Assert.That(p3, Is.Not.Null);
+        }
+
+        [Test]
+        [InlineAutoData(null)]
+        public void InlineAutoDataWithNullArgumentCanBeUsedWithFrozen(int? p1, int p2, [Frozen]string p3, string p4)
+        {
+            Assert.That(p1, Is.Null);
+            Assert.That(p3, Is.EqualTo(p4));
+        }
     }
-}
+}
diff --git a/Src/AutoFixture.NUnit3/InlineAutoDataAttribute.cs b/Src/AutoFixture.NUnit3/InlineAutoDataAttribute.cs
@@ -53,7 +53,7 @@ protected InlineAutoDataAttribute(IFixture fixture, params object[] arguments)
             if (fixture == null) throw new ArgumentNullException(nameof(fixture));
 
             this.fixtureLazy = new Lazy<IFixture>(() => fixture, LazyThreadSafetyMode.None);
-            this.existingParameterValues = arguments ?? throw new ArgumentNullException(nameof(arguments));
+            this.existingParameterValues = arguments ?? new object[] { null };
         }
 
         /// <summary>
@@ -66,7 +66,7 @@ protected InlineAutoDataAttribute(Func<IFixture> fixtureFactory, params object[]
             if (fixtureFactory == null) throw new ArgumentNullException(nameof(fixtureFactory));
 
             this.fixtureLazy = new Lazy<IFixture>(fixtureFactory, LazyThreadSafetyMode.PublicationOnly);
-            this.existingParameterValues = arguments ?? throw new ArgumentNullException(nameof(arguments));
+            this.existingParameterValues = arguments ?? new object[] { null };
         }
 
         /// <summary>