* Test/System.Windows.Forms/ContainerControlTest.cs,

  Test/System.Windows.Forms/ControlTest.cs,
  Test/System.Windows.Forms/DefaultLayoutTest.cs,
  Test/System.Windows.Forms/FormTest.cs,
  Test/System.Windows.Forms/PanelTest.cs,
  Test/System.Windows.Forms/TableLayoutTest.cs,
  Test/System.Windows.Forms/UserControlTest.cs: Dispose of forms when
  they're no longer used.
* Test/System.Windows.Forms/ListViewCollectionsTest.cs: Dispose of
  listviews when they're no longer used.

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

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 bd1f87d8519287d7ab805dba3ad0e2906c5031fa..617c68001b36ee1672c963665d1db49aee6c720a 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-08-08  Rolf Bjarne Kvinge <RKvinge@novell.com> 
+
+       * ContainerControlTest.cs, ControlTest.cs, DefaultLayoutTest.cs,
+         FormTest.cs, PanelTest.cs, TableLayoutTest.cs, UserControlTest.cs:
+         Dispose of forms when they're no longer used.
+       * ListViewCollectionsTest.cs: Dispose of listviews when they're no longer
+         used.
+
 2007-08-07  Jonathan Pobst  <monkey@jpobst.com>
 
        * ListBoxTest.cs: Added test for ScaleControl.

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ContainerControlTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ContainerControlTest.cs
index 9006ff5c67bb570285c9cfc01e33ac3c9f95cf76..998d63789bce165bb0fb2002681866add29bde9b 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ContainerControlTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ContainerControlTest.cs
@@ -269,6 +269,7 @@ namespace MonoTests.System.Windows.Forms {
                        f.PublicProcessMnemonic ('b');
                        
                        Assert.AreEqual (true, c.mnemonic_called, "A2");
+                       f.Dispose ();
                }
                
                private class MyForm : Form

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ControlTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ControlTest.cs
index 6378980737f742f1b1d81c1cf27641cafa96e8fd..2220e7d5d183ef69ff43eaad0267fb2a47a9d374 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ControlTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ControlTest.cs
@@ -107,6 +107,7 @@ namespace MonoTests.System.Windows.Forms
                        c.AutoSize = true;
                        f.PerformLayout();
                        Assert.AreEqual (s, c.Size, "#S9");
+                       f.Close ();
                }
                
                public class ControlAutoSizeTester : Control {
@@ -2375,6 +2376,7 @@ namespace MonoTests.System.Windows.Forms
                        f.ResumeLayout ();
 
                        Assert.AreEqual (new Point (225, 287), button1.Location, "A3");
+                       f.Dispose ();
                }
        }
 

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/DefaultLayoutTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/DefaultLayoutTest.cs
index 9dc7997a84b3c20caf25082214204835ce328fe0..0228284b911310672605a35dc1296440a83b7cfb 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/DefaultLayoutTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/DefaultLayoutTest.cs
@@ -542,6 +542,7 @@ namespace MonoTests.System.Windows.Forms
                        f.Show ();
                        
                        Assert.AreEqual (new Size (600, 600), c.lv.Size, "I1");
+                       f.Close ();
                }
                
                private class MyUserControl : UserControl

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FormTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FormTest.cs
index ef5c9f50e384fc09718c863ce55fcdb241dff7dd..015638058362504fe7fd2742edea89b18bcbda7f 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FormTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FormTest.cs
@@ -1903,6 +1903,7 @@ namespace MonoTests.System.Windows.Forms
 
                        f.AutoSize = false;
                        Assert.AreEqual (start_size, f.ClientSize, "A2");
+                       f.Close ();
                }
 
                [Test]
@@ -1925,6 +1926,7 @@ namespace MonoTests.System.Windows.Forms
                        f.Controls.Add (b);
 
                        Assert.AreEqual (new Size (203, 203), f.ClientSize, "A2");
+                       f.Dispose ();
                }
 
                [Test]

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 9caa67d676d13143ef16f6e9ce68e8ac722cf52c..55700b6155d140db13ba86ea387badc152b184b5 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
@@ -404,6 +404,7 @@ namespace MonoTests.System.Windows.Forms
                        Assert.AreEqual (1, n, "SelectedIndexCollectionTest_AddTest#5");
                        Assert.AreEqual (1, listview.SelectedIndices.Count, "SelectedIndexCollectionTest_AddTest#6");
                        Assert.AreEqual (true, listview.Items [0].Selected, "SelectedIndexCollectionTest_AddTest#7");
+                       listview.Dispose ();
                }
 
                [Test]
@@ -448,6 +449,7 @@ namespace MonoTests.System.Windows.Forms
                        n = listview.SelectedIndices.Add (0);
                        Assert.AreEqual (3, n, "SelectedIndexCollectionTest_AddTest#17");
                        Assert.AreEqual (3, listview.SelectedIndices.Count, "SelectedIndexCollectionTest_AddTest#18");
+                       listview.Dispose ();
                }
 
                [Test]
@@ -478,6 +480,7 @@ namespace MonoTests.System.Windows.Forms
                        Assert.AreEqual (false, listview.Items [0].Selected, "SelectedIndexCollectionTest_ClearTest#6");
                        Assert.AreEqual (false, listview.Items [1].Selected, "SelectedIndexCollectionTest_ClearTest#7");
                        Assert.AreEqual (false, listview.Items [2].Selected, "SelectedIndexCollectionTest_ClearTest#8");
+                       listview.Dispose ();
                }
 
                [Test]
@@ -507,6 +510,7 @@ namespace MonoTests.System.Windows.Forms
                        Assert.AreEqual (false, listview.Items [0].Selected, "SelectedIndexCollectionTest_ClearTest#6");
                        Assert.AreEqual (false, listview.Items [1].Selected, "SelectedIndexCollectionTest_ClearTest#7");
                        Assert.AreEqual (false, listview.Items [2].Selected, "SelectedIndexCollectionTest_ClearTest#8");
+                       listview.Dispose ();
                }
 
                [Test]
@@ -536,6 +540,7 @@ namespace MonoTests.System.Windows.Forms
                        Assert.AreEqual (1, listview.SelectedIndices.IndexOf (item3.Index), "SelectedIndexCollectionTest_IndexOfTest#8");
                        Assert.AreEqual (2, listview.SelectedIndices.IndexOf (item4.Index), "SelectedIndexCollectionTest_IndexOfTest#9");
                        Assert.AreEqual (-1, listview.SelectedIndices.IndexOf (item2.Index), "SelectedIndexCollectionTest_IndexOfTest#10");
+                       listview.Dispose ();
                }
 
                [Test]
@@ -561,6 +566,7 @@ namespace MonoTests.System.Windows.Forms
                        Assert.AreEqual (-1, listview.SelectedIndices.IndexOf (1), "SelectedIndexCollectionTest_IndexOfTest#5");
                        Assert.AreEqual (-1, listview.SelectedIndices.IndexOf (99), "SelectedIndexCollectionTest_IndexOfTest#6");
                        Assert.AreEqual (-1, listview.SelectedIndices.IndexOf (-1), "SelectedIndexCollectionTest_IndexOfTest#7");
+                       listview.Dispose ();
                }
 
                [Test]
@@ -581,6 +587,7 @@ namespace MonoTests.System.Windows.Forms
                        listview.SelectedIndices.Remove (0);
                        Assert.AreEqual (0, listview.SelectedIndices.Count, "SelectedIndexCollectionTest_RemoveTest#3");
                        Assert.AreEqual (false, listview.Items [0].Selected, "SelectedIndexCollectionTest_RemoveTest#4");
+                       listview.Dispose ();
                }
 
                [Test]
@@ -626,6 +633,7 @@ namespace MonoTests.System.Windows.Forms
                        listview.SelectedIndices.Remove (0);
                        Assert.AreEqual (0, listview.SelectedIndices.Count, "SelectedIndexCollectionTest_RemoveTest#17");
                        Assert.AreEqual (false, listview.Items [0].Selected, "SelectedIndexCollectionTest_RemoveTest#18");
+                       listview.Dispose ();
                }
 #endif
 
@@ -961,6 +969,7 @@ namespace MonoTests.System.Windows.Forms
 
                        Assert.AreEqual (4, lvw.SelectedItems.Count, "#B1");
                        Assert.AreEqual (3, lvw.SelectedItems.IndexOfKey ("F name"), "#B2");
+                       lvw.Dispose ();
                }
 
                [Test]
@@ -1002,6 +1011,7 @@ namespace MonoTests.System.Windows.Forms
 
                        Assert.AreEqual (4, lvw.SelectedItems.Count, "#B1");
                        Assert.AreEqual (lvi6, lvw.SelectedItems ["F name"], "#B2");
+                       lvw.Dispose ();
                }
 #endif
 

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/PanelTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/PanelTest.cs
index c48f9cc5eae0dda6375ee9656524df2f0990f590..3749d0adc0fc41a33d0790de3a2c4094b3056d0b 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/PanelTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/PanelTest.cs
@@ -57,6 +57,7 @@ namespace MonoTests.System.Windows.Forms
                        \r
                        p.AutoSizeMode = AutoSizeMode.GrowAndShrink;\r
                        Assert.AreEqual (new Size (0, 0), p.ClientSize, "A3");\r
+                       f.Dispose ();\r
                }\r
 #endif\r
        }\r

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TableLayoutTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TableLayoutTest.cs
index 87511b41efd43deffcea1f9592550f3f548bb0a0..90d9141d63fb81a5d3b903a238aa8c49ba0194b5 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TableLayoutTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TableLayoutTest.cs
@@ -1037,6 +1037,8 @@ namespace MonoTests.System.Windows.Forms
                        Assert.AreEqual (new Rectangle (6, 101, 95, 96), _labelD.Bounds, "A40");\r
                        Assert.AreEqual (new Rectangle (110, 101, 95, 96), _labelE.Bounds, "A41");\r
                        Assert.AreEqual (new Rectangle (214, 101, 95, 96), _labelF.Bounds, "A42");\r
+                       \r
+                       f.Close ();\r
                }\r
 \r
                [Test]\r

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/UserControlTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/UserControlTest.cs
index 01b9f2b65039400dfe66372675903bbb77f01d22..6241a65b7e80fe0ebc98cd4b57e43d9802796b8a 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/UserControlTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/UserControlTest.cs
@@ -109,6 +109,8 @@ namespace MonoTests.System.Windows.Forms
 
                        p.AutoSizeMode = AutoSizeMode.GrowAndShrink;
                        Assert.AreEqual (new Size (0, 0), p.ClientSize, "A3");
+                       
+                       f.Close ();
                }
 #endif 
        }