Author: everaldo
Date: 2007-01-15 21:41:34 -0500 (Mon, 15 Jan 2007)
New Revision: 71104

Modified:
   trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MenuTest.cs
Log:
2007-01-15  Everaldo Canuto  <[EMAIL PROTECTED]>
        * MenuTest.cs: Add test for #80006, mainmenu merge operations.

2007-01-15  Everaldo Canuto  <[EMAIL PROTECTED]>



Modified: 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog   
2007-01-16 02:04:30 UTC (rev 71103)
+++ trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog   
2007-01-16 02:41:34 UTC (rev 71104)
@@ -1,5 +1,9 @@
-2006-12-04  Everaldo Canuto  <[EMAIL PROTECTED]>
+2007-01-15  Everaldo Canuto  <[EMAIL PROTECTED]>
 
+       * MenuTest.cs: Add test for #80006, mainmenu merge operations.
+
+2007-01-15  Everaldo Canuto  <[EMAIL PROTECTED]>
+
        * MenuItemTest.cs: Remove the "NotWorking" from MenuItemMerge test.
 
 2007-01-14  Carlos Alberto Cortez <[EMAIL PROTECTED]>

Modified: 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MenuTest.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MenuTest.cs 
2007-01-16 02:04:30 UTC (rev 71103)
+++ trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MenuTest.cs 
2007-01-16 02:41:34 UTC (rev 71104)
@@ -99,5 +99,43 @@
                        Assert.AreEqual (mycontextmenu, 
menuItem1.GetContextMenu (),"#11");
                        myform.Dispose ();
                }
+               
+               [Test]
+               public void MenuItemMerge ()
+               {
+                       MenuItem itemA2 = new MenuItem ("Exit");
+                       itemA2.MergeType = MenuMerge.MergeItems;
+                       itemA2.MergeOrder = 3;
+
+                       MenuItem itemA1 = new MenuItem ("File");
+                       itemA1.MenuItems.Add (itemA2);
+                       itemA1.MergeType = MenuMerge.MergeItems;
+
+                       MenuItem itemB2 = new MenuItem ("Open");
+                       itemB2.MergeOrder = 1;
+                       itemB2.MergeType = MenuMerge.Add;
+
+                       MenuItem itemB3 = new MenuItem ("Close");
+                       itemB3.MergeOrder = 2;
+                       itemB3.MergeType = MenuMerge.Add;
+
+                       MenuItem itemB1 = new MenuItem ("File");
+                       itemB1.MenuItems.Add (itemB2);
+                       itemB1.MenuItems.Add (itemB3);
+                       itemB1.MergeType = MenuMerge.MergeItems;
+
+                       MainMenu mainMenu1 = new MainMenu();
+                       mainMenu1.MenuItems.Add (itemA1);
+                       
+                       MainMenu mainMenu2 = new MainMenu();
+                       mainMenu2.MenuItems.Add (itemB1);
+                       
+                       mainMenu1.MergeMenu (mainMenu2);
+
+                       Assert.AreEqual ("File",  mainMenu1.MenuItems[0].Text,  
            "ItemMerge#1");
+                       Assert.AreEqual ("Open",  
mainMenu1.MenuItems[0].MenuItems[0].Text, "ItemMerge#2");
+                       Assert.AreEqual ("Close", 
mainMenu1.MenuItems[0].MenuItems[1].Text, "ItemMerge#3");
+                       Assert.AreEqual ("Exit",  
mainMenu1.MenuItems[0].MenuItems[2].Text, "ItemMerge#4");
+               }
        }
 }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to