diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2006-01-31 10:44:13 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2006-01-31 10:44:13 +0300 |
| commit | 32e28e47e61b64dc9bb40a68c4982b09b50e97d1 (patch) | |
| tree | b9675b90f4f3c519d68c0b7e9fef2a2c8a5aa074 /mcs/class/System.XML | |
| parent | fff12b1908770cb902605e440b0a9fc98367746c (diff) | |
merged r56026 from trunk.
svn path=/branches/mono-1-1-13/mcs/; revision=56318
Diffstat (limited to 'mcs/class/System.XML')
| -rw-r--r-- | mcs/class/System.XML/System.Xml/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System.XML/System.Xml/XmlConvert.cs | 3 | ||||
| -rw-r--r-- | mcs/class/System.XML/Test/System.Xml/ChangeLog | 4 | ||||
| -rw-r--r-- | mcs/class/System.XML/Test/System.Xml/XmlConvertTests.cs | 6 |
4 files changed, 18 insertions, 0 deletions
diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog index 70a14159908..e2552911611 100644 --- a/mcs/class/System.XML/System.Xml/ChangeLog +++ b/mcs/class/System.XML/System.Xml/ChangeLog @@ -1,3 +1,8 @@ +2006-01-25 Atsushi Enomoto <atsushi@ximian.com> + + * XmlConvert.cs : ToString(TimeSpan) should return valid duration + for TimeSpan.Zero, rather than "P". Fixed bug #77350 + 2006-01-16 Atsushi Enomoto <atsushi@ximian.com> * XmlConvert.cs : handle Ticks. Fixed bug #77252. diff --git a/mcs/class/System.XML/System.Xml/XmlConvert.cs b/mcs/class/System.XML/System.Xml/XmlConvert.cs index c9ede090a06..810db96cda2 100644 --- a/mcs/class/System.XML/System.Xml/XmlConvert.cs +++ b/mcs/class/System.XML/System.Xml/XmlConvert.cs @@ -423,6 +423,9 @@ namespace System.Xml { public static string ToString (TimeSpan value) { + if (value == TimeSpan.Zero) + return "PT0S"; + StringBuilder builder = new StringBuilder (); if (value.Ticks < 0) { builder.Append ('-'); diff --git a/mcs/class/System.XML/Test/System.Xml/ChangeLog b/mcs/class/System.XML/Test/System.Xml/ChangeLog index 7183721bd33..7b678f96e95 100644 --- a/mcs/class/System.XML/Test/System.Xml/ChangeLog +++ b/mcs/class/System.XML/Test/System.Xml/ChangeLog @@ -1,3 +1,7 @@ +2006-01-25 Atsushi Enomoto <atsushi@ximian.com> + + * XmlConvertTests.cs : added test for bug #77350. + 2006-01-16 Atsushi Enomoto <atsushi@ximian.com> * XmlConvertTests.cs : added test for bug #77252. diff --git a/mcs/class/System.XML/Test/System.Xml/XmlConvertTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlConvertTests.cs index a601250da45..fcfa5562751 100644 --- a/mcs/class/System.XML/Test/System.Xml/XmlConvertTests.cs +++ b/mcs/class/System.XML/Test/System.Xml/XmlConvertTests.cs @@ -549,6 +549,12 @@ namespace MonoTests.System.Xml XmlConvert.VerifyNCName (""); } + [Test] + public void DurationZero () // bug #77350 + { + AssertEquals ("PT0S", XmlConvert.ToString (TimeSpan.FromSeconds (0))); + } + #if NET_2_0 [Test] public void VerifyTOKEN () |