Author: gert
Date: 2007-05-25 17:16:33 -0400 (Fri, 25 May 2007)
New Revision: 77975
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TextBoxTest.cs
Log:
* TextBoxTest.cs: Improve tests for Copy, Cut and Paste to also cover
bug #81736.
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
2007-05-25 21:14:14 UTC (rev 77974)
+++ trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
2007-05-25 21:16:33 UTC (rev 77975)
@@ -1,3 +1,8 @@
+2007-05-25 Gert Driesen <[EMAIL PROTECTED]>
+
+ * TextBoxTest.cs: Improve tests for Copy, Cut and Paste to also cover
+ bug #81736.
+
2007-05-25 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
* KeyEventArgsTest.cs: Added.
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TextBoxTest.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TextBoxTest.cs
2007-05-25 21:14:14 UTC (rev 77974)
+++
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TextBoxTest.cs
2007-05-25 21:16:33 UTC (rev 77975)
@@ -20,6 +20,7 @@
public class TextBoxTest
{
TextBox textBox;
+ int _changed;
int _invalidated;
int _paint;
@@ -29,6 +30,7 @@
textBox = new TextBox();
textBox.Invalidated += new InvalidateEventHandler
(TextBox_Invalidated);
textBox.Paint += new PaintEventHandler (TextBox_Paint);
+ textBox.TextChanged += new EventHandler
(TextBox_TextChanged);
Reset ();
}
@@ -297,8 +299,10 @@
{
textBox.Text = "ABCDE";
textBox.SelectionLength = 4;
+ Assert.AreEqual (1, _changed, "#1");
textBox.Copy ();
- Assert.AreEqual ("ABCD", textBox.SelectedText, "#30");
+ Assert.AreEqual (1, _changed, "#2");
+ Assert.AreEqual ("ABCD", textBox.SelectedText, "#3");
}
[Test]
@@ -306,8 +310,10 @@
{
textBox.Text = "ABCDE";
textBox.SelectionLength = 4;
+ Assert.AreEqual (1, _changed, "#1");
textBox.Cut ();
- Assert.AreEqual ("E", textBox.Text, "#31");
+ Assert.AreEqual (2, _changed, "#2");
+ Assert.AreEqual ("E", textBox.Text, "#3");
}
[Test]
@@ -315,10 +321,13 @@
{
textBox.Text = "ABCDE";
textBox.SelectionLength = 4;
+ Assert.AreEqual (1, _changed, "#1");
textBox.Copy ();
textBox.SelectionStart = textBox.SelectionStart +
textBox.SelectionLength;
+ Assert.AreEqual (1, _changed, "#2");
textBox.Paste ();
- Assert.AreEqual ("ABCDABCD", textBox.Text, "#32");
+ //Assert.AreEqual (2, _changed, "#3");
+ Assert.AreEqual ("ABCDABCD", textBox.Text, "#4");
}
[Test] // bug #80301
@@ -678,6 +687,11 @@
Assert.AreEqual (false, textBox.Modified, "modified-3");
}
+ void TextBox_TextChanged (object sender, EventArgs e)
+ {
+ _changed++;
+ }
+
void TextBox_Invalidated (object sender, InvalidateEventArgs e)
{
_invalidated++;
@@ -690,6 +704,7 @@
void Reset ()
{
+ _changed = 0;
_invalidated = 0;
_paint = 0;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
