Merge pull request #14 from /issues/10

issues-10 Update contracts and unit tests
mr5z · Dec 23, 2023 · 688040e · 688040e
2 parents 07dc9bd + cedfa4f
commit 688040e
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 13 deletions.
diff --git a/src/Models/IRuleCollection.cs b/src/Models/IRuleCollection.cs
@@ -9,23 +9,23 @@ public interface IRuleCollection<TModel>
 {
     IRuleCollection<TModel> AddRule<TProperty>(
         Expression<Func<TModel, TProperty>> expression,
-        params ValidationRule<TProperty>[] rules);
+        params IValidationRule[] rules);
 
     IRuleCollection<TModel> AddRule<TProperty>(
         [NotNull]
         string propertyName,
-        params ValidationRule<TProperty>[] rules);
+        params IValidationRule[] rules);
 
     IRuleCollection<TModel> AddRule<TProperty>(
         Expression<Func<TModel, TProperty>> expression,
         string? errorMessageOverride,
-        params ValidationRule<TProperty>[] rules);
+        params IValidationRule[] rules);
 
     IRuleCollection<TModel> AddRule<TProperty>(
         [NotNull]
         string propertyName,
         string? errorMessageOverride,
-        params ValidationRule<TProperty>[] rules);
+        params IValidationRule[] rules);
 
     IReadOnlyDictionary<string, IEnumerable<IValidationRule>> GetRules();
 }
diff --git a/src/Models/RuleCollection.cs b/src/Models/RuleCollection.cs
@@ -36,26 +36,26 @@ private void TargetInstance_PropertyChanged(object sender, PropertyChangedEventA
 
     public IRuleCollection<TModel> AddRule<TProperty>(
         Expression<Func<TModel, TProperty>> expression,
-        params ValidationRule<TProperty>[] rules)
+        params IValidationRule[] rules)
     {
         return AddRule(expression, null, rules);
     }
 
     public IRuleCollection<TModel> AddRule<TProperty>(
         [NotNull] string propertyName,
-        params ValidationRule<TProperty>[] rules)
+        params IValidationRule[] rules)
     {
-        return AddRule(propertyName, null, rules);
+        return AddRule<TProperty>(propertyName, null, rules);
     }
 
     public IRuleCollection<TModel> AddRule<TProperty>(
         Expression<Func<TModel, TProperty>> expression,
         string? errorMessageOverride,
-        params ValidationRule<TProperty>[] rules)
+        params IValidationRule[] rules)
     {
         var propertyName = expression.GetMemberName();
         var propInfo = expression.GetPropertyInfo();
-        var result = AddRule(propertyName, errorMessageOverride, rules);
+        var result = AddRule<TProperty>(propertyName, errorMessageOverride, rules);
         var value = propInfo.GetValue(this.target, null);
         if (value is INotifyPropertyChanged notifiableObject)
         {
@@ -68,13 +68,13 @@ public IRuleCollection<TModel> AddRule<TProperty>(
     public IRuleCollection<TModel> AddRule<TProperty>(
         [NotNull] string propertyName,
         string? errorMessageOverride,
-        params ValidationRule<TProperty>[] rules)
+        params IValidationRule[] rules)
     {
-        RegisterRuleFor(propertyName, errorMessageOverride, rules);
+        RegisterRuleFor<TProperty>(propertyName, errorMessageOverride, rules);
         return this;
     }
 
-    private void RegisterRuleFor<TProperty>(string propertyName, string? errorMessageOverride, params ValidationRule<TProperty>[] rules)
+    private void RegisterRuleFor<TProperty>(string propertyName, string? errorMessageOverride, params IValidationRule[] rules)
     {
         Array.ForEach(rules, rule => {
             rule.PropertyName = propertyName;

diff --git a/src/Services/ValidationService.cs b/src/Services/ValidationService.cs
@@ -82,6 +82,7 @@ private async Task ValidateByProperty<TValue>(string propertyName, TValue? value
             throw new InvalidOperationException($"'{propertyName}' is not registered to validation rules.");
 
         var resultArgs = GetValidationResultArgs(propertyName, value, propertyRules);
+
         this.recentErrors[propertyName] = null;
 
         UpdateRecentErrors(resultArgs);

diff --git a/test/PropertyValidator.Test/ValidationService.test.cs b/test/PropertyValidator.Test/ValidationService.test.cs
@@ -1,3 +1,4 @@
+using PropertyValidator.Exceptions;
 using PropertyValidator.Models;
 using PropertyValidator.Services;
 using PropertyValidator.ValidationPack;
@@ -8,7 +9,7 @@ public class Tests
 {
     public class DummyViewModel : INotifiableModel, System.ComponentModel.INotifyPropertyChanged
     {
-        public void NotifyErrorPropertyChanged() => throw new NotImplementedException();
+        public void NotifyErrorPropertyChanged() { }
         public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;
         public string? Value { get; set; }
     }
@@ -107,6 +108,56 @@ public void MustValidateRangeLengthRule(DummyViewModel vm, RangeLengthRule rule)
         Assert.That(result, Is.EqualTo(true), $"Didn't succeed because vb.Value: '{vm.Value}', length: {vm.Value?.Length}");
     }
 
+    [Test, Description("ValidationService.PropertyInvalid must be invoked upon violation of property rules.")]
+    public async Task MustInvokePropertyInvalidEvent()
+    {
+        var vm = new DummyViewModel { Value = "something" };
+
+        validationService
+            .For(vm)
+            .AddRule(e => e.Value, new StringRequiredRule());
+
+        var cts = new CancellationTokenSource(TimeSpan.FromSeconds(1));
+        var tcs = new TaskCompletionSource<bool>();
+        cts.Token.Register(() => tcs.TrySetCanceled(), useSynchronizationContext: false);
+
+        validationService.PropertyInvalid += PropertyInvalid;
+
+        vm.Value = null;
+
+        var result = await tcs.Task;
+
+        void PropertyInvalid(object? sender, ValidationResultArgs e)
+        {
+            tcs.SetResult(e.HasError);
+        }
+
+        Assert.That(result, Is.EqualTo(true), $"Didn't succeed because result from PropertyInvalid is not expected.");
+    }
+
+    [Test, Description("ValidationService.EnsurePropertiesAreValid() must throw Exception.")]
+    [TestCaseSource(nameof(DummyViewModelFixturesXRule))]
+    public void MustEnsurePropertiesAreInvalid(DummyViewModel vm, IValidationRule rule)
+    {
+        validationService
+            .For(vm)
+            .AddRule(e => e.Value, rule);
+
+        bool result;
+
+        try
+        {
+            validationService.EnsurePropertiesAreValid();
+            result = false;
+        }
+        catch (Exception e)
+        {
+            result = e is PropertyException;
+        }
+
+        Assert.That(result, Is.EqualTo(true), $"Didn't succeed because EnsurePropertiesAreValid() didn't throw.");
+    }
+
     private static IEnumerable<TestCaseData> DummyViewModelFixturesStringRequiredRule
     {
         get
@@ -126,4 +177,15 @@ private static IEnumerable<TestCaseData> DummyViewModelFixturesRangeLengthRule
             yield return new TestCaseData(new DummyViewModel { Value = "1234567890+2" }, new RangeLengthRule(10, 20));
         }
     }
+
+    private static IEnumerable<TestCaseData> DummyViewModelFixturesXRule
+    {
+        get
+        {
+            yield return new TestCaseData(new DummyViewModel { Value = null }, new StringRequiredRule());
+            yield return new TestCaseData(new DummyViewModel { Value = "1234" }, new RangeLengthRule(5, 10));
+            yield return new TestCaseData(new DummyViewModel { Value = "12345+1" }, new MaxLengthRule(5));
+            yield return new TestCaseData(new DummyViewModel { Value = "123" }, new MinLengthRule(5));
+        }
+    }
 }