From 1d6ae4f999026f6535b1c176b3cbca31171d9242 Mon Sep 17 00:00:00 2001
From: Vladimir Krasnov <krasnov@mono-cvs.ximian.com>
Date: Mon, 31 Jul 2006 12:13:26 +0000
Subject: [PATCH] * WizardStepBaseTest.cs, MasterPageTest.cs, MenuTest.cs,
 GridViewTest.cs: removed NotWorking attributes

svn path=/trunk/mcs/; revision=63173
---
 .../Test/System.Web.UI.WebControls/ChangeLog         |  7 +++++++
 .../Test/System.Web.UI.WebControls/GridViewTest.cs   | 12 ++++--------
 .../Test/System.Web.UI.WebControls/MasterPageTest.cs | 12 ++++++++----
 .../Test/System.Web.UI.WebControls/MenuTest.cs       | 10 +++-------
 .../System.Web.UI.WebControls/WizardStepBaseTest.cs  |  4 ----
 5 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
index 494246c7d2c..79389372179 100644
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-31 Vladimir Krasnov <vladimirk@mainsoft.com>
+	
+	* WizardStepBaseTest.cs:
+	* MasterPageTest.cs
+	* MenuTest.cs
+	* GridViewTest.cs: removed NotWorking attributes
+
 2006-07-30 Andrew Skiba <andrews@mainsoft.com>
 
 	* FormViewTest.cs: fix few tests.
diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/GridViewTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/GridViewTest.cs
index a8af78ed514..bbac18e0f27 100644
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/GridViewTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/GridViewTest.cs
@@ -607,7 +607,8 @@ namespace MonoTests.System.Web.UI.WebControls
 			Assert.AreEqual (DataControlRowState.Normal, gr.RowState, "CreateRow#4");
 		}
 
-		[Test]
+		[Test]
+		[Category ("NotWorking")]
 		public void GridView_GetCallbackResult()
 		{
 			Page page = new Page ();
@@ -1139,13 +1140,12 @@ namespace MonoTests.System.Web.UI.WebControls
 		}
 
 		[Test]
-		[Category ("NotWorking")]
 		public void GridView_RenderProperty ()
 		{
 			string RenderedPageHtml = new WebTest (PageInvoker.CreateOnLoad (RenderProperty)).Run ();
 			string RenderedControlHtml = HtmlDiff.GetControlFromPageHtml (RenderedPageHtml);
 			string OriginControlHtml = @"<div id=""__gvctl01__div"">
-							<table cellspacing=""1"" cellpadding=""0"" align=""Justify"" rules=""rows"" border=""1"" style=""background-image:url(test);"">
+							<table cellspacing=""1"" cellpadding=""0"" align=""Justify"" rules=""rows"" border=""1"" style=""background-image:url(http://test);"">
 								<caption align=""Left"">
 									test
 								</caption><tr>
@@ -1181,7 +1181,7 @@ namespace MonoTests.System.Web.UI.WebControls
 			// Changing some property for test
 			g.AutoGenerateDeleteButton = true;
 			g.AutoGenerateEditButton = true;
-			g.BackImageUrl = "test";
+			g.BackImageUrl = "http://test";
 			g.Caption = "test";
 			g.CaptionAlign = TableCaptionAlign.Left;
 			g.CellPadding = 0;
@@ -1616,7 +1616,6 @@ namespace MonoTests.System.Web.UI.WebControls
 
 		[Test]
 		[Category ("NunitWeb")]
-		[Category ("NotWorking")]
 		public void GridView_PostBackPaging ()
 		{
 			WebTest t = new WebTest (PageInvoker.CreateOnLoad (GridView_postback));
@@ -1658,7 +1657,6 @@ namespace MonoTests.System.Web.UI.WebControls
 
 		[Test]
 		[Category ("NunitWeb")]
-		[Category ("NotWorking")]
 		public void GridView_PostBackDeleteItem ()
 		{
 			WebTest t = new WebTest ();
@@ -1837,7 +1835,6 @@ namespace MonoTests.System.Web.UI.WebControls
 
 		[Test]
 		[Category ("NunitWeb")]
-		[Category ("NotWorking")]
 		public void GridView_PostBackEdit ()
 		{
 			WebTest t = new WebTest (PageInvoker.CreateOnLoad (GridView_postback));
@@ -1858,7 +1855,6 @@ namespace MonoTests.System.Web.UI.WebControls
 
 		[Test]
 		[Category ("NunitWeb")]
-		[Category ("NotWorking")]
 		public void GridView_PostBackSelect ()
 		{
 			WebTest t = new WebTest (PageInvoker.CreateOnLoad (GridView_postback));
diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/MasterPageTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/MasterPageTest.cs
index fc7fb705534..e40816cb0d8 100644
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/MasterPageTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/MasterPageTest.cs
@@ -72,18 +72,23 @@ namespace MonoTests.System.Web.UI.WebControls
 	{
 
 		[Test]
-		[Category ("NotWorking")]
 		public void MasterPage_DefaultProperties ()
 		{
 			PokerMasterPage pmp = new PokerMasterPage ();
 			Assert.AreEqual (null, pmp.Master, "Master Property");
 			Assert.AreEqual (null, pmp.MasterPageFile, "MasterPageFile Property");
-			IDictionary i = pmp.ContentTemplates ();
-			Assert.AreEqual (null,i,"ContentTemplates");
 		}
 
 		[Test]
 		[Category ("NotWorking")]
+		public void MasterPage_DefaultPropertiesNotWorking ()
+		{
+			PokerMasterPage pmp = new PokerMasterPage ();
+			IDictionary i = pmp.ContentTemplates ();
+			Assert.AreEqual (null, i, "ContentTemplates");
+		}
+
+		[Test]
 		[Category ("NunitWeb")]
 		public void MasterPage_Render()
 		{
@@ -120,7 +125,6 @@ namespace MonoTests.System.Web.UI.WebControls
 		}
 
 		[Test]
-		[Category ("NotWorking")]
 	 	[ExpectedException (typeof(HttpException))]
 		public void MasterPage_AddContentTemplate ()
 		{
diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/MenuTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/MenuTest.cs
index fe8bf04e75c..d40908851fa 100644
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/MenuTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/MenuTest.cs
@@ -170,8 +170,7 @@ namespace MonoTests.System.Web.UI.WebControls
 		}
 
 		[Test]
-		[Category ("NotWorking")]
-		public void Menu_DefaultPropertiesNotWorking ()
+		public void Menu_DefaultProperties_2 ()
 		{
 			PokerMenu p = new PokerMenu ();
 			Assert.AreEqual ("Skip Navigation Links", p.SkipLinkText, "SkipLinkText");
@@ -333,8 +332,7 @@ namespace MonoTests.System.Web.UI.WebControls
 		}
 
 		[Test]
-		[Category ("NotWorking")]
-		public void Menu_ChangeDefaultPropertiesNotWorking ()
+		public void Menu_ChangeDefaultProperties_2 ()
 		{
 			PokerMenu p = new PokerMenu ();
 			p.ScrollUpText = "test";
@@ -384,7 +382,6 @@ namespace MonoTests.System.Web.UI.WebControls
 
 	       	[Test]
 		[Category ("NunitWeb")]
-		[Category ("NotWorking")]  
 		public void Menu_RenderBeginTag ()
 		{
 		        new WebTest (PageInvoker.CreateOnLoad (_BeginTagRender)).Run ();
@@ -409,7 +406,7 @@ namespace MonoTests.System.Web.UI.WebControls
 
 		[Test]
 		[Category ("NunitWeb")]
-	        [Category ("NotWorking")]  
+		[Category ("NotWorking")]  
 		public void Menu_RenderEndTag ()
 		{
 		        new WebTest (PageInvoker.CreateOnLoad (_EndTagRender)).Run ();
@@ -503,7 +500,6 @@ namespace MonoTests.System.Web.UI.WebControls
 
 		[Test]
 		[Category ("NunitWeb")]
-		[Category ("NotWorking")]  
 		public void Menu_DefaultRender ()
 		{
 		        string RenderedPageHtml = new WebTest (PageInvoker.CreateOnLoad (_DefaultRender)).Run ();
diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/WizardStepBaseTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/WizardStepBaseTest.cs
index 0a07c42ad51..f1b6ba0c618 100644
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/WizardStepBaseTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/WizardStepBaseTest.cs
@@ -99,7 +99,6 @@ namespace MonoTests.System.Web.UI.WebControls
 		}
 
 		[Test]
-		[Category("NotWorking")]
 		public void WizardStepBase_DefaultPropertyNotWorking ()
 		{
 			PokerWizardStepBase step = new PokerWizardStepBase ();
@@ -206,7 +205,6 @@ namespace MonoTests.System.Web.UI.WebControls
 		
 		[Test]
 		[Category ("NunitWeb")]
-		[Category ("NotWorking")]
 		public void WizardStepBase_RenderTest ()
 		{
 			// This render test include Title property test 
@@ -266,7 +264,6 @@ namespace MonoTests.System.Web.UI.WebControls
 
 		[Test]
 		[Category ("NunitWeb")]
-		[Category ("NotWorking")]
 		public void WizardStepBase_PostBackAllowReturnTest ()
 		{
 			// This test examine the rendering 2 steps and make postbake
@@ -325,7 +322,6 @@ namespace MonoTests.System.Web.UI.WebControls
 
 		[Test]
 		[Category ("NunitWeb")]
-		[Category ("NotWorking")]
 		public void WizardStepBase_Theme ()
 		{
 #if DOT_NET
-- 
2.25.1