Author: jpobst
Date: 2008-02-08 16:46:07 -0500 (Fri, 08 Feb 2008)
New Revision: 95305
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ComboBoxTest.cs
Log:
2008-02-08 Jonathan Pobst <[EMAIL PROTECTED]>
* ComboBoxTest.cs: MethodScaleControl needs to take Font into
account, which PreferredHeight does. Fixes a failing test.
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
2008-02-08 21:40:14 UTC (rev 95304)
+++ trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
2008-02-08 21:46:07 UTC (rev 95305)
@@ -1,3 +1,8 @@
+2008-02-08 Jonathan Pobst <[EMAIL PROTECTED]>
+
+ * ComboBoxTest.cs: MethodScaleControl needs to take Font into
+ account, which PreferredHeight does. Fixes a failing test.
+
2008_02-08 Carlos Alberto Cortez <[EMAIL PROTECTED]>
* ListControl.cs: Add setter and events for MockItem members -
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ComboBoxTest.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ComboBoxTest.cs
2008-02-08 21:40:14 UTC (rev 95304)
+++
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ComboBoxTest.cs
2008-02-08 21:46:07 UTC (rev 95305)
@@ -1252,22 +1252,22 @@
Assert.AreEqual (new Rectangle (5, 10, 121, 21),
gb.Bounds, "A1");
gb.PublicScaleControl (new SizeF (2.0f, 2.0f),
BoundsSpecified.All);
- Assert.AreEqual (new Rectangle (10, 20, 238, 21),
gb.Bounds, "A2");
+ Assert.AreEqual (new Rectangle (10, 20, 238,
gb.PreferredHeight), gb.Bounds, "A2");
gb.PublicScaleControl (new SizeF (.5f, .5f),
BoundsSpecified.Location);
- Assert.AreEqual (new Rectangle (5, 10, 238, 21),
gb.Bounds, "A3");
+ Assert.AreEqual (new Rectangle (5, 10, 238,
gb.PreferredHeight), gb.Bounds, "A3");
gb.PublicScaleControl (new SizeF (.5f, .5f),
BoundsSpecified.Size);
- Assert.AreEqual (new Rectangle (5, 10, 121, 21),
gb.Bounds, "A4");
- Console.WriteLine ("DONE");
+ Assert.AreEqual (new Rectangle (5, 10, 121,
gb.PreferredHeight), gb.Bounds, "A4");
+
gb.PublicScaleControl (new SizeF (3.5f, 3.5f),
BoundsSpecified.Size);
- Assert.AreEqual (new Rectangle (5, 10, 414, 21),
gb.Bounds, "A5");
+ Assert.AreEqual (new Rectangle (5, 10, 414,
gb.PreferredHeight), gb.Bounds, "A5");
gb.PublicScaleControl (new SizeF (2.5f, 2.5f),
BoundsSpecified.Size);
- Assert.AreEqual (new Rectangle (5, 10, 1029, 21),
gb.Bounds, "A6");
+ Assert.AreEqual (new Rectangle (5, 10, 1029,
gb.PreferredHeight), gb.Bounds, "A6");
gb.PublicScaleControl (new SizeF (.2f, .2f),
BoundsSpecified.Size);
- Assert.AreEqual (new Rectangle (5, 10, 209, 21),
gb.Bounds, "A7");
+ Assert.AreEqual (new Rectangle (5, 10, 209,
gb.PreferredHeight), gb.Bounds, "A7");
f.Dispose ();
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
