2007-03-08 Carlos Alberto Cortez <calberto.cortez@gmail.com>

	* ListViewTest.cs: Added tests for the ListView and
	Index properties of ListViewItems in VirtualMode.

	* ListViewCollectionsTest.cs: Remove warning when building
	tests.

svn path=/trunk/mcs/; revision=73981

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
index 2536f02382ec1d0f226e49a1a79b10efdfcd9d76..f32994980471658b4ed646b5c49548d086a7cc1d 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-08  Carlos Alberto Cortez <calberto.cortez@gmail.com>
+
+       * ListViewTest.cs: Added tests for the ListView and
+       Index properties of ListViewItems in VirtualMode.
+
+       * ListViewCollectionsTest.cs: Remove warning when building
+       tests.
+
 2007-03-08  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * FormTest.cs: Added tests for bug #80791 and #80574.

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ListViewCollectionsTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ListViewCollectionsTest.cs
index f8aa0eed15a78a6f287940d930cff3593ac30ab4..a65fa32da27b564e1f97c5924fa5d6fb0cc4e3ec 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ListViewCollectionsTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ListViewCollectionsTest.cs
@@ -1531,7 +1531,7 @@ namespace MonoTests.System.Windows.Forms
                        }
 
                        try {
-                               IEnumerator enumerator = lvw.Items.GetEnumerator ();
+                               lvw.Items.GetEnumerator ();
                                Assert.Fail ("#A7");
                        } catch (InvalidOperationException) {
                        }

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ListViewTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ListViewTest.cs
index 9b3209ee5fa60f68b30f8ba43e218874ab922a30..e6baa1ef92e66eca98d03e8ef1032918acdfb48f 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ListViewTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ListViewTest.cs
@@ -440,9 +440,6 @@ namespace MonoTests.System.Windows.Forms
                        lvw.VirtualMode = true;
 
                        CreateListViewItems (item_count);
-                       items [0].Name = "A";
-                       items [1].Name = "B";
-                       items [2].Name = "C";
 
                        Assert.AreEqual (item_count, lvw.Items.Count, "#A1");
                        Assert.AreEqual (true, lvw.VirtualMode, "#A2");
@@ -450,12 +447,31 @@ namespace MonoTests.System.Windows.Forms
                        Assert.AreEqual (items [0], lvw.Items [0], "#B1");
                        Assert.AreEqual (items [1], lvw.Items [1], "#B2");
                        Assert.AreEqual (items [2], lvw.Items [2], "#B3");
+                       Assert.AreEqual (0, lvw.Items [0].Index, "#B4");
+                       Assert.AreEqual (1, lvw.Items [1].Index, "#B5");
+                       Assert.AreEqual (2, lvw.Items [2].Index, "#B6");
+                       Assert.AreEqual (lvw, lvw.Items [0].ListView, "#B7");
+                       Assert.AreEqual (lvw, lvw.Items [1].ListView, "#B8");
+                       Assert.AreEqual (lvw, lvw.Items [2].ListView, "#B9");
+
+                       // force to re-create the items, because we need a blank state
+                       // for our items
+                       CreateListViewItems (item_count);
+                       items [0].Name = "A";
+                       items [1].Name = "B";
+                       items [2].Name = "C";
 
                        Assert.AreEqual (items [0], lvw.Items ["A"], "#C1");
                        Assert.AreEqual (items [1], lvw.Items ["B"], "#C2");
                        Assert.AreEqual (items [2], lvw.Items ["C"], "#C3");
-                       Assert.IsNull (lvw.Items ["Invalid key"], "#C4");
-                       Assert.IsNull (lvw.Items [String.Empty], "#C5");
+                       Assert.AreEqual (0, lvw.Items ["A"].Index, "#C4");
+                       Assert.AreEqual (1, lvw.Items ["B"].Index, "#C5");
+                       Assert.AreEqual (2, lvw.Items ["C"].Index, "#C6");
+                       Assert.AreEqual (lvw, lvw.Items ["A"].ListView, "#C7");
+                       Assert.AreEqual (lvw, lvw.Items ["B"].ListView, "#C8");
+                       Assert.AreEqual (lvw, lvw.Items ["C"].ListView, "#C9");
+                       Assert.IsNull (lvw.Items ["Invalid key"], "#C10");
+                       Assert.IsNull (lvw.Items [String.Empty], "#C11");
 
                        Assert.AreEqual (false, lvw.Items.ContainsKey (String.Empty), "#D1");
                        Assert.AreEqual (false, lvw.Items.ContainsKey (null), "#D2");