Changeset 5151 for trunk/sources

Timestamp:

12/21/10 16:39:56 (14 years ago)

Author:

mkommend

Message:

Corrected CloningConstructorTest and StorableConstructorTest to test only HL plugin assemblies (ticket #1351).

Location:

trunk/sources/HeuristicLab/3.3/Tests

Files:

• CloningConstructorTest.cs (modified) (1 diff)
• PluginLoader.cs (modified) (1 diff)
• StorableConstructorTest.cs (modified) (1 diff)

trunk/sources/HeuristicLab/3.3/Tests/CloningConstructorTest.cs

@@ -21 +21 @@
 
       foreach (Type deepCloneableType in ApplicationManager.Manager.GetTypes(typeof(IDeepCloneable))) {
+        //test only types contained in HL plugin assemblies
+        if (!PluginLoader.pluginAssemblies.Contains(deepCloneableType.Assembly)) break;
+
         bool found = false;
         foreach (ConstructorInfo constructor in deepCloneableType.GetConstructors(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public)) {

trunk/sources/HeuristicLab/3.3/Tests/PluginLoader.cs

@@ -10 +10 @@
   internal static class PluginLoader {
     public const string AssemblyExtension = ".dll";
+    public const string TestAccessorAssemblyExtension = "_Accessor.dll";
+    public const string TestAssemblyExtension = ".test.dll";
     public static List<Assembly> pluginAssemblies;
 
     static PluginLoader() {
       foreach (string path in Directory.EnumerateFiles(Environment.CurrentDirectory)
-        .Where(s => s.EndsWith(AssemblyExtension)))
+        .Where(s => s.EndsWith(AssemblyExtension) && !s.EndsWith(TestAccessorAssemblyExtension) && !s.EndsWith(TestAssemblyExtension)))
         Assembly.LoadFrom(path);
 

trunk/sources/HeuristicLab/3.3/Tests/StorableConstructorTest.cs

@@ -25 +25 @@
       foreach (Type storableType in ApplicationManager.Manager.GetTypes(typeof(object))
         .Where(t => StorableClassAttribute.IsStorableClass(t))) {
+        //test only types contained in HL plugin assemblies
+        if (!PluginLoader.pluginAssemblies.Contains(storableType.Assembly)) break;
+
         IEnumerable<ConstructorInfo> ctors = storableType.GetConstructors(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
         ConstructorInfo storableConstructor = ctors.Where(c => c.GetParameters().Count() == 1 && c.GetParameters().First().ParameterType == typeof(bool)).FirstOrDefault();