Changeset 8577 for trunk/sources

Timestamp:

09/05/12 14:24:13 (12 years ago)

Author:

mkommend

Message:

#1923: Changed type discovery to return only generic types with exactly the same type parameter and adapted the unit test accordingly.

Location:

trunk/sources

Files:

• HeuristicLab.PluginInfrastructure/3.3/TypeExtensions.cs (modified) (1 diff)
• HeuristicLab.Tests/HeuristicLab.PluginInfraStructure-3.3/TypeDiscoveryTest.cs (modified) (1 diff)

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/TypeExtensions.cs

@@ -110 +110 @@
 
         if (baseTypeGenericArgument.IsGenericParameter ^ subTypeGenericArgument.IsGenericParameter) return false;
-        if (baseTypeGenericArgument.IsAssignableFrom(subTypeGenericArgument)) continue;
+        if (baseTypeGenericArgument == subTypeGenericArgument) continue;
         if (!baseTypeGenericArgument.IsGenericParameter && !subTypeGenericArgument.IsGenericParameter) return false;
 

trunk/sources/HeuristicLab.Tests/HeuristicLab.PluginInfraStructure-3.3/TypeDiscoveryTest.cs

@@ -41 +41 @@
       Assert.IsTrue(typeof(List<int>).IsSubTypeOf(typeof(IList)));
       Assert.IsTrue(typeof(List<>).IsSubTypeOf(typeof(IList)));
+      Assert.IsFalse(typeof(NamedItemCollection<>).IsSubTypeOf(typeof(ICollection<IItem>)));
+      Assert.IsFalse(typeof(NamedItemCollection<>).IsSubTypeOf(typeof(ICollection<NamedItem>)));
 
-      Assert.IsTrue(typeof(IList<IItem>).IsSubTypeOf(typeof(IList<IItem>)));
-      Assert.IsTrue(typeof(List<IntValue>).IsSubTypeOf(typeof(IList<IItem>)));
-      Assert.IsTrue(typeof(List<IntValue>).IsSubTypeOf(typeof(List<IItem>)));
+
+      Assert.IsTrue(typeof(List<IItem>).IsSubTypeOf(typeof(IList<IItem>)));
+      Assert.IsFalse(typeof(IList<IntValue>).IsSubTypeOf(typeof(IList<IItem>)));
+      Assert.IsTrue(typeof(List<IItem>).IsSubTypeOf(typeof(IList<IItem>)));
       Assert.IsFalse(typeof(ItemList<>).IsSubTypeOf(typeof(IList<IItem>)));
       Assert.IsFalse(typeof(ItemList<>).IsSubTypeOf(typeof(List<IItem>)));