Author: andrews
Date: 2006-07-17 11:41:25 -0400 (Mon, 17 Jul 2006)
New Revision: 62675
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI.WebControls/CommandField.cs
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/CommandFieldTest.cs
Log:
test and fix for CommandField.ValidateSupportsCallback
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2006-07-17 15:10:37 UTC (rev 62674)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2006-07-17 15:41:25 UTC (rev 62675)
@@ -1,5 +1,9 @@
2006-07-17 Andrew Skiba <[EMAIL PROTECTED]>
+ * CommandField.cs: fixed ValidateSupportsCallback
+
+2006-07-17 Andrew Skiba <[EMAIL PROTECTED]>
+
* Image.cs: prepare to use HttpBrowserCapabilities. Does not
affect the flow yet.
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/CommandField.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/CommandField.cs
2006-07-17 15:10:37 UTC (rev 62674)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/CommandField.cs
2006-07-17 15:41:25 UTC (rev 62675)
@@ -361,7 +361,9 @@
}
public override void ValidateSupportsCallback ()
- {
+ {
+ if (ShowSelectButton)
+ throw new NotSupportedException
("ShowSelectButton = true");
}
}
}
Modified: trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
2006-07-17 15:10:37 UTC (rev 62674)
+++ trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
2006-07-17 15:41:25 UTC (rev 62675)
@@ -4,6 +4,11 @@
2006-07-17 Andrew Skiba <[EMAIL PROTECTED]>
+ * CommandFieldTest.cs: added positive flow test for
+ ValidateSupportsCallback
+
+2006-07-17 Andrew Skiba <[EMAIL PROTECTED]>
+
* WebControlTest.cs: added tests for display style
2006-07-17 Vladimir Krasnov <[EMAIL PROTECTED]>
Modified:
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/CommandFieldTest.cs
===================================================================
---
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/CommandFieldTest.cs
2006-07-17 15:10:37 UTC (rev 62674)
+++
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/CommandFieldTest.cs
2006-07-17 15:41:25 UTC (rev 62675)
@@ -40,7 +40,6 @@
using System.Collections;
using System.Collections.Specialized;
using NUnit.Framework;
-using System.Data;
namespace MonoTests.System.Web.UI.WebControls
{
@@ -227,7 +226,17 @@
field.ShowSelectButton = true;
field.Initialize (true, new Control());
field.ValidateSupportsCallback ();
- }
+ }
+
+
+ [Test]
+ public void CommandField_ValidateSupportsCallback_pass ()
+ {
+ PokerCommandField field = new PokerCommandField ();
+ field.ShowSelectButton = false;
+ field.Initialize (true, new Control ());
+ field.ValidateSupportsCallback ();
+ }
}
}
#endif
\ No newline at end of file
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
