Changeset 17865

Timestamp:

03/09/21 08:16:23 (4 years ago)

Author:

gkronber

Message:

#3089: merged r17781 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Tests (modified) (1 prop)
• HeuristicLab.Tests/HeuristicLab-3.3/PluginDependenciesTest.cs (modified) (1 diff)
• HeuristicLab.Tests/HeuristicLab.Persistence.Attic/PersistenceConsistencyChecks.cs (modified) (2 diffs)

stable/HeuristicLab.Tests/HeuristicLab-3.3/PluginDependenciesTest.cs

@@ -39 +39 @@
     [ClassInitialize]
     public static void MyClassInitialize(TestContext testContext) {
-      loadedPlugins = PluginLoader.Assemblies.Where(PluginLoader.IsPluginAssembly).ToDictionary(a => a, GetPluginFromAssembly);
+      try {
+        loadedPlugins = PluginLoader.Assemblies.Where(PluginLoader.IsPluginAssembly).ToDictionary(a => a, GetPluginFromAssembly);
+      } catch (BadImageFormatException e) {
+        var message = string.Join(Environment.NewLine, "Could not load all types. Check if test process architecture is set to x64.", string.Empty, "Exception:", e);
+        Assert.Fail(message);
+      }
+
       pluginNames = loadedPlugins.ToDictionary(a => a.Key.GetName().FullName, a => GetPluginName(a.Value));
 

stable/HeuristicLab.Tests/HeuristicLab.Persistence.Attic/PersistenceConsistencyChecks.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using HEAL.Attic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -16 +17 @@
       var dict = new Dictionary<Guid, string>();
       var duplicates = new Dictionary<string, string>();
-      // using AppDomain instead of ApplicationManager so that NonDiscoverableTypes are also checked
-      foreach (Type type in AppDomain.CurrentDomain.GetAssemblies().SelectMany(x => x.GetTypes())) {
-        var attr = StorableTypeAttribute.GetStorableTypeAttribute(type);
-        if (attr == null)
-          continue;
 
-        foreach (var guid in attr.Guids) {
-          if (!dict.ContainsKey(guid)) {
-            dict.Add(guid, type.FullName);
-          } else {
-            duplicates.Add(type.FullName, dict[guid]);
+      try {
+        // using AppDomain instead of ApplicationManager so that NonDiscoverableTypes are also checked
+        foreach (Type type in AppDomain.CurrentDomain.GetAssemblies().SelectMany(x => x.GetTypes())) {
+          var attr = StorableTypeAttribute.GetStorableTypeAttribute(type);
+          if (attr == null)
+            continue;
+
+          foreach (var guid in attr.Guids) {
+            if (!dict.ContainsKey(guid)) {
+              dict.Add(guid, type.FullName);
+            } else {
+              duplicates.Add(type.FullName, dict[guid]);
+            }
           }
         }
+      } catch (ReflectionTypeLoadException e) {
+        var loaderExeptions = string.Join("-----" + Environment.NewLine, e.LoaderExceptions.Select(x => x.ToString()));
+        var message = string.Join(Environment.NewLine, "Could not load all types. Check if test process architecture is set to x64.",
+          string.Empty, "Exception:", e, string.Empty, "LoaderExceptions:", loaderExeptions);
+        Assert.Fail(message);
       }