2010-03-12 Jb Evain <jbevain@novell.com>

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

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FormTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FormTest.cs
index 6cfabfe238096c8f264fe90d790378a44783e5c8..de2e636a27d48202143bd8216e370724c3d6f4dd 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FormTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FormTest.cs
@@ -2086,9 +2086,9 @@ namespace MonoTests.System.Windows.Forms
                [Test]
                public void OnActivateEventHandlingTest1 ()
                {
-                       if (TestHelper.RunningOnUnix) {
-                               Assert.Ignore ("Relies on form.Show() synchronously generating WM_ACTIVATE");
-                       }
+//                     if (TestHelper.RunningOnUnix) {
+//                             Assert.Ignore ("Relies on form.Show() synchronously generating WM_ACTIVATE");
+//                     }
 
                        SwallowOnActivated f = new SwallowOnActivated ();
 
@@ -2308,6 +2308,39 @@ namespace MonoTests.System.Windows.Forms
                        Assert.AreEqual (new Size (292, 266), f.ClientSize, "A4");
                }
 #endif
+
+               [Test]  // bug #438866
+               public void MinMaxSize ()
+               {
+                       Form f = new Form ();
+                       
+                       f.MinimumSize = new Size (200, 200);
+                       f.MaximumSize = new Size (150, 150);
+
+                       Assert.AreEqual (new Size (150, 150), f.MinimumSize, "A1");
+                       Assert.AreEqual (new Size (150, 150), f.MaximumSize, "A2");
+                       
+                       f.MinimumSize = new Size (200, 200);
+
+                       Assert.AreEqual (new Size (200, 200), f.MinimumSize, "A3");
+                       Assert.AreEqual (new Size (200, 200), f.MaximumSize, "A4");
+                       
+                       f.Dispose ();
+               }
+
+               [Test]
+               public void MinSizeIssue ()
+               {
+                       Form f = new Form ();
+
+                       f.MinimumSize = new Size (100, 100);
+
+                       f.Show ();
+
+                       Assert.AreEqual (new Size (300, 300), f.Size, "A1");
+
+                       f.Dispose ();
+               }
                
                [Test]  // Bug #81582
                [Category ("NotWorking")]
@@ -2343,9 +2376,9 @@ namespace MonoTests.System.Windows.Forms
                [Test] // bug #339641
                public void ChildFocused ()
                {
-                       if (TestHelper.RunningOnUnix) {
-                               Assert.Ignore ("Relies on form.Show() synchronously generating WM_ACTIVATE");
-                       }
+//                     if (TestHelper.RunningOnUnix) {
+//                             Assert.Ignore ("Relies on form.Show() synchronously generating WM_ACTIVATE");
+//                     }
                        using (Form f = new TimeBombedForm ()) {
                                TreeView tv = new TreeView ();
                                EventLogger log = new EventLogger (tv);