2006-12-05 Nagappan A <anagappan@novell.com>

	* DataSetReadXmlTest.cs (ColumnOrder, XmlSpace): Modified
	AssertEquals to NUnit.Framework.Assert.AreEqual.

	* DataTableTest.cs (ReadWriteXmlSchema_ByFileName): Fixed Not
	Working test case and made it working.

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

diff --git a/mcs/class/System.Data/Test/System.Data/ChangeLog b/mcs/class/System.Data/Test/System.Data/ChangeLog
index 4ecbe6196c2e783a794d137d4afcabd57c7ed741..726b57904585426e0ebf847ecaa041ce24c5ba34 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/ChangeLog
+++ b/mcs/class/System.Data/Test/System.Data/ChangeLog
@@ -1,5 +1,11 @@
 2006-12-05  Nagappan A  <anagappan@novell.com>
 
+       * DataSetReadXmlTest.cs (ColumnOrder, XmlSpace): Modified
+       AssertEquals to NUnit.Framework.Assert.AreEqual.
+
+       * DataTableTest.cs (ReadWriteXmlSchema_ByFileName): Fixed Not
+       Working test case and made it working.
+
        * DataColumnCollectionTest.cs (CaseSensitiveIndexOfTest): To test
        case sensitive column name with IndexOf member function.
 

diff --git a/mcs/class/System.Data/Test/System.Data/DataSetReadXmlTest.cs b/mcs/class/System.Data/Test/System.Data/DataSetReadXmlTest.cs
index 8822f1afc8693c6cd0e26ea4452ab29ca68a3486..c15362c2dc7933505d84b4280a80a6b0ca8d0a3d 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataSetReadXmlTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataSetReadXmlTest.cs
@@ -691,23 +691,23 @@ namespace MonoTests.System.Data
 \r
                        DataSet ds = new DataSet ();\r
                        ds.ReadXml (new StringReader (xml));\r
-                       AssertEquals ("#1", 1, ds.Tables.Count);\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
-                       AssertEquals ("#5a", "FirstName", ds.Tables [0].Columns [1].ColumnName);\r
-                       AssertEquals ("#5b", 1, ds.Tables [0].Columns [1].Ordinal);\r
+                       NUnit.Framework.Assert.AreEqual (1, ds.Tables.Count, "#1");\r
+                       NUnit.Framework.Assert.AreEqual ("Table", ds.Tables [0].TableName, "#2");\r
+                       NUnit.Framework.Assert.AreEqual (4, ds.Tables [0].Columns.Count, "#3");\r
+                       NUnit.Framework.Assert.AreEqual ("Name", ds.Tables [0].Columns [0].ColumnName, "#4a");\r
+                       NUnit.Framework.Assert.AreEqual (0, ds.Tables [0].Columns [0].Ordinal, "#4b");\r
+                       NUnit.Framework.Assert.AreEqual ("FirstName", ds.Tables [0].Columns [1].ColumnName, "#5a");\r
+                       NUnit.Framework.Assert.AreEqual (1, ds.Tables [0].Columns [1].Ordinal, "#5b");\r
 #if NET_2_0\r
-                       AssertEquals ("#6a", "Address", ds.Tables [0].Columns [2].ColumnName);\r
-                       AssertEquals ("#6b", 2, ds.Tables [0].Columns [2].Ordinal);\r
-                       AssertEquals ("#7a", "Income", ds.Tables [0].Columns [3].ColumnName);\r
-                       AssertEquals ("#7b", 3, ds.Tables [0].Columns [3].Ordinal);\r
+                       NUnit.Framework.Assert.AreEqual ("Address", ds.Tables [0].Columns [2].ColumnName, "#6a");\r
+                       NUnit.Framework.Assert.AreEqual (2, ds.Tables [0].Columns [2].Ordinal, "#6b");\r
+                       NUnit.Framework.Assert.AreEqual ("Income", ds.Tables [0].Columns [3].ColumnName, "#7a");\r
+                       NUnit.Framework.Assert.AreEqual (3, ds.Tables [0].Columns [3].Ordinal, "#7b");\r
 #else\r
-                       AssertEquals ("#6a", "Income", ds.Tables [0].Columns [2].ColumnName);\r
-                       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
+                       NUnit.Framework.Assert.AreEqual ("Income", ds.Tables [0].Columns [2].ColumnName, "#6a");\r
+                       NUnit.Framework.Assert.AreEqual (2, ds.Tables [0].Columns [2].Ordinal, "#6b");\r
+                       NUnit.Framework.Assert.AreEqual ("Address", ds.Tables [0].Columns [3].ColumnName, "#7a");\r
+                       NUnit.Framework.Assert.AreEqual (3, ds.Tables [0].Columns [3].Ordinal, "#7b");\r
 #endif\r
                }\r
 \r
@@ -732,33 +732,33 @@ namespace MonoTests.System.Data
                        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
+                       NUnit.Framework.Assert.AreEqual (1, ds.Tables.Count, "#1");\r
+                       NUnit.Framework.Assert.AreEqual ("Table", ds.Tables [0].TableName, "#2");\r
+                       NUnit.Framework.Assert.AreEqual (3, ds.Tables [0].Columns.Count, "#3");\r
+                       NUnit.Framework.Assert.AreEqual ("Name", ds.Tables [0].Columns [0].ColumnName, "#4a");\r
+                       NUnit.Framework.Assert.AreEqual (0, ds.Tables [0].Columns [0].Ordinal, "#4b");\r
+                       NUnit.Framework.Assert.AreEqual ("FirstName", ds.Tables [0].Columns [1].ColumnName, "#5a");\r
+                       NUnit.Framework.Assert.AreEqual (1, ds.Tables [0].Columns [1].Ordinal, "#5b");\r
+                       NUnit.Framework.Assert.AreEqual ("Income", ds.Tables [0].Columns [2].ColumnName, "#6a");\r
+                       NUnit.Framework.Assert.AreEqual (2, ds.Tables [0].Columns [2].Ordinal, "#6b");\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
+                       NUnit.Framework.Assert.AreEqual (2, ds.Tables.Count, "#1");\r
+                       NUnit.Framework.Assert.AreEqual ("Table", ds.Tables [0].TableName, "#2");\r
+                       NUnit.Framework.Assert.AreEqual (3, ds.Tables [0].Columns.Count, "#3");\r
+                       NUnit.Framework.Assert.AreEqual ("Name", ds.Tables [0].Columns [0].ColumnName, "#4a");\r
+                       NUnit.Framework.Assert.AreEqual (0, ds.Tables [0].Columns [0].Ordinal, "#4b");\r
+                       NUnit.Framework.Assert.AreEqual ("Table_Id", ds.Tables [0].Columns [1].ColumnName, "#5a");\r
+                       NUnit.Framework.Assert.AreEqual (1, ds.Tables [0].Columns [1].Ordinal, "#5b");\r
+                       NUnit.Framework.Assert.AreEqual ("Income", ds.Tables [0].Columns [2].ColumnName, "#6a");\r
+                       NUnit.Framework.Assert.AreEqual (2, ds.Tables [0].Columns [2].Ordinal, "#6b");\r
+                       NUnit.Framework.Assert.AreEqual ("FirstName", ds.Tables [1].TableName, "#7");\r
+                       NUnit.Framework.Assert.AreEqual (3, ds.Tables [1].Columns.Count, "#8");\r
+                       NUnit.Framework.Assert.AreEqual ("space", ds.Tables [1].Columns [0].ColumnName, "#9a");\r
+                       NUnit.Framework.Assert.AreEqual (0, ds.Tables [1].Columns [0].Ordinal, "#9b");\r
+                       NUnit.Framework.Assert.AreEqual ("FirstName_Text", ds.Tables [1].Columns [1].ColumnName, "#10a");\r
+                       NUnit.Framework.Assert.AreEqual (1, ds.Tables [1].Columns [1].Ordinal, "#10b");\r
+                       NUnit.Framework.Assert.AreEqual ("Table_Id", ds.Tables [1].Columns [2].ColumnName, "#11a");\r
+                       NUnit.Framework.Assert.AreEqual (2, ds.Tables [1].Columns [2].Ordinal, "#11b");\r
 #endif\r
                }\r
        }\r

diff --git a/mcs/class/System.Data/Test/System.Data/DataTableTest.cs b/mcs/class/System.Data/Test/System.Data/DataTableTest.cs
index 444191c21ce3e2e71e71b11d740da265f1ba3d73..e290ffb14630ed35e73e0f5a76a35c00bcca6796 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataTableTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataTableTest.cs
@@ -42,6 +42,7 @@ using System.Runtime.Serialization.Formatters.Binary;
 using System.Xml;
 using MonoTests.System.Data.Utils;
 using System.Collections;
+using System.Threading;
 
 namespace MonoTests.System.Data
 {
@@ -3004,7 +3005,6 @@ namespace MonoTests.System.Data
                }
 
                [Test]
-               //[Category ("NotWorking")]
                public void ReadWriteXmlSchema_ByFileName () {
                        string sTempFileName1 = "tmpDataSet_ReadWriteXml_43899-1.xml";
                        string sTempFileName2 = "tmpDataSet_ReadWriteXml_43899-2.xml";