more precise lifetime flow checks

svn path=/trunk/mcs/; revision=62821

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
index b02b7c8cb1cbfb66c38a153f4cc688bf8ff0d623..3bf0fff61c986ead48a4672e3dfcb8a320fa5bd2 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-20 Andrew Skiba <andrews@mainsoft.com>
+
+       * DetailsViewTest.cs: more precise lifetime flow check.
+
 2006-07-20 Andrew Skiba <andrews@mainsoft.com>
 
        * DetailsViewTest.cs: add EnsureChildControls basic test.

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/DetailsViewTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/DetailsViewTest.cs
index f591256917f99979f19f185d1a52615503b9f1ad..9ecbc26221ce3879981dd8be99edd647c05f0960 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/DetailsViewTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/DetailsViewTest.cs
@@ -55,7 +55,9 @@ namespace MonoTests.System.Web.UI.WebControls
                        public bool ensureDataBound=false;
                        public bool isInitializePager = false;
                        public bool controlHierarchy = false;\r
-                       public bool ensureCreateChildControls = false;
+                       public bool ensureCreateChildControls = false;\r
+                       public bool createChildControls1 = false;\r
+                       public bool createChildControls2 = false;
                        public PokerDetailsView () 
                        {
                         TrackViewState ();
@@ -224,6 +226,18 @@ namespace MonoTests.System.Web.UI.WebControls
                        {\r
                                base.EnsureChildControls ();\r
                                ensureCreateChildControls = true;\r
+                       }\r
+\r
+                       protected override void CreateChildControls ()\r
+                       {\r
+                               base.CreateChildControls ();\r
+                               createChildControls1 = true;\r
+                       }\r
+\r
+                       protected override int CreateChildControls (IEnumerable data, bool dataBinding)\r
+                       {\r
+                               return base.CreateChildControls (data, dataBinding);\r
+                               createChildControls2 = true;\r
                        }
 
                        public void DoConfirmInitState ()
@@ -858,6 +872,8 @@ namespace MonoTests.System.Web.UI.WebControls
                        int i = dv.Rows.Count;\r
                        Assert.IsTrue (dv.ensureCreateChildControls);\r
                        Assert.IsFalse (dv.ensureDataBound);\r
+                       Assert.IsFalse (dv.createChildControls1);\r
+                       Assert.IsFalse (dv.createChildControls2);\r
                }
 
                [Test]