* System_test.dll.sources: Add ListChangedEventArgsTest.cs.

	* System.ComponentModel/ListChangedEventArgs.cs: Fix .NET compatibility
	  problems (discovered from trying to run the System.Data.Linq 
	  unit tests).
	* Test/System.ComponentModel/ListChangedEventArgsTest.cs: Added; tests
	  for ListChangedEventArgs.

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

6 files changed, 74 insertions, 2 deletions

diff --git a/mcs/class/System/ChangeLog b/mcs/class/System/ChangeLog
index 7a9113a291d..6f2f8002c35 100644
--- a/mcs/class/System/ChangeLog
+++ b/mcs/class/System/ChangeLog
@@ -1,5 +1,9 @@
 2009-05-13  Jonathan Pryor <jpryor@novell.com>
 
+	* System_test.dll.sources: Add ListChangedEventArgsTest.cs.
+
+2009-05-13  Jonathan Pryor <jpryor@novell.com>
+
 	* Makefile: $(test_lib).config needs to be profile-specific.
 
 2009-04-23  Sebastien Pouliot  <sebastien@ximian.com>
diff --git a/mcs/class/System/System.ComponentModel/ChangeLog b/mcs/class/System/System.ComponentModel/ChangeLog
index 4ffdfb7e1d5..8561892c47e 100644
--- a/mcs/class/System/System.ComponentModel/ChangeLog
+++ b/mcs/class/System/System.ComponentModel/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-14  Jonathan Pryor  <jpryor@novell.com>
+
+	* ListChangedEventArgs.cs: Fix .NET compatibility problems (discovered
+	  from trying to run the System.Data.Linq unit tests).
+
 2009-04-22 Gonzalo Paniagua Javier <gonzalo@novell.com>
 
 	* Win32Exception.cs: made W32ErrorMessage internal.
diff --git a/mcs/class/System/System.ComponentModel/ListChangedEventArgs.cs b/mcs/class/System/System.ComponentModel/ListChangedEventArgs.cs
index 5506a44c067..61d04a6eba7 100644
--- a/mcs/class/System/System.ComponentModel/ListChangedEventArgs.cs
+++ b/mcs/class/System/System.ComponentModel/ListChangedEventArgs.cs
@@ -42,9 +42,8 @@ namespace System.ComponentModel {
 
 		public ListChangedEventArgs (ListChangedType listChangedType,
 					     int newIndex)
+			: this (listChangedType, newIndex, -1)
 		{
-			this.changedType = listChangedType;
-			this.newIndex = newIndex;
 		}
 	
 		public ListChangedEventArgs (ListChangedType listChangedType,
@@ -71,6 +70,7 @@ namespace System.ComponentModel {
 		{
 			this.changedType = listChangedType;
 			this.newIndex = newIndex;
+			this.oldIndex = newIndex;
 			this.propDesc = propDesc;
 		}
 #endif
diff --git a/mcs/class/System/System_test.dll.sources b/mcs/class/System/System_test.dll.sources
index 513ff4482e1..a03d1a98135 100644
--- a/mcs/class/System/System_test.dll.sources
+++ b/mcs/class/System/System_test.dll.sources
@@ -136,6 +136,7 @@ System.ComponentModel/Int32ConverterTests.cs
 System.ComponentModel/Int64ConverterTests.cs
 System.ComponentModel/InvalidEnumArgumentExceptionTest.cs
 System.ComponentModel/LicenseManagerTests.cs
+System.ComponentModel/ListChangedEventArgsTest.cs
 System.ComponentModel/LookupBindingPropertiesAttributeTest.cs
 System.ComponentModel/MaskedTextProviderTest.cs
 System.ComponentModel/NestedContainerTest.cs
diff --git a/mcs/class/System/Test/System.ComponentModel/ChangeLog b/mcs/class/System/Test/System.ComponentModel/ChangeLog
index 27066486663..b1d98cd8ba2 100644
--- a/mcs/class/System/Test/System.ComponentModel/ChangeLog
+++ b/mcs/class/System/Test/System.ComponentModel/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-14  Jonathan Pryor  <jpryor@novell.com>
+
+	* ListChangedEventArgsTest.cs: Added; tests for ListChangedEventArgs.
+
 2009-02-19  Marek Habersack  <mhabersack@novell.com>
 
 	* TypeDescriptorTests.cs: added a test for
diff --git a/mcs/class/System/Test/System.ComponentModel/ListChangedEventArgsTest.cs b/mcs/class/System/Test/System.ComponentModel/ListChangedEventArgsTest.cs
new file mode 100644
index 00000000000..9299128bcf5
--- /dev/null
+++ b/mcs/class/System/Test/System.ComponentModel/ListChangedEventArgsTest.cs
@@ -0,0 +1,58 @@
+//
+// System.ComponentModel.TypeConverter test cases
+//
+// Authors:
+// 	Jonathan Pryor <jpryor@novell.com>
+//
+// (c) 2009 Novell, Inc. (http://novell.com)
+//
+
+using System;
+using System.ComponentModel;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.ComponentModel
+{
+	[TestFixture]
+	public class ListChangedEventArgsTests
+	{
+		[Test]
+		public void Ctor_ListChangedType_NewIndex()
+		{
+			ListChangedEventArgs e = new ListChangedEventArgs (ListChangedType.ItemAdded, 0);
+			Assert.AreEqual (ListChangedType.ItemAdded, e.ListChangedType);
+			Assert.AreEqual (0,   e.NewIndex);
+			Assert.AreEqual (-1,  e.OldIndex);
+		}
+
+		[Test]
+		public void Ctor_ListChangedType_NewIndex_OldIndex()
+		{
+			ListChangedEventArgs e = new ListChangedEventArgs (ListChangedType.ItemMoved, 1, 2);
+			Assert.AreEqual (ListChangedType.ItemMoved, e.ListChangedType);
+			Assert.AreEqual (1,  e.NewIndex);
+			Assert.AreEqual (2,  e.OldIndex);
+		}
+
+		[Test]
+		public void Ctor_ListChangedType_PropDesc()
+		{
+			PropertyDescriptor   p = null;
+			ListChangedEventArgs e = new ListChangedEventArgs (ListChangedType.ItemMoved, p);
+			Assert.AreEqual (ListChangedType.ItemMoved, e.ListChangedType);
+			Assert.AreEqual (0,  e.NewIndex);
+			Assert.AreEqual (0,  e.OldIndex);
+		}
+
+		[Test]
+		public void Ctor_ListChangedType_NewIndex_PropDesc()
+		{
+			PropertyDescriptor   p = null;
+			ListChangedEventArgs e = new ListChangedEventArgs (ListChangedType.ItemMoved, 2, p);
+			Assert.AreEqual (ListChangedType.ItemMoved, e.ListChangedType);
+			Assert.AreEqual (2,  e.NewIndex);
+			Assert.AreEqual (2,  e.OldIndex);
+		}
+	}
+}