fixed SPRNET-1151
This commit is contained in:
@@ -1212,7 +1212,7 @@ namespace Spring.Web.UI
|
||||
///Instructs any validation controls included on the page to validate their assigned information.
|
||||
///</summary>
|
||||
///
|
||||
public override void Validate()
|
||||
public new virtual void Validate()
|
||||
{
|
||||
base.Validate();
|
||||
}
|
||||
@@ -1223,7 +1223,7 @@ namespace Spring.Web.UI
|
||||
///</summary>
|
||||
///
|
||||
///<param name="validationGroup">The validation group name of the controls to validate.</param>
|
||||
public override void Validate(string validationGroup)
|
||||
public new virtual void Validate(string validationGroup)
|
||||
{
|
||||
base.Validate(validationGroup);
|
||||
}
|
||||
|
||||
@@ -46,6 +46,22 @@ namespace Spring.Web.UI
|
||||
[TestFixture]
|
||||
public class PageTests : TestWebContextTests
|
||||
{
|
||||
class MockValidator : System.Web.UI.WebControls.BaseValidator
|
||||
{
|
||||
public bool WasCalled = false;
|
||||
|
||||
protected override bool ControlPropertiesValid()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
protected override bool EvaluateIsValid()
|
||||
{
|
||||
WasCalled = true;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void NoSharedStateAtConstruction()
|
||||
{
|
||||
@@ -53,6 +69,26 @@ namespace Spring.Web.UI
|
||||
Assert.IsNull(page.SharedState);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void CallsBaseValidateMethod()
|
||||
{
|
||||
Page child = new Page();
|
||||
MockValidator mockValidator = new MockValidator();
|
||||
mockValidator.ValidationGroup = "theValidationGroup";
|
||||
child.Validators.Add( mockValidator );
|
||||
|
||||
child.Validate(mockValidator.ValidationGroup);
|
||||
Assert.IsTrue(mockValidator.WasCalled);
|
||||
|
||||
child = new Page();
|
||||
mockValidator = new MockValidator();
|
||||
mockValidator.ValidationGroup = "theValidationGroup";
|
||||
child.Validators.Add( mockValidator );
|
||||
|
||||
child.Validate();
|
||||
Assert.IsTrue(mockValidator.WasCalled);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Validate()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user