X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Web%2FTest%2FSystem.Web.UI.WebControls%2FDataSourceControlTest.cs;h=ff34528f898d0a13fc8bb7ef9fba8eb9363714ba;hb=cb9a9f28e25e258c38e0618fb0bc73c699f26a68;hp=fefa6c30d226a717947adbe0527bf587363c9151;hpb=c4a3b30460c7ea1a1fb3c97cfc8478555714af2f;p=mono.git

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataSourceControlTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataSourceControlTest.cs
index fefa6c30d22..ff34528f898 100644
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataSourceControlTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/DataSourceControlTest.cs
@@ -51,7 +51,7 @@ namespace MonoTests.System.Web.UI.WebControls
 
 		public ICollection  DoGetViewNames()
 		{
- 			 return base.GetViewNames();
+			 return base.GetViewNames();
 		}
 		
 		public ControlCollection DoCreateControlCollection ()
@@ -77,14 +77,17 @@ namespace MonoTests.System.Web.UI.WebControls
 		public void DataSourceControl_DefaultProperty ()
 		{
 			PokerDataSource ds = new PokerDataSource ();
+#if NET_4_0
+			Assert.AreEqual (String.Empty, ds.ClientID, "ClientID");
+#else
 			Assert.AreEqual (null, ds.ClientID, "ClientID");
+#endif
 			Assert.IsNotNull (ds.Controls, "Controls#1");
 			Assert.AreEqual ( 0 , ds.Controls.Count , "Controls#2");
 			Assert.AreEqual (false, ds.Visible, "Visible");
 		}
 
 		[Test]
-		[NUnit.Framework.Category ("NotWorking")]
 		public void DataSourceControl_DefaultPropertyNotWorking ()
 		{
 			PokerDataSource ds = new PokerDataSource ();
@@ -94,9 +97,9 @@ namespace MonoTests.System.Web.UI.WebControls
 		[Test]
 		public void DataSourceControl_ApplyStyleSheetSkin ()
 		{
-		        // DataSourceControl EnableTheme property always set to false 
-	                // and have no render issue - this method would do nothing
- 		}
+			// DataSourceControl EnableTheme property always set to false 
+			// and have no render issue - this method would do nothing
+		}
 
 		[Test]
 		public void DataSourceControl_FindControl ()
@@ -106,7 +109,6 @@ namespace MonoTests.System.Web.UI.WebControls
 		}
 
 		[Test]
-		[NUnit.Framework.Category ("NotWorking")]
 		[ExpectedException (typeof (NotSupportedException))]
 		public void DataSourceControl_Focus ()
 		{
@@ -152,7 +154,6 @@ namespace MonoTests.System.Web.UI.WebControls
 
 
 		[Test]
-		[NUnit.Framework.Category ("NotWorking")]
 		[ExpectedException (typeof (NotSupportedException))]
 		public void DataSourceControl_EnableThemingException ()
 		{