Changeset 5306

Timestamp:

01/17/11 10:49:45 (14 years ago)

Author:

mkommend

Message:

Corrected HL3.3 tests project to test all assemblies and not only assemblies that contain a Plugin class (ticket #1351).

Location:

trunk/sources/HeuristicLab/3.3/Tests

Files:

• CloningConstructorTest.cs (modified) (2 diffs)
• ContentViewTests.cs (modified) (1 diff)
• PluginDependenciesTest.cs (modified) (1 diff)
• PluginLoader.cs (modified) (2 diffs)
• StorableConstructorTest.cs (modified) (2 diffs)

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

@@ -13 +13 @@
     [ClassInitialize]
     public static void MyClassInitialize(TestContext testContext) {
-      PluginLoader.pluginAssemblies.Any();
+      PluginLoader.Assemblies.Any();
     }
 
@@ -22 +22 @@
       foreach (Type deepCloneableType in ApplicationManager.Manager.GetTypes(typeof(IDeepCloneable))) {
         //test only types contained in HL plugin assemblies
-        if (!PluginLoader.pluginAssemblies.Contains(deepCloneableType.Assembly)) continue;
+        if (!PluginLoader.Assemblies.Contains(deepCloneableType.Assembly)) continue;
 
         bool found = false;

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

@@ -52 +52 @@
     [ClassInitialize]
     public static void MyClassInitialize(TestContext testContext) {
-      PluginLoader.pluginAssemblies.Any();
+      PluginLoader.Assemblies.Any();
     }
 

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

@@ -38 +38 @@
     [ClassInitialize]
     public static void MyClassInitialize(TestContext testContext) {
-      loadedPlugins = PluginLoader.pluginAssemblies.ToDictionary(a => a, GetPluginFromAssembly);
+      loadedPlugins = PluginLoader.Assemblies.Where(x => PluginLoader.IsPluginAssembly(x)).ToDictionary(a => a, GetPluginFromAssembly);
       pluginNames = loadedPlugins.ToDictionary(a => a.Key.GetName().FullName, a => GetPluginName(a.Value));
 

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

@@ -12 +12 @@
     public const string TestAccessorAssemblyExtension = "_Accessor.dll";
     public const string TestAssemblyExtension = ".Tests.dll";
-    public static List<Assembly> pluginAssemblies;
+    public static List<Assembly> Assemblies;
 
     static PluginLoader() {
@@ -19 +19 @@
         Assembly.LoadFrom(path);
 
-      pluginAssemblies = AppDomain.CurrentDomain.GetAssemblies().Where(IsPluginAssembly).ToList();
+      Assemblies = AppDomain.CurrentDomain.GetAssemblies().ToList();
     }
 
-    private static bool IsPluginAssembly(Assembly assembly) {
+    public static bool IsPluginAssembly(Assembly assembly) {
       return assembly.GetExportedTypes()
         .Where(t => typeof(IPlugin).IsAssignableFrom(t) && !t.IsAbstract && !t.IsInterface).Any();

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

@@ -16 +16 @@
     [ClassInitialize]
     public static void MyClassInitialize(TestContext testContext) {
-      PluginLoader.pluginAssemblies.Any();
+      PluginLoader.Assemblies.Any();
     }
 
@@ -26 +26 @@
         .Where(t => StorableClassAttribute.IsStorableClass(t))) {
         //test only types contained in HL plugin assemblies
-        if (!PluginLoader.pluginAssemblies.Contains(storableType.Assembly)) continue;
+        if (!PluginLoader.Assemblies.Contains(storableType.Assembly)) continue;
 
         IEnumerable<ConstructorInfo> ctors = storableType.GetConstructors(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);