2007-07-19 Atsushi Enomoto <atsushi@ximian.com>

	* MonoMethod.cs : ToString() did not show correct return type when
	  it is generic.

	* MethodInfoTest.cs : added ToString() test for generic return type.

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

diff --git a/mcs/class/corlib/System.Reflection/ChangeLog b/mcs/class/corlib/System.Reflection/ChangeLog
index 1b71b935d1308f0ab8eac07ffbf11456c93d7a71..7ce81dcb1afec3722c79008148657d14d0ce5fd7 100644 (file)
--- a/mcs/class/corlib/System.Reflection/ChangeLog
+++ b/mcs/class/corlib/System.Reflection/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-19  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * MonoMethod.cs : ToString() did not show correct return type when
+         it is generic.
+
 2007-07-15  Zoltan Varga  <vargaz@gmail.com>
 
        * FieldInfo.cs: Implement GetOptional/RequiredCustomModifiers ().

diff --git a/mcs/class/corlib/System.Reflection/MonoMethod.cs b/mcs/class/corlib/System.Reflection/MonoMethod.cs
index 8248c31de384d38e3b2312cf06329a2a0bb188db..78cdfe1f2c7f822bdaf8a5f6aaa1eb0ad0a370e3 100644 (file)
--- a/mcs/class/corlib/System.Reflection/MonoMethod.cs
+++ b/mcs/class/corlib/System.Reflection/MonoMethod.cs
@@ -240,11 +240,10 @@ namespace System.Reflection {
 
                public override string ToString () {
                        StringBuilder sb = new StringBuilder ();
-                       if (ReturnType.IsClass && ReturnType.Namespace != String.Empty) {
-                               sb.Append (ReturnType.Namespace);
-                               sb.Append (".");
-                       }
-                       sb.Append (ReturnType.Name);
+                       if (ReturnType.IsClass)
+                               sb.Append (ReturnType.ToString ());
+                       else
+                               sb.Append (ReturnType.Name);
                        sb.Append (" ");
                        sb.Append (Name);
 #if NET_2_0 || BOOTSTRAP_NET_2_0

diff --git a/mcs/class/corlib/Test/System.Reflection/ChangeLog b/mcs/class/corlib/Test/System.Reflection/ChangeLog
index 5a5b3b24ebcf788d1faa14020c8a03ddb4c717cb..c30326d6afd9e18e76c281701e9024552dd553a9 100644 (file)
--- a/mcs/class/corlib/Test/System.Reflection/ChangeLog
+++ b/mcs/class/corlib/Test/System.Reflection/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-19  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * MethodInfoTest.cs : added ToString() test for generic return type.
+
 2007-07-09  Mark Probst  <mark.probst@gmail.com>
 
        * AssemblyTest.cs: Enabled test for bug 78465.

diff --git a/mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs b/mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs
index d25cb9b4fc608bead1d9a0fc08748e00825e3d3b..a6b0ce962d2eb30b999a8356d4b88495aa546ca1 100644 (file)
--- a/mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs
@@ -193,6 +193,15 @@ namespace MonoTests.System.Reflection
                                this.GetType ().GetMethod ("HeyHey").ToString ());
                }
 
+#if NET_2_0
+               [Test]
+               public void ToStringGenericMethod ()
+               {
+                       Assert.AreEqual ("System.Collections.ObjectModel.ReadOnlyCollection`1[T] AsReadOnly[T](.T[])",
+                               typeof (Array).GetMethod ("AsReadOnly").ToString ());
+               }
+#endif
+
                class GBD_A         { public virtual     void f () {} }
                class GBD_B : GBD_A { public override    void f () {} }
                class GBD_C : GBD_B { public override    void f () {} }