Author: rolf
Date: 2007-04-02 13:23:51 -0400 (Mon, 02 Apr 2007)
New Revision: 75290
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/BindingTest.cs
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ContainerControlTest.cs
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FormTest.cs
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MdiFormHandleTest.cs
Log:
* ContainerControlTest.cs: Add RemoveActiveControlTest
* MdiFormHandleTest.cs, BindingTest.cs: Remove stacktrace from output.
* FormTest.cs: Add special window style cases.
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/BindingTest.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/BindingTest.cs
2007-04-02 17:11:03 UTC (rev 75289)
+++
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/BindingTest.cs
2007-04-02 17:23:51 UTC (rev 75290)
@@ -127,7 +127,7 @@
int eventcount;
public void Event_Handler1 (object sender, EventArgs e)
{
- Console.WriteLine (Environment.StackTrace);
+ //Console.WriteLine (Environment.StackTrace);
eventcount++;
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
2007-04-02 17:11:03 UTC (rev 75289)
+++ trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
2007-04-02 17:23:51 UTC (rev 75290)
@@ -1,3 +1,9 @@
+2007-04-02 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
+
+ * ContainerControlTest.cs: Add RemoveActiveControlTest
+ * MdiFormHandleTest.cs, BindingTest.cs: Remove stacktrace from output.
+ * FormTest.cs: Add special window style cases.
+
2007-03-31 Gert Driesen <[EMAIL PROTECTED]>
* RichTextBoxTest.cs: Added BackColor test. Improved ReadOnly tests.
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ContainerControlTest.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ContainerControlTest.cs
2007-04-02 17:11:03 UTC (rev 75289)
+++
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ContainerControlTest.cs
2007-04-02 17:23:51 UTC (rev 75290)
@@ -150,8 +150,19 @@
[TestFixture]
[SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)]
public class ContainerControlTest {
-
[Test]
+ public void RemoveActiveControlTest ()
+ {
+ ContainerControl cc = new ContainerControl();
+ TextBox txt = new TextBox ();
+ cc.Controls.Add (txt);
+ Assert.IsFalse (cc.ActiveControl == txt, "#01");
+ cc.ActiveControl = txt;
+ Assert.AreSame (cc.ActiveControl, txt, "#02");
+ cc.Controls.Remove (txt);
+ Assert.IsNull (cc.ActiveControl, "#03");
+ }
+ [Test]
public void GetContainerControl ()
{
ContainerControl cc = new ContainerControl ();
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-04-02 17:11:03 UTC (rev 75289)
+++ trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FormTest.cs
2007-04-02 17:23:51 UTC (rev 75290)
@@ -681,6 +681,13 @@
Assert.AreEqual (WindowStyles.WS_TILED |
WindowStyles.WS_TILEDWINDOW | WindowStyles.WS_CLIPCHILDREN,
((WindowStyles)TestHelper.GetCreateParams (frm).Style), "#27-Style");
Assert.AreEqual (WindowExStyles.WS_EX_LEFT |
WindowExStyles.WS_EX_RIGHTSCROLLBAR | WindowExStyles.WS_EX_CONTROLPARENT |
WindowExStyles.WS_EX_APPWINDOW, ((WindowExStyles)TestHelper.GetCreateParams
(frm).ExStyle), "#27-ExStyle");
}
+
+ using (frm = new Form ()) {
+ frm.ControlBox = false;
+ frm.Text = "";
+ Assert.AreEqual (WindowStyles.WS_TILED |
WindowStyles.WS_TABSTOP | WindowStyles.WS_GROUP | WindowStyles.WS_THICKFRAME |
WindowStyles.WS_BORDER | WindowStyles.WS_CLIPCHILDREN,
((WindowStyles)TestHelper.GetCreateParams (frm).Style), "#28-Style");
+ Assert.AreEqual (WindowExStyles.WS_EX_LEFT |
WindowExStyles.WS_EX_RIGHTSCROLLBAR | WindowExStyles.WS_EX_CONTROLPARENT |
WindowExStyles.WS_EX_APPWINDOW, ((WindowExStyles)TestHelper.GetCreateParams
(frm).ExStyle), "#28-ExStyle");
+ }
}
[Test]
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MdiFormHandleTest.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MdiFormHandleTest.cs
2007-04-02 17:11:03 UTC (rev 75289)
+++
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MdiFormHandleTest.cs
2007-04-02 17:23:51 UTC (rev 75290)
@@ -1142,7 +1142,7 @@
void HandleCreated_WriteStackTrace (object sender, EventArgs e)
{
- Console.WriteLine (Environment.StackTrace);
+ Console.WriteLine
("Stacktrace?");//Environment.StackTrace);
}
public delegate void InvokeDelegate ();
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches