Imported Upstream version 5.10.0.47

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

View File

@ -33,7 +33,7 @@ using System.Web.Compilation;
using System.Web.Hosting;
using NUnit.Framework;
using MonoTests.Common;
namespace MonoTests.System.Web.Compilation
{
@ -45,7 +45,7 @@ namespace MonoTests.System.Web.Compilation
[Ignore ("Pending investigation if it is indeed the correct test.")]
public void GetGlobalAsaxType ()
{
AssertExtensions.Throws<InvalidOperationException> (() => {
Assert.Throws<InvalidOperationException> (() => {
BuildManager.GetGlobalAsaxType ();
}, "#A1");
}

View File

@ -39,7 +39,6 @@ using NUnit.Framework;
using MonoTests.SystemWeb.Framework;
using MonoTests.stand_alone.WebHarness;
using MonoTests.Common;
namespace MonoTests.System.Web.Compilation
{
@ -49,25 +48,25 @@ namespace MonoTests.System.Web.Compilation
[Test]
public void RegisterBuildProvider ()
{
AssertExtensions.Throws<ArgumentException> (() => {
Assert.Throws<ArgumentException> (() => {
BuildProvider.RegisterBuildProvider (null, typeof (FooBuildProvider));
}, "#A1-1");
AssertExtensions.Throws<ArgumentException> (() => {
Assert.Throws<ArgumentException> (() => {
BuildProvider.RegisterBuildProvider (String.Empty, typeof (FooBuildProvider));
}, "#A1-2");
AssertExtensions.Throws<ArgumentNullException> (() => {
Assert.Throws<ArgumentNullException> (() => {
BuildProvider.RegisterBuildProvider (".foo", null);
}, "#A1-3");
AssertExtensions.Throws<ArgumentException> (() => {
Assert.Throws<ArgumentException> (() => {
BuildProvider.RegisterBuildProvider (".foo", typeof (string));
}, "#A1-4");
// This would have worked if we called the method during the pre-application start stage
// (we have a test for this in the standalone test suite)
AssertExtensions.Throws<InvalidOperationException> (() => {
Assert.Throws<InvalidOperationException> (() => {
BuildProvider.RegisterBuildProvider (".foo", typeof (BuildProvider));
}, "#A1-5");
}

View File

@ -39,7 +39,7 @@ using NUnit.Framework;
using MonoTests.SystemWeb.Framework;
using MonoTests.stand_alone.WebHarness;
using MonoTests.Common;
namespace MonoTests.System.Web.Compilation
{
@ -84,11 +84,11 @@ namespace MonoTests.System.Web.Compilation
obj = bldr.EvaluateExpression (null, entry, null, context);
Assert.IsNull (obj, "#A4");
AssertExtensions.Throws<NullReferenceException> (() => {
Assert.Throws<NullReferenceException> (() => {
bldr.EvaluateExpression (null, null, null, context);
}, "#A5-1");
AssertExtensions.Throws<NullReferenceException> (() => {
Assert.Throws<NullReferenceException> (() => {
bldr.EvaluateExpression (null, entry, null, null);
}, "#A5-2");
}
@ -105,7 +105,7 @@ namespace MonoTests.System.Web.Compilation
[Test]
public void GetRouteUrl ()
{
AssertExtensions.Throws<ArgumentNullException> (() => {
Assert.Throws<ArgumentNullException> (() => {
RouteUrlExpressionBuilder.GetRouteUrl (null, "bar=test");
}, "#A1-1");
@ -139,15 +139,15 @@ namespace MonoTests.System.Web.Compilation
Assert.IsNotNull (url, "#A6-1");
Assert.AreEqual ("/NunitWeb/test-foo", url, "#A6-2");
AssertExtensions.Throws<InvalidOperationException> (() => {
Assert.Throws<InvalidOperationException> (() => {
url = RouteUrlExpressionBuilder.GetRouteUrl (new Control (), "routename");
}, "#A7-1");
AssertExtensions.Throws<InvalidOperationException> (() => {
Assert.Throws<InvalidOperationException> (() => {
url = RouteUrlExpressionBuilder.GetRouteUrl (new Control (), String.Empty);
}, "#A7-2");
AssertExtensions.Throws<InvalidOperationException> (() => {
Assert.Throws<InvalidOperationException> (() => {
url = RouteUrlExpressionBuilder.GetRouteUrl (new Control (), null);
}, "#A7-2");
}
@ -165,7 +165,7 @@ namespace MonoTests.System.Web.Compilation
Assert.AreEqual (1, rvd.Count, "#A1-4-1");
Assert.AreEqual (String.Empty, rvd ["route"], "#A1-4-2");
AssertExtensions.Throws<NullReferenceException> (() => {
Assert.Throws<NullReferenceException> (() => {
RouteUrlExpressionBuilder.TryParseRouteExpression ("foo=bar", null, out routeName);
}, "#A1-5");
@ -235,7 +235,7 @@ namespace MonoTests.System.Web.Compilation
var context = new ExpressionBuilderContext (new FakePage ());
CodeExpression expr;
AssertExtensions.Throws<NullReferenceException> (() => {
Assert.Throws<NullReferenceException> (() => {
expr = bldr.GetCodeExpression (null, "data", context);
}, "#A1-1");