Author: gert
Date: 2006-11-23 02:14:59 -0500 (Thu, 23 Nov 2006)
New Revision: 68381
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ToolBarTest.cs
Log:
* ToolBarTest.cs: Added test for bug #79863. Fixed and enabled
ToStringTest.
* ToolBar.cs: Fixed ToString to match MS.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-11-23 04:20:48 UTC (rev 68380)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-11-23 07:14:59 UTC (rev 68381)
@@ -1,3 +1,7 @@
+2006-11-23 Gert Driesen <[EMAIL PROTECTED]>
+
+ * ToolBar.cs: Fixed ToString to match MS.
+
2006-11-22 Andreia Gaita <[EMAIL PROTECTED]>
* NumericUpDown:
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
2006-11-23 04:20:48 UTC (rev 68380)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
2006-11-23 07:14:59 UTC (rev 68381)
@@ -416,9 +416,9 @@
int count = this.Buttons.Count;
if (count == 0)
- return string.Format
("System.Windows.Forms.ToolBar, Button.Count: 0");
+ return string.Format
("System.Windows.Forms.ToolBar, Buttons.Count: 0");
else
- return string.Format
("System.Windows.Forms.ToolBar, Button.Count: {0}, Buttons[0]: {1}",
+ return string.Format
("System.Windows.Forms.ToolBar, Buttons.Count: {0}, Buttons[0]: {1}",
count, this.Buttons
[0].ToString ());
}
#endregion Public Methods
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
2006-11-23 04:20:48 UTC (rev 68380)
+++ trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
2006-11-23 07:14:59 UTC (rev 68381)
@@ -1,3 +1,8 @@
+2006-11-23 Gert Driesen <[EMAIL PROTECTED]>
+
+ * ToolBarTest.cs: Added test for bug #79863. Fixed and enabled
+ ToStringTest.
+
2006-11-20 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
* ControlTest.cs: Added tests for #79999.
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ToolBarTest.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ToolBarTest.cs
2006-11-23 04:20:48 UTC (rev 68380)
+++
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ToolBarTest.cs
2006-11-23 07:14:59 UTC (rev 68381)
@@ -8,16 +8,23 @@
//
using System;
-using NUnit.Framework;
+using System.Drawing;
+using System.Globalization;
using System.Windows.Forms;
-using System.Drawing;
-using System.Runtime.Remoting;
+using NUnit.Framework;
+
namespace MonoTests.System.Windows.Forms
{
[TestFixture]
public class ToolBarTest
{
+ [Test] // bug #79863
+ public void TabStop ()
+ {
+ ToolBar tb = new ToolBar ();
+ Assert.IsFalse (tb.TabStop);
+ }
[Test]
[Category ("NotWorking")]
@@ -86,12 +93,20 @@
}
[Test]
- [Category ("NotWorking")]
public void ToStringMethodTest ()
{
- ToolBar myToolBar = new ToolBar ();
- myToolBar.Text = "New ToolBar";
- Assert.AreEqual ("System.Windows.Forms.ToolBar,
Buttons.Count: 0", myToolBar.ToString (), "#T3");
+ ToolBar tb = new ToolBar ();
+ tb.Text = "New ToolBar";
+ Assert.AreEqual ("System.Windows.Forms.ToolBar,
Buttons.Count: 0",
+ tb.ToString (), "#1");
+
+ ToolBarButton buttonA = new ToolBarButton ("A");
+ ToolBarButton buttonB = new ToolBarButton ("B");
+ tb.Buttons.Add (buttonA);
+ tb.Buttons.Add (buttonB);
+ Assert.AreEqual ("System.Windows.Forms.ToolBar,
Buttons.Count: 2, " +
+ "Buttons[0]: ToolBarButton: A, Style:
PushButton",
+ tb.ToString (), "#2");
}
[Test]
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
