From d19e5c42a527800e92fd980a718c5b2afabb2a53 Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Thu, 13 Oct 2016 23:58:18 +0200 Subject: [System.Xml] Update supported time formats for mobile version of XML deserializer. Fixes #42843 --- .../System.XML/Test/System.Xml.Serialization/DeserializeTests.cs | 7 +++++++ .../Test/System.Xml.Serialization/XmlSerializerTestClasses.cs | 6 ++++++ 2 files changed, 13 insertions(+) (limited to 'mcs/class/System.XML/Test') diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/DeserializeTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/DeserializeTests.cs index ec13691da1c..1393c354207 100644 --- a/mcs/class/System.XML/Test/System.Xml.Serialization/DeserializeTests.cs +++ b/mcs/class/System.XML/Test/System.Xml.Serialization/DeserializeTests.cs @@ -1555,6 +1555,13 @@ namespace MonoTests.System.XmlSerialization Assert.AreEqual (new DateTime (2012,2,5,9,0,0,DateTimeKind.Utc), o.SomeDate.ToUniversalTime ()); } + [Test] + public void TimeWithUtc () + { + XmlSerializer xs = new XmlSerializer (typeof (UtcTimeClass)); + var o = (UtcTimeClass) xs.Deserialize (new StringReader ("12:34:56.0Z")); + Assert.AreEqual (new DateTime (1,1,1,12,34,56,DateTimeKind.Utc), o.DateTimeValue); + } public class Foo { diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializerTestClasses.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializerTestClasses.cs index 116bbe323ad..4adcc11b20d 100644 --- a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializerTestClasses.cs +++ b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializerTestClasses.cs @@ -1071,6 +1071,12 @@ namespace MonoTests.System.Xml.TestClasses public DateTime SomeDate; } + public class UtcTimeClass + { + [XmlElementAttribute (DataType = "time")] + public DateTime DateTimeValue; + } + public class Bug8468BaseClass { public string Base; -- cgit v1.2.3