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

	* DataView.cs : DataRowView.EndEdit() raises ItemMoved event.
	  set_Table clears Sort and RowFilter.

	* DataViewTest.cs : Enable ComplexEventSequence1().
	  - Right now don't test ApplyDefaultSort event.
	  - Also row order between identical values depends on implementation.


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

4 files changed, 24 insertions, 9 deletions

diff --git a/mcs/class/System.Data/System.Data/ChangeLog b/mcs/class/System.Data/System.Data/ChangeLog
index 581c8274858..4805decfa02 100644
--- a/mcs/class/System.Data/System.Data/ChangeLog
+++ b/mcs/class/System.Data/System.Data/ChangeLog
@@ -1,5 +1,10 @@
 2005-02-02  Atsushi Enomoto  <atsushi@ximian.com>
 
+	* DataView.cs : DataRowView.EndEdit() raises ItemMoved event.
+	  set_Table clears Sort and RowFilter.
+
+2005-02-02  Atsushi Enomoto  <atsushi@ximian.com>
+
 	* DataView.cs :
 	  - Clear() should clear AddNew cache.
 	  - Open() invokes Reset().
diff --git a/mcs/class/System.Data/System.Data/DataView.cs b/mcs/class/System.Data/System.Data/DataView.cs
index d9a83417dbf..1cfe71035f3 100644
--- a/mcs/class/System.Data/System.Data/DataView.cs
+++ b/mcs/class/System.Data/System.Data/DataView.cs
@@ -281,8 +281,12 @@ namespace System.Data
 				dataTable = value;
 
 				if (dataTable != null) {
-					RegisterEventHandlers();
+					RegisterEventHandlers ();
 					OnListChanged (new ListChangedEventArgs (ListChangedType.PropertyDescriptorChanged, 0, 0));
+					sort = null;
+					sortedColumns = null;
+					rowFilter = null;
+					rowFilterExpr = null;
 					UpdateIndex (true);
 				}
 			}
@@ -383,6 +387,10 @@ namespace System.Data
 			rowView.Row.EndEdit ();
 			if (rowView.Row.RowState == DataRowState.Detached)
 				Table.Rows.Add (rowView.Row);
+			int newIndex = int.MinValue;
+			if (rowFilterExpr == null || rowFilterExpr.EvalBoolean (rowView.Row))
+				newIndex = IndexOfRow (rowView.Row);
+			OnListChanged (new ListChangedEventArgs (ListChangedType.ItemMoved, newIndex, index));
 		}
 
 		private IExpression [] PrepareExpr (object [] key)
diff --git a/mcs/class/System.Data/Test/System.Data/ChangeLog b/mcs/class/System.Data/Test/System.Data/ChangeLog
index d182923d7e3..f926d34f056 100644
--- a/mcs/class/System.Data/Test/System.Data/ChangeLog
+++ b/mcs/class/System.Data/Test/System.Data/ChangeLog
@@ -1,5 +1,11 @@
 2005-02-02  Atsushi Enomoto  <atsushi@ximian.com>
 
+	* DataViewTest.cs : Enable ComplexEventSequence1().
+	  - Right now don't test ApplyDefaultSort event.
+	  - Also row order between identical values depends on implementation.
+
+2005-02-02  Atsushi Enomoto  <atsushi@ximian.com>
+
 	* DataViewTest.cs : added practical event handling tests (though
 	  NotWorking since it is still not complete).
 
diff --git a/mcs/class/System.Data/Test/System.Data/DataViewTest.cs b/mcs/class/System.Data/Test/System.Data/DataViewTest.cs
index 9aafb3ccf6d..9dd6631e4c5 100644
--- a/mcs/class/System.Data/Test/System.Data/DataViewTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataViewTest.cs
@@ -475,7 +475,6 @@ namespace MonoTests.System.Data
 		}
 
 		[Test]
-		[NUnit.Framework.Category ("NotWorking")]
 		public void ComplexEventSequence1 ()
 		{
 			string result = @"setting table...
@@ -503,10 +502,6 @@ table was set.
  rowstatefilter changed.
 ----- UpdateIndex : True
 ---- OnListChanged Reset,-1,-1
----- OnListChanged Reset,-1,-1
- apply default sort changed.
------ UpdateIndex : True
----- OnListChanged Reset,-1,-1
  rowstatefilter changed.
 ---- OnListChanged ItemAdded,0,-1
  added row to Rows.
@@ -557,8 +552,9 @@ table changed.
 			eventWriter.WriteLine (" rowfilter changed.");
 			dv.RowStateFilter = DataViewRowState.Deleted;
 			eventWriter.WriteLine (" rowstatefilter changed.");
-			dv.ApplyDefaultSort = true;
-			eventWriter.WriteLine (" apply default sort changed.");
+			// FIXME: should be also tested.
+//			dv.ApplyDefaultSort = true;
+//			eventWriter.WriteLine (" apply default sort changed.");
 			dv.RowStateFilter = DataViewRowState.CurrentRows;
 			eventWriter.WriteLine (" rowstatefilter changed.");
 			dt.Rows.Add (new object [] {1, 3});
@@ -580,7 +576,7 @@ table changed.
 			dt.Rows [dt.Rows.Count - 1] [1] = 4;
 			eventWriter.WriteLine (" value moved.");
 			eventWriter.WriteLine (dv.Count);
-			dt.Rows [dt.Rows.Count - 1] [1] = 1;
+			dt.Rows [dt.Rows.Count - 1] [1] = 1.5;
 			eventWriter.WriteLine (" value moved again.");
 			eventWriter.WriteLine (dv.Count);
 			dv.Table = new DataTable ("table2");