Added tests for same parent/child table name and Id columns.

[mono.git] / mcs / class / System.Data / Test / System.Data / DataSetReadXmlTest.cs

diff --git a/mcs/class/System.Data/Test/System.Data/DataSetReadXmlTest.cs b/mcs/class/System.Data/Test/System.Data/DataSetReadXmlTest.cs
index e98549d6ae6aa190d3d5880d113ba20173765cc0..dd050fcf8650526dc799374e914e6113f753172f 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataSetReadXmlTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataSetReadXmlTest.cs
@@ -728,7 +728,7 @@ namespace MonoTests.System.Data
                                "  </Table>" +\r
                                "</NewDataSet>";\r
 \r
-                       DataSet ds = new DataSet ();\r
+                       DataSet ds = new DataSet ();\r
                        ds.ReadXml (new StringReader (xml));\r
 #if NET_2_0\r
                        Assert.AreEqual (1, ds.Tables.Count, "#1");\r
@@ -760,5 +760,29 @@ namespace MonoTests.System.Data
                        Assert.AreEqual (2, ds.Tables [1].Columns [2].Ordinal, "#11b");\r
 #endif\r
                }\r
+\r
+               public void TestSameParentChildName ()\r
+               {\r
+                       string xml = "<?xml version=\"1.0\" encoding=\"utf-8\" ?><resource type=\"parent\">" +\r
+                                    "<resource type=\"child\" /></resource>";\r
+                       DataSet ds = new DataSet ();\r
+                       ds.ReadXml (new StringReader (xml));\r
+\r
+                       AssertReadXml (ds, "SameNameParentChild", xml,\r
+                               XmlReadMode.Auto, XmlReadMode.IgnoreSchema,\r
+                               "NewDataSet", 1);\r
+               }\r
+\r
+               public void TestSameColumnName ()\r
+               {\r
+                       string xml = "<?xml version=\"1.0\" encoding=\"utf-8\" ?><resource resource_Id_0=\"parent\">" +\r
+                                    "<resource resource_Id_0=\"child\" /></resource>";\r
+                       DataSet ds = new DataSet ();\r
+                       ds.ReadXml (new StringReader (xml));\r
+\r
+                       AssertReadXml (ds, "SameColumnName", xml,\r
+                               XmlReadMode.Auto, XmlReadMode.IgnoreSchema,\r
+                               "NewDataSet", 1);\r
+               }\r
        }\r
 }\r