Remove Thread.[Abort|Suspend|Resume] from TvOS/WatchOS.

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

diff --git a/mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs b/mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs
index 65adf97aa51cb3fae0efc2b5d6374e45d5ebb2f2..b8a9de2b3c59a7908974d880877fdf8d4bcd2fb3 100644 (file)
--- a/mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs
@@ -37,14 +37,15 @@ using System.Reflection.Emit;
 using System.Runtime.InteropServices;
 using System.Runtime.CompilerServices;
 
-#if NET_2_0
 using System.Collections.Generic;
-#endif
 
 namespace A.B.C {
+       // Disable expected warning
+#pragma warning disable 169
        public struct MethodInfoTestStruct {
                int p;
        }
+#pragma warning restore 169
 }
 namespace MonoTests.System.Reflection
 {
@@ -63,6 +64,11 @@ namespace MonoTests.System.Reflection
                {
                }
 
+               public interface InterfaceTest
+               {
+                       void Clone ();
+               }
+
                [Test]
                public void IsDefined_AttributeType_Null ()
                {
@@ -94,7 +100,6 @@ namespace MonoTests.System.Reflection
                        }
                }
 
-#if NET_2_0
                [Test]
                public void PseudoCustomAttributes ()
                {
@@ -132,7 +137,6 @@ namespace MonoTests.System.Reflection
 
                        Assert.IsTrue (mi.ReturnTypeCustomAttributes.GetCustomAttributes (typeof (MarshalAsAttribute), true).Length == 1);
                }
-#endif
 
                public static int foo (int i, int j)
                {
@@ -170,9 +174,6 @@ namespace MonoTests.System.Reflection
                }
 
                [Test]
-#if ONLY_1_1
-               [Category ("NotDotNet")] // #A2 fails on MS.NET 1.x
-#endif
                public void ByrefVtypeInvoke ()
                {
                        MethodInfo mi = typeof (MethodInfoTest).GetMethod ("ByrefVtype");
@@ -204,6 +205,7 @@ namespace MonoTests.System.Reflection
                        return (int*) 0;
                }
 
+#if MONO_FEATURE_THREAD_ABORT
                [Test] // bug #81538
                public void InvokeThreadAbort ()
                {
@@ -212,24 +214,17 @@ namespace MonoTests.System.Reflection
                                method.Invoke (null, new object [0]);
                                Assert.Fail ("#1");
                        }
-#if NET_2_0
                        catch (ThreadAbortException ex) {
                                Thread.ResetAbort ();
                                Assert.IsNull (ex.InnerException, "#2");
                        }
-#else
-                       catch (TargetInvocationException ex) {
-                               Thread.ResetAbort ();
-                               Assert.IsNotNull (ex.InnerException, "#2");
-                               Assert.AreEqual (typeof (ThreadAbortException), ex.InnerException.GetType (), "#3");
-                       }
-#endif
                }
 
                public static void AbortIt ()
                {
                        Thread.CurrentThread.Abort ();
                }
+#endif
 
                [Test] // bug #76541
                public void ToStringByRef ()
@@ -253,7 +248,7 @@ namespace MonoTests.System.Reflection
 
                public struct SimpleStruct
                {
-                       int a;
+                       public int a;
                }
 
                public static unsafe SimpleStruct* PtrFunc2 (SimpleStruct* a, A.B.C.MethodInfoTestStruct *b)
@@ -313,11 +308,10 @@ namespace MonoTests.System.Reflection
                        Assert.AreSame (inheritedMethod, baseMethod);
                }
 
-#if NET_2_0
                [Test]
                public void GetMethodBody_Abstract ()
                {
-                       MethodBody mb = typeof (ICloneable).GetMethod ("Clone").GetMethodBody ();
+                       MethodBody mb = typeof (InterfaceTest).GetMethod ("Clone").GetMethodBody ();
                        Assert.IsNull (mb);
                }
 
@@ -369,14 +363,20 @@ namespace MonoTests.System.Reflection
 
                        IList<LocalVariableInfo> locals = mb.LocalVariables;
 
-                       // This might break with different compilers etc.
-                       Assert.AreEqual (2, locals.Count, "#3");
-
-                       Assert.IsTrue ((locals [0].LocalType == typeof (byte[])) || (locals [1].LocalType == typeof (byte[])), "#4");
-                       if (locals [0].LocalType == typeof (byte[]))
-                               Assert.AreEqual (false, locals [0].IsPinned, "#5");
-                       else
-                               Assert.AreEqual (false, locals [1].IsPinned, "#6");
+                       bool foundPinnedBytePointer = false;
+                       unsafe {
+                               foreach (LocalVariableInfo lvi in locals) {
+                                       if (lvi.LocalType == typeof (byte[]))
+                                               // This is optimized out by CSC in .NET 4.6
+                                               Assert.IsFalse (lvi.IsPinned, "#3-1");
+
+                                       if (/* mcs */ lvi.LocalType == typeof (byte*) || /* csc */ lvi.LocalType == typeof (byte).MakeByRefType ()) {
+                                               foundPinnedBytePointer = true;
+                                               Assert.IsTrue (lvi.IsPinned, "#3-2");
+                                       }
+                               }
+                       }
+                       Assert.IsTrue (foundPinnedBytePointer, "#4");
                }
 
                public int return_parameter_test ()
@@ -408,6 +408,15 @@ namespace MonoTests.System.Reflection
                        //Assert.IsTrue (pi.IsRetval, "#3");
                }
 
+               [Test]
+               public void MethodInfoModule ()
+               {
+                       Type type = typeof (MethodInfoTest);
+                       MethodInfo me = type.GetMethod ("return_parameter_test");
+
+                       Assert.AreEqual (type.Module, me.Module);
+               }
+
                [Test]
                        public void InvokeOnRefOnlyAssembly ()
                {
@@ -737,8 +746,6 @@ namespace MonoTests.System.Reflection
                        {
                        }
                }
-#endif
-#if NET_4_0
                interface IMethodInvoke<out T>
                {
                    T Test ();
@@ -762,7 +769,6 @@ namespace MonoTests.System.Reflection
                        Assert.AreEqual ("MethodInvoke", m0.Invoke (obj, new Object [0]));
                        Assert.AreEqual ("MethodInvoke", m1.Invoke (obj, new Object [0]));
                }
-#endif
 
 
                public int? Bug12856 ()
@@ -804,26 +810,48 @@ namespace MonoTests.System.Reflection
                        var type = typeof (GenericClass<>).GetMethod("Method").GetMethodBody().LocalVariables[0].LocalType;
                        Assert.AreEqual (typeofT, type);
                        Assert.AreEqual (typeof (GenericClass<>), type.DeclaringType);
+               
+                       bool foundTypeOfK = false;
+                       bool foundExpectedType = false;
+           
+                       MethodBody mb = typeof (GenericClass<>).GetMethod("Method2").GetMethodBody();
+                       foreach (LocalVariableInfo lvi in mb.LocalVariables) {
+                               if (lvi.LocalType == typeofK) {
+                                       foundTypeOfK = true;
+                                       Assert.AreEqual (typeof (GenericClass<>), lvi.LocalType.DeclaringType, "#1-1");
+                               } else if (lvi.LocalType == typeofT) {
+                                       foundExpectedType = true;
+                                       Assert.AreEqual (typeof (GenericClass<>), lvi.LocalType.DeclaringType, "#1-2");
+                               }
+                       }
 
-                       type = typeof (GenericClass<>).GetMethod("Method2").GetMethodBody().LocalVariables[0].LocalType;
-                       Assert.AreEqual (typeofT, type);
-                       Assert.AreEqual (typeof (GenericClass<>), type.DeclaringType);
-
-                       type = typeof (GenericClass<>).GetMethod("Method2").GetMethodBody().LocalVariables[1].LocalType;
-                       Assert.AreEqual (typeofK, type);
-                       Assert.AreEqual (typeof (GenericClass<>), type.DeclaringType);
-
-                       type = typeof (GenericClass<int>).GetMethod("Method2").GetMethodBody().LocalVariables[0].LocalType;
-                       Assert.AreEqual (typeof (int), type);
-
-                       type = typeof (GenericClass<int>).GetMethod("Method2").GetMethodBody().LocalVariables[1].LocalType;
-                       Assert.AreEqual (typeofK, type);
-                       Assert.AreEqual (typeof (GenericClass<>), type.DeclaringType);
+                       Assert.IsTrue (foundTypeOfK, "#1-3");
+                       if (mb.LocalVariables.Count < 2)
+                               Assert.Ignore ("Code built in release mode - 'T var0' optmized out");
+                       else
+                               Assert.IsTrue (foundExpectedType, "#1-4");
+           
+                       foundTypeOfK = false;
+                       foundExpectedType = false;
+                       mb = typeof (GenericClass<int>).GetMethod("Method2").GetMethodBody();
+                       foreach (LocalVariableInfo lvi in mb.LocalVariables) {
+                               if (lvi.LocalType == typeofK) {
+                                       foundTypeOfK = true;
+                                       Assert.AreEqual (typeof (GenericClass<>), lvi.LocalType.DeclaringType, "#2-1");
+                               } else if (lvi.LocalType == typeof (int)) {
+                                       foundExpectedType = true;
+                               }
+                       }
+           
+                       Assert.IsTrue (foundTypeOfK, "#2-3");
+                       if (mb.LocalVariables.Count < 2)
+                               Assert.Ignore ("Code built in release mode - 'int var0' optmized out");
+                       else
+                               Assert.IsTrue (foundExpectedType, "#2-4");
                }
 #endif
        }
        
-#if NET_2_0
        // Helper class
        class RefOnlyMethodClass 
        {
@@ -847,5 +875,4 @@ namespace MonoTests.System.Reflection
                        set { _myList = value; }
                }
        }
-#endif
 }