mirror of https://github.com/AMT-Cheif/Stylet.git
Add test code coverage for ValidatingModelBase
This commit is contained in:
Antony Male
parent
d56f3b5c26
commit
1e76531e36
|
|
@ -10,10 +10,10 @@ namespace Stylet
|
|||
/// Generic version of IValidationArapter. Provided for use with StyletIoC
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Having a generic version allows you implement it using a generic ValidationAdapter (ValidationAdapter{T} : IModelValidator{T})
|
||||
/// Having a generic version allows you implement it using a generic ModelValidator (ModelValidator{T} : IModelValidator{T})
|
||||
/// then write a binding rule like this:
|
||||
/// builder.Bind(typeof(IValidationAdapter{})).ToAllImplementations()
|
||||
/// and request a new IValidationAdapter{MyViewModelType} in your ViewModel's constructor.
|
||||
/// builder.Bind(typeof(IModelValidator{})).ToAllImplementations()
|
||||
/// and request a new IModelValidator{MyViewModelType} in your ViewModel's constructor.
|
||||
/// </remarks>
|
||||
/// <typeparam name="T"></typeparam>
|
||||
public interface IModelValidator<in T> : IModelValidator
|
||||
|
|
@ -30,7 +30,7 @@ namespace Stylet
|
|||
{
|
||||
/// <summary>
|
||||
/// Called by ValidatingModelBase, which passes in an instance of itself.
|
||||
/// This allows the IValidationAdapter to specialize to validating that particular ValidatingModelBase instance
|
||||
/// This allows the IModelValidator to specialize to validating that particular ValidatingModelBase instance
|
||||
/// </summary>
|
||||
/// <param name="subject"></param>
|
||||
void Initialize(object subject);
|
||||
|
|
|
|||
|
|
@ -34,7 +34,8 @@ namespace Stylet
|
|||
set
|
||||
{
|
||||
this._validator = value;
|
||||
this._validator.Initialize(this);
|
||||
if (this._validator != null)
|
||||
this._validator.Initialize(this);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -75,7 +76,15 @@ namespace Stylet
|
|||
/// <returns>True if all properties validated successfully</returns>
|
||||
protected virtual bool Validate()
|
||||
{
|
||||
return this.ValidateAsync().Result;
|
||||
try
|
||||
{
|
||||
return this.ValidateAsync().Result;
|
||||
}
|
||||
catch (AggregateException e)
|
||||
{
|
||||
// We're only ever going to get one InnerException here - let's be nice and unwrap it
|
||||
throw e.InnerException;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -101,11 +110,10 @@ namespace Stylet
|
|||
{
|
||||
if (!this.propertyErrors.ContainsKey(kvp.Key))
|
||||
this.propertyErrors[kvp.Key] = kvp.Value;
|
||||
|
||||
if (this.ErrorsEqual(this.propertyErrors[kvp.Key], kvp.Value))
|
||||
else if (this.ErrorsEqual(this.propertyErrors[kvp.Key], kvp.Value))
|
||||
continue;
|
||||
|
||||
this.propertyErrors[kvp.Key] = kvp.Value;
|
||||
else
|
||||
this.propertyErrors[kvp.Key] = kvp.Value;
|
||||
anyChanged = true;
|
||||
if (handler != null)
|
||||
this.PropertyChangedDispatcher(() => handler(this, new DataErrorsChangedEventArgs(kvp.Key)));
|
||||
|
|
@ -146,7 +154,15 @@ namespace Stylet
|
|||
/// <returns>True if the property validated successfully</returns>
|
||||
protected virtual bool ValidateProperty([CallerMemberName] string propertyName = null)
|
||||
{
|
||||
return this.ValidatePropertyAsync(propertyName).Result;
|
||||
try
|
||||
{
|
||||
return this.ValidatePropertyAsync(propertyName).Result;
|
||||
}
|
||||
catch (AggregateException e)
|
||||
{
|
||||
// We're only ever going to get one InnerException here. Let's be nice and unwrap it
|
||||
throw e.InnerException;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -81,6 +81,7 @@
|
|||
<Compile Include="StyletIoC\StyletIoCGetSingleKeyedTests.cs" />
|
||||
<Compile Include="StyletIoC\StyletIoCGetSingleTests.cs" />
|
||||
<Compile Include="StyletIoC\StyletIoCUnboundGenericTests.cs" />
|
||||
<Compile Include="ValidatingModelBaseTests.cs" />
|
||||
<Compile Include="ViewManagerTests.cs" />
|
||||
<Compile Include="ViewTests.cs" />
|
||||
<Compile Include="WindowManagerTests.cs" />
|
||||
|
|
|
|||
|
|
@ -0,0 +1,349 @@
|
|||
using Moq;
|
||||
using NUnit.Framework;
|
||||
using Stylet;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Linq.Expressions;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace StyletUnitTests
|
||||
{
|
||||
[TestFixture]
|
||||
public class ValidatingModelBaseTests
|
||||
{
|
||||
private class MyModel : ValidatingModelBase
|
||||
{
|
||||
public MyModel() : base() { }
|
||||
public MyModel(IModelValidator validator) : base(validator) { }
|
||||
|
||||
private int _intProperty;
|
||||
public int IntProperty
|
||||
{
|
||||
get { return this._intProperty; }
|
||||
set { SetAndNotify(ref this._intProperty, value); }
|
||||
}
|
||||
|
||||
public bool AutoValidate
|
||||
{
|
||||
get { return base.autoValidate; }
|
||||
set { base.autoValidate = value; }
|
||||
}
|
||||
|
||||
public IModelValidator Validator
|
||||
{
|
||||
get { return this.validator; }
|
||||
set { this.validator = value; }
|
||||
}
|
||||
|
||||
public new bool Validate()
|
||||
{
|
||||
return base.Validate();
|
||||
}
|
||||
|
||||
public new Task<bool> ValidateAsync()
|
||||
{
|
||||
return base.ValidateAsync();
|
||||
}
|
||||
|
||||
public new bool ValidateProperty(string propertyName)
|
||||
{
|
||||
return base.ValidateProperty(propertyName);
|
||||
}
|
||||
|
||||
public new bool ValidateProperty<TProperty>(Expression<Func<TProperty>> property)
|
||||
{
|
||||
return base.ValidateProperty(property);
|
||||
}
|
||||
|
||||
public new Task<bool> ValidatePropertyAsync(string propertyName)
|
||||
{
|
||||
return base.ValidatePropertyAsync(propertyName);
|
||||
}
|
||||
|
||||
public new Task<bool> ValidatePropertyAsync<TProperty>(Expression<Func<TProperty>> property)
|
||||
{
|
||||
return base.ValidatePropertyAsync(property);
|
||||
}
|
||||
}
|
||||
|
||||
private Mock<IModelValidator> validator;
|
||||
private MyModel model;
|
||||
|
||||
[TestFixtureSetUp]
|
||||
public void SetUpFixture()
|
||||
{
|
||||
Execute.TestExecuteSynchronously = true;
|
||||
}
|
||||
|
||||
[SetUp]
|
||||
public void SetUp()
|
||||
{
|
||||
this.validator = new Mock<IModelValidator>();
|
||||
this.model = new MyModel();
|
||||
this.model.Validator = this.validator.Object;
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void PropertySetsAndInitialisesModelValidator()
|
||||
{
|
||||
this.validator.Verify(x => x.Initialize(this.model));
|
||||
Assert.AreEqual(validator.Object, this.model.Validator);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ConstructorSetsAndInitialisesModelValidator()
|
||||
{
|
||||
this.validator.Verify(x => x.Initialize(model));
|
||||
Assert.AreEqual(validator.Object, model.Validator);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ThrowsIfAskedToValidateAndNoValidatorSet()
|
||||
{
|
||||
this.model.Validator = null;
|
||||
Assert.Throws<InvalidOperationException>(() => this.model.Validate());
|
||||
Assert.Throws<InvalidOperationException>(() => this.model.ValidateProperty("test"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ValidateCallsAdapterValidate()
|
||||
{
|
||||
this.validator.Setup(x => x.ValidateAllPropertiesAsync()).Returns(Task.Delay(1).ContinueWith(t => new Dictionary<string, string[]>() { { "property", new[] { "error1", "error2" } } })).Verifiable();
|
||||
this.model.Validate();
|
||||
|
||||
this.validator.Verify();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ValidateAsyncCallsAdapterValidate()
|
||||
{
|
||||
this.validator.Setup(x => x.ValidateAllPropertiesAsync()).Returns(Task.Delay(1).ContinueWith(t => new Dictionary<string, string[]>())).Verifiable();
|
||||
this.model.ValidateAsync().Wait();
|
||||
|
||||
this.validator.Verify();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ValidatePropertyByNameCallsAdapterValidate()
|
||||
{
|
||||
this.validator.Setup(x => x.ValidatePropertyAsync("test")).Returns(Task.Delay(1).ContinueWith(t => new string[0])).Verifiable();
|
||||
this.model.ValidateProperty("test");
|
||||
|
||||
this.validator.Verify();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ValidatePropertyAsyncByNameCallsAdapterValidate()
|
||||
{
|
||||
this.validator.Setup(x => x.ValidatePropertyAsync("test")).Returns(Task.Delay(1).ContinueWith(t => new string[0])).Verifiable();
|
||||
this.model.ValidatePropertyAsync("test").Wait();
|
||||
|
||||
this.validator.Verify();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ValidatePropertyByExpressoinCallsAdapterValidate()
|
||||
{
|
||||
this.validator.Setup(x => x.ValidatePropertyAsync("IntProperty")).Returns(Task.Delay(1).ContinueWith(t => new string[0])).Verifiable();
|
||||
this.model.ValidateProperty(() => this.model.IntProperty);
|
||||
|
||||
this.validator.Verify();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ValidatePropertAsyncByExpressionCallsAdapterValidate()
|
||||
{
|
||||
this.validator.Setup(x => x.ValidatePropertyAsync("IntProperty")).Returns(Task.Delay(1).ContinueWith(t => new string[0])).Verifiable();
|
||||
this.model.ValidatePropertyAsync(() => this.model.IntProperty).Wait();
|
||||
|
||||
this.validator.Verify();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ValidatePropertyReturnsTrueIfValidationPassed()
|
||||
{
|
||||
this.validator.Setup(x => x.ValidatePropertyAsync("IntProperty")).ReturnsAsync(null);
|
||||
var result = this.model.ValidateProperty("IntProperty");
|
||||
Assert.True(result);
|
||||
|
||||
this.validator.Setup(x => x.ValidatePropertyAsync("IntProperty")).ReturnsAsync(new string[0]);
|
||||
result = this.model.ValidateProperty("IntProperty");
|
||||
Assert.True(result);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ValidatePropertyReturnsFalseIfValidationFailed()
|
||||
{
|
||||
this.validator.Setup(x => x.ValidatePropertyAsync("IntProperty")).ReturnsAsync(new[] { "error" });
|
||||
var result = this.model.ValidateProperty("IntProperty");
|
||||
Assert.False(result);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ValidateReturnsTrueIfValidationPassed()
|
||||
{
|
||||
this.validator.Setup(x => x.ValidateAllPropertiesAsync()).ReturnsAsync(new Dictionary<string, string[]>()
|
||||
{
|
||||
{ "IntProperty", null }
|
||||
});
|
||||
var result = this.model.Validate();
|
||||
Assert.True(result);
|
||||
|
||||
this.validator.Setup(x => x.ValidateAllPropertiesAsync()).ReturnsAsync(new Dictionary<string, string[]>()
|
||||
{
|
||||
{ "IntProperty", new string[0] }
|
||||
});
|
||||
result = this.model.Validate();
|
||||
Assert.True(result);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ValidateReturnsFalseIfValidationFailed()
|
||||
{
|
||||
this.validator.Setup(x => x.ValidateAllPropertiesAsync()).ReturnsAsync(new Dictionary<string, string[]>()
|
||||
{
|
||||
{ "IntProperty", new[] { "error" } }
|
||||
});
|
||||
var result = this.model.Validate();
|
||||
Assert.False(result);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EventRaisedAndHasErrorsChangedIfErrorWasNullAndNowIsNot()
|
||||
{
|
||||
this.validator.Setup(x => x.ValidatePropertyAsync("IntProperty")).ReturnsAsync(null);
|
||||
this.model.ValidateProperty("IntProperty");
|
||||
|
||||
string changedProperty = null;
|
||||
this.model.ErrorsChanged += (o, e) => changedProperty = e.PropertyName;
|
||||
bool hasErrorsRaised = false;
|
||||
this.model.PropertyChanged += (o, e) => { if (e.PropertyName == "HasErrors") hasErrorsRaised = true; };
|
||||
|
||||
this.validator.Setup(x => x.ValidatePropertyAsync("IntProperty")).ReturnsAsync(new[] { "error" });
|
||||
this.model.ValidateProperty("IntProperty");
|
||||
|
||||
Assert.AreEqual("IntProperty", changedProperty);
|
||||
Assert.True(hasErrorsRaised);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EventRaisedAndHasErrorsChangedIfErrorWasEmptyArrayAndNowIsNot()
|
||||
{
|
||||
this.validator.Setup(x => x.ValidatePropertyAsync("IntProperty")).ReturnsAsync(new string[0]);
|
||||
this.model.ValidateProperty("IntProperty");
|
||||
|
||||
string changedProperty = null;
|
||||
this.model.ErrorsChanged += (o, e) => changedProperty = e.PropertyName;
|
||||
bool hasErrorsRaised = false;
|
||||
this.model.PropertyChanged += (o, e) => { if (e.PropertyName == "HasErrors") hasErrorsRaised = true; };
|
||||
|
||||
this.validator.Setup(x => x.ValidatePropertyAsync("IntProperty")).ReturnsAsync(new[] { "error" });
|
||||
this.model.ValidateProperty("IntProperty");
|
||||
|
||||
Assert.AreEqual("IntProperty", changedProperty);
|
||||
Assert.True(hasErrorsRaised);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EventRaisedAndHasErrorsChangedIfErrorWasSetAndIsNowNull()
|
||||
{
|
||||
this.validator.Setup(x => x.ValidatePropertyAsync("IntProperty")).ReturnsAsync(new[] { "error" });
|
||||
this.model.ValidateProperty("IntProperty");
|
||||
|
||||
string changedProperty = null;
|
||||
this.model.ErrorsChanged += (o, e) => changedProperty = e.PropertyName;
|
||||
bool hasErrorsRaised = false;
|
||||
this.model.PropertyChanged += (o, e) => { if (e.PropertyName == "HasErrors") hasErrorsRaised = true; };
|
||||
|
||||
this.validator.Setup(x => x.ValidatePropertyAsync("IntProperty")).ReturnsAsync(null);
|
||||
this.model.ValidateProperty("IntProperty");
|
||||
|
||||
Assert.AreEqual("IntProperty", changedProperty);
|
||||
Assert.True(hasErrorsRaised);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EventRaisedAndHasErrorsChangedIfErrorWasSetAndIsNowEmptyArray()
|
||||
{
|
||||
this.validator.Setup(x => x.ValidatePropertyAsync("IntProperty")).ReturnsAsync(new[] { "error" });
|
||||
this.model.ValidateProperty("IntProperty");
|
||||
|
||||
string changedProperty = null;
|
||||
this.model.ErrorsChanged += (o, e) => changedProperty = e.PropertyName;
|
||||
bool hasErrorsRaised = false;
|
||||
this.model.PropertyChanged += (o, e) => { if (e.PropertyName == "HasErrors") hasErrorsRaised = true; };
|
||||
|
||||
this.validator.Setup(x => x.ValidatePropertyAsync("IntProperty")).ReturnsAsync(new string[0]);
|
||||
this.model.ValidateProperty("IntProperty");
|
||||
|
||||
Assert.AreEqual("IntProperty", changedProperty);
|
||||
Assert.True(hasErrorsRaised);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EventRaisedAndHasErrorsChangedIfValidateAllAndErrorsChange()
|
||||
{
|
||||
// Set up some initial errors
|
||||
this.validator.Setup(x => x.ValidateAllPropertiesAsync()).ReturnsAsync(new Dictionary<string, string[]>()
|
||||
{
|
||||
{ "IntProperty", new[] { "error" } },
|
||||
{ "OtherProperty", null },
|
||||
{ "OtherOtherProperty", new string[0] },
|
||||
{ "PropertyThatWillDisappear", new[] { "error" } },
|
||||
});
|
||||
this.model.Validate();
|
||||
|
||||
this.validator.Setup(x => x.ValidateAllPropertiesAsync()).ReturnsAsync(new Dictionary<string, string[]>()
|
||||
{
|
||||
{ "IntProperty", new[] { "error" } },
|
||||
{ "OtherProperty", new[] { "error" } },
|
||||
{ "OtherOtherProperty", new string[0] },
|
||||
{ "NewOKProperty", null },
|
||||
{ "NewNotOKProperty", new[] { "woo" } },
|
||||
});
|
||||
|
||||
var errors = new List<string>();
|
||||
this.model.ErrorsChanged += (o, e) => errors.Add(e.PropertyName);
|
||||
int hasErrorsChangedCount = 0;
|
||||
this.model.PropertyChanged += (o, e) => { if (e.PropertyName == "HasErrors") hasErrorsChangedCount++; };
|
||||
|
||||
this.model.Validate();
|
||||
|
||||
Assert.That(errors, Is.EquivalentTo(new[] { "OtherProperty", "NewOKProperty", "NewNotOKProperty" }));
|
||||
Assert.AreEqual(1, hasErrorsChangedCount);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void GetErrorsReturnsNullIfNoErrorsForThatProperty()
|
||||
{
|
||||
var errors = this.model.GetErrors("FooBar");
|
||||
Assert.Null(errors);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void GetErrorsReturnsErrorsForProperty()
|
||||
{
|
||||
this.validator.Setup(x => x.ValidatePropertyAsync("IntProperty")).ReturnsAsync(new[] { "error1", "error2" });
|
||||
this.model.ValidateProperty("IntProperty");
|
||||
var errors = this.model.GetErrors("IntProperty");
|
||||
Assert.That(errors, Is.EquivalentTo(new[] { "error1", "error2" }));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void SettingPropertyValidatesIfAutoValidateIsTrue()
|
||||
{
|
||||
this.model.IntProperty = 5;
|
||||
this.validator.Verify(x => x.ValidatePropertyAsync("IntProperty"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void SettingPropertyDoesNotValidateIfAutoValidateIsFalse()
|
||||
{
|
||||
this.model.AutoValidate = false;
|
||||
this.model.IntProperty = 5;
|
||||
this.validator.Verify(x => x.ValidatePropertyAsync("IntProperty"), Times.Never);
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue