2007-05-23 Everaldo Canuto <ecanuto@novell.com>

	* ContextMenuTest.cs: ContextMenu tests added.

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms_test.dll.sources b/mcs/class/Managed.Windows.Forms/System.Windows.Forms_test.dll.sources
index c9c3db7975631b61247667f672e5156e8199dc1b..046d9ec6459fd5c7726290c59119226bba645d4e 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms_test.dll.sources
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms_test.dll.sources
@@ -21,6 +21,7 @@ System.Windows.Forms/ComboBoxTests.cs
 System.Windows.Forms/Common.cs
 System.Windows.Forms/CommonDialogsTest.cs
 System.Windows.Forms/ContainerControlTest.cs
+System.Windows.Forms/ContextMenuTest.cs
 System.Windows.Forms/ControlBindingsCollectionTest.cs
 System.Windows.Forms/ControlBindingsConverterTest.cs
 System.Windows.Forms/ControlCollectionTest.cs

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
index 0dc8457b344ff01991e94510c8f37226bb0e963c..d2337b0732afd1cb900f866a6da1c097f1d5ba51 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-23  Everaldo Canuto  <ecanuto@novell.com>
+
+       * ContextMenuTest.cs: ContextMenu tests added.
+
 2007-05-23  Rolf Bjarne Kvinge <RKvinge@novell.com> 
 
        * ToolBarButtonTest.cs: Added test for Name.

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ContextMenuTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ContextMenuTest.cs
new file mode 100644 (file)
index 0000000..582d38f
--- /dev/null
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ContextMenuTest.cs
@@ -0,0 +1,35 @@
+//
+// ContextMenuTest.cs: Test cases for ContextMenu
+//
+// Author:
+//   Everaldo Canuto (ecanuto@novell.com)
+//
+// (C) 2005 Novell, Inc. (http://www.novell.com)
+//
+
+using System;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Reflection;
+using NUnit.Framework;
+
+namespace MonoTests.System.Windows.Forms
+{
+       [TestFixture]   
+       public class ContextMenuTest
+       {
+               [Test]
+               public void GetContextMenuTest ()
+               {
+                       Form myform = new Form ();
+                       myform.ShowInTaskbar = false;
+                       ContextMenu mycontextmenu = new ContextMenu ();
+                       myform.ContextMenu= mycontextmenu;
+                       MenuItem menuItem1 = new MenuItem ();
+                       menuItem1.Text = "1";
+                       mycontextmenu.MenuItems.Add (menuItem1);
+                       Assert.AreEqual (mycontextmenu, menuItem1.GetContextMenu (),"#1");
+                       myform.Dispose ();
+               }
+       }
+}

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MenuTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MenuTest.cs
index 78e422b180703c82dc2caaa5ad325670b424409c..8a27beae0b3f232a91425e06c60d331cb2f206f6 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MenuTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MenuTest.cs
@@ -86,20 +86,6 @@ namespace MonoTests.System.Windows.Forms
                        myform.Dispose ();
                }
                
-               [Test]
-               public void GetContextMenuTest ()
-               {
-                       Form myform = new Form ();
-                       myform.ShowInTaskbar = false;
-                       ContextMenu mycontextmenu = new ContextMenu ();
-                       myform.ContextMenu= mycontextmenu;
-                       MenuItem menuItem1 = new MenuItem ();
-                       menuItem1.Text = "1";
-                       mycontextmenu.MenuItems.Add (menuItem1);
-                       Assert.AreEqual (mycontextmenu, menuItem1.GetContextMenu (),"#11");
-                       myform.Dispose ();
-               }
-               
                [Test]
                public void MenuItemMerge ()
                {