2006-12-18 Daniel Nauck <[email protected]>

	* DataGridViewAdvancedBorderStyleTest.cs,
	DataGridViewRowTest.cs,
	DataGridViewElementTest.cs,
	DataGridViewCellTest.cs,
	DataGridViewCellStyleTest.cs,
	DataGridViewTest.cs: fixed NUnit obsolete warnings and
	DataGridView tests against .NET 2.0


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

mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog

@@ -1,3 +1,13 @@
+2006-12-18  Daniel Nauck  <[email protected]>
+
+	* DataGridViewAdvancedBorderStyleTest.cs,
+	DataGridViewRowTest.cs,
+	DataGridViewElementTest.cs,
+	DataGridViewCellTest.cs,
+	DataGridViewCellStyleTest.cs,
+	DataGridViewTest.cs: fixed NUnit obsolete warnings and
+	DataGridView tests against .NET 2.0
+
 2006-12-17  Daniel Nauck  <[email protected]>
 
 	* ButtonTest.cs: Added tests for FlatButtonAppearance.

mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/DataGridViewAdvancedBorderStyleTest.cs

@@ -17,7 +17,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-// Copyright (c) 2005 Novell, Inc. (http://www.novell.com)
+// Copyright (c) 2005,2006 Novell, Inc. (http://www.novell.com)
 //
 // Author:
 //	Pedro Martínez Juliá <[email protected]>
@@ -36,7 +36,7 @@ using System.Collections;
 namespace MonoTests.System.Windows.Forms {
 
 	[TestFixture]
-	public class DataGridViewAdvancedBorderStyleTest : Assertion {
+	public class DataGridViewAdvancedBorderStyleTest {
 
 		private DataGridViewAdvancedBorderStyle style;
 		
@@ -51,15 +51,15 @@ namespace MonoTests.System.Windows.Forms {
 
 		[Test]
 		public void TestDefaultValues () {
-			AssertEquals("All property before any change", DataGridViewAdvancedCellBorderStyle.None, style.All);
+			Assert.AreEqual (DataGridViewAdvancedCellBorderStyle.None, style.All, "#A1");
 			style.Left = DataGridViewAdvancedCellBorderStyle.Single;
-			AssertEquals("All property after changes", DataGridViewAdvancedCellBorderStyle.NotSet, style.All);
+			Assert.AreEqual (DataGridViewAdvancedCellBorderStyle.NotSet, style.All, "#A2");
 			style.All = DataGridViewAdvancedCellBorderStyle.Single;
-			AssertEquals("All property after changes", DataGridViewAdvancedCellBorderStyle.Single, style.All);
-			AssertEquals("Left property after changes", DataGridViewAdvancedCellBorderStyle.Single, style.Left);
-			AssertEquals("Right property after changes", DataGridViewAdvancedCellBorderStyle.Single, style.Right);
-			AssertEquals("Top property after changes", DataGridViewAdvancedCellBorderStyle.Single, style.Top);
-			AssertEquals("Bottom property after changes", DataGridViewAdvancedCellBorderStyle.Single, style.Bottom);
+			Assert.AreEqual (DataGridViewAdvancedCellBorderStyle.Single, style.All, "#A3");
+			Assert.AreEqual (DataGridViewAdvancedCellBorderStyle.Single, style.Left, "#A4");
+			Assert.AreEqual (DataGridViewAdvancedCellBorderStyle.Single, style.Right, "#A5");
+			Assert.AreEqual (DataGridViewAdvancedCellBorderStyle.Single, style.Top, "#A6");
+			Assert.AreEqual (DataGridViewAdvancedCellBorderStyle.Single, style.Bottom, "#A7");
 		}
 
 		[Test]
@@ -141,9 +141,7 @@ namespace MonoTests.System.Windows.Forms {
 		public void TestBottomArgumentException () {
 			style.Bottom = DataGridViewAdvancedCellBorderStyle.NotSet;
 		}
-
 	}
-
 }
 
 #endif

mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/DataGridViewCellStyleTest.cs

@@ -37,7 +37,7 @@ using System.Globalization;
 namespace MonoTests.System.Windows.Forms {
 
 	[TestFixture]
-	public class DataGridViewCellStyleTest : Assertion {
+	public class DataGridViewCellStyleTest {
 
 		DataGridViewCellStyle style;
 		
@@ -53,38 +53,38 @@ namespace MonoTests.System.Windows.Forms {
 
 		[Test]
 		public void TestDefaultValues () {
-			AssertEquals("Alignment property", DataGridViewContentAlignment.NotSet, style.Alignment);
-			AssertEquals("BackColor property", Color.Empty, style.BackColor);
-			AssertEquals("Font property", null, style.Font);
-			AssertEquals("ForeColor property", Color.Empty, style.ForeColor);
-			AssertEquals("Format property", String.Empty, style.Format);
-			AssertEquals("FormatProvider property", CultureInfo.CurrentUICulture, style.FormatProvider);
-			AssertEquals("IsFormatProviderDefault property", true, style.IsFormatProviderDefault);
-			AssertEquals("IsNullValueDefault property", true, style.IsNullValueDefault);
-			AssertEquals("NullValue property", "(null)", style.NullValue);
-			AssertEquals("SelectionBackColor property", Color.Empty, style.SelectionBackColor);
-			AssertEquals("SelectionForeColor property", Color.Empty, style.SelectionForeColor);
-			AssertEquals("Tag property", null, style.Tag);
-			AssertEquals("WrapMode property", DataGridViewTriState.NotSet, style.WrapMode);
+			Assert.AreEqual (DataGridViewContentAlignment.NotSet, style.Alignment, "#A1");
+			Assert.AreEqual (Color.Empty, style.BackColor, "#A2");
+			Assert.AreEqual (null, style.Font, "#A3");
+			Assert.AreEqual (Color.Empty, style.ForeColor, "#A4");
+			Assert.AreEqual (String.Empty, style.Format, "#A5");
+			Assert.AreEqual (CultureInfo.CurrentUICulture, style.FormatProvider, "#A6");
+			Assert.AreEqual (true, style.IsFormatProviderDefault, "#A7");
+			Assert.AreEqual (true, style.IsNullValueDefault, "#A8");
+			Assert.AreEqual (string.Empty, style.NullValue, "#A9");
+			Assert.AreEqual (Color.Empty, style.SelectionBackColor, "#A10");
+			Assert.AreEqual (Color.Empty, style.SelectionForeColor, "#A11");
+			Assert.AreEqual (null, style.Tag, "#A12");
+			Assert.AreEqual (DataGridViewTriState.NotSet, style.WrapMode, "#A13");
 		}
 
 		[Test]
 		public void TestApplyStyle () {
 			DataGridViewCellStyle style_aux = new DataGridViewCellStyle();
 			style.ApplyStyle(style_aux);
-			AssertEquals("ApplyStyle method", style_aux, style);
+			Assert.AreEqual (style_aux, style, "#B1");
 		}
 
 		[Test]
 		public void TestClone () {
 			DataGridViewCellStyle style_aux = (DataGridViewCellStyle) style.Clone();
-			AssertEquals("Clone method", style_aux, style);
+			Assert.AreEqual (style_aux, style, "#C1");
 		}
 
 		[Test]
 		public void TestEquals () {
 			DataGridViewCellStyle style_aux = (DataGridViewCellStyle) style.Clone();
-			AssertEquals("Equals method", true, (style_aux.Equals(style)));
+			Assert.AreEqual (true, (style_aux.Equals(style)), "#D1");
 		}
 
 		[Test]
@@ -93,33 +93,12 @@ namespace MonoTests.System.Windows.Forms {
 			style.Alignment = DataGridViewContentAlignment.BottomCenter | DataGridViewContentAlignment.BottomRight;
 		}
 
-		[Test]
-		[ExpectedException(typeof(ArgumentException))]
-		public void TestSelectionBackColorArgumentException () {
-			style.SelectionBackColor = Color.FromArgb(100, Color.Red);
-		}
-
 		[Test]
 		[ExpectedException(typeof(InvalidEnumArgumentException))]
 		public void TestWrapModeInvalidEnumArgumentException () {
 			style.WrapMode = (DataGridViewTriState) 3;
 		}
-
-		/*
-		[Test]
-		[ExpectedException(typeof(Exception))]
-		public void TestException () {
-			ConcreteCollection myCollection;
-			myCollection = new ConcreteCollection();
-			....
-			AssertEquals ("#UniqueID", expected, actual);
-			....
-			Fail ("Message");
-		}
-		*/
-
 	}
-
 }
 
 #endif

mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/DataGridViewCellTest.cs

@@ -36,7 +36,7 @@ using System.Collections;
 namespace MonoTests.System.Windows.Forms {
 
 	[TestFixture]
-	public class DataGridViewCellTest : Assertion {
+	public class DataGridViewCellTest {
 		
 		[SetUp]
 		public void GetReady() {}
@@ -66,9 +66,7 @@ namespace MonoTests.System.Windows.Forms {
 			Fail ("Message");
 		}
 		*/
-
 	}
-
 }
 
 #endif

mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/DataGridViewElementTest.cs

@@ -36,7 +36,7 @@ using System.Collections;
 namespace MonoTests.System.Windows.Forms {
 
 	[TestFixture]
-	public class DataGridViewElementTest : Assertion {
+	public class DataGridViewElementTest {
 		
 		[SetUp]
 		public void GetReady() {}
@@ -47,11 +47,9 @@ namespace MonoTests.System.Windows.Forms {
 		[Test]
 		public void TestDefaultValues () {
 			DataGridViewElement element = new DataGridViewElement();
-			AssertEquals("DataGridView property", null, element.DataGridView);
+			Assert.AreEqual (null, element.DataGridView, "#A1");
 		}
-
 	}
-
 }
 
 #endif

mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/DataGridViewRowTest.cs

@@ -36,7 +36,7 @@ using System.Collections;
 namespace MonoTests.System.Windows.Forms {
 
 	[TestFixture]
-	public class DataGridViewRowTest : Assertion {
+	public class DataGridViewRowTest {
 		
 		[SetUp]
 		public void GetReady() {}
@@ -56,9 +56,6 @@ namespace MonoTests.System.Windows.Forms {
 			grid.Rows.Add(row);
 			row.Visible = false;
 		}
-
 	}
-
 }
-
 #endif

mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/DataGridViewTest.cs

@@ -17,11 +17,11 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-// Copyright (c) 2005 Novell, Inc. (http://www.novell.com)
+// Copyright (c) 2005,2006 Novell, Inc. (http://www.novell.com)
 //
 // Author:
 //	Pedro Martínez Juliá <[email protected]>
-//
+//	Daniel Nauck    (dna(at)mono-project(dot)de)
 
 
 #if NET_2_0
@@ -36,62 +36,70 @@ using System.Collections;
 namespace MonoTests.System.Windows.Forms {
 
 	[TestFixture]
-	public class DataGridViewTest : Assertion {
+	public class DataGridViewTest {
 		
+		private DataGridView grid = null;
+
 		[SetUp]
-		public void GetReady() {}
+		public void GetReady() 
+		{
+			grid = new DataGridView();
+		}
 
 		[TearDown]
-		public void Clean() {}
+		public void Clean()
+		{
+			grid.Dispose ();
+		}
 
 		[Test]
 		public void TestDefaultValues () {
-			DataGridView grid = new DataGridView();
-			AssertEquals("AllowUserToAddRows property", true, grid.AllowUserToAddRows);
-			AssertEquals("AllowUserToDeleteRows property", true, grid.AllowUserToDeleteRows);
-			AssertEquals("AllowUserToOrderColumns property", false, grid.AllowUserToOrderColumns);
-			AssertEquals("AllowUserToResizeColumns property", true, grid.AllowUserToResizeColumns);
-			AssertEquals("AllowUserToResizeRows property", true, grid.AllowUserToResizeRows);
-			AssertEquals("AlternatingRowsDefaultCellStyle property", new DataGridViewCellStyle(), grid.AlternatingRowsDefaultCellStyle);
-			AssertEquals("AutoGenerateColumns property", true, grid.AutoGenerateColumns);
-			AssertEquals("AutoSizeRowsMode property", DataGridViewAutoSizeRowsMode.None, grid.AutoSizeRowsMode);
-			AssertEquals("BackColor property", Control.DefaultBackColor, grid.BackColor);
-			AssertEquals("BackgroundColor property", SystemColors.AppWorkspace, grid.BackgroundColor);
-			AssertEquals("BorderStyle property", BorderStyle.FixedSingle, grid.BorderStyle);
-			AssertEquals("ClipboardCopyMode property", DataGridViewClipboardCopyMode.EnableWithAutoHeaderText, grid.ClipboardCopyMode);
-			AssertEquals("ColumnHeadersDefaultCellStyle.BackColor property", SystemColors.Control, grid.ColumnHeadersDefaultCellStyle.BackColor);
-			AssertEquals("ColumnHeadersDefaultCellStyle.ForeColor property", SystemColors.WindowText,  grid.ColumnHeadersDefaultCellStyle.ForeColor);
-			AssertEquals("ColumnHeadersDefaultCellStyle.SelectionBackColor property", SystemColors.Highlight, grid.ColumnHeadersDefaultCellStyle.SelectionBackColor);
-			AssertEquals("ColumnHeadersDefaultCellStyle.SelectionForeColor property", SystemColors.HighlightText, grid.ColumnHeadersDefaultCellStyle.SelectionForeColor);
-			AssertEquals("ColumnHeadersDefaultCellStyle.Font property", grid.Font, grid.ColumnHeadersDefaultCellStyle.Font);
-			AssertEquals("ColumnHeadersDefaultCellStyle.Alignment property", DataGridViewContentAlignment.MiddleLeft, grid.ColumnHeadersDefaultCellStyle.Alignment);
-			AssertEquals("ColumnHeadersDefaultCellStyle.WrapMode property", DataGridViewTriState.True, grid.ColumnHeadersDefaultCellStyle.WrapMode);
-			AssertEquals("ColumnHeadersHeight property", 23, grid.ColumnHeadersHeight);
-			AssertEquals("ColumnHeadersHeightSizeMode property", DataGridViewColumnHeadersHeightSizeMode.EnableResizing, grid.ColumnHeadersHeightSizeMode);
-			AssertEquals("ColumnHeadersVisible property", true, grid.ColumnHeadersVisible);
-			AssertEquals("DataMember property", String.Empty, grid.DataMember);
-			AssertEquals("DefaultCellStyle.BackColor property", SystemColors.Control, grid.DefaultCellStyle.BackColor);
-			AssertEquals("DefaultCellStyle.ForeColor property", SystemColors.WindowText,  grid.DefaultCellStyle.ForeColor);
-			AssertEquals("DefaultCellStyle.SelectionBackColor property", SystemColors.Highlight, grid.DefaultCellStyle.SelectionBackColor);
-			AssertEquals("DefaultCellStyle.SelectionForeColor property", SystemColors.HighlightText, grid.DefaultCellStyle.SelectionForeColor);
-			AssertEquals("DefaultCellStyle.Font property", grid.Font, grid.DefaultCellStyle.Font);
-			AssertEquals("DefaultCellStyle.Alignment property", DataGridViewContentAlignment.MiddleLeft, grid.DefaultCellStyle.Alignment);
-			AssertEquals("DefaultCellStyle.WrapMode property", DataGridViewTriState.True, grid.DefaultCellStyle.WrapMode);
-			AssertEquals("EditMode property", DataGridViewEditMode.EditOnKeystrokeOrF2, grid.EditMode);
-			AssertEquals("Font property", Control.DefaultFont, grid.Font);
-			AssertEquals("ForeColor property", Control.DefaultForeColor, grid.ForeColor);
-			AssertEquals("GridColor property", Color.FromKnownColor(KnownColor.ControlDarkDark), grid.GridColor);
-			AssertEquals("MultiSelect property", true, grid.MultiSelect);
-			AssertEquals("NewRowIndex property", grid.Rows.Count - 1, grid.NewRowIndex);
-			AssertEquals("Padding property", Padding.Empty, grid.Padding);
-			AssertEquals("ReadOnly property", false, grid.ReadOnly);
-			AssertEquals("RowHeadersVisible property", true, grid.RowHeadersVisible);
-			AssertEquals("RowHeadersWidth property", 43, grid.RowHeadersWidth);
-			AssertEquals("SelectionMode property", DataGridViewSelectionMode.RowHeaderSelect, grid.SelectionMode);
-			AssertEquals("ShowCellErrors property", true, grid.ShowCellErrors);
-			AssertEquals("ShowEditingIcon property", true, grid.ShowEditingIcon);
-			AssertEquals("UserSetCursor property", Cursor.Current, grid.UserSetCursor);
-			AssertEquals("VirtualMode property", false, grid.VirtualMode);
+			DataGridView grid = new DataGridView ();
+			Assert.AreEqual (true, grid.AllowUserToAddRows, "#A1");
+			Assert.AreEqual (true, grid.AllowUserToDeleteRows, "#A2");
+			Assert.AreEqual (false, grid.AllowUserToOrderColumns, "#A3");
+			Assert.AreEqual (true, grid.AllowUserToResizeColumns, "#A4");
+			Assert.AreEqual (true, grid.AllowUserToResizeRows, "#A5");
+			Assert.AreEqual (new DataGridViewCellStyle(), grid.AlternatingRowsDefaultCellStyle, "#A6");
+			Assert.AreEqual (true, grid.AutoGenerateColumns, "#A7");
+			Assert.AreEqual (DataGridViewAutoSizeRowsMode.None, grid.AutoSizeRowsMode, "#A8");
+			Assert.AreEqual (Control.DefaultBackColor, grid.BackColor, "#A9");
+			Assert.AreEqual (SystemColors.AppWorkspace, grid.BackgroundColor, "#A10");
+			Assert.AreEqual (BorderStyle.FixedSingle, grid.BorderStyle, "#A11");
+			Assert.AreEqual (DataGridViewClipboardCopyMode.EnableWithAutoHeaderText, grid.ClipboardCopyMode, "#A12");
+			Assert.AreEqual (SystemColors.Control, grid.ColumnHeadersDefaultCellStyle.BackColor, "#A13");
+			Assert.AreEqual (SystemColors.WindowText,  grid.ColumnHeadersDefaultCellStyle.ForeColor, "#A14");
+			Assert.AreEqual (SystemColors.Highlight, grid.ColumnHeadersDefaultCellStyle.SelectionBackColor, "#A15");
+			Assert.AreEqual (SystemColors.HighlightText, grid.ColumnHeadersDefaultCellStyle.SelectionForeColor, "#A16");
+			Assert.AreEqual (grid.Font, grid.ColumnHeadersDefaultCellStyle.Font, "#A17");
+			Assert.AreEqual (DataGridViewContentAlignment.MiddleLeft, grid.ColumnHeadersDefaultCellStyle.Alignment, "#A18");
+			Assert.AreEqual (DataGridViewTriState.True, grid.ColumnHeadersDefaultCellStyle.WrapMode, "#A19");
+			Assert.AreEqual (23, grid.ColumnHeadersHeight, "#A20");
+			Assert.AreEqual (DataGridViewColumnHeadersHeightSizeMode.EnableResizing, grid.ColumnHeadersHeightSizeMode, "#A21");
+			Assert.AreEqual (true, grid.ColumnHeadersVisible, "#A22");
+			Assert.AreEqual (String.Empty, grid.DataMember, "#A23");
+			Assert.AreEqual (SystemColors.Window, grid.DefaultCellStyle.BackColor, "#A24");
+			Assert.AreEqual (SystemColors.ControlText,  grid.DefaultCellStyle.ForeColor, "#A25");
+			Assert.AreEqual (SystemColors.Highlight, grid.DefaultCellStyle.SelectionBackColor, "#A26");
+			Assert.AreEqual (SystemColors.HighlightText, grid.DefaultCellStyle.SelectionForeColor, "#A27");
+			Assert.AreEqual (grid.Font, grid.DefaultCellStyle.Font, "#A28");
+			Assert.AreEqual (DataGridViewContentAlignment.MiddleLeft, grid.DefaultCellStyle.Alignment, "#A29");
+			Assert.AreEqual (DataGridViewTriState.False, grid.DefaultCellStyle.WrapMode, "#A30");
+			Assert.AreEqual (DataGridViewEditMode.EditOnKeystrokeOrF2, grid.EditMode, "#A31");
+			Assert.AreEqual (Control.DefaultFont, grid.Font, "#A32");
+			Assert.AreEqual (Control.DefaultForeColor, grid.ForeColor, "#A33");
+			Assert.AreEqual (Color.FromKnownColor(KnownColor.ControlDark), grid.GridColor, "#A34");
+			Assert.AreEqual (true, grid.MultiSelect, "#A35");
+			Assert.AreEqual (grid.Rows.Count - 1, grid.NewRowIndex, "#A36");
+			Assert.AreEqual (Padding.Empty, grid.Padding, "#A37");
+			Assert.AreEqual (false, grid.ReadOnly, "#A38");
+			Assert.AreEqual (true, grid.RowHeadersVisible, "#A39");
+			Assert.AreEqual (41, grid.RowHeadersWidth, "#A40");
+			Assert.AreEqual (DataGridViewSelectionMode.RowHeaderSelect, grid.SelectionMode, "#A41");
+			Assert.AreEqual (true, grid.ShowCellErrors, "#A42");
+			Assert.AreEqual (true, grid.ShowEditingIcon, "#A43");
+			Assert.AreEqual (Cursors.Default, grid.UserSetCursor, "#A44");
+			Assert.AreEqual (false, grid.VirtualMode, "#A45");
 		}
 
 		#region AutoSizeColumnsModeExceptions
@@ -169,8 +177,8 @@ namespace MonoTests.System.Windows.Forms {
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentException))]
-		public void TestColumnCountArgumentException () {
+		[ExpectedException(typeof(ArgumentOutOfRangeException))]
+		public void TestColumnCountArgumentOutOfRangeException () {
 			DataGridView grid = new DataGridView();
 			grid.ColumnCount = -1;
 		}
@@ -184,8 +192,8 @@ namespace MonoTests.System.Windows.Forms {
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentException))]
-		public void TestColumnHeadersHeightArgumentException () {
+		[ExpectedException(typeof(ArgumentOutOfRangeException))]
+		public void TestColumnHeadersHeightArgumentOutOfRangeException () {
 			DataGridView grid = new DataGridView();
 			grid.ColumnHeadersHeight = 3;
 		}
@@ -198,15 +206,8 @@ namespace MonoTests.System.Windows.Forms {
 		}
 
 		[Test]
-		[ExpectedException(typeof(ArgumentException))]
-		public void TestCurrentCellArgumentException () {
-			DataGridView grid = new DataGridView();
-			grid.CurrentCell = new DataGridViewTextBoxCell();
-		}
-
-		[Test]
-		[ExpectedException(typeof(ArgumentException))]
-		public void TestRowHeadersWidthArgumentException () {
+		[ExpectedException(typeof(ArgumentOutOfRangeException))]
+		public void TestRowHeadersWidthArgumentOutOfRangeException () {
 			DataGridView grid = new DataGridView();
 			grid.RowHeadersWidth = 3;
 		}
@@ -261,22 +262,7 @@ namespace MonoTests.System.Windows.Forms {
 			DataGridView grid = new DataGridView();
 			grid.AutoResizeRows(DataGridViewAutoSizeRowsMode.None);
 		}
-
-		/*
-		[Test]
-		[ExpectedException(typeof(Exception))]
-		public void TestException () {
-			ConcreteCollection myCollection;
-			myCollection = new ConcreteCollection();
-			....
-			AssertEquals ("#UniqueID", expected, actual);
-			....
-			Fail ("Message");
-		}
-		*/
-
 	}
-
 }
 
 #endif