2009-02-05 Marek Habersack <mhabersack@novell.com>

	* NunitWebResources/NoDoubleOnInitOnRemoveAdd.aspx,
	NunitWebResources/NoDoubleOnInitOnRemoveAdd.aspx.cs: added

2009-02-05  Marek Habersack  <mhabersack@novell.com>

	* ControlTest.cs: added test for bug #47130

2009-02-05  Marek Habersack  <mhabersack@novell.com>

	* Makefile (TEST_RESOURCE_FILES): added
	Test/mainsoft/NunitWebResources/NoDoubleOnInitOnRemoveAdd.aspx and
	Test/mainsoft/NunitWebResources/NoDoubleOnInitOnRemoveAdd.aspx.cs

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

diff --git a/mcs/class/System.Web/ChangeLog b/mcs/class/System.Web/ChangeLog
index a87e849083818c10e700caccba2e4e529d54422b..09c0372444c3e157860409e3e46ae729673f6c4a 100644 (file)
--- a/mcs/class/System.Web/ChangeLog
+++ b/mcs/class/System.Web/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-05  Marek Habersack  <mhabersack@novell.com>
+
+       * Makefile (TEST_RESOURCE_FILES): added
+       Test/mainsoft/NunitWebResources/NoDoubleOnInitOnRemoveAdd.aspx and
+       Test/mainsoft/NunitWebResources/NoDoubleOnInitOnRemoveAdd.aspx.cs
+
 2009-01-27  Marek Habersack  <mhabersack@novell.com>
 
        * System.Web.dll.sources: added System.Web.Util/SearchPattern.cs

diff --git a/mcs/class/System.Web/Makefile b/mcs/class/System.Web/Makefile
index 23e64d990a6d93246e47dc853afd03a468f6f776..e1bc2c476ce9502150566d74782cb0138512b294 100644 (file)
--- a/mcs/class/System.Web/Makefile
+++ b/mcs/class/System.Web/Makefile
@@ -162,7 +162,9 @@ TEST_RESOURCE_FILES = \
        Test/mainsoft/NunitWebResources/ContentPlaceHolderInTemplate.aspx \
        Test/mainsoft/NunitWebResources/ContentPlaceHolderInTemplate.master \
        Test/mainsoft/NunitWebResources/MissingMasterFile.aspx \
-       Test/mainsoft/NunitWebResources/CustomSectionEmptyCollection.aspx
+       Test/mainsoft/NunitWebResources/CustomSectionEmptyCollection.aspx \
+       Test/mainsoft/NunitWebResources/NoDoubleOnInitOnRemoveAdd.aspx \
+       Test/mainsoft/NunitWebResources/NoDoubleOnInitOnRemoveAdd.aspx.cs
 
 RESX_DIST =  resources/TranslationResources.resx
 ifeq (net_2_0, $(PROFILE))

diff --git a/mcs/class/System.Web/Test/System.Web.UI/ChangeLog b/mcs/class/System.Web/Test/System.Web.UI/ChangeLog
index 32e1a6fec8934cfdcbeab205434cc1049a982c3e..8d45e319df0ad1d4b1e24670c4489add9eb7b584 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI/ChangeLog
+++ b/mcs/class/System.Web/Test/System.Web.UI/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-05  Marek Habersack  <mhabersack@novell.com>
+
+       * ControlTest.cs: added test for bug #471305
+
 2009-01-21  Marek Habersack  <mhabersack@novell.com>
 
        * XhtmlTextWriterTest.cs: temporarily disabled the

diff --git a/mcs/class/System.Web/Test/System.Web.UI/ControlTest.cs b/mcs/class/System.Web/Test/System.Web.UI/ControlTest.cs
index eae850528725a06c0de035bf495220f1ecd0e411..59800c4980a7317210bcdb229638d9056a31e4c0 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI/ControlTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI/ControlTest.cs
@@ -274,6 +274,23 @@ namespace MonoTests.System.Web.UI
                        Assert.AreEqual ("", result, "#01");
                }
 
+               [Test] // Bug #471305
+               [Category ("NunitWeb")]
+               public void NoDoubleOnInitOnRemoveAdd ()
+               {
+#if VISUAL_STUDIO
+                       WebTest.CopyResource (GetType (), "MonoTests.System.Web.UI.WebControls.Resources.NoDoubleOnInitOnRemoveAdd.aspx", "NoDoubleOnInitOnRemoveAdd.aspx");
+                       WebTest.CopyResource (GetType (), "MonoTests.System.Web.UI.WebControls.Resources.NoDoubleOnInitOnRemoveAdd.aspx.cs", "NoDoubleOnInitOnRemoveAdd.aspx.cs");
+#else
+                       WebTest.CopyResource (GetType (), "NoDoubleOnInitOnRemoveAdd.aspx", "NoDoubleOnInitOnRemoveAdd.aspx");
+                       WebTest.CopyResource (GetType (), "NoDoubleOnInitOnRemoveAdd.aspx.cs", "NoDoubleOnInitOnRemoveAdd.aspx.cs");
+#endif
+                       WebTest t = new WebTest ("NoDoubleOnInitOnRemoveAdd.aspx");
+                       string html = t.Run ();
+
+                       Assert.AreEqual (-1, html.IndexOf ("<span>label</span><span>label</span>"), "#A1");
+               }
+               
 #if NET_2_0
                [Test]
                [Category("NunitWeb")]

diff --git a/mcs/class/System.Web/Test/mainsoft/ChangeLog b/mcs/class/System.Web/Test/mainsoft/ChangeLog
index 5136235bfa52ebf2ef1e1091bb0b745df473afca..a11ca308e6997be67676c422d587f4b427f45969 100644 (file)
--- a/mcs/class/System.Web/Test/mainsoft/ChangeLog
+++ b/mcs/class/System.Web/Test/mainsoft/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-05  Marek Habersack  <mhabersack@novell.com>
+
+       * NunitWebResources/NoDoubleOnInitOnRemoveAdd.aspx,
+       NunitWebResources/NoDoubleOnInitOnRemoveAdd.aspx.cs: added
+
 2008-12-23  Marek Habersack  <mhabersack@novell.com>
 
        * NunitWeb/Makefile (NunitWeb.dll): added NunitWeb/CustomSection.cs

diff --git a/mcs/class/System.Web/Test/mainsoft/NunitWebResources/NoDoubleOnInitOnRemoveAdd.aspx b/mcs/class/System.Web/Test/mainsoft/NunitWebResources/NoDoubleOnInitOnRemoveAdd.aspx
new file mode 100644 (file)
index 0000000..ffae881
--- /dev/null
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWebResources/NoDoubleOnInitOnRemoveAdd.aspx
@@ -0,0 +1,13 @@
+<%@ Page Language="C#" AutoEventWireup="true"  Src="NoDoubleOnInitOnRemoveAdd.aspx.cs" Inherits="_Bug471305_Default" %>\r
+\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
+\r
+<html xmlns="http://www.w3.org/1999/xhtml" >\r
+<head runat="server">\r
+    <title>Bug #471305</title>\r
+</head>\r
+<body>\r
+    <form id="form1" runat="server">\r
+    </form>\r
+</body>\r
+</html>\r

diff --git a/mcs/class/System.Web/Test/mainsoft/NunitWebResources/NoDoubleOnInitOnRemoveAdd.aspx.cs b/mcs/class/System.Web/Test/mainsoft/NunitWebResources/NoDoubleOnInitOnRemoveAdd.aspx.cs
new file mode 100644 (file)
index 0000000..e24f14a
--- /dev/null
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWebResources/NoDoubleOnInitOnRemoveAdd.aspx.cs
@@ -0,0 +1,32 @@
+using System;\r
+using System.Data;\r
+using System.Configuration;\r
+using System.Web;\r
+using System.Web.Security;\r
+using System.Web.UI;\r
+using System.Web.UI.WebControls;\r
+using System.Web.UI.WebControls.WebParts;\r
+using System.Web.UI.HtmlControls;\r
+\r
+public partial class _Bug471305_Default : System.Web.UI.Page \r
+{\r
+    public class CustomControl : Control\r
+    {\r
+        protected override void OnInit(EventArgs e)\r
+        {\r
+            Label label = new Label();\r
+            label.Text = "label";\r
+            Controls.Add(label);\r
+\r
+            base.OnInit(e);\r
+        }\r
+    }\r
+\r
+    protected void Page_Load(object sender, EventArgs e)\r
+    {\r
+        CustomControl ctrl = new CustomControl();\r
+        Form.Controls.Add(ctrl);\r
+        Form.Controls.Remove(ctrl);\r
+        Form.Controls.Add(ctrl);\r
+    }\r
+}\r