Author: kostat
Date: 2007-01-17 12:01:01 -0500 (Wed, 17 Jan 2007)
New Revision: 71211
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/BaseValidator.cs
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
branches/mainsoft/gh20preview2/mcs/class/System.Web/Test/System.Web.UI.WebControls/BaseValidatorTest.cs
Log:
merge -r 71208:71210
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/BaseValidator.cs
===================================================================
---
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/BaseValidator.cs
2007-01-17 17:00:06 UTC (rev 71210)
+++
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/BaseValidator.cs
2007-01-17 17:01:01 UTC (rev 71211)
@@ -325,14 +325,7 @@
return null;
object o = prop.GetValue (control);
- if (o is string)
- return (string)o;
- else if (o is ListItem)
- return ((ListItem)o).Value;
- else {
- // XXX
- return null;
- }
+ return o != null ? o.ToString () : String.Empty;
}
public static PropertyDescriptor GetValidationProperty (object
o)
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
---
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-01-17 17:00:06 UTC (rev 71210)
+++
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-01-17 17:01:01 UTC (rev 71211)
@@ -1,3 +1,8 @@
+2007-01-17 Konstantin Triger <[EMAIL PROTECTED]>
+
+ * BaseValidator.cs: ToString the validating property value or
+ if null return an empty string.
+
2007-01-17 Vladimir Krasnov <[EMAIL PROTECTED]>
* TreeView.cs: fixed RegisterStyle, style names should be without
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Web/Test/System.Web.UI.WebControls/BaseValidatorTest.cs
===================================================================
---
branches/mainsoft/gh20preview2/mcs/class/System.Web/Test/System.Web.UI.WebControls/BaseValidatorTest.cs
2007-01-17 17:00:06 UTC (rev 71210)
+++
branches/mainsoft/gh20preview2/mcs/class/System.Web/Test/System.Web.UI.WebControls/BaseValidatorTest.cs
2007-01-17 17:01:01 UTC (rev 71211)
@@ -243,6 +243,21 @@
}
[Test]
+ public void NullValidationProperty ()
+ {
+ BaseValidatorPoker v = new BaseValidatorPoker ();
+
+ Page p = new Page ();
+ p.Controls.Add (v);
+ RadioButtonList l = new RadioButtonList ();
+ p.Controls.Add (l);
+ l.ID = "XXX";
+ v.ControlToValidate = "XXX";
+
+ Assert.AreEqual (String.Empty,
v.DoGetControlValidationValue ("XXX"), "#A1");
+ }
+
+ [Test]
[ExpectedException (typeof (HttpException))]
public void ControlPropertiesValid2 ()
{
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
