2007-03-28 Igor Zelmanovich <igorz@mainsoft.com>

[mono.git] / mcs / class / Managed.Windows.Forms / Test / System.Windows.Forms / MenuItemTest.cs

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MenuItemTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MenuItemTest.cs
index 6c12e0b887c1152b1978eb5871ec681ab1afb018..3ff922a5cb7c390b50ad7fc0bc8f73ba98e1f3dc 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MenuItemTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MenuItemTest.cs
@@ -106,7 +106,6 @@ namespace MonoTests.System.Windows.Forms
                }
 
                [Test]
-               [Category ("NotWorking")]
                public void MenuItemMerge ()
                {
                        MenuItem item1 = new MenuItem ("File (0)");             // Position 0
@@ -258,5 +257,33 @@ namespace MonoTests.System.Windows.Forms
                        Assert.IsTrue (event_reached);
 #endif
                }
+
+               [Test]
+               public void OwnerDraw() 
+               {
+                       Form form = new Form();
+                       form.Menu = new MainMenu();
+                       form.Menu.MenuItems.Add(new NotOwnerDrawnMenuItem());
+                       form.Show();
+                       form.Close();
+               }
+
+               class NotOwnerDrawnMenuItem : MenuItem
+               {
+                       public NotOwnerDrawnMenuItem() 
+                       {
+                               Assert.IsFalse(OwnerDraw, "OwnerDraw");
+                       }
+
+                       protected override void OnMeasureItem(MeasureItemEventArgs e) 
+                       {
+                               Assert.Fail("OnMeasureItem");
+                       }
+
+                       protected override void OnDrawItem(DrawItemEventArgs e) 
+                       {
+                               Assert.Fail("OnDrawItem");
+                       }
+               }
        }
 }