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

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

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MdiFormTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MdiFormTest.cs
index 6a70bf0a44bd9546686ac7685eb84c3cf016283c..eaa7d8973d06eb8115fd2fa6207614475cc42bb4 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MdiFormTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MdiFormTest.cs
@@ -149,10 +149,12 @@ namespace MonoTests.System.Windows.Forms
                                {
                                        Closed += new EventHandler (ChildForm_Closed);
                                        Closing += new CancelEventHandler (ChildForm_Closing);
+#if NET_2_0                                    
                                        FormClosed += new FormClosedEventHandler (ChildForm_FormClosed);
                                        FormClosing += new FormClosingEventHandler (ChildForm_FormClosing);
+#endif
                                }
-
+#if NET_2_0
                                void ChildForm_FormClosing (object sender, FormClosingEventArgs e)
                                {
                                        Assert.IsNotNull (MdiParent, "ChildForm_FormClosing");
@@ -162,7 +164,7 @@ namespace MonoTests.System.Windows.Forms
                                {
                                        Assert.IsNotNull (MdiParent, "ChildForm_FormClosed");
                                }
-
+#endif
                                void ChildForm_Closing (object sender, CancelEventArgs e)
                                {
                                        Assert.IsNotNull (MdiParent, "ChildForm_Closing");
@@ -209,7 +211,30 @@ namespace MonoTests.System.Windows.Forms
                                }
                        }
                }
+               [Test]
+               [Category ("NotWorking")]
+               public void StartLocationTest ()
+               {
+                       SetUp (false, false);
+
+                       child1.MdiParent = main;
+                       child2.MdiParent = main;
+
+                       child1.Visible = true;
+                       child2.Visible = true;
+
+                       main.Show ();
+
+                       Assert.AreEqual ("{X=0,Y=0}", child1.Location.ToString (), "#1");
+                       Assert.AreEqual (true, "{X=0,Y=0}" != child2.Location.ToString (), "#2");
+
+                       TearDown ();
+               }
                
+               /* These tests are all failing on WinXP with XP Theme. 
+                * offset seems to be 22,22 normally, and 22,29 with XP theme.
+                * Find a way to test this reliably.
+                * /
                [Category("NotWorking")]
                [Test]
                public void StartLocationTest1 ()
@@ -743,7 +768,7 @@ namespace MonoTests.System.Windows.Forms
 
                        TearDown ();
                }
-
+*/
                [Test]
                public void StartSizeTest1 ()
                {