Author: igorz
Date: 2006-09-12 08:52:43 -0400 (Tue, 12 Sep 2006)
New Revision: 65303
Modified:
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/TreeNodeTest.cs
Log:
fixed tests, removed NotWorking attributes
Modified: trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
2006-09-12 12:46:54 UTC (rev 65302)
+++ trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
2006-09-12 12:52:43 UTC (rev 65303)
@@ -1,10 +1,14 @@
2006-09-12 Igor Zelmanovich <[EMAIL PROTECTED]>
- * TableViewTest.cs: fixed test, removed NotWorking attributes
+ * TreeNodeTest.cs: fixed tests, removed NotWorking attributes
+2006-09-12 Igor Zelmanovich <[EMAIL PROTECTED]>
+
+ * TreeViewTest.cs: fixed test, removed NotWorking attributes
+
2006-09-11 Igor Zelmanovich <[EMAIL PROTECTED]>
- * TableViewTest.cs: fixed tests, removed NotWorking attributes
+ * TreeViewTest.cs: fixed tests, removed NotWorking attributes
2006-09-10 Igor Zelmanovich <[EMAIL PROTECTED]>
Modified:
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/TreeNodeTest.cs
===================================================================
--- trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/TreeNodeTest.cs
2006-09-12 12:46:54 UTC (rev 65302)
+++ trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/TreeNodeTest.cs
2006-09-12 12:52:43 UTC (rev 65303)
@@ -73,7 +73,6 @@
public class TreeNodeTest {
[Test]
- [Category ("NotWorking")]
public void TreeNode_DefaultProperties () {
PokerTreeNode tn = new PokerTreeNode ();
Assert.AreEqual (false, tn.Checked, "Checked");
@@ -141,7 +140,6 @@
}
[Test]
- [Category ("NotWorking")]
public void TreeNode_Method_Clone () {
PokerTreeNode tn1 = new PokerTreeNode ();
TreeNode tn2 = new TreeNode ();
@@ -155,10 +153,9 @@
}
[Test]
- [Category ("NotWorking")]
[Category ("NunitWeb")]
- public void TreeNode_PostbackNavigate () {
- WebTest t = new WebTest (PageInvoker.CreateOnLoad
(pageLoadPostbackNavigate));
+ public void TreeNode_NavigateUrl () {
+ WebTest t = new WebTest (PageInvoker.CreateOnLoad
(pageLoadNavigateUrl));
string strTarget =
@"<a href=""#treeview1_SkipLink""><img alt=""Skip Navigation Links.""
src=""/NunitWeb/WebResource.axd?d=kffkK8wYLPknq-W8AKNdNQ2&t=632883840303269703""
width=""0"" height=""0"" style=""border-width:0px;"" /></a><div
id=""treeview1"">
<table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
@@ -170,7 +167,7 @@
string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
HtmlDiff.AssertAreEqual (strTarget, str,
"PostbackNavigate");
}
- private static void pageLoadPostbackNavigate (Page page) {
+ public static void pageLoadNavigateUrl (Page page) {
TreeView tv = new TreeView ();
tv.ID = "treeview1";
PokerTreeNode tn1 = new PokerTreeNode ();
@@ -184,200 +181,12 @@
page.Form.Controls.Add (lce);
}
- [Test]
- [Category ("NotWorking")]
- [Category ("NunitWeb")]
- public void TreeNode_PostbackExpand () {
- WebTest t = new WebTest (PageInvoker.CreateOnLoad
(pageLoadPostbackExpand));
- string strTarget =
- @"<a href=""#treeview1_SkipLink""><img alt=""Skip
Navigation Links.""
src=""/NunitWeb/WebResource.axd?d=kffkK8wYLPknq-W8AKNdNQ2&t=632883840303269703""
width=""0"" height=""0"" style=""border-width:0px;"" /></a><div
id=""treeview1"">
- <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
- <tr>
- <td><a id=""treeview1n0""
href=""javascript:TreeView_ToggleNode(treeview1_Data,0,treeview1n0,'
',treeview1n0Nodes)""><img
src=""/NunitWeb/WebResource.axd?d=edXX1vkoy5lI0CekgaZ5zczrmaCFckltSZkUNyTPtxw1&t=632883840303269703""
alt=""Expand TreeNode1"" style=""border-width:0;"" /></a></td><td
style=""white-space:nowrap;""><a class=""treeview1_0""
href=""javascript:TreeView_ToggleNode(treeview1_Data,0,treeview1n0,'
',treeview1n0Nodes)"" id=""treeview1t0"">TreeNode1</a></td>
- </tr>
- </table><div id=""treeview1n0Nodes"" style=""display:none;"">
- <table cellpadding=""0"" cellspacing=""0""
style=""border-width:0;"">
- <tr>
- <td><div
style=""width:20px;height:1px""></div></td><td><img
src=""/NunitWeb/WebResource.axd?d=edXX1vkoy5lI0CekgaZ5zZhMbc1ZCZv4nlS9J-l53l41&t=632883840303269703""
alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0""
href=""javascript:__doPostBack('treeview1','sTreeNode1\\TreeNode2')""
onclick=""TreeView_SelectNode(treeview1_Data, this,'treeview1t1');""
id=""treeview1t1"">TreeNode2</a></td>
- </tr>
- </table>
- </div>
-</div><a id=""treeview1_SkipLink""></a>";
- string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
- HtmlDiff.AssertAreEqual (strTarget, str,
"PostbackExpand");
- }
- private static void pageLoadPostbackExpand (Page page) {
- TreeView tv = new TreeView ();
- tv.ID = "treeview1";
- PokerTreeNode tn1 = new PokerTreeNode ();
- tn1.Text = "TreeNode1";
- tn1.NavigateUrl = "";
- tn1.SelectAction = TreeNodeSelectAction.Expand;
- PokerTreeNode tn2 = new PokerTreeNode ();
- tn2.Text = "TreeNode2";
- tn1.ChildNodes.Add (tn2);
- tv.Nodes.Add (tn1);
- tv.CollapseAll ();
- LiteralControl lcb = new LiteralControl
(HtmlDiff.BEGIN_TAG);
- LiteralControl lce = new LiteralControl
(HtmlDiff.END_TAG);
- page.Form.Controls.Add (lcb);
- page.Form.Controls.Add (tv);
- page.Form.Controls.Add (lce);
- }
-
- [Test]
- [Category ("NotWorking")]
- [Category ("NunitWeb")]
- public void TreeNode_PostbackNone () {
- WebTest t = new WebTest (PageInvoker.CreateOnLoad
(pageLoadPostbackNone));
- string strTarget =
- @"<a href=""#treeview1_SkipLink""><img alt=""Skip
Navigation Links.""
src=""/NunitWeb/WebResource.axd?d=kffkK8wYLPknq-W8AKNdNQ2&t=632883840303269703""
width=""0"" height=""0"" style=""border-width:0px;"" /></a><div
id=""treeview1"">
- <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
- <tr>
- <td><a id=""treeview1n0""
href=""javascript:TreeView_ToggleNode(treeview1_Data,0,treeview1n0,'
',treeview1n0Nodes)""><img
src=""/NunitWeb/WebResource.axd?d=edXX1vkoy5lI0CekgaZ5zczrmaCFckltSZkUNyTPtxw1&t=632883840303269703""
alt=""Expand TreeNode1"" style=""border-width:0;"" /></a></td><td
style=""white-space:nowrap;""><span class=""treeview1_0""
id=""treeview1t0"">TreeNode1</span></td>
- </tr>
- </table><div id=""treeview1n0Nodes"" style=""display:none;"">
- <table cellpadding=""0"" cellspacing=""0""
style=""border-width:0;"">
- <tr>
- <td><div
style=""width:20px;height:1px""></div></td><td><img
src=""/NunitWeb/WebResource.axd?d=edXX1vkoy5lI0CekgaZ5zZhMbc1ZCZv4nlS9J-l53l41&t=632883840303269703""
alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0""
href=""javascript:__doPostBack('treeview1','sTreeNode1\\TreeNode2')""
onclick=""TreeView_SelectNode(treeview1_Data, this,'treeview1t1');""
id=""treeview1t1"">TreeNode2</a></td>
- </tr>
- </table>
- </div>
-</div><a id=""treeview1_SkipLink""></a>";
- string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
- HtmlDiff.AssertAreEqual (strTarget, str,
"PostbackNone");
- }
- private static void pageLoadPostbackNone (Page page) {
- TreeView tv = new TreeView ();
- tv.ID = "treeview1";
- PokerTreeNode tn1 = new PokerTreeNode ();
- tn1.Text = "TreeNode1";
- tn1.NavigateUrl = "";
- tn1.SelectAction = TreeNodeSelectAction.None;
- PokerTreeNode tn2 = new PokerTreeNode ();
- tn2.Text = "TreeNode2";
- tn1.ChildNodes.Add (tn2);
- tv.Nodes.Add (tn1);
- tv.CollapseAll ();
- LiteralControl lcb = new LiteralControl
(HtmlDiff.BEGIN_TAG);
- LiteralControl lce = new LiteralControl
(HtmlDiff.END_TAG);
- page.Form.Controls.Add (lcb);
- page.Form.Controls.Add (tv);
- page.Form.Controls.Add (lce);
- }
-
- [Test]
- [Category ("NotWorking")]
- [Category ("NunitWeb")]
- public void TreeNode_PostbackSelect () {
- WebTest t = new WebTest (PageInvoker.CreateOnLoad
(pageLoadPostbackSelect));
- t.Run ();
- FormRequest fr = new FormRequest (t.Response, "form1");
- fr.Controls.Add ("__EVENTTARGET");
- fr.Controls.Add ("__EVENTARGUMENT");
- fr.Controls["__EVENTTARGET"].Value = "tv";
- fr.Controls["__EVENTARGUMENT"].Value =
"sTreeNode1\\TreeNode2";
- t.Request = fr;
- string strTarget =
- @"<a href=""#tv_SkipLink""><img alt=""Skip Navigation
Links.""
src=""/NunitWeb/WebResource.axd?d=kffkK8wYLPknq-W8AKNdNQ2&t=632883840303269703""
width=""0"" height=""0"" style=""border-width:0px;"" /></a><div id=""tv"">
- <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
- <tr>
- <td><a id=""tvn0""
href=""javascript:TreeView_ToggleNode(tv_Data,0,tvn0,' ',tvn0Nodes)""><img
src=""/NunitWeb/WebResource.axd?d=edXX1vkoy5lI0CekgaZ5zczrmaCFckltSZkUNyTPtxw1&t=632883840303269703""
alt=""Expand TreeNode1"" style=""border-width:0;"" /></a></td><td
style=""white-space:nowrap;""><a class=""tv_0""
href=""javascript:__doPostBack('tv','sTreeNode1')""
onclick=""TreeView_SelectNode(tv_Data, this,'tvt0');""
id=""tvt0"">TreeNode1</a></td>
- </tr>
- </table><div id=""tvn0Nodes"" style=""display:none;"">
- <table cellpadding=""0"" cellspacing=""0""
style=""border-width:0;"">
- <tr>
- <td><div
style=""width:20px;height:1px""></div></td><td><img
src=""/NunitWeb/WebResource.axd?d=edXX1vkoy5lI0CekgaZ5zZhMbc1ZCZv4nlS9J-l53l41&t=632883840303269703""
alt="""" /></td><td style=""white-space:nowrap;""><a class=""tv_0""
href=""javascript:__doPostBack('tv','sTreeNode1\\TreeNode2')""
onclick=""TreeView_SelectNode(tv_Data, this,'tvt1');""
id=""tvt1"">TreeNode2</a></td>
- </tr>
- </table>
- </div>
-</div><a id=""tv_SkipLink""></a>";
- string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
- HtmlDiff.AssertAreEqual (strTarget, str,
"PostbackSelect");
- Assert.AreEqual ("TreeNode2", t.UserData,
"PostbackSelectEvent");
- }
- private static void pageLoadPostbackSelect (Page page) {
- WebTest.CurrentTest.UserData = "Init";
- TreeView tv = new TreeView ();
- tv.ID = "tv";
- tv.SelectedNodeChanged += new EventHandler
(tv_SelectedNodeChanged);
- PokerTreeNode tn1 = new PokerTreeNode ();
- tn1.Text = "TreeNode1";
- PokerTreeNode tn2 = new PokerTreeNode ();
- tn2.Text = "TreeNode2";
- tn2.NavigateUrl = "";
- tn2.SelectAction = TreeNodeSelectAction.Select;
- tn1.ChildNodes.Add (tn2);
- tv.Nodes.Add (tn1);
- if (page.IsPostBack == false)
- tv.CollapseAll ();
- LiteralControl lcb = new LiteralControl
(HtmlDiff.BEGIN_TAG);
- LiteralControl lce = new LiteralControl
(HtmlDiff.END_TAG);
- page.Form.Controls.Add (lcb);
- page.Form.Controls.Add (tv);
- page.Form.Controls.Add (lce);
- }
-
- [Test]
- [Category ("NotWorking")]
- [Category ("NunitWeb")]
- public void TreeNode_PostbackSelectExpand () {
- WebTest t = new WebTest (PageInvoker.CreateOnLoad
(pageLoadPostbackSelectExpand));
- t.Run ();
- FormRequest fr = new FormRequest (t.Response, "form1");
- fr.Controls.Add ("__EVENTTARGET");
- fr.Controls.Add ("__EVENTARGUMENT");
- fr.Controls["__EVENTTARGET"].Value = "tv";
- fr.Controls["__EVENTARGUMENT"].Value = "sTreeNode1";
- t.Request = fr;
- string strTarget =
-@"<a href=""#tv_SkipLink""><img alt=""Skip Navigation Links.""
src=""/NunitWeb/WebResource.axd?d=kffkK8wYLPknq-W8AKNdNQ2&t=632883840303269703""
width=""0"" height=""0"" style=""border-width:0px;"" /></a><div id=""tv"">
- <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
- <tr>
- <td><a id=""tvn0""
href=""javascript:TreeView_ToggleNode(tv_Data,0,tvn0,' ',tvn0Nodes)""><img
src=""/NunitWeb/WebResource.axd?d=edXX1vkoy5lI0CekgaZ5zW7-1Af97Wq_r6fRK7PDqP81&t=632883840303269703""
alt=""Collapse TreeNode1"" style=""border-width:0;"" /></a></td><td
style=""white-space:nowrap;""><a class=""tv_0""
href=""javascript:__doPostBack('tv','sTreeNode1')""
onclick=""TreeView_SelectNode(tv_Data, this,'tvt0');""
id=""tvt0"">TreeNode1</a></td>
- </tr>
- </table><div id=""tvn0Nodes"" style=""display:block;"">
- <table cellpadding=""0"" cellspacing=""0""
style=""border-width:0;"">
- <tr>
- <td><div
style=""width:20px;height:1px""></div></td><td><img
src=""/NunitWeb/WebResource.axd?d=edXX1vkoy5lI0CekgaZ5zZhMbc1ZCZv4nlS9J-l53l41&t=632883840303269703""
alt="""" /></td><td style=""white-space:nowrap;""><a class=""tv_0""
href=""NavigateUrl"" id=""tvt1"">TreeNode2</a></td>
- </tr>
- </table>
- </div>
-</div><a id=""tv_SkipLink""></a>";
- string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
- HtmlDiff.AssertAreEqual (strTarget, str,
"PostbackSelectExpand");
- Assert.AreEqual ("TreeNode1", t.UserData,
"PostbackSelectEvent");
- }
- private static void pageLoadPostbackSelectExpand (Page page) {
- WebTest.CurrentTest.UserData = "Init";
- TreeView tv = new TreeView ();
- tv.ID = "tv";
- tv.SelectedNodeChanged += new EventHandler
(tv_SelectedNodeChanged);
- PokerTreeNode tn1 = new PokerTreeNode ();
- tn1.Text = "TreeNode1";
- tn1.NavigateUrl = "";
- tn1.SelectAction = TreeNodeSelectAction.SelectExpand;
- PokerTreeNode tn2 = new PokerTreeNode ();
- tn2.Text = "TreeNode2";
- tn2.NavigateUrl = "NavigateUrl";
- tn1.ChildNodes.Add (tn2);
- tv.Nodes.Add (tn1);
- if (page.IsPostBack == false)
- tv.CollapseAll ();
- LiteralControl lcb = new LiteralControl
(HtmlDiff.BEGIN_TAG);
- LiteralControl lce = new LiteralControl
(HtmlDiff.END_TAG);
- page.Form.Controls.Add (lcb);
- page.Form.Controls.Add (tv);
- page.Form.Controls.Add (lce);
- }
-
static void tv_SelectedNodeChanged (object sender, EventArgs e)
{
TreeView tv = (TreeView) sender;
WebTest.CurrentTest.UserData = tv.SelectedNode.Text;
}
[Test]
- [Category ("NotWorking")]
[Category ("NunitWeb")]
public void TreeNode_Render () {
WebTest t = new WebTest (PageInvoker.CreateOnLoad
(pageLoadRender));
@@ -387,19 +196,19 @@
<tr>
<td><a id=""treeview1n0""
href=""javascript:TreeView_ToggleNode(treeview1_Data,0,treeview1n0,'
',treeview1n0Nodes)""><img
src=""/NunitWeb/WebResource.axd?d=edXX1vkoy5lI0CekgaZ5zW7-1Af97Wq_r6fRK7PDqP81&t=632883840303269703""
alt=""Collapse text"" style=""border-width:0;"" /></a></td><td><a
href=""navigateUrl"" target=""target""
onclick=""javascript:TreeView_SelectNode(treeview1_Data,
this,'treeview1t0');javascript:TreeView_ToggleNode(treeview1_Data,0,treeview1n0,'
',treeview1n0Nodes)"" title=""ToolTip"" id=""treeview1t0i""><img
src=""imageUrl"" alt=""ImageToolTip"" style=""border-width:0;"" /></a></td><td
style=""white-space:nowrap;""><input type=""checkbox""
name=""treeview1n0CheckBox"" id=""treeview1n0CheckBox"" checked=""checked""
title=""text"" /><a class=""treeview1_0"" href=""navigateUrl""
target=""target"" onclick=""javascript:TreeView_SelectNode(treeview1_Data,
this,'treeview1t0');javascript:TreeView_ToggleNode(treeview1_Data,0,treeview1n0,'
',treeview1n0Nodes)
"" title=""ToolTip"" id=""treeview1t0"">text</a></td>
</tr>
- </table><div id=""treeview1n0Nodes"" style=""display:block;"">
- <table cellpadding=""0"" cellspacing=""0""
style=""border-width:0;"">
- <tr>
- <td><div
style=""width:20px;height:1px""></div></td><td><img
src=""/NunitWeb/WebResource.axd?d=edXX1vkoy5lI0CekgaZ5zZhMbc1ZCZv4nlS9J-l53l41&t=632883840303269703""
alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0""
href=""javascript:__doPostBack('treeview1','svalue\\childenode')""
onclick=""TreeView_SelectNode(treeview1_Data, this,'treeview1t1');""
id=""treeview1t1"">childenode</a></td>
- </tr>
- </table>
- </div>
+ </table>
+ <table cellpadding=""0"" cellspacing=""0"" style=""border-width:0;"">
+ <tr>
+ <td><div
style=""width:20px;height:1px""></div></td><td><img
src=""/NunitWeb/WebResource.axd?d=edXX1vkoy5lI0CekgaZ5zZhMbc1ZCZv4nlS9J-l53l41&t=632883840303269703""
alt="""" /></td><td style=""white-space:nowrap;""><a class=""treeview1_0""
href=""javascript:__doPostBack('treeview1','svalue\\childenode')""
onclick=""TreeView_SelectNode(treeview1_Data, this,'treeview1t1');""
id=""treeview1t1"">childenode</a></td>
+ </tr>
+ </table>
</div><a id=""treeview1_SkipLink""></a>";
string str = HtmlDiff.GetControlFromPageHtml (t.Run ());
HtmlDiff.AssertAreEqual (strTarget, str, "Render");
}
- private static void pageLoadRender (Page page) {
+ public static void pageLoadRender (Page page) {
TreeView tv = new TreeView ();
+ tv.EnableClientScript = false;
tv.ID = "treeview1";
TreeNode tn = new TreeNode
("text", "value", "imageUrl", "navigateUrl",
"target");
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches