2005/01/03 Nick Drochak <ndrochak@ieee.org>

[mono.git] / mcs / class / corlib / Test / System / ConvertTest.cs

diff --git a/mcs/class/corlib/Test/System/ConvertTest.cs b/mcs/class/corlib/Test/System/ConvertTest.cs
index 44e5f5475671059550fe0a35fdcdad72893c0fc9..5f65a94cfa2ddd8b95b27f6b08964f18eae04277 100755 (executable)
--- a/mcs/class/corlib/Test/System/ConvertTest.cs
+++ b/mcs/class/corlib/Test/System/ConvertTest.cs
@@ -197,7 +197,7 @@ namespace MonoTests.System {
                                Fail();
                        }
                        catch (Exception e) {
-                               AssertEquals("#A34", typeof(ArgumentException), e.GetType());
+                               AssertEquals("#A34", typeof(InvalidCastException), e.GetType());
                        }
 
                }               
@@ -475,7 +475,7 @@ namespace MonoTests.System {
                        AssertEquals("#F07", '@', Convert.ToChar("@"));
                        AssertEquals("#F08", 'K', Convert.ToChar((ushort)75));
                        AssertEquals("#F09", '=', Convert.ToChar((uint)61));
-                       // AssertEquals("#F10", 'È', Convert.ToChar((ulong)200));
+                       // AssertEquals("#F10", 'E', Convert.ToChar((ulong)200));
                        AssertEquals("#F11", '{', Convert.ToChar((object)trySByte, ci));
                        AssertEquals("#F12", 'o', Convert.ToChar(tryStr.Substring(1,1), ci));
                        
@@ -3490,6 +3490,13 @@ namespace MonoTests.System {
                        Convert.ChangeType (true, TypeCode.Empty);
                }
 
+               [Test]
+               [ExpectedException (typeof (NullReferenceException))]
+               public void ChangeTypeNullToValuetype ()
+               {
+                       Convert.ChangeType (null, typeof (int));
+               }
+
                [Test]
                public void ToString_MinMax_WithBase () 
                {