2007-08-19 Ivan N. Zlatev <contact@i-nz.net>

[mono.git] / mcs / class / System / Test / System.ComponentModel / PropertyDescriptorTests.cs

diff --git a/mcs/class/System/Test/System.ComponentModel/PropertyDescriptorTests.cs b/mcs/class/System/Test/System.ComponentModel/PropertyDescriptorTests.cs
index 502c73cc4f477ede97377dfcee8a6781aa9d30ed..7105a07a397dc56ce1fd95a04e0403e35f1408a1 100644 (file)
--- a/mcs/class/System/Test/System.ComponentModel/PropertyDescriptorTests.cs
+++ b/mcs/class/System/Test/System.ComponentModel/PropertyDescriptorTests.cs
@@ -193,6 +193,18 @@ namespace MonoTests.System.ComponentModel
                                set { _prop7 = value; }
                        }
 
+                       [ReadOnly (true)]
+                       [DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
+                       public string Prop8 {
+                               get { return null; }
+                       }
+
+                       [ReadOnly (true)]
+                       [DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
+                       public string Prop9 {
+                               get { return null; }
+                       }
+
                        public bool SerializeProp3 {
                                get { return _serializeProp3; }
                                set { _serializeProp3 = value; }
@@ -243,6 +255,11 @@ namespace MonoTests.System.ComponentModel
                                return _serializeProp7;
                        }
 
+                       public bool ShouldSerializeProp8 ()
+                       {
+                               return false;
+                       }
+
                        private string _prop1;
                        private string _prop2;
                        private string _prop3;
@@ -412,6 +429,8 @@ namespace MonoTests.System.ComponentModel
                        PropertyDescriptor prop5PD = properties ["Prop5"];
                        PropertyDescriptor prop6PD = properties ["Prop6"];
                        PropertyDescriptor prop7PD = properties ["Prop7"];
+                       PropertyDescriptor prop8PD = properties ["Prop8"];
+                       PropertyDescriptor prop9PD = properties ["Prop9"];
 
                        Assert.IsFalse (prop1PD.ShouldSerializeValue (test), "#A1");
                        Assert.IsTrue (prop2PD.ShouldSerializeValue (test), "#A2");
@@ -448,6 +467,11 @@ namespace MonoTests.System.ComponentModel
                        Assert.IsTrue (prop7PD.ShouldSerializeValue (test), "#C7");
                        test.Prop7 = "good";
                        Assert.IsTrue (prop7PD.ShouldSerializeValue (test), "#C8");
+
+                       // has both DesignerSerializationVisibility.Content and ShouldSerialize { return false }
+                       Assert.IsFalse (prop8PD.ShouldSerializeValue (test), "#D1");
+                       // has DesignerSerializationVisibility.Content, no ShouldSerialize
+                       Assert.IsTrue (prop9PD.ShouldSerializeValue (test), "#D2");
                }
 
                [Test]