Merge pull request #1624 from esdrubal/getprocesstimes

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

diff --git a/mcs/class/System.Data/Test/System.Data/DataSetReadXmlSchemaTest.cs b/mcs/class/System.Data/Test/System.Data/DataSetReadXmlSchemaTest.cs
index cc238f8497dc16f0fde86e127db8ab70490105d4..08909cf76fa2f8cb74ce039632ec635ca1e4efbd 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataSetReadXmlSchemaTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataSetReadXmlSchemaTest.cs
@@ -331,10 +331,10 @@ namespace MonoTests.System.Data
                        DataSet ds = new DataSet ();
                        ds.ReadXmlSchema (new StringReader (xs));
                        AssertDataSet ("ds", ds, "NewDataSet", 1, 0);
-                       AssertEquals ("fi-FI", ds.Locale.Name); // DataSet's Locale comes from current thread
+                       Assert.AreEqual ("fi-FI", ds.Locale.Name); // DataSet's Locale comes from current thread
                        DataTable dt = ds.Tables [0];
                        AssertDataTable ("dt", dt, "Root", 2, 0, 0, 0, 0, 0);
-                       AssertEquals ("ja-JP", dt.Locale.Name); // DataTable's Locale comes from msdata:Locale
+                       Assert.AreEqual ("ja-JP", dt.Locale.Name); // DataTable's Locale comes from msdata:Locale
                        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);
                        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);
                }
@@ -383,19 +383,19 @@ namespace MonoTests.System.Data
                        string xs = String.Format (xsbase, constraints, String.Empty, String.Empty);
                        DataSet ds = new DataSet ();
                        ds.ReadXmlSchema (new StringReader (xs));
-                       AssertEquals (1, ds.Relations.Count);
+                       Assert.AreEqual (1, ds.Relations.Count);
 
                        // Constraints on another global element - just ignored
                        xs = String.Format (xsbase, String.Empty, constraints, String.Empty);
                        ds = new DataSet ();
                        ds.ReadXmlSchema (new StringReader (xs));
-                       AssertEquals (0, ds.Relations.Count);
+                       Assert.AreEqual (0, ds.Relations.Count);
 
                        // Constraints on local element - just ignored
                        xs = String.Format (xsbase, String.Empty, String.Empty, constraints);
                        ds = new DataSet ();
                        ds.ReadXmlSchema (new StringReader (xs));
-                       AssertEquals (0, ds.Relations.Count);
+                       Assert.AreEqual (0, ds.Relations.Count);
                }
 
                [Test]
@@ -567,9 +567,7 @@ namespace MonoTests.System.Data
                }
 
                [Test]
-               [Category ("NotDotNet")]
-               // MS.NET has a bug on handling default value of referenced
-               // attribute.
+               [Ignore (".NET has a bug on handling default value of referenced attribute.")]
                public void TestSampleFileValueConstraints ()
                {
                        DataSet ds = new DataSet ();
@@ -602,6 +600,7 @@ namespace MonoTests.System.Data
                }
 
                [Test]
+               [Category ("NotWorking")]
                public void TestSampleFileImportSimple ()
                {
                        DataSet ds = new DataSet ();
@@ -751,7 +750,7 @@ namespace MonoTests.System.Data
                        col.AutoIncrementSeed = -1;
                        col.AutoIncrementStep = -1;
                        tbl.Columns.Add("data", typeof(string));
-                       Assert (ds.GetXmlSchema ().IndexOf ("AutoIncrementStep") > 0);
+                       Assert.IsTrue (ds.GetXmlSchema ().IndexOf ("AutoIncrementStep") > 0);
                }
 
                [Test]
@@ -760,10 +759,10 @@ namespace MonoTests.System.Data
                        DataSet ds = new DataSet ();
                        ds.ReadXmlSchema ("Test/System.Data/schemas/test015.xsd");
 
-                       NUnit.Framework.Assert.AreEqual (0, ds.Relations.Count, "#1");
-                       NUnit.Framework.Assert.AreEqual(1, ds.Tables [0].Constraints.Count, "#2" );
-                       NUnit.Framework.Assert.AreEqual(1, ds.Tables [1].Constraints.Count, "#3" );
-                       NUnit.Framework.Assert.AreEqual("fk1", ds.Tables [1].Constraints [0].ConstraintName, "#4");
+                       Assert.AreEqual (0, ds.Relations.Count, "#1");
+                       Assert.AreEqual (1, ds.Tables [0].Constraints.Count, "#2" );
+                       Assert.AreEqual (1, ds.Tables [1].Constraints.Count, "#3" );
+                       Assert.AreEqual ("fk1", ds.Tables [1].Constraints [0].ConstraintName, "#4");
                }
 
                [Test]
@@ -772,12 +771,12 @@ namespace MonoTests.System.Data
                        DataSet ds = new DataSet ();
                        ds.ReadXmlSchema ("Test/System.Data/schemas/test016.xsd");
 
-                       NUnit.Framework.Assert.AreEqual (1, ds.Relations.Count, "#1");
-                       NUnit.Framework.Assert.AreEqual ("rel", ds.Relations [0].RelationName, "#2");
-                       NUnit.Framework.Assert.AreEqual (2, ds.Relations [0].ParentColumns.Length, "#3");
-                       NUnit.Framework.Assert.AreEqual (2, ds.Relations [0].ChildColumns.Length, "#4");
-                       NUnit.Framework.Assert.AreEqual(0, ds.Tables [0].Constraints.Count, "#5" );
-                       NUnit.Framework.Assert.AreEqual(0, ds.Tables [1].Constraints.Count, "#6" );
+                       Assert.AreEqual (1, ds.Relations.Count, "#1");
+                       Assert.AreEqual ("rel", ds.Relations [0].RelationName, "#2");
+                       Assert.AreEqual (2, ds.Relations [0].ParentColumns.Length, "#3");
+                       Assert.AreEqual (2, ds.Relations [0].ChildColumns.Length, "#4");
+                       Assert.AreEqual (0, ds.Tables [0].Constraints.Count, "#5" );
+                       Assert.AreEqual (0, ds.Tables [1].Constraints.Count, "#6" );
 
                        AssertDataRelation ("TestRel", ds.Relations [0], "rel", false, new String[] {"col 1","col2"},
                                        new String[] {"col1","col  2"}, false, false);