Author: gert
Date: 2007-07-20 13:38:42 -0400 (Fri, 20 Jul 2007)
New Revision: 82373

Added:
   trunk/mcs/class/corlib/Test/System/RuntimeMethodHandleTest.cs
Modified:
   trunk/mcs/class/corlib/ChangeLog
   trunk/mcs/class/corlib/Test/System.Reflection/ChangeLog
   trunk/mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs
   trunk/mcs/class/corlib/corlib_test.dll.sources
Log:
* corlib_test.dll.sources: added RuntimeMethodHandleTest.cs.
* RuntimeMethodHandleTest.cs: Added operator and Equals tests.
* MethodInfoTest.cs: Added GetMethodFromHandle test for generic type.


Modified: trunk/mcs/class/corlib/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/ChangeLog    2007-07-20 17:24:12 UTC (rev 82372)
+++ trunk/mcs/class/corlib/ChangeLog    2007-07-20 17:38:42 UTC (rev 82373)
@@ -1,3 +1,7 @@
+2007-07-20  Gert Driesen  <[EMAIL PROTECTED]>
+
+       * corlib_test.dll.sources: added RuntimeMethodHandleTest.cs.
+
 2007-07-10  Atsushi Enomoto  <[EMAIL PROTECTED]>
 
        * corlib_test.dll.sources : added StringInfoTest.cs.

Added: trunk/mcs/class/corlib/Test/System/RuntimeMethodHandleTest.cs
===================================================================
--- trunk/mcs/class/corlib/Test/System/RuntimeMethodHandleTest.cs       
2007-07-20 17:24:12 UTC (rev 82372)
+++ trunk/mcs/class/corlib/Test/System/RuntimeMethodHandleTest.cs       
2007-07-20 17:38:42 UTC (rev 82373)
@@ -0,0 +1,102 @@
+//
+// RuntimeMethodHandleTest.cs - Unit tests for System.RuntimeMethodHandle
+//
+// 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 NUnit.Framework;
+
+namespace MonoTests.System
+{
+       [TestFixture]
+       public class RuntimeMethodHandleTest
+       {
+               [Test]
+               public void Equals_Object ()
+               {
+                       Type type = typeof (RuntimeMethodHandleTest);
+                       RuntimeMethodHandle rmhA1 = type.GetMethod 
("Equals_Object").MethodHandle;
+                       RuntimeMethodHandle rmhA2 = type.GetMethod 
("Equals_Object").MethodHandle;
+                       RuntimeMethodHandle rmhB1 = type.GetMethod 
("Equals_RuntimeMethodHandle").MethodHandle;
+                       RuntimeMethodHandle rmhB2 = type.GetMethod 
("Equals_RuntimeMethodHandle").MethodHandle;
+
+                       Assert.IsTrue (rmhA1.Equals((object) rmhA1), "#1");
+                       Assert.IsTrue (rmhA1.Equals ((object) rmhA2), "#2");
+                       Assert.IsTrue (rmhB1.Equals ((object) rmhB1), "#3");
+                       Assert.IsTrue (rmhB2.Equals ((object) rmhB1), "#4");
+                       Assert.IsFalse (rmhA1.Equals ((object) rmhB1), "#5");
+                       Assert.IsFalse (rmhB1.Equals ((object) rmhA1), "#6");
+                       Assert.IsFalse (rmhA1.Equals (null), "#7");
+                       Assert.IsFalse (rmhA1.Equals (5), "#8");
+               }
+
+               [Test]
+               public void Equals_RuntimeMethodHandle ()
+               {
+                       Type type = typeof (RuntimeMethodHandleTest);
+                       RuntimeMethodHandle rmhA1 = type.GetMethod 
("Equals_Object").MethodHandle;
+                       RuntimeMethodHandle rmhA2 = type.GetMethod 
("Equals_Object").MethodHandle;
+                       RuntimeMethodHandle rmhB1 = type.GetMethod 
("Equals_RuntimeMethodHandle").MethodHandle;
+                       RuntimeMethodHandle rmhB2 = type.GetMethod 
("Equals_RuntimeMethodHandle").MethodHandle;
+
+                       Assert.IsTrue (rmhA1.Equals (rmhA1), "#1");
+                       Assert.IsTrue (rmhA1.Equals (rmhA2), "#2");
+                       Assert.IsTrue (rmhB1.Equals (rmhB1), "#3");
+                       Assert.IsTrue (rmhB2.Equals (rmhB1), "#4");
+                       Assert.IsFalse (rmhA1.Equals (rmhB1), "#5");
+                       Assert.IsFalse (rmhB1.Equals (rmhA1), "#6");
+               }
+
+#if NET_2_0
+               [Test]
+               public void Operators ()
+               {
+                       Type type = typeof (RuntimeMethodHandleTest);
+                       RuntimeMethodHandle rmhA1 = type.GetMethod 
("Operators").MethodHandle;
+                       RuntimeMethodHandle rmhA2 = type.GetMethod 
("Operators").MethodHandle;
+                       RuntimeMethodHandle rmhB1 = type.GetMethod 
("Equals_Object").MethodHandle;
+                       RuntimeMethodHandle rmhB2 = type.GetMethod 
("Equals_Object").MethodHandle;
+
+                       // equality
+                       Assert.IsTrue (rmhA1 == rmhA1, "#A1");
+                       Assert.IsTrue (rmhA1 == rmhA2, "#A2");
+                       Assert.IsTrue (rmhB1 == rmhB1, "#A3");
+                       Assert.IsTrue (rmhB2 == rmhB1, "#A4");
+                       Assert.IsFalse (rmhA1 == rmhB1, "#A5");
+                       Assert.IsFalse (rmhB1 == rmhA1, "#A6");
+
+                       // inequality
+                       Assert.IsFalse (rmhA1 != rmhA1, "#B1");
+                       Assert.IsFalse (rmhA1 != rmhA2, "#B2");
+                       Assert.IsFalse (rmhB1 != rmhB1, "#B3");
+                       Assert.IsFalse (rmhB2 != rmhB1, "#B4");
+                       Assert.IsTrue (rmhA1 != rmhB1, "#B5");
+                       Assert.IsTrue (rmhB1 != rmhA1, "#B6");
+               }
+#endif
+       }
+}


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

Modified: trunk/mcs/class/corlib/Test/System.Reflection/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/Test/System.Reflection/ChangeLog     2007-07-20 
17:24:12 UTC (rev 82372)
+++ trunk/mcs/class/corlib/Test/System.Reflection/ChangeLog     2007-07-20 
17:38:42 UTC (rev 82373)
@@ -1,3 +1,7 @@
+2007-07-20  Gert Driesen  <[EMAIL PROTECTED]>
+
+       * MethodInfoTest.cs: Added GetMethodFromHandle test for generic type.
+
 2007-07-20  Raja R Harinath  <[EMAIL PROTECTED]>
 
        * MethodInfoTest.cs (GetGenericMethodDefinition): New.  Based on

Modified: trunk/mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs
===================================================================
--- trunk/mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs     
2007-07-20 17:24:12 UTC (rev 82372)
+++ trunk/mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs     
2007-07-20 17:38:42 UTC (rev 82373)
@@ -287,6 +287,20 @@
                }
 
                [Test]
+               public void GetMethodFromHandle_Generic ()
+               {
+                       MethodHandleTest<int> test = new MethodHandleTest<int> 
();
+                       RuntimeMethodHandle mh = test.GetType ().GetProperty 
("MyList")
+                               .GetGetMethod ().MethodHandle;
+                       MethodBase mb = MethodInfo.GetMethodFromHandle (mh,
+                               typeof (MethodHandleTest<int>).TypeHandle);
+                       Assert.IsNotNull (mb, "#1");
+                       List<int> list = (List<int>) mb.Invoke (test, null);
+                       Assert.IsNotNull (list, "#2");
+                       Assert.AreEqual (1, list.Count, "#3");
+               }
+
+               [Test]
                public void ReturnParameter ()
                {
                        ParameterInfo pi = typeof (MethodInfoTest).GetMethod 
("return_parameter_test").ReturnParameter;
@@ -501,6 +515,20 @@
                {
                }
        }
+
+       public class MethodHandleTest<T>
+       {
+               private List<T> _myList = new List<T> ();
+
+               public MethodHandleTest ()
+               {
+                       _myList.Add (default (T));
+               }
+
+               public List<T> MyList {
+                       get { return _myList; }
+                       set { _myList = value; }
+               }
+       }
 #endif
 }
-

Modified: trunk/mcs/class/corlib/corlib_test.dll.sources
===================================================================
--- trunk/mcs/class/corlib/corlib_test.dll.sources      2007-07-20 17:24:12 UTC 
(rev 82372)
+++ trunk/mcs/class/corlib/corlib_test.dll.sources      2007-07-20 17:38:42 UTC 
(rev 82373)
@@ -346,6 +346,7 @@
 System/ExceptionCas.cs
 System/MarshalByRefObjectCas.cs
 System/RuntimeMethodHandleCas.cs
+System/RuntimeMethodHandleTest.cs
 System/TypedReferenceCas.cs
 System.Diagnostics/StackFrameCas.cs
 System.Diagnostics/StackTraceCas.cs

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

Reply via email to