* CheckoutException.cs: Provide customized message and error code
authorGert Driesen <drieseng@users.sourceforge.net>
Mon, 24 Dec 2007 10:22:40 +0000 (10:22 -0000)
committerGert Driesen <drieseng@users.sourceforge.net>
Mon, 24 Dec 2007 10:22:40 +0000 (10:22 -0000)
(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.

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

mcs/class/System/ChangeLog
mcs/class/System/System.ComponentModel.Design/Changelog
mcs/class/System/System.ComponentModel.Design/CheckoutException.cs
mcs/class/System/System_test.dll.sources
mcs/class/System/Test/System.ComponentModel.Design/ChangeLog
mcs/class/System/Test/System.ComponentModel.Design/CheckoutExceptionTest.cs [new file with mode: 0644]

index d6a426e1944091d9060dd49df2a2518ae8fe4388..d251fa215fcf778afb1023c8e1e4958f351a25d8 100644 (file)
@@ -1,3 +1,7 @@
+2007-12-24  Gert Driesen  <drieseng@users.sourceforge.net>
+
+       * System_test.dll.sources: Added CheckoutExceptionTest.cs.
+
 2007-12-15  Marek Habersack  <mhabersack@novell.com>
 
        * System.dll.sources: added
index 387bd3567fac1844da0c6eedafe196baa479edf0..0b1e89fe114306eb984767e32c6405b301db25a6 100644 (file)
@@ -1,3 +1,8 @@
+2007-12-24  Gert Driesen  <drieseng@users.sourceforge.net>
+
+       * CheckoutException.cs: Provide customized message and error code
+       (2.0 only) for Canceled. Call base ctor in default ctor.
+
 2007-12-24  Arina Itkes <arinai@mainsoft.com>
 
        * CheckoutException.cs: 
index 48570574d6a491ab45387100915dd03d6a2ddfe8..d3fefb77bf803e442f67526d817447f92228b59d 100644 (file)
@@ -41,10 +41,16 @@ namespace System.ComponentModel.Design
 #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 ()
                {
                }
 
index fcff8fa157425b8bd74031de6590d35c24ca5e55..ea39be6c42ae9ab8c5f65c8e08b00f5c13b5f719 100644 (file)
@@ -143,6 +143,7 @@ System.ComponentModel/UInt16ConverterTests.cs
 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
index f342bf2b7686e381ca101bb28bdb99c39985165b..d65b6fd7cb25e531a6354070fc6642643e393cb0 100644 (file)
@@ -1,3 +1,7 @@
+2007-12-24  Gert Driesen  <drieseng@users.sourceforge.net>
+
+       * CheckoutExceptionTest.cs: Added test for ctors and Canceled.
+
 2004-01-01  Nick Drochak <ndrochak@gol.com>
 
        * ServiceContainerTest.cs: Eliminate unused variable that was giving us
@@ -6,5 +10,5 @@
 2003-08-31 Alexandre Pigolkine <pigolkine@gmx.de>
 
        * ChangeLog:
-       * ServiceContainerTest.cs               new test
+       * ServiceContainerTest.cs: new test
 
diff --git a/mcs/class/System/Test/System.ComponentModel.Design/CheckoutExceptionTest.cs b/mcs/class/System/Test/System.ComponentModel.Design/CheckoutExceptionTest.cs
new file mode 100644 (file)
index 0000000..1a9b2d1
--- /dev/null
@@ -0,0 +1,150 @@
+//
+// CheckoutExceptionTest.cs - NUnit tests for CheckoutException
+//
+// Author:
+//     Gert Driesen  <drieseng@users.sourceforge.net>
+//
+// 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");
+               }
+       }
+}