Changeset 17035 for branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Tests/HeuristicLab.Persistence.Attic

Timestamp:

06/26/19 08:13:50 (5 years ago)

Author:

gkronber

Message:

#2925: merged r17007:17033 from trunk to branch

Location:

branches/2925_AutoDiffForDynamicalModels

Files:

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

branches/2925_AutoDiffForDynamicalModels/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.");
     }

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Tests/HeuristicLab.Persistence.Attic/UseCases.cs

@@ -276 +276 @@
       for (int i = 0; i < REPS; i++) {
         var original = XmlParser.Deserialize(fileName);
-        byte[] buf;
         System.GC.Collect();
         var collection0 = System.GC.CollectionCount(0);
@@ -336 +335 @@
       var serializer = new ProtoBufSerializer();
       foreach (var fileName in Directory.EnumerateFiles(path, "*.hl")) {
-        var original = XmlParser.Deserialize(fileName);
+        var original = serializer.Deserialize(fileName);
         var ok = true;
         foreach (var t in original.GetObjectGraphObjects().Select(o => o.GetType())) {
@@ -371 +370 @@
       var serializer = new ProtoBufSerializer();
       foreach (var fileName in Directory.EnumerateFiles(path, "*.hl")) {
-        var original = XmlParser.Deserialize(fileName);
+        var original = serializer.Deserialize(fileName);
 
         var exec = original as IExecutable;