Merge pull request #1949 from lewurm/fixtype

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

diff --git a/mcs/class/corlib/Test/System.Reflection/PropertyInfoTest.cs b/mcs/class/corlib/Test/System.Reflection/PropertyInfoTest.cs
index f461e8be636edf1285b2cf22e5f17ac6b6fb5e60..dd38e16b7e52e7588d05cdbb637b9ae47da88b5b 100644 (file)
--- a/mcs/class/corlib/Test/System.Reflection/PropertyInfoTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection/PropertyInfoTest.cs
@@ -48,6 +48,7 @@ namespace MonoTests.System.Reflection
                {
                        Type type = typeof (TestClass);
                        PropertyInfo property = type.GetProperty ("ReadOnlyProperty");
+                       Assert.IsNotNull (property.Module, "#0");
 
                        MethodInfo [] methods = property.GetAccessors (true);
                        Assert.AreEqual (1, methods.Length, "#A1");
@@ -98,7 +99,6 @@ namespace MonoTests.System.Reflection
                        methods = property.GetAccessors ();
                        Assert.AreEqual (0, methods.Length, "#H");
 
-#if NET_2_0
                        property = typeof (TestClass).GetProperty ("PrivateSetter");
 
                        methods = property.GetAccessors (true);
@@ -117,7 +117,6 @@ namespace MonoTests.System.Reflection
                        Assert.AreEqual (1, methods.Length, "#J1");
                        Assert.IsNotNull (methods [0], "#J2");
                        Assert.AreEqual ("get_PrivateSetter", methods [0].Name, "#J3");
-#endif
                }
 
                [Test]
@@ -480,12 +479,10 @@ namespace MonoTests.System.Reflection
                                set { }
                        }
 
-#if NET_2_0
                        public string PrivateSetter {
                                get { return null; }
                                private set { }
                        }
-#endif
                }
 
                [Test] // bug #633671
@@ -501,8 +498,20 @@ namespace MonoTests.System.Reflection
                        Assert.AreEqual (typeof (ClassWithNullableDateTime), siblingProperty.DeclaringType, "#3");
                        Assert.AreEqual (typeof (InheritsFromClassWithNullableDateTime), siblingProperty.ReflectedType, "#4");
                }
-               
-       
+
+               class Super { public long A { get; private set; } }
+
+               class Sub : Super { }
+
+               [Test]
+               public void PrivateSetterFromDerivedType ()
+               {
+                       var prop = typeof (Sub).GetProperty ("A");
+                       Assert.AreEqual (1, prop.GetAccessors (true).Length, "#1");
+                       Assert.IsFalse (prop.CanWrite, "#2");
+                       Assert.IsNull (prop.GetSetMethod (true), "#3");
+               }
+
                public class ClassWithNullableDateTime
                {
                        public DateTime? Property1 { get; set; }