Add unit test for [AlsoValidateProperty]

CommunityToolkit · May 31, 2022 · 0b15992 · 0b15992
1 parent 3191845
commit 0b15992
Showing 1 changed file with 42 additions and 0 deletions.
diff --git a/tests/CommunityToolkit.Mvvm.UnitTests/Test_ObservablePropertyAttribute.cs b/tests/CommunityToolkit.Mvvm.UnitTests/Test_ObservablePropertyAttribute.cs
@@ -224,13 +224,46 @@ public void Test_ObservablePropertyWithValueNamedField_WithValidationAttributes(
 
         model.PropertyChanged += (s, e) => propertyNames.Add(e.PropertyName);
 
+        bool errorsChanged = false;
+
+        model.ErrorsChanged += (s, e) => errorsChanged = true;
+
         model.Value = "Hello world";
 
         Assert.AreEqual(model.Value, "Hello world");
 
+        // The [AlsoValidateProperty] attribute wasn't used, so the property shouldn't be validated
+        Assert.IsFalse(errorsChanged);
+
         CollectionAssert.AreEqual(new[] { nameof(model.Value) }, propertyNames);
     }
 
+    [TestMethod]
+    public void Test_ObservablePropertyWithValueNamedField_WithValidationAttributesAndValidation()
+    {
+        ModelWithValuePropertyWithAutomaticValidation model = new();
+
+        List<string?> propertyNames = new();
+
+        model.PropertyChanged += (s, e) => propertyNames.Add(e.PropertyName);
+
+        List<DataErrorsChangedEventArgs> errors = new();
+
+        model.ErrorsChanged += (s, e) => errors.Add(e);
+
+        model.Value = "Bo";
+
+        Assert.IsTrue(model.HasErrors);
+        Assert.AreEqual(errors.Count, 1);
+        Assert.AreEqual(errors[0].PropertyName, nameof(ModelWithValuePropertyWithAutomaticValidation.Value));
+
+        model.Value = "Hello world";
+
+        Assert.IsFalse(model.HasErrors);
+        Assert.AreEqual(errors.Count, 2);
+        Assert.AreEqual(errors[1].PropertyName, nameof(ModelWithValuePropertyWithAutomaticValidation.Value));
+    }
+
     // See https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/4184
     [TestMethod]
     public void Test_GeneratedPropertiesWithValidationAttributesOverFields()
@@ -893,6 +926,15 @@ public partial class ModelWithValuePropertyWithValidation : ObservableValidator
         private string? value;
     }
 
+    public partial class ModelWithValuePropertyWithAutomaticValidation : ObservableValidator
+    {
+        [ObservableProperty]
+        [Required]
+        [MinLength(5)]
+        [AlsoValidateProperty]
+        private string? value;
+    }
+
     public partial class ViewModelWithValidatableGeneratedProperties : ObservableValidator
     {
         [Required]