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

5
mcs/class/System.Web/Test/System.Web.UI/ControlTest.cs
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");

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

@ -32,7 +32,6 @@ using System.Text;
using System.Web.UI;
using NUnit.Framework;
using MonoTests.Common;
namespace MonoTests.System.Web.UI
{
@ -76,7 +75,7 @@ namespace MonoTests.System.Web.UI
Assert.AreEqual (0, cvt.ConvertFrom (null, null, String.Empty), "#A1-2");
Assert.AreEqual (0, cvt.ConvertFrom (null, null, "infinite"), "#A1-3");
Assert.AreEqual (0, cvt.ConvertFrom (null, null, "INfINiTE"), "#A1-4");
AssertExtensions.Throws<Exception> (() => {
Assert.Throws<Exception> (() => {
cvt.ConvertFrom (null, null, "dummy");
}, "#A1-5");
Assert.AreEqual (5, cvt.ConvertFrom (null, null, "5"), "#A1-6");

10
mcs/class/System.Web/Test/System.Web.UI/MinimizableAttributeTypeConverterTest.cs
View File

@ -37,8 +37,6 @@ using System.Web.UI.HtmlControls;
using System.Reflection;
using NUnit.Framework;
using MonoTests.Common;
namespace MonoTests.System.Web.UI {
[TestFixture]
@ -101,16 +99,16 @@ namespace MonoTests.System.Web.UI {
Assert.AreEqual (false, tc.ConvertFrom (null, culture, "FALSE"), "A5");
Assert.AreEqual (true, tc.ConvertFrom (null, culture, "true"), "A6");
Assert.AreEqual (true, tc.ConvertFrom (null, culture, "True"), "A");
AssertExtensions.Throws<NotSupportedException> (() => {
Assert.Throws<NotSupportedException> (() => {
tc.ConvertFrom (null, culture, true);
}, "A8");
AssertExtensions.Throws<NotSupportedException> (() => {
Assert.Throws<NotSupportedException> (() => {
tc.ConvertFrom (null, culture, false);
}, "A9");
AssertExtensions.Throws<NotSupportedException> (() => {
Assert.Throws<NotSupportedException> (() => {
tc.ConvertFrom (null, culture, 1234);
}, "A10");
AssertExtensions.Throws<NotSupportedException> (() => {
Assert.Throws<NotSupportedException> (() => {
tc.ConvertFrom (null, culture, null);
}, "A11");
}