2005-02-01 Atsushi Enomoto <atsushi@ximian.com>

	* DataTableTest.cs : added RowChanging event test.
	* DataViewTest.cs : make sure to clear event args.


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

3 files changed, 47 insertions, 3 deletions

diff --git a/mcs/class/System.Data/Test/System.Data/ChangeLog b/mcs/class/System.Data/Test/System.Data/ChangeLog
index a99c2dabc12..2328d0a17c6 100644
--- a/mcs/class/System.Data/Test/System.Data/ChangeLog
+++ b/mcs/class/System.Data/Test/System.Data/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-01  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* DataTableTest.cs : added RowChanging event test.
+	* DataViewTest.cs : make sure to clear event args.
+
 2005-01-31  Sureshkumar T  <tsureshkumar@novell.com>
 
 	* DataRowTest.cs: Added case for SetparentRow: create
diff --git a/mcs/class/System.Data/Test/System.Data/DataTableTest.cs b/mcs/class/System.Data/Test/System.Data/DataTableTest.cs
index e5c8265cc21..1510b56ac6f 100644
--- a/mcs/class/System.Data/Test/System.Data/DataTableTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataTableTest.cs
@@ -1288,6 +1288,39 @@ namespace MonoTests.System.Data
 			dt.Rows.Add (new object [] {DBNull.Value, 3});
 		}
 
+		void RowChanging (object o, DataRowChangeEventArgs e)
+		{
+			AssertEquals ("changing.Action", rowChangingExpectedAction, e.Action);
+			rowChangingRowChanging = true;
+		}
+
+		void RowChanged (object o, DataRowChangeEventArgs e)
+		{
+			AssertEquals ("changed.Action", rowChangingExpectedAction, e.Action);
+			rowChangingRowChanged = true;
+		}
+
+		bool rowChangingRowChanging, rowChangingRowChanged;
+		DataRowAction rowChangingExpectedAction;
+
+		[Test]
+		public void RowChanging ()
+		{
+			DataTable dt = new DataTable ("table");
+			dt.Columns.Add ("col1");
+			dt.Columns.Add ("col2");
+			dt.RowChanging += new DataRowChangeEventHandler (RowChanging);
+			dt.RowChanged += new DataRowChangeEventHandler (RowChanged);
+			rowChangingExpectedAction = DataRowAction.Add;
+			dt.Rows.Add (new object [] {1, 2});
+			Assert ("changing,Added", rowChangingRowChanging);
+			Assert ("changed,Added", rowChangingRowChanged);
+			rowChangingExpectedAction = DataRowAction.Change;
+			dt.Rows [0] [0] = 2;
+			Assert ("changing,Changed", rowChangingRowChanging);
+			Assert ("changed,Changed", rowChangingRowChanged);
+		}
+
 		 [Test]
                 public void CloneSubClassTest()
                 {
diff --git a/mcs/class/System.Data/Test/System.Data/DataViewTest.cs b/mcs/class/System.Data/Test/System.Data/DataViewTest.cs
index aaaf936c072..e55ba0267da 100644
--- a/mcs/class/System.Data/Test/System.Data/DataViewTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataViewTest.cs
@@ -296,28 +296,34 @@ namespace MonoTests.System.Data
 
 			//PrintTableOrView(dataView, "ItemAdded");
 			AssertEquals ("test#01",ListChangedType.ItemAdded,listChangedArgs.ListChangedType);
-			
+			listChangedArgs = null;
+
 			dr ["itemId"] = "aitem 0";
 			// PrintTableOrView(dataView, "ItemChanged");
 			AssertEquals ("test#02",ListChangedType.ItemChanged,listChangedArgs.ListChangedType);
-			
+			listChangedArgs = null;
+
 			dr ["itemId"] = "zitem 0";
 			// PrintTableOrView(dataView, "ItemMoved");
 			AssertEquals ("test#03",ListChangedType.ItemMoved,listChangedArgs.ListChangedType);
-			
+			listChangedArgs = null;
+
 			dataTable.Rows.Remove (dr);
 			// PrintTableOrView(dataView, "ItemDeleted");
 			AssertEquals ("test#04",ListChangedType.ItemDeleted,listChangedArgs.ListChangedType);
 			
+			listChangedArgs = null;
 			DataColumn dc5 = new DataColumn ("itemDesc");
 			dataTable.Columns.Add (dc5);
 			// PrintTableOrView(dataView, "PropertyDescriptorAdded");
 			AssertEquals ("test#05",ListChangedType.PropertyDescriptorAdded,listChangedArgs.ListChangedType);
 			
+			listChangedArgs = null;
 			dc5.ColumnName = "itemDescription";
 			// PrintTableOrView(dataView, "PropertyDescriptorChanged");
 			// AssertEquals ("test#06",ListChangedType.PropertyDescriptorChanged,listChangedArgs.ListChangedType);
 			
+			listChangedArgs = null;
 			dataTable.Columns.Remove (dc5);
 			// PrintTableOrView(dataView, "PropertyDescriptorDeleted");
 			AssertEquals ("test#07",ListChangedType.PropertyDescriptorDeleted,listChangedArgs.ListChangedType);