Author: andrews
Date: 2006-07-16 08:42:57 -0400 (Sun, 16 Jul 2006)
New Revision: 62655
Modified:
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/SiteMapPathTest.cs
Log:
fix expected results for dotnet in 3 tests; add 2 new asserts for InitializeItem
Modified: trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
2006-07-16 12:12:13 UTC (rev 62654)
+++ trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
2006-07-16 12:42:57 UTC (rev 62655)
@@ -1,3 +1,8 @@
+2006-07-16 Andrew Skiba <[EMAIL PROTECTED]>
+
+ * SiteMapPathTest.cs: fix expected results for dotnet in 3 tests;
+ add 2 new asserts for InitializeItem
+
2006-07-16 Vladimir Krasnov <[EMAIL PROTECTED]>
* BulletedListTest.cs: removed NotWorking attributes
@@ -29,6 +34,7 @@
* SiteMapPathTest.cs: fix expected results for IE user-agent
+>>>>>>> .r62654
2006-07-09 Yoni Klain <[EMAIL PROTECTED]>
* MenuTest.cs changes on postback;
Modified:
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/SiteMapPathTest.cs
===================================================================
---
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/SiteMapPathTest.cs
2006-07-16 12:12:13 UTC (rev 62654)
+++
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/SiteMapPathTest.cs
2006-07-16 12:42:57 UTC (rev 62655)
@@ -222,13 +222,10 @@
{
string RenderedPageHtml = new WebTest
(PageInvoker.CreateOnLoad (DoTestPropertyRender)).Run ();
string RenderedControlHtml =
HtmlDiff.GetControlFromPageHtml (RenderedPageHtml);
- string OriginControlHtml = @"<span
style=""background-color:Red;border-color:Red;border-width:3px;border-style:Dashed;color:Red;"">
- <a href=""#_ctl1_SkipLink"">
- <img
src=""WebResource.axd?a=s&r=transparent.gif&t=632881421043562512""
- width=""0"" height=""0"" alt=""Skip Navigation Links""
border=""0"" />
- </a><span><span
title=""test"">node1</span></span><span><span>-</span></span><span>
- <a title=""test""
href=""/NunitWeb/MyPageWithMaster.aspx"">root</a></span>
- <a id=""_ctl1_SkipLink""></a></span>";
+ string OriginControlHtml = @"<span
style=""display:inline-block;color:Red;background-color:Red;border-color:Red;border-width:3px;border-style:Dashed;"">
+ <a href=""#ctl01_SkipLink""><img alt=""Skip Navigation
Links"" height=""0"" width=""0"" src=""/NunitWeb/WebResource.axd""
+ style=""border-width:0px;""
/></a><span>node1</span><span>-</span><span><a title=""test""
href=""/NunitWeb/MyPageWithMaster.aspx"">root</a>
+ </span><a id=""ctl01_SkipLink""></a></span>";
HtmlDiff.AssertAreEqual(OriginControlHtml,RenderedControlHtml,"RenderProperty");
}
[Test]
@@ -238,11 +235,12 @@
{
string RenderedPageHtml = new WebTest
(PageInvoker.CreateOnLoad (DoTestStylesRender)).Run ();
string RenderedControlHtml =
HtmlDiff.GetControlFromPageHtml (RenderedPageHtml);
- string OriginControlHtml = @"<span><a
href=""#ctl01_SkipLink"">
- <img alt=""Skip Navigation Links""
height=""0"" width=""0""
src=""/NunitWeb/WebResource.axd?d=gZrz8lvSQfolS1pG07HX9g2&t=632784640484505569""
border=""0"" />
- </a><span><a title=""test""
href=""/NunitWeb/MyPageWithMaster.aspx"">root</a></span>
- <span> > </span><span>node1</span>
- <a
id=""ctl01_SkipLink""></a></span>";
+ string OriginControlHtml = @"<span
style=""background-color:Red;""><a href=""#ctl01_SkipLink"">
+ <img alt=""Skip Navigation Links"" height=""0""
width=""0"" src=""/NunitWeb/WebResource.axd""
+ style=""border-width:0px;"" /></a><span><a
title=""test"" href=""/NunitWeb/MyPageWithMaster.aspx""
+
style=""background-color:Beige;border-color:Purple;"">root</a></span>
+ <span style=""background-color:RoyalBlue;""> >
</span><span style=""background-color:Pink;border-color:Purple;"">node1</span>
+ <a id=""ctl01_SkipLink""></a></span>";
HtmlDiff.AssertAreEqual (OriginControlHtml,
RenderedControlHtml,"RenderStyles");
}
[Test]
@@ -253,9 +251,9 @@
string RenderedPageHtml = new WebTest
(PageInvoker.CreateOnLoad (DoTestDefaultRender)).Run ();
string RenderedControlHtml =
HtmlDiff.GetControlFromPageHtml (RenderedPageHtml);
string OriginControlHtml = @"<span><a
href=""#ctl01_SkipLink"">
- <img alt=""Skip Navigation
Links"" height=""0"" width=""0""
src=""/NunitWeb/WebResource.axd?d=gZrz8lvSQfolS1pG07HX9g2&t=632784640484505569""
border=""0"" /></a>
- <span><a title=""test""
href=""/NunitWeb/MyPageWithMaster.aspx"">root</a></span><span> >
</span><span>node1</span>
- <a
id=""ctl01_SkipLink""></a></span>";
+ <img alt=""Skip Navigation Links"" height=""0""
width=""0"" src=""/NunitWeb/WebResource.axd""
+ style=""border-width:0px;"" /></a><span><a
title=""test"" href=""/NunitWeb/MyPageWithMaster.aspx"">root</a>
+ </span><span> > </span><span>node1</span><a
id=""ctl01_SkipLink""></a></span>";
HtmlDiff.AssertAreEqual (OriginControlHtml,
RenderedControlHtml,"RenderDefault");
}
@@ -361,15 +359,17 @@
{
PokerSiteMapPath smp = new PokerSiteMapPath ();
Assert.AreEqual ("root", smp.Provider.RootNode.Title,
"RootNode");
- }
- public static void InitializeItem (Page p)
- {
- PokerSiteMapPath smp = new PokerSiteMapPath ();
- SiteMapNodeItem I = new SiteMapNodeItem (0,
SiteMapNodeItemType.PathSeparator);
- smp.PathSeparatorStyle.BorderColor = Color.Red;
- smp.InitilizeItems (I);
- Assert.AreEqual (Color.Red, I.BorderColor,
"InitializeItem");
- }
+ }
+ public static void InitializeItem (Page p)
+ {
+ PokerSiteMapPath smp = new PokerSiteMapPath ();
+ SiteMapNodeItem I = new SiteMapNodeItem (0,
SiteMapNodeItemType.PathSeparator);
+ smp.PathSeparatorStyle.BorderColor = Color.Red;
+ smp.InitilizeItems (I);
+ Assert.AreEqual (1, I.Controls.Count,
"InitializeItem#1");
+ Assert.AreEqual (typeof (Literal),
I.Controls[0].GetType (), "InitializeItem#2");
+ Assert.AreEqual (Color.Red, I.BorderColor,
"InitializeItem#3");
+ }
public static void SiteMapChildNode (Page p)
{
PokerSiteMapPath smp = new PokerSiteMapPath ();
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
