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.Drawing | |
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.Drawing')
5 files changed, 13 insertions, 13 deletions
diff --git a/mcs/class/System.Drawing/Test/System.Drawing/ColorConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/ColorConverter.cs index b73ed00255c..9050e814f6e 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/ColorConverter.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/ColorConverter.cs @@ -187,7 +187,7 @@ namespace MonoTests.System.Drawing { [Test] public void ConvertFrom_x4 () { - Assert.Throws<Exception> (() => colconv.ConvertFrom (null, CultureInfo.InvariantCulture, + Assert.Throws<ArgumentException> (() => colconv.ConvertFrom (null, CultureInfo.InvariantCulture, "*1, 1")); } diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestPointConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestPointConverter.cs index a45a24942c3..b7c0ce48a2b 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestPointConverter.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestPointConverter.cs @@ -125,7 +125,7 @@ namespace MonoTests.System.Drawing ptconv.ConvertFrom (null, CultureInfo.InvariantCulture, "*1, 1"); Assert.Fail ("CF#5-1"); } catch (Exception ex) { - Assert.AreEqual (typeof (Exception), ex.GetType (), "CF#5-2"); + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "CF#5-2"); Assert.IsNotNull (ex.InnerException, "CF#5-3"); Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "CF#5-4"); } @@ -315,7 +315,7 @@ namespace MonoTests.System.Drawing ptconv.ConvertFromInvariantString ("hello"); Assert.Fail ("#1"); } catch (Exception ex) { - Assert.AreEqual (typeof (Exception), ex.GetType (), "#2"); + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2"); Assert.IsNotNull (ex.InnerException, "#3"); Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3"); } @@ -350,7 +350,7 @@ namespace MonoTests.System.Drawing ptconv.ConvertFromString ("hello"); Assert.Fail ("#1"); } catch (Exception ex) { - Assert.AreEqual (typeof (Exception), ex.GetType (), "#2"); + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2"); Assert.IsNotNull (ex.InnerException, "#3"); Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3"); } diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestRectangleConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestRectangleConverter.cs index bc05d224536..c7b85ff7cf4 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestRectangleConverter.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestRectangleConverter.cs @@ -134,7 +134,7 @@ namespace MonoTests.System.Drawing "*1, 1, 1, 1"); Assert.Fail ("CF#5: must throw Exception"); } catch (Exception ex) { - Assert.AreEqual (typeof (Exception), ex.GetType (), "CF#5-2"); + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "CF#5-2"); Assert.IsNotNull (ex.InnerException, "CF#5-3"); Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "CF#5-4"); } @@ -384,7 +384,7 @@ namespace MonoTests.System.Drawing rconv.ConvertFromInvariantString ("hello"); Assert.Fail ("#1"); } catch (Exception ex) { - Assert.AreEqual (typeof (Exception), ex.GetType (), "#2"); + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2"); Assert.IsNotNull (ex.InnerException, "#3"); Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3"); } @@ -421,7 +421,7 @@ namespace MonoTests.System.Drawing rconv.ConvertFromString ("hello"); Assert.Fail ("#1"); } catch (Exception ex) { - Assert.AreEqual (typeof (Exception), ex.GetType (), "#2"); + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2"); Assert.IsNotNull (ex.InnerException, "#3"); Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3"); } diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestSizeConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestSizeConverter.cs index d6cc2e11594..657d8d5585c 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestSizeConverter.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestSizeConverter.cs @@ -128,7 +128,7 @@ namespace MonoTests.System.Drawing "*1, 1"); Assert.Fail ("CF#5-1: must throw Exception"); } catch (Exception ex) { - Assert.AreEqual (typeof (Exception), ex.GetType (), "CF#5-2"); + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "CF#5-2"); Assert.IsNotNull (ex.InnerException, "CF#5-3"); Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "CF#5-4"); } @@ -320,7 +320,7 @@ namespace MonoTests.System.Drawing szconv.ConvertFromInvariantString ("hello"); Assert.Fail ("#1"); } catch (Exception ex) { - Assert.AreEqual (typeof (Exception), ex.GetType (), "#2"); + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2"); Assert.IsNotNull (ex.InnerException, "#3"); Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3"); } @@ -357,7 +357,7 @@ namespace MonoTests.System.Drawing szconv.ConvertFromString ("hello"); Assert.Fail ("#1"); } catch (Exception ex) { - Assert.AreEqual (typeof (Exception), ex.GetType (), "#2"); + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2"); Assert.IsNotNull (ex.InnerException, "#3"); Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3"); } diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestSizeFConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestSizeFConverter.cs index 95b4483f83a..b286967b06b 100644 --- a/mcs/class/System.Drawing/Test/System.Drawing/TestSizeFConverter.cs +++ b/mcs/class/System.Drawing/Test/System.Drawing/TestSizeFConverter.cs @@ -129,7 +129,7 @@ namespace MonoTests.System.Drawing "*1, 1"); Assert.Fail ("CF#5-1: must throw Exception"); } catch (Exception ex) { - Assert.AreEqual (typeof (Exception), ex.GetType (), "CF#5-2"); + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "CF#5-2"); Assert.IsNotNull (ex.InnerException, "CF#5-3"); Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "CF#5-4"); } @@ -323,7 +323,7 @@ namespace MonoTests.System.Drawing szconv.ConvertFromInvariantString ("hello"); Assert.Fail ("#1"); } catch (Exception ex) { - Assert.AreEqual (typeof (Exception), ex.GetType (), "#2"); + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2"); Assert.IsNotNull (ex.InnerException, "#3"); Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3"); } @@ -360,7 +360,7 @@ namespace MonoTests.System.Drawing szconv.ConvertFromString ("hello"); Assert.Fail ("#1"); } catch (Exception ex) { - Assert.AreEqual (typeof (Exception), ex.GetType (), "#2"); + Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#2"); Assert.IsNotNull (ex.InnerException, "#3"); Assert.AreEqual (typeof (FormatException), ex.InnerException.GetType (), "#3"); } |