2007-08-19 Ivan N. Zlatev <contact@i-nz.net>
[mono.git] / mcs / class / System / Test / System.ComponentModel / TypeDescriptorTests.cs
index e350797129903466242b0e7d6297859d56725274..52e17280dd27e6d4203d80677fedd55e750429ac 100644 (file)
@@ -32,6 +32,19 @@ namespace MonoTests.System.ComponentModel
                public void Dispose () { }
        }
 
+       class MyOtherDesigner: IDesigner
+       {
+               public MyOtherDesigner()
+               {
+               }
+
+               public IComponent Component {get {return null; } }
+               public DesignerVerbCollection Verbs { get {return null; } }
+               public void DoDefaultAction () { }
+               public void Initialize (IComponent component) { }
+               public void Dispose () { }
+       }
+       
        class MySite: ISite
        { 
                public IComponent Component { get {  return null; } }
@@ -40,7 +53,7 @@ namespace MonoTests.System.ComponentModel
 
                public bool DesignMode { get {  return true; } }
 
-               public string Name { get { return "TestName"; } set { } }       
+               public string Name { get { return "TestName"; } set { } }
 
                public object GetService (Type t)
                {
@@ -75,6 +88,107 @@ namespace MonoTests.System.ComponentModel
                }
        }
 
+       class AnotherSite: ISite
+       { 
+               public IComponent Component { get {  return null; } }
+
+               public IContainer Container { get {  return null; } }
+
+               public bool DesignMode { get {  return true; } }
+
+               public string Name { get { return "TestName"; } set { } }
+
+               public object GetService (Type t)
+               {
+                       if (t == typeof(ITypeDescriptorFilterService)) {
+                               return new AnotherFilter ();
+                       }
+                       return null;
+               }
+       }
+
+       class NoFilterSite : ISite
+       {
+               public NoFilterSite () : this (null)
+               {
+               }
+
+               public NoFilterSite (IContainer container)
+               {
+                       _container = container;
+               }
+
+               public IComponent Component {
+                       get { return null; }
+               }
+
+               public IContainer Container {
+                       get { return _container; }
+               }
+
+               public bool DesignMode { get { return true; } }
+
+               public string Name { get { return "TestName"; } set { } }
+
+               public object GetService (Type t)
+               {
+                       return null;
+               }
+
+               public IContainer _container;
+       }
+
+       class MyContainer : IContainer
+       {
+               public MyContainer ()
+               {
+                       _components = new ComponentCollection (new IComponent [0]);
+               }
+
+               public ComponentCollection Components {
+                       get { return _components; }
+               }
+
+               public void Add (IComponent component)
+               {
+               }
+
+               public void Add (IComponent component, string name)
+               {
+               }
+
+               public void Dispose ()
+               {
+               }
+
+               public void Remove (IComponent component)
+               {
+               }
+
+               private ComponentCollection _components;
+       }
+
+       class AnotherFilter: ITypeDescriptorFilterService
+       {
+               public bool FilterAttributes (IComponent component,IDictionary attributes) {
+                       Attribute ea = new DefaultEventAttribute ("AnEvent");
+                       attributes [ea.TypeId] = ea;
+                       ea = new DefaultPropertyAttribute ("TestProperty");
+                       attributes [ea.TypeId] = ea;
+                       ea = new EditorAttribute ();
+                       attributes [ea.TypeId] = ea;
+                       return true;
+               }
+
+               public bool FilterEvents (IComponent component, IDictionary events) {
+                       return true;
+               }
+
+               public bool FilterProperties (IComponent component, IDictionary properties) {
+                       return true;
+               }
+       }
+
        [DescriptionAttribute ("my test component")]
        [DesignerAttribute (typeof(MyDesigner), typeof(int))]
        public class MyComponent: Component
@@ -94,9 +208,14 @@ namespace MonoTests.System.ComponentModel
                {
                        Site = site;
                }
-               
+
+               public MyComponent (IContainer container)
+               {
+                       container.Add (this);
+               }
+
                [DescriptionAttribute ("test")]
-               public string TestProperty
+               public virtual string TestProperty
                {
                        get { return prop; }
                        set { prop = value; }
@@ -108,195 +227,577 @@ namespace MonoTests.System.ComponentModel
                        set { prop = value; }
                }
        }
+
+       [DescriptionAttribute ("my test derived component")]
+       [DesignerAttribute (typeof(MyOtherDesigner))]
+       public class MyDerivedComponent: MyComponent
+       {
+               string prop;
+               
+               public MyDerivedComponent  ()
+               {
+               }
+               
+               public MyDerivedComponent (ISite site) : base (site)
+               {
+               }
+               
+               [DescriptionAttribute ("test derived")]
+               public override string TestProperty
+               {
+                       get { return prop; }
+                       set { prop = value; }
+               }
+
+
+               [DescriptionAttribute ("test derived")]
+               public new string AnotherProperty
+               {
+                       get { return base.AnotherProperty; }
+                       set { base.AnotherProperty = value; }
+               }
+       }
        
+
+       [DefaultProperty("AnotherProperty")]
+       [DefaultEvent("AnotherEvent")]
+       [DescriptionAttribute ("my test component")]
+       [DesignerAttribute (typeof(MyDesigner), typeof(int))]
+       public class AnotherComponent: Component {
+               string prop;
+               
+               [DescriptionAttribute ("test")]
+               public event EventHandler AnEvent;
+               
+               public event EventHandler AnotherEvent;
+               
+               public AnotherComponent () {
+               }
+               
+               public AnotherComponent (ISite site) {
+                       Site = site;
+               }
+               
+               [DescriptionAttribute ("test")]
+               public string TestProperty {
+                       get { return prop; }
+                       set { prop = value; }
+               }
+               
+               public string AnotherProperty {
+                       get { return prop; }
+                       set { prop = value; }
+               }
+       }
+
+       public interface ITestInterface
+       {
+               void TestFunction ();
+       }
+       
+       public class TestClass
+       {
+               public TestClass()
+               {}
+                       
+               void TestFunction ()
+               {}
+       }
+       
+       public struct TestStruct
+       {
+               public int TestVal;
+       }
+
+       public class TestCustomTypeDescriptor : ICustomTypeDescriptor
+       {
+               public string methods_called = "";
+
+               public void ResetMethodsCalled ()
+               {
+                       methods_called = "";
+               }
+
+               public TypeConverter GetConverter()
+               {
+                       return new StringConverter();
+               }
+
+               public EventDescriptorCollection GetEvents(Attribute[] attributes)
+               {
+                       methods_called += "1";
+                       return null;
+               }
+
+               public EventDescriptorCollection GetEvents()
+               {
+                       methods_called += "2";
+                       return null;
+               }
+
+               public string GetComponentName()
+               {
+                       return "MyComponentnName";
+               }
+
+               public object GetPropertyOwner(PropertyDescriptor pd)
+               {
+                       return this;
+               }
+
+               public AttributeCollection GetAttributes()
+               {
+                       methods_called += "3";
+                       return null;
+               }
+
+               public PropertyDescriptorCollection GetProperties(Attribute[] attributes)
+               {
+                       methods_called += "4";
+                       return new PropertyDescriptorCollection(new PropertyDescriptor[0]);
+               }
+
+               public PropertyDescriptorCollection GetProperties()
+               {
+                       methods_called += "5";
+                       return new PropertyDescriptorCollection(new PropertyDescriptor[0]);
+               }
+
+               public object GetEditor(Type editorBaseType)
+               {
+                       return null;
+               }
+
+               public PropertyDescriptor GetDefaultProperty()
+               {
+                       methods_called += "6";
+                       return null;
+               }
+
+               public EventDescriptor GetDefaultEvent()
+               {
+                       methods_called += "7";
+                       return null;
+               }
+
+               public string GetClassName()
+               {
+                       return this.GetType().Name;
+               }
+       }
+
        [TestFixture]
-       public class TypeDescriptorTests: Assertion
+       [NUnit.Framework.Category ("inz")]
+       public class TypeDescriptorTests
        {
                MyComponent com = new MyComponent ();
                MyComponent sitedcom = new MyComponent (new MySite ());
+               MyComponent nfscom = new MyComponent (new NoFilterSite (new MyContainer ()));
+               AnotherComponent anothercom = new AnotherComponent ();
                
+               [Test]
+               public void TestICustomTypeDescriptor ()
+               {
+                       TestCustomTypeDescriptor test = new TestCustomTypeDescriptor ();
+
+                       PropertyDescriptorCollection props;
+                       PropertyDescriptor prop;
+                       EventDescriptorCollection events;
+
+                       test.ResetMethodsCalled ();
+                       props = TypeDescriptor.GetProperties (test);
+                       Assert.AreEqual ("5", test.methods_called, "#1");
+
+                       test.ResetMethodsCalled ();
+                       props = TypeDescriptor.GetProperties (test, new Attribute[0]);
+                       Assert.AreEqual ("4", test.methods_called, "#2");
+
+                       test.ResetMethodsCalled ();
+                       props = TypeDescriptor.GetProperties (test, new Attribute[0], false);
+                       Assert.AreEqual ("4", test.methods_called, "#3");
+
+                       test.ResetMethodsCalled ();
+                       props = TypeDescriptor.GetProperties (test, false);
+                       Assert.AreEqual ("5", test.methods_called, "#4");
+
+                       test.ResetMethodsCalled ();
+                       prop = TypeDescriptor.GetDefaultProperty (test);
+                       Assert.AreEqual ("6", test.methods_called, "#5");
+
+                       test.ResetMethodsCalled ();
+                       events = TypeDescriptor.GetEvents (test);
+                       Assert.AreEqual ("2", test.methods_called, "#6");
+
+                       test.ResetMethodsCalled ();
+                       events = TypeDescriptor.GetEvents (test, new Attribute[0]);
+                       Assert.AreEqual ("1", test.methods_called, "#7");
+
+                       test.ResetMethodsCalled ();
+                       events = TypeDescriptor.GetEvents (test, false);
+                       Assert.AreEqual ("2", test.methods_called, "#8");
+               }
+
                [Test]
                public void TestCreateDesigner ()
                {
                        IDesigner des = TypeDescriptor.CreateDesigner (com, typeof(int));
-                       Assert ("t1", des is MyDesigner);
+                       Assert.IsTrue (des is MyDesigner, "#1");
                        
                        des = TypeDescriptor.CreateDesigner (com, typeof(string));
-                       AssertNull ("t2", des);
+                       Assert.IsNull (des, "#2");
                }
                
                [Test]
                public void TestCreateEvent ()
                {
                        EventDescriptor ed = TypeDescriptor.CreateEvent (typeof(MyComponent), "AnEvent", typeof(EventHandler), null);
-                       AssertEquals ("t1", typeof(MyComponent), ed.ComponentType);
-                       AssertEquals ("t2", typeof(EventHandler), ed.EventType);
-                       AssertEquals ("t3", true, ed.IsMulticast);
-                       AssertEquals ("t4", "AnEvent", ed.Name);
+                       Assert.AreEqual (typeof (MyComponent), ed.ComponentType, "#1");
+                       Assert.AreEqual (typeof (EventHandler), ed.EventType, "#2");
+                       Assert.IsTrue (ed.IsMulticast, "#3");
+                       Assert.AreEqual ("AnEvent", ed.Name, "#4");
                }
                
                [Test]
                public void TestCreateProperty ()
                {
                        PropertyDescriptor pd = TypeDescriptor.CreateProperty (typeof(MyComponent), "TestProperty", typeof(string), null);
-                       AssertEquals ("t1", typeof(MyComponent), pd.ComponentType);
-                       AssertEquals ("t2", "TestProperty", pd.Name);
-                       AssertEquals ("t3", typeof(string), pd.PropertyType);
-                       AssertEquals ("t4", false, pd.IsReadOnly);
+                       Assert.AreEqual (typeof (MyComponent), pd.ComponentType, "#1");
+                       Assert.AreEqual ("TestProperty", pd.Name, "#2");
+                       Assert.AreEqual (typeof (string), pd.PropertyType, "#3");
+                       Assert.IsFalse (pd.IsReadOnly, "#4");
                        
                        pd.SetValue (com, "hi");
-                       AssertEquals ("t5", "hi", pd.GetValue(com));
+                       Assert.AreEqual ("hi", pd.GetValue (com), "#5");
                }
                
                [Test]
                public void TestGetAttributes ()
                {
                        AttributeCollection col = TypeDescriptor.GetAttributes (typeof(MyComponent));
-                       Assert ("t2", col[typeof(DescriptionAttribute)] != null);
-                       Assert ("t3", col[typeof(DesignerAttribute)] != null);
-                       Assert ("t4", col[typeof(EditorAttribute)] == null);
+                       Assert.IsNotNull (col [typeof (DescriptionAttribute)], "#A1");
+                       Assert.IsNotNull (col [typeof (DesignerAttribute)], "#A2");
+                       Assert.IsNull (col [typeof (EditorAttribute)], "#A3");
                        
                        col = TypeDescriptor.GetAttributes (com);
-                       Assert ("t6", col[typeof(DescriptionAttribute)] != null);
-                       Assert ("t7", col[typeof(DesignerAttribute)] != null);
-                       Assert ("t8", col[typeof(EditorAttribute)] == null);
+                       Assert.IsNotNull (col [typeof (DescriptionAttribute)], "#B1");
+                       Assert.IsNotNull (col [typeof (DesignerAttribute)], "#B2");
+                       Assert.IsNull (col [typeof (EditorAttribute)], "#B3");
                        
                        col = TypeDescriptor.GetAttributes (sitedcom);
-                       Assert ("t10", col[typeof(DescriptionAttribute)] != null);
-                       Assert ("t11", col[typeof(DesignerAttribute)] != null);
-                       Assert ("t12", col[typeof(EditorAttribute)] != null);
+                       Assert.IsNotNull (col [typeof (DescriptionAttribute)], "#C1");
+                       Assert.IsNotNull (col [typeof (DesignerAttribute)], "#C2");
+                       Assert.IsNotNull (col [typeof (EditorAttribute)], "#C3");
+
+                       col = TypeDescriptor.GetAttributes (nfscom);
+                       Assert.IsNotNull (col [typeof (DescriptionAttribute)], "#D1");
+                       Assert.IsNotNull (col [typeof (DesignerAttribute)], "#D2");
+                       Assert.IsNull (col [typeof (EditorAttribute)], "#D3");
+
+                       col = TypeDescriptor.GetAttributes (typeof (MyDerivedComponent));
+                       Assert.IsNotNull (col [typeof (DesignerAttribute)], "#E1");
+                       Assert.IsNotNull (col [typeof (DescriptionAttribute)], "#E2");
+                       DesignerAttribute attribute = col[typeof(DesignerAttribute)] as DesignerAttribute;
+                       Assert.IsNotNull (attribute, "#E3");
+                       // there are multiple DesignerAttribute present and their order in the collection isn't deterministic
+                       bool found = false;
+                       for (int i = 0; i < col.Count; i++) {
+                               attribute = (col [i] as DesignerAttribute);
+                               if (attribute != null) {
+                                       found = typeof(MyOtherDesigner).AssemblyQualifiedName == attribute.DesignerTypeName;
+                                       if (found)
+                                               break;
+                               }
+                       }
+                       Assert.IsTrue (found, "#E4");
                }
                
                [Test]
                public void TestGetClassName ()
                {
-                       AssertEquals ("t1", typeof(MyComponent).FullName, TypeDescriptor.GetClassName (com));
+                       Assert.AreEqual (typeof(MyComponent).FullName, TypeDescriptor.GetClassName (com));
                }
                
                [Test]
                public void TestGetComponentName ()
                {
-                       AssertNull ("t1", TypeDescriptor.GetComponentName (com));
-                       AssertEquals ("t1", "TestName", TypeDescriptor.GetComponentName (sitedcom));
+#if NET_2_0
+                       // in MS.NET 2.0, GetComponentName no longer returns
+                       // the type name if there's no custom typedescriptor
+                       // and no site
+                       Assert.IsNull (TypeDescriptor.GetComponentName (com), "#1");
+                       Assert.IsNull (TypeDescriptor.GetComponentName (com, false), "#2");
+                       Assert.IsNull (TypeDescriptor.GetComponentName (new Exception ()), "#3");
+                       Assert.IsNull (TypeDescriptor.GetComponentName (new Exception (), false), "#4");
+                       Assert.IsNull (TypeDescriptor.GetComponentName (typeof (Exception)), "#4");
+                       Assert.IsNull (TypeDescriptor.GetComponentName (typeof (Exception), false), "#6");
+#else
+                       Assert.AreEqual ("MyComponent", TypeDescriptor.GetComponentName (com), "#1");
+                       Assert.AreEqual ("MyComponent", TypeDescriptor.GetComponentName (com, false), "#2");
+                       Assert.AreEqual ("Exception", TypeDescriptor.GetComponentName (new Exception ()), "#3");
+                       Assert.AreEqual ("Exception", TypeDescriptor.GetComponentName (new Exception (), false), "#4");
+                       Assert.IsNotNull (TypeDescriptor.GetComponentName (typeof (Exception)), "#5");
+                       Assert.IsNotNull (TypeDescriptor.GetComponentName (typeof (Exception), false), "#6");
+#endif
+                       Assert.AreEqual ("TestName", TypeDescriptor.GetComponentName (sitedcom), "#7");
+                       Assert.AreEqual ("TestName", TypeDescriptor.GetComponentName (sitedcom), "#8");
                }
                
                [Test]
                public void TestGetConverter ()
                {
-                       AssertEquals (typeof(BooleanConverter), TypeDescriptor.GetConverter (typeof (bool)).GetType());
-                       AssertEquals (typeof(ByteConverter), TypeDescriptor.GetConverter (typeof (byte)).GetType());
-                       AssertEquals (typeof(SByteConverter), TypeDescriptor.GetConverter (typeof (sbyte)).GetType());
-                       AssertEquals (typeof(StringConverter), TypeDescriptor.GetConverter (typeof (string)).GetType());
-                       AssertEquals (typeof(CharConverter), TypeDescriptor.GetConverter (typeof (char)).GetType());
-                       AssertEquals (typeof(Int16Converter), TypeDescriptor.GetConverter (typeof (short)).GetType());
-                       AssertEquals (typeof(Int32Converter), TypeDescriptor.GetConverter (typeof (int)).GetType());
-                       AssertEquals (typeof(Int64Converter), TypeDescriptor.GetConverter (typeof (long)).GetType());
-                       AssertEquals (typeof(UInt16Converter), TypeDescriptor.GetConverter (typeof (ushort)).GetType());
-                       AssertEquals (typeof(UInt32Converter), TypeDescriptor.GetConverter (typeof (uint)).GetType());
-                       AssertEquals (typeof(UInt64Converter), TypeDescriptor.GetConverter (typeof (ulong)).GetType());
-                       AssertEquals (typeof(SingleConverter), TypeDescriptor.GetConverter (typeof (float)).GetType());
-                       AssertEquals (typeof(DoubleConverter), TypeDescriptor.GetConverter (typeof (double)).GetType());
-                       AssertEquals (typeof(DecimalConverter), TypeDescriptor.GetConverter (typeof (decimal)).GetType());
-                       AssertEquals (typeof(ArrayConverter), TypeDescriptor.GetConverter (typeof (Array)).GetType());
-                       AssertEquals (typeof(CultureInfoConverter), TypeDescriptor.GetConverter (typeof (CultureInfo)).GetType());
-                       AssertEquals (typeof(DateTimeConverter), TypeDescriptor.GetConverter (typeof (DateTime)).GetType());
-                       AssertEquals (typeof(GuidConverter), TypeDescriptor.GetConverter (typeof (Guid)).GetType());
-                       AssertEquals (typeof(TimeSpanConverter), TypeDescriptor.GetConverter (typeof (TimeSpan)).GetType());
-                       AssertEquals (typeof(CollectionConverter), TypeDescriptor.GetConverter (typeof (ICollection)).GetType());
+                       Assert.AreEqual (typeof (BooleanConverter), TypeDescriptor.GetConverter (typeof (bool)).GetType (), "#1");
+                       Assert.AreEqual (typeof (ByteConverter), TypeDescriptor.GetConverter (typeof (byte)).GetType (), "#2");
+                       Assert.AreEqual (typeof (SByteConverter), TypeDescriptor.GetConverter (typeof (sbyte)).GetType (), "#3");
+                       Assert.AreEqual (typeof (StringConverter), TypeDescriptor.GetConverter (typeof (string)).GetType (), "#4");
+                       Assert.AreEqual (typeof (CharConverter), TypeDescriptor.GetConverter (typeof (char)).GetType (), "#5");
+                       Assert.AreEqual (typeof (Int16Converter), TypeDescriptor.GetConverter (typeof (short)).GetType (), "#6");
+                       Assert.AreEqual (typeof (Int32Converter), TypeDescriptor.GetConverter (typeof (int)).GetType (), "#7");
+                       Assert.AreEqual (typeof (Int64Converter), TypeDescriptor.GetConverter (typeof (long)).GetType (), "#8");
+                       Assert.AreEqual (typeof (UInt16Converter), TypeDescriptor.GetConverter (typeof (ushort)).GetType (), "#9");
+                       Assert.AreEqual (typeof (UInt32Converter), TypeDescriptor.GetConverter (typeof (uint)).GetType (), "#10");
+                       Assert.AreEqual (typeof (UInt64Converter), TypeDescriptor.GetConverter (typeof (ulong)).GetType (), "#11");
+                       Assert.AreEqual (typeof (SingleConverter), TypeDescriptor.GetConverter (typeof (float)).GetType (), "#12");
+                       Assert.AreEqual (typeof (DoubleConverter), TypeDescriptor.GetConverter (typeof (double)).GetType (), "#13");
+                       Assert.AreEqual (typeof (DecimalConverter), TypeDescriptor.GetConverter (typeof (decimal)).GetType (), "#14");
+                       Assert.AreEqual (typeof (ArrayConverter), TypeDescriptor.GetConverter (typeof (Array)).GetType (), "#15");
+                       Assert.AreEqual (typeof (CultureInfoConverter), TypeDescriptor.GetConverter (typeof (CultureInfo)).GetType (), "#16");
+                       Assert.AreEqual (typeof (DateTimeConverter), TypeDescriptor.GetConverter (typeof (DateTime)).GetType (), "#17");
+                       Assert.AreEqual (typeof (GuidConverter), TypeDescriptor.GetConverter (typeof (Guid)).GetType (), "#18");
+                       Assert.AreEqual (typeof (TimeSpanConverter), TypeDescriptor.GetConverter (typeof (TimeSpan)).GetType (), "#19");
+                       Assert.AreEqual (typeof (CollectionConverter), TypeDescriptor.GetConverter (typeof (ICollection)).GetType (), "#20");
+
+                       // Tests from bug #71444
+                       Assert.AreEqual (typeof (CollectionConverter), TypeDescriptor.GetConverter (typeof (IDictionary)).GetType (), "#21");
+                       Assert.AreEqual (typeof (ReferenceConverter), TypeDescriptor.GetConverter (typeof (ITestInterface)).GetType (), "#22");
+                       Assert.AreEqual (typeof (TypeConverter), TypeDescriptor.GetConverter (typeof (TestClass)).GetType (), "#23");
+                       Assert.AreEqual (typeof (TypeConverter), TypeDescriptor.GetConverter (typeof (TestStruct)).GetType (), "#24");
+
+                       Assert.AreEqual (typeof (TypeConverter), TypeDescriptor.GetConverter (new TestClass ()).GetType (), "#25");
+                       Assert.AreEqual (typeof (TypeConverter), TypeDescriptor.GetConverter (new TestStruct ()).GetType (), "#26");
+                       Assert.AreEqual (typeof (CollectionConverter), TypeDescriptor.GetConverter (new Hashtable ()).GetType (), "#27");
+
+#if NET_2_0
+                       // Test from bug #76686
+                       Assert.AreEqual  (typeof (Int32Converter), TypeDescriptor.GetConverter ((int?) 1).GetType (), "#28");
+#endif
                }
                
                [Test]
                public void TestGetDefaultEvent ()
                {
                        EventDescriptor des = TypeDescriptor.GetDefaultEvent (typeof(MyComponent));
-                       AssertNull ("t1", des);
+                       Assert.IsNull ( des, "#A");
                        
                        des = TypeDescriptor.GetDefaultEvent (com);
-                       AssertNull ("t2", des);
-                       
+                       Assert.IsNull (des, "#B");
+
+                       des = TypeDescriptor.GetDefaultEvent (typeof(AnotherComponent));
+                       Assert.IsNotNull (des, "#C1");
+                       Assert.AreEqual ("AnotherEvent", des.Name, "#C2");
+
+                       des = TypeDescriptor.GetDefaultEvent (anothercom);
+                       Assert.IsNotNull (des, "#D1");
+                       Assert.AreEqual ("AnotherEvent", des.Name, "#D2");
+
                        des = TypeDescriptor.GetDefaultEvent (sitedcom);
-                       AssertNotNull ("t3", des);
-                       AssertEquals ("t4", "AnEvent", des.Name);
+#if NET_2_0
+                       Assert.IsNull (des, "#E1");
+#else
+                       Assert.IsNotNull (des, "#E1");
+                       Assert.AreEqual ("AnotherEvent", des.Name, "#E2");
+#endif
+
+                       des = TypeDescriptor.GetDefaultEvent (new MyComponent(new AnotherSite ()));
+                       Assert.IsNotNull (des, "#F1");
+                       Assert.AreEqual ("AnEvent", des.Name, "#F2");
+
+                       des = TypeDescriptor.GetDefaultEvent (new AnotherComponent(new AnotherSite ()));
+                       Assert.IsNotNull (des, "#G1");
+                       Assert.AreEqual ("AnEvent", des.Name, "#G2");
                }
                
                [Test]
                public void TestGetDefaultProperty ()
                {
                        PropertyDescriptor des = TypeDescriptor.GetDefaultProperty (typeof(MyComponent));
-                       AssertNull ("t1", des);
+                       Assert.IsNull (des, "#A");
                        
                        des = TypeDescriptor.GetDefaultProperty (com);
-                       AssertNull ("t2", des);
-                       
-                       des = TypeDescriptor.GetDefaultProperty (sitedcom);
-                       AssertNotNull ("t3", des);
-                       AssertEquals ("t4", "TestProperty", des.Name);
+                       Assert.IsNull (des, "#B");
+
+                       des = TypeDescriptor.GetDefaultProperty (typeof(AnotherComponent));
+                       Assert.IsNotNull (des, "#C1");
+                       Assert.AreEqual ("AnotherProperty", des.Name, "#C2");
+
+                       des = TypeDescriptor.GetDefaultProperty (anothercom);
+                       Assert.IsNotNull (des, "#D1");
+                       Assert.AreEqual ("AnotherProperty", des.Name, "#D2");
                }
                
+               [Test]
+#if ONLY_1_1
+               // throws NullReferenceException on MS.NET 1.x due to bug
+               // which is fixed in MS.NET 2.0
+               [NUnit.Framework.Category("NotDotNet")]
+#endif
+               public void TestGetDefaultProperty2 ()
+               {
+                       PropertyDescriptor des = TypeDescriptor.GetDefaultProperty (sitedcom);
+                       Assert.IsNull (des, "#A");
+
+                       des = TypeDescriptor.GetDefaultProperty (new MyComponent (new AnotherSite ()));
+                       Assert.IsNotNull (des, "#B1");
+                       Assert.AreEqual ("TestProperty", des.Name, "#B2");
+
+                       des = TypeDescriptor.GetDefaultProperty (new AnotherComponent (new AnotherSite ()));
+                       Assert.IsNotNull (des, "#C1");
+                       Assert.AreEqual ("TestProperty", des.Name, "#C2");
+
+                       des = TypeDescriptor.GetDefaultProperty (new AnotherComponent (new MySite ()));
+                       Assert.IsNull (des, "#D");
+               }
+
                [Test]
                public void TestGetEvents ()
                {
                        EventDescriptorCollection col = TypeDescriptor.GetEvents (typeof(MyComponent));
-                               
-                       AssertEquals ("t1.1", 3, col.Count);
-                       Assert ("t1.2", col.Find ("AnEvent", true) != null);
-                       Assert ("t1.3", col.Find ("AnotherEvent", true) != null);
-                       Assert ("t1.4", col.Find ("Disposed", true) != null);
+                       Assert.AreEqual (3, col.Count, "#A1");
+                       Assert.IsNotNull (col.Find ("AnEvent", true), "#A2");
+                       Assert.IsNotNull (col.Find ("AnotherEvent", true), "#A3");
+                       Assert.IsNotNull (col.Find ("Disposed", true), "#A4");
                        
                        col = TypeDescriptor.GetEvents (com);
-                       AssertEquals ("t2.1", 3, col.Count);
-                       Assert ("t2.2", col.Find ("AnEvent", true) != null);
-                       Assert ("t2.3", col.Find ("AnotherEvent", true) != null);
-                       Assert ("t2.4", col.Find ("Disposed", true) != null);
+                       Assert.AreEqual (3, col.Count, "#B1");
+                       Assert.IsNotNull (col.Find ("AnEvent", true), "#B2");
+                       Assert.IsNotNull (col.Find ("AnotherEvent", true), "#B3");
+                       Assert.IsNotNull (col.Find ("Disposed", true), "#B4");
                        
                        col = TypeDescriptor.GetEvents (sitedcom);
-                       AssertEquals ("t3.1", 2, col.Count);
-                       Assert ("t3.2", col.Find ("AnotherEvent", true) != null);
-                       Assert ("t3.3", col.Find ("Disposed", true) != null);
-                       
+                       Assert.AreEqual (2, col.Count, "#C1");
+                       Assert.IsNotNull (col.Find ("AnotherEvent", true), "#C2");
+                       Assert.IsNotNull (col.Find ("Disposed", true), "#C3");
+
+                       col = TypeDescriptor.GetEvents (nfscom);
+                       Assert.AreEqual (3, col.Count, "#D1");
+                       Assert.IsNotNull (col.Find ("AnEvent", true), "#D2");
+                       Assert.IsNotNull ( col.Find ("AnotherEvent", true), "#D3");
+                       Assert.IsNotNull (col.Find ("Disposed", true), "#D4");
+
                        Attribute[] filter = new Attribute[] { new DescriptionAttribute ("test") };
                        
                        col = TypeDescriptor.GetEvents (typeof(MyComponent), filter);
-                       AssertEquals ("t4.1", 1, col.Count);
-                       Assert ("t4.2", col.Find ("AnEvent", true) != null);
+                       Assert.AreEqual (1, col.Count, "#E1");
+                       Assert.IsNotNull (col.Find ("AnEvent", true), "#E2");
                        
                        col = TypeDescriptor.GetEvents (com, filter);
-                       AssertEquals ("t5.1", 1, col.Count);
-                       Assert ("t5.2", col.Find ("AnEvent", true) != null);
+                       Assert.AreEqual (1, col.Count, "#F1");
+                       Assert.IsNotNull (col.Find ("AnEvent", true), "#F2");
                        
                        col = TypeDescriptor.GetEvents (sitedcom, filter);
-                       AssertEquals ("t6", 0, col.Count);
+                       Assert.AreEqual (0, col.Count, "#G");
+
+                       col = TypeDescriptor.GetEvents (nfscom, filter);
+                       Assert.AreEqual (1, col.Count, "#H1");
+                       Assert.IsNotNull (col.Find ("AnEvent", true), "#H2");
                }
                
                [Test]
                public void TestGetProperties ()
                {
                        PropertyDescriptorCollection col = TypeDescriptor.GetProperties (typeof(MyComponent));
-                       Assert ("t1.1", col.Find ("TestProperty", true) != null);
-                       Assert ("t1.2", col.Find ("AnotherProperty", true) != null);
+                       Assert.IsNotNull (col.Find ("TestProperty", true), "#A1");
+                       Assert.IsNotNull ( col.Find ("AnotherProperty", true), "#A2");
                        
                        col = TypeDescriptor.GetProperties (com);
-                       Assert ("t2.1", col.Find ("TestProperty", true) != null);
-                       Assert ("t2.2", col.Find ("AnotherProperty", true) != null);
-                       
-                       col = TypeDescriptor.GetProperties (sitedcom);
-                       Assert ("t3.1", col.Find ("TestProperty", true) == null);
-                       Assert ("t3.2", col.Find ("AnotherProperty", true) != null);
-                       
+                       Assert.IsNotNull (col.Find ("TestProperty", true), "#B1");
+                       Assert.IsNotNull (col.Find ("AnotherProperty", true), "#B2");
+
+                       col = TypeDescriptor.GetProperties (nfscom);
+                       Assert.IsNotNull (col.Find ("TestProperty", true), "#C1");
+                       Assert.IsNotNull (col.Find ("AnotherProperty", true), "#C2");
+
                        Attribute[] filter = new Attribute[] { new DescriptionAttribute ("test") };
                        
                        col = TypeDescriptor.GetProperties (typeof(MyComponent), filter);
-                       Assert ("t4.1", col.Find ("TestProperty", true) != null);
-                       Assert ("t4.2", col.Find ("AnotherProperty", true) == null);
+                       Assert.IsNotNull (col.Find ("TestProperty", true), "#D1");
+                       Assert.IsNull (col.Find ("AnotherProperty", true), "#D2");
                        
                        col = TypeDescriptor.GetProperties (com, filter);
-                       Assert ("t5.1", col.Find ("TestProperty", true) != null);
-                       Assert ("t5.2", col.Find ("AnotherProperty", true) == null);
-                       
+                       Assert.IsNotNull (col.Find ("TestProperty", true), "#E1");
+                       Assert.IsNull (col.Find ("AnotherProperty", true), "#E2");
+
+                       col = TypeDescriptor.GetProperties (nfscom, filter);
+                       Assert.IsNotNull (col.Find ("TestProperty", true), "#F1");
+                       Assert.IsNull (col.Find ("AnotherProperty", true), "#F2");
+
+
+                       // GetProperties should return only the last type's implementation of a
+                       // property with a matching name in the base types. E.g in the case where 
+                       // the "new" keyword is used.
+                       //
+                       PropertyDescriptorCollection derivedCol = TypeDescriptor.GetProperties (typeof(MyDerivedComponent));
+                       Assert.IsNotNull (derivedCol["AnotherProperty"].Attributes[typeof (DescriptionAttribute)], "#G1");
+                       int propsFound = 0;
+                       foreach (PropertyDescriptor props in derivedCol)
+                               if (props.Name == "AnotherProperty")
+                                       propsFound++;
+                       Assert.AreEqual (1, propsFound, "#G2");
+               }
+
+               [Test]
+#if ONLY_1_1
+               // throws NullReferenceException on MS.NET 1.x due to bug
+               // which is fixed in MS.NET 2.0
+               [NUnit.Framework.Category("NotDotNet")]
+#endif
+               public void TestGetProperties2 ()
+               {
+                       PropertyDescriptorCollection col = TypeDescriptor.GetProperties (sitedcom);
+                       Assert.IsNull (col.Find ("TestProperty", true), "#A1");
+                       Assert.IsNotNull (col.Find ("AnotherProperty", true), "#A2");
+
+                       Attribute[] filter = new Attribute[] { new DescriptionAttribute ("test") };
                        col = TypeDescriptor.GetProperties (sitedcom, filter);
-                       Assert ("t6.1", col.Find ("TestProperty", true) == null);
-                       Assert ("t6.2", col.Find ("AnotherProperty", true) == null);
+                       Assert.IsNull (col.Find ("TestProperty", true), "#B1");
+                       Assert.IsNull (col.Find ("AnotherProperty", true), "#B2");
+               }
+
+               [TypeConverter (typeof (TestConverter))]
+               class TestConverterClass {
+               }
+
+               class TestConverter : TypeConverter {
+                       public Type Type;
+
+                       public TestConverter (Type type)
+                       {
+                               this.Type = type;
+                       }
+               }
+
+               [Test]
+               public void TestConverterCtorWithArgument ()
+               {
+                       TypeConverter t = TypeDescriptor.GetConverter (typeof (TestConverterClass));
+                       Assert.IsNotNull (t.GetType (), "#A1");
+                       Assert.AreEqual (typeof (TestConverter), t.GetType (), "#A2");
+                       TestConverter converter = (TestConverter) t;
+                       Assert.AreEqual (typeof (TestConverterClass), converter.Type, "#B");
+               }
+
+               [Test]
+               public void GetPropertiesIgnoreIndexers ()
+               {
+                       PropertyDescriptorCollection pc =
+                               TypeDescriptor.GetProperties (typeof (string));
+                       // There are two string properties: Length and Chars.
+                       // Chars is an indexer.
+                       //
+                       // Future version of CLI might contain some additional
+                       // properties. In that case simply increase the
+                       // number. (Also, it is fine to just remove #2.)
+                       Assert.AreEqual (1, pc.Count, "#1");
+                       Assert.AreEqual ("Length", pc [0].Name, "#2");
                }
        }
 }
-