Merge pull request #495 from nicolas-raoul/fix-for-issue2907-with-no-formatting-changes

[mono.git] / mcs / tests / gtest-284.cs

diff --git a/mcs/tests/gtest-284.cs b/mcs/tests/gtest-284.cs
index eb9df3ccf56ef633c7ed552fad258919903dcfa3..a2a0100ce6b6aeb356330a70cd720034119f5135 100644 (file)
--- a/mcs/tests/gtest-284.cs
+++ b/mcs/tests/gtest-284.cs
@@ -147,6 +147,10 @@ public static class InterfaceTester
        static readonly Type generic_icollection_type;
        static readonly Type generic_ienumerable_type;
        static readonly Type icloneable_type;
+#if NET_4_0
+       static readonly Type istructuralequatable_type = typeof (IStructuralEquatable);
+       static readonly Type istructuralcomparable_type = typeof (IStructuralComparable);
+#endif
 
        static InterfaceTester ()
        {
@@ -172,6 +176,10 @@ public static class InterfaceTester
                ifaces.Add (icollection_type, State.Missing);
                ifaces.Add (ienumerable_type, State.Missing);
                ifaces.Add (icloneable_type, State.Missing);
+#if NET_4_0
+               ifaces.Add (istructuralequatable_type, State.Missing);
+               ifaces.Add (istructuralcomparable_type, State.Missing);
+#endif
 
                Type array_type = t.MakeArrayType ();
 
@@ -218,11 +226,11 @@ public static class InterfaceTester
 
        public static int Test ()
        {
-               int result = Test (typeof (X), typeof (X), typeof (Y), typeof (object));
+               int result = Test (typeof (X), typeof (X));
                if (result != 0)
                        return result;
 
-               result = Test (typeof (Y), typeof (Y), typeof (object));
+               result = Test (typeof (Y), typeof (Y));
                if (result != 0)
                        return 100 + result;
 
@@ -234,27 +242,27 @@ public static class InterfaceTester
                if (result != 0)
                        return 300 + result;
 
-               result = Test (typeof (int), typeof (int), typeof (uint));
+               result = Test (typeof (int), typeof (int));
                if (result != 0)
                        return 400 + result;
 
-               result = Test (typeof (uint), typeof (int), typeof (uint));
+               result = Test (typeof (uint), typeof (uint));
                if (result != 0)
                        return 500 + result;
 
-               result = Test (typeof (long), typeof (long), typeof (ulong));
+               result = Test (typeof (long), typeof (long));
                if (result != 0)
                        return 600 + result;
 
-               result = Test (typeof (ulong), typeof (long), typeof (ulong));
+               result = Test (typeof (ulong), typeof (ulong));
                if (result != 0)
                        return 700 + result;
 
-               result = Test (typeof (short), typeof (short), typeof (ushort));
+               result = Test (typeof (short), typeof (short));
                if (result != 0)
                        return 800 + result;
 
-               result = Test (typeof (ushort), typeof (short), typeof (ushort));
+               result = Test (typeof (ushort), typeof (ushort));
                if (result != 0)
                        return 900 + result;
 
@@ -280,7 +288,7 @@ class Z
                return 0;
        }
 
-       static int Main ()
+       public static int Main ()
        {
                int result = Test ();
                if (result == 0)