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

@ -40,7 +40,6 @@ using System.Web.UI;
using System.Web.UI.WebControls;
using MonoTests.SystemWeb.Framework;
using MonoTests.stand_alone.WebHarness;
using MonoTests.Common;
using System.Web.UI.Adapters;
@ -1059,7 +1058,7 @@ namespace MonoTests.System.Web.UI
var ctl = new Control ();
object obj = new { foo = "one", bar = "two" };
string path;
AssertExtensions.Throws<ArgumentException> (() => {
Assert.Throws<ArgumentException> (() => {
path = ctl.GetRouteUrl ("myroute1", obj);
}, "#A1");
@ -1090,7 +1089,7 @@ namespace MonoTests.System.Web.UI
{"bar", "two"}
};
string path;
AssertExtensions.Throws<ArgumentException> (() => {
Assert.Throws<ArgumentException> (() => {
path = ctl.GetRouteUrl ("myroute", rvd);
}, "#A1");