Changeset 6901 for trunk

Timestamp:

10/11/11 19:17:39 (13 years ago)

Author:

gkronber

Message:

#1653 small change to fix the unit tests.

File:

• trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/PluginLoader.cs (modified) (1 diff)

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

@@ -42 +42 @@
         catch (BadImageFormatException) { }
       }
-      Assemblies = AppDomain.CurrentDomain.GetAssemblies().ToList();
+      // test relevant path again to exclude previously loaded assemblies
+      Assemblies = AppDomain.CurrentDomain.GetAssemblies()
+        .Where(asm => IsRelevantAssemblyPath(asm.Location))
+        .ToList();
     }
 
     private static bool IsRelevantAssemblyPath(string path) {
       bool valid = true;
-      valid = valid && (path.EndsWith(ExecutableExtension, StringComparison.OrdinalIgnoreCase) || path.EndsWith(AssemblyExtension, StringComparison.OrdinalIgnoreCase));
+      valid = valid && path.EndsWith(ExecutableExtension, StringComparison.OrdinalIgnoreCase) || path.EndsWith(AssemblyExtension, StringComparison.OrdinalIgnoreCase);
       valid = valid && !path.EndsWith(TestAccessorAssemblyExtension, StringComparison.OrdinalIgnoreCase) && !path.EndsWith(TestAssemblyExtension, StringComparison.OrdinalIgnoreCase);
       return valid;