Author: gert
Date: 2006-11-09 15:24:09 -0500 (Thu, 09 Nov 2006)
New Revision: 67636
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ListViewEventTest.cs
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/UpDownTest.cs
Log:
* ListViewEventTest.cs: Added tests for SelectedIndexChanged event.
* UpDownTest.cs: Fixed ToStringTest.
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-09 20:15:54 UTC (rev 67635)
+++ trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
2006-11-09 20:24:09 UTC (rev 67636)
@@ -1,3 +1,8 @@
+2006-11-09 Gert Driesen <[EMAIL PROTECTED]>
+
+ * ListViewEventTest.cs: Added tests for SelectedIndexChanged event.
+ * UpDownTest.cs: Fixed ToStringTest.
+
2006-11-09 Alexander Olk <[EMAIL PROTECTED]>
* CommonDialogsTest.cs: Added
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ListViewEventTest.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ListViewEventTest.cs
2006-11-09 20:15:54 UTC (rev 67635)
+++
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ListViewEventTest.cs
2006-11-09 20:24:09 UTC (rev 67636)
@@ -15,9 +15,10 @@
namespace MonoTests.System.Windows.Forms
{
- [TestFixture, Ignore ("Needs Manual Intervention")]
- public class ListViewEvent
- {
+ [TestFixture]
+ [Ignore ("Needs Manual Intervention")]
+ public class LabelEditEvent
+ {
static bool eventhandled = false;
public void LabelEdit_EventHandler (object
sender,LabelEditEventArgs e)
{
@@ -67,10 +68,10 @@
}
}
- [TestFixture, Ignore ("Needs Manual Intervention")]
-
+ [TestFixture]
+ [Ignore ("Needs Manual Intervention")]
public class ColumnClickEvent
- {
+ {
static bool eventhandled = false;
public void ColumnClickEventHandler (object sender,
ColumnClickEventArgs e)
{
@@ -100,10 +101,10 @@
}
}
- [TestFixture, Ignore ("Needs Manual Intervention")]
-
+ [TestFixture]
+ [Ignore ("Needs Manual Intervention")]
public class MyEvent
- {
+ {
static bool eventhandled = false;
public void New_EventHandler (object sender, EventArgs e)
{
@@ -153,10 +154,10 @@
}
}
- [TestFixture, Ignore ("Needs Manual Intervention")]
-
+ [TestFixture]
+ [Ignore ("Needs Manual Intervention")]
public class ItemCheckEvent
- {
+ {
static bool eventhandled = false;
public void ItemCheckEventHandler (object sender,
ItemCheckEventArgs e)
@@ -187,11 +188,10 @@
}
}
-
- [TestFixture, Ignore ("Needs Manual Intervention")]
-
+ [TestFixture]
+ [Ignore ("Needs Manual Intervention")]
public class ItemDragEvent
- {
+ {
static bool eventhandled = false;
public void ItemDragEventHandler (object sender,
ItemDragEventArgs e)
@@ -220,4 +220,109 @@
myform.Dispose ();
}
}
+
+ [TestFixture]
+ public class SelectedIndexChangedEvent
+ {
+ int selectedIndexChanged;
+
+ public void ListView_SelectedIndexChanged (object sender,
EventArgs e)
+ {
+ selectedIndexChanged++;
+ }
+
+ [SetUp]
+ public void SetUp ()
+ {
+ selectedIndexChanged = 0;
+ }
+
+ [Test] // bug #79849
+ [Category ("NotWorking")]
+ public void SelectBeforeCreationOfHandle ()
+ {
+ Form form = new Form ();
+ form.ShowInTaskbar = false;
+
+ ListView lvw = new ListView ();
+ lvw.SelectedIndexChanged += new EventHandler
(ListView_SelectedIndexChanged);
+ lvw.View = View.Details;
+ ListViewItem itemA = new ListViewItem ("A");
+ lvw.Items.Add (itemA);
+ Assert.AreEqual (0, selectedIndexChanged, "#A1");
+ itemA.Selected = true;
+ Assert.AreEqual (0, selectedIndexChanged, "A2");
+
+ ListViewItem itemB = new ListViewItem ("B");
+ lvw.Items.Add (itemB);
+ Assert.AreEqual (0, selectedIndexChanged, "#B1");
+ itemB.Selected = true;
+ Assert.AreEqual (0, selectedIndexChanged, "B2");
+
+ form.Controls.Add (lvw);
+ Assert.AreEqual (0, selectedIndexChanged, "#C1");
+ form.Show ();
+ Assert.AreEqual (2, selectedIndexChanged, "#C2");
+ form.Dispose ();
+ }
+
+ [Test]
+ [Category ("NotWorking")]
+ public void RemoveSelectedItem ()
+ {
+ Form form = new Form ();
+ form.ShowInTaskbar = false;
+
+ ListView lvw = new ListView ();
+ lvw.SelectedIndexChanged += new EventHandler
(ListView_SelectedIndexChanged);
+ lvw.View = View.Details;
+ ListViewItem itemA = new ListViewItem ("A");
+ lvw.Items.Add (itemA);
+ Assert.AreEqual (0, selectedIndexChanged, "#A1");
+ itemA.Selected = true;
+ Assert.AreEqual (0, selectedIndexChanged, "A2");
+
+ ListViewItem itemB = new ListViewItem ("B");
+ lvw.Items.Add (itemB);
+ Assert.AreEqual (0, selectedIndexChanged, "#B1");
+ itemB.Selected = true;
+ Assert.AreEqual (0, selectedIndexChanged, "B2");
+ lvw.Items.Remove (itemB);
+ Assert.IsTrue (itemB.Selected, "#B3");
+
+ form.Controls.Add (lvw);
+ Assert.AreEqual (0, selectedIndexChanged, "#C1");
+ form.Show ();
+ Assert.AreEqual (1, selectedIndexChanged, "#C2");
+ lvw.Items.Remove (itemA);
+ Assert.AreEqual (2, selectedIndexChanged, "#C3");
+ Assert.IsTrue (itemA.Selected, "#C4");
+ }
+
+ [Test]
+ [Category ("NotWorking")]
+ public void AddAndSelectItem ()
+ {
+ Form form = new Form ();
+ form.ShowInTaskbar = false;
+
+ ListView lvw = new ListView ();
+ lvw.SelectedIndexChanged += new EventHandler
(ListView_SelectedIndexChanged);
+ lvw.View = View.Details;
+ form.Controls.Add (lvw);
+ form.Show ();
+
+ ListViewItem itemA = new ListViewItem ();
+ lvw.Items.Add (itemA);
+ Assert.AreEqual (0, selectedIndexChanged, "#A1");
+ itemA.Selected = true;
+ Assert.AreEqual (1, selectedIndexChanged, "#A2");
+
+ ListViewItem itemB = new ListViewItem ();
+ lvw.Items.Add (itemB);
+ Assert.AreEqual (1, selectedIndexChanged, "#B1");
+ itemB.Selected = true;
+ Assert.AreEqual (2, selectedIndexChanged, "#B2");
+ }
+ }
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/UpDownTest.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/UpDownTest.cs
2006-11-09 20:15:54 UTC (rev 67635)
+++
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/UpDownTest.cs
2006-11-09 20:24:09 UTC (rev 67636)
@@ -6,8 +6,10 @@
//
using System;
+using System.Drawing;
+using System.Globalization;
using System.Windows.Forms;
-using System.Drawing;
+
using NUnit.Framework;
namespace MonoTests.System.Windows.Forms
@@ -34,7 +36,9 @@
n1.Minimum = 0.33m;
n1.Maximum = 100.33m;
- Assert.AreEqual ("System.Windows.Forms.NumericUpDown,
Minimum = 0.33, Maximum = 100.33", n1.ToString (), "2");
+ Assert.AreEqual (string.Format
(CultureInfo.CurrentCulture,
+ "System.Windows.Forms.NumericUpDown, Minimum =
{0}, Maximum = {1}",
+ 0.33, 100.33), n1.ToString (), "2");
}
[Test]
Property changes on:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/UpDownTest.cs
___________________________________________________________________
Name: svn:eol-style
+ CRLF
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches