Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using NUnit.Framework;
using System;
@ -174,4 +173,3 @@ namespace MonoTests.System.Web.UI.WebControls
}
}
#endif

View File

@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#if NET_2_0
using System;
@ -150,4 +149,3 @@ namespace MonoTests.System.Web.UI.WebControls
}
}
#endif

View File

@ -73,11 +73,7 @@ namespace MonoCasTests.System.Web.UI.WebControls {
Assert.AreEqual (p.GetCutoffYear (), 2029, "E1");
Assert.AreEqual (p.GetFullYear (29), 2029, "E2");
#if NET_2_0
Assert.AreEqual (p.GetFullYear (30), 1930, "E3");
#else
Assert.AreEqual (p.GetFullYear (30), 2030, "E3"); // XXX this is broken
#endif
Assert.IsNotNull (p.GetDateElementOrder (), "E4");
}
}

View File

@ -116,9 +116,7 @@ namespace MonoTests.System.Web.UI.WebControls
BaseCompareValidatorPoker p = new BaseCompareValidatorPoker ();
Assert.AreEqual (ValidationDataType.String, p.Type, "CultureInvariantValues");
#if NET_2_0
Assert.AreEqual (false, p.CultureInvariantValues, "CultureInvariantValues");
#endif
}
[Test]
@ -128,10 +126,8 @@ namespace MonoTests.System.Web.UI.WebControls
p.Type = ValidationDataType.Double;
Assert.AreEqual (ValidationDataType.Double, p.Type, "CultureInvariantValues");
#if NET_2_0
p.CultureInvariantValues = true;
Assert.AreEqual (true, p.CultureInvariantValues, "CultureInvariantValues");
#endif
}
[Test]
@ -140,17 +136,13 @@ namespace MonoTests.System.Web.UI.WebControls
BaseCompareValidatorPoker p = new BaseCompareValidatorPoker ();
p.Type = ValidationDataType.Double;
#if NET_2_0
p.CultureInvariantValues = true;
#endif
BaseCompareValidatorPoker copy = new BaseCompareValidatorPoker ();
copy.LoadState (p.SaveState ());
Assert.AreEqual (ValidationDataType.Double, copy.Type, "A1");
#if NET_2_0
Assert.AreEqual (true, copy.CultureInvariantValues, "A1");
#endif
}
[Test]
@ -522,11 +514,7 @@ namespace MonoTests.System.Web.UI.WebControls
Assert.AreEqual (p.GetCutoffYear(), 2029, "E1");
Assert.AreEqual (p.GetFullYear (29), 2029, "E2");
#if NET_2_0
Assert.AreEqual (p.GetFullYear (30), 1930, "E3");
#else
Assert.AreEqual (p.GetFullYear (30), 2030, "E3"); // XXX this is broken
#endif
Thread.CurrentThread.CurrentCulture = new CultureInfo ("en-GB", false);
Assert.AreEqual (p.GetDateElementOrder (), "dmy", "E4");
@ -538,7 +526,6 @@ namespace MonoTests.System.Web.UI.WebControls
Assert.AreEqual (p.GetDateElementOrder (), "ymd", "E6");
}
#if NET_2_0
[Test]
public void CultureInvariantValues_1 ()
{
@ -640,6 +627,5 @@ namespace MonoTests.System.Web.UI.WebControls
tb1.Text = "24-12-2005";
v.Validate ();
}
#endif
}
}

View File

@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using NUnit.Framework;
@ -65,4 +64,3 @@ namespace MonoCasTests.System.Web.UI.WebControls {
}
}
#endif

View File

@ -28,7 +28,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using NUnit.Framework;
using System;
using System.IO;
@ -198,4 +197,3 @@ namespace MonoTests.System.Web.UI.WebControls
#endif
}
}
#endif

View File

@ -68,7 +68,6 @@ namespace MonoCasTests.System.Web.UI.WebControls {
unit.Render ();
unit.Events ();
unit.OnDataBinding ();
#if NET_2_0
unit.DataSourceID ();
unit.EnsureDataBound_WithoutDataSourceID ();
unit.EnsureDataBound_WithDataSourceID ();
@ -84,7 +83,6 @@ namespace MonoCasTests.System.Web.UI.WebControls {
unit.OnLoad_WithPage ();
unit.OnLoad_WithPageWithoutViewState ();
unit.OnLoad_WithDataSource ();
#endif
unit.IsBindableType ();
}
}

View File

@ -57,7 +57,6 @@ namespace MonoTests.System.Web.UI.WebControls {
public StateBag StateBag {
get { return base.ViewState; }
}
#if NET_2_0
public bool IsDataBoundByDataSourceId {
get { return base.IsBoundUsingDataSourceID; }
}
@ -73,7 +72,6 @@ namespace MonoTests.System.Web.UI.WebControls {
public DataSourceSelectArguments Arguments {
get { return base.SelectArguments; }
}
#endif
public void Add (object o)
{
base.AddParsedSubObject (o);
@ -100,7 +98,6 @@ namespace MonoTests.System.Web.UI.WebControls {
{
OnSelectedIndexChanged (e);
}
#if NET_2_0
public DataSourceSelectArguments CreateArguments ()
{
return base.CreateDataSourceSelectArguments ();
@ -120,7 +117,6 @@ namespace MonoTests.System.Web.UI.WebControls {
{
base.EnsureDataBound ();
}
#endif
public bool DataBindingCalled {
get { return dataBindingCalled; }
set { dataBindingCalled = value; }
@ -131,7 +127,6 @@ namespace MonoTests.System.Web.UI.WebControls {
dataBindingCalled = true;
base.OnDataBinding (e);
}
#if NET_2_0
private bool dataPropertyChangedCalled;
private bool dataSourceViewChangedCalled;
private bool initCalled;
@ -212,7 +207,6 @@ namespace MonoTests.System.Web.UI.WebControls {
{
base.OnPreRender (e);
}
#endif
}
public class TestDataSource : IListSource {
@ -236,7 +230,6 @@ namespace MonoTests.System.Web.UI.WebControls {
}
}
#if NET_2_0
public class Test2DataSource : WebControl, IDataSource {
public DataSourceView GetView (string viewName)
@ -267,7 +260,6 @@ namespace MonoTests.System.Web.UI.WebControls {
return al;
}
}
#endif
[TestFixture]
public class BaseDataListTest {
@ -315,9 +307,7 @@ namespace MonoTests.System.Web.UI.WebControls {
Assert.AreEqual (GridLines.Both, bdl.GridLines, "GridLines");
Assert.AreEqual (HorizontalAlign.NotSet, bdl.HorizontalAlign, "HorizontalAlign");
Assert.IsFalse (bdl.UseAccessibleHeader, "UseAccessibleHeader");
#if NET_2_0
Assert.AreEqual (String.Empty, bdl.DataSourceID, "DataSourceID");
#endif
Assert.AreEqual (0, bdl.Attributes.Count, "Attributes.Count-2");
Assert.AreEqual (0, bdl.StateBag.Count, "ViewState.Count-2");
@ -351,13 +341,9 @@ namespace MonoTests.System.Web.UI.WebControls {
Assert.IsNull (bdl.DataSource, "DataSource");
bdl.UseAccessibleHeader = false;
Assert.IsFalse (bdl.UseAccessibleHeader, "UseAccessibleHeader");
#if NET_2_0
bdl.DataSourceID = String.Empty;
Assert.AreEqual (String.Empty, bdl.DataSourceID, "DataSourceID");
Assert.AreEqual (3, bdl.StateBag.Count, "ViewState.Count-3");
#else
Assert.AreEqual (2, bdl.StateBag.Count, "ViewState.Count-3");
#endif
Assert.AreEqual (0, bdl.Attributes.Count, "Attributes.Count-2");
}
@ -545,7 +531,6 @@ namespace MonoTests.System.Web.UI.WebControls {
bdl.DataBind ();
Assert.IsTrue (bdl.DataBindingCalled, "After DataBind");
}
#if NET_2_0
[Test]
public void DataSourceID ()
{
@ -792,7 +777,6 @@ namespace MonoTests.System.Web.UI.WebControls {
Assert.IsTrue (bdl.IsInitialized, "IsInitialized");
Assert.IsTrue (bdl.RequiresDataBind, "RequiresDataBind");
}
#endif
[Test]
public void IsBindableType ()
{

View File

@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#if NET_2_0
using System;
using System.Collections.Generic;
@ -557,4 +556,3 @@ namespace MonoTests.System.Web.UI.WebControls
}
}
}
#endif

View File

@ -28,7 +28,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using NUnit.Framework;
using System;
using System.Collections;
@ -405,4 +404,3 @@ namespace MonoTests.System.Web.UI.WebControls
}
}
#endif

View File

@ -49,24 +49,20 @@ namespace MonoTests.System.Web.UI.WebControls {
public void Defaults ()
{
ButtonColumn bc = new ButtonColumn ();
#if NET_2_0
Assert.AreEqual ("", bc.ValidationGroup, "ValidationGroup");
Assert.AreEqual (false, bc.CausesValidation, "CausesValidation");
#endif
}
[Test]
public void AssignedProperties ()
{
ButtonColumn bc = new ButtonColumn ();
#if NET_2_0
Assert.AreEqual ("", bc.ValidationGroup, "ValidationGroup#1");
bc.ValidationGroup = "test";
Assert.AreEqual ("test", bc.ValidationGroup, "ValidationGroup#2");
Assert.AreEqual (false, bc.CausesValidation, "CausesValidation#1");
bc.CausesValidation = true;
Assert.AreEqual (true, bc.CausesValidation, "CausesValidation#2");
#endif
}
[Test]

View File

@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#if NET_2_0
using System;
@ -127,4 +126,3 @@ namespace MonoTests.System.Web.UI.WebControls
}
}
}
#endif

View File

@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#if NET_2_0
using System;
using System.Collections.Generic;
@ -206,4 +205,3 @@ namespace MonoTests.System.Web.UI.WebControls
}
}
}
#endif

View File

@ -65,7 +65,6 @@ namespace MonoTests.System.Web.UI.WebControls
base.Render (writer);
return writer.InnerWriter.ToString ();
}
#if NET_2_0
public new PostBackOptions GetPostBackOptions ()
{
return base.GetPostBackOptions ();
@ -80,7 +79,6 @@ namespace MonoTests.System.Web.UI.WebControls
{
base.RaisePostBackEvent (eventArgument);
}
#endif
}
@ -111,19 +109,16 @@ namespace MonoTests.System.Web.UI.WebControls
Assert.AreEqual (true, b.CausesValidation, "CausesValidation");
Assert.AreEqual (string.Empty, b.CommandArgument, "CommandArgument");
Assert.AreEqual (string.Empty, b.CommandName, "CommandName");
#if NET_2_0
Assert.AreEqual (string.Empty, b.ValidationGroup, "ValidationGroup");
Assert.AreEqual (string.Empty, b.OnClientClick, "OnClientClick");
Assert.AreEqual (string.Empty, b.PostBackUrl, "PostBackUrl");
Assert.AreEqual (true, b.UseSubmitBehavior, "UseSubmitBehavior");
#endif
}
[Test]
public void AssignProperties ()
{
Button b = new Button ();
#if NET_2_0
Assert.AreEqual (string.Empty, b.OnClientClick, "OnClientClick#1");
b.OnClientClick = "Test()";
Assert.AreEqual ("Test()", b.OnClientClick, "OnClientClick#2");
@ -136,7 +131,6 @@ namespace MonoTests.System.Web.UI.WebControls
Assert.AreEqual (string.Empty, b.ValidationGroup, "ValidationGroup#1");
b.ValidationGroup = "test";
Assert.AreEqual ("test", b.ValidationGroup, "ValidationGroup#2");
#endif
}
[Test]
@ -148,7 +142,6 @@ namespace MonoTests.System.Web.UI.WebControls
p.Text = "Hello";
Assert.AreEqual (p.Text, "Hello", "A2");
#if NET_2_0
p.ValidationGroup = "VG1";
p.UseSubmitBehavior = false;
p.OnClientClick = "ClientClick()";
@ -157,7 +150,6 @@ namespace MonoTests.System.Web.UI.WebControls
Assert.AreEqual (false, p.UseSubmitBehavior, "ViewState_UseSubmitBehavior#original");
Assert.AreEqual ("ClientClick()", p.OnClientClick, "ViewState_OnClientClick#original");
Assert.AreEqual ("PostBackUrl", p.PostBackUrl, "ViewState_PostBackUrl#original");
#endif
object state = p.SaveState ();
@ -165,12 +157,10 @@ namespace MonoTests.System.Web.UI.WebControls
copy.LoadState (state);
Assert.AreEqual (copy.Text, "Hello", "A4");
#if NET_2_0
Assert.AreEqual (copy.ValidationGroup, "VG1", "A5");
Assert.AreEqual (false, copy.UseSubmitBehavior, "ViewState_UseSubmitBehavior#copy");
Assert.AreEqual ("ClientClick()", p.OnClientClick, "ViewState_OnClientClick#copy");
Assert.AreEqual ("PostBackUrl", p.PostBackUrl, "ViewState_PostBackUrl#copy");
#endif
}
[Test]
@ -201,7 +191,6 @@ namespace MonoTests.System.Web.UI.WebControls
Assert.AreEqual (-1, str.IndexOf ("hola"), "hola");
}
#if NET_2_0
[Test]
public void Button_Render2 () {
StringWriter sw = new StringWriter ();
@ -311,7 +300,6 @@ namespace MonoTests.System.Web.UI.WebControls
{
WebTest.Unload ();
}
#endif
}
}

View File

@ -457,10 +457,8 @@ namespace MonoTests.System.Web.UI.WebControls
p.TitleFormat = TitleFormat.Month;
p.TodaysDate = new DateTime (1999,1,1);
p.VisibleDate = new DateTime (1998,1,1);
#if NET_2_0
p.Caption = "This is a Caption";
p.CaptionAlign = TableCaptionAlign.Right;
#endif
p.DayHeaderStyle.BackColor = Color.Blue;
p.DayStyle.BackColor = Color.Yellow;
@ -494,10 +492,8 @@ namespace MonoTests.System.Web.UI.WebControls
Assert.AreEqual (new DateTime (1999,1,1), copy.TodaysDate, "TodaysDate");
Assert.AreEqual (new DateTime (1998,1,1), copy.VisibleDate, "VisibleDate");
#if NET_2_0
Assert.AreEqual ("This is a Caption", copy.Caption, "Caption");
Assert.AreEqual (TableCaptionAlign.Right, copy.CaptionAlign, "CaptionAlign");
#endif
copy.ShowDayHeader = true;
copy.ShowNextPrevMonth = true;

View File

@ -26,7 +26,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#if NET_2_0
using System;
using System.Collections.Generic;
@ -151,4 +150,3 @@ namespace MonoTests.System.Web.UI.WebControls
}
}
}
#endif

View File

@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Drawing;
@ -900,4 +899,3 @@ namespace MonoTests.System.Web.UI.WebControls
}
}
#endif

View File

@ -55,9 +55,7 @@ namespace MonoCasTests.System.Web.UI.WebControls {
unit.TextAlign_Values ();
unit.Render ();
unit.CheckboxViewstateTextNull ();
#if NET_2_0
unit.CheckboxViewstateValidation ();
#endif
}
// LinkDemand

View File

@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#if NET_2_0
using System;
@ -462,4 +461,3 @@ namespace MonoTests.System.Web.UI.WebControls
}
}
}
#endif

View File

@ -63,7 +63,6 @@ namespace MonoTests.System.Web.UI.WebControls {
}
#if NET_2_0
public new bool HasFooter
{
get
@ -121,7 +120,6 @@ namespace MonoTests.System.Web.UI.WebControls {
base.RenderItem(itemType,repeatIndex,repeatInfo,writer);
return writer.InnerWriter.ToString ();
}
#endif
}
[TestFixture]
@ -150,16 +148,13 @@ namespace MonoTests.System.Web.UI.WebControls {
Assert.AreEqual (c.RepeatLayout,
RepeatLayout.Table, "A5");
Assert.AreEqual (c.TextAlign, TextAlign.Right, "A6");
#if NET_2_0
Assert.AreEqual (false, c.HasFooter, "HasFooter");
Assert.AreEqual (false, c.HasHeader, "HasHeader");
Assert.AreEqual (false, c.HasSeparators, "HasSeparators");
Assert.AreEqual (0, c.RepeatedItemCount, "RepeatedItemCount");
Assert.AreEqual (null, c.DoGetItemStyle (ListItemType.Item, 0), "GetItemStyle");
#endif
}
#if NET_2_0
[Test]
public void CheckBoxList_Bug377703_1 ()
{
@ -422,7 +417,6 @@ namespace MonoTests.System.Web.UI.WebControls {
Assert.AreEqual (2, c.RepeatedItemCount, "RepeatedItemCount#2");
}
#endif
[Test]
@ -629,39 +623,21 @@ namespace MonoTests.System.Web.UI.WebControls {
{
CheckBoxList c = new CheckBoxList ();
#if NET_2_0
Render (c, "", "A1");
#else
Render (c, "<table border=\"0\">\n\n</table>", "A1");
#endif
c.CellPadding = 1;
#if NET_2_0
Render (c, "", "A2");
#else
Render (c, "<table border=\"0\" cellpadding=\"1\">\n\n</table>", "A2");
#endif
c = new CheckBoxList ();
c.CellPadding = 1;
#if NET_2_0
Render (c, "", "A3");
#else
Render (c, "<table border=\"0\" cellpadding=\"1\">\n\n</table>", "A3");
#endif
c = new CheckBoxList ();
c.TextAlign = TextAlign.Left;
#if NET_2_0
Render (c, "", "A4");
#else
Render (c, "<table border=\"0\">\n\n</table>", "A4");
#endif
}
[Test]
#if NET_2_0
[Category("NotDotNet")] // MS's implementation throws NRE's from these
#endif
public void Render ()
{
#if NET_4_0
@ -684,9 +660,7 @@ namespace MonoTests.System.Web.UI.WebControls {
// bug 51648
[Test]
#if NET_2_0
[Category("NotDotNet")] // MS's implementation throws NRE's from these
#endif
public void TestTabIndex ()
{
CheckBoxList c = new CheckBoxList ();
@ -710,9 +684,7 @@ namespace MonoTests.System.Web.UI.WebControls {
// bug 48802
[Test]
#if NET_2_0
[Category("NotDotNet")] // MS's implementation throws NRE's from these
#endif
public void TestDisabled ()
{
CheckBoxList c = new CheckBoxList ();
@ -733,7 +705,6 @@ namespace MonoTests.System.Web.UI.WebControls {
#endif
Render (c, exp, "C1");
}
#if NET_2_0
class TestCheckBoxList : CheckBoxList
{
public void CallVerifyMultiSelect()
@ -752,7 +723,6 @@ namespace MonoTests.System.Web.UI.WebControls {
{
WebTest.Unload ();
}
#endif
}
}

Some files were not shown because too many files have changed in this diff Show More