2006-11-21 Nagappan A <anagappan@novell.com>

	* DataViewTest.cs (BeginInit2): Checks for the data view public
	event Initialized.

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

diff --git a/mcs/class/System.Data/Test/System.Data/ChangeLog b/mcs/class/System.Data/Test/System.Data/ChangeLog
index e70728d4f7d1c1f355c3752c476786c6fed1a8af..9db7e2cd2d752b2de7466737c3e3d6917ef28862 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/ChangeLog
+++ b/mcs/class/System.Data/Test/System.Data/ChangeLog
@@ -1,5 +1,8 @@
 2006-11-21  Nagappan A  <anagappan@novell.com>
 
+       * DataViewTest.cs (BeginInit2): Checks for the data view public
+       event Initialized.
+
        * DataSetTest.cs (CreateDataReader1, CreateDataReader2,
        CreateDataReader3, Load_Basic, Load_TableConflictT,
        Load_TableConflictT, Load_TableConflictF, Load_TableUnknown,

diff --git a/mcs/class/System.Data/Test/System.Data/DataTableTest.cs b/mcs/class/System.Data/Test/System.Data/DataTableTest.cs
index bfa28ad704a533ce1737a73d846b6eea87ec4209..13518b86e5850738b2f87132746b9da90def03e8 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataTableTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataTableTest.cs
@@ -1954,21 +1954,20 @@ namespace MonoTests.System.Data
                [Test]
                public void TableInitializedEventTest4 () {
                        DataTable dt = new DataTable();
-                       tableInitialized = true;
-                       AssertEquals("TableInitialized #04", tableInitialized, dt.IsInitialized);
+                       AssertEquals("TableInitialized #04", true, dt.IsInitialized);
                        dt.BeginInit ();
                        tableInitialized = false;
                        dt.Initialized += new EventHandler (OnTableInitialized);
                        dt.Columns.Add("Series Label", typeof(SqlInt32));
                        dt.Rows.Add(new object[] {"sss"});
-                       AssertEquals("TableInitialized #05", tableInitialized, dt.IsInitialized);
+                       AssertEquals("TableInitialized #05", false, dt.IsInitialized);
                        dt.EndInit ();
-                       tableInitialized = true;
-                       AssertEquals("TableInitialized #06", tableInitialized, dt.IsInitialized);
+                       NUnit.Framework.Assert.IsTrue (dt.IsInitialized, "TableInitialized #06");
+                       NUnit.Framework.Assert.IsTrue (tableInitialized, "TableInitialized #07");
                        dt.Initialized -= new EventHandler (OnTableInitialized);
                }
 
-                public void OnTableInitialized (object src, EventArgs args)
+                private void OnTableInitialized (object src, EventArgs args)
                 {
                        tableInitialized = true;
                }

diff --git a/mcs/class/System.Data/Test/System.Data/DataViewTest.cs b/mcs/class/System.Data/Test/System.Data/DataViewTest.cs
index 8791f118e9873d4200b04b85888508146cf1f4a4..799eeceb186723fb2446f5a5da13a158fb102ed4 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataViewTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataViewTest.cs
@@ -378,6 +378,43 @@ namespace MonoTests.System.Data
                        AssertEquals ("#4", 2, table.Columns.Count);
                }
 
+#if NET_2_0
+               private bool dvInitialized;
+                private void OnDataViewInitialized (object src, EventArgs args)
+                {
+                       dvInitialized = true;
+               }
+               [Test]
+               public void BeginInit2 ()
+               {
+                       DataTable table = new DataTable ("table");
+                       DataView dv = new DataView ();
+                       DataColumn col1 = new DataColumn ("col1");
+                       DataColumn col2 = new DataColumn ("col2");
+
+                       dvInitialized = false;
+
+                       dv.Initialized += new EventHandler (OnDataViewInitialized);
+                       
+                       dv.BeginInit ();
+                       table.BeginInit ();
+                       table.Columns.AddRange (new DataColumn[] {col1,col2});
+
+                       dv.Table = table;
+                       AssertNull ("#1", dv.Table);
+                       dv.EndInit ();
+
+                       dv.Initialized -= new EventHandler (OnDataViewInitialized);
+                       
+                       AssertEquals ("#2", table, dv.Table);
+                       AssertEquals ("#3", 0, table.Columns.Count);
+
+                       table.EndInit ();
+                       AssertEquals ("#4", 2, table.Columns.Count);
+                       AssertEquals("DataViewInitialized #5", dvInitialized, true);
+               }
+#endif
+
                [Test]
                [ExpectedException(typeof(ArgumentException))]
                public void Find_1 ()