Merge pull request #347 from JamesB7/master

[mono.git] / mcs / class / System / Test / System.ComponentModel / Int64ConverterTests.cs

diff --git a/mcs/class/System/Test/System.ComponentModel/Int64ConverterTests.cs b/mcs/class/System/Test/System.ComponentModel/Int64ConverterTests.cs
index c4d6b0734711dcfa613c7f1f53f0060f1c1da55e..a9158d3d9c325982a9cb243d36f4723854cb2494 100644 (file)
--- a/mcs/class/System/Test/System.ComponentModel/Int64ConverterTests.cs
+++ b/mcs/class/System/Test/System.ComponentModel/Int64ConverterTests.cs
@@ -41,6 +41,7 @@ namespace MonoTests.System.ComponentModel
                {
                        Assert.IsTrue (converter.CanConvertTo (typeof (string)), "#1");
                        Assert.IsFalse (converter.CanConvertTo (typeof (object)), "#2");
+                       Assert.IsTrue (converter.CanConvertTo (typeof (int)), "#3");
                }
 
                [Test]
@@ -265,6 +266,19 @@ namespace MonoTests.System.ComponentModel
                                        return base.GetFormat (formatType);
                                }
                        }
+
+#if NET_2_0
+// adding this override in 1.x shows different result in .NET (it is ignored).
+// Some compatibility kids might want to fix this issue.
+                       public override NumberFormatInfo NumberFormat {
+                               get {
+                                       NumberFormatInfo nfi = (NumberFormatInfo) base.NumberFormat.Clone ();
+                                       nfi.NegativeSign = "myNegativeSign";
+                                       return nfi;
+                               }
+                               set { throw new NotSupportedException (); }
+                       }
+#endif
                }
        }
 }