diff options
| author | Egor Bogatov <egorbo@gmail.com> | 2018-04-21 08:04:39 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2018-04-21 08:04:39 +0300 |
| commit | 09de0b9e1b0318dad70dc48d803ba145406e2297 (patch) | |
| tree | 4cb08139c2ee5a1efec17efdd69e031098047612 /mcs/class/System.Web | |
| parent | f93b9673270b455c542fb363ca566648fcca61db (diff) | |
[System] ComponentModel and System.Net from corefx (#7948)
* ComponentModel from corefx
* System.Net.Mail from corefx
* update SR.cs
* fix build error
* fix tests
* undo run-test-default.sh change
* update corefx
* fix failing tests
* hide DesignerAttribute on mobile profiles
* Bump API snapshot submodule
Diffstat (limited to 'mcs/class/System.Web')
| -rw-r--r-- | mcs/class/System.Web/Test/System.Web.UI.WebControls/WebColorConverterTest.cs | 2 | ||||
| -rw-r--r-- | mcs/class/System.Web/Test/System.Web.UI/DataSourceCacheDurationConverterTest.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/WebColorConverterTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/WebColorConverterTest.cs index 818a9eb60b1..20d9a1762c3 100644 --- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/WebColorConverterTest.cs +++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/WebColorConverterTest.cs @@ -145,7 +145,7 @@ namespace MonoTests.System.Web.UI.WebControls } [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(ArgumentException))] public void MalformatTest5 () { WebColorConverter conv; diff --git a/mcs/class/System.Web/Test/System.Web.UI/DataSourceCacheDurationConverterTest.cs b/mcs/class/System.Web/Test/System.Web.UI/DataSourceCacheDurationConverterTest.cs index efdb5a5ea67..a81d68ef262 100644 --- a/mcs/class/System.Web/Test/System.Web.UI/DataSourceCacheDurationConverterTest.cs +++ b/mcs/class/System.Web/Test/System.Web.UI/DataSourceCacheDurationConverterTest.cs @@ -75,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"); - Assert.Throws<Exception> (() => { + Assert.Throws<ArgumentException> (() => { cvt.ConvertFrom (null, null, "dummy"); }, "#A1-5"); Assert.AreEqual (5, cvt.ConvertFrom (null, null, "5"), "#A1-6"); |