* DataSetReadXmlTest.cs: Added NotWorking test for bug #80048.

svn path=/trunk/mcs/; revision=68476

diff --git a/mcs/class/System.Data/Test/System.Data/ChangeLog b/mcs/class/System.Data/Test/System.Data/ChangeLog
index 048c64492e197e126121c07b2a361cfa92a19e0a..ad1f7cf164bf33717b50a2bfed1d22447ae24347 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/ChangeLog
+++ b/mcs/class/System.Data/Test/System.Data/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-26  Gert Driesen  <drieseng@users.sourceforge.net>
+
+       * DataSetReadXmlTest.cs: Added NotWorking test for bug #80048.
+
 2006-11-26  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * DataSetReadXmlTest.cs: Added NotWorking test for bug #80045.

diff --git a/mcs/class/System.Data/Test/System.Data/DataSetReadXmlTest.cs b/mcs/class/System.Data/Test/System.Data/DataSetReadXmlTest.cs
index f10cd26c7002bb9fce6e1cffbea21da1143381cc..8822f1afc8693c6cd0e26ea4452ab29ca68a3486 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataSetReadXmlTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataSetReadXmlTest.cs
@@ -42,7 +42,6 @@ namespace MonoTests.System.Data
        [TestFixture]\r
        public class DataSetReadXmlTest : DataSetAssertion\r
        {\r
-\r
                const string xml1 = "";\r
                const string xml2 = "<root/>";\r
                const string xml3 = "<root></root>";\r
@@ -670,7 +669,9 @@ namespace MonoTests.System.Data
                }\r
 \r
                [Test] // bug #80045\r
+#if NET_2_0\r
                [Category ("NotWorking")]\r
+#endif\r
                public void ColumnOrder ()\r
                {\r
                        string xml = "<?xml version=\"1.0\" standalone=\"yes\"?>" +\r
@@ -691,7 +692,7 @@ namespace MonoTests.System.Data
                        DataSet ds = new DataSet ();\r
                        ds.ReadXml (new StringReader (xml));\r
                        AssertEquals ("#1", 1, ds.Tables.Count);\r
-                       AssertNotNull ("#2", ds.Tables ["Table"]);\r
+                       AssertEquals ("#2", "Table", ds.Tables [0].TableName);\r
                        AssertEquals ("#3", 4, ds.Tables [0].Columns.Count);\r
                        AssertEquals ("#4a", "Name", ds.Tables [0].Columns [0].ColumnName);\r
                        AssertEquals ("#4b", 0, ds.Tables [0].Columns [0].Ordinal);\r
@@ -707,6 +708,57 @@ namespace MonoTests.System.Data
                        AssertEquals ("#6b", 2, ds.Tables [0].Columns [2].Ordinal);\r
                        AssertEquals ("#7a", "Address", ds.Tables [0].Columns [3].ColumnName);\r
                        AssertEquals ("#7b", 3, ds.Tables [0].Columns [3].Ordinal);\r
+#endif\r
+               }\r
+\r
+               [Test] // bug #80048\r
+               [Category ("NotWorking")]\r
+               public void XmlSpace ()\r
+               {\r
+                       string xml = "<?xml version=\"1.0\" standalone=\"yes\"?>" +\r
+                               "<NewDataSet>" +\r
+                               "  <Table>" +\r
+                               "    <Name>Miguel</Name>" +\r
+                               "    <FirstName xml:space=\"preserve\"> de Icaza</FirstName>" +\r
+                               "    <Income>4000</Income>" +\r
+                               "  </Table>" +\r
+                               "  <Table>" +\r
+                               "    <Name>Chris</Name>" +\r
+                               "    <FirstName xml:space=\"preserve\">Toshok </FirstName>" +\r
+                               "    <Income>3000</Income>" +\r
+                               "  </Table>" +\r
+                               "</NewDataSet>";\r
+\r
+                       DataSet ds = new DataSet ();\r
+                       ds.ReadXml (new StringReader (xml));\r
+#if NET_2_0\r
+                       AssertEquals ("#1", 1, ds.Tables.Count);\r
+                       AssertEquals ("#2", "Table", ds.Tables [0].TableName);\r
+                       AssertEquals ("#3", 3, ds.Tables [0].Columns.Count);\r
+                       AssertEquals ("#4a", "Name", ds.Tables [0].Columns [0].ColumnName);\r
+                       AssertEquals ("#4b", 0, ds.Tables [0].Columns [0].Ordinal);\r
+                       AssertEquals ("#5a", "FirstName", ds.Tables [0].Columns [1].ColumnName);\r
+                       AssertEquals ("#5b", 1, ds.Tables [0].Columns [1].Ordinal);\r
+                       AssertEquals ("#6a", "Income", ds.Tables [0].Columns [2].ColumnName);\r
+                       AssertEquals ("#6b", 2, ds.Tables [0].Columns [2].Ordinal);\r
+#else\r
+                       AssertEquals ("#1", 2, ds.Tables.Count);\r
+                       AssertEquals ("#2", "Table", ds.Tables [0].TableName);\r
+                       AssertEquals ("#3", 3, ds.Tables [0].Columns.Count);\r
+                       AssertEquals ("#4a", "Name", ds.Tables [0].Columns [0].ColumnName);\r
+                       AssertEquals ("#4b", 0, ds.Tables [0].Columns [0].Ordinal);\r
+                       AssertEquals ("#5a", "Table_Id", ds.Tables [0].Columns [1].ColumnName);\r
+                       AssertEquals ("#5b", 1, ds.Tables [0].Columns [1].Ordinal);\r
+                       AssertEquals ("#6a", "Income", ds.Tables [0].Columns [2].ColumnName);\r
+                       AssertEquals ("#6b", 2, ds.Tables [0].Columns [2].Ordinal);\r
+                       AssertEquals ("#7", "FirstName", ds.Tables [1].TableName);\r
+                       AssertEquals ("#8", 3, ds.Tables [1].Columns.Count);\r
+                       AssertEquals ("#9a", "space", ds.Tables [1].Columns [0].ColumnName);\r
+                       AssertEquals ("#9b", 0, ds.Tables [1].Columns [0].Ordinal);\r
+                       AssertEquals ("#10a", "FirstName_Text", ds.Tables [1].Columns [1].ColumnName);\r
+                       AssertEquals ("#10b", 1, ds.Tables [1].Columns [1].Ordinal);\r
+                       AssertEquals ("#11a", "Table_Id", ds.Tables [1].Columns [2].ColumnName);\r
+                       AssertEquals ("#11b", 2, ds.Tables [1].Columns [2].Ordinal);\r
 #endif\r
                }\r
        }\r