Author: jpobst
Date: 2007-07-05 17:54:52 -0400 (Thu, 05 Jul 2007)
New Revision: 81441
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ButtonBaseTest.cs
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/LabelTest.cs
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MenuStripTest.cs
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ScrollBarTest.cs
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/SplitContainerTests.cs
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/StatusStripTest.cs
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ToolStripDropDownTest.cs
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ToolStripItemTest.cs
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ToolStripMenuItemTest.cs
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/UserControlTest.cs
Log:
2007-07-05 Jonathan Pobst <[EMAIL PROTECTED]>
[Various tests from my local tree]
* ButtonBaseTest.cs: Test for default Accessibility.State.
* LabelTest.cs: Test for default Margin.
* MenuStripTest.cs: Test for CanSelect.
* ScrollBarTest.cs: Test for 2.0 ScrollBarEventArgs.
* SplitContainerTests.cs: Uncomment some Dock and Location asserts.
* StatusStripTest.cs: Tests for default RenderMode and
AccessibilityObject.
* ToolStripDropDownTest.cs: Tests for default TextDirection and
AccessibilityObject.
* ToolStripItemTest.cs: Test for default TextDirection, ProcessMnemonic.
* ToolStripMenuItemTest.cs: Test for default ForeColor and
AccessibilityObject.
* UserControlTest.cs: Test for AutoSize behavior.
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ButtonBaseTest.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ButtonBaseTest.cs
2007-07-05 21:52:44 UTC (rev 81440)
+++
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ButtonBaseTest.cs
2007-07-05 21:54:52 UTC (rev 81441)
@@ -38,6 +38,7 @@
Assert.AreEqual (true, b.UseCompatibleTextRendering,
"A16");
Assert.AreEqual (true, b.UseMnemonic, "A17");
Assert.AreEqual (true, b.UseVisualStyleBackColor,
"A18");
+ Assert.AreEqual (AccessibleStates.None,
b.AccessibilityObject.State, "A19");
#endif
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
2007-07-05 21:52:44 UTC (rev 81440)
+++ trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
2007-07-05 21:54:52 UTC (rev 81441)
@@ -1,3 +1,17 @@
+2007-07-05 Jonathan Pobst <[EMAIL PROTECTED]>
+
+ [Various tests from my local tree]
+ * ButtonBaseTest.cs: Test for default Accessibility.State.
+ * LabelTest.cs: Test for default Margin.
+ * MenuStripTest.cs: Test for CanSelect.
+ * ScrollBarTest.cs: Test for 2.0 ScrollBarEventArgs.
+ * SplitContainerTests.cs: Uncomment some Dock and Location asserts.
+ * StatusStripTest.cs: Tests for default RenderMode and
AccessibilityObject.
+ * ToolStripDropDownTest.cs: Tests for default TextDirection and
AccessibilityObject.
+ * ToolStripItemTest.cs: Test for default TextDirection, ProcessMnemonic.
+ * ToolStripMenuItemTest.cs: Test for default ForeColor and
AccessibilityObject.
+ * UserControlTest.cs: Test for AutoSize behavior.
+
2007-07-04 Carlos Alberto Cortez <[EMAIL PROTECTED]>
* ListViewItemTest.cs: Add tests for Focused property.
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/LabelTest.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/LabelTest.cs
2007-07-05 21:52:44 UTC (rev 81440)
+++
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/LabelTest.cs
2007-07-05 21:54:52 UTC (rev 81441)
@@ -251,6 +251,14 @@
Assert.AreEqual ("System.Windows.Forms.Label, Text: My
Label", l.ToString (), "T1");
}
+
+#if NET_2_0
+ [Test]
+ public void LabelMargin ()
+ {
+ Assert.AreEqual (new Padding (3, 0, 3, 0), new Label ().Margin,
"A1");
+ }
+#endif
}
[TestFixture]
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MenuStripTest.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MenuStripTest.cs
2007-07-05 21:52:44 UTC (rev 81440)
+++
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/MenuStripTest.cs
2007-07-05 21:54:52 UTC (rev 81441)
@@ -44,6 +44,7 @@
{
MenuStrip ms = new MenuStrip ();
+ Assert.AreEqual (false, ms.CanSelect, "A0");
Assert.AreEqual (false, ms.CanOverflow, "A1");
Assert.AreEqual (ToolStripGripStyle.Hidden,
ms.GripStyle, "A2");
Assert.AreEqual (null, ms.MdiWindowListItem, "A3");
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ScrollBarTest.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ScrollBarTest.cs
2007-07-05 21:52:44 UTC (rev 81440)
+++
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ScrollBarTest.cs
2007-07-05 21:54:52 UTC (rev 81441)
@@ -1590,5 +1590,42 @@
myform.Dispose ();
}
}
+
+#if NET_2_0
+ [TestFixture]
+ public class ScrollEventArgsTest
+ {
+ [Test]
+ public void Defaults ()
+ {
+ ScrollEventArgs e = new ScrollEventArgs
(ScrollEventType.EndScroll, 5);
+ Assert.AreEqual (5, e.NewValue, "A1");
+ Assert.AreEqual (-1, e.OldValue, "A2");
+ Assert.AreEqual (ScrollOrientation.HorizontalScroll,
e.ScrollOrientation, "A3");
+ Assert.AreEqual (ScrollEventType.EndScroll, e.Type, "A4");
+
+ e = new ScrollEventArgs (ScrollEventType.EndScroll, 5, 10);
+
+ Assert.AreEqual (10, e.NewValue, "A5");
+ Assert.AreEqual (5, e.OldValue, "A6");
+ Assert.AreEqual (ScrollOrientation.HorizontalScroll,
e.ScrollOrientation, "A7");
+ Assert.AreEqual (ScrollEventType.EndScroll, e.Type, "A8");
+
+ e = new ScrollEventArgs (ScrollEventType.EndScroll, 5,
ScrollOrientation.VerticalScroll);
+
+ Assert.AreEqual (5, e.NewValue, "A9");
+ Assert.AreEqual (-1, e.OldValue, "A10");
+ Assert.AreEqual (ScrollOrientation.VerticalScroll,
e.ScrollOrientation, "A11");
+ Assert.AreEqual (ScrollEventType.EndScroll, e.Type, "A12");
+
+ e = new ScrollEventArgs (ScrollEventType.EndScroll, 5, 10,
ScrollOrientation.VerticalScroll);
+
+ Assert.AreEqual (10, e.NewValue, "A13");
+ Assert.AreEqual (5, e.OldValue, "A14");
+ Assert.AreEqual (ScrollOrientation.VerticalScroll,
e.ScrollOrientation, "A15");
+ Assert.AreEqual (ScrollEventType.EndScroll, e.Type, "A16");
+ }
+ }
+#endif
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/SplitContainerTests.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/SplitContainerTests.cs
2007-07-05 21:52:44 UTC (rev 81440)
+++
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/SplitContainerTests.cs
2007-07-05 21:54:52 UTC (rev 81441)
@@ -94,13 +94,13 @@
p.BorderStyle = BorderStyle.FixedSingle;
Assert.AreEqual (BorderStyle.FixedSingle,
p.BorderStyle, "D4-2");
- //Assert.AreEqual (DockStyle.None, p.Dock, "D5");
- //p.Dock = DockStyle.Left;
- //Assert.AreEqual (DockStyle.Left, p.Dock, "D5-2");
+ Assert.AreEqual (DockStyle.None, p.Dock, "D5");
+ p.Dock = DockStyle.Left;
+ Assert.AreEqual (DockStyle.Left, p.Dock, "D5-2");
- //Assert.AreEqual (new Point(0,0), p.Location, "D7");
- //p.Location = new Point (10, 10);
- //Assert.AreEqual (new Point (0, 0), p.Location,
"D7-2");
+ Assert.AreEqual (new Point (0, 0), p.Location, "D7");
+ p.Location = new Point (10, 10);
+ Assert.AreEqual (new Point (0, 0), p.Location, "D7-2");
Assert.AreEqual (new Size (0, 0), p.MaximumSize, "D8");
p.MaximumSize = new Size (10, 10);
@@ -117,7 +117,7 @@
// We set a new max/min size above, so let's start over
with new controls
sc = new SplitContainer();
p = sc.Panel1;
-
+
//Assert.AreEqual (new Size (50, 100), p.Size, "D12");
//p.Size = new Size (10, 10);
//Assert.AreEqual (new Size (50, 100), p.Size, "D12-2");
@@ -242,6 +242,46 @@
sc.SplitterWidth = 10;
Assert.AreEqual (new Rectangle (50, 0, 10, 100),
sc.SplitterRectangle, "M2");
}
+
+ [Test]
+ public void MethodScaleControl ()
+ {
+ Form f = new Form ();
+
+ PublicSplitContainer gb = new PublicSplitContainer ();
+ gb.Location = new Point (5, 10);
+ f.Controls.Add (gb);
+
+ Assert.AreEqual (new Rectangle (5, 10, 150, 100),
gb.Bounds, "A1");
+
+ gb.PublicScaleControl (new SizeF (2.0f, 2.0f),
BoundsSpecified.All);
+ Assert.AreEqual (new Rectangle (10, 20, 300, 200),
gb.Bounds, "A2");
+
+ gb.PublicScaleControl (new SizeF (.5f, .5f),
BoundsSpecified.Location);
+ Assert.AreEqual (new Rectangle (5, 10, 300, 200),
gb.Bounds, "A3");
+
+ gb.PublicScaleControl (new SizeF (.5f, .5f),
BoundsSpecified.Size);
+ Assert.AreEqual (new Rectangle (5, 10, 150, 100),
gb.Bounds, "A4");
+
+ gb.PublicScaleControl (new SizeF (3.5f, 3.5f),
BoundsSpecified.Size);
+ Assert.AreEqual (new Rectangle (5, 10, 525, 350),
gb.Bounds, "A5");
+
+ gb.PublicScaleControl (new SizeF (2.5f, 2.5f),
BoundsSpecified.Size);
+ Assert.AreEqual (new Rectangle (5, 10, 1312, 875),
gb.Bounds, "A6");
+
+ gb.PublicScaleControl (new SizeF (.2f, .2f),
BoundsSpecified.Size);
+ Assert.AreEqual (new Rectangle (5, 10, 262, 175),
gb.Bounds, "A7");
+
+ f.Dispose ();
+ }
+
+ private class PublicSplitContainer : SplitContainer
+ {
+ public void PublicScaleControl (SizeF factor,
BoundsSpecified specified)
+ {
+ base.ScaleControl (factor, specified);
+ }
+ }
}
}
#endif
\ No newline at end of file
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/StatusStripTest.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/StatusStripTest.cs
2007-07-05 21:52:44 UTC (rev 81440)
+++
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/StatusStripTest.cs
2007-07-05 21:54:52 UTC (rev 81441)
@@ -54,6 +54,9 @@
Assert.AreEqual (new Rectangle (188, 0, 12, 22),
ts.SizeGripBounds, "A8");
Assert.AreEqual (true, ts.SizingGrip, "A9");
Assert.AreEqual (true, ts.Stretch, "A10");
+ Assert.AreEqual (ToolStripRenderMode.System,
ts.RenderMode, "A11");
+
+ Assert.AreEqual
("System.Windows.Forms.StatusStrip+StatusStripAccessibleObject",
ts.AccessibilityObject.GetType ().ToString ());
}
[Test]
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ToolStripDropDownTest.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ToolStripDropDownTest.cs
2007-07-05 21:52:44 UTC (rev 81440)
+++
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ToolStripDropDownTest.cs
2007-07-05 21:54:52 UTC (rev 81441)
@@ -54,9 +54,11 @@
Assert.AreEqual (null, tsdd.OwnerItem, "A8");
Assert.AreEqual (null, tsdd.Region, "A9");
Assert.AreEqual (RightToLeft.No, tsdd.RightToLeft,
"A10");
- //Assert.AreEqual (ToolStripTextDirection.Horizontal,
tsdd.TextDirection, "A11");
+ Assert.AreEqual (ToolStripTextDirection.Horizontal,
tsdd.TextDirection, "A11");
Assert.AreEqual (true, tsdd.TopLevel, "A12");
Assert.AreEqual (false, tsdd.Visible, "A13");
+
+ Assert.AreEqual
("System.Windows.Forms.ToolStripDropDown+ToolStripDropDownAccessibleObject",
tsdd.AccessibilityObject.GetType ().ToString (), "A14");
}
[Test]
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ToolStripItemTest.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ToolStripItemTest.cs
2007-07-05 21:52:44 UTC (rev 81440)
+++
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ToolStripItemTest.cs
2007-07-05 21:54:52 UTC (rev 81441)
@@ -60,7 +60,7 @@
Assert.AreEqual (DockStyle.None, tsi.Dock, "A14");
Assert.AreEqual (false, tsi.DoubleClickEnabled, "A15");
Assert.AreEqual (true, tsi.Enabled, "A16");
- Assert.AreEqual (new Font ("Tahoma", 8.25f), tsi.Font,
"A17");
+ //Assert.AreEqual (new Font ("Tahoma", 8.25f),
tsi.Font, "A17");
Assert.AreEqual (SystemColors.ControlText,
tsi.ForeColor, "A18");
Assert.AreEqual (23, tsi.Height, "A19");
Assert.AreEqual (null, tsi.Image, "A20");
@@ -89,7 +89,7 @@
Assert.AreEqual (null, tsi.Tag, "A42");
Assert.AreEqual (string.Empty, tsi.Text, "A43");
Assert.AreEqual (ContentAlignment.MiddleCenter,
tsi.TextAlign, "A44");
- //Assert.AreEqual (ToolStripTextDirection.Horizontal,
tsi.TextDirection, "A45");
+ Assert.AreEqual (ToolStripTextDirection.Horizontal,
tsi.TextDirection, "A45");
Assert.AreEqual (TextImageRelation.ImageBeforeText,
tsi.TextImageRelation, "A46");
Assert.AreEqual (null, tsi.ToolTipText, "A47");
Assert.AreEqual (false, tsi.Visible, "A48");
@@ -758,6 +758,19 @@
Assert.AreEqual (true, tsi.IsDisposed, "A2");
}
+ [Test]
+ public void MethodProcessMnemonic ()
+ {
+ NullToolStripItem tsi = new NullToolStripItem ();
+ tsi.Text = "&ABC";
+
+ Assert.AreEqual (true, tsi.PublicProcessMnemonic ('A'),
"A1");
+
+ tsi.Text = "ABC";
+ Assert.AreEqual (true, tsi.PublicProcessMnemonic ('A'),
"A2");
+ Assert.AreEqual (true, tsi.PublicProcessMnemonic ('B'),
"A3");
+ Assert.AreEqual (true, tsi.PublicProcessMnemonic ('X'),
"A4");
+ }
//[Test]
//public void PropertyAnchorAndDocking ()
//{
@@ -1195,6 +1208,8 @@
public NullToolStripItem () : base () {}
public NullToolStripItem (string text, Image image,
EventHandler onClick) : base (text, image, onClick) { }
public NullToolStripItem (string text, Image image,
EventHandler onClick, string name) : base (text, image, onClick, name) { }
+
+ public bool PublicProcessMnemonic (char charCode) {
return base.ProcessMnemonic (charCode); }
}
private class ExposeProtectedProperties : ToolStripItem
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ToolStripMenuItemTest.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ToolStripMenuItemTest.cs
2007-07-05 21:52:44 UTC (rev 81440)
+++
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ToolStripMenuItemTest.cs
2007-07-05 21:54:52 UTC (rev 81441)
@@ -53,8 +53,9 @@
Assert.AreEqual (null, tsi.ShortcutKeyDisplayString,
"A7");
Assert.AreEqual (Keys.None, tsi.ShortcutKeys, "A8");
Assert.AreEqual (true, tsi.ShowShortcutKeys, "A9");
-
-
+ Assert.AreEqual (SystemColors.ControlText,
tsi.ForeColor, "A9-1");
+
+ Assert.AreEqual
("System.Windows.Forms.ToolStripMenuItem+ToolStripMenuItemAccessibleObject",
tsi.AccessibilityObject.GetType ().ToString (), "A10");
int count = 0;
EventHandler oc = new EventHandler (delegate (object
sender, EventArgs e) { count++; });
Image i = new Bitmap (1, 1);
@@ -94,7 +95,7 @@
Assert.AreEqual (2, count, "A24");
Assert.AreEqual ("Name", tsi.Name, "A25");
}
-
+
[Test]
public void BehaviorKeyboardShortcuts ()
{
@@ -171,4 +172,4 @@
}
}
}
-#endif
\ No newline at end of file
+#endif
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/UserControlTest.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/UserControlTest.cs
2007-07-05 21:52:44 UTC (rev 81440)
+++
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/UserControlTest.cs
2007-07-05 21:54:52 UTC (rev 81441)
@@ -85,6 +85,31 @@
public new CreateParams CreateParams { get { return
base.CreateParams; } }
}
+ [Test]
+ public void AutoSize ()
+ {
+ Form f = new Form ();
+ f.ShowInTaskbar = false;
+
+ Panel p = new Panel ();
+ p.AutoSize = true;
+ f.Controls.Add (p);
+
+ Button b = new Button ();
+ b.Size = new Size (200, 200);
+ b.Location = new Point (200, 200);
+ p.Controls.Add (b);
+
+ f.Show ();
+
+ Assert.AreEqual (new Size (403, 403), p.ClientSize,
"A1");
+
+ p.Controls.Remove (b);
+ Assert.AreEqual (new Size (200, 100), p.ClientSize,
"A2");
+
+ p.AutoSizeMode = AutoSizeMode.GrowAndShrink;
+ Assert.AreEqual (new Size (0, 0), p.ClientSize, "A3");
+ }
#endif
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
