From cb9a9f28e25e258c38e0618fb0bc73c699f26a68 Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Thu, 8 Jul 2010 13:09:46 +0000 Subject: [PATCH] 4.0 test update svn path=/trunk/mcs/; revision=160051 --- .../DataSourceControlTest.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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 b87cee50c3f..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,7 +77,11 @@ 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"); @@ -93,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 () -- 2.25.1