Changeset 17165

Timestamp:

07/23/19 21:01:03 (5 years ago)

Author:

gkronber

Message:

#2520: merged r17019 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Tests (modified) (1 prop)
• HeuristicLab.Tests/HeuristicLab.Persistence.Attic/PersistenceConsistencyChecks.cs (modified) (3 diffs)

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

@@ -3 +3 @@
 using System.Linq;
 using HEAL.Attic;
-using HeuristicLab.PluginInfrastructure;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -15 +14 @@
     public void CheckDuplicateGUIDs() {
       // easy to produce duplicate GUIDs with copy&paste
-
       var dict = new Dictionary<Guid, string>();
       var duplicates = new Dictionary<string, string>();
-      foreach (Type type in ApplicationManager.Manager.GetTypes(typeof(object))) {
+      // 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)
@@ -35 +34 @@
         Console.WriteLine($"{kvp.Key} has same GUID as {kvp.Value}");
       }
+
       if (duplicates.Any()) Assert.Fail("Duplicate GUIDs found.");
     }