Author: gert
Date: 2007-01-12 16:23:27 -0500 (Fri, 12 Jan 2007)
New Revision: 70937
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FocusTest.cs
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FormTest.cs
Log:
* FocusTest.cs: Ignore tests that rely on Form.Show () synchronously
generating WM_ACTIVATE on unix.
* FormTest.cs: Same.
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-12 19:30:42 UTC (rev 70936)
+++ trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
2007-01-12 21:23:27 UTC (rev 70937)
@@ -1,3 +1,9 @@
+2007-01-12 Gert Driesen <[EMAIL PROTECTED]>
+
+ * FocusTest.cs: Ignore tests that rely on Form.Show () synchronously
+ generating WM_ACTIVATE on unix.
+ * FormTest.cs: Same.
+
2007-01-10 Chris Toshok <[EMAIL PROTECTED]>
* FocusTest.cs: Disable a couple of tests that rely on the
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FocusTest.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FocusTest.cs
2007-01-12 19:30:42 UTC (rev 70936)
+++
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FocusTest.cs
2007-01-12 21:23:27 UTC (rev 70937)
@@ -97,9 +97,12 @@
}
[Test]
- [Category ("NotWorking")] // this relies on the fact that
form.Show synchronously generated WM_ACTIVATE on ms .net
public void ControlSelectNextFlatTest ()
{
+ if (RunningOnUnix) {
+ Assert.Ignore ("Relies on form.Show()
synchronously generating WM_ACTIVATE");
+ }
+
Form form = new Form ();
form.ShowInTaskbar = false;
@@ -819,9 +822,12 @@
}
[Test]
- [Category ("NotWorking")] // relies on form.Show()
synchronously generating WM_ACTIVATE
public void ActiveControl ()
{
+ if (RunningOnUnix) {
+ Assert.Ignore ("Relies on form.Show()
synchronously generating WM_ACTIVATE");
+ }
+
Form form = new Form ();
form.ShowInTaskbar = false;
@@ -1183,7 +1189,14 @@
form.Dispose ();
}
+
+ private bool RunningOnUnix {
+ get {
+ // check for Unix platforms - see FAQ for more
details
+ //
http://www.mono-project.com/FAQ:_Technical#How_to_detect_the_execution_platform_.3F
+ int platform = (int)
Environment.OSVersion.Platform;
+ return ((platform == 4) || (platform == 128));
+ }
+ }
}
-
}
-
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FormTest.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FormTest.cs
2007-01-12 19:30:42 UTC (rev 70936)
+++ trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FormTest.cs
2007-01-12 21:23:27 UTC (rev 70937)
@@ -495,9 +495,12 @@
}
[Test]
- [NUnit.Framework.CategoryAttribute ("NotWorking")] // works on
windows but not mono+linux, since f.Show() is async there.
public void OnActivateEventHandlingTest1 ()
{
+ if (RunningOnUnix) {
+ Assert.Ignore ("Relies on form.Show()
synchronously generating WM_ACTIVATE");
+ }
+
SwallowOnActivated f = new SwallowOnActivated ();
f.ShowInTaskbar = false;
@@ -545,5 +548,14 @@
Assert.AreEqual ("Closing;FormClosing
[Reason:UserClosing - Cancel:True]", events, "A1");
}
#endif
+
+ private bool RunningOnUnix {
+ get {
+ // check for Unix platforms - see FAQ for more
details
+ //
http://www.mono-project.com/FAQ:_Technical#How_to_detect_the_execution_platform_.3F
+ int platform = (int)
Environment.OSVersion.Platform;
+ return ((platform == 4) || (platform == 128));
+ }
+ }
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
