Author: gert
Date: 2007-01-02 09:37:40 -0500 (Tue, 02 Jan 2007)
New Revision: 70364

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CheckedListBox.cs
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListBox.cs
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListControl.cs
   trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
   
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/CheckedListBoxTest.cs
   
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ListBoxTest.cs
   
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ListControlTest.cs
   trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/UpDownTest.cs
Log:
* CheckedListBox.cs: Fixed SelectionMode to match MS.
* ListControl.cs: Implemented AllowSelection property. Removed extra
tabs.
* ListBox.cs: Implemented AllowSelection property.
* ListControlTest.cs: Added test for AllowSelection.
* UpDownTest.cs: MockItem is now nested class.
* ListBoxTest.cs: Added test for AllowSelection.
* CheckedListBoxTest.cs: Added tests for DisplayMember, GetItemText,
SelectionMode, Text and ValueMember.


Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-01-02 14:07:24 UTC (rev 70363)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-01-02 14:37:40 UTC (rev 70364)
@@ -1,3 +1,10 @@
+2007-01-02  Gert Driesen  <[EMAIL PROTECTED]>
+
+       * CheckedListBox.cs: Fixed SelectionMode to match MS.
+       * ListControl.cs: Implemented AllowSelection property. Removed extra
+       tabs.
+       * ListBox.cs: Implemented AllowSelection property.
+
 2007-01-02  Everaldo Canuto  <[EMAIL PROTECTED]>
 
        * MenuItem.cs: In MdiWindowClickHandler uses sender instead of

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CheckedListBox.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CheckedListBox.cs    
    2007-01-02 14:07:24 UTC (rev 70363)
+++ 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CheckedListBox.cs    
    2007-01-02 14:37:40 UTC (rev 70364)
@@ -167,8 +167,11 @@
                public override SelectionMode SelectionMode {
                        get { return base.SelectionMode; }
                        set {
+                               if (!Enum.IsDefined (typeof (SelectionMode), 
value))
+                                       throw new InvalidEnumArgumentException 
("value", (int) value, typeof (SelectionMode));
+
                                if (value == SelectionMode.MultiSimple || value 
== SelectionMode.MultiExtended)
-                                       throw new InvalidEnumArgumentException 
("Multi selection modes not supported");
+                                       throw new ArgumentException ("Multi 
selection not supported on CheckedListBox");
 
                                base.SelectionMode = value;
                        }

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListBox.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListBox.cs       
2007-01-02 14:07:24 UTC (rev 70363)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListBox.cs       
2007-01-02 14:37:40 UTC (rev 70364)
@@ -596,6 +596,14 @@
                        }
                }
 
+#if NET_2_0
+               protected override bool AllowSelection {
+                       get {
+                               return SelectionMode != SelectionMode.None;
+                       }
+               }
+#endif
+
                #endregion Public Properties
 
                #region Private Properties

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListControl.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListControl.cs   
2007-01-02 14:07:24 UTC (rev 70363)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListControl.cs   
2007-01-02 14:37:40 UTC (rev 70364)
@@ -132,7 +132,7 @@
                
[TypeConverter("System.Windows.Forms.Design.DataMemberFieldConverter, " + 
Consts.AssemblySystem_Design)]
                public string DisplayMember {
                        get { 
-                               return display_member;                          
+                               return display_member;
                        }
                        set {
                                if (value == null)
@@ -143,7 +143,7 @@
                                }
 
                                display_member = value;
-                               ConnectToDataSource ();                         
+                               ConnectToDataSource ();
                                OnDisplayMemberChanged (EventArgs.Empty);
                        }
                }
@@ -207,7 +207,7 @@
                                value_member = new_value;
                                
                                if (display_member == string.Empty) {
-                                       DisplayMember = 
value_member.BindingMember;                                     
+                                       DisplayMember = 
value_member.BindingMember;
                                }
                                
                                ConnectToDataSource ();
@@ -215,6 +215,13 @@
                        }
                }
 
+#if NET_2_0
+               protected virtual
+#endif
+               bool AllowSelection {
+                       get { return true; }
+               }
+
                #endregion Public Properties
 
                #region Public Methods
@@ -236,7 +243,7 @@
 
                        if (data_manager != null) {
                                PropertyDescriptorCollection col = 
data_manager.GetItemProperties ();
-                               prop = col.Find (field, true);                  
        
+                               prop = col.Find (field, true);
                        }
                        
                        if (prop == null)
@@ -254,7 +261,7 @@
                                }
                        }
                                                                
-                       return item.ToString ();                        
+                       return item.ToString ();
                }
 
                protected CurrencyManager DataManager {
@@ -290,7 +297,8 @@
 
                        if (DataManager != null) {
                                SetItemsCore (DataManager.List);
-                               SelectedIndex = DataManager.Position;
+                               if (AllowSelection)
+                                       SelectedIndex = DataManager.Position;
                        }
                }
 
@@ -377,11 +385,12 @@
                }
 
                private void OnPositionChanged (object sender, EventArgs e)
-               {                       
-                       SelectedIndex = data_manager.Position;
+               {
+                       if (AllowSelection)
+                               SelectedIndex = data_manager.Position;
                }
 
-               #endregion Private Methods      
+               #endregion Private Methods
        }
 
 }

Modified: 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog   
2007-01-02 14:07:24 UTC (rev 70363)
+++ trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog   
2007-01-02 14:37:40 UTC (rev 70364)
@@ -1,3 +1,11 @@
+2007-01-02  Gert Driesen  <[EMAIL PROTECTED]>
+
+       * ListControlTest.cs: Added test for AllowSelection.
+       * UpDownTest.cs: MockItem is now nested class.
+       * ListBoxTest.cs: Added test for AllowSelection.
+       * CheckedListBoxTest.cs: Added tests for DisplayMember, GetItemText,
+       SelectionMode, Text and ValueMember.
+
 2007-01-01  Gert Driesen  <[EMAIL PROTECTED]>
 
        * ToolBarTest.cs: Enabled test for bug #80416.

Modified: 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/CheckedListBoxTest.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/CheckedListBoxTest.cs
       2007-01-02 14:07:24 UTC (rev 70363)
+++ 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/CheckedListBoxTest.cs
       2007-01-02 14:37:40 UTC (rev 70364)
@@ -3,13 +3,16 @@
 //
 // Authors:
 //             Ritvik Mayank ([EMAIL PROTECTED])
+//             Gert Driesen ([EMAIL PROTECTED])
 //
 
 using System;
 using System.Collections;
-using System.Windows.Forms;
+using System.ComponentModel;
 using System.Drawing;
 using System.Reflection;
+using System.Windows.Forms;
+
 using NUnit.Framework;
 
 namespace MonoTests.System.Windows.Forms
@@ -57,6 +60,114 @@
                }
 
                [Test]
+               [NUnit.Framework.Category ("NotWorking")]
+               public void DisplayMember_HandleCreated ()
+               {
+                       MockItem itemA = new MockItem ("A1", 1);
+                       MockItem itemB = new MockItem ("B2", 2);
+                       MockItem itemC = new MockItem ("C3", 3);
+                       MockItem itemD = new MockItem ("D4", 4);
+                       MockItem itemE = new MockItem ("E5", 5);
+                       MockItem itemF = new MockItem ("F6", 6);
+
+                       CheckedListBox clb = new CheckedListBox ();
+                       clb.Items.Add (itemA, true);
+                       clb.Items.Add (itemC, false);
+                       clb.Items.Add (itemB, true);
+
+                       Form form = new Form ();
+                       form.ShowInTaskbar = false;
+                       form.Controls.Add (clb);
+                       form.Show ();
+
+                       Assert.AreEqual (string.Empty, clb.Text, "#A1");
+                       clb.SelectedIndex = 1;
+                       Assert.AreEqual (itemC.GetType ().FullName, clb.Text, 
"#A2");
+                       clb.DisplayMember = "Text";
+                       Assert.AreEqual ("C3", clb.Text, "#A3");
+                       clb.SelectedIndex = 2;
+                       Assert.AreEqual ("B2", clb.Text, "#A4");
+
+                       clb.Text = "C3";
+                       Assert.AreEqual (1, clb.SelectedIndex, "#B1");
+                       Assert.AreEqual ("C3", clb.Text, "#B2");
+                       clb.Text = "B";
+                       Assert.AreEqual (1, clb.SelectedIndex, "#B3");
+                       Assert.AreEqual ("C3", clb.Text, "#B4");
+
+                       ArrayList itemList = new ArrayList ();
+                       itemList.Add (itemD);
+                       itemList.Add (itemE);
+                       itemList.Add (itemF);
+
+                       clb.DataSource = itemList;
+                       clb.DisplayMember = string.Empty;
+                       clb.SelectedIndex = 1;
+
+                       Assert.AreEqual (itemC.GetType ().FullName, clb.Text, 
"#C1");
+                       clb.DisplayMember = "Text";
+                       Assert.AreEqual ("E5", clb.Text, "#C2");
+                       clb.SelectedIndex = 2;
+                       Assert.AreEqual ("F6", clb.Text, "#C3");
+
+                       clb.Text = "E5";
+                       Assert.AreEqual (1, clb.SelectedIndex, "#D1");
+                       Assert.AreEqual ("E5", clb.Text, "#D2");
+                       clb.Text = "D";
+                       Assert.AreEqual (1, clb.SelectedIndex, "#D3");
+                       Assert.AreEqual ("E5", clb.Text, "#D4");
+
+                       form.Dispose ();
+               }
+
+               [Test]
+               [NUnit.Framework.Category ("NotWorking")]
+               public void DisplayMember_HandleNotCreated ()
+               {
+                       MockItem itemA = new MockItem ("A1", 1);
+                       MockItem itemB = new MockItem ("B2", 2);
+                       MockItem itemC = new MockItem ("C3", 3);
+                       MockItem itemD = new MockItem ("D4", 4);
+                       MockItem itemE = new MockItem ("E5", 5);
+                       MockItem itemF = new MockItem ("F6", 6);
+
+                       CheckedListBox clb = new CheckedListBox ();
+                       clb.Items.Add (itemA, true);
+                       clb.Items.Add (itemC, false);
+                       clb.Items.Add (itemB, true);
+
+                       Assert.AreEqual (string.Empty, clb.Text, "#A1");
+                       clb.SelectedIndex = 1;
+                       Assert.AreEqual (itemC.GetType ().FullName, clb.Text, 
"#A2");
+                       clb.DisplayMember = "Text";
+                       Assert.AreEqual ("C3", clb.Text, "#A3");
+                       clb.SelectedIndex = 2;
+                       Assert.AreEqual ("B2", clb.Text, "#A4");
+
+                       clb.Text = "C3";
+                       Assert.AreEqual (1, clb.SelectedIndex, "#B1");
+                       Assert.AreEqual ("C3", clb.Text, "#B2");
+                       clb.Text = "C";
+                       Assert.AreEqual (1, clb.SelectedIndex, "#B3");
+                       Assert.AreEqual ("C3", clb.Text, "#B4");
+
+                       ArrayList itemList = new ArrayList ();
+                       itemList.Add (itemD);
+                       itemList.Add (itemE);
+                       itemList.Add (itemF);
+
+                       clb.DataSource = itemList;
+                       clb.DisplayMember = string.Empty;
+                       clb.SelectedIndex = 1;
+
+                       Assert.AreEqual (itemC.GetType ().FullName, clb.Text, 
"#C1");
+                       clb.DisplayMember = "Text";
+                       Assert.AreEqual ("C3", clb.Text, "#C2");
+                       clb.SelectedIndex = 2;
+                       Assert.AreEqual ("B2", clb.Text, "#C3");
+               }
+
+               [Test]
                public void GetItemCheckedTest ()
                {
                        Form f = new Form ();
@@ -99,9 +210,68 @@
                        Assert.AreEqual (CheckState.Indeterminate, 
mychklistbox.GetItemCheckState (1), "#15");
                        Assert.AreEqual (CheckState.Unchecked, 
mychklistbox.GetItemCheckState (2), "#16");
                        f.Dispose ();
-               }       
+               }
 
                [Test]
+               [NUnit.Framework.Category ("NotWorking")]
+               public void GetItemText ()
+               {
+                       MockItem itemA = new MockItem ("A", 1);
+                       MockItem itemB = new MockItem ("B", 2);
+
+                       CheckedListBox clb = new CheckedListBox ();
+                       clb.DisplayMember = "Text";
+                       clb.Items.Add (itemA, true);
+
+                       Assert.AreEqual ("A", clb.GetItemText (itemA), "#A1");
+                       Assert.AreEqual ("B", clb.GetItemText (itemB), "#A2");
+
+                       clb.DisplayMember = string.Empty;
+
+                       Assert.AreEqual (itemA.GetType ().FullName, 
clb.GetItemText (itemA), "#B1");
+                       Assert.AreEqual (itemB.GetType ().FullName, 
clb.GetItemText (itemB), "#B2");
+               }
+
+               [Test]
+               public void SelectionMode_Invalid ()
+               {
+                       CheckedListBox clb = new CheckedListBox ();
+
+                       try {
+                               clb.SelectionMode = SelectionMode.MultiSimple;
+                               Assert.Fail ("#A1");
+                       } catch (ArgumentException ex) {
+                               // Multi selection not supported on 
CheckedListBox
+                               Assert.AreEqual (typeof (ArgumentException), 
ex.GetType (), "#A2");
+                               Assert.IsNotNull (ex.Message, "#A3");
+                               Assert.IsNull (ex.ParamName, "#A4");
+                               Assert.IsNull (ex.InnerException, "#A5");
+                       }
+
+                       try {
+                               clb.SelectionMode = SelectionMode.MultiExtended;
+                               Assert.Fail ("#B1");
+                       } catch (ArgumentException ex) {
+                               // Multi selection not supported on 
CheckedListBox
+                               Assert.AreEqual (typeof (ArgumentException), 
ex.GetType (), "#B2");
+                               Assert.IsNotNull (ex.Message, "#B3");
+                               Assert.IsNull (ex.ParamName, "#B4");
+                               Assert.IsNull (ex.InnerException, "#B5");
+                       }
+
+                       try {
+                               clb.SelectionMode = (SelectionMode) 666;
+                               Assert.Fail ("#C1");
+                       } catch (InvalidEnumArgumentException ex) {
+                               Assert.AreEqual (typeof 
(InvalidEnumArgumentException), ex.GetType (), "#C2");
+                               Assert.IsNotNull (ex.Message, "#C3");
+                               Assert.IsNotNull (ex.ParamName, "#C4");
+                               Assert.AreEqual ("value", ex.ParamName, "#C5");
+                               Assert.IsNull (ex.InnerException, "#C6");
+                       }
+               }
+
+               [Test]
                public void SetItemCheckedTest ()
                {
                        Form myform = new Form ();
@@ -138,6 +308,297 @@
                        Assert.AreEqual (CheckState.Indeterminate, 
mychklistbox.GetItemCheckState (1), "#20");
                        Assert.AreEqual (CheckState.Unchecked, 
mychklistbox.GetItemCheckState (2), "#21");
                        myform.Dispose ();
-               }       
+               }
+
+#if NET_2_0
+               // Fails on 1.1 (both MS and Mono) because SelectedIndex is set
+               [Test]
+               public void Text_SelectionMode_None ()
+               {
+                       MockItem itemA = new MockItem ("A1", 1);
+                       MockItem itemB = new MockItem ("B2", 2);
+                       MockItem itemC = new MockItem ("C3", 3);
+                       MockItem itemD = new MockItem ("C3", 4);
+                       MockItem itemE = new MockItem ("", 5);
+                       MockItem itemF = new MockItem (null, 6);
+
+                       ArrayList itemList = new ArrayList ();
+                       itemList.Add (itemA);
+                       itemList.Add (itemC);
+                       itemList.Add (itemB);
+                       itemList.Add (itemD);
+                       itemList.Add (itemE);
+                       itemList.Add (itemF);
+
+                       CheckedListBox clb = new CheckedListBox ();
+                       clb.DisplayMember = "Text";
+                       clb.DataSource = itemList;
+                       clb.SelectionMode = SelectionMode.None;
+
+                       Form form = new Form ();
+                       form.ShowInTaskbar = false;
+                       form.Controls.Add (clb);
+                       form.Show ();
+
+                       Assert.AreEqual (string.Empty, clb.Text, "#A1");
+                       Assert.AreEqual (-1, clb.SelectedIndex, "#A2");
+
+                       clb.Text = "B2";
+                       Assert.AreEqual ("B2", clb.Text, "#B1");
+                       Assert.AreEqual (-1, clb.SelectedIndex, "#B2");
+
+                       clb.Text = "D";
+                       Assert.AreEqual ("D", clb.Text, "#C1");
+                       Assert.AreEqual (-1, clb.SelectedIndex, "#C2");
+
+                       clb.Text = "Doesnotexist";
+                       Assert.AreEqual ("Doesnotexist", clb.Text, "#D1");
+                       Assert.AreEqual (-1, clb.SelectedIndex, "#D2");
+
+                       clb.Text = string.Empty;
+                       Assert.AreEqual (string.Empty, clb.Text, "#E1");
+                       Assert.AreEqual (-1, clb.SelectedIndex, "#E2");
+
+                       clb.Text = null;
+                       Assert.AreEqual (string.Empty, clb.Text, "#F1");
+                       Assert.AreEqual (-1, clb.SelectedIndex, "#F2");
+
+                       form.Dispose ();
+               }
+
+               [Test]
+               public void AllowSelection ()
+               {
+                       MockCheckedListBox clb = new MockCheckedListBox ();
+                       clb.SelectionMode = SelectionMode.None;
+                       Assert.IsFalse (clb.allow_selection, "#1");
+                       clb.SelectionMode = SelectionMode.One;
+                       Assert.IsTrue (clb.allow_selection, "#2");
+               }
+#endif
+
+               [Test]
+               [NUnit.Framework.Category ("NotWorking")]
+               public void Text_SelectionMode_One ()
+               {
+                       MockItem itemA = new MockItem ("A1", 1);
+                       MockItem itemB = new MockItem ("B2", 2);
+                       MockItem itemC = new MockItem ("C3", 3);
+                       MockItem itemD = new MockItem ("C3", 4);
+                       MockItem itemE = new MockItem ("", 5);
+                       MockItem itemF = new MockItem (null, 6);
+
+                       ArrayList itemList = new ArrayList ();
+                       itemList.Add (itemA);
+                       itemList.Add (itemC);
+                       itemList.Add (itemB);
+                       itemList.Add (itemD);
+                       itemList.Add (itemE);
+                       itemList.Add (itemF);
+
+                       CheckedListBox clb = new CheckedListBox ();
+                       clb.DisplayMember = "Text";
+                       clb.DataSource = itemList;
+                       clb.SelectionMode = SelectionMode.One;
+
+                       Form form = new Form ();
+                       form.ShowInTaskbar = false;
+                       form.Controls.Add (clb);
+                       form.Show ();
+
+                       Assert.AreEqual ("A1", clb.Text, "#A1");
+                       Assert.AreEqual (0, clb.SelectedIndex, "#A2");
+
+                       clb.Text = "B2";
+                       Assert.AreEqual ("B2", clb.Text, "#B1");
+                       Assert.AreEqual (2, clb.SelectedIndex, "#B2");
+                       Assert.AreEqual (1, clb.SelectedItems.Count, "#B3");
+                       Assert.AreSame (itemB, clb.SelectedItems [0], "#B4");
+
+                       clb.Text = "D";
+                       Assert.AreEqual ("B2", clb.Text, "#C1");
+                       Assert.AreEqual (2, clb.SelectedIndex, "#C2");
+                       Assert.AreEqual (1, clb.SelectedItems.Count, "#C3");
+                       Assert.AreSame (itemB, clb.SelectedItems [0], "#C4");
+
+                       clb.Text = "Doesnotexist";
+                       Assert.AreEqual ("B2", clb.Text, "#D1");
+                       Assert.AreEqual (2, clb.SelectedIndex, "#D2");
+                       Assert.AreEqual (1, clb.SelectedItems.Count, "#D3");
+                       Assert.AreSame (itemB, clb.SelectedItems [0], "#D4");
+
+                       clb.Text = "C3";
+                       Assert.AreEqual ("C3", clb.Text, "#E1");
+                       Assert.AreEqual (1, clb.SelectedIndex, "#E2");
+                       Assert.AreEqual (1, clb.SelectedItems.Count, "#E3");
+                       Assert.AreSame (itemC, clb.SelectedItems [0], "#E4");
+
+                       clb.Text = string.Empty;
+                       Assert.AreEqual (string.Empty, clb.Text, "#F1");
+                       Assert.AreEqual (4, clb.SelectedIndex, "#F2");
+                       Assert.AreEqual (1, clb.SelectedItems.Count, "#F3");
+                       Assert.AreSame (itemE, clb.SelectedItems [0], "#F4");
+
+                       clb.Text = null;
+                       Assert.AreEqual (string.Empty, clb.Text, "#G1");
+                       Assert.AreEqual (4, clb.SelectedIndex, "#G2");
+                       Assert.AreEqual (1, clb.SelectedItems.Count, "#G3");
+                       Assert.AreSame (itemE, clb.SelectedItems [0], "#G4");
+
+                       clb.SelectedIndex = -1;
+                       Assert.AreEqual ("A1", clb.Text, "#H1");
+                       Assert.AreEqual (0, clb.SelectedIndex, "#H2");
+                       Assert.AreEqual (1, clb.SelectedItems.Count, "#H3");
+                       Assert.AreSame (itemA, clb.SelectedItems [0], "#H4");
+
+                       form.Dispose ();
+               }
+
+               [Test]
+               [NUnit.Framework.Category ("NotWorking")]
+               public void ValueMember_HandleCreated ()
+               {
+                       MockItem itemA = new MockItem ("A", 1);
+                       MockItem itemB = new MockItem ("B", 2);
+                       MockItem itemC = new MockItem ("C", 3);
+                       MockItem itemD = new MockItem ("D", 4);
+                       MockItem itemE = new MockItem ("E", 5);
+
+                       CheckedListBox clb = new CheckedListBox ();
+                       clb.Items.Add (itemA, true);
+                       clb.Items.Add (itemC, false);
+                       clb.Items.Add (itemB, true);
+                       clb.SelectedIndex = 1;
+
+                       Form form = new Form ();
+                       form.ShowInTaskbar = false;
+                       form.Controls.Add (clb);
+                       form.Show ();
+
+                       Assert.AreEqual (string.Empty, clb.ValueMember, "#A1");
+                       Assert.AreEqual (itemC.GetType ().FullName, clb.Text, 
"#A2");
+                       Assert.IsNull (clb.SelectedValue, "#A3");
+
+                       clb.ValueMember = "Value";
+                       Assert.AreEqual ("Value", clb.ValueMember, "#B1");
+                       Assert.AreEqual ("3", clb.Text, "#B2");
+                       Assert.IsNull (clb.SelectedValue, "#B3");
+
+                       clb.DisplayMember = "Text";
+                       Assert.AreEqual ("Value", clb.ValueMember, "#C1");
+                       Assert.AreEqual ("C", clb.Text, "#C2");
+                       Assert.IsNull (clb.SelectedValue, "#C3");
+
+                       ArrayList itemList = new ArrayList ();
+                       itemList.Add (itemD);
+                       itemList.Add (itemE);
+
+                       clb.DataSource = itemList;
+                       clb.ValueMember = string.Empty;
+                       clb.DisplayMember = string.Empty;
+                       clb.SelectedIndex = 1;
+
+                       Assert.AreEqual (string.Empty, clb.ValueMember, "#D1");
+                       Assert.AreEqual (itemC.GetType ().FullName, clb.Text, 
"#D2");
+                       Assert.IsNotNull (clb.SelectedValue, "#D3");
+                       Assert.AreSame (itemE, clb.SelectedValue, "#D4");
+
+                       clb.ValueMember = "Value";
+                       Assert.AreEqual ("Value", clb.ValueMember, "#E1");
+                       Assert.AreEqual ("5", clb.Text, "#E2");
+                       Assert.IsNotNull (clb.SelectedValue, "#E3");
+                       Assert.AreEqual (5, clb.SelectedValue, "#E4");
+
+                       clb.DisplayMember = "Text";
+                       Assert.AreEqual ("Value", clb.ValueMember, "#F1");
+                       Assert.AreEqual ("E", clb.Text, "#F2");
+                       Assert.IsNotNull (clb.SelectedValue, "#F3");
+                       Assert.AreEqual (5, clb.SelectedValue, "#F4");
+
+                       form.Dispose ();
+               }
+
+               [Test]
+               [NUnit.Framework.Category ("NotWorking")]
+               public void ValueMember_HandleNotCreated ()
+               {
+                       MockItem itemA = new MockItem ("A", 1);
+                       MockItem itemB = new MockItem ("B", 2);
+                       MockItem itemC = new MockItem ("C", 3);
+                       MockItem itemD = new MockItem ("D", 4);
+                       MockItem itemE = new MockItem ("E", 5);
+
+                       CheckedListBox clb = new CheckedListBox ();
+                       clb.Items.Add (itemA, true);
+                       clb.Items.Add (itemC, false);
+                       clb.Items.Add (itemB, true);
+                       clb.SelectedIndex = 1;
+
+                       Assert.AreEqual (string.Empty, clb.ValueMember, "#A1");
+                       Assert.AreEqual (itemC.GetType ().FullName, clb.Text, 
"#A2");
+                       Assert.IsNull (clb.SelectedValue, "#A3");
+
+                       clb.ValueMember = "Value";
+                       Assert.AreEqual ("Value", clb.ValueMember, "#B1");
+                       Assert.AreEqual ("3", clb.Text, "#B2");
+                       Assert.IsNull (clb.SelectedValue, "#B3");
+
+                       clb.DisplayMember = "Text";
+                       Assert.AreEqual ("Value", clb.ValueMember, "#C1");
+                       Assert.AreEqual ("C", clb.Text, "#C2");
+                       Assert.IsNull (clb.SelectedValue, "#C3");
+
+                       ArrayList itemList = new ArrayList ();
+                       itemList.Add (itemD);
+                       itemList.Add (itemE);
+
+                       clb.DataSource = itemList;
+                       clb.ValueMember = string.Empty;
+                       clb.DisplayMember = string.Empty;
+                       clb.SelectedIndex = 1;
+
+                       Assert.AreEqual (string.Empty, clb.ValueMember, "#D1");
+                       Assert.AreEqual (itemC.GetType ().FullName, clb.Text, 
"#D2");
+                       Assert.IsNull (clb.SelectedValue, "#D3");
+
+                       clb.ValueMember = "Value";
+                       Assert.AreEqual ("Value", clb.ValueMember, "#E1");
+                       Assert.AreEqual ("3", clb.Text, "#E2");
+                       Assert.IsNull (clb.SelectedValue, "#E3");
+
+                       clb.DisplayMember = "Text";
+                       Assert.AreEqual ("Value", clb.ValueMember, "#F1");
+                       Assert.AreEqual ("C", clb.Text, "#F2");
+                       Assert.IsNull (clb.SelectedValue, "#F3");       
+               }
+
+               public class MockCheckedListBox : CheckedListBox
+               {
+#if NET_2_0
+                       public bool allow_selection {
+                               get { return base.AllowSelection; }
+                       }
+#endif
+               }
+
+               public class MockItem
+               {
+                       public MockItem (string text, int value)
+                       {
+                               _text = text;
+                               _value = value;
+                       }
+
+                       public string Text {
+                               get { return _text; }
+                       }
+
+                       public int Value {
+                               get { return _value; }
+                       }
+
+                       private readonly string _text;
+                       private readonly int _value;
+               }
        }
 }

Modified: 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ListBoxTest.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ListBoxTest.cs  
    2007-01-02 14:07:24 UTC (rev 70363)
+++ 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ListBoxTest.cs  
    2007-01-02 14:37:40 UTC (rev 70364)
@@ -195,6 +195,18 @@
                        Assert.AreEqual (-1, x, "#203");
                }
 
+#if NET_2_0
+               [Test]
+               public void AllowSelection ()
+               {
+                       MockListBox lb = new MockListBox ();
+                       lb.SelectionMode = SelectionMode.None;
+                       Assert.IsFalse (lb.allow_selection, "#1");
+                       lb.SelectionMode = SelectionMode.One;
+                       Assert.IsTrue (lb.allow_selection, "#2");
+               }
+#endif
+
                //
                // Exceptions
                //
@@ -304,7 +316,14 @@
                        eventFired = true;
                }
 
-
+               public class MockListBox : ListBox
+               {
+#if NET_2_0
+                       public bool allow_selection {
+                               get { return base.AllowSelection; }
+                       }
+#endif
+               }
        }
 
        [TestFixture]
@@ -395,7 +414,5 @@
                {
                        col.Add (null);
                }
-
-
        }
 }

Modified: 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ListControlTest.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ListControlTest.cs
  2007-01-02 14:07:24 UTC (rev 70363)
+++ 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ListControlTest.cs
  2007-01-02 14:37:40 UTC (rev 70364)
@@ -51,6 +51,15 @@
                        ListControlChild lc = new ListControlChild ();
                        lc.DataSource = new object ();
                }
+
+#if NET_2_0
+               [Test]
+               public void AllowSelection ()
+               {
+                       ListControlChild lc = new ListControlChild ();
+                       Assert.IsTrue (lc.allow_selection);
+               }
+#endif
        }
 
        public class ListControlChild : ListControl
@@ -63,6 +72,12 @@
                        }
                }
 
+#if NET_2_0
+               public bool allow_selection {
+                       get { return base.AllowSelection; }
+               }
+#endif
+
                protected override void RefreshItem (int index)
                {
                }

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   
    2007-01-02 14:07:24 UTC (rev 70363)
+++ 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/UpDownTest.cs   
    2007-01-02 14:37:40 UTC (rev 70364)
@@ -1002,24 +1002,24 @@
                private int selected_item_changed = 0;
                private int text_changed = 0;
                private int value_changed = 0;
-       }
 
-       public class MockItem
-       {
-               public MockItem (string text)
+               public class MockItem
                {
-                       _text = text;
-               }
+                       public MockItem (string text)
+                       {
+                               _text = text;
+                       }
 
-               public string Text {
-                       get { return _text; }
-               }
+                       public string Text {
+                               get { return _text; }
+                       }
 
-               public override string ToString ()
-               {
-                       return _text;
+                       public override string ToString ()
+                       {
+                               return _text;
+                       }
+
+                       private readonly string _text;
                }
-
-               private readonly string _text;
        }
 }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to