Просмотр исходного кода

* FormTest.cs: Improved test for bug #80604.

svn path=/trunk/mcs/; revision=72509
Gert Driesen 19 лет назад
Родитель
Сommit
c573ce28d3

+ 4 - 0
mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog

@@ -1,3 +1,7 @@
+2007-02-08  Gert Driesen  <[email protected]>
+
+	* FormTest.cs: Improved test for bug #80604.
+
 2007-02-08  Gert Driesen  <[email protected]>
 
 	* ControlTest.cs: Removed use of #pragma to allow tests to be built using

+ 15 - 1
mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FormTest.cs

@@ -248,9 +248,15 @@ namespace MonoTests.System.Windows.Forms
 		public void VisibleOnLoad ()
 		{
 			MockForm form = new MockForm ();
+			form.CloseOnLoad = true;
+			Application.Run (form);
+			Assert.IsTrue (form.VisibleOnLoad, "#1");
+			form.Dispose ();
+
+			form = new MockForm ();
 			form.ShowInTaskbar = false;
 			form.Show ();
-			Assert.IsTrue (form.VisibleOnLoad);
+			Assert.IsTrue (form.VisibleOnLoad, "#2");
 			form.Dispose ();
 		}
 
@@ -687,6 +693,11 @@ namespace MonoTests.System.Windows.Forms
 
 		private class MockForm : Form
 		{
+			public bool CloseOnLoad {
+				get { return _closeOnLoad; }
+				set { _closeOnLoad = value; }
+			}
+
 			public bool VisibleOnLoad {
 				get { return _visibleOnLoad; }
 			}
@@ -694,8 +705,11 @@ namespace MonoTests.System.Windows.Forms
 			protected override void OnLoad(EventArgs e) {
 				base.OnLoad(e);
 				_visibleOnLoad = Visible;
+				if (CloseOnLoad)
+					Close ();
 			}
 
+			private bool _closeOnLoad;
 			private bool _visibleOnLoad;
 		}
 	}