Author: gert
Date: 2007-12-04 05:38:09 -0500 (Tue, 04 Dec 2007)
New Revision: 90631

Added:
   
trunk/mcs/class/corlib/Test/System.Runtime.InteropServices/ExternalExceptionTest.cs
Modified:
   trunk/mcs/class/corlib/ChangeLog
   trunk/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog
   trunk/mcs/class/corlib/System.Runtime.InteropServices/ExternalException.cs
   trunk/mcs/class/corlib/Test/System.Runtime.InteropServices/ChangeLog
   trunk/mcs/class/corlib/corlib_test.dll.sources
Log:
* corlib_test.dll.sources: added ExternalExceptionTest.cs.
* ExternalException.cs: Set HResult to match MS.
* ExternalExceptionTest.cs: Added ctor tests.


Modified: trunk/mcs/class/corlib/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/ChangeLog    2007-12-04 10:36:15 UTC (rev 90630)
+++ trunk/mcs/class/corlib/ChangeLog    2007-12-04 10:38:09 UTC (rev 90631)
@@ -1,3 +1,7 @@
+2007-12-04  Gert Driesen  <[EMAIL PROTECTED]>
+
+       * corlib_test.dll.sources: added ExternalExceptionTest.cs.
+
 2007-11-21  Atsushi Enomoto  <[EMAIL PROTECTED]>
 
        * corlib.dll.sources: added System.Deployment.Internal and

Modified: trunk/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog     
2007-12-04 10:36:15 UTC (rev 90630)
+++ trunk/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog     
2007-12-04 10:38:09 UTC (rev 90631)
@@ -1,3 +1,7 @@
+2007-12-04  Gert Driesen  <[EMAIL PROTECTED]>
+
+       * ExternalException.cs: Set HResult to match MS.
+
 2007-11-05  Sebastien Pouliot  <[EMAIL PROTECTED]>
 
        * ComVisible.cs: Fix parameter name (part of #322850).

Modified: 
trunk/mcs/class/corlib/System.Runtime.InteropServices/ExternalException.cs
===================================================================
--- trunk/mcs/class/corlib/System.Runtime.InteropServices/ExternalException.cs  
2007-12-04 10:36:15 UTC (rev 90630)
+++ trunk/mcs/class/corlib/System.Runtime.InteropServices/ExternalException.cs  
2007-12-04 10:38:09 UTC (rev 90631)
@@ -33,30 +33,34 @@
 using System.Runtime.Serialization;
 using System.Globalization;
 
-namespace System.Runtime.InteropServices {
+namespace System.Runtime.InteropServices
+{
        [Serializable]
 #if NET_2_0
        [ComVisible (true)]
 #endif
-       public class ExternalException : SystemException {
-               // Constructors
+       public class ExternalException : SystemException
+       {
                public ExternalException ()
                        : base (Locale.GetText ("External exception"))
                {
+                       HResult = -2147467259;
                }
 
                public ExternalException (string message)
                        : base (message)
                {
+                       HResult = -2147467259;
                }
 
                protected ExternalException(SerializationInfo info, 
StreamingContext context)
                        : base (info, context) {
                }
-               
+
                public ExternalException (string message, Exception inner)
                        : base (message, inner)
                {
+                       HResult = -2147467259;
                }
 
                public ExternalException (string message, int errorCode)

Modified: trunk/mcs/class/corlib/Test/System.Runtime.InteropServices/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/Test/System.Runtime.InteropServices/ChangeLog        
2007-12-04 10:36:15 UTC (rev 90630)
+++ trunk/mcs/class/corlib/Test/System.Runtime.InteropServices/ChangeLog        
2007-12-04 10:38:09 UTC (rev 90631)
@@ -1,3 +1,7 @@
+2007-12-04  Gert Driesen  <[EMAIL PROTECTED]>
+
+       * ExternalExceptionTest.cs: Added ctor tests.
+
 2007-11-06  Sebastien Pouliot  <[EMAIL PROTECTED]>
 
        * MarshalTest.cs: Add test for various StringTo... to check for 

Added: 
trunk/mcs/class/corlib/Test/System.Runtime.InteropServices/ExternalExceptionTest.cs
===================================================================
--- 
trunk/mcs/class/corlib/Test/System.Runtime.InteropServices/ExternalExceptionTest.cs
 2007-12-04 10:36:15 UTC (rev 90630)
+++ 
trunk/mcs/class/corlib/Test/System.Runtime.InteropServices/ExternalExceptionTest.cs
 2007-12-04 10:38:09 UTC (rev 90631)
@@ -0,0 +1,132 @@
+//
+// ExternalExceptionTest.cs - NUnit tests for ExternalException
+//
+// 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.Runtime.InteropServices;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Runtime.InteropServices
+{
+       [TestFixture]
+       public class ExternalExceptionTest
+       {
+               [Test] // ctor ()
+               public void Constructor0 ()
+               {
+                       ExternalException ex = new ExternalException ();
+                       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");
+               }
+
+               [Test] // ctor (string)
+               public void Constructor1 ()
+               {
+                       ExternalException ex;
+                       string msg = "ERROR";
+
+                       ex = new ExternalException (msg);
+                       Assert.AreEqual (-2147467259, ex.ErrorCode, "#A1");
+                       Assert.IsNull (ex.InnerException, "#A2");
+                       Assert.AreSame (msg, ex.Message, "#A3");
+
+                       ex = new ExternalException ((string) null);
+                       Assert.AreEqual (-2147467259, ex.ErrorCode, "#B1");
+                       Assert.IsNull (ex.InnerException, "#B2");
+                       Assert.IsNotNull (msg, ex.Message, "#B3");
+                       Assert.AreEqual (new ExternalException (null).Message, 
ex.Message, "#B4");
+
+                       ex = new ExternalException (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");
+               }
+
+               [Test] // ctor (string, Exception)
+               public void Constructor3 ()
+               {
+                       ExternalException ex;
+                       string msg = "ERROR";
+                       Exception inner = new Exception ();
+
+                       ex = new ExternalException (msg, inner);
+                       Assert.AreEqual (-2147467259, ex.ErrorCode, "#A1");
+                       Assert.AreSame (inner, ex.InnerException, "#A2");
+                       Assert.AreSame (msg, ex.Message, "#A3");
+
+                       ex = new ExternalException ((string) null, inner);
+                       Assert.AreEqual (-2147467259, ex.ErrorCode, "#B1");
+                       Assert.AreSame (inner, ex.InnerException, "#B2");
+                       Assert.IsNotNull (msg, ex.Message, "#B3");
+                       Assert.AreEqual (new ExternalException (null).Message, 
ex.Message, "#B4");
+
+                       ex = new ExternalException (msg, (Exception) null);
+                       Assert.AreEqual (-2147467259, ex.ErrorCode, "#C1");
+                       Assert.IsNull (ex.InnerException, "#C2");
+                       Assert.AreSame (msg, ex.Message, "#C3");
+
+                       ex = new ExternalException (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");
+               }
+
+               [Test] // ctor (string, int)
+               public void Constructor4 ()
+               {
+                       ExternalException ex;
+                       string msg = "ERROR";
+
+                       ex = new ExternalException (msg, int.MinValue);
+                       Assert.AreEqual (int.MinValue, ex.ErrorCode, "#A1");
+                       Assert.IsNull (ex.InnerException, "#A2");
+                       Assert.AreSame (msg, ex.Message, "#A3");
+
+                       ex = new ExternalException ((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 ExternalException (null).Message, 
ex.Message, "#B4");
+
+                       ex = new ExternalException (msg, 0);
+                       Assert.AreEqual (0, ex.ErrorCode, "#C1");
+                       Assert.IsNull (ex.InnerException, "#C2");
+                       Assert.AreSame (msg, ex.Message, "#C3");
+
+                       ex = new ExternalException (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");
+               }
+       }
+}


Property changes on: 
trunk/mcs/class/corlib/Test/System.Runtime.InteropServices/ExternalExceptionTest.cs
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: trunk/mcs/class/corlib/corlib_test.dll.sources
===================================================================
--- trunk/mcs/class/corlib/corlib_test.dll.sources      2007-12-04 10:36:15 UTC 
(rev 90630)
+++ trunk/mcs/class/corlib/corlib_test.dll.sources      2007-12-04 10:38:09 UTC 
(rev 90631)
@@ -141,6 +141,7 @@
 System.Resources/ResourceWriterTest.cs
 System.Runtime.CompilerServices/RuntimeHelpersTest.cs
 System.Runtime.CompilerServices/RuntimeWrappedExceptionTest.cs
+System.Runtime.InteropServices/ExternalExceptionTest.cs
 System.Runtime.InteropServices/GCHandleTest.cs
 System.Runtime.InteropServices/MarshalTest.cs
 System.Runtime.InteropServices/RuntimeEnvironmentTest.cs

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to