Author: andrews
Date: 2006-05-28 10:44:59 -0400 (Sun, 28 May 2006)
New Revision: 61211
Modified:
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/MasterPageTest.cs
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/MenuTest.cs
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ThemeTest.cs
Log:
rename methods to make nunit quiet
Modified: trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
2006-05-28 14:23:09 UTC (rev 61210)
+++ trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
2006-05-28 14:44:59 UTC (rev 61211)
@@ -1,3 +1,8 @@
+2006-05-28 Andrew Skiba <[EMAIL PROTECTED]>
+
+ * ThemeTest.cs, MenuTest.cs, MasterPageTest.cs: rename methods to make
+ nunit quiet
+
2006-05-21 Yoni Klain <[EMAIL PROTECTED]>
* ThemeTest.cs - Add new test
Modified:
trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/MasterPageTest.cs
===================================================================
--- trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/MasterPageTest.cs
2006-05-28 14:23:09 UTC (rev 61210)
+++ trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/MasterPageTest.cs
2006-05-28 14:44:59 UTC (rev 61211)
@@ -83,11 +83,11 @@
}
[Test]
+ [Category ("NotWorking")]
[Category ("NunitWeb")]
- [Category ("NotWorking")]
public void MasterPage_Render()
{
- string PageRenderHtml =
Helper.Instance.RunInPageWithMaster(TestRenderDefault, null);
+ string PageRenderHtml =
Helper.Instance.RunInPageWithMaster(_RenderDefault, null);
Assert.AreEqual (-1, PageRenderHtml.IndexOf ("Master
header text"), "Master#1");
if (PageRenderHtml.IndexOf ("Page main text") < 0) {
@@ -112,7 +112,7 @@
}
- static void TestRenderDefault (HttpContext c, Page p, object
param)
+ public static void _RenderDefault (HttpContext c, Page p,
object param)
{
p.Form.Controls.Add(new LiteralControl("Page dynamic
text"));
}
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-28 14:23:09 UTC (rev 61210)
+++ trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/MenuTest.cs
2006-05-28 14:44:59 UTC (rev 61211)
@@ -392,9 +392,9 @@
[Category ("NotWorking")] //Must be running after hosting bug
resolve
public void Menu_RenderBeginTag ()
{
- Helper.Instance.RunInPage(TestBeginTagRender, null);
+ Helper.Instance.RunInPage(_BeginTagRender, null);
}
- public static void TestBeginTagRender(HttpContext c, Page p,
object param)
+ public static void _BeginTagRender(HttpContext c, Page p,
object param)
{
PokerMenu pm = new PokerMenu ();
p.Form.Controls.Add (pm);
@@ -417,9 +417,9 @@
[Category ("NotWorking")] //Must be running after hosting bug
resolve
public void Menu_RenderEndTag ()
{
- Helper.Instance.RunInPage (TestEndTagRender, null);
+ Helper.Instance.RunInPage (_EndTagRender, null);
}
- public static void TestEndTagRender (HttpContext c, Page p,
object param)
+ public static void _EndTagRender (HttpContext c, Page p, object
param)
{
PokerMenu pm = new PokerMenu ();
p.Form.Controls.Add (pm);
@@ -511,7 +511,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
(_DefaultRender, null);
string RenderedControlHtml =
WebTest.GetControlFromPageHtml (RenderedPageHtml);
string OriginControlHtml = "";
WebTest.AssertAreEqual(OriginControlHtml,
RenderedControlHtml,"RenderDefault");
@@ -520,7 +520,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 _DefaultRender (HttpContext c, Page p,
object param)
{
LiteralControl lcb = new LiteralControl
(WebTest.BEGIN_TAG);
LiteralControl lce = new LiteralControl
(WebTest.END_TAG);
@@ -534,7 +534,7 @@
[Category ("NotWorking")] //Must be running after hosting bug
resolve
public void Menu_ItemsRender ()
{
- string RenderedPageHtml = Helper.Instance.RunInPage
(TestItemsRender, null);
+ string RenderedPageHtml = Helper.Instance.RunInPage
(_ItemsRender, 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"">
@@ -571,7 +571,7 @@
WebTest.AssertAreEqual(OriginControlHtml,
RenderedControlHtml,"Render Items");
}
- public static void TestItemsRender (HttpContext c, Page p,
object param)
+ public static void _ItemsRender (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/ThemeTest.cs
===================================================================
--- trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ThemeTest.cs
2006-05-28 14:23:09 UTC (rev 61210)
+++ trunk/mcs/class/System.Web/Test/System.Web.UI.WebControls/ThemeTest.cs
2006-05-28 14:44:59 UTC (rev 61211)
@@ -169,11 +169,11 @@
[Category ("NunitWeb")]
public void Theme_TestThemeNotExistExeption()
{
- string page = Helper.Instance.RunInPagePreInit
(TestThemeNotExistException);
+ string page = Helper.Instance.RunInPagePreInit
(_ThemeNotExistException);
Assert.IsTrue (page.IndexOf("System.Web.HttpException")
>= 0, "System.Web.HttpException was expected, actual result: "+page);
}
- public static void TestThemeNotExistException (HttpContext c,
Page p, object param)
+ public static void _ThemeNotExistException (HttpContext c,
Page p, object param)
{
p.Theme = "NotExistTheme";
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
