From ae57844c6afe968dda719bf6a7f178b68f4e146e Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Tue, 8 Sep 2015 21:39:17 -0700 Subject: [PATCH] Make a few arrays explicitly `object[]` - react to aspnet/aspnet.xunit#13 - latest xUnit bits maintains array types correctly, failing some `Type`-related assertions - previous xUnit versions mapped all arrays to `object[]` - fix likely part of xunit/xunit@bd6814c --- .../ModelBindingHelperTest.cs | 6 +++--- .../ViewDataDictionaryTest.cs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ModelBindingHelperTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ModelBindingHelperTest.cs index 15e15817a7..d0950428f5 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ModelBindingHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ModelBindingHelperTest.cs @@ -1161,7 +1161,7 @@ namespace Microsoft.AspNet.Mvc.Test } [Theory] - [InlineData(new object[] { new[] { 1, 0 } })] + [InlineData(new object[] { new object[] { 1, 0 } })] [InlineData(new object[] { new[] { "Value1", "Value0" } })] [InlineData(new object[] { new[] { "Value1", "value0" } })] public void ConvertTo_ConvertsEnumArrays(object value) @@ -1179,9 +1179,9 @@ namespace Microsoft.AspNet.Mvc.Test } [Theory] - [InlineData(new object[] { new[] { 1, 2 }, new[] { FlagsEnum.Value1, FlagsEnum.Value2 } })] + [InlineData(new object[] { new object[] { 1, 2 }, new[] { FlagsEnum.Value1, FlagsEnum.Value2 } })] [InlineData(new object[] { new[] { "Value1", "Value2" }, new[] { FlagsEnum.Value1, FlagsEnum.Value2 } })] - [InlineData(new object[] { new[] { 5, 2 }, new[] { FlagsEnum.Value1 | FlagsEnum.Value4, FlagsEnum.Value2 } })] + [InlineData(new object[] { new object[] { 5, 2 }, new[] { FlagsEnum.Value1 | FlagsEnum.Value4, FlagsEnum.Value2 } })] public void ConvertTo_ConvertsFlagsEnumArrays(object value, FlagsEnum[] expected) { // Arrange diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewDataDictionaryTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewDataDictionaryTest.cs index cfb74ac26f..2fb84fd981 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewDataDictionaryTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewDataDictionaryTest.cs @@ -311,8 +311,8 @@ namespace Microsoft.AspNet.Mvc.Core [Theory] [InlineData(typeof(int), "test string", typeof(string))] [InlineData(typeof(string), 23, typeof(int))] - [InlineData(typeof(IEnumerable), new[] { "1", "2", "3", }, typeof(object[]))] - [InlineData(typeof(List), new[] { 1, 2, 3, }, typeof(object[]))] + [InlineData(typeof(IEnumerable), new object[] { "1", "2", "3", }, typeof(object[]))] + [InlineData(typeof(List), new object[] { 1, 2, 3, }, typeof(object[]))] public void CopyConstructors_OverrideSourceMetadata_IfModelNonNull( Type sourceType, object instance,