Author: spouliot
Date: 2006-11-28 22:13:31 -0500 (Tue, 28 Nov 2006)
New Revision: 68636
Added:
trunk/mcs/class/System.Drawing/Test/System.Drawing.Design/UITypeEditorTest.cs
Modified:
trunk/mcs/class/System.Drawing/Test/System.Drawing.Design/ChangeLog
trunk/mcs/class/System.Drawing/Test/System.Drawing.Design/UITypeEditorCas.cs
Log:
2006-11-28 Sebastien Pouliot <[EMAIL PROTECTED]>
* UITypeEditorCas.cs: Reuse new unit test cases in CAS tests.
* UITypeEditorTest.cs: New. Unit tests for UITypeEditor.
Modified: trunk/mcs/class/System.Drawing/Test/System.Drawing.Design/ChangeLog
===================================================================
--- trunk/mcs/class/System.Drawing/Test/System.Drawing.Design/ChangeLog
2006-11-29 03:13:04 UTC (rev 68635)
+++ trunk/mcs/class/System.Drawing/Test/System.Drawing.Design/ChangeLog
2006-11-29 03:13:31 UTC (rev 68636)
@@ -1,3 +1,8 @@
+2006-11-28 Sebastien Pouliot <[EMAIL PROTECTED]>
+
+ * UITypeEditorCas.cs: Reuse new unit test cases in CAS tests.
+ * UITypeEditorTest.cs: New. Unit tests for UITypeEditor.
+
2006-05-25 Gert Driesen <[EMAIL PROTECTED]>
* PropertyValueUIItemCas.cs: Fix compilation using csc 1.x.
Modified:
trunk/mcs/class/System.Drawing/Test/System.Drawing.Design/UITypeEditorCas.cs
===================================================================
---
trunk/mcs/class/System.Drawing/Test/System.Drawing.Design/UITypeEditorCas.cs
2006-11-29 03:13:04 UTC (rev 68635)
+++
trunk/mcs/class/System.Drawing/Test/System.Drawing.Design/UITypeEditorCas.cs
2006-11-29 03:13:31 UTC (rev 68636)
@@ -35,6 +35,8 @@
using System.Security.Permissions;
using System.Security.Policy;
+using MonoTests.System.Drawing.Design;
+
namespace MonoCasTests.System.Drawing.Design {
[TestFixture]
@@ -42,6 +44,7 @@
public class UITypeEditorCas {
private ConstructorInfo ctor;
+ private UITypeEditorTest unit;
[TestFixtureSetUp]
public void FixtureSetUp ()
@@ -49,6 +52,9 @@
// this executes at fulltrust
ConstructorInfo[] infos = typeof
(UITypeEditor).GetConstructors ();
ctor = infos[0];
+
+ unit = new UITypeEditorTest ();
+ unit.FixtureSetUp ();
}
[SetUp]
@@ -65,6 +71,24 @@
new UITypeEditor ();
}
+ [Test]
+ [PermissionSet (SecurityAction.Deny, Unrestricted = true)]
+ public void UnitTests ()
+ {
+ unit.DefaultValues ();
+ }
+
+#if !TARGET_JVM
+ [Test]
+ [PermissionSet (SecurityAction.Deny, Unrestricted = true)]
+ public void UnitTests_PaintValue ()
+ {
+ unit.PaintValue_PaintValueEventArgs_Null ();
+ unit.PaintValue_PaintValueEventArgs ();
+ unit.PaintValue ();
+ }
+#endif
+
// we use reflection to call UITypeEditor class as it's
protected by a
// LinkDemand (which will be converted into full demand, i.e. a
stack
// walk) when reflection is used (i.e. it gets testable).
Added:
trunk/mcs/class/System.Drawing/Test/System.Drawing.Design/UITypeEditorTest.cs
===================================================================
---
trunk/mcs/class/System.Drawing/Test/System.Drawing.Design/UITypeEditorTest.cs
2006-11-29 03:13:04 UTC (rev 68635)
+++
trunk/mcs/class/System.Drawing/Test/System.Drawing.Design/UITypeEditorTest.cs
2006-11-29 03:13:31 UTC (rev 68636)
@@ -0,0 +1,88 @@
+//
+// UITypeEditorTest.cs - Unit tests for System.Drawing.Design.UITypeEditor
+//
+// Author:
+// Sebastien Pouliot <[EMAIL PROTECTED]>
+//
+// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
+//
+// 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.
+//
+
+using NUnit.Framework;
+
+using System;
+using System.Drawing;
+using System.Drawing.Design;
+
+namespace MonoTests.System.Drawing.Design {
+
+ [TestFixture]
+ public class UITypeEditorTest {
+
+ private UITypeEditor editor;
+ private Graphics graphics;
+
+ [TestFixtureSetUp]
+ public void FixtureSetUp ()
+ {
+ editor = new UITypeEditor ();
+
+ Bitmap bitmap = new Bitmap (20, 20);
+ graphics = Graphics.FromImage (bitmap);
+ }
+
+ [Test]
+ public void DefaultValues ()
+ {
+ Assert.AreSame (graphics, editor.EditValue (null,
graphics), "EditValue(2)");
+ Assert.AreSame (graphics, editor.EditValue (null, null,
graphics), "EditValue(3)");
+
+ Assert.AreEqual (UITypeEditorEditStyle.None,
editor.GetEditStyle (), "GetEditStyle()");
+ Assert.AreEqual (UITypeEditorEditStyle.None,
editor.GetEditStyle (null), "GetEditStyle(null)");
+
+ Assert.IsFalse (editor.GetPaintValueSupported (),
"GetPaintValueSupported()");
+ Assert.IsFalse (editor.GetPaintValueSupported (null),
"GetPaintValueSupported(null)");
+#if NET_2_0
+ Assert.IsFalse (editor.IsDropDownResizable,
"IsDropDownResizable");
+#endif
+ }
+
+#if !TARGET_JVM
+ [Test]
+ public void PaintValue_PaintValueEventArgs_Null ()
+ {
+ editor.PaintValue (null);
+ }
+
+ [Test]
+ public void PaintValue_PaintValueEventArgs ()
+ {
+ editor.PaintValue (new PaintValueEventArgs (null, null,
graphics, Rectangle.Empty));
+ }
+
+ [Test]
+ public void PaintValue ()
+ {
+ editor.PaintValue (null, graphics, Rectangle.Empty);
+ }
+#endif
+ }
+}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
