Author: igorz
Date: 2007-02-27 11:39:56 -0500 (Tue, 27 Feb 2007)
New Revision: 73480
Modified:
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/TreeViewTest.cs
Log:
fixed tests
Modified:
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/TreeViewTest.cs
===================================================================
--- trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/TreeViewTest.cs
2007-02-27 16:30:39 UTC (rev 73479)
+++ trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/TreeViewTest.cs
2007-02-27 16:39:56 UTC (rev 73480)
@@ -119,7 +119,7 @@
[TestFixtureSetUp]
public void SetUp ()
{
-#if DOT_NET
+#if VISUAL_STUDIO
WebTest.CopyResource (GetType (),
"MonoTests.System.Web.UI.WebControls.Resources.NoEventValidation.aspx",
"NoEventValidation.aspx");
#else
WebTest.CopyResource (GetType (),
"NoEventValidation.aspx", "NoEventValidation.aspx");
@@ -1828,7 +1828,6 @@
[Test]
[Category ("NunitWeb")]
- [Category ("NotWorking")] // Implementation details for mono
public void TreeView_PostBackFireEvents_1 ()
{
WebTest t = new WebTest (PageInvoker.CreateOnLoad
(PostBackFireEvents_1));
@@ -1872,9 +1871,10 @@
{
WebTest t = new WebTest ("NoEventValidation.aspx");
t.Invoker = PageInvoker.CreateOnLoad
(PostBackFireEvents_2);
- t.Run ();
+ string html = t.Run ();
FormRequest fr = new FormRequest (t.Response, "form1");
+#if DOT_NET
fr.Controls.Add ("__EVENTTARGET");
fr.Controls.Add ("__EVENTARGUMENT");
fr.Controls.Add ("treeview1_ExpandState");
@@ -1888,9 +1888,24 @@
fr.Controls["treeview1_SelectedNode"].Value =
"treeview1t0";
fr.Controls["treeview1_PopulateLog"].Value = "";
fr.Controls["treeview1n0CheckBox"].Value = "on";
+#else
+ fr.Controls.Add ("__EVENTTARGET");
+ fr.Controls.Add ("__EVENTARGUMENT");
+ //fr.Controls.Add ("treeview1_ExpandState");
+ //fr.Controls.Add ("treeview1_SelectedNode");
+ //fr.Controls.Add ("treeview1_PopulateLog");
+ fr.Controls.Add ("treeview1_cs_0");
+ fr.Controls ["__EVENTTARGET"].Value = "treeview1";
+ fr.Controls ["__EVENTARGUMENT"].Value = "sel|0";
+ //fr.Controls ["treeview1_ExpandState"].Value = "n";
+ //fr.Controls ["treeview1_SelectedNode"].Value =
"treeview1t0";
+ //fr.Controls ["treeview1_PopulateLog"].Value = "";
+ fr.Controls ["treeview1_cs_0"].Value = "on";
+#endif
+
t.Request = fr;
- t.Run ();
+ html = t.Run ();
Assert.AreEqual ("TreeNodeCheckChanged",
t.UserData.ToString (), "PostBackFireEvents");
}
@@ -1917,7 +1932,6 @@
[Test]
[Category ("NunitWeb")]
- [Category ("NotWorking")] // Implementation details for mono
public void TreeView_PostBackFireEvents_3 ()
{
WebTest t = new WebTest (PageInvoker.CreateOnLoad
(PostBackFireEvents_3));
@@ -1930,9 +1944,13 @@
fr.Controls.Add ("__EVENTTARGET");
fr.Controls.Add ("__EVENTARGUMENT");
fr.Controls["__EVENTTARGET"].Value = "treeview1";
+#if DOT_NET
fr.Controls["__EVENTARGUMENT"].Value = "tBook";
+#else
+ fr.Controls ["__EVENTARGUMENT"].Value = "ec|0";
+#endif
t.Request = fr;
- t.Run ();
+ html = t.Run ();
Assert.AreEqual ("TreeNodeCollapsed",
t.UserData.ToString (), "PostBackFireEvents#2");
}
@@ -1974,7 +1992,6 @@
[Test]
[Category ("NunitWeb")]
- [Category ("NotWorking")] // Implementation details for mono
public void TreeView_PostBackFireEvents_4 ()
{
WebTest t = new WebTest (PageInvoker.CreateOnLoad
(PostBackFireEvents_4));
@@ -2004,13 +2021,13 @@
[Test]
[Category ("NunitWeb")]
- [Category ("NotWorking")] // Implementation details for mono
public void TreeView_PostBackFireEvents_5 ()
{
WebTest t = new WebTest ("NoEventValidation.aspx");
t.Invoker = PageInvoker.CreateOnLoad
(PostBackFireEvents_5);
t.Run ();
FormRequest fr = new FormRequest (t.Response, "form1");
+#if DOT_NET
fr.Controls.Add ("__EVENTTARGET");
fr.Controls.Add ("__EVENTARGUMENT");
fr.Controls.Add ("TreeView2_ExpandState");
@@ -2020,6 +2037,17 @@
fr.Controls["__EVENTARGUMENT"].Value = "snode";
fr.Controls["TreeView2_ExpandState"].Value = "nn";
fr.Controls["TreeView2_SelectedNode"].Value =
"treeview1t1";
+#else
+ fr.Controls.Add ("__EVENTTARGET");
+ fr.Controls.Add ("__EVENTARGUMENT");
+ //fr.Controls.Add ("TreeView2_ExpandState");
+ //fr.Controls.Add ("TreeView2_SelectedNode");
+
+ fr.Controls ["__EVENTTARGET"].Value = "treeview1";
+ fr.Controls ["__EVENTARGUMENT"].Value = "sel|1";
+ //fr.Controls ["TreeView2_ExpandState"].Value = "nn";
+ //fr.Controls ["TreeView2_SelectedNode"].Value =
"treeview1t1";
+#endif
t.Request = fr;
t.Run ();
Assert.AreEqual ("SelectedNodeChanged",
t.UserData.ToString (), "PostBackFireEvents");
@@ -2048,7 +2076,6 @@
#endregion
[Test]
- [Category("NotWorking")]
public void TreeView_NullDS ()
{
TreeView tv = new TreeView ();
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
