2007-01-18 Rolf Bjarne Kvinge <RKvinge@novell.com>

	* StatusBarTest.cs: Added tests for StatusBarPanelCollection.
	* StatusBarPanelTest.cs: Added tests for new properties in StatusBarPanel.

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

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 c612733fd1515d73bff975ae0f95596a7473fbb8..d2e0c129168b68190cfc3ceb96412611ec701424 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,8 @@
+2007-01-18  Rolf Bjarne Kvinge  <RKvinge@novell.com>
+
+       * StatusBarTest.cs: Added tests for StatusBarPanelCollection.
+       * StatusBarPanelTest.cs: Added tests for new properties in StatusBarPanel.
+
 2007-01-18  Jonathan Pobst  <monkey@jpobst.com>
 
        * NotifyIconTest.cs: Add test for Tag, ContextMenuStrip.

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/StatusBarPanelTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/StatusBarPanelTest.cs
index 85e154c0d6fd2dff90ef8a73f572ed38271b46de..b98f74574e477e313d0f50dc84cfc818f18edb0b 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/StatusBarPanelTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/StatusBarPanelTest.cs
@@ -56,7 +56,11 @@ namespace MonoTests.System.Windows.Forms
                }
                
                [Test]
+#if NET_2_0
+               [ExpectedException (typeof (ArgumentOutOfRangeException))]
+#else
                [ExpectedException(typeof(ArgumentException))]
+#endif
                public void MinimumWidth4 ()
                {
                        StatusBarPanel p = new StatusBarPanel ();
@@ -99,5 +103,30 @@ namespace MonoTests.System.Windows.Forms
                        
                }
                
+#if NET_2_0
+               [Test]
+               public void TagTest ()
+               {
+                       StatusBarPanel p = new StatusBarPanel ();
+                       
+                       Assert.AreEqual (null, p.Tag, "#1");
+                       p.Tag = "a";
+                       Assert.AreEqual ("a", p.Tag, "#2");
+                       p.Tag = null;
+                       Assert.AreEqual (null, p.Tag, "#3");
+               }
+               
+               [Test]
+               public void NameTest ()
+               {
+                       StatusBarPanel p = new StatusBarPanel ();
+                       Assert.AreEqual ("", p.Name, "#1");
+                       p.Name = "a";
+                       Assert.AreEqual ("a", p.Name, "#2");
+                       p.Name = null;
+                       Assert.AreEqual ("", p.Name, "#3");
+               }
+#endif 
+               
        }
 }

diff --git a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/StatusBarTest.cs b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/StatusBarTest.cs
index 50d5abdaf1d1dcb34097ada67f4a19a7439f86c6..0c0eab95c7e06768cfd6a5fa8da309eb447865da 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/StatusBarTest.cs
+++ b/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/StatusBarTest.cs
@@ -68,4 +68,301 @@ namespace MonoTests.System.Windows.Forms
                //[MonoTODO ("Test case for DrawItem")] 
                //[MonoTODO ("Test case for PanelClick")]       
        }
+       
+       [TestFixture]
+       public class StatusBarPanelCollectionTest
+       {
+               [Test]
+               public void Test ()
+               {
+
+               }
+               [Test]
+               public void DefaultPropertiesTest ()
+               {
+                       StatusBar bar = new StatusBar ();
+                       StatusBar.StatusBarPanelCollection collection = new StatusBar.StatusBarPanelCollection (bar);
+                       
+                       Assert.AreEqual (0, collection.Count, "C1");
+                       Assert.AreEqual (false, collection.IsReadOnly, "I1");
+               }
+               
+               
+               [Test]
+               public void AddRemoveTest ()
+               {
+                       StatusBar bar = new StatusBar ();
+                       StatusBar.StatusBarPanelCollection collection = new StatusBar.StatusBarPanelCollection (bar);
+
+                       StatusBarPanel panel = new StatusBarPanel ();
+                       StatusBarPanel panel2 = new StatusBarPanel ();
+                       
+                       collection.Add (panel);
+                       Assert.AreEqual (1, collection.Count, "#1");
+
+                       collection.Remove (panel);
+                       Assert.AreEqual (0, collection.Count, "#2");
+
+                       collection.Add (panel);
+                       collection.RemoveAt (0);
+                       Assert.AreEqual (0, collection.Count, "#3");
+
+                       collection.Add (panel);
+                       Assert.AreEqual (0, collection.IndexOf (panel), "#4");
+                       Assert.AreEqual (-1, collection.IndexOf (panel2), "#5");
+
+                       collection.Add (panel2);
+                       Assert.AreEqual (1, collection.IndexOf (panel2), "#6");
+
+                       collection.RemoveAt (0);
+                       Assert.AreEqual (0, collection.IndexOf (panel2), "#7");
+                       Assert.AreEqual (1, collection.Count, "#8");
+                       
+                       Assert.AreEqual (false, collection.Contains (panel), "#9");
+                       Assert.AreEqual (true, collection.Contains (panel2), "#10");
+                       
+               }
+
+#if NET_2_0
+               [Test]
+               public void ItemByKeyTest ()
+               {
+                       StatusBar bar = new StatusBar ();
+                       StatusBar.StatusBarPanelCollection c = new StatusBar.StatusBarPanelCollection (bar);
+
+                       StatusBarPanel panel1 = new StatusBarPanel ();
+                       StatusBarPanel panel2 = new StatusBarPanel ();
+                       StatusBarPanel panel3 = new StatusBarPanel ();
+                       StatusBarPanel panel4 = new StatusBarPanel ();
+                       StatusBarPanel panel5 = new StatusBarPanel ();
+
+
+                       panel1.Name = "p1";
+                       panel2.Name = "p2";
+                       panel3.Name = "P2";
+                       panel4.Name = "";
+                       panel5.Name = null;
+
+                       c.AddRange (new StatusBarPanel [] { panel1, panel2, panel3, panel4, panel5 });
+
+                       Assert.AreEqual (null, c [""], "#1");
+                       Assert.AreEqual (null, c [null], "#2");
+                       Assert.AreEqual (panel1, c ["p1"], "#3");
+                       Assert.AreEqual (panel1, c ["P1"], "#4");
+                       Assert.AreEqual (panel2, c ["p2"], "#5");
+                       Assert.AreEqual (panel2, c ["P2"], "#6");
+                       Assert.AreEqual (null, c ["p3"], "#7");
+                       Assert.AreEqual (null, c ["p"], "#8");  
+               }
+
+               [Test]
+               public void RemoveByKeyTest ()
+               {
+                       StatusBar bar = new StatusBar ();
+                       StatusBar.StatusBarPanelCollection c = new StatusBar.StatusBarPanelCollection (bar);
+
+                       StatusBarPanel panel1 = new StatusBarPanel ();
+                       StatusBarPanel panel2 = new StatusBarPanel ();
+                       StatusBarPanel panel3 = new StatusBarPanel ();
+                       StatusBarPanel panel4 = new StatusBarPanel ();
+                       StatusBarPanel panel5 = new StatusBarPanel ();
+
+
+                       panel1.Name = "p1";
+                       panel2.Name = "p2";
+                       panel3.Name = "P2";
+                       panel4.Name = "";
+                       panel5.Name = null;
+
+                       c.AddRange (new StatusBarPanel [] { panel1, panel2, panel3, panel4, panel5 });
+
+                       Assert.AreEqual (true, c.ContainsKey ("p1"), "#A1");
+                       Assert.AreEqual (true, c.ContainsKey ("P1"), "#A2");
+                       Assert.AreEqual (true, c.ContainsKey ("P2"), "#A3");
+                       Assert.AreEqual (false, c.ContainsKey (""), "#A4");
+                       Assert.AreEqual (false, c.ContainsKey (null), "#A5");
+                       Assert.AreEqual (false, c.ContainsKey ("p3"), "#A6");
+                       Assert.AreEqual (false, c.ContainsKey ("p"), "#A7");
+                       Assert.AreEqual (null, c [""], "#A8");
+                       Assert.AreEqual (null, c [null], "#A9");
+                       Assert.AreEqual (panel1, c ["p1"], "#A10");
+                       Assert.AreEqual (panel1, c ["P1"], "#A11");
+                       Assert.AreEqual (panel2, c ["p2"], "#A12");
+                       Assert.AreEqual (panel2, c ["P2"], "#A13");
+                       Assert.AreEqual (null, c ["p3"], "#A14");
+                       Assert.AreEqual (null, c ["p"], "#A15");        
+                       
+                       c.RemoveByKey ("P2");
+
+                       Assert.AreEqual (true, c.ContainsKey ("p1"), "#B1");
+                       Assert.AreEqual (true, c.ContainsKey ("P1"), "#B2");
+                       Assert.AreEqual (true, c.ContainsKey ("P2"), "#B3");
+                       Assert.AreEqual (false, c.ContainsKey (""), "#B4");
+                       Assert.AreEqual (false, c.ContainsKey (null), "#B5");
+                       Assert.AreEqual (false, c.ContainsKey ("p3"), "#B6");
+                       Assert.AreEqual (false, c.ContainsKey ("p"), "#B7");
+                       Assert.AreEqual (null, c [""], "#B8");
+                       Assert.AreEqual (null, c [null], "#B9");
+                       Assert.AreEqual (panel1, c ["p1"], "#B10");
+                       Assert.AreEqual (panel1, c ["P1"], "#B11");
+                       Assert.AreEqual (panel3, c ["p2"], "#B12");
+                       Assert.AreEqual (panel3, c ["P2"], "#B13");
+                       Assert.AreEqual (null, c ["p3"], "#B14");
+                       Assert.AreEqual (null, c ["p"], "#B15");
+
+                       c.RemoveByKey ("p2");
+
+                       Assert.AreEqual (true, c.ContainsKey ("p1"), "#C1");
+                       Assert.AreEqual (true, c.ContainsKey ("P1"), "#C2");
+                       Assert.AreEqual (false, c.ContainsKey ("P2"), "#C3");
+                       Assert.AreEqual (false, c.ContainsKey (""), "#C4");
+                       Assert.AreEqual (false, c.ContainsKey (null), "#C5");
+                       Assert.AreEqual (false, c.ContainsKey ("p3"), "#C6");
+                       Assert.AreEqual (false, c.ContainsKey ("p"), "#C7");
+                       Assert.AreEqual (null, c [""], "#C8");
+                       Assert.AreEqual (null, c [null], "#C9");
+                       Assert.AreEqual (panel1, c ["p1"], "#C10");
+                       Assert.AreEqual (panel1, c ["P1"], "#C11");
+                       Assert.AreEqual (null, c ["p2"], "#C12");
+                       Assert.AreEqual (null, c ["P2"], "#C13");
+                       Assert.AreEqual (null, c ["p3"], "#C14");
+                       Assert.AreEqual (null, c ["p"], "#C15");
+
+                       c.RemoveByKey ("p2");
+
+                       Assert.AreEqual (true, c.ContainsKey ("p1"), "#D1");
+                       Assert.AreEqual (true, c.ContainsKey ("P1"), "#D2");
+                       Assert.AreEqual (false, c.ContainsKey ("P2"), "#D3");
+                       Assert.AreEqual (false, c.ContainsKey (""), "#D4");
+                       Assert.AreEqual (false, c.ContainsKey (null), "#D5");
+                       Assert.AreEqual (false, c.ContainsKey ("p3"), "#D6");
+                       Assert.AreEqual (false, c.ContainsKey ("p"), "#D7");
+                       Assert.AreEqual (null, c [""], "#D8");
+                       Assert.AreEqual (null, c [null], "#D9");
+                       Assert.AreEqual (panel1, c ["p1"], "#D10");
+                       Assert.AreEqual (panel1, c ["P1"], "#D11");
+                       Assert.AreEqual (null, c ["p2"], "#D12");
+                       Assert.AreEqual (null, c ["P2"], "#D13");
+                       Assert.AreEqual (null, c ["p3"], "#D14");
+                       Assert.AreEqual (null, c ["p"], "#D15");
+                       
+                       c.RemoveByKey ("P1");
+
+                       Assert.AreEqual (false, c.ContainsKey ("p1"), "#E1");
+                       Assert.AreEqual (false, c.ContainsKey ("P1"), "#E2");
+                       Assert.AreEqual (false, c.ContainsKey ("P2"), "#E3");
+                       Assert.AreEqual (false, c.ContainsKey (""), "#E4");
+                       Assert.AreEqual (false, c.ContainsKey (null), "#E5");
+                       Assert.AreEqual (false, c.ContainsKey ("p3"), "#E6");
+                       Assert.AreEqual (false, c.ContainsKey ("p"), "#E7");
+                       Assert.AreEqual (null, c [""], "#E8");
+                       Assert.AreEqual (null, c [null], "#E9");
+                       Assert.AreEqual (null, c ["p1"], "#E10");
+                       Assert.AreEqual (null, c ["P1"], "#E11");
+                       Assert.AreEqual (null, c ["p2"], "#E12");
+                       Assert.AreEqual (null, c ["P2"], "#E13");
+                       Assert.AreEqual (null, c ["p3"], "#E14");
+                       Assert.AreEqual (null, c ["p"], "#E15");
+
+                       c.RemoveByKey ("");
+
+                       Assert.AreEqual (false, c.ContainsKey ("p1"), "#F1");
+                       Assert.AreEqual (false, c.ContainsKey ("P1"), "#F2");
+                       Assert.AreEqual (false, c.ContainsKey ("P2"), "#F3");
+                       Assert.AreEqual (false, c.ContainsKey (""), "#F4");
+                       Assert.AreEqual (false, c.ContainsKey (null), "#F5");
+                       Assert.AreEqual (false, c.ContainsKey ("p3"), "#F6");
+                       Assert.AreEqual (false, c.ContainsKey ("p"), "#F7");
+                       Assert.AreEqual (null, c [""], "#F8");
+                       Assert.AreEqual (null, c [null], "#F9");
+                       Assert.AreEqual (null, c ["p1"], "#F10");
+                       Assert.AreEqual (null, c ["P1"], "#F11");
+                       Assert.AreEqual (null, c ["p2"], "#F12");
+                       Assert.AreEqual (null, c ["P2"], "#F13");
+                       Assert.AreEqual (null, c ["p3"], "#F14");
+                       Assert.AreEqual (null, c ["p"], "#F15");
+
+
+                       c.RemoveByKey (null);
+
+                       Assert.AreEqual (false, c.ContainsKey ("p1"), "#G1");
+                       Assert.AreEqual (false, c.ContainsKey ("P1"), "#G2");
+                       Assert.AreEqual (false, c.ContainsKey ("P2"), "#G3");
+                       Assert.AreEqual (false, c.ContainsKey (""), "#G4");
+                       Assert.AreEqual (false, c.ContainsKey (null), "#G5");
+                       Assert.AreEqual (false, c.ContainsKey ("p3"), "#G6");
+                       Assert.AreEqual (false, c.ContainsKey ("p"), "#G7");
+                       Assert.AreEqual (null, c [""], "#G8");
+                       Assert.AreEqual (null, c [null], "#G9");
+                       Assert.AreEqual (null, c ["p1"], "#G10");
+                       Assert.AreEqual (null, c ["P1"], "#G11");
+                       Assert.AreEqual (null, c ["p2"], "#G12");
+                       Assert.AreEqual (null, c ["P2"], "#G13");
+                       Assert.AreEqual (null, c ["p3"], "#G14");
+                       Assert.AreEqual (null, c ["p"], "#G15");
+                       
+               }
+               
+               public void ContainsKeyTest ()
+               {
+
+                       StatusBar bar = new StatusBar ();
+                       StatusBar.StatusBarPanelCollection c = new StatusBar.StatusBarPanelCollection (bar);
+
+                       StatusBarPanel panel1 = new StatusBarPanel ();
+                       StatusBarPanel panel2 = new StatusBarPanel ();
+                       StatusBarPanel panel3 = new StatusBarPanel ();
+                       StatusBarPanel panel4 = new StatusBarPanel ();
+                       StatusBarPanel panel5 = new StatusBarPanel ();
+
+
+                       panel1.Name = "p1";
+                       panel2.Name = "p2";
+                       panel3.Name = "P2";
+                       panel4.Name = "";
+                       panel5.Name = null;
+                       
+                       c.AddRange (new StatusBarPanel [] {panel1, panel2, panel3, panel4, panel5});
+                       
+                       Assert.AreEqual (true, c.ContainsKey ("p1"), "#1");
+                       Assert.AreEqual (true, c.ContainsKey ("P1"), "#2");
+                       Assert.AreEqual (true, c.ContainsKey ("P2"), "#3");
+                       Assert.AreEqual (false, c.ContainsKey (""), "#4");
+                       Assert.AreEqual (false, c.ContainsKey (null), "#5");
+                       Assert.AreEqual (false, c.ContainsKey ("p3"), "#6");
+                       Assert.AreEqual (false, c.ContainsKey ("p"), "#7");
+
+               }
+               
+               public void IndexByKeyTest ()
+               {
+                       StatusBar bar = new StatusBar ();
+                       StatusBar.StatusBarPanelCollection c = new StatusBar.StatusBarPanelCollection (bar);
+
+                       StatusBarPanel panel1 = new StatusBarPanel ();
+                       StatusBarPanel panel2 = new StatusBarPanel ();
+                       StatusBarPanel panel3 = new StatusBarPanel ();
+                       StatusBarPanel panel4 = new StatusBarPanel ();
+                       StatusBarPanel panel5 = new StatusBarPanel ();
+
+
+                       panel1.Name = "p1";
+                       panel2.Name = "p2";
+                       panel3.Name = "P2";
+                       panel4.Name = "";
+                       panel5.Name = null;
+
+                       c.AddRange (new StatusBarPanel [] { panel1, panel2, panel3, panel4, panel5 });
+                       
+                       Assert.AreEqual (-1, c.IndexOfKey (""), "#1");
+                       Assert.AreEqual (-1, c.IndexOfKey (null), "#2");
+                       Assert.AreEqual (0, c.IndexOfKey ("p1"), "#3");
+                       Assert.AreEqual (0, c.IndexOfKey ("P1"), "#4");
+                       Assert.AreEqual (1, c.IndexOfKey ("p2"), "#5");
+                       Assert.AreEqual (1, c.IndexOfKey ("P2"), "#6");
+                       Assert.AreEqual (-1, c.IndexOfKey ("p3"), "#7");
+                       Assert.AreEqual (-1, c.IndexOfKey ("p"), "#8");                 
+               }
+#endif
+       }
 }