Imported Upstream version 5.8.0.22

Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-10-19 20:04:20 +00:00
parent 5f4a27cc8a
commit 7d05485754
5020 changed files with 114082 additions and 186061 deletions

View File

@ -24,6 +24,7 @@
//
using System;
using System.Globalization;
using System.Windows;
using System.Windows.Media;
using NUnit.Framework;
@ -52,7 +53,6 @@ namespace MonoTests.System.Windows {
}
[Test]
[Category ("NotWorking")]
public void ConvertFrom ()
{
PointConverter r = new PointConverter ();
@ -77,14 +77,13 @@ namespace MonoTests.System.Windows {
}
[Test]
[Category ("NotWorking")]
public void ConvertTo ()
{
PointConverter r = new PointConverter ();
Point rect = new Point (1, 2);
object o = r.ConvertTo (rect, typeof (string));
object o = r.ConvertTo (null, CultureInfo.InvariantCulture, rect, typeof (string));
Assert.AreEqual (typeof (string), o.GetType());
Assert.AreEqual ("1,2", (string)o);