Author: jackson
Date: 2006-05-25 18:23:24 -0400 (Thu, 25 May 2006)
New Revision: 61144
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TabControlTest.cs
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TreeViewTest.cs
Log:
* TreeViewTest.cs: Add a couple of default properties.
* Put in
correct namespace.
* TabControlTest.cs: Put in correct namespace.
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
2006-05-25 20:24:49 UTC (rev 61143)
+++ trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
2006-05-25 22:23:24 UTC (rev 61144)
@@ -1,3 +1,9 @@
+2006-05-25 Jackson Harper <[EMAIL PROTECTED]>
+
+ * TreeViewTest.cs: Add a couple of default properties. Put in
+ correct namespace.
+ * TabControlTest.cs: Put in correct namespace.
+
2006-05-25 Atsushi Enomoto <[EMAIL PROTECTED]>
* BindingContextTest.cs : added more tests for Item, Contains()
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
2006-05-25 20:24:49 UTC (rev 61143)
+++
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TabControlTest.cs
2006-05-25 22:23:24 UTC (rev 61144)
@@ -12,125 +12,132 @@
using NUnit.Framework;
-[TestFixture]
-public class TabControlTest
-{
- [Test]
- [Category ("NotWorking")]
- public void TabControlPropertyTest ()
+
+
+
+namespace MonoTests.System.Windows.Forms {
+
+ [TestFixture]
+ public class TabControlTest
{
- Form myForm = new Form ();
- TabControl myTabControl = new TabControl ();
- myTabControl.Visible = true;
- myTabControl.Name = "Mono TabControl";
+ [Test]
+ [Category ("NotWorking")]
+ public void TabControlPropertyTest ()
+ {
+ Form myForm = new Form ();
+ TabControl myTabControl = new TabControl ();
+ myTabControl.Visible = true;
+ myTabControl.Name = "Mono TabControl";
- // A
- Assert.AreEqual (TabAlignment.Top, myTabControl.Alignment,
"A1");
- Assert.AreEqual (TabAppearance.Normal, myTabControl.Appearance,
"#A2");
+ // A
+ Assert.AreEqual (TabAlignment.Top,
myTabControl.Alignment, "A1");
+ Assert.AreEqual (TabAppearance.Normal,
myTabControl.Appearance, "#A2");
- // D
- Assert.AreEqual (4, myTabControl.DisplayRectangle.X, "#D1");
- Assert.AreEqual (4, myTabControl.DisplayRectangle.Y, "#D2");
- Assert.AreEqual (192, myTabControl.DisplayRectangle.Width,
"#D3");
- Assert.AreEqual (92, myTabControl.DisplayRectangle.Height,
"#D4");
- Assert.AreEqual (TabDrawMode.Normal, myTabControl.DrawMode,
"#D5");
+ // D
+ Assert.AreEqual (4, myTabControl.DisplayRectangle.X,
"#D1");
+ Assert.AreEqual (4, myTabControl.DisplayRectangle.Y,
"#D2");
+ Assert.AreEqual (192,
myTabControl.DisplayRectangle.Width, "#D3");
+ Assert.AreEqual (92,
myTabControl.DisplayRectangle.Height, "#D4");
+ Assert.AreEqual (TabDrawMode.Normal,
myTabControl.DrawMode, "#D5");
- // H
- Assert.AreEqual (false, myTabControl.HotTrack, "#H1");
+ // H
+ Assert.AreEqual (false, myTabControl.HotTrack, "#H1");
- // I
- Assert.AreEqual (null, myTabControl.ImageList, "#I1");
- // It is environment dependent
- //Assert.AreEqual (18, myTabControl.ItemSize.Height, "#I2");
- Assert.AreEqual (0, myTabControl.ItemSize.Width, "#I3");
+ // I
+ Assert.AreEqual (null, myTabControl.ImageList, "#I1");
+ // It is environment dependent
+ //Assert.AreEqual (18, myTabControl.ItemSize.Height,
"#I2");
+ Assert.AreEqual (0, myTabControl.ItemSize.Width, "#I3");
- // M
- Assert.AreEqual (false, myTabControl.Multiline, "#M1");
+ // M
+ Assert.AreEqual (false, myTabControl.Multiline, "#M1");
- // P
- Assert.AreEqual (6, myTabControl.Padding.X, "#P1");
- Assert.AreEqual (3, myTabControl.Padding.Y, "#P1");
+ // P
+ Assert.AreEqual (6, myTabControl.Padding.X, "#P1");
+ Assert.AreEqual (3, myTabControl.Padding.Y, "#P1");
- // R
- Assert.AreEqual (0, myTabControl.RowCount, "#R1");
+ // R
+ Assert.AreEqual (0, myTabControl.RowCount, "#R1");
- // S
- Assert.AreEqual (-1, myTabControl.SelectedIndex, "#S1");
- Assert.AreEqual (null, myTabControl.SelectedTab, "#S2");
- Assert.AreEqual (false, myTabControl.ShowToolTips, "#S3");
- Assert.AreEqual (TabSizeMode.Normal, myTabControl.SizeMode,
"#S4");
+ // S
+ Assert.AreEqual (-1, myTabControl.SelectedIndex, "#S1");
+ Assert.AreEqual (null, myTabControl.SelectedTab, "#S2");
+ Assert.AreEqual (false, myTabControl.ShowToolTips,
"#S3");
+ Assert.AreEqual (TabSizeMode.Normal,
myTabControl.SizeMode, "#S4");
- // T
- Assert.AreEqual (0, myTabControl.TabCount, "#T1");
- Assert.AreEqual (0, myTabControl.TabPages.Count, "#T2");
- }
+ // T
+ Assert.AreEqual (0, myTabControl.TabCount, "#T1");
+ Assert.AreEqual (0, myTabControl.TabPages.Count, "#T2");
+ }
- [Test]
- [Category ("NotWorking")]
- public void GetTabRectTest ()
- {
- TabControl myTabControl = new TabControl ();
- TabPage myTabPage = new TabPage();
- myTabControl.Controls.Add(myTabPage);
- myTabPage.TabIndex = 0;
- Rectangle myTabRect = myTabControl.GetTabRect (0);
- Assert.AreEqual (2, myTabRect.X, "#GetT1");
- Assert.AreEqual (2, myTabRect.Y, "#GetT2");
- Assert.AreEqual (42, myTabRect.Width, "#GetT3");
- // It is environment dependent
- //Assert.AreEqual (18, myTabRect.Height, "#GetT4");
- }
+ [Test]
+ [Category ("NotWorking")]
+ public void GetTabRectTest ()
+ {
+ TabControl myTabControl = new TabControl ();
+ TabPage myTabPage = new TabPage();
+ myTabControl.Controls.Add(myTabPage);
+ myTabPage.TabIndex = 0;
+ Rectangle myTabRect = myTabControl.GetTabRect (0);
+ Assert.AreEqual (2, myTabRect.X, "#GetT1");
+ Assert.AreEqual (2, myTabRect.Y, "#GetT2");
+ Assert.AreEqual (42, myTabRect.Width, "#GetT3");
+ // It is environment dependent
+ //Assert.AreEqual (18, myTabRect.Height, "#GetT4");
+ }
- [Test]
- public void ToStringTest ()
- {
- TabControl myTabControl = new TabControl ();
- Assert.AreEqual ("System.Windows.Forms.TabControl,
TabPages.Count: 0", myTabControl.ToString(), "#1");
- }
+ [Test]
+ public void ToStringTest ()
+ {
+ TabControl myTabControl = new TabControl ();
+ Assert.AreEqual ("System.Windows.Forms.TabControl,
TabPages.Count: 0", myTabControl.ToString(), "#1");
+ }
- [Test]
- public void ClearTabPagesTest ()
- {
- // no tab pages
- TabControl tab = new TabControl ();
- tab.TabPages.Clear ();
- Assert.AreEqual (-1, tab.SelectedIndex, "#A1");
- Assert.AreEqual (0, tab.TabPages.Count, "#A2");
+ [Test]
+ public void ClearTabPagesTest ()
+ {
+ // no tab pages
+ TabControl tab = new TabControl ();
+ tab.TabPages.Clear ();
+ Assert.AreEqual (-1, tab.SelectedIndex, "#A1");
+ Assert.AreEqual (0, tab.TabPages.Count, "#A2");
- // single tab page
- tab.Controls.Add (new TabPage ());
- Assert.AreEqual (0, tab.SelectedIndex, "#B1");
- Assert.AreEqual (1, tab.TabPages.Count, "#B2");
- tab.TabPages.Clear();
- Assert.AreEqual (-1, tab.SelectedIndex, "#B3");
- Assert.AreEqual (0, tab.TabPages.Count, "#B4");
+ // single tab page
+ tab.Controls.Add (new TabPage ());
+ Assert.AreEqual (0, tab.SelectedIndex, "#B1");
+ Assert.AreEqual (1, tab.TabPages.Count, "#B2");
+ tab.TabPages.Clear();
+ Assert.AreEqual (-1, tab.SelectedIndex, "#B3");
+ Assert.AreEqual (0, tab.TabPages.Count, "#B4");
- // multiple tab pages
- tab.Controls.Add (new TabPage ());
- tab.Controls.Add (new TabPage ());
- tab.Controls.Add (new TabPage ());
- Assert.AreEqual (0, tab.SelectedIndex, "#C1");
- Assert.AreEqual (3, tab.TabPages.Count, "#C2");
- tab.SelectedIndex = 1;
- tab.TabPages.Clear ();
- Assert.AreEqual (-1, tab.SelectedIndex, "#C3");
- Assert.AreEqual (0, tab.TabPages.Count, "#C4");
- }
+ // multiple tab pages
+ tab.Controls.Add (new TabPage ());
+ tab.Controls.Add (new TabPage ());
+ tab.Controls.Add (new TabPage ());
+ Assert.AreEqual (0, tab.SelectedIndex, "#C1");
+ Assert.AreEqual (3, tab.TabPages.Count, "#C2");
+ tab.SelectedIndex = 1;
+ tab.TabPages.Clear ();
+ Assert.AreEqual (-1, tab.SelectedIndex, "#C3");
+ Assert.AreEqual (0, tab.TabPages.Count, "#C4");
+ }
- [Test]
- public void SetSelectedIndex ()
- {
- // bug #78395
- TabControl c = new TabControl ();
- c.SelectedIndex = 0;
+ [Test]
+ public void SetSelectedIndex ()
+ {
+ // bug #78395
+ TabControl c = new TabControl ();
+ c.SelectedIndex = 0;
- c.TabPages.Add (new TabPage ());
- c.TabPages.Add (new TabPage ());
- Assert.AreEqual (0, c.SelectedIndex, "#1");
- Form f = new Form ();
- f.Controls.Add (c);
- f.Show ();
- c.SelectedIndex = 2; // beyond the pages - ignored
- Assert.AreEqual (0, c.SelectedIndex, "#2");
+ c.TabPages.Add (new TabPage ());
+ c.TabPages.Add (new TabPage ());
+ Assert.AreEqual (0, c.SelectedIndex, "#1");
+ Form f = new Form ();
+ f.Controls.Add (c);
+ f.Show ();
+ c.SelectedIndex = 2; // beyond the pages - ignored
+ Assert.AreEqual (0, c.SelectedIndex, "#2");
+ }
}
+
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TreeViewTest.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TreeViewTest.cs
2006-05-25 20:24:49 UTC (rev 61143)
+++
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/TreeViewTest.cs
2006-05-25 22:23:24 UTC (rev 61144)
@@ -3,32 +3,35 @@
using System.Windows.Forms;
using System.Drawing;
-[TestFixture]
-public class TreeViewTest {
- [Test]
- [Ignore ("This test has to be completly reviewed")]
- public void DefaultCtor ()
- {
- TreeView tv = new TreeView ();
- Assert.AreEqual (121, tv.Width, "#1");
- Assert.AreEqual (97, tv.Height, "#2");
- //Assert.AreEqual (BorderStyle.Fixed3D, tv.BorderStyle, "#3");
+namespace MonoTests.System.Windows.Forms {
- // Windows specific
- Assert.AreEqual (SystemColors.Window, tv.BackColor);
- }
+ [TestFixture]
+ public class TreeViewTest {
- [Test]
- public void SimpleShowTest ()
- {
- Form f = new Form ();
- TreeView tv = new TreeView ();
- //tv.BorderStyle = BorderStyle.FixedSingle;
- tv.Location = new Point (20, 20);
- //tv.Text = "adssssss";
+ [Test]
+ public void DefaultCtor ()
+ {
+ TreeView tv = new TreeView ();
+ Assert.AreEqual (121, tv.Width, "#1");
+ Assert.AreEqual (97, tv.Height, "#2");
- f.Controls.Add (tv);
- f.Show ();
+ Assert.IsTrue (tv.Scrollable, "#3");
+ Assert.AreEqual (tv.SelectedNode, null, "#4");
+ }
+
+ [Test]
+ public void SimpleShowTest ()
+ {
+ Form f = new Form ();
+ TreeView tv = new TreeView ();
+ //tv.BorderStyle = BorderStyle.FixedSingle;
+ tv.Location = new Point (20, 20);
+ //tv.Text = "adssssss";
+
+ f.Controls.Add (tv);
+ f.Show ();
+ }
+
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
