Author: toshok
Date: 2006-11-04 16:53:06 -0500 (Sat, 04 Nov 2006)
New Revision: 67366
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FormTest.cs
Log:
clean this up a bit and enable some of the commented-out assertions
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
2006-11-04 21:48:28 UTC (rev 67365)
+++ trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FormTest.cs
2006-11-04 21:53:06 UTC (rev 67366)
@@ -26,14 +26,13 @@
myform.Visible = true;
myform.Text = "NewForm";
myform.Name = "FormTest";
- Assert.AreEqual (null, myform.AcceptButton, "#1");
- //Assert.AreEqual (null, myform.ActiveMdiChild, "#2");
- //System.NotImplementedException for ActiveMdiChild.
Feature not implemented.
- Assert.AreEqual (false, myform.AutoScale, "#3");
+ Assert.IsNull (myform.AcceptButton, "#1");
+ Assert.IsNull (myform.ActiveMdiChild, "#2");
+ Assert.IsFalse (myform.AutoScale, "#3");
Assert.AreEqual (13, myform.AutoScaleBaseSize.Height,
"#4");
Assert.AreEqual (5, myform.AutoScaleBaseSize.Width,
"#5");
- Assert.AreEqual (null, myform.CancelButton, "#6");
- Assert.AreEqual (true, myform.ControlBox, "#9");
+ Assert.IsNull (myform.CancelButton, "#6");
+ Assert.IsTrue (myform.ControlBox, "#9");
Assert.IsTrue (myform.DesktopBounds.X > 0, "#10a");
Assert.IsTrue (myform.DesktopBounds.Y > 0, "#10b");
Assert.AreEqual (300, myform.DesktopBounds.Height,
"#10c");
@@ -42,38 +41,36 @@
Assert.IsTrue (myform.DesktopLocation.Y > 0, "#11b");
Assert.AreEqual (DialogResult.None,
myform.DialogResult, "#12");
Assert.AreEqual (FormBorderStyle.Sizable,
myform.FormBorderStyle, "#13");
- Assert.AreEqual (false, myform.HelpButton, "#14");
+ Assert.IsFalse (myform.HelpButton, "#14");
Assert.AreEqual ("System.Drawing.Icon",
myform.Icon.GetType ().ToString (), "#15");
- Assert.AreEqual (false, myform.IsMdiChild, "#16");
- Assert.AreEqual (false, myform.IsMdiContainer, "#17");
- Assert.AreEqual (false, myform.KeyPreview, "#18");
- Assert.AreEqual (true, myform.MaximizeBox, "#19");
+ Assert.IsFalse (myform.IsMdiChild, "#16");
+ Assert.IsFalse (myform.IsMdiContainer, "#17");
+ Assert.IsFalse (myform.KeyPreview, "#18");
+ Assert.IsTrue (myform.MaximizeBox, "#19");
Assert.AreEqual (0, myform.MaximumSize.Height, "#20a");
Assert.AreEqual (0, myform.MaximumSize.Width, "#20b");
Assert.AreEqual (0, myform.MdiChildren.Length, "#21a");
Assert.AreEqual (1, myform.MdiChildren.Rank, "#21b");
- Assert.AreEqual (false,
myform.MdiChildren.IsSynchronized, "#21c");
- Assert.AreEqual (null, myform.MdiParent, "#22");
- Assert.AreEqual (null, myform.Menu, "#23");
- //Assert.AreEqual (null, myform.MergedMenu, "#24");
- //System.NotImplementedException for MergedMenu.
Feature not implemented.
- Assert.AreEqual (true, myform.MinimizeBox, "#25");
+ Assert.IsFalse (myform.MdiChildren.IsSynchronized,
"#21c");
+ Assert.IsNull (myform.MdiParent, "#22");
+ Assert.IsNull (myform.Menu, "#23");
+ Assert.IsNull (myform.MergedMenu, "#24");
+ Assert.IsTrue (myform.MinimizeBox, "#25");
Assert.AreEqual (0, myform.MinimumSize.Height, "#26a");
Assert.AreEqual (0, myform.MinimumSize.Width, "#26b");
- Assert.AreEqual (true, myform.MinimumSize.IsEmpty,
"#26c");
- Assert.AreEqual (false, myform.Modal, "#27");
- //Assert.AreEqual (1, myform.Opacity, "#28");
- //System.NotImplementedException for Opacity. Feature
not implemented.
+ Assert.IsTrue (myform.MinimumSize.IsEmpty, "#26c");
+ Assert.IsFalse (myform.Modal, "#27");
+ Assert.AreEqual (1, myform.Opacity, "#28");
Assert.AreEqual (0, myform.OwnedForms.Length, "#29a");
Assert.AreEqual (1, myform.OwnedForms.Rank, "#29b");
- Assert.AreEqual (null, myform.Owner, "#30");
- Assert.AreEqual (true, myform.ShowInTaskbar, "#31");
+ Assert.IsNull (myform.Owner, "#30");
+ Assert.IsTrue (myform.ShowInTaskbar, "#31");
Assert.AreEqual (300, myform.Size.Height, "#32a");
Assert.AreEqual (300, myform.Size.Width, "#32b");
Assert.AreEqual (SizeGripStyle.Auto,
myform.SizeGripStyle, "#33");
Assert.AreEqual
(FormStartPosition.WindowsDefaultLocation, myform.StartPosition, "#34");
- Assert.AreEqual (true, myform.TopLevel, "#35");
- Assert.AreEqual (false, myform.TopMost, "#36");
+ Assert.IsTrue (myform.TopLevel, "#35");
+ Assert.IsFalse (myform.TopMost, "#36");
Assert.AreEqual (Color.Empty, myform.TransparencyKey,
"#37");
Assert.AreEqual (FormWindowState.Normal,
myform.WindowState, "#38");
myform.Dispose ();
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
