Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@ -88,13 +88,11 @@ namespace MonoTests.System.Windows.Markup {
}
[Test]
#if NET_4_0
[NUnit.Framework.CategoryAttribute ("NotWorking")]
// Since ValueSerializer has moved to System.Xaml.dll while the type
// this test expects is in WindowsBase, there should be some additional
// support code in this assembly. Until someone does that job, this
// test won't pass.
#endif
public void CanConvertFromString ()
{
Context context = new Context ();
@ -107,13 +105,11 @@ namespace MonoTests.System.Windows.Markup {
Assert.IsTrue (serializer.CanConvertFromString ("2008-01-.106426-08:00", context), "4");
}
#if NET_4_0
[NUnit.Framework.CategoryAttribute ("NotWorking")]
// Since ValueSerializer has moved to System.Xaml.dll while the type
// this test expects is in WindowsBase, there should be some additional
// support code in this assembly. Until someone does that job, this
// test won't pass.
#endif
[Test]
[ExpectedException (typeof (ArgumentException))] // Expected object of type 'DateTime'.
public void CanConvertToString1 ()