Author: igorz
Date: 2006-08-09 05:36:36 -0400 (Wed, 09 Aug 2006)
New Revision: 63528
Added:
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/HierarchicalDataBoundControlTest.cs
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI.WebControls/HierarchicalDataBoundControl.cs
trunk/mcs/class/System.Web/System.Web_test.dll.sources
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
Log:
fixed DataBind flow in HierarchicalDataBoundControl
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2006-08-09 09:28:15 UTC (rev 63527)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2006-08-09 09:36:36 UTC (rev 63528)
@@ -1,3 +1,7 @@
+2006-08-09 Igor Zelmanovich <[EMAIL PROTECTED]>
+
+ * HierarchicalDataBoundControl.cs: fixed DataBind flow
+
2006-08-08 Vladimir Krasnov <[EMAIL PROTECTED]>
* Content.cs:
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/HierarchicalDataBoundControl.cs
===================================================================
---
trunk/mcs/class/System.Web/System.Web.UI.WebControls/HierarchicalDataBoundControl.cs
2006-08-09 09:28:15 UTC (rev 63527)
+++
trunk/mcs/class/System.Web/System.Web.UI.WebControls/HierarchicalDataBoundControl.cs
2006-08-09 09:36:36 UTC (rev 63528)
@@ -110,12 +110,13 @@
protected internal virtual void PerformDataBinding ()
{
- OnDataBinding (EventArgs.Empty);
}
protected override void PerformSelect ()
{
+ OnDataBinding (EventArgs.Empty);
PerformDataBinding ();
+ OnDataBound (EventArgs.Empty);
}
protected override void ValidateDataSource (object dataSource)
Modified: trunk/mcs/class/System.Web/System.Web_test.dll.sources
===================================================================
--- trunk/mcs/class/System.Web/System.Web_test.dll.sources 2006-08-09
09:28:15 UTC (rev 63527)
+++ trunk/mcs/class/System.Web/System.Web_test.dll.sources 2006-08-09
09:36:36 UTC (rev 63528)
@@ -406,6 +406,7 @@
System.Web.UI.WebControls/FontNamesConverterCas.cs
System.Web.UI.WebControls/FontUnitCas.cs
System.Web.UI.WebControls/FormViewCas.cs
+System.Web.UI.WebControls/HierarchicalDataBoundControlTest.cs
System.Web.UI.WebControls/HyperLinkCas.cs
System.Web.UI.WebControls/HyperLinkColumnCas.cs
System.Web.UI.WebControls/ImageButtonCas.cs
Modified: trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
2006-08-09 09:28:15 UTC (rev 63527)
+++ trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
2006-08-09 09:36:36 UTC (rev 63528)
@@ -1,3 +1,7 @@
+2006-08-09 Igor Zelmanovich <[EMAIL PROTECTED]>
+
+ * HierarchicalDataBoundControlTest.cs: added new tests
+
2006-08-08 Merav Sudri <[EMAIL PROTECTED]>
* ObjectDataSourceTest.cs: SetUp with delay was added to the test.
Added:
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/HierarchicalDataBoundControlTest.cs
===================================================================
---
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/HierarchicalDataBoundControlTest.cs
2006-08-09 09:28:15 UTC (rev 63527)
+++
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/HierarchicalDataBoundControlTest.cs
2006-08-09 09:36:36 UTC (rev 63528)
@@ -0,0 +1,108 @@
+//
+// Tests for System.Web.UI.WebControls.HierarchicalDataBoundControl.cs
+//
+// Author:
+// Igor Zelmanovich ([EMAIL PROTECTED])
+//
+//
+// Copyright (C) 2006 Mainsoft, Inc (http://www.mainsoft.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+#if NET_2_0
+
+
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.IO;
+using System.Drawing;
+using System.Threading;
+using MyWebControl = System.Web.UI.WebControls;
+using System.Collections;
+using MonoTests.SystemWeb.Framework;
+using MonoTests.stand_alone.WebHarness;
+using System.Text.RegularExpressions;
+using System.Reflection;
+
+namespace MonoTests.System.Web.UI.WebControls
+{
+ [Serializable]
+ [TestFixture]
+ public class HierarchicalDataBoundControlTest
+ {
+ class MyHierarchicalDataBoundControl :
HierarchicalDataBoundControl
+ {
+ private StringBuilder dataBindTrace;
+ public string DataBindTrace {
+ get { return dataBindTrace.ToString (); }
+ }
+
+ public override void DataBind () {
+ dataBindTrace = new StringBuilder ();
+ dataBindTrace.Append("[Start DataBind]");
+ base.DataBind ();
+ dataBindTrace.Append ("[End DataBind]");
+ }
+
+ protected override void PerformSelect () {
+ dataBindTrace.Append ("[Start PerformSelect]");
+ base.PerformSelect ();
+ dataBindTrace.Append ("[End PerformSelect]");
+ }
+
+ protected override void PerformDataBinding () {
+ dataBindTrace.Append ("[Start
PerformDataBinding]");
+ base.PerformDataBinding ();
+ dataBindTrace.Append ("[End
PerformDataBinding]");
+ }
+
+ protected override void OnDataBinding (EventArgs e) {
+ dataBindTrace.Append ("[Start OnDataBinding]");
+ base.OnDataBinding (e);
+ dataBindTrace.Append ("[End OnDataBinding]");
+ }
+
+ protected override void OnDataBound (EventArgs e) {
+ dataBindTrace.Append ("[Start OnDataBound]");
+ base.OnDataBound (e);
+ dataBindTrace.Append ("[End OnDataBound]");
+ }
+ }
+
+ [Test]
+ public void HierarchicalDataBoundControl_DataBindFlow () {
+ Page p = new Page ();
+ MyHierarchicalDataBoundControl hc = new
MyHierarchicalDataBoundControl ();
+ p.Controls.Add (hc);
+ hc.DataBind ();
+ string expected = "[Start DataBind][Start
PerformSelect][Start OnDataBinding][End OnDataBinding][Start
PerformDataBinding][End PerformDataBinding][Start OnDataBound][End
OnDataBound][End PerformSelect][End DataBind]";
+ Assert.AreEqual (expected, hc.DataBindTrace,
"DataBindFlow");
+ }
+
+ }
+}
+
+#endif
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
