Author: gert
Date: 2007-12-24 05:22:40 -0500 (Mon, 24 Dec 2007)
New Revision: 91854
Added:
trunk/mcs/class/System/Test/System.ComponentModel.Design/CheckoutExceptionTest.cs
Modified:
trunk/mcs/class/System/ChangeLog
trunk/mcs/class/System/System.ComponentModel.Design/Changelog
trunk/mcs/class/System/System.ComponentModel.Design/CheckoutException.cs
trunk/mcs/class/System/System_test.dll.sources
trunk/mcs/class/System/Test/System.ComponentModel.Design/ChangeLog
trunk/mcs/class/System/Test/System.ComponentModel.Design/ServiceContainerTest.cs
Log:
* CheckoutException.cs: Provide customized message and error code
(2.0 only) for Canceled. Call base ctor in default ctor.
* CheckoutExceptionTest.cs: Added test for ctors and Canceled.
* System_test.dll.sources: Added CheckoutExceptionTest.cs.
Modified: trunk/mcs/class/System/ChangeLog
===================================================================
--- trunk/mcs/class/System/ChangeLog 2007-12-24 09:42:34 UTC (rev 91853)
+++ trunk/mcs/class/System/ChangeLog 2007-12-24 10:22:40 UTC (rev 91854)
@@ -1,3 +1,7 @@
+2007-12-24 Gert Driesen <[EMAIL PROTECTED]>
+
+ * System_test.dll.sources: Added CheckoutExceptionTest.cs.
+
2007-12-15 Marek Habersack <[EMAIL PROTECTED]>
* System.dll.sources: added
Modified: trunk/mcs/class/System/System.ComponentModel.Design/Changelog
===================================================================
--- trunk/mcs/class/System/System.ComponentModel.Design/Changelog
2007-12-24 09:42:34 UTC (rev 91853)
+++ trunk/mcs/class/System/System.ComponentModel.Design/Changelog
2007-12-24 10:22:40 UTC (rev 91854)
@@ -1,3 +1,8 @@
+2007-12-24 Gert Driesen <[EMAIL PROTECTED]>
+
+ * CheckoutException.cs: Provide customized message and error code
+ (2.0 only) for Canceled. Call base ctor in default ctor.
+
2007-12-24 Arina Itkes <[EMAIL PROTECTED]>
* CheckoutException.cs:
Modified:
trunk/mcs/class/System/System.ComponentModel.Design/CheckoutException.cs
===================================================================
--- trunk/mcs/class/System/System.ComponentModel.Design/CheckoutException.cs
2007-12-24 09:42:34 UTC (rev 91853)
+++ trunk/mcs/class/System/System.ComponentModel.Design/CheckoutException.cs
2007-12-24 10:22:40 UTC (rev 91854)
@@ -41,10 +41,16 @@
#endif
public class CheckoutException : ExternalException
{
- public static readonly CheckoutException Canceled = new
CheckoutException ();
+ public static readonly CheckoutException Canceled = new
CheckoutException (
+ "The user canceled the checkout.",
+#if NET_2_0
+ -2147467260);
+#else
+ -2147467259);
+#endif
public CheckoutException()
- : this (null)
+ : base ()
{
}
Modified: trunk/mcs/class/System/System_test.dll.sources
===================================================================
--- trunk/mcs/class/System/System_test.dll.sources 2007-12-24 09:42:34 UTC
(rev 91853)
+++ trunk/mcs/class/System/System_test.dll.sources 2007-12-24 10:22:40 UTC
(rev 91854)
@@ -143,6 +143,7 @@
System.ComponentModel/UInt32ConverterTests.cs
System.ComponentModel/UInt64ConverterTests.cs
System.ComponentModel/Win32ExceptionTest.cs
+System.ComponentModel.Design/CheckoutExceptionTest.cs
System.ComponentModel.Design/ServiceContainerTest.cs
System.ComponentModel.Design.Serialization/ContextStackTest.cs
System.ComponentModel.Design.Serialization/InstanceDescriptorTest.cs
Modified: trunk/mcs/class/System/Test/System.ComponentModel.Design/ChangeLog
===================================================================
--- trunk/mcs/class/System/Test/System.ComponentModel.Design/ChangeLog
2007-12-24 09:42:34 UTC (rev 91853)
+++ trunk/mcs/class/System/Test/System.ComponentModel.Design/ChangeLog
2007-12-24 10:22:40 UTC (rev 91854)
@@ -1,3 +1,7 @@
+2007-12-24 Gert Driesen <[EMAIL PROTECTED]>
+
+ * CheckoutExceptionTest.cs: Added test for ctors and Canceled.
+
2004-01-01 Nick Drochak <[EMAIL PROTECTED]>
* ServiceContainerTest.cs: Eliminate unused variable that was giving us
@@ -6,5 +10,5 @@
2003-08-31 Alexandre Pigolkine <[EMAIL PROTECTED]>
* ChangeLog:
- * ServiceContainerTest.cs new test
+ * ServiceContainerTest.cs: new test
Added:
trunk/mcs/class/System/Test/System.ComponentModel.Design/CheckoutExceptionTest.cs
===================================================================
---
trunk/mcs/class/System/Test/System.ComponentModel.Design/CheckoutExceptionTest.cs
2007-12-24 09:42:34 UTC (rev 91853)
+++
trunk/mcs/class/System/Test/System.ComponentModel.Design/CheckoutExceptionTest.cs
2007-12-24 10:22:40 UTC (rev 91854)
@@ -0,0 +1,150 @@
+//
+// CheckoutExceptionTest.cs - NUnit tests for CheckoutException
+//
+// 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.
+//
+
+using System;
+using System.ComponentModel.Design;
+using System.Runtime.InteropServices;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.ComponentModel.Design
+{
+ [TestFixture]
+ public class CheckoutExceptionTest
+ {
+ [Test] // ctor ()
+ public void Constructor0 ()
+ {
+ CheckoutException ex = new CheckoutException ();
+ Assert.AreEqual (-2147467259, ex.ErrorCode, "#1");
+ Assert.IsNull (ex.InnerException, "#2");
+ Assert.IsNotNull (ex.Message, "#3");
+ Assert.IsTrue (ex.Message.IndexOf (ex.GetType
().FullName) == -1, "#4");
+ Assert.AreEqual (new ExternalException ().Message,
ex.Message, "#5");
+ }
+
+ [Test] // ctor (string)
+ public void Constructor1 ()
+ {
+ CheckoutException ex;
+ string msg = "ERROR";
+
+ ex = new CheckoutException (msg);
+ Assert.AreEqual (-2147467259, ex.ErrorCode, "#A1");
+ Assert.IsNull (ex.InnerException, "#A2");
+ Assert.AreSame (msg, ex.Message, "#A3");
+
+ ex = new CheckoutException ((string) null);
+ Assert.AreEqual (-2147467259, ex.ErrorCode, "#B1");
+ Assert.IsNull (ex.InnerException, "#B2");
+ Assert.IsNotNull (msg, ex.Message, "#B3");
+ Assert.IsTrue (ex.Message.IndexOf (ex.GetType
().FullName) != -1, "#B4");
+
+ ex = new CheckoutException (string.Empty);
+ Assert.AreEqual (-2147467259, ex.ErrorCode, "#C1");
+ Assert.IsNull (ex.InnerException, "#C2");
+ Assert.IsNotNull (msg, ex.Message, "#C3");
+ Assert.AreEqual (string.Empty, ex.Message, "#C4");
+ }
+
+#if NET_2_0
+ [Test] // ctor (string, Exception)
+ public void Constructor3 ()
+ {
+ CheckoutException ex;
+ string msg = "ERROR";
+ Exception inner = new Exception ();
+
+ ex = new CheckoutException (msg, inner);
+ Assert.AreEqual (-2147467259, ex.ErrorCode, "#A1");
+ Assert.AreSame (inner, ex.InnerException, "#A2");
+ Assert.AreSame (msg, ex.Message, "#A3");
+
+ ex = new CheckoutException ((string) null, inner);
+ Assert.AreEqual (-2147467259, ex.ErrorCode, "#B1");
+ Assert.AreSame (inner, ex.InnerException, "#B2");
+ Assert.IsNotNull (msg, ex.Message, "#B3");
+ Assert.AreEqual (new CheckoutException (null).Message,
ex.Message, "#B4");
+
+ ex = new CheckoutException (msg, (Exception) null);
+ Assert.AreEqual (-2147467259, ex.ErrorCode, "#C1");
+ Assert.IsNull (ex.InnerException, "#C2");
+ Assert.AreSame (msg, ex.Message, "#C3");
+
+ ex = new CheckoutException (string.Empty, (Exception)
null);
+ Assert.AreEqual (-2147467259, ex.ErrorCode, "#D1");
+ Assert.IsNull (ex.InnerException, "#D2");
+ Assert.IsNotNull (ex.Message, "#D3");
+ Assert.AreEqual (string.Empty, ex.Message, "#D4");
+ }
+#endif
+
+ [Test] // ctor (string, int)
+ public void Constructor4 ()
+ {
+ CheckoutException ex;
+ string msg = "ERROR";
+
+ ex = new CheckoutException (msg, int.MinValue);
+ Assert.AreEqual (int.MinValue, ex.ErrorCode, "#A1");
+ Assert.IsNull (ex.InnerException, "#A2");
+ Assert.AreSame (msg, ex.Message, "#A3");
+
+ ex = new CheckoutException ((string) null,
int.MaxValue);
+ Assert.AreEqual (int.MaxValue, ex.ErrorCode, "#B1");
+ Assert.IsNull (ex.InnerException, "#B2");
+ Assert.IsNotNull (msg, ex.Message, "#B3");
+ Assert.AreEqual (new CheckoutException (null).Message,
ex.Message, "#B4");
+
+ ex = new CheckoutException (msg, 0);
+ Assert.AreEqual (0, ex.ErrorCode, "#C1");
+ Assert.IsNull (ex.InnerException, "#C2");
+ Assert.AreSame (msg, ex.Message, "#C3");
+
+ ex = new CheckoutException (string.Empty, 0);
+ Assert.AreEqual (0, ex.ErrorCode, "#D1");
+ Assert.IsNull (ex.InnerException, "#D2");
+ Assert.IsNotNull (ex.Message, "#D3");
+ Assert.AreEqual (string.Empty, ex.Message, "#D4");
+ }
+
+ [Test]
+ public void Canceled ()
+ {
+ CheckoutException ex = CheckoutException.Canceled;
+#if NET_2_0
+ Assert.AreEqual (-2147467260, ex.ErrorCode, "#1");
+#else
+ Assert.AreEqual (-2147467259, ex.ErrorCode, "#1");
+#endif
+ Assert.IsNull (ex.InnerException, "#2");
+ Assert.IsNotNull (ex.Message, "#3");
+ Assert.IsTrue (ex.Message.IndexOf (ex.GetType
().FullName) == -1, "#4");
+ }
+ }
+}
Property changes on:
trunk/mcs/class/System/Test/System.ComponentModel.Design/CheckoutExceptionTest.cs
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on:
trunk/mcs/class/System/Test/System.ComponentModel.Design/ServiceContainerTest.cs
___________________________________________________________________
Name: svn:eol-style
+ native
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
