mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.10.0.47

Browse Source 
Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-24 17:04:36 +00:00
parent 88ff76fe28
commit e46a49ecf1
5927 changed files with 226314 additions and 129848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangePasswordTest.cs
View File

@ -40,7 +40,6 @@ using System.Web.Security;
using System.Text.RegularExpressions;
using MonoTests.SystemWeb.Framework;
using MonoTests.stand_alone.WebHarness;
using MonoTests.Common;
using NUnit.Framework;
using System.Collections.Specialized;
@ -879,7 +878,7 @@ namespace MonoTests.System.Web.UI.WebControls
using (var sw = new StringWriter ()) {
using (var w = new HtmlTextWriter (sw)) {
if (shouldFail)
AssertExtensions.Throws<InvalidOperationException> (() => {
Assert.Throws<InvalidOperationException> (() => {
cp.RenderControl (w);
}, message);
else {

5
mcs/class/System.Web/Test/System.Web.UI.WebControls/DataListTest.cs
View File

@ -38,7 +38,6 @@ using System.Web.UI;
using System.Web.UI.WebControls;
using NUnit.Framework;
using MonoTests.Common;
namespace MonoTests.System.Web.UI.WebControls {
@ -327,11 +326,11 @@ namespace MonoTests.System.Web.UI.WebControls {
{
TestDataList dl = new TestDataList ();
AssertExtensions.Throws<ArgumentOutOfRangeException> (() => {
Assert.Throws<ArgumentOutOfRangeException> (() => {
dl.RepeatLayout = RepeatLayout.OrderedList;
}, "#A1");
AssertExtensions.Throws<ArgumentOutOfRangeException> (() => {
Assert.Throws<ArgumentOutOfRangeException> (() => {
dl.RepeatLayout = RepeatLayout.UnorderedList;
}, "#A2");
}

11
mcs/class/System.Web/Test/System.Web.UI.WebControls/MasterPageTest.cs
View File

@ -42,7 +42,6 @@ using System.Collections;
using MonoTests.SystemWeb.Framework;
using MonoTests.stand_alone.WebHarness;
using System.Threading;
using MonoTests.Common;
namespace MonoTests.System.Web.UI.WebControls
{
@ -219,17 +218,17 @@ namespace MonoTests.System.Web.UI.WebControls
var mp = new MasterPage ();
ITemplate template = new MyTemplate ();
AssertExtensions.Throws<NullReferenceException> (() => {
Assert.Throws<NullReferenceException> (() => {
mp.InstantiateInContentPlaceHolder (null, template);
}, "#A1-1");
Control container = new Control ();
AssertExtensions.Throws<NullReferenceException> (() => {
Assert.Throws<NullReferenceException> (() => {
mp.InstantiateInContentPlaceHolder (container, null);
}, "#A1-2");
#if DOTNET
// TODO: why does it throw? Unchecked 'as' type cast?
AssertExtensions.Throws<NullReferenceException> (() => {
Assert.Throws<NullReferenceException> (() => {
mp.InstantiateInContentPlaceHolder (container, template);
}, "#B1-1");
#endif
@ -257,12 +256,12 @@ namespace MonoTests.System.Web.UI.WebControls
ITemplate template = new MyTemplate ();
AssertExtensions.Throws<NullReferenceException> (() => {
Assert.Throws<NullReferenceException> (() => {
mp.InstantiateInContentPlaceHolder (null, template);
}, "#A1-1");
Control container = new Control ();
AssertExtensions.Throws<NullReferenceException> (() => {
Assert.Throws<NullReferenceException> (() => {
mp.InstantiateInContentPlaceHolder (container, null);
}, "#A1-2");

6
mcs/class/System.Web/Test/System.Web.UI.WebControls/MenuTest.cs
View File

@ -47,8 +47,6 @@ using System.Text.RegularExpressions;
using System.Reflection;
using System.Xml;
using MonoTests.Common;
namespace MonoTests.System.Web.UI.WebControls
{
class MenuTable : Menu
@ -1774,11 +1772,11 @@ namespace MonoTests.System.Web.UI.WebControls
maxValue = value;
}
AssertExtensions.Throws<ArgumentOutOfRangeException> (() => {
Assert.Throws<ArgumentOutOfRangeException> (() => {
m.RenderingMode = (MenuRenderingMode) (minValue - 1);
}, "#A2-1");
AssertExtensions.Throws<ArgumentOutOfRangeException> (() => {
Assert.Throws<ArgumentOutOfRangeException> (() => {
m.RenderingMode = (MenuRenderingMode) (maxValue + 1);
}, "#A2-2");
}

5
mcs/class/System.Web/Test/System.Web.UI.WebControls/RouteParameterTest.cs
View File

@ -31,7 +31,6 @@ using System.Web.UI;
using System.Web.UI.WebControls;
using NUnit.Framework;
using MonoTests.Common;
using MonoTests.System.Web;
namespace MonoTests.System.Web.UI.WebControls
@ -60,7 +59,7 @@ namespace MonoTests.System.Web.UI.WebControls
RouteParameter rp;
RouteParameter original;
AssertExtensions.Throws<NullReferenceException> (() => {
Assert.Throws<NullReferenceException> (() => {
rp = new FakeRouteParameter ((RouteParameter) null);
}, "#A1");
@ -137,7 +136,7 @@ namespace MonoTests.System.Web.UI.WebControls
Assert.IsNull (rp.DoEvaluate (null, new Control ()), "#A1-1");
Assert.IsNull (rp.DoEvaluate (ctx, null), "#A1-2");
AssertExtensions.Throws <NullReferenceException> (() => {
Assert.Throws <NullReferenceException> (() => {
rp.DoEvaluate (ctx, new Control ());
}, "#A1-2");
}

13
mcs/class/System.Web/Test/System.Web.UI.WebControls/WizardTest.cs
View File

@ -46,9 +46,6 @@ using MonoTests.SystemWeb.Framework;
using MonoTests.stand_alone.WebHarness;
using System.Threading;
using MonoTests.Common;
namespace MonoTests.System.Web.UI.WebControls
{
@ -1501,7 +1498,7 @@ namespace MonoTests.System.Web.UI.WebControls
t.UserData = "Empty";
string result;
AssertExtensions.Throws<InvalidOperationException> (() => {
Assert.Throws<InvalidOperationException> (() => {
result = t.Run ();
}, "#A1");
}
@ -1517,7 +1514,7 @@ namespace MonoTests.System.Web.UI.WebControls
Assert.AreEqual (String.Empty, renderedHtml, "#A1");
t.UserData = "OptionalSideBar_WithSideBar";
AssertExtensions.Throws<InvalidOperationException> (() => {
Assert.Throws<InvalidOperationException> (() => {
result = t.Run ();
}, "#A2");
}
@ -1552,7 +1549,7 @@ namespace MonoTests.System.Web.UI.WebControls
Assert.AreEqual (String.Empty, renderedHtml, "#A1");
t.UserData = "OptionalHeader_WithHeaderTemplate";
AssertExtensions.Throws<InvalidOperationException> (() => {
Assert.Throws<InvalidOperationException> (() => {
result = t.Run ();
}, "#A2");
}
@ -1580,7 +1577,7 @@ namespace MonoTests.System.Web.UI.WebControls
{
WebTest t = new WebTest (PageInvoker.CreateOnInit (LayoutTemplateRender));
t.UserData = "StepPlaceHolder";
AssertExtensions.Throws<InvalidOperationException> (() => {
Assert.Throws<InvalidOperationException> (() => {
string result = t.Run ();
}, "#A1");
}
@ -1590,7 +1587,7 @@ namespace MonoTests.System.Web.UI.WebControls
{
WebTest t = new WebTest (PageInvoker.CreateOnInit (LayoutTemplateRender));
t.UserData = "NavigationPlaceHolder";
AssertExtensions.Throws<InvalidOperationException> (() => {
Assert.Throws<InvalidOperationException> (() => {
string result = t.Run ();
}, "#A1");
}