2004-04-27 Atsushi Enomoto <atsushi@ximian.com>

	* ConstraintCollectionTest.cs,
	  DataSetTest.cs,
	  DataTableTest.cs,
	  ForeignKeyConstraintTest.cs : Fixes for incorrect NET_1_0 use.
	* DataRowCollectionTest.cs : just check exception type. Don't check
	  localizable error message.
	* DataSetAssertion.cs : Removed AssertDataSet() with just 4 argument.
	  Added relation count parameter for AssertDataTable().
	  Added Nested check parameter for AssertDataRelation().
	* DataSetInferXmlSchemaTest.cs,
	  DataSetReadXmlTest.cs,
	  DataSetReadXmlSchemaTest.cs :
	  Applied new AssertDataTable().  Added more check on
	  DataSetReadXmlSchemaTest.SingleElementTreatmentDifference ().

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

diff --git a/mcs/class/System.Data/Test/System.Data/ChangeLog b/mcs/class/System.Data/Test/System.Data/ChangeLog
index d543a866b0c771b18f1d2fce03661dab38983e2f..4f27865732a2b530f0f8c5f22e60244ea237fb81 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/ChangeLog
+++ b/mcs/class/System.Data/Test/System.Data/ChangeLog
@@ -1,3 +1,20 @@
+2004-04-27  Atsushi Enomoto <atsushi@ximian.com>
+
+       * ConstraintCollectionTest.cs,
+         DataSetTest.cs,
+         DataTableTest.cs,
+         ForeignKeyConstraintTest.cs : Fixes for incorrect NET_1_0 use.
+       * DataRowCollectionTest.cs : just check exception type. Don't check
+         localizable error message.
+       * DataSetAssertion.cs : Removed AssertDataSet() with just 4 argument.
+         Added relation count parameter for AssertDataTable().
+         Added Nested check parameter for AssertDataRelation().
+       * DataSetInferXmlSchemaTest.cs,
+         DataSetReadXmlTest.cs,
+         DataSetReadXmlSchemaTest.cs :
+         Applied new AssertDataTable().  Added more check on
+         DataSetReadXmlSchemaTest.SingleElementTreatmentDifference ().
+
 2004-04-22  Atsushi Enomoto <atsushi@ximian.com>
 
        All fixes are to make them pass under MS.NET 1.1.

diff --git a/mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest.cs b/mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest.cs
index bd92b4efab15743e726fb879fc177e5bf08b3e4b..480441daefbf3b6a90c76413d9adac64ea9c146e 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest.cs
@@ -83,14 +83,15 @@ namespace MonoTests.System.Data
                                _constraint2.ConstraintName = "dog"; //case insensitive
                                col.Add(_constraint1);
                                col.Add(_constraint2);
-#if NET_1_0
+#if NET_1_1
+#else
                                Fail("Failed to throw Duplicate name exception.");
 #endif
                                col.Remove (_constraint2); // only for !1.0
                                col.Remove (_constraint1);
                        }
                        catch (DuplicateNameException) {
-#if !NET_1_0
+#if NET_1_1
                                throw;
 #endif
                        }
@@ -104,13 +105,15 @@ namespace MonoTests.System.Data
                        try 
                        {
                                col.Add(_constraint1);
-#if NET_1_0
+#if NET_1_1
+#else
                                Fail("B2: Failed to throw ArgumentException.");
 #endif
                                col.Remove (_constraint1);
                        }
                        catch (ArgumentException) {
-#if !NET_1_0
+#if NET_1_1
+#else
                                throw;
 #endif
                        }
@@ -381,10 +384,10 @@ namespace MonoTests.System.Data
 //                        Assertion.Assert ("#A03", constraints [2].Table.ToString().Equals ("Table"));
                         Assertion.Assert ("#A04", table.Constraints.Contains ("Unique1"));
                         Assertion.Assert ("#A05", table.Constraints.Contains ("Unique2"));
-#if NET_1_0 // really?
-                        Assertion.Assert ("#A06", table.Constraints.Contains ("Unique3"));
-#else
+#if NET_1_1 // really?
                         Assertion.Assert ("#A06", !table.Constraints.Contains ("Unique3"));
+#else
+                        Assertion.Assert ("#A06", table.Constraints.Contains ("Unique3"));
 #endif
                 }
         

diff --git a/mcs/class/System.Data/Test/System.Data/DataRowCollectionTest.cs b/mcs/class/System.Data/Test/System.Data/DataRowCollectionTest.cs
index 54a88c38cbb02f56540b71f54a4c04d06cb3f266..e2ad7914afb115dfedfe376f5902c34e6c589701 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataRowCollectionTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataRowCollectionTest.cs
@@ -254,9 +254,7 @@ namespace MonoTests.System.Data
                        try {
                                Rows.Clear ();
                                Fail ("test#03");
-                       } catch (Exception e) {
-                               AssertEquals ("test#04", typeof (InvalidConstraintException), e.GetType ());
-                               AssertEquals ("test#05", "Cannot clear table Table1 because ForeignKeyConstraint REL enforces constraints and there are child rows in child.", e.Message);
+                       } catch (InvalidConstraintException) {
                        }
                        
                        AssertEquals ("test#06", 3, Table.Rows.Count);

diff --git a/mcs/class/System.Data/Test/System.Data/DataSetAssertion.cs b/mcs/class/System.Data/Test/System.Data/DataSetAssertion.cs
index 695c10141b7ac3e35acc0667de882532293bd931..2c32971b532f4f8a60728a100f05bb67da3f8c1e 100755 (executable)
--- a/mcs/class/System.Data/Test/System.Data/DataSetAssertion.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataSetAssertion.cs
@@ -18,24 +18,21 @@ namespace MonoTests.System.Data
 {
        public class DataSetAssertion : Assertion
        {
-               public void AssertDataSet (string label, DataSet ds, string name, int tableCount)
-               {
-                       AssertEquals (label + ".DataSetName", name, ds.DataSetName);
-                       AssertEquals (label + ".TableCount", tableCount, ds.Tables.Count);
-               }
-
                public void AssertDataSet (string label, DataSet ds, string name, int tableCount, int relCount)
                {
                        AssertEquals (label + ".DataSetName", name, ds.DataSetName);
                        AssertEquals (label + ".TableCount", tableCount, ds.Tables.Count);
-                       AssertEquals (label + ".RelationCount", relCount, ds.Relations.Count);
+                       if (relCount >= 0)
+                               AssertEquals (label + ".RelationCount", relCount, ds.Relations.Count);
                }
 
-               public void AssertDataTable (string label, DataTable dt, string name, int columnCount, int rowCount)
+               public void AssertDataTable (string label, DataTable dt, string name, int columnCount, int rowCount, int parentRelationCount, int childRelationCount)
                {
                        AssertEquals (label + ".TableName", name, dt.TableName);
                        AssertEquals (label + ".ColumnCount", columnCount, dt.Columns.Count);
                        AssertEquals (label + ".RowCount", rowCount, dt.Rows.Count);
+                       AssertEquals (label + ".ParentRelCount", parentRelationCount, dt.ParentRelations.Count);
+                       AssertEquals (label + ".ChildRelCount", childRelationCount, dt.ChildRelations.Count);
                }
 
                public void AssertReadXml (DataSet ds, string label, string xml, XmlReadMode readMode, XmlReadMode resultMode, string datasetName, int tableCount)
@@ -48,15 +45,16 @@ namespace MonoTests.System.Data
                {
                        XmlReader xtr = new XmlTextReader (xml, XmlNodeType.Element, null);
                        AssertEquals (label + ".return", resultMode, ds.ReadXml (xtr, readMode));
-                       AssertDataSet (label + ".dataset", ds, datasetName, tableCount);
+                       AssertDataSet (label + ".dataset", ds, datasetName, tableCount, -1);
                        AssertEquals (label + ".readstate", state, xtr.ReadState);
                }
 
-               public void AssertDataRelation (string label, DataRelation rel, string name,
+               public void AssertDataRelation (string label, DataRelation rel, string name, bool nested,
                        string [] parentColNames, string [] childColNames,
                        bool existsUK, bool existsFK)
                {
                        AssertEquals (label + ".Name", name, rel.RelationName);
+                       AssertEquals (label + ".Nested", nested, rel.Nested);
                        for (int i = 0; i < parentColNames.Length; i++)
                                AssertEquals (label + ".parentColumn_" + i, parentColNames [i], rel.ParentColumns [i].ColumnName);
                        AssertEquals (label + ".ParentColCount", parentColNames.Length, rel.ParentColumns.Length);

diff --git a/mcs/class/System.Data/Test/System.Data/DataSetInferXmlSchemaTest.cs b/mcs/class/System.Data/Test/System.Data/DataSetInferXmlSchemaTest.cs
index 73d66d07a2638c89a15287f2f6b8ea70b12b1497..a3f300c73a3badab58657280a87db6129f9cc122 100755 (executable)
--- a/mcs/class/System.Data/Test/System.Data/DataSetInferXmlSchemaTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataSetInferXmlSchemaTest.cs
@@ -124,7 +124,7 @@ namespace MonoTests.System.Data
                {
                        DataSet ds = new DataSet ();
                        ds.InferXmlSchema ((XmlReader) null, null);
-                       AssertDataSet ("null", ds, "NewDataSet", 0);
+                       AssertDataSet ("null", ds, "NewDataSet", 0, 0);
                }
 
                [Test]
@@ -153,7 +153,7 @@ namespace MonoTests.System.Data
                        DataSet ds = GetDataSet (xml2, null);
                        AssertDataSet ("ds", ds, "NewDataSet", 1, 0);
                        DataTable dt = ds.Tables [0];
-                       AssertDataTable ("dt", dt, "root", 1, 0);
+                       AssertDataTable ("dt", dt, "root", 1, 0, 0, 0);
                        AssertDataColumn ("col", dt.Columns [0], "attr", true, false, 0, 1, "attr", MappingType.Attribute, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 0, String.Empty, false, false);
                }
 
@@ -163,7 +163,7 @@ namespace MonoTests.System.Data
                        DataSet ds = GetDataSet (xml3, null);
                        AssertDataSet ("ds", ds, "NewDataSet", 1, 0);
                        DataTable dt = ds.Tables [0];
-                       AssertDataTable ("dt", dt, "root", 2, 0);
+                       AssertDataTable ("dt", dt, "root", 2, 0, 0, 0);
                        AssertDataColumn ("col", dt.Columns [0], "attr", true, false, 0, 1, "attr", MappingType.Attribute, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 0, String.Empty, false, false);
                        AssertDataColumn ("col", dt.Columns [1], "attr2", true, false, 0, 1, "attr2", MappingType.Attribute, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 1, String.Empty, false, false);
                }
@@ -174,13 +174,13 @@ namespace MonoTests.System.Data
                        DataSet ds = GetDataSet (xml5, null);
                        AssertDataSet ("ds", ds, "NewDataSet", 1, 0);
                        DataTable dt = ds.Tables [0];
-                       AssertDataTable ("dt", dt, "root", 1, 0);
+                       AssertDataTable ("dt", dt, "root", 1, 0, 0, 0);
                        AssertDataColumn ("col", dt.Columns [0], "child", true, false, 0, 1, "child", MappingType.Element, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 0, String.Empty, false, false);
 
                        ds = GetDataSet (xml6, null);
                        AssertDataSet ("ds", ds, "NewDataSet", 1, 0);
                        dt = ds.Tables [0];
-                       AssertDataTable ("dt", dt, "root", 1, 0);
+                       AssertDataTable ("dt", dt, "root", 1, 0, 0, 0);
                        AssertDataColumn ("col", dt.Columns [0], "col1", true, false, 0, 1, "col1", MappingType.Element, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 0, String.Empty, false, false);
                }
 
@@ -190,7 +190,7 @@ namespace MonoTests.System.Data
                        DataSet ds = GetDataSet (xml7, null);
                        AssertDataSet ("ds", ds, "NewDataSet", 1, 0);
                        DataTable dt = ds.Tables [0];
-                       AssertDataTable ("dt", dt, "root", 3, 0);
+                       AssertDataTable ("dt", dt, "root", 3, 0, 0, 0);
                        AssertDataColumn ("col", dt.Columns [0], "col1", true, false, 0, 1, "col1", MappingType.Element, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 0, String.Empty, false, false);
                        AssertDataColumn ("col2", dt.Columns [1], "col2", true, false, 0, 1, "col2", MappingType.Element, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 1, String.Empty, false, false);
                        AssertDataColumn ("col3", dt.Columns [2], "col3", true, false, 0, 1, "col3", MappingType.Element, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 2, String.Empty, false, false);
@@ -202,7 +202,7 @@ namespace MonoTests.System.Data
                        DataSet ds = GetDataSet (xml8, null);
                        AssertDataSet ("ds", ds, "set", 1, 0);
                        DataTable dt = ds.Tables [0];
-                       AssertDataTable ("dt", dt, "tab", 3, 0);
+                       AssertDataTable ("dt", dt, "tab", 3, 0, 0, 0);
                        AssertDataColumn ("col", dt.Columns [0], "col1", true, false, 0, 1, "col1", MappingType.Element, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 0, String.Empty, false, false);
                        AssertDataColumn ("col2", dt.Columns [1], "col2", true, false, 0, 1, "col2", MappingType.Element, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 1, String.Empty, false, false);
                        AssertDataColumn ("col3", dt.Columns [2], "col3", true, false, 0, 1, "col3", MappingType.Element, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 2, String.Empty, false, false);
@@ -217,13 +217,13 @@ namespace MonoTests.System.Data
                        AssertDataSet ("ds", ds, "NewDataSet", 4, 3);
                        DataTable dt = ds.Tables [0];
 
-                       AssertDataTable ("dt", dt, "el1", 3, 0);
+                       AssertDataTable ("dt", dt, "el1", 3, 0, 0, 1);
                        AssertDataColumn ("el1_Id", dt.Columns [0], "el1_Id", false, true, 0, 1, "el1_Id", MappingType.Hidden, typeof (int), DBNull.Value, String.Empty, -1, String.Empty, 0, String.Empty, false, true);
                        AssertDataColumn ("el1_attr1", dt.Columns [1], "attr1", true, false, 0, 1, "attr1", MappingType.Attribute, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 1, String.Empty, false, false);
                        AssertDataColumn ("el1_attrA", dt.Columns [2], "attrA", true, false, 0, 1, "attrA", MappingType.Attribute, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 2, String.Empty, false, false);
 
                        dt = ds.Tables [1];
-                       AssertDataTable ("dt", dt, "el2", 6, 0);
+                       AssertDataTable ("dt", dt, "el2", 6, 0, 1, 2);
                        AssertDataColumn ("el2_Id", dt.Columns [0], "el2_Id", false, true, 0, 1, "el2_Id", MappingType.Hidden, typeof (int), DBNull.Value, String.Empty, -1, String.Empty, 0, String.Empty, false, true);
                        AssertDataColumn ("el2_col2", dt.Columns [1], "column2", true, false, 0, 1, "column2", MappingType.Element, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 1, String.Empty, false, false);
                        AssertDataColumn ("el2_col3", dt.Columns [2], "column3", true, false, 0, 1, "column3", MappingType.Element, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 2, String.Empty, false, false);
@@ -232,14 +232,14 @@ namespace MonoTests.System.Data
                        AssertDataColumn ("el2_el1Id", dt.Columns [5], "el1_Id", true, false, 0, 1, "el1_Id", MappingType.Hidden, typeof (int), DBNull.Value, String.Empty, -1, String.Empty, 5, String.Empty, false, false);
 
                        dt = ds.Tables [2];
-                       AssertDataTable ("dt", dt, "el3", 4, 0);
+                       AssertDataTable ("dt", dt, "el3", 4, 0, 1, 0);
                        AssertDataColumn ("el3_attr3", dt.Columns [0], "attr3", true, false, 0, 1, "attr3", MappingType.Attribute, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 0, String.Empty, false, false);
                        AssertDataColumn ("el3_attrC", dt.Columns [1], "attrC", true, false, 0, 1, "attrC", MappingType.Attribute, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 1, String.Empty, false, false);
                        AssertDataColumn ("el3_Text", dt.Columns [2], "el3_Text", true, false, 0, 1, "el3_Text", MappingType.SimpleContent, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 2, String.Empty, false, false);
                        AssertDataColumn ("el3_el2Id", dt.Columns [3], "el2_Id", true, false, 0, 1, "el2_Id", MappingType.Hidden, typeof (int), DBNull.Value, String.Empty, -1, String.Empty, 3, String.Empty, false, false);
 
                        dt = ds.Tables [3];
-                       AssertDataTable ("dt", dt, "el4", 4, 0);
+                       AssertDataTable ("dt", dt, "el4", 4, 0, 1, 0);
                        AssertDataColumn ("el3_attr4", dt.Columns [0], "attr4", true, false, 0, 1, "attr4", MappingType.Attribute, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 0, String.Empty, false, false);
                        AssertDataColumn ("el4_attrD", dt.Columns [1], "attrD", true, false, 0, 1, "attrD", MappingType.Attribute, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 1, String.Empty, false, false);
                        AssertDataColumn ("el4_Text", dt.Columns [2], "el4_Text", true, false, 0, 1, "el4_Text", MappingType.SimpleContent, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 2, String.Empty, false, false);
@@ -254,7 +254,7 @@ namespace MonoTests.System.Data
                        DataSet ds = GetDataSet (xml10, null);
                        AssertDataSet ("ds", ds, "NewDataSet", 1, 0);
                        DataTable dt = ds.Tables [0];
-                       AssertDataTable ("dt", dt, "root", 1, 0);
+                       AssertDataTable ("dt", dt, "root", 1, 0, 0, 0);
                        AssertDataColumn ("col", dt.Columns [0], "b", true, false, 0, 1, "b", MappingType.Element, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 0, String.Empty, false, false);
                }
 
@@ -266,7 +266,7 @@ namespace MonoTests.System.Data
                        DataSet ds = GetDataSet (xml11, null);
                        AssertDataSet ("ds", ds, "NewDataSet", 1, 0);
                        DataTable dt = ds.Tables [0];
-                       AssertDataTable ("dt", dt, "root", 2, 0);
+                       AssertDataTable ("dt", dt, "root", 2, 0, 0, 0);
                        AssertDataColumn ("element", dt.Columns [0], "child_after_significant_space", true, false, 0, 1, "child_after_significant_space", MappingType.Element, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 0, String.Empty, false, false);
                        AssertDataColumn ("xml:space", dt.Columns [1], "space", true, false, 0, 1, "space", MappingType.Attribute, typeof (string), DBNull.Value, String.Empty, -1, "http://www.w3.org/XML/1998/namespace", 1, "xml", false, false);
                }
@@ -284,7 +284,7 @@ namespace MonoTests.System.Data
                        ("      \n\n"));\r
                        XmlReader xr = new XmlNodeReader (doc);\r
                        ds.InferXmlSchema (xr, null);\r
-                       AssertDataSet ("pure_whitespace", ds, "root", 0);\r
+                       AssertDataSet ("pure_whitespace", ds, "root", 0, 0);\r
                }
 
                [Test]
@@ -296,12 +296,12 @@ namespace MonoTests.System.Data
                        AssertDataSet ("ds", ds, "root", 2, 0);
 
                        DataTable dt = ds.Tables [0];
-                       AssertDataTable ("dt", dt, "table1", 2, 0);
+                       AssertDataTable ("dt", dt, "table1", 2, 0, 0, 0);
                        AssertDataColumn ("col1_1", dt.Columns [0], "col1_1", true, false, 0, 1, "col1_1", MappingType.Element, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 0, String.Empty, false, false);
                        AssertDataColumn ("col1_2", dt.Columns [1], "col1_2", true, false, 0, 1, "col1_2", MappingType.Element, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 1, String.Empty, false, false);
 
                        dt = ds.Tables [1];
-                       AssertDataTable ("dt", dt, "table2", 2, 0);
+                       AssertDataTable ("dt", dt, "table2", 2, 0, 0, 0);
                        AssertDataColumn ("col2_1", dt.Columns [0], "col2_1", true, false, 0, 1, "col2_1", MappingType.Element, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 0, String.Empty, false, false);
                        AssertDataColumn ("col2_2", dt.Columns [1], "col2_2", true, false, 0, 1, "col2_2", MappingType.Element, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 1, String.Empty, false, false);
                }
@@ -343,16 +343,16 @@ namespace MonoTests.System.Data
                        AssertDataSet ("ds", ds, "set", 2, 1);
 
                        DataTable dt = ds.Tables [0];
-                       AssertDataTable ("dt", dt, "table", 1, 0);
+                       AssertDataTable ("dt", dt, "table", 1, 0, 0, 1);
                        AssertDataColumn ("table_Id", dt.Columns [0], "table_Id", false, true, 0, 1, "table_Id", MappingType.Hidden, typeof (int), DBNull.Value, String.Empty, -1, String.Empty, 0, String.Empty, false, true);
 
                        dt = ds.Tables [1];
-                       AssertDataTable ("dt", dt, "col", 2, 0);
+                       AssertDataTable ("dt", dt, "col", 2, 0, 1, 0);
                        AssertDataColumn ("another_col", dt.Columns [0], "another_col", true, false, 0, 1, "another_col", MappingType.Element, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 0, String.Empty, false, false);
                        AssertDataColumn ("table_refId", dt.Columns [1], "table_Id", true, false, 0, 1, "table_Id", MappingType.Hidden, typeof (int), DBNull.Value, String.Empty, -1, String.Empty, 1, String.Empty, false, false);
 
                        DataRelation dr = ds.Relations [0];
-                       AssertDataRelation ("rel", dr, "table_col", new string [] {"table_Id"}, new string [] {"table_Id"}, true, true);
+                       AssertDataRelation ("rel", dr, "table_col", true, new string [] {"table_Id"}, new string [] {"table_Id"}, true, true);
                        AssertUniqueConstraint ("uniq", dr.ParentKeyConstraint, "Constraint1", true, new string [] {"table_Id"});
                        AssertForeignKeyConstraint ("fkey", dr.ChildKeyConstraint, "table_col", AcceptRejectRule.None, Rule.Cascade, Rule.Cascade, new string [] {"table_Id"}, new string [] {"table_Id"});
                }
@@ -364,16 +364,16 @@ namespace MonoTests.System.Data
                        AssertDataSet ("ds", ds, "set", 2, 1);
 
                        DataTable dt = ds.Tables [0];
-                       AssertDataTable ("dt", dt, "table", 1, 0);
+                       AssertDataTable ("dt", dt, "table", 1, 0, 0, 1);
                        AssertDataColumn ("table_Id", dt.Columns [0], "table_Id", false, true, 0, 1, "table_Id", MappingType.Hidden, typeof (int), DBNull.Value, String.Empty, -1, String.Empty, 0, String.Empty, false, true);
 
                        dt = ds.Tables [1];
-                       AssertDataTable ("dt", dt, "col", 2, 0);
+                       AssertDataTable ("dt", dt, "col", 2, 0, 1, 0);
                        AssertDataColumn ("table_refId", dt.Columns [0], "table_Id", true, false, 0, 1, "table_Id", MappingType.Hidden, typeof (int), DBNull.Value, String.Empty, -1, String.Empty, 0, String.Empty, false, false);
                        AssertDataColumn ("another_col", dt.Columns [1], "another_col", true, false, 0, 1, "another_col", MappingType.Element, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 1, String.Empty, false, false);
 
                        DataRelation dr = ds.Relations [0];
-                       AssertDataRelation ("rel", dr, "table_col", new string [] {"table_Id"}, new string [] {"table_Id"}, true, true);
+                       AssertDataRelation ("rel", dr, "table_col", true, new string [] {"table_Id"}, new string [] {"table_Id"}, true, true);
                        AssertUniqueConstraint ("uniq", dr.ParentKeyConstraint, "Constraint1", true, new string [] {"table_Id"});
                        AssertForeignKeyConstraint ("fkey", dr.ChildKeyConstraint, "table_col", AcceptRejectRule.None, Rule.Cascade, Rule.Cascade, new string [] {"table_Id"}, new string [] {"table_Id"});
                }
@@ -386,17 +386,17 @@ namespace MonoTests.System.Data
                        AssertDataSet ("ds", ds, "set", 2, 1);
 
                        DataTable dt = ds.Tables [0];
-                       AssertDataTable ("dt", dt, "table", 1, 0);
+                       AssertDataTable ("dt", dt, "table", 1, 0, 0, 1);
                        AssertDataColumn ("table_Id", dt.Columns [0], "table_Id", false, true, 0, 1, "table_Id", MappingType.Hidden, typeof (int), DBNull.Value, String.Empty, -1, String.Empty, 0, String.Empty, false, true);
 
                        dt = ds.Tables [1];
-                       AssertDataTable ("dt", dt, "col", 3, 0);
+                       AssertDataTable ("dt", dt, "col", 3, 0, 1, 0);
                        AssertDataColumn ("another_col", dt.Columns [0], "another_col", true, false, 0, 1, "another_col", MappingType.Element, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 0, String.Empty, false, false);
                        AssertDataColumn ("table_refId", dt.Columns [1], "table_Id", true, false, 0, 1, "table_Id", MappingType.Hidden, typeof (int), DBNull.Value, String.Empty, -1, String.Empty, 1, String.Empty, false, false);
                        AssertDataColumn ("attr", dt.Columns [2], "attr", true, false, 0, 1, "attr", MappingType.Attribute, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 2, String.Empty, false, false);
 
                        DataRelation dr = ds.Relations [0];
-                       AssertDataRelation ("rel", dr, "table_col", new string [] {"table_Id"}, new string [] {"table_Id"}, true, true);
+                       AssertDataRelation ("rel", dr, "table_col", true, new string [] {"table_Id"}, new string [] {"table_Id"}, true, true);
                        AssertUniqueConstraint ("uniq", dr.ParentKeyConstraint, "Constraint1", true, new string [] {"table_Id"});
                        AssertForeignKeyConstraint ("fkey", dr.ChildKeyConstraint, "table_col", AcceptRejectRule.None, Rule.Cascade, Rule.Cascade, new string [] {"table_Id"}, new string [] {"table_Id"});
                }

diff --git a/mcs/class/System.Data/Test/System.Data/DataSetReadXmlSchemaTest.cs b/mcs/class/System.Data/Test/System.Data/DataSetReadXmlSchemaTest.cs
index 65318d3fc9be35031c9875da4e7fc4e1204e58cf..7815dfc95ce72a801a2694f48f52eae1af7ccffa 100755 (executable)
--- a/mcs/class/System.Data/Test/System.Data/DataSetReadXmlSchemaTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataSetReadXmlSchemaTest.cs
@@ -62,34 +62,47 @@ namespace MonoTests.System.Data
                        // LocaleOnRootWithoutIsDataSet(), that tests if locale on\r
                        // the (mere) data table modifies *DataSet's* locale.\r
                        string xsbase = @"<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema' id='hoge'>\r
-       <xs:element name='Root'> <!-- becomes table -->\r
+       <xs:element name='Root'> <!-- When simple, it becomes table. When complex, it becomes DataSet -->\r
                <xs:complexType>\r
                        <xs:choice maxOccurs='unbounded'>\r
                                {0}\r
                        </xs:choice>\r
                </xs:complexType>\r
        </xs:element>\r
+       <xs:element name='more' type='xs:string' />\r
 </xs:schema>";\r
                        string simple = "<xs:element name='Child' type='xs:string' />";\r
                        string complex = @"<xs:element name='Child'>\r
                                        <xs:complexType>\r
                                                <xs:attribute name='a1' />\r
-                                               <xs:attribute name='a2'/>\r
+                                               <xs:attribute name='a2' type='xs:integer'/>\r
                                        </xs:complexType>\r
                                </xs:element>";\r
+                       string elref = "<xs:element ref='more' />";\r
 \r
                        DataSet ds = new DataSet ();\r
 \r
                        string xs = String.Format (xsbase, simple);\r
                        ds.ReadXmlSchema (new StringReader (xs));\r
-                       AssertDataSet ("simple", ds, "hoge", 1);\r
-                       AssertDataTable ("simple", ds.Tables [0], "Root", 1, 0);\r
+                       AssertDataSet ("simple", ds, "hoge", 1, 0);\r
+                       AssertDataTable ("simple", ds.Tables [0], "Root", 1, 0, 0, 0);\r
 \r
                        ds = new DataSet ();\r
                        xs = String.Format (xsbase, complex);\r
                        ds.ReadXmlSchema (new StringReader (xs));\r
-                       AssertDataSet ("complex", ds, "Root", 1);\r
-                       AssertDataTable ("complex", ds.Tables [0], "Child", 2, 0);\r
+                       AssertDataSet ("complex", ds, "hoge", 2, 1);\r
+                       AssertDataTable ("complex", ds.Tables [0], "Root", 1, 0, 0, 1);\r
+                       DataTable dt = ds.Tables [1];\r
+                       AssertDataTable ("complex", dt, "Child", 3, 0, 1, 0);\r
+                       AssertDataColumn ("a1", dt.Columns [0], "a1", true, false, 0, 1, "a1", MappingType.Attribute, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 0, String.Empty, false, false);\r
+                       AssertDataColumn ("a2", dt.Columns [1], "a2", true, false, 0, 1, "a2", MappingType.Attribute, typeof (long), DBNull.Value, String.Empty, -1, String.Empty, 1, String.Empty, false, false);\r
+                       AssertDataColumn ("Root_Id", dt.Columns [2], "Root_Id", true, false, 0, 1, "Root_Id", MappingType.Hidden, typeof (int), DBNull.Value, String.Empty, -1, String.Empty, 2, String.Empty, false, false);\r
+\r
+                       ds = new DataSet ();\r
+                       xs = String.Format (xsbase, elref);\r
+                       ds.ReadXmlSchema (new StringReader (xs));\r
+                       AssertDataSet ("complex", ds, "hoge", 1, 0);\r
+                       AssertDataTable ("complex", ds.Tables [0], "Root", 1, 0, 0, 0);\r
                }\r
 \r
                [Test]\r
@@ -113,8 +126,8 @@ namespace MonoTests.System.Data
                        DataSet ds = new DataSet ();\r
                        ds.ReadXmlSchema (new StringReader (xs));\r
                        // Here "unusedType" table is never imported.\r
-                       AssertDataSet ("ds", ds, "hoge", 1);\r
-                       AssertDataTable ("dt", ds.Tables [0], "Root", 1, 0);\r
+                       AssertDataSet ("ds", ds, "hoge", 1, 0);\r
+                       AssertDataTable ("dt", ds.Tables [0], "Root", 1, 0, 0, 0);\r
                }\r
 \r
                [Test]\r
@@ -128,7 +141,7 @@ namespace MonoTests.System.Data
                        DataSet ds = new DataSet ();\r
                        ds.ReadXmlSchema (new StringReader (xs));\r
                        // nothing is imported.\r
-                       AssertDataSet ("ds", ds, "NewDataSet", 0);\r
+                       AssertDataSet ("ds", ds, "NewDataSet", 0, 0);\r
                }\r
 \r
                [Test]\r
@@ -150,7 +163,7 @@ namespace MonoTests.System.Data
 \r
                        DataSet ds = new DataSet ();\r
                        ds.ReadXmlSchema (new StringReader (xs));\r
-                       AssertDataSet ("ds", ds, "Root", 0); // name is "Root"\r
+                       AssertDataSet ("ds", ds, "Root", 0, 0); // name is "Root"\r
 \r
                        // But when explicit msdata:IsDataSet value is "false", then\r
                        // treat as usual.\r
@@ -158,7 +171,7 @@ namespace MonoTests.System.Data
 \r
                        ds = new DataSet ();\r
                        ds.ReadXmlSchema (new StringReader (xs));\r
-                       AssertDataSet ("ds", ds, "NewDataSet", 1);\r
+                       AssertDataSet ("ds", ds, "NewDataSet", 1, 0);\r
                }\r
 \r
                [Test]\r
@@ -207,7 +220,7 @@ namespace MonoTests.System.Data
                        DataSet ds = new DataSet ();\r
                        ds.ReadXmlSchema (new StringReader (xs));\r
                        // Child should not be regarded as DataSet element\r
-                       AssertDataSet ("ds", ds, "NewDataSet", 1);\r
+                       AssertDataSet ("ds", ds, "NewDataSet", 1, 0);\r
                }\r
 \r
                [Test]\r
@@ -226,10 +239,10 @@ namespace MonoTests.System.Data
 \r
                        DataSet ds = new DataSet ();\r
                        ds.ReadXmlSchema (new StringReader (xs));\r
-                       AssertDataSet ("ds", ds, "NewDataSet", 1);\r
+                       AssertDataSet ("ds", ds, "NewDataSet", 1, 0);\r
                        AssertEquals ("fi-FI", ds.Locale.Name); // DataSet's Locale comes from current thread\r
                        DataTable dt = ds.Tables [0];\r
-                       AssertDataTable ("dt", dt, "Root", 2, 0);\r
+                       AssertDataTable ("dt", dt, "Root", 2, 0, 0, 0);\r
                        AssertEquals ("ja-JP", dt.Locale.Name); // DataTable's Locale comes from msdata:Locale\r
                        AssertDataColumn ("col1", dt.Columns [0], "Attr", true, false, 0, 1, "Attr", MappingType.Attribute, typeof (Int64), DBNull.Value, String.Empty, -1, String.Empty, 0, String.Empty, false, false);\r
                        AssertDataColumn ("col2", dt.Columns [1], "Child", false, false, 0, 1, "Child", MappingType.Element, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 1, String.Empty, false, false);\r
@@ -345,9 +358,9 @@ namespace MonoTests.System.Data
                        // No prefixes on tables and columns\r
                        DataSet ds = new DataSet ();\r
                        ds.ReadXmlSchema (new StringReader (xs));\r
-                       AssertDataSet ("ds", ds, "DS", 3);\r
+                       AssertDataSet ("ds", ds, "DS", 3, 1);\r
                        DataTable dt = ds.Tables [0];\r
-                       AssertDataTable ("R3", dt, "R3", 3, 0);\r
+                       AssertDataTable ("R3", dt, "R3", 3, 0, 0, 0);\r
                        AssertDataColumn ("col1", dt.Columns [0], "Attr", true, false, 0, 1, "Attr", MappingType.Attribute, typeof (Int64), DBNull.Value, String.Empty, -1, String.Empty, 0, String.Empty, false, false);\r
                }\r
 \r
@@ -374,12 +387,12 @@ namespace MonoTests.System.Data
 \r
                private void ReadTest1Check (DataSet ds)\r
                {\r
-                       AssertDataSet ("dataset", ds, "NewDataSet", 2);\r
-                       AssertDataTable ("tbl1", ds.Tables [0], "Table1", 3, 0);\r
-                       AssertDataTable ("tbl2", ds.Tables [1], "Table2", 3, 0);\r
+                       AssertDataSet ("dataset", ds, "NewDataSet", 2, 1);\r
+                       AssertDataTable ("tbl1", ds.Tables [0], "Table1", 3, 0, 0, 1);\r
+                       AssertDataTable ("tbl2", ds.Tables [1], "Table2", 3, 0, 1, 0);\r
 \r
                        DataRelation rel = ds.Relations [0];\r
-                       AssertDataRelation ("rel", rel, "Rel1",\r
+                       AssertDataRelation ("rel", rel, "Rel1", false,\r
                                new string [] {"Column1_3"},\r
                                new string [] {"Column2_1"}, true, true);\r
                        AssertUniqueConstraint ("uc", rel.ParentKeyConstraint, \r

diff --git a/mcs/class/System.Data/Test/System.Data/DataSetReadXmlTest.cs b/mcs/class/System.Data/Test/System.Data/DataSetReadXmlTest.cs
index 55d3bc30a2013fe8e86ea52d319d04892f517bf1..4d4151d4dacf3c95f2fe0a29fc610aa87709a936 100755 (executable)
--- a/mcs/class/System.Data/Test/System.Data/DataSetReadXmlTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataSetReadXmlTest.cs
@@ -92,21 +92,21 @@ namespace MonoTests.System.Data
                        AssertReadXml (ds, "SimpleTable", xml6,\r
                                XmlReadMode.Auto, XmlReadMode.InferSchema,\r
                                "NewDataSet", 1);\r
-                       AssertDataTable ("xml6", ds.Tables [0], "root", 1, 1);\r
+                       AssertDataTable ("xml6", ds.Tables [0], "root", 1, 1, 0, 0);\r
 \r
                        // simple table with 2 columns:\r
                        ds = new DataSet ();\r
                        AssertReadXml (ds, "SimpleTable2", xml7,\r
                                XmlReadMode.Auto, XmlReadMode.InferSchema,\r
                                "NewDataSet", 1);\r
-                       AssertDataTable ("xml7", ds.Tables [0], "root", 2, 1);\r
+                       AssertDataTable ("xml7", ds.Tables [0], "root", 2, 1, 0, 0);\r
 \r
                        // simple dataset with 1 table:\r
                        ds = new DataSet ();\r
                        AssertReadXml (ds, "SimpleDataSet", xml8,\r
                                XmlReadMode.Auto, XmlReadMode.InferSchema,\r
                                "dataset", 1);\r
-                       AssertDataTable ("xml8", ds.Tables [0], "table", 2, 1);\r
+                       AssertDataTable ("xml8", ds.Tables [0], "table", 2, 1, 0, 0);\r
                }\r
 \r
                [Test]\r
@@ -312,21 +312,21 @@ namespace MonoTests.System.Data
                        AssertReadXml (ds, "SimpleTable", xml6,\r
                                XmlReadMode.InferSchema, XmlReadMode.InferSchema,\r
                                "NewDataSet", 1);\r
-                       AssertDataTable ("xml6", ds.Tables [0], "root", 1, 1);\r
+                       AssertDataTable ("xml6", ds.Tables [0], "root", 1, 1, 0, 0);\r
 \r
                        // simple table with 2 columns:\r
                        ds = new DataSet ();\r
                        AssertReadXml (ds, "SimpleTable2", xml7,\r
                                XmlReadMode.InferSchema, XmlReadMode.InferSchema,\r
                                "NewDataSet", 1);\r
-                       AssertDataTable ("xml7", ds.Tables [0], "root", 2, 1);\r
+                       AssertDataTable ("xml7", ds.Tables [0], "root", 2, 1, 0, 0);\r
 \r
                        // simple dataset with 1 table:\r
                        ds = new DataSet ();\r
                        AssertReadXml (ds, "SimpleDataSet", xml8,\r
                                XmlReadMode.InferSchema, XmlReadMode.InferSchema,\r
                                "dataset", 1);\r
-                       AssertDataTable ("xml8", ds.Tables [0], "table", 2, 1);\r
+                       AssertDataTable ("xml8", ds.Tables [0], "table", 2, 1, 0, 0);\r
                }\r
 \r
                [Test]\r
@@ -481,19 +481,19 @@ namespace MonoTests.System.Data
                        AssertReadXml (ds, "Fragment", schema1,\r
                                XmlReadMode.Fragment, XmlReadMode.Fragment,\r
                                "NewDataSet", 1);\r
-                       AssertDataTable ("fragment", ds.Tables [0], "Root", 1, 0);\r
+                       AssertDataTable ("fragment", ds.Tables [0], "Root", 1, 0, 0, 0);\r
 \r
                        ds = new DataSet ();\r
                        AssertReadXml (ds, "ReadSchema", schema1,\r
                                XmlReadMode.ReadSchema, XmlReadMode.ReadSchema,\r
                                "NewDataSet", 1);\r
-                       AssertDataTable ("readschema", ds.Tables [0], "Root", 1, 0);\r
+                       AssertDataTable ("readschema", ds.Tables [0], "Root", 1, 0, 0, 0);\r
 \r
                        ds = new DataSet ();\r
                        AssertReadXml (ds, "Auto", schema1,\r
                                XmlReadMode.Auto, XmlReadMode.ReadSchema,\r
                                "NewDataSet", 1);\r
-                       AssertDataTable ("auto", ds.Tables [0], "Root", 1, 0);\r
+                       AssertDataTable ("auto", ds.Tables [0], "Root", 1, 0, 0, 0);\r
 \r
                        ds = new DataSet ();\r
                        AssertReadXml (ds, "DiffGram", schema1,\r
@@ -522,20 +522,20 @@ namespace MonoTests.System.Data
                        AssertReadXml (ds, "Fragment", schema2,\r
                                XmlReadMode.Fragment, XmlReadMode.Fragment,\r
                                "NewDataSet", 1);\r
-                       AssertDataTable ("fragment", ds.Tables [0], "Root", 1, 0);\r
+                       AssertDataTable ("fragment", ds.Tables [0], "Root", 1, 0, 0, 0);\r
 \r
                        // rest ... treated as schema\r
                        ds = new DataSet ();\r
                        AssertReadXml (ds, "Auto", schema2,\r
                                XmlReadMode.Auto, XmlReadMode.ReadSchema,\r
                                "NewDataSet", 1, ReadState.Interactive);\r
-                       AssertDataTable ("auto", ds.Tables [0], "Root", 1, 0);\r
+                       AssertDataTable ("auto", ds.Tables [0], "Root", 1, 0, 0, 0);\r
 \r
                        ds = new DataSet ();\r
                        AssertReadXml (ds, "DiffGram", schema2,\r
                                XmlReadMode.DiffGram, XmlReadMode.DiffGram,\r
                                "NewDataSet", 1, ReadState.Interactive);\r
-                       AssertDataTable ("diffgram", ds.Tables [0], "Root", 1, 0);\r
+                       AssertDataTable ("diffgram", ds.Tables [0], "Root", 1, 0, 0, 0);\r
 \r
                        ds = new DataSet ();\r
                        AssertReadXml (ds, "ReadSchema", schema2,\r
@@ -556,7 +556,7 @@ namespace MonoTests.System.Data
                        AssertReadXml (ds, "SimpleTable", xml6,\r
                                XmlReadMode.Auto, XmlReadMode.InferSchema,\r
                                "root", 1); // not NewDataSet unlike standalone load\r
-                       AssertDataTable ("seq1", ds.Tables [0], "root", 1, 1);\r
+                       AssertDataTable ("seq1", ds.Tables [0], "root", 1, 1, 0, 0);\r
                }\r
 \r
                [Test]\r
@@ -572,7 +572,7 @@ namespace MonoTests.System.Data
                        AssertReadXml (ds, "SimpleTable2", xml7,\r
                                XmlReadMode.Auto, XmlReadMode.InferSchema,\r
                                "root", 1); // dataset name will not be overwritten\r
-                       AssertDataTable ("#1", ds.Tables [0], "root", 2, 1);\r
+                       AssertDataTable ("#1", ds.Tables [0], "root", 2, 1, 0, 0);\r
 \r
                        // simple table -> simple dataset\r
                        ds = new DataSet ();\r
@@ -580,7 +580,7 @@ namespace MonoTests.System.Data
                        AssertReadXml (ds, "SimpleTable", xml6,\r
                                XmlReadMode.Auto, XmlReadMode.InferSchema,\r
                                "NewDataSet", 1);\r
-                       AssertDataTable ("#2", ds.Tables [0], "root", 1, 1);\r
+                       AssertDataTable ("#2", ds.Tables [0], "root", 1, 1, 0, 0);\r
 \r
                        // Return value became IgnoreSchema, since there is\r
                        // already schema information in the dataset.\r
@@ -589,7 +589,7 @@ namespace MonoTests.System.Data
                        AssertReadXml (ds, "SimpleTable2", xml7,\r
                                XmlReadMode.Auto, XmlReadMode.IgnoreSchema,\r
                                "NewDataSet", 1);\r
-                       AssertDataTable ("#3", ds.Tables [0], "root", 1, 2);\r
+                       AssertDataTable ("#3", ds.Tables [0], "root", 1, 2, 0, 0);\r
 \r
                }\r
 \r

diff --git a/mcs/class/System.Data/Test/System.Data/DataSetTest.cs b/mcs/class/System.Data/Test/System.Data/DataSetTest.cs
index 936c59487997c34f7ef3f441ff50e9579d833347..2d3595f057d7e3a584cca772db3bd85d498496f8 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataSetTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataSetTest.cs
@@ -224,10 +224,10 @@ namespace MonoTests.System.Data
                        \r
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));\r
                        TextString = TextString.Substring (TextString.IndexOf(EOL) + EOL.Length);\r
-#if NET_1_0\r
-                       AssertEquals ("test#16", "              <xs:element name=\"second\" msdata:DataType=\"System.Data.SqlTypes.SqlGuid, System.Data, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089\" type=\"xs:string\" minOccurs=\"0\" />", substring);\r
-#elif NET_1_1\r
+#if NET_1_1\r
                        AssertEquals ("test#16", "              <xs:element name=\"second\" msdata:DataType=\"System.Data.SqlTypes.SqlGuid, System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089\" type=\"xs:string\" minOccurs=\"0\" />", substring);\r
+#else\r
+                       AssertEquals ("test#16", "              <xs:element name=\"second\" msdata:DataType=\"System.Data.SqlTypes.SqlGuid, System.Data, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089\" type=\"xs:string\" minOccurs=\"0\" />", substring);\r
 #endif\r
                        \r
                        substring = TextString.Substring (0, TextString.IndexOf(EOL));\r
@@ -915,6 +915,8 @@ namespace MonoTests.System.Data
                {\r
                        // see GetReady() for current culture\r
                        string xml = "<?xml version='1.0' encoding='utf-16'?><DataSet><xs:schema id='DS' xmlns='' xmlns:xs='http://www.w3.org/2001/XMLSchema' xmlns:msdata='urn:schemas-microsoft-com:xml-msdata'><xs:element name='DS' msdata:IsDataSet='true' msdata:Locale='fi-FI'><xs:complexType><xs:choice maxOccurs='unbounded' /></xs:complexType></xs:element></xs:schema><diffgr:diffgram xmlns:msdata='urn:schemas-microsoft-com:xml-msdata' xmlns:diffgr='urn:schemas-microsoft-com:xml-diffgram-v1' /></DataSet>";\r
+                       // Modified attribute order from MS result\r
+//                     string xml = "<?xml version='1.0' encoding='utf-16'?><DataSet><xs:schema xmlns:msdata='urn:schemas-microsoft-com:xml-msdata' id='DS' xmlns:xs='http://www.w3.org/2001/XMLSchema' xmlns=''><xs:element name='DS' msdata:IsDataSet='true' msdata:Locale='fi-FI'><xs:complexType><xs:choice maxOccurs='unbounded' /></xs:complexType></xs:element></xs:schema><diffgr:diffgram xmlns:msdata='urn:schemas-microsoft-com:xml-msdata' xmlns:diffgr='urn:schemas-microsoft-com:xml-diffgram-v1' /></DataSet>";\r
                        DataSet ds = new DataSet ();\r
                        ds.DataSetName = "DS";\r
                        XmlSerializer ser = new XmlSerializer (typeof (DataSet));\r

diff --git a/mcs/class/System.Data/Test/System.Data/DataTableTest.cs b/mcs/class/System.Data/Test/System.Data/DataTableTest.cs
index bd7aa3f45924d91c5be788d0298dc4cec932398b..b8cd30cd5bf486bdbbac9755a5715ef5543a7469 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataTableTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataTableTest.cs
@@ -898,7 +898,8 @@ namespace MonoTests.System.Data
                        DataColumn[] colArray = {table.Columns[0]};
                        table.PrimaryKey = colArray;
                        table.ExtendedProperties.Add ("TimeStamp", DateTime.Now);
-#if NET_1_0 // This prevents further tests after .NET 1.1.
+#if NET_1_1 // This prevents further tests after .NET 1.1.
+#else
                        CultureInfo cultureInfo = new CultureInfo ("en-gb");
                        table.Locale = cultureInfo;
 #endif
@@ -926,7 +927,8 @@ namespace MonoTests.System.Data
                        AssertEquals ("#A06", "Id / Name + (Id * Id)", cloneTable.DisplayExpression);
                        AssertEquals ("#A07", 1 ,cloneTable.ExtendedProperties.Count);
                        AssertEquals ("#A08", false ,cloneTable.HasErrors);
-#if NET_1_0
+#if NET_1_1
+#else
                        AssertEquals ("#A09", 2057, cloneTable.Locale.LCID);
 #endif
                        AssertEquals ("#A10", 100, cloneTable.MinimumCapacity);
@@ -946,7 +948,8 @@ namespace MonoTests.System.Data
                        AssertEquals ("#A21", "Id / Name + (Id * Id)", copyTable.DisplayExpression);
                        AssertEquals ("#A22", 1 ,copyTable.ExtendedProperties.Count);
                        AssertEquals ("#A23", true ,copyTable.HasErrors);
-#if NET_1_0
+#if NET_1_1
+#else
                        AssertEquals ("#A24", 2057, copyTable.Locale.LCID);
 #endif
                        AssertEquals ("#A25", 100, copyTable.MinimumCapacity);
@@ -1136,19 +1139,20 @@ namespace MonoTests.System.Data
                        }
                        try {
                                table.Clear ();
-#if NET_1_0
+#if NET_1_1
+#else
                                Fail ("#A03");
 #endif
                        }
                        catch (Exception e) {
-#if NET_1_0
+#if NET_1_1
+                               throw e;
+#else
                                if (e.GetType () != typeof (AssertionException)) {
                                        // FIXME: Don't depend on localizable error messages.
                                        AssertEquals ("#A04", "Cannot clear table Parent because ForeignKeyConstraint DR enforces Child.", e.Message);
                                }
                                else throw e;
-#else
-                               throw e;
 #endif
                        }
                        table1.Reset ();
@@ -1158,10 +1162,10 @@ namespace MonoTests.System.Data
                
                        table.Clear ();
                        AssertEquals ("#A08", 0, table.Rows.Count);
-#if NET_1_0
-                       AssertEquals ("#A09", 1, table.Constraints.Count);
-#else
+#if NET_1_1
                        AssertEquals ("#A09", 0, table.Constraints.Count);
+#else
+                       AssertEquals ("#A09", 1, table.Constraints.Count);
 #endif
                        AssertEquals ("#A05", 0, table.ChildRelations.Count);
                }

diff --git a/mcs/class/System.Data/Test/System.Data/ForeignKeyConstraintTest.cs b/mcs/class/System.Data/Test/System.Data/ForeignKeyConstraintTest.cs
index 2ecce33d394cbf0c25e497bc646e1240171a4ee7..81555980dfbc43060a04c30f5c85e00d668e0cbd 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/ForeignKeyConstraintTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/ForeignKeyConstraintTest.cs
@@ -187,14 +187,14 @@ namespace MonoTests.System.Data
                        // Create a ForeingKeyConstraint Object using the constructor
                         // ForeignKeyConstraint (string, string, string[], string[], AcceptRejectRule, Rule, Rule);
                         ForeignKeyConstraint fkc = new ForeignKeyConstraint ("hello world", parentTableName, parentColumnNames, childColumnNames, AcceptRejectRule.Cascade, Rule.Cascade, Rule.Cascade);                                                                                                                            // Assert that the Constraint object does not belong to any table yet
-#if NET_1_0
-                        Assertion.AssertEquals ("#A01 Table should not be set", fkc.Table, null);
-#else
+#if NET_1_1
                        try {
                                DataTable tmp = fkc.Table;
                                Fail ("When table is null, get_Table causes an InvalidOperationException.");
                        } catch (InvalidOperationException) {
                        }
+#else
+                        Assertion.AssertEquals ("#A01 Table should not be set", fkc.Table, null);
 #endif
                                                                                                     
                         Constraint []constraints = new Constraint[3];
@@ -208,10 +208,10 @@ namespace MonoTests.System.Data
                                 throw new ApplicationException ("An Exception was expected");
                         }
                         catch(Exception e){
-#if NET_1_0
-                                Assertion.AssertEquals ("#A03", typeof (ArgumentException), e.GetType());
-#else
+#if NET_1_1
                                 Assertion.AssertEquals ("#A03", typeof (InvalidOperationException), e.GetType());
+#else
+                                Assertion.AssertEquals ("#A03", typeof (ArgumentException), e.GetType());
 #endif
                         }
                                                                                                     
@@ -280,10 +280,10 @@ namespace MonoTests.System.Data
                                fkc = new ForeignKeyConstraint((DataColumn)null,(DataColumn)null);
                                Fail("Failed to throw ArgumentNullException.");
                        }
-#if NET_1_0
-                       catch (ArgumentNullException) {}
-#else
+#if NET_1_1
                        catch (NullReferenceException) {}
+#else
+                       catch (ArgumentNullException) {}
 #endif
                        catch (AssertionException exc) {throw exc;}
                        catch (Exception exc)