Author: arina
Date: 2008-02-04 04:08:00 -0500 (Mon, 04 Feb 2008)
New Revision: 94730
Modified:
trunk/mcs/class/System.Data/System.Data/ChangeLog
trunk/mcs/class/System.Data/System.Data/DataTable.cs
trunk/mcs/class/System.Data/Test/System.Data/ChangeLog
trunk/mcs/class/System.Data/Test/System.Data/DataTableTest5.cs
Log:
Fix for IXmlSerializable.ReadXml. Bug 9762.
Modified: trunk/mcs/class/System.Data/System.Data/ChangeLog
===================================================================
--- trunk/mcs/class/System.Data/System.Data/ChangeLog 2008-02-04 08:49:05 UTC
(rev 94729)
+++ trunk/mcs/class/System.Data/System.Data/ChangeLog 2008-02-04 09:08:00 UTC
(rev 94730)
@@ -1,3 +1,7 @@
+2008-02-04 Arina Itkes <[EMAIL PROTECTED]>
+
+ * DataTable.cs: Fix for IXmlSerializable.ReadXml.
+
2008-01-28 Arina Itkes <[EMAIL PROTECTED]>
* DataTable.cs: Fix for IXmlSerializable.WriteXml.
Modified: trunk/mcs/class/System.Data/System.Data/DataTable.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data/DataTable.cs 2008-02-04
08:49:05 UTC (rev 94729)
+++ trunk/mcs/class/System.Data/System.Data/DataTable.cs 2008-02-04
09:08:00 UTC (rev 94730)
@@ -1706,7 +1706,7 @@
void IXmlSerializable.ReadXml (XmlReader reader)
{
- ReadXml (reader);
+ ReadXml_internal (reader, true);
}
void IXmlSerializable.WriteXml (XmlWriter writer)
@@ -2061,6 +2061,11 @@
public XmlReadMode ReadXml (XmlReader reader)
{
+ return ReadXml_internal (reader, false);
+ }
+
+ public XmlReadMode ReadXml_internal (XmlReader reader, bool
serializable)
+ {
// The documentation from MS for this method is rather
// poor. The following cases have been observed
// during testing:
@@ -2086,7 +2091,7 @@
DataSet ds = new DataSet ();
reader.MoveToContent ();
- if (Columns.Count > 0 && reader.LocalName !=
"diffgram")
+ if (Columns.Count > 0 && reader.LocalName != "diffgram"
|| serializable)
mode = ds.ReadXml (reader);
else if (Columns.Count > 0 && reader.LocalName ==
"diffgram") {
try {
Modified: trunk/mcs/class/System.Data/Test/System.Data/ChangeLog
===================================================================
--- trunk/mcs/class/System.Data/Test/System.Data/ChangeLog 2008-02-04
08:49:05 UTC (rev 94729)
+++ trunk/mcs/class/System.Data/Test/System.Data/ChangeLog 2008-02-04
09:08:00 UTC (rev 94730)
@@ -1,3 +1,8 @@
+2008-02-04 Arina Itkes <[EMAIL PROTECTED]>
+
+ * DataTableTest5.cs: Removing of "Ignore" category
+ for tests on IXmlSerializable.ReadXml for empty DataTable.
+
2008-02-03 Arina Itkes <[EMAIL PROTECTED]>
* XmlExportOfTypedDataSetTest.cs: added test for exporting of
Modified: trunk/mcs/class/System.Data/Test/System.Data/DataTableTest5.cs
===================================================================
--- trunk/mcs/class/System.Data/Test/System.Data/DataTableTest5.cs
2008-02-04 08:49:05 UTC (rev 94729)
+++ trunk/mcs/class/System.Data/Test/System.Data/DataTableTest5.cs
2008-02-04 09:08:00 UTC (rev 94730)
@@ -451,7 +451,6 @@
Assert.AreEqual (3, row ["DepartmentID"], "#75");
}
- [Ignore ("IXmlSerializable.ReadXml does not work for a table
without columns defined.")]
[Test]
public void XmlTest1 () {
//Make a table without any relations
@@ -470,7 +469,6 @@
VerifyTableSchema (table, parentTable1.TableName,
null);//parentTable1.DataSet);
}
- [Ignore ("IXmlSerializable.ReadXml does not work for a table
without columns defined.")]
[Test]
public void XmlTest2 () {
MakeParentTable1 ();
@@ -487,7 +485,6 @@
VerifyTableSchema (table, parentTable1.TableName, ds);
}
- [Ignore ("IXmlSerializable.ReadXml does not work for a table
without columns defined.")]
[Test]
public void XmlTest3 () {
//Create a parent table and create child tables
@@ -506,7 +503,7 @@
VerifyTableSchema (table, parentTable1.TableName, null);
}
- [Ignore ("IXmlSerializable.ReadXml does not work for a table
without columns defined.")]
+
[Test]
public void XmlTest4 () {
//Create a parent table and create child tables
@@ -1063,7 +1060,6 @@
Assert.AreEqual (DataRowState.Unchanged, row.RowState,
"#10");
}
- [Ignore ("IXmlSerializable.ReadXml does not work for a table
without columns defined.")]
[Test]
public void XmlTest16 () {
FileStream stream = null;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches