2005-01-10 Nick Drochak <ndrochak@ieee.org>

	* ConvertTest.cs: Test for exception thrown by 1.1. This is different
	than the MSDN docs say.  Probably a doc bug.

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

diff --git a/mcs/class/corlib/Test/System/ChangeLog b/mcs/class/corlib/Test/System/ChangeLog
index c0c5818165e2200c10b90f539e1343a887e014cf..6e4652b6480133ab5fa3c15ecea220ac8c6685a8 100644 (file)
--- a/mcs/class/corlib/Test/System/ChangeLog
+++ b/mcs/class/corlib/Test/System/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-10  Nick Drochak  <ndrochak@ieee.org>
+
+       * ConvertTest.cs: Test for exception thrown by 1.1. This is different
+       than the MSDN docs say.  Probably a doc bug.
+
 2005-01-08  Sebastien Pouliot  <sebastien@ximian.com>
 
        * AppDomainTest.cs: Un-ignore tests that unloaded the appdomain (they

diff --git a/mcs/class/corlib/Test/System/ConvertTest.cs b/mcs/class/corlib/Test/System/ConvertTest.cs
index 11c7b63a1988f1b31e415cb6611bc51e918e48c6..ce984540cd7d78840e8878be8480a09f6dc00237 100755 (executable)
--- a/mcs/class/corlib/Test/System/ConvertTest.cs
+++ b/mcs/class/corlib/Test/System/ConvertTest.cs
@@ -3491,7 +3491,10 @@ namespace MonoTests.System {
                }
 
                [Test]
-               [ExpectedException (typeof (InvalidCastException))]
+               // 2005/01/10: The docs say this should throw an InvalidCastException,
+               // however, MS.NET 1.1 throws a NullReferenceException. Assuming docs
+               // are wrong.
+               [ExpectedException (typeof (NullReferenceException))]
                public void ChangeTypeNullToValuetype ()
                {
                        Convert.ChangeType (null, typeof (int));