diff --git a/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/DefaultModelMetadataProviderTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/DefaultModelMetadataProviderTest.cs index c4d8bafec62f..9b6662d2f15b 100644 --- a/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/DefaultModelMetadataProviderTest.cs +++ b/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/DefaultModelMetadataProviderTest.cs @@ -211,8 +211,14 @@ public void GetMetadataForParameter_SuppliesEmptyAttributes_WhenParameterHasNoAt // Assert var defaultMetadata = Assert.IsType(metadata); - // Not exactly "no attributes" due to SerializableAttribute on object. - Assert.IsType(Assert.Single(defaultMetadata.Attributes.Attributes)); + // The parameter itself has no attributes + Assert.Empty(defaultMetadata.Attributes.ParameterAttributes); + + // Type attributes exist (but we don't care what they are - that's runtime implementation detail) + Assert.NotEmpty(defaultMetadata.Attributes.TypeAttributes); + + // Combined attributes = ParameterAttributes + TypeAttributes (when parameter has no attributes) + Assert.Equal(defaultMetadata.Attributes.TypeAttributes, defaultMetadata.Attributes.Attributes); } [Fact] diff --git a/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/ModelAttributesTest.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/ModelAttributesTest.cs index 73dbd7f6c180..5db7c1f45ece 100644 --- a/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/ModelAttributesTest.cs +++ b/src/Mvc/Mvc.Core/test/ModelBinding/Metadata/ModelAttributesTest.cs @@ -185,11 +185,15 @@ public void GetAttributesForParameter_NoAttributes() .GetParameters()[0]); // Assert - // Not exactly "no attributes" due to SerializableAttribute on object. - Assert.IsType(Assert.Single(attributes.Attributes)); + // The parameter itself has no attributes Assert.Empty(attributes.ParameterAttributes); Assert.Null(attributes.PropertyAttributes); - Assert.Equal(attributes.Attributes, attributes.TypeAttributes); + + // Type attributes exist (but we don't care what they are - that's runtime implementation detail) + Assert.NotEmpty(attributes.TypeAttributes); + + // Combined attributes = ParameterAttributes + TypeAttributes (when parameter has no attributes) + Assert.Equal(attributes.TypeAttributes, attributes.Attributes); } [Fact]