diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2005-10-20 11:35:50 +0400 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2005-10-20 11:35:50 +0400 |
| commit | e470ba06fb0458d26e56e3c741fdaf1ff778c82c (patch) | |
| tree | 105a3f7c513a3fc9a0665ee1af5444aceddd9b56 /mcs/class/System.Data/Test | |
| parent | 40b9ed58d8a0c8c9c1799ff9a95ef454d8fec6a3 (diff) | |
2005-10-20 Atsushi Enomoto <atsushi@ximian.com>
* XmlSchemaWriter.cs : escape names in the schema with XmlConvert.
Fixed bug #76480.
* DataSetTest.cs : added test for #76480.
svn path=/trunk/mcs/; revision=51968
Diffstat (limited to 'mcs/class/System.Data/Test')
| -rw-r--r-- | mcs/class/System.Data/Test/System.Data/ChangeLog | 4 | ||||
| -rw-r--r-- | mcs/class/System.Data/Test/System.Data/DataSetTest.cs | 31 |
2 files changed, 34 insertions, 1 deletions
diff --git a/mcs/class/System.Data/Test/System.Data/ChangeLog b/mcs/class/System.Data/Test/System.Data/ChangeLog index 4d7662ccdf3..04a7d1449f0 100644 --- a/mcs/class/System.Data/Test/System.Data/ChangeLog +++ b/mcs/class/System.Data/Test/System.Data/ChangeLog @@ -1,3 +1,7 @@ +2005-10-20 Atsushi Enomoto <atsushi@ximian.com> + + * DataSetTest.cs : added test for #76480. + 2005-10-14 Sureshkumar T <tsureshkumar@novell.com> * DataViewTest_IBindingList.cs (FindTest): mark working. According diff --git a/mcs/class/System.Data/Test/System.Data/DataSetTest.cs b/mcs/class/System.Data/Test/System.Data/DataSetTest.cs index 708a5d0088f..507447479d5 100644 --- a/mcs/class/System.Data/Test/System.Data/DataSetTest.cs +++ b/mcs/class/System.Data/Test/System.Data/DataSetTest.cs @@ -2058,7 +2058,36 @@ namespace MonoTests.System.Data 4, (int) childRow ["parent"]); } - + + [Test] // from bug #76480 + public void WriteXmlEscapeName () + { + // create dataset + DataSet data = new DataSet(); + + DataTable mainTable = data.Tables.Add ("main"); + DataColumn mainkey = mainTable.Columns.Add ("mainkey", typeof(Guid)); + mainTable.Columns.Add ("col.2<hi/>", typeof (string)); + mainTable.Columns.Add ("#col3", typeof (string)); + + // populate data + mainTable.Rows.Add (new object [] { Guid.NewGuid (), "hi there", "my friend" } ); + mainTable.Rows.Add (new object [] { Guid.NewGuid (), "what is", "your name" } ); + mainTable.Rows.Add (new object [] { Guid.NewGuid (), "I have", "a bean" } ); + + // write xml + StringWriter writer = new StringWriter (); + data.WriteXml (writer, XmlWriteMode.WriteSchema); + string xml = writer.ToString (); + Assert ("#1", xml.IndexOf ("name=\"col.2_x003C_hi_x002F__x003E_\"") > 0); + Assert ("#2", xml.IndexOf ("name=\"_x0023_col3\"") > 0); + Assert ("#3", xml.IndexOf ("<col.2_x003C_hi_x002F__x003E_>hi there</col.2_x003C_hi_x002F__x003E_>") > 0); + + // read xml + DataSet data2 = new DataSet(); + data2.ReadXml (new StringReader ( + writer.GetStringBuilder ().ToString ())); + } } |