X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FManaged.Windows.Forms%2FTest%2FSystem.Windows.Forms%2FListBoxTest.cs;h=3b2a6b950b4f2addff882bc0f2f52930e5973c0a;hb=c29282519b48d5fbfd73dd2bd1306a7844174f29;hp=c3b7e5fccb2a4eef2c7c41116776d6711522bf78;hpb=5bbfa8860b090e465a3aa45edeb9c94481ef1a22;p=mono.git

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ListBoxTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ListBoxTest.cs
index c3b7e5fccb2..3b2a6b950b4 100644
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ListBoxTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ListBoxTest.cs
@@ -27,28 +27,80 @@
 //	Jordi Mas i Hernandez <jordi@ximian.com>
 //
 
-
 using System;
-using System.Windows.Forms;
+using System.Collections;
+using System.ComponentModel;
 using System.Drawing;
 using System.Reflection;
+using System.Windows.Forms;
+
 using NUnit.Framework;
-using System.Collections;
-using System.ComponentModel;
 
 namespace MonoTests.System.Windows.Forms
 {
 	[TestFixture]
-	public class ListBoxTest
+	public class ListBoxTest : TestHelper
 	{
 		ListBox listBox;
 		Form form;
 
 		[SetUp]
-		public void SetUp()
+		protected override void SetUp ()
 		{
 			listBox = new ListBox();
 			form = new Form();
+			form.ShowInTaskbar = false;
+			base.SetUp ();
+		}
+
+		[TearDown]
+		protected override void TearDown ()
+		{
+			form.Dispose ();
+			base.TearDown ();
+		}
+
+		[Test] // bug #465422
+		public void RemoveLast ()
+		{
+			listBox.Items.Clear ();
+
+			for (int i = 0; i < 3; i++)
+				listBox.Items.Add (i.ToString ());
+
+			// need to create control to actually test the invalidation
+			listBox.CreateControl ();
+
+			// select last - then remove an item that is *not* the last,
+			// so basically the selection is invalidated implicitly
+			listBox.SelectedIndex = 2;
+			listBox.Items.RemoveAt (1);
+			Assert.AreEqual (1, listBox.SelectedIndex, "#A1");
+
+			listBox.SelectedIndex = 0;
+			Assert.AreEqual (0, listBox.SelectedIndex, "#B1");
+
+			// 
+			// MultiSelection
+			//
+			listBox.ClearSelected ();
+			listBox.Items.Clear ();
+			for (int i = 0; i < 3; i++)
+				listBox.Items.Add (i.ToString ());
+
+			listBox.SelectionMode = SelectionMode.MultiSimple;
+
+			listBox.SetSelected (0, true);
+			listBox.SetSelected (2, true);
+
+			Assert.AreEqual (true, listBox.GetSelected (0), "#C1");
+			Assert.AreEqual (false, listBox.GetSelected (1), "#C2");
+			Assert.AreEqual (true, listBox.GetSelected (2), "#C3");
+
+			listBox.Items.RemoveAt (2);
+			Assert.AreEqual (true, listBox.GetSelected (0), "#D1");
+			Assert.AreEqual (false, listBox.GetSelected (1), "#D2");
+			Assert.AreEqual (1, listBox.SelectedIndices.Count, "#D3");
 		}
 
 		[Test]
@@ -112,6 +164,17 @@ namespace MonoTests.System.Windows.Forms
 			Assert.AreEqual (0, listBox.SelectedItems.Count,"#23");
 		}
 
+		[Test] // bug #80620
+		[NUnit.Framework.Category ("NotWorking")]
+		public void ClientRectangle_Borders ()
+		{
+			// This test is invalid because createcontrol forces .net to resize
+			// the listbox using integralheight, which defaults to true.  This
+			// will only hold for most font sizes.
+			listBox.CreateControl ();
+			Assert.AreEqual (listBox.ClientRectangle, new ListBox ().ClientRectangle);
+		}
+
 		[Ignore ("It depends on user system settings")]
 		public void GetItemHeightTest ()
 		{
@@ -138,6 +201,7 @@ namespace MonoTests.System.Windows.Forms
 			listBox.Items.Add ("B");
 			listBox.Items.Add ("C");
 			listBox.Items.Add ("D");
+			listBox.SelectionMode = SelectionMode.MultiSimple;
 			listBox.Sorted = true;
 			listBox.SetSelected (0,true);
 			listBox.SetSelected (2,true);
@@ -170,6 +234,15 @@ namespace MonoTests.System.Windows.Forms
 			Assert.AreEqual (0, x, "#192");
 			x = listBox.FindString ("NonExistant");
 			Assert.AreEqual (-1, x, "#193");
+
+			x = listBox.FindString ("A", -1);
+			Assert.AreEqual (0, x, "#194");
+			x = listBox.FindString ("A", 0);
+			Assert.AreEqual (1, x, "#195");
+			x = listBox.FindString ("A", listBox.Items.Count - 1);
+			Assert.AreEqual (0, x, "#196");
+			x = listBox.FindString ("a", listBox.Items.Count - 1);
+			Assert.AreEqual (0, x, "#197");
 		}
 
 		[Test]
@@ -186,7 +259,28 @@ namespace MonoTests.System.Windows.Forms
 			Assert.AreEqual (-1, x, "#202");
 			x = listBox.FindStringExact ("NonExistant");
 			Assert.AreEqual (-1, x, "#203");
+
+			x = listBox.FindStringExact ("ABCD", -1);
+			Assert.AreEqual (0, x, "#204");
+			x = listBox.FindStringExact ("ABC", 0);
+			Assert.AreEqual (1, x, "#205");
+			x = listBox.FindStringExact ("ABC", listBox.Items.Count - 1);
+			Assert.AreEqual (1, x, "#206");
+			x = listBox.FindStringExact ("abcd", listBox.Items.Count - 1);
+			Assert.AreEqual (0, x, "#207");
+		}
+
+#if NET_2_0
+		[Test]
+		public void AllowSelection ()
+		{
+			MockListBox lb = new MockListBox ();
+			lb.SelectionMode = SelectionMode.None;
+			Assert.IsFalse (lb.allow_selection, "#1");
+			lb.SelectionMode = SelectionMode.One;
+			Assert.IsTrue (lb.allow_selection, "#2");
 		}
+#endif
 
 		//
 		// Exceptions
@@ -228,6 +322,187 @@ namespace MonoTests.System.Windows.Forms
 			listBox.ItemHeight = 256;
 		}
 
+		[Test] // bug #80696
+		public void SelectedIndex_Created ()
+		{
+			Form form = new Form ();
+			ListBox listBox = new ListBox ();
+			listBox.Items.Add ("A");
+			listBox.Items.Add ("B");
+			form.Controls.Add (listBox);
+			form.Show ();
+
+			Assert.AreEqual (-1, listBox.SelectedIndex, "#1");
+			listBox.SelectedIndex = 0;
+			Assert.AreEqual (0, listBox.SelectedIndex, "#2");
+			listBox.SelectedIndex = -1;
+			Assert.AreEqual (-1, listBox.SelectedIndex, "#3");
+			listBox.SelectedIndex = 1;
+			Assert.AreEqual (1, listBox.SelectedIndex, "#4");
+			
+			form.Close ();
+		}
+
+		[Test] // bug #80753
+		public void SelectedIndex_NotCreated ()
+		{
+			ListBox listBox = new ListBox ();
+			listBox.Items.Add ("A");
+			listBox.Items.Add ("B");
+			Assert.AreEqual (-1, listBox.SelectedIndex, "#1");
+			listBox.SelectedIndex = 0;
+			Assert.AreEqual (0, listBox.SelectedIndex, "#2");
+			listBox.SelectedIndex = -1;
+			Assert.AreEqual (-1, listBox.SelectedIndex, "#3");
+			listBox.SelectedIndex = 1;
+			Assert.AreEqual (1, listBox.SelectedIndex, "#4");
+		}
+
+#if NET_2_0
+		[Test]
+		public void SelectedIndex_Removed ()
+		{
+			ListBox listBox = new ListBox ();
+			listBox.Items.Add ("A");
+			listBox.Items.Add ("B");
+			listBox.Items.Add ("C");
+
+			Assert.AreEqual (-1, listBox.SelectedIndex, "#1");
+			listBox.SelectedIndex = 2;
+			Assert.AreEqual (2, listBox.SelectedIndex, "#2");
+			listBox.Items.RemoveAt (2);
+			Assert.AreEqual (-1, listBox.SelectedIndex, "#3");
+
+			listBox.SelectedIndex = 0;
+			Assert.AreEqual (0, listBox.SelectedIndex, "#4");
+			listBox.Items.RemoveAt (0);
+			Assert.AreEqual (-1, listBox.SelectedIndex, "#5");
+		}
+
+		// This should also apply to MultiSimple selection mode
+		[Test]
+		public void Selection_MultiExtended ()
+		{
+			listBox.Items.Add ("A");
+			listBox.Items.Add ("B");
+			listBox.Items.Add ("C");
+			listBox.Items.Add ("D");
+			listBox.SelectionMode = SelectionMode.MultiExtended;
+
+			//
+			// First part: test the order of SelectedItems as well
+			// as SelectedIndex when more than one item is selected
+			//
+			listBox.SelectedItems.Add ("D");
+			listBox.SelectedItems.Add ("B");
+			Assert.AreEqual (1, listBox.SelectedIndex, "#A1");
+			Assert.AreEqual (2, listBox.SelectedItems.Count, "#A2");
+			Assert.AreEqual ("B", listBox.SelectedItems [0], "#A3");
+			Assert.AreEqual ("D", listBox.SelectedItems [1], "#A4");
+
+			listBox.SelectedItems.Add ("C");
+			Assert.AreEqual (1, listBox.SelectedIndex, "#B1");
+			Assert.AreEqual (3, listBox.SelectedItems.Count, "#B2");
+			Assert.AreEqual ("B", listBox.SelectedItems [0], "#B3");
+			Assert.AreEqual ("C", listBox.SelectedItems [1], "#B4");
+			Assert.AreEqual ("D", listBox.SelectedItems [2], "#B5");
+
+			listBox.SelectedItems.Add ("A");
+			Assert.AreEqual (0, listBox.SelectedIndex, "#C1");
+			Assert.AreEqual (4, listBox.SelectedItems.Count, "#C2");
+			Assert.AreEqual ("A", listBox.SelectedItems [0], "#C3");
+			Assert.AreEqual ("B", listBox.SelectedItems [1], "#C4");
+			Assert.AreEqual ("C", listBox.SelectedItems [2], "#C5");
+			Assert.AreEqual ("D", listBox.SelectedItems [3], "#C6");
+
+			// 
+			// Second part: how does SelectedIndex setter work related
+			// to SelectedItems
+			//
+			listBox.SelectedIndex = -1;
+			Assert.AreEqual (-1, listBox.SelectedIndex, "#D1");
+			Assert.AreEqual (0, listBox.SelectedItems.Count, "#D2");
+
+			listBox.SelectedIndex = 3; // "D"
+			Assert.AreEqual (3, listBox.SelectedIndex, "#E1");
+			Assert.AreEqual (1, listBox.SelectedItems.Count, "#E2");
+			Assert.AreEqual ("D", listBox.SelectedItems [0], "#E3");
+
+			listBox.SelectedItems.Add ("B"); // index = 1
+			Assert.AreEqual (1, listBox.SelectedIndex, "#F1");
+			Assert.AreEqual (2, listBox.SelectedItems.Count, "#E3");
+			Assert.AreEqual ("B", listBox.SelectedItems [0], "#E4");
+			Assert.AreEqual ("D", listBox.SelectedItems [1], "#E5");
+
+			listBox.SelectedIndex = 2;
+			Assert.AreEqual (1, listBox.SelectedIndex, "#G1");
+			Assert.AreEqual (3, listBox.SelectedItems.Count, "#G2");
+			Assert.AreEqual ("B", listBox.SelectedItems [0], "#G3");
+			Assert.AreEqual ("C", listBox.SelectedItems [1], "#G4");
+			Assert.AreEqual ("D", listBox.SelectedItems [2], "#G5");
+
+			listBox.SelectedIndex = 1; // already selected
+			Assert.AreEqual (1, listBox.SelectedIndex, "#H1");
+			Assert.AreEqual (3, listBox.SelectedItems.Count, "#H2");
+
+			// NOTE: It seems that passing -1 does not affect the collection
+			// in anyway (other wrong values generate an exception, however)
+			listBox.SelectedIndices.Add (-1);
+			Assert.AreEqual (3, listBox.SelectedItems.Count, "#J1");
+		}
+
+		[Test]
+		public void Selection_One ()
+		{
+			listBox.Items.Add ("A");
+			listBox.Items.Add ("B");
+			listBox.Items.Add ("C");
+			listBox.SelectionMode = SelectionMode.One;
+
+			listBox.SelectedItems.Add ("B");
+			Assert.AreEqual (1, listBox.SelectedIndex, "#A1");
+			Assert.AreEqual (1, listBox.SelectedItems.Count, "#A2");
+			Assert.AreEqual ("B", listBox.SelectedItems [0], "#A3");
+
+			listBox.SelectedIndex = 2;
+			Assert.AreEqual (2, listBox.SelectedIndex, "#B1");
+			Assert.AreEqual (1, listBox.SelectedItems.Count, "#B2");
+			Assert.AreEqual ("C", listBox.SelectedItems [0], "#B3");
+
+			listBox.SelectedItems.Add ("A");
+			Assert.AreEqual (0, listBox.SelectedIndex, "#C1");
+			Assert.AreEqual (1, listBox.SelectedItems.Count, "#C2");
+			Assert.AreEqual ("A", listBox.SelectedItems [0], "#C3");
+		}
+
+		[Test]
+		public void Selection_None ()
+		{
+			listBox.Items.Add ("A");
+			listBox.Items.Add ("B");
+			listBox.SelectionMode = SelectionMode.None;
+
+			try {
+				listBox.SelectedIndex = 0;
+				Assert.Fail ("#A");
+			} catch (ArgumentException) {
+			}
+
+			try {
+				listBox.SelectedIndices.Add (0);
+				Assert.Fail ("#B");
+			} catch (InvalidOperationException e) {
+				Console.WriteLine (e.Message);
+			}
+
+			try {
+				listBox.SelectedItems.Add ("A");
+				Assert.Fail ("#C");
+			} catch (ArgumentException) {
+			}
+		}
+#endif
+
 		[Test]
 		[ExpectedException (typeof (ArgumentOutOfRangeException))]
 		public void SelectedIndexException ()
@@ -235,6 +510,13 @@ namespace MonoTests.System.Windows.Forms
 			listBox.SelectedIndex = -2;
 		}
 
+		[Test]
+		[ExpectedException (typeof (ArgumentOutOfRangeException))]
+		public void SelectedIndexException2 ()
+		{
+			listBox.SelectedIndex = listBox.Items.Count;
+		}
+
 		[Test]
 		[ExpectedException (typeof (ArgumentException))]
 		public void SelectedIndexModeNoneException ()
@@ -253,35 +535,334 @@ namespace MonoTests.System.Windows.Forms
 		[Test]
 		public void SelectedValueNull()
 		{
+			listBox.Items.Clear ();
+
+			listBox.Items.Add ("A");
+			listBox.Items.Add ("B");
+			listBox.Items.Add ("C");
+			listBox.Items.Add ("D");
+
+			listBox.SelectedIndex = 2;
 			listBox.SelectedValue = null;
+			Assert.AreEqual (listBox.SelectedIndex, 2);
 		}
 
 		[Test]
 		public void SelectedValueEmptyString()
 		{
-			listBox.SelectedValue = String.Empty;
+			listBox.Items.Clear ();
+
+			listBox.Items.Add ("A");
+			listBox.Items.Add ("B");
+			listBox.Items.Add ("C");
+			listBox.Items.Add ("D");
+
+			listBox.SelectedIndex = 2;
+			listBox.SelectedValue = null;
+			Assert.AreEqual (listBox.SelectedIndex, 2);
+		}
+
+		[Test]
+		public void SetItemsCore ()
+		{
+			MockListBox l = new MockListBox ();
+			l.InvokeSetItemsCore (new object [] { "A", "B", "C" });
+			Assert.AreEqual (3, l.Items.Count, "#1");
+			Assert.AreEqual ("A", l.Items [0], "#2");
+			Assert.AreEqual ("B", l.Items [1], "#3");
+			Assert.AreEqual ("C", l.Items [2], "#4");
+		}
+
+		[Test]
+		public void SetItemsCore_Item_Null ()
+		{
+			MockListBox l = new MockListBox ();
+			try {
+				l.InvokeSetItemsCore (new object [] { "A", null, "B" });
+				Assert.Fail ("#1");
+			} catch (ArgumentNullException ex) {
+				Assert.AreEqual (typeof (ArgumentNullException), ex.GetType (), "#2");
+				Assert.IsNull (ex.InnerException, "#3");
+				Assert.IsNotNull (ex.Message, "#4");
+				Assert.AreEqual ("item", ex.ParamName, "#5");
+			}
+
+#if NET_2_0
+			Assert.AreEqual (1, l.Items.Count, "#6");
+			Assert.AreEqual ("A", l.Items [0], "#7");
+#else
+			Assert.AreEqual (0, l.Items.Count, "#6");
+#endif
+		}
+
+		[Test]
+		public void SetItemsCore_Value_Null ()
+		{
+			MockListBox l = new MockListBox ();
+			try {
+				l.InvokeSetItemsCore ((IList) null);
+				Assert.Fail ("#1");
+			} catch (ArgumentNullException ex) {
+				Assert.AreEqual (typeof (ArgumentNullException), ex.GetType (), "#2");
+				Assert.IsNull (ex.InnerException, "#3");
+				Assert.IsNotNull (ex.Message, "#4");
+				Assert.AreEqual ("items", ex.ParamName, "#5");
+			}
+		}
+
+		[Test]	// Bug #80466
+		public void ListBoxHeight ()
+		{
+			ListBox l = new ListBox ();
+			
+			for (int h = 0; h < 100; h++) {
+				l.Height = h;
+				
+				if (l.Height != h)
+					Assert.Fail ("Set ListBox height of {0}, got back {1}.  Should be the same.", h, l.Height);
+			}
+		}
+
+#if NET_2_0
+		[Test]
+		public void GetScaledBoundsTest ()
+		{
+			ScaleListBox c = new ScaleListBox ();
+
+			Rectangle r = new Rectangle (100, 200, 300, 400);
+
+			Assert.AreEqual (new Rectangle (200, 100, 596, 50), c.PublicGetScaledBounds (r, new SizeF (2f, .5f), BoundsSpecified.All), "A1");
+			Assert.AreEqual (new Rectangle (200, 100, 300, 96), c.PublicGetScaledBounds (r, new SizeF (2f, .5f), BoundsSpecified.Location), "A2");
+			Assert.AreEqual (new Rectangle (100, 200, 596, 50), c.PublicGetScaledBounds (r, new SizeF (2f, .5f), BoundsSpecified.Size), "A3");
+			Assert.AreEqual (new Rectangle (100, 200, 300, 50), c.PublicGetScaledBounds (r, new SizeF (2f, .5f), BoundsSpecified.Height), "A4");
+			Assert.AreEqual (new Rectangle (200, 200, 300, 96), c.PublicGetScaledBounds (r, new SizeF (2f, .5f), BoundsSpecified.X), "A5");
+			Assert.AreEqual (new Rectangle (100, 200, 300, 96), c.PublicGetScaledBounds (r, new SizeF (2f, .5f), BoundsSpecified.None), "A6");
+
+			Assert.AreEqual (new Rectangle (100, 200, 300, 96), c.PublicGetScaledBounds (r, new SizeF (1f, 1f), BoundsSpecified.All), "A6-2");
+			Assert.AreEqual (new Rectangle (200, 400, 596, 188), c.PublicGetScaledBounds (r, new SizeF (2f, 2f), BoundsSpecified.All), "A7");
+			Assert.AreEqual (new Rectangle (300, 600, 892, 280), c.PublicGetScaledBounds (r, new SizeF (3f, 3f), BoundsSpecified.All), "A8");
+			Assert.AreEqual (new Rectangle (400, 800, 1188, 372), c.PublicGetScaledBounds (r, new SizeF (4f, 4f), BoundsSpecified.All), "A9");
+			Assert.AreEqual (new Rectangle (50, 100, 152, 50), c.PublicGetScaledBounds (r, new SizeF (.5f, .5f), BoundsSpecified.All), "A10");
+		}
+
+		[Test]
+		[NUnit.Framework.Category ("NotWorking")]
+		public void MethodScaleControl ()
+		{
+			Form f = new Form ();
+			f.ShowInTaskbar = false;
+
+			f.Show ();
+
+			ScaleListBox gb = new ScaleListBox ();
+			gb.Location = new Point (5, 10);
+			f.Controls.Add (gb);
+
+			Assert.AreEqual (new Rectangle (5, 10, 120, 95), gb.Bounds, "A1");
+
+			gb.PublicScaleControl (new SizeF (2.0f, 2.0f), BoundsSpecified.All);
+			Assert.AreEqual (new Rectangle (10, 20, 236, 186), gb.Bounds, "A2");
+
+			gb.PublicScaleControl (new SizeF (.5f, .5f), BoundsSpecified.Location);
+			Assert.AreEqual (new Rectangle (5, 10, 236, 186), gb.Bounds, "A3");
+
+			gb.PublicScaleControl (new SizeF (.5f, .5f), BoundsSpecified.Size);
+			Assert.AreEqual (new Rectangle (5, 10, 120, 95), gb.Bounds, "A4");
+
+			gb.PublicScaleControl (new SizeF (3.5f, 3.5f), BoundsSpecified.Size);
+			Assert.AreEqual (new Rectangle (5, 10, 410, 316), gb.Bounds, "A5");
+
+			gb.PublicScaleControl (new SizeF (2.5f, 2.5f), BoundsSpecified.Size);
+			Assert.AreEqual (new Rectangle (5, 10, 1019, 797), gb.Bounds, "A6");
+
+			gb.PublicScaleControl (new SizeF (.2f, .2f), BoundsSpecified.Size);
+			Assert.AreEqual (new Rectangle (5, 10, 207, 160), gb.Bounds, "A7");
+
+			f.Dispose ();
+		}
+
+		private class ScaleListBox : ListBox
+		{
+			public Rectangle PublicGetScaledBounds (Rectangle bounds, SizeF factor, BoundsSpecified specified)
+			{
+				return base.GetScaledBounds (bounds, factor, specified);
+			}
+
+			public void PublicScaleControl (SizeF factor, BoundsSpecified specified)
+			{
+				base.ScaleControl (factor, specified);
+			}
+		}
+#endif
+
+		[Test]
+		public void MethodIsInputChar ()
+		{
+			// Basically, show that this method always returns true
+			InputCharControl m = new InputCharControl ();
+			bool result = true;
+
+			for (int i = 0; i < 256; i++)
+				result &= m.PublicIsInputChar ((char)i);
+
+			Assert.AreEqual (true, result, "I1");
+		}
+
+		private class InputCharControl : ListBox
+		{
+			public bool PublicIsInputChar (char charCode)
+			{
+				return base.IsInputChar (charCode);
+			}
+		}
+
+		[Test]
+		public void HeightAndIntegralHeight ()
+		{
+			ListBox a = new ListBox();
+			Size defaultSize = new Size(120, 96);
+			Assert.AreEqual (defaultSize, a.Size, "A1");
+			a.CreateControl();
+			Assert.AreEqual (0, (a.ClientSize.Height % a.ItemHeight), "A2");
+			a.IntegralHeight = false;
+			Assert.AreEqual (a.Size, defaultSize, "A3");
+			a.IntegralHeight = true;
+			Assert.AreEqual (0, (a.ClientSize.Height % a.ItemHeight), "A4");
+
+			Size clientSizeI = new Size(200, a.ItemHeight * 5);
+			Size clientSize = clientSizeI + new Size(0, a.ItemHeight / 2);
+			Size borderSize = new Size(a.Width - a.ClientSize.Width, a.Height - a.ClientSize.Height);
+			Size totalSizeI = clientSizeI + borderSize;
+			Size totalSize = clientSize + borderSize;
+
+			a = new ListBox();
+			a.ClientSize = clientSize;
+			Assert.AreEqual (clientSize, a.ClientSize, "A5");
+			Assert.AreEqual (totalSize, a.Size, "A6");
+			a.IntegralHeight = false;
+			a.IntegralHeight = true;
+			Assert.AreEqual (clientSize, a.ClientSize, "A7");
+			a.CreateControl();
+			Assert.AreEqual (clientSizeI, a.ClientSize, "A8");
+			Assert.AreEqual (totalSizeI, a.Size, "A9");
+			a.IntegralHeight = false;
+			Assert.AreEqual (clientSize, a.ClientSize, "A10");
+			a.IntegralHeight = true;
+			Assert.AreEqual (totalSizeI, a.Size, "A11");
+
+			a = new ListBox();
+			a.CreateControl();
+			a.Size = totalSize;
+			Assert.AreEqual (totalSizeI, a.Size, "A12");
+			Assert.AreEqual (clientSizeI, a.ClientSize, "A13");
+			a.IntegralHeight = false;
+			Assert.AreEqual (totalSize, a.Size, "A14");
+			Assert.AreEqual (clientSize, a.ClientSize, "A15");
+
+			a = new ListBox();
+			a.IntegralHeight = false;
+			Assert.AreEqual (defaultSize, a.Size, "A16");
+			a.CreateControl();
+			Assert.AreEqual (defaultSize, a.Size, "A17");
+
+			a = new ListBox();
+			a.ClientSize = clientSize;
+			a.IntegralHeight = false;
+			Assert.AreEqual (clientSize, a.ClientSize, "A18");
+			a.CreateControl();
+			Assert.AreEqual (clientSize, a.ClientSize, "A19");
 		}
 
+		[Test]
+		public void PropertyTopIndex ()
+		{
+			Form f = new Form ();
+			f.ShowInTaskbar = false;
+			f.Show ();
+			
+			ListBox l = new ListBox ();
+			l.Height = 100;
+			f.Controls.Add (l);
+			
+			l.Items.AddRange (new string[] { "A", "B", "C"});
+			
+			Assert.AreEqual (0, l.TopIndex, "A1");
+			
+			l.TopIndex = 2;
+			Assert.AreEqual (0, l.TopIndex, "A2");
+
+			l.Items.AddRange (new string[] { "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M" });
+			Assert.AreEqual (0, l.TopIndex, "A3");
+
+			l.TopIndex = 2;
+			Assert.AreEqual (2, l.TopIndex, "A4");
+
+			// There aren't items enough for 12 to be the top index, but
+			// the actual value is font height dependent.
+			l.TopIndex = 12;
+			Assert.IsTrue (l.TopIndex < 12, "A5");
+			
+			f.Close ();
+			f.Dispose ();
+		}
+		
 		//
 		// Events
 		//
-		private bool eventFired;
+		//private bool eventFired;
+
+		//private void GenericHandler (object sender,  EventArgs e)
+		//{
+		//        eventFired = true;
+		//}
+
+		public class MockListBox : ListBox
+		{
+#if NET_2_0
+			public bool allow_selection {
+				get { return base.AllowSelection; }
+			}
+#endif
+
+			public void InvokeSetItemsCore (IList value)
+			{
+				base.SetItemsCore (value);
+			}
+		}
 
-		private void GenericHandler (object sender,  EventArgs e)
+		[Test]
+		public void AddToSorted ()
 		{
-			eventFired = true;
+			AddItems (true, CheckedListBoxTest.Items, CheckedListBoxTest.ExpectedAddPositionsSorted);
 		}
 
+		[Test]
+		public void AddToUnsorted ()
+		{
+			AddItems (false, CheckedListBoxTest.Items, CheckedListBoxTest.ExpectedAddPositionsUnsorted);
+		}
 
+		void AddItems (bool sorted, object[] items, int[] expectedAddPositions)
+		{
+			ListBox clb = new ListBox ();
+			clb.Sorted = sorted;
+			ArrayList addedAtList = new ArrayList ();
+			foreach (object cur in items)
+			{
+				int idx = clb.Items.Add (cur);
+				addedAtList.Add (idx);
+			}
+			Assert.AreEqual ((Array)expectedAddPositions, (Array)addedAtList.ToArray (typeof (int)), "addedAtList");
+		}
 	}
 
 	[TestFixture]
-	public class ListBoxObjectCollectionTest
+	public class ListBoxObjectCollectionTest : TestHelper
 	{
 		ListBox.ObjectCollection col;
 
 		[SetUp]
-		public void SetUp()
+		protected override void SetUp ()
 		{
 			col = new ListBox.ObjectCollection (new ListBox ());
 		}
@@ -297,15 +878,59 @@ namespace MonoTests.System.Windows.Forms
 		}
 
 		[Test]
-		public void AddTest ()
+		public void Add ()
 		{
 			col.Add ("Item1");
 			col.Add ("Item2");
-			Assert.AreEqual (2, col.Count, "#C1");
+			Assert.AreEqual (2, col.Count, "#1");
+			Assert.AreEqual ("Item1", col [0], "#2");
+			Assert.AreEqual ("Item2", col [1], "#3");
 		}
 
 		[Test]
-		public void ClearTest ()
+		public void Add_Item_Null ()
+		{
+			try {
+				col.Add (null);
+				Assert.Fail ("#1");
+			} catch (ArgumentNullException ex) {
+				Assert.AreEqual (typeof (ArgumentNullException), ex.GetType (), "#2");
+				Assert.IsNull (ex.InnerException, "#3");
+				Assert.IsNotNull (ex.Message, "#4");
+				Assert.AreEqual ("item", ex.ParamName, "#5");
+			}
+		}
+
+		[Test] // AddRange (Object [])
+		public void AddRange1_Items_Null ()
+		{
+			try {
+				col.AddRange ((object []) null);
+				Assert.Fail ("#1");
+			} catch (ArgumentNullException ex) {
+				Assert.AreEqual (typeof (ArgumentNullException), ex.GetType (), "#2");
+				Assert.IsNull (ex.InnerException, "#3");
+				Assert.IsNotNull (ex.Message, "#4");
+				Assert.AreEqual ("items", ex.ParamName, "#5");
+			}
+		}
+
+		[Test] // AddRange (ListBox.ObjectCollection)
+		public void AddRange2_Value_Null ()
+		{
+			try {
+				col.AddRange ((ListBox.ObjectCollection) null);
+				Assert.Fail ("#1");
+			} catch (ArgumentNullException ex) {
+				Assert.AreEqual (typeof (ArgumentNullException), ex.GetType (), "#2");
+				Assert.IsNull (ex.InnerException, "#3");
+				Assert.IsNotNull (ex.Message, "#4");
+				Assert.AreEqual ("items", ex.ParamName, "#5");
+			}
+		}
+
+		[Test]
+		public void Clear ()
 		{
 			col.Add ("Item1");
 			col.Add ("Item2");
@@ -314,56 +939,670 @@ namespace MonoTests.System.Windows.Forms
 		}
 
 		[Test]
-		public void ContainsTest ()
+		public void Contains ()
 		{
 			object obj = "Item1";
 			col.Add (obj);
-			Assert.AreEqual (true, col.Contains ("Item1"), "#E1");
-			Assert.AreEqual (false, col.Contains ("Item2"), "#E2");
+			Assert.IsTrue (col.Contains ("Item1"), "#1");
+			Assert.IsFalse (col.Contains ("Item2"), "#2");
+		}
+
+		[Test]
+		public void Contains_Value_Null ()
+		{
+			try {
+				col.Contains (null);
+				Assert.Fail ("#1");
+			} catch (ArgumentNullException ex) {
+				Assert.AreEqual (typeof (ArgumentNullException), ex.GetType (), "#2");
+				Assert.IsNull (ex.InnerException, "#3");
+				Assert.IsNotNull (ex.Message, "#4");
+#if NET_2_0
+				Assert.AreEqual ("value", ex.ParamName, "#5");
+#else
+				Assert.IsNotNull (ex.ParamName, "#5");
+#endif
+			}
 		}
 
 		[Test]
-		public void IndexOfTest ()
+		public void Indexer_Value_Null ()
+		{
+			col.Add ("Item1");
+			try {
+				col [0] = null;
+				Assert.Fail ("#1");
+			} catch (ArgumentNullException ex) {
+				Assert.AreEqual (typeof (ArgumentNullException), ex.GetType (), "#2");
+				Assert.IsNull (ex.InnerException, "#3");
+				Assert.IsNotNull (ex.Message, "#4");
+				Assert.AreEqual ("value", ex.ParamName, "#5");
+			}
+		}
+
+		[Test]
+		public void IndexOf ()
 		{
 			col.Add ("Item1");
 			col.Add ("Item2");
-			Assert.AreEqual (1, col.IndexOf ("Item2"), "#F1");
+			Assert.AreEqual (1, col.IndexOf ("Item2"), "#1");
+			Assert.AreEqual (0, col.IndexOf ("Item1"), "#2");
+			Assert.AreEqual (-1, col.IndexOf ("Item3"), "#3");
+		}
+
+		[Test]
+		public void IndexOf_Value_Null ()
+		{
+			try {
+				col.IndexOf (null);
+				Assert.Fail ("#1");
+			} catch (ArgumentNullException ex) {
+				Assert.AreEqual (typeof (ArgumentNullException), ex.GetType (), "#2");
+				Assert.IsNull (ex.InnerException, "#3");
+				Assert.IsNotNull (ex.Message, "#4");
+#if NET_2_0
+				Assert.AreEqual ("value", ex.ParamName, "#5");
+#else
+				Assert.IsNotNull (ex.ParamName, "#5");
+#endif
+			}
 		}
 
 		[Test]
-		public void RemoveTest ()
+#if NET_2_0
+		[NUnit.Framework.Category ("NotDotNet")] // https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=363285
+#endif
+		public void Insert_Item_Null ()
+		{
+			col.Add ("Item1");
+			try {
+				col.Insert (0, null);
+				Assert.Fail ("#1");
+			} catch (ArgumentNullException ex) {
+				Assert.AreEqual (typeof (ArgumentNullException), ex.GetType (), "#2");
+				Assert.IsNull (ex.InnerException, "#3");
+				Assert.IsNotNull (ex.Message, "#4");
+				Assert.AreEqual ("item", ex.ParamName, "#5");
+			}
+		}
+
+		[Test]
+		public void Remove ()
 		{
 			col.Add ("Item1");
 			col.Add ("Item2");
 			col.Remove ("Item1");
-			Assert.AreEqual (1, col.Count, "#G1");
+			Assert.AreEqual (1, col.Count, "#A1");
+			Assert.AreEqual (-1, col.IndexOf ("Item1"), "#A2");
+			Assert.AreEqual (0, col.IndexOf ("Item2"), "#A3");
+			col.Remove (null);
+			Assert.AreEqual (1, col.Count, "#B1");
+			Assert.AreEqual (-1, col.IndexOf ("Item1"), "#B2");
+			Assert.AreEqual (0, col.IndexOf ("Item2"), "#B3");
+			col.Remove ("Item3");
+			Assert.AreEqual (1, col.Count, "#C1");
+			Assert.AreEqual (-1, col.IndexOf ("Item1"), "#C2");
+			Assert.AreEqual (0, col.IndexOf ("Item2"), "#C3");
+			col.Remove ("Item2");
+			Assert.AreEqual (0, col.Count, "#D1");
+			Assert.AreEqual (-1, col.IndexOf ("Item1"), "#D2");
+			Assert.AreEqual (-1, col.IndexOf ("Item2"), "#D3");
 		}
 
 		[Test]
-		public void RemoveAtTest ()
+		public void RemoveAt ()
 		{
 			col.Add ("Item1");
 			col.Add ("Item2");
 			col.RemoveAt (0);
-			Assert.AreEqual (1, col.Count, "#H1");
-			Assert.AreEqual (true, col.Contains ("Item2"), "#H1");
+			Assert.AreEqual (1, col.Count, "#1");
+			Assert.AreEqual (-1, col.IndexOf ("Item1"), "#2");
+			Assert.AreEqual (0, col.IndexOf ("Item2"), "#3");
+		}
+	}
+
+#if NET_2_0
+	[TestFixture]
+	public class ListBoxIntegerCollectionTest : TestHelper
+	{
+		ListBox.IntegerCollection col;
+		ListBox listBox;
+
+		[SetUp]
+		protected override void SetUp ()
+		{
+			listBox = new ListBox ();
+			col = new ListBox.IntegerCollection (listBox);
 		}
 
 		[Test]
-		[ExpectedException (typeof (ArgumentNullException))]
-		public void IndexerNullTest ()
+		public void Add ()
 		{
-			col.Add ("Item1");
-			col [0] = null;
+			col.Add (5);
+			Assert.AreEqual (1, col.Count, "#1");
+			col.Add (7);
+			Assert.AreEqual (2, col.Count, "#2");
+			col.Add (5);
+			Assert.AreEqual (2, col.Count, "#3");
+			col.Add (3);
+			Assert.AreEqual (3, col.Count, "#4");
+		}
+
+		[Test] // AddRange (Int32 [])
+		public void AddRange1 ()
+		{
+			col.Add (5);
+			col.Add (3);
+			col.AddRange (new int [] { 3, 7, 9, 5, 4 });
+			Assert.AreEqual (5, col.Count, "#1");
+			Assert.AreEqual (3, col [0], "#2");
+			Assert.AreEqual (4, col [1], "#3");
+			Assert.AreEqual (5, col [2], "#4");
+			Assert.AreEqual (7, col [3], "#5");
+			Assert.AreEqual (9, col [4], "#6");
+		}
+
+		[Test] // AddRange (Int32 [])
+		public void AddRange1_Items_Null ()
+		{
+			try {
+				col.AddRange ((int []) null);
+				Assert.Fail ("#1");
+			} catch (ArgumentNullException ex) {
+				Assert.AreEqual (typeof (ArgumentNullException), ex.GetType (), "#2");
+				Assert.IsNull (ex.InnerException, "#3");
+				Assert.IsNotNull (ex.Message, "#4");
+				Assert.AreEqual ("items", ex.ParamName, "#5");
+			}
+		}
+
+		[Test] // AddRange (ListBox.IntegerCollection)
+		public void AddRange2 ()
+		{
+			ListBox.IntegerCollection ints = new ListBox.IntegerCollection (
+				listBox);
+			ints.Add (3);
+			ints.Add (1);
+			ints.Add (-5);
+			ints.Add (4);
+			ints.Add (2);
+
+			col.Add (5);
+			col.Add (3);
+			col.Add (12);
+			col.AddRange (ints);
+
+			Assert.AreEqual (7, col.Count, "#1");
+			Assert.AreEqual (-5, col [0], "#2");
+			Assert.AreEqual (1, col [1], "#3");
+			Assert.AreEqual (2, col [2], "#4");
+			Assert.AreEqual (3, col [3], "#5");
+			Assert.AreEqual (4, col [4], "#6");
+			Assert.AreEqual (5, col [5], "#7");
+		}
+
+		[Test] // AddRange (ListBox.IntegerCollection)
+		public void AddRange2_Items_Null ()
+		{
+			try {
+				col.AddRange ((ListBox.IntegerCollection) null);
+				Assert.Fail ("#1");
+			} catch (ArgumentNullException ex) {
+				Assert.AreEqual (typeof (ArgumentNullException), ex.GetType (), "#2");
+				Assert.IsNull (ex.InnerException, "#3");
+				Assert.IsNotNull (ex.Message, "#4");
+				Assert.AreEqual ("items", ex.ParamName, "#5");
+			}
+		}
+
+		[Test]
+		[NUnit.Framework.Category ("NotDotNet")] // https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=363278
+		public void Clear ()
+		{
+			col.Add (5);
+			col.Add (3);
+			col.Clear ();
+
+			Assert.AreEqual (0, col.Count, "#1");
+			Assert.AreEqual (-1, col.IndexOf (5), "#2");
+			Assert.AreEqual (-1, col.IndexOf (3), "#3");
+		}
+
+		[Test]
+		public void Contains ()
+		{
+			col.Add (5);
+			col.Add (7);
+			Assert.IsTrue (col.Contains (5), "#1");
+			Assert.IsFalse (col.Contains (3), "#2");
+			Assert.IsTrue (col.Contains (7), "#3");
+			Assert.IsFalse (col.Contains (-5), "#4");
+		}
+
+		[Test]
+		public void CopyTo ()
+		{
+			int [] copy = new int [5] { 9, 4, 6, 2, 8 };
+			
+			col.Add (3);
+			col.Add (7);
+			col.Add (5);
+			col.CopyTo (copy, 1);
+
+			Assert.AreEqual (9, copy [0], "#1");
+			Assert.AreEqual (3, copy [1], "#2");
+			Assert.AreEqual (5, copy [2], "#3");
+			Assert.AreEqual (7, copy [3], "#4");
+			Assert.AreEqual (8, copy [4], "#5");
+		}
+
+		[Test]
+		public void CopyTo_Destination_Invalid ()
+		{
+			string [] copy = new string [3] { "A", "B", "C" };
+
+			col.CopyTo (copy, 1);
+			col.Add (3);
+
+			try {
+				col.CopyTo (copy, 1);
+				Assert.Fail ("#1");
+			} catch (InvalidCastException) {
+			}
+		}
+
+		[Test]
+		public void CopyTo_Destination_Null ()
+		{
+			col.CopyTo ((Array) null, 1);
+			col.Add (3);
+
+			try {
+				col.CopyTo ((Array) null, 1);
+				Assert.Fail ("#1");
+			} catch (NullReferenceException) {
+			}
+		}
+
+		[Test]
+		public void CopyTo_Index_Negative ()
+		{
+			int [] copy = new int [5] { 9, 4, 6, 2, 8 };
+
+			col.CopyTo (copy, -5);
+			col.Add (3);
+
+			try {
+				col.CopyTo (copy, -5);
+				Assert.Fail ("#1");
+			} catch (IndexOutOfRangeException ex) {
+				// Index was outside the bounds of the array
+				Assert.AreEqual (typeof (IndexOutOfRangeException), ex.GetType (), "#2");
+				Assert.IsNull (ex.InnerException, "#3");
+				Assert.IsNotNull (ex.Message, "#4");
+			}
+		}
+
+		[Test]
+		public void Count ()
+		{
+			Assert.AreEqual (0, col.Count, "#1");
+			col.Add (5);
+			Assert.AreEqual (1, col.Count, "#2");
+			col.Add (7);
+			Assert.AreEqual (2, col.Count, "#3");
+			col.Remove (7);
+			Assert.AreEqual (1, col.Count, "#4");
+		}
+
+		[Test]
+		public void Indexer ()
+		{
+			col.Add (5);
+			col.Add (7);
+			Assert.AreEqual (7, col [1], "#1");
+			Assert.AreEqual (5, col [0], "#2");
+			col [0] = 3;
+			Assert.AreEqual (7, col [1], "#3");
+			Assert.AreEqual (3, col [0], "#4");
+		}
+
+		[Test]
+		public void IndexOf ()
+		{
+			col.Add (5);
+			col.Add (7);
+			Assert.AreEqual (0, col.IndexOf (5), "#1");
+			Assert.AreEqual (-1, col.IndexOf (3), "#2");
+			Assert.AreEqual (1, col.IndexOf (7), "#3");
+			Assert.AreEqual (-1, col.IndexOf (-5), "#4");
+		}
+
+		[Test]
+		public void Remove ()
+		{
+			col.Add (5);
+			col.Add (3);
+			col.Remove (5);
+			col.Remove (7);
+
+			Assert.AreEqual (1, col.Count, "#1");
+			Assert.AreEqual (3, col [0], "#2");
+			col.Remove (3);
+			Assert.AreEqual (0, col.Count, "#3");
+			col.Remove (3);
+			// https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=363280
+			//Assert.AreEqual (0, col.Count, "#4");
+		}
+
+		[Test]
+		public void RemoveAt ()
+		{
+			col.Add (5);
+			col.Add (3);
+			col.Add (7);
+			col.RemoveAt (1);
+			Assert.AreEqual (2, col.Count, "#A1");
+			Assert.AreEqual (3, col [0], "#A2");
+			Assert.AreEqual (7, col [1], "#A3");
+			col.RemoveAt (0);
+			Assert.AreEqual (1, col.Count, "#B1");
+			Assert.AreEqual (7, col [0], "#B2");
+			col.RemoveAt (0);
+			Assert.AreEqual (0, col.Count, "#C1");
+			Assert.AreEqual (-1, col.IndexOf (5), "#C2");
+			Assert.AreEqual (-1, col.IndexOf (3), "#C3");
+			// https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=363280
+			//Assert.AreEqual (-1, col.IndexOf (7), "#C4");
+		}
+
+		[Test]
+		[NUnit.Framework.Category ("NotDotNet")] // https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=363276
+		public void RemoveAt_Index_Negative ()
+		{
+			col.Add (5);
+
+			try {
+				col.RemoveAt (-1);
+				Assert.Fail ("#1");
+			} catch (IndexOutOfRangeException ex) {
+				// Index was outside the bounds of the array
+				Assert.AreEqual (typeof (IndexOutOfRangeException), ex.GetType (), "#2");
+				Assert.IsNull (ex.InnerException, "#3");
+				Assert.IsNotNull (ex.Message, "#4");
+			}
+
+			Assert.AreEqual (1, col.Count, "#5");
+		}
+
+		[Test]
+		[NUnit.Framework.Category ("NotDotNet")] // https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=363276
+		public void RemoveAt_Index_Overflow ()
+		{
+			col.Add (5);
+
+			try {
+				col.RemoveAt (1);
+				Assert.Fail ("#1");
+			} catch (ArgumentOutOfRangeException ex) {
+				// Index was outside the bounds of the array
+				Assert.AreEqual (typeof (ArgumentOutOfRangeException), ex.GetType (), "#2");
+				Assert.IsNull (ex.InnerException, "#3");
+				Assert.IsNotNull (ex.Message, "#4");
+				Assert.AreEqual ("index", ex.ParamName, "#5");
+			}
+
+			Assert.AreEqual (1, col.Count, "#6");
+		}
+
+		[Test]
+		public void ICollection_IsSynchronized ()
+		{
+			ICollection collection = (ICollection) col;
+			Assert.IsTrue (collection.IsSynchronized);
+		}
+
+		[Test]
+		public void ICollection_SyncRoot ()
+		{
+			ICollection collection = (ICollection) col;
+			Assert.AreSame (collection, collection.SyncRoot);
+		}
+
+		[Test]
+		public void IList_Add ()
+		{
+			IList list = (IList) col;
+			list.Add (5);
+			Assert.AreEqual (1, list.Count, "#1");
+			list.Add (7);
+			Assert.AreEqual (2, list.Count, "#2");
+			list.Add (5);
+			Assert.AreEqual (2, list.Count, "#3");
+			list.Add (3);
+			Assert.AreEqual (3, list.Count, "#4");
+		}
+
+		[Test]
+		public void IList_Add_Item_Invalid ()
+		{
+			IList list = (IList) col;
+
+			try {
+				list.Add (null);
+				Assert.Fail ("#A1");
+			} catch (ArgumentException ex) {
+				Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#A2");
+				Assert.IsNull (ex.InnerException, "#A3");
+				Assert.AreEqual ("item", ex.Message, "#A4");
+				Assert.IsNull (ex.ParamName, "#A5");
+			}
+
+			try {
+				list.Add ("x");
+				Assert.Fail ("#B1");
+			} catch (ArgumentException ex) {
+				Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#B2");
+				Assert.IsNull (ex.InnerException, "#B3");
+				Assert.AreEqual ("item", ex.Message, "#B4");
+				Assert.IsNull (ex.ParamName, "#B5");
+			}
+		}
+
+		[Test]
+		public void IList_Clear ()
+		{
+			IList list = (IList) col;
+			list.Add (5);
+			list.Add (7);
+			list.Clear ();
+			Assert.AreEqual (0, list.Count);
+		}
+
+		[Test]
+		public void IList_Contains ()
+		{
+			IList list = (IList) col;
+			list.Add (5);
+			list.Add (7);
+			Assert.IsTrue (list.Contains (5), "#1");
+			Assert.IsFalse (list.Contains (3), "#2");
+			Assert.IsTrue (list.Contains (7), "#3");
+			Assert.IsFalse (list.Contains (null), "#4");
+			Assert.IsFalse (list.Contains ("x"), "#5");
+		}
+
+		[Test]
+		public void IList_Indexer ()
+		{
+			IList list = (IList) col;
+			list.Add (5);
+			list.Add (7);
+			Assert.AreEqual (7, list [1], "#1");
+			Assert.AreEqual (5, list [0], "#2");
+			list [0] = 3;
+			Assert.AreEqual (7, list [1], "#3");
+			Assert.AreEqual (3, list [0], "#4");
+		}
+
+		[Test]
+		public void IList_IndexOf ()
+		{
+			IList list = (IList) col;
+			list.Add (5);
+			list.Add (7);
+			Assert.AreEqual (0, list.IndexOf (5), "#1");
+			Assert.AreEqual (-1, list.IndexOf (3), "#2");
+			Assert.AreEqual (1, list.IndexOf (7), "#3");
+			Assert.AreEqual (-1, list.IndexOf (null), "#4");
+			Assert.AreEqual (-1, list.IndexOf ("x"), "#5");
+		}
+
+		[Test]
+		public void IList_Insert ()
+		{
+			IList list = (IList) col;
+			list.Add (5);
+
+			try {
+				list.Insert (0, 7);
+				Assert.Fail ("#A1");
+			} catch (NotSupportedException ex) {
+				// ListBox.IntegerCollection is sorted, and
+				// items cannot be inserted into it
+				Assert.AreEqual (typeof (NotSupportedException), ex.GetType (), "#A2");
+				Assert.IsNull (ex.InnerException, "#A3");
+				Assert.IsNotNull (ex.Message, "#A4");
+			}
+
+			try {
+				list.Insert (-5, null);
+				Assert.Fail ("#B1");
+			} catch (NotSupportedException ex) {
+				// ListBox.IntegerCollection is sorted, and
+				// items cannot be inserted into it
+				Assert.AreEqual (typeof (NotSupportedException), ex.GetType (), "#B2");
+				Assert.IsNull (ex.InnerException, "#B3");
+				Assert.IsNotNull (ex.Message, "#B4");
+			}
+		}
+
+		[Test]
+		public void IList_IsFixedSize ()
+		{
+			IList list = (IList) col;
+			Assert.IsFalse (list.IsFixedSize);
+		}
+
+		[Test]
+		public void IList_IsReadOnly ()
+		{
+			IList list = (IList) col;
+			Assert.IsFalse (list.IsReadOnly);
+		}
+
+		[Test]
+		public void IList_Remove ()
+		{
+			IList list = (IList) col;
+			list.Add (5);
+			list.Add (3);
+			list.Remove (5);
+			list.Remove (7);
+			list.Remove (int.MinValue);
+			list.Remove (int.MaxValue);
+
+			Assert.AreEqual (1, list.Count, "#1");
+			Assert.AreEqual (3, list [0], "#2");
+			list.Remove (3);
+			Assert.AreEqual (0, list.Count, "#3");
+		}
+
+		[Test]
+		public void IList_Remove_Value_Invalid ()
+		{
+			IList list = (IList) col;
+			list.Add (5);
+
+			try {
+				list.Remove ("x");
+				Assert.Fail ("#A1");
+			} catch (ArgumentException ex) {
+				Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#A2");
+				Assert.IsNull (ex.InnerException, "#A3");
+				Assert.AreEqual ("value", ex.Message, "#A4");
+				Assert.IsNull (ex.ParamName, "#A5");
+			}
+
+			try {
+				list.Remove (null);
+				Assert.Fail ("#B1");
+			} catch (ArgumentException ex) {
+				Assert.AreEqual (typeof (ArgumentException), ex.GetType (), "#B2");
+				Assert.IsNull (ex.InnerException, "#B3");
+				Assert.AreEqual ("value", ex.Message, "#B4");
+				Assert.IsNull (ex.ParamName, "#B5");
+			}
 		}
 
 		[Test]
-		[ExpectedException (typeof (ArgumentNullException))]
-		public void AddNullTest ()
+		public void IList_RemoveAt ()
 		{
-			col.Add (null);
+			IList list = (IList) col;
+			list.Add (5);
+			list.Add (3);
+			list.Add (7);
+			list.RemoveAt (1);
+			Assert.AreEqual (2, list.Count, "#A1");
+			Assert.AreEqual (3, list [0], "#A2");
+			Assert.AreEqual (7, list [1], "#A3");
+			list.RemoveAt (0);
+			Assert.AreEqual (1, list.Count, "#B1");
+			Assert.AreEqual (7, list [0], "#B2");
+			list.RemoveAt (0);
+			Assert.AreEqual (0, list.Count, "#C");
 		}
 
+		[Test]
+		public void IList_RemoveAt_Index_Negative ()
+		{
+			IList list = (IList) col;
+			list.Add (5);
+
+			try {
+				list.RemoveAt (-1);
+				Assert.Fail ("#1");
+			} catch (IndexOutOfRangeException ex) {
+				// Index was outside the bounds of the array
+				Assert.AreEqual (typeof (IndexOutOfRangeException), ex.GetType (), "#2");
+				Assert.IsNull (ex.InnerException, "#3");
+				Assert.IsNotNull (ex.Message, "#4");
+			}
+
+			// // https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=363276
+			//Assert.AreEqual (1, list.Count, "#5");
+		}
 
+		[Test]
+		[NUnit.Framework.Category ("NotDotNet")] // https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=363276
+		public void IList_RemoveAt_Index_Overflow ()
+		{
+			IList list = (IList) col;
+			list.Add (5);
+
+			try {
+				list.RemoveAt (1);
+				Assert.Fail ("#1");
+			} catch (ArgumentOutOfRangeException ex) {
+				// Index was outside the bounds of the array
+				Assert.AreEqual (typeof (ArgumentOutOfRangeException), ex.GetType (), "#2");
+				Assert.IsNull (ex.InnerException, "#3");
+				Assert.IsNotNull (ex.Message, "#4");
+				Assert.AreEqual ("index", ex.ParamName, "#5");
+			}
+
+			Assert.AreEqual (1, list.Count, "#6");
+		}
 	}
+#endif
 }