Author: gert
Date: 2007-04-30 04:48:14 -0400 (Mon, 30 Apr 2007)
New Revision: 76482

Added:
   
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/DataGridViewTextBoxCellTest.cs
Modified:
   trunk/mcs/class/Managed.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewColumn.cs
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms_test.dll.sources
   trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
   
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/DataGridViewColumnTest.cs
   
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/EventLogger.cs
   
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/RichTextBoxTest.cs
   
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TabControlTest.cs
   
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TextBoxTest.cs
Log:
* DataGridViewColumn.cs: Initialize value of headercell to zero-length
string. When setting Name to null, use zero-length string instead.
* DataGridViewColumnTest.cs: Added test for bug #81464, improved
existing tests.
* DataGridViewTextBoxCellTest.cs: Added test for Value.
* RichTextBoxTest.cs: Added test for bug #80626.
* TabControlTest.cs: Added test for TabPageCollection indexer.
* TextBoxTest.cs: Enabled test for bug #80626.
* System.Windows.Forms_test.dll.sources: Added
DataGridViewTextBoxCellTest.cs


Modified: trunk/mcs/class/Managed.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/ChangeLog     2007-04-30 08:20:12 UTC 
(rev 76481)
+++ trunk/mcs/class/Managed.Windows.Forms/ChangeLog     2007-04-30 08:48:14 UTC 
(rev 76482)
@@ -1,3 +1,8 @@
+2007-04-30  Gert Driesen  <[EMAIL PROTECTED]>
+
+       * System.Windows.Forms_test.dll.sources: Added
+       DataGridViewTextBoxCellTest.cs
+
 2007-04-29  Duncan Mak  <[EMAIL PROTECTED]>
 
        * SWF.csproj: 

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-04-30 08:20:12 UTC (rev 76481)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-04-30 08:48:14 UTC (rev 76482)
@@ -1,3 +1,8 @@
+2007-04-30  Gert Driesen  <[EMAIL PROTECTED]>
+
+       * DataGridViewColumn.cs: Initialize value of headercell to zero-length
+       string. When setting Name to null, use zero-length string instead.
+
 2007-04-29  Andreia Gaita  <[EMAIL PROTECTED]>
 
        * TabControl.cs: Implement missing 2.0 methods (SelectTab, 

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewColumn.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewColumn.cs
    2007-04-30 08:20:12 UTC (rev 76481)
+++ 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewColumn.cs
    2007-04-30 08:48:14 UTC (rev 76482)
@@ -68,6 +68,7 @@
                        readOnly = false;
                        headerCell = new DataGridViewColumnHeaderCell();
                        headerCell.SetColumnIndex(Index);
+                       headerCell.Value = string.Empty;
                        displayIndex = -1;
                }
 
@@ -290,9 +291,12 @@
                        get { return name; }
                        set {
                                if (name != value) {
-                                       name = value;
+                                       if (value == null)
+                                               name = string.Empty;
+                                       else
+                                               name = value;
                                        if (!headerTextSet) {
-                                               headerCell.Value = value;
+                                               headerCell.Value = name;
                                        }
                                        if (DataGridView != null) {
                                                
DataGridView.OnColumnNameChanged(new DataGridViewColumnEventArgs(this));

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms_test.dll.sources
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms_test.dll.sources 
2007-04-30 08:20:12 UTC (rev 76481)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms_test.dll.sources 
2007-04-30 08:48:14 UTC (rev 76482)
@@ -46,6 +46,7 @@
 System.Windows.Forms/DataGridViewElementTest.cs
 System.Windows.Forms/DataGridViewRowTest.cs
 System.Windows.Forms/DataGridViewTest.cs
+System.Windows.Forms/DataGridViewTextBoxCellTest.cs
 System.Windows.Forms/DateTimePickerTest.cs
 System.Windows.Forms/DefaultLayoutTest.cs
 System.Windows.Forms/ErrorProviderTest.cs

Modified: 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog   
2007-04-30 08:20:12 UTC (rev 76481)
+++ trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog   
2007-04-30 08:48:14 UTC (rev 76482)
@@ -1,3 +1,12 @@
+2007-04-30  Gert Driesen  <[EMAIL PROTECTED]>
+
+       * DataGridViewColumnTest.cs: Added test for bug #81464, improved 
+       existing tests.
+       * DataGridViewTextBoxCellTest.cs: Added test for Value.
+       * RichTextBoxTest.cs: Added test for bug #80626.
+       * TabControlTest.cs: Added test for TabPageCollection indexer.
+       * TextBoxTest.cs: Enabled test for bug #80626.
+
 2007-04-29  Andreia Gaita  <[EMAIL PROTECTED]>
 
        * TabControlTest.cs: Add more 2.0 select and deselect tab tests.

Modified: 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/DataGridViewColumnTest.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/DataGridViewColumnTest.cs
   2007-04-30 08:20:12 UTC (rev 76481)
+++ 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/DataGridViewColumnTest.cs
   2007-04-30 08:48:14 UTC (rev 76482)
@@ -39,9 +39,14 @@
        [TestFixture]
        public class DataGridViewColumnTest
        {
+               [SetUp]
+               public void SetUp ()
+               {
+                       columnChanged = 0;
+               }
+
                [Test] // bug #80746
-               [Category ("NotWorking")]
-               public void HeaderText ()
+               public void HeaderText_NotBound ()
                {
                        DataGridViewColumn dvc = new DataGridViewColumn ();
                        Assert.AreEqual (string.Empty, dvc.HeaderText, "#A1");
@@ -70,26 +75,146 @@
                }
 
                [Test]
-               [Category ("NotWorking")]
-               public void Name ()
+               public void HeaderText_Bound ()
                {
-                       DataGridViewColumn dvc = new DataGridViewColumn ();
-                       Assert.AreEqual (string.Empty, dvc.Name, "#A1");
+                       DataGridView dataGrid = new DataGridView ();
+                       DataGridViewColumn dvc = new DataGridViewTextBoxColumn 
();
+                       dataGrid.ColumnNameChanged += new 
DataGridViewColumnEventHandler (
+                               DataGridView_ColumnNameChanged);
+                       dataGrid.Columns.Add (dvc);
+                       Assert.AreEqual (string.Empty, dvc.HeaderText, "#A1");
                        Assert.AreEqual (string.Empty, dvc.HeaderCell.Value, 
"#A2");
+                       Assert.AreEqual (string.Empty, dvc.Name, "#A3");
+                       Assert.AreEqual (0, columnChanged, "#A4");
+                       dvc.HeaderText = "A";
+                       Assert.AreEqual ("A", dvc.HeaderText, "#B1");
+                       Assert.AreEqual ("A", dvc.HeaderCell.Value, "#B2");
+                       Assert.AreEqual (string.Empty, dvc.Name, "#B3");
+                       Assert.AreEqual (0, columnChanged, "#B4");
+                       dvc.Name = "B";
+                       Assert.AreEqual ("A", dvc.HeaderText, "#C1");
+                       Assert.AreEqual ("A", dvc.HeaderCell.Value, "#C2");
+                       Assert.AreEqual ("B", dvc.Name, "#C3");
+                       Assert.AreEqual (1, columnChanged, "#C4");
+                       dvc.HeaderText = "C";
+                       Assert.AreEqual ("C", dvc.HeaderText, "#D1");
+                       Assert.AreEqual ("C", dvc.HeaderCell.Value, "#D2");
+                       Assert.AreEqual ("B", dvc.Name, "#D3");
+                       Assert.AreEqual (1, columnChanged, "#D4");
+                       dvc.HeaderText = string.Empty;
+                       Assert.AreEqual (string.Empty, dvc.HeaderText, "#E1");
+                       Assert.AreEqual (string.Empty, dvc.HeaderCell.Value, 
"#E2");
+                       Assert.AreEqual ("B", dvc.Name, "#E3");
+                       Assert.AreEqual (1, columnChanged, "#E4");
+               }
+
+               [Test]
+               public void Name_Bound ()
+               {
+                       DataGridView dataGrid = new DataGridView ();
+                       DataGridViewColumn dvc = new DataGridViewTextBoxColumn 
();
+                       dataGrid.ColumnNameChanged += new 
DataGridViewColumnEventHandler (
+                               DataGridView_ColumnNameChanged);
+                       dataGrid.Columns.Add (dvc);
+                       Assert.AreEqual (string.Empty, dvc.HeaderText, "#A1");
+                       Assert.AreEqual (string.Empty, dvc.HeaderCell.Value, 
"#A2");
+                       Assert.AreEqual (string.Empty, dvc.Name, "#A3");
+                       Assert.AreEqual (0, columnChanged, "#A4");
                        dvc.Name = "A";
-                       Assert.AreEqual ("A", dvc.Name, "#B");
+                       //Assert.AreEqual (string.Empty, dvc.HeaderText, "#B1");
                        Assert.AreEqual ("A", dvc.HeaderCell.Value, "#B2");
+                       Assert.AreEqual ("A", dvc.Name, "#B3");
+                       Assert.AreEqual (1, columnChanged, "#B4");
                        dvc.Name = "B";
-                       Assert.AreEqual ("B", dvc.Name, "#C1");
+                       Assert.AreEqual ("B", dvc.HeaderText, "#C1");
                        Assert.AreEqual ("B", dvc.HeaderCell.Value, "#C2");
+                       Assert.AreEqual ("B", dvc.Name, "#C3");
+                       Assert.AreEqual (2, columnChanged, "#C4");
                        dvc.Name = null;
-                       Assert.AreEqual (string.Empty, dvc.Name, "#D1");
+                       Assert.AreEqual (string.Empty, dvc.HeaderText, "#D1");
                        Assert.AreEqual (string.Empty, dvc.HeaderCell.Value, 
"#D2");
-                       dvc.HeaderText = "D";
+                       Assert.AreEqual (string.Empty, dvc.Name, "#D3");
+                       Assert.AreEqual (3, columnChanged, "#D4");
+                       dvc.HeaderText = "C";
+                       Assert.AreEqual ("C", dvc.HeaderText, "#E1");
+                       Assert.AreEqual ("C", dvc.HeaderCell.Value, "#E2");
+                       Assert.AreEqual (string.Empty, dvc.Name, "#E3");
+                       Assert.AreEqual (3, columnChanged, "#E4");
+                       dvc.Name = "D";
+                       Assert.AreEqual ("C", dvc.HeaderText, "#F1");
+                       Assert.AreEqual ("C", dvc.HeaderCell.Value, "#F2");
+                       Assert.AreEqual ("D", dvc.Name, "#F3");
+                       Assert.AreEqual (4, columnChanged, "#F4");
+                       dvc.HeaderText = null;
+                       Assert.AreEqual (string.Empty, dvc.HeaderText, "#G1");
+                       Assert.IsNull (dvc.HeaderCell.Value, "#G2");
+                       Assert.AreEqual ("D", dvc.Name, "#G3");
+                       Assert.AreEqual (4, columnChanged, "#G4");
                        dvc.Name = "E";
-                       Assert.AreEqual ("E", dvc.Name, "#E1");
-                       Assert.AreEqual ("D", dvc.HeaderCell.Value, "#E2");
+                       Assert.AreEqual (string.Empty, dvc.HeaderText, "#H1");
+                       Assert.IsNull (dvc.HeaderCell.Value, "#H2");
+                       Assert.AreEqual ("E", dvc.Name, "#H3");
+                       Assert.AreEqual (5, columnChanged, "#H4");
+                       dvc.Name = null;
+                       Assert.AreEqual (string.Empty, dvc.HeaderText, "#I1");
+                       Assert.IsNull (dvc.HeaderCell.Value, "#I2");
+                       Assert.AreEqual (string.Empty, dvc.Name, "#I3");
+                       Assert.AreEqual (6, columnChanged, "#I4");
+                       dvc.Name = "F";
+                       Assert.AreEqual (string.Empty, dvc.HeaderText, "#J1");
+                       Assert.IsNull (dvc.HeaderCell.Value, "#J2");
+                       Assert.AreEqual ("F", dvc.Name, "#J3");
+                       Assert.AreEqual (7, columnChanged, "#J4");
+                       dvc.Name = "G";
+                       Assert.AreEqual (string.Empty, dvc.HeaderText, "#K1");
+                       Assert.IsNull (dvc.HeaderCell.Value, "#K2");
+                       Assert.AreEqual ("G", dvc.Name, "#K3");
+                       Assert.AreEqual (8, columnChanged, "#K4");
                }
+
+               [Test]
+               public void Name_NotBound ()
+               {
+                       DataGridViewColumn dvc = new DataGridViewTextBoxColumn 
();
+                       Assert.AreEqual (string.Empty, dvc.HeaderText, "#A1");
+                       Assert.AreEqual (string.Empty, dvc.Name, "#A2");
+                       Assert.AreEqual (string.Empty, dvc.HeaderCell.Value, 
"#A3");
+                       dvc.Name = "A";
+                       Assert.AreEqual ("A", dvc.HeaderText, "#B1");
+                       Assert.AreEqual ("A", dvc.HeaderCell.Value, "#B2");
+                       Assert.AreEqual ("A", dvc.Name, "#B3");
+                       dvc.Name = "B";
+                       Assert.AreEqual ("B", dvc.HeaderText, "#C1");
+                       Assert.AreEqual ("B", dvc.HeaderCell.Value, "#C2");
+                       Assert.AreEqual ("B", dvc.Name, "#C3");
+                       dvc.Name = null;
+                       Assert.AreEqual (string.Empty, dvc.HeaderText, "#D1");
+                       Assert.AreEqual (string.Empty, dvc.HeaderCell.Value, 
"#D2");
+                       Assert.AreEqual (string.Empty, dvc.Name, "#D3");
+                       dvc.HeaderText = "C";
+                       Assert.AreEqual ("C", dvc.HeaderText, "#E1");
+                       Assert.AreEqual ("C", dvc.HeaderCell.Value, "#E2");
+                       Assert.AreEqual (string.Empty, dvc.Name, "#E3");
+                       dvc.Name = "D";
+                       Assert.AreEqual ("C", dvc.HeaderText, "#F1");
+                       Assert.AreEqual ("C", dvc.HeaderCell.Value, "#F2");
+                       Assert.AreEqual ("D", dvc.Name, "#F3");
+                       dvc.HeaderText = null;
+                       Assert.AreEqual (string.Empty, dvc.HeaderText, "#G1");
+                       Assert.IsNull (dvc.HeaderCell.Value, "#G2");
+                       Assert.AreEqual ("D", dvc.Name, "#G3");
+                       dvc.Name = "E";
+                       Assert.AreEqual (string.Empty, dvc.HeaderText, "#H1");
+                       Assert.IsNull (dvc.HeaderCell.Value, "#H2");
+                       Assert.AreEqual ("E", dvc.Name, "#H3");
+               }
+
+               void DataGridView_ColumnNameChanged (object sender, 
DataGridViewColumnEventArgs e)
+               {
+                       columnChanged++;
+               }
+
+               private int columnChanged;
        }
 }
 #endif

Added: 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/DataGridViewTextBoxCellTest.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/DataGridViewTextBoxCellTest.cs
      2007-04-30 08:20:12 UTC (rev 76481)
+++ 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/DataGridViewTextBoxCellTest.cs
      2007-04-30 08:48:14 UTC (rev 76482)
@@ -0,0 +1,56 @@
+//
+// DataGridViewTextBoxCellTest.cs - Unit tests for
+// System.Windows.Forms.DataGridViewTextBoxCell
+//
+// Author:
+//     Gert Driesen  <[EMAIL PROTECTED]>
+//
+// Copyright (C) 2007 Gert Driesen
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+
+using System;
+using System.Windows.Forms;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Windows.Forms
+{
+       [TestFixture]
+       public class DataGridViewTextBoxCellTest
+       {
+               [Test]
+               public void Value ()
+               {
+                       DataGridViewTextBoxCell tbc = new 
DataGridViewTextBoxCell ();
+                       Assert.IsNull (tbc.Value, "#1");
+                       tbc.Value = string.Empty;
+                       Assert.AreEqual (string.Empty, tbc.Value, "#2");
+                       tbc.Value = 5;
+                       Assert.AreEqual (5, tbc.Value, "#3");
+                       tbc.Value = null;
+                       Assert.IsNull (tbc.Value, "#4");
+               }
+       }
+}
+#endif


Property changes on: 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/DataGridViewTextBoxCellTest.cs
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/EventLogger.cs
___________________________________________________________________
Name: svn:executable
   - *

Modified: 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/RichTextBoxTest.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/RichTextBoxTest.cs
  2007-04-30 08:20:12 UTC (rev 76481)
+++ 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/RichTextBoxTest.cs
  2007-04-30 08:48:14 UTC (rev 76482)
@@ -122,6 +122,16 @@
                        Assert.AreEqual (SystemColors.Window, rtb.BackColor, 
"#3");
                }
 
+               [Test] // bug #80626
+               public void BorderStyle_None ()
+               {
+                       RichTextBox rtb = new RichTextBox ();
+                       rtb.BorderStyle = BorderStyle.None;
+                       Assert.AreEqual (96, rtb.Height, "#1");
+                       rtb.CreateControl ();
+                       Assert.AreEqual (96, rtb.Height, "#2");
+               }
+
                [Test] // bug #80620
                public void ClientRectangle_Borders ()
                {

Modified: 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TabControlTest.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TabControlTest.cs
   2007-04-30 08:20:12 UTC (rev 76481)
+++ 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TabControlTest.cs
   2007-04-30 08:48:14 UTC (rev 76482)
@@ -716,4 +716,36 @@
                }
 #endif
        }
+
+       [TestFixture]
+       public class TabPageCollectionTest
+       {
+               [Test]
+               public void Indexer ()
+               {
+                       TabControl tab = new TabControl ();
+                       TabControl.TabPageCollection tabPages = new 
TabControl.TabPageCollection (tab);
+                       TabPage tabPageA = new TabPage ();
+                       TabPage tabPageB = new TabPage ();
+                       TabPage tabPageC = new TabPage ();
+                       TabPage tabPageD = new TabPage ();
+                       tabPages.Add (tabPageA);
+                       Assert.AreSame (tabPageA, tabPages [0], "#1");
+                       tabPages [0] = tabPageB;
+                       Assert.AreSame (tabPageB, tabPages [0], "#2");
+                       tabPages.Add (tabPageC);
+                       Assert.AreSame (tabPageB, tabPages [0], "#3");
+                       Assert.AreSame (tabPageC, tabPages [1], "#4");
+                       tabPages.Remove (tabPageB);
+                       Assert.AreSame (tabPageC, tabPages [0], "#5");
+                       tabPages [0] = tabPageD;
+                       Assert.AreSame (tabPageD, tabPages [0], "#6");
+
+                       Form form = new Form ();
+                       form.ShowInTaskbar = false;
+                       form.Controls.Add (tab);
+                       form.Show ();
+                       form.Dispose ();
+               }
+       }
 }

Modified: 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TextBoxTest.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TextBoxTest.cs  
    2007-04-30 08:20:12 UTC (rev 76481)
+++ 
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TextBoxTest.cs  
    2007-04-30 08:48:14 UTC (rev 76482)
@@ -245,7 +245,6 @@
                }
 
                [Test] // bug #80626
-               [Category ("NotWorking")]
                public void BorderStyle_None ()
                {
                        textBox.BorderStyle = BorderStyle.None;

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

Reply via email to