X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FManaged.Windows.Forms%2FTest%2FSystem.Windows.Forms%2FToolStripItemCollectionTest.cs;h=c7960d379df4638f99a2512af7f3285d647d5dc9;hb=813cb34f37f9dd34d7acc9a0e53939dba0f5d94d;hp=251499dbcfe74f3b868de70bb2654692a13bd22e;hpb=dab734b85ce2fa508eb9ff7db4047378635eecee;p=mono.git

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ToolStripItemCollectionTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ToolStripItemCollectionTest.cs
index 251499dbcfe..c7960d379df 100644
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ToolStripItemCollectionTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ToolStripItemCollectionTest.cs
@@ -36,7 +36,6 @@ using NUnit.Framework;
 namespace MonoTests.System.Windows.Forms
 {
 	[TestFixture]
-	[Category ("NotWorking")]
 	public class ToolStripItemCollectionTests
 	{
 		private List<ToolStripItem> itemsAdded;
@@ -101,6 +100,13 @@ namespace MonoTests.System.Windows.Forms
 			}
 		}
 
+		[Test]
+		[ExpectedException (typeof (ArgumentNullException))]
+		public void ConstructorANE ()
+		{
+			new ToolStripItemCollection (new ToolStrip (), (ToolStripItem[])null);
+		}
+		
 		[Test]
 		public void Constructor_Items_Null ()
 		{
@@ -149,6 +155,41 @@ namespace MonoTests.System.Windows.Forms
 			Assert.IsNull (buttonC.ParentToolStrip, "#C7");
 		}
 
+		[Test]
+		public void Insert_Owned_CreateControl ()
+		{
+			ToolStrip toolStrip = CreateToolStrip ();
+			toolStrip.CreateControl ();
+			ToolStripItemCollection items = toolStrip.Items;
+
+			MockToolStripButton buttonA = new MockToolStripButton ("A");
+			items.Insert (0, buttonA);
+			Assert.AreEqual (1, items.Count, "#A1");
+			Assert.AreEqual (1, itemsAdded.Count, "#A2");
+			Assert.AreSame (buttonA, items[0], "#A3");
+			Assert.AreSame (toolStrip, buttonA.Owner, "#A4");
+			Assert.IsNotNull (buttonA.ParentToolStrip, "#A5");
+
+			MockToolStripButton buttonB = new MockToolStripButton ("B");
+			items.Insert (0, buttonB);
+			Assert.AreEqual (2, items.Count, "#B1");
+			Assert.AreEqual (2, itemsAdded.Count, "#B2");
+			Assert.AreSame (buttonB, items[0], "#B3");
+			Assert.AreSame (buttonA, items[1], "#B4");
+			Assert.AreSame (toolStrip, buttonB.Owner, "#B5");
+			Assert.IsNotNull (buttonB.ParentToolStrip, "#B6");
+
+			MockToolStripButton buttonC = new MockToolStripButton ("C");
+			items.Insert (1, buttonC);
+			Assert.AreEqual (3, items.Count, "#C1");
+			Assert.AreEqual (3, itemsAdded.Count, "#C2");
+			Assert.AreSame (buttonB, items[0], "#C3");
+			Assert.AreSame (buttonC, items[1], "#C4");
+			Assert.AreSame (buttonA, items[2], "#C5");
+			Assert.AreSame (toolStrip, buttonC.Owner, "#C6");
+			Assert.IsNotNull (buttonC.ParentToolStrip, "#C7");
+		}
+
 		[Test]
 		public void Insert_StandAlone ()
 		{