Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added check of RequiresValidationContext before calling IsValid #110647

Merged
merged 3 commits into from
Dec 24, 2024
+11 −0
Merged

Added check of RequiresValidationContext before calling IsValid #110647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c090f6d
Added check of RequiresValidationContext before calling IsValid
vvg88 Dec 12, 2024
1df29d7
Throw exception if validation context is null
vvg88 Dec 13, 2024
f9e4db7
Unit test
vvg88 Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ....ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations/CompareAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ public override string FormatErrorMessage(string name) =>
Justification = "The ctor is marked with RequiresUnreferencedCode informing the caller to preserve the other property.")]
protected override ValidationResult? IsValid(object? value, ValidationContext validationContext)
{
ArgumentNullException.ThrowIfNull(validationContext);

var otherPropertyInfo = validationContext.ObjectType.GetRuntimeProperty(OtherProperty);
if (otherPropertyInfo == null)
{
Expand Down
9 changes: 9 additions & 0 deletions ...entModel.Annotations/tests/System/ComponentModel/DataAnnotations/CompareAttributeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,15 @@ public static void Validate_PropertyHasDisplayName_UpdatesFormatErrorMessageToCo
Assert.Contains("CustomDisplayName", newErrorMessage);
}

[Fact]
public static void IsValid_ValidationContextNull_ThrowsArgumentNullException()
{
var attribute = new CompareAttribute(nameof(CompareObject.ComparePropertyWithDisplayName));
var compareObject = new CompareObject("test");

Assert.Throws<ArgumentNullException>(() => attribute.IsValid(compareObject.CompareProperty));
}

private class DerivedCompareAttribute : CompareAttribute
{
public DerivedCompareAttribute(string otherProperty) : base(otherProperty) { }
Expand Down