Author: andrews
Date: 2006-05-17 11:50:22 -0400 (Wed, 17 May 2006)
New Revision: 60784
Modified:
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/MenuTest.cs
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/SiteMapPathTest.cs
Log:
rename methods so nunit does not try to run them as tests
Modified: trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/MenuTest.cs
===================================================================
--- trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/MenuTest.cs
2006-05-17 15:16:59 UTC (rev 60783)
+++ trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/MenuTest.cs
2006-05-17 15:50:22 UTC (rev 60784)
@@ -498,9 +498,9 @@
public void Menu_RenderBeginTag ()
{
//Thread.Sleep (1000);
- Helper.Instance.RunInPage(TestBeginTagRender, null);
+ Helper.Instance.RunInPage(DoTestBeginTagRender, null);
}
- public static void TestBeginTagRender(HttpContext c, Page p,
object param)
+ public static void DoTestBeginTagRender(HttpContext c, Page p,
object param)
{
PokerMenu pm = new PokerMenu ();
p.Form.Controls.Add (pm);
@@ -526,9 +526,9 @@
public void Menu_RenderEndTag ()
{
//Thread.Sleep (1000);
- Helper.Instance.RunInPage (TestEndTagRender, null);
+ Helper.Instance.RunInPage (DoTestEndTagRender, null);
}
- public static void TestEndTagRender (HttpContext c, Page p,
object param)
+ public static void DoTestEndTagRender (HttpContext c, Page p,
object param)
{
PokerMenu pm = new PokerMenu ();
p.Form.Controls.Add (pm);
@@ -608,7 +608,7 @@
[Category ("NotWorking")] //Must be running after hosting bug
resolve
public void Menu_DefaultRender ()
{
- string RenderedPageHtml = Helper.Instance.RunInPage
(TestDefaultRender, null);
+ string RenderedPageHtml = Helper.Instance.RunInPage
(DoTestDefaultRender, null);
string RenderedControlHtml =
WebTest.GetControlFromPageHtml (RenderedPageHtml);
string OriginControlHtml = "";
Assert.AreEqual (true, WebTest.HtmlComparer
(OriginControlHtml, RenderedControlHtml), "RenderDefault");
@@ -617,7 +617,7 @@
// All this methods are delegates for running tests in host
assembly.
- public static void TestDefaultRender (HttpContext c, Page p,
object param)
+ public static void DoTestDefaultRender (HttpContext c, Page p,
object param)
{
LiteralControl lcb = new LiteralControl
(WebTest.BEGIN_TAG);
LiteralControl lce = new LiteralControl
(WebTest.END_TAG);
@@ -633,7 +633,7 @@
public void Menu_ItemsRender ()
{
//Thread.Sleep (1000);
- string RenderedPageHtml = Helper.Instance.RunInPage
(TestItemsRender, null);
+ string RenderedPageHtml = Helper.Instance.RunInPage
(DoTestItemsRender, null);
string RenderedControlHtml =
WebTest.GetControlFromPageHtml (RenderedPageHtml);
string OriginControlHtml = @"<a
href=""#ctl01_SkipLink""><img alt=""Skip Navigation Links""
src=""/NunitWeb/WebResource.axd?d=gZrz8lvSQfolS1pG07HX9g2&t=632784640484505569""
width=""0"" height=""0"" border=""0"" />
</a><table id=""ctl01""
cellpadding=""0"" cellspacing=""0"" border=""0"">
@@ -670,7 +670,7 @@
Assert.AreEqual (true, WebTest.HtmlComparer
(OriginControlHtml, RenderedControlHtml), "Render Items");
}
- public static void TestItemsRender (HttpContext c, Page p,
object param)
+ public static void DoTestItemsRender (HttpContext c, Page p,
object param)
{
LiteralControl lcb = new LiteralControl
(WebTest.BEGIN_TAG);
LiteralControl lce = new LiteralControl
(WebTest.END_TAG);
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-05-17 15:16:59 UTC (rev 60783)
+++
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/SiteMapPathTest.cs
2006-05-17 15:50:22 UTC (rev 60784)
@@ -201,7 +201,7 @@
[Category ("NotWorking")] //Must be running after hosting bug
resolve
public void SiteMapPath_RenderProperty ()
{
- string RenderedPageHtml = Helper.Instance.RunInPage
(TestPropertyRender, null);
+ string RenderedPageHtml = Helper.Instance.RunInPage
(DoTestPropertyRender, null);
string RenderedControlHtml =
WebTest.GetControlFromPageHtml (RenderedPageHtml);
string OriginControlHtml = @"<span
style=""display:inline-block;""><font color=""Red"">
<a href=""#ctl01_SkipLink"">
@@ -218,7 +218,7 @@
[Category ("NotWorking")] //Must be running after hosting bug
resolve
public void SiteMapPath_RenderStyles ()
{
- string RenderedPageHtml = Helper.Instance.RunInPage
(TestStylesRender, null);
+ string RenderedPageHtml = Helper.Instance.RunInPage
(DoTestStylesRender, null);
string RenderedControlHtml =
WebTest.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"" />
@@ -232,7 +232,7 @@
[Category ("NotWorking")] //Must be running after hosting bug
resolve
public void SiteMapPath_DefaultRender()
{
- string RenderedPageHtml = Helper.Instance.RunInPage
(TestDefaultRender, null);
+ string RenderedPageHtml = Helper.Instance.RunInPage
(DoTestDefaultRender, null);
string RenderedControlHtml =
WebTest.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>
@@ -245,7 +245,7 @@
/// All this methods are delegates for running tests in host
assembly.
/// </summary>
- public static void TestDefaultRender (HttpContext c, Page p,
object param)
+ public static void DoTestDefaultRender (HttpContext c, Page p,
object param)
{
LiteralControl lcb = new LiteralControl
(WebTest.BEGIN_TAG);
LiteralControl lce = new LiteralControl
(WebTest.END_TAG);
@@ -254,7 +254,7 @@
p.Form.Controls.Add (smp);
p.Form.Controls.Add (lce);
}
- public static void TestPropertyRender (HttpContext c, Page p,
object param)
+ public static void DoTestPropertyRender (HttpContext c, Page p,
object param)
{
SiteMapPath smp = new SiteMapPath ();
smp.BackColor = Color.Red;
@@ -271,7 +271,7 @@
p.Form.Controls.Add (smp);
p.Form.Controls.Add (lce);
}
- public static void TestStylesRender (HttpContext c, Page p,
object param)
+ public static void DoTestStylesRender (HttpContext c, Page p,
object param)
{
PokerSiteMapPath smp = new PokerSiteMapPath ();
smp.ControlStyle.BackColor = Color.Red;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
