Changeset 13879

Timestamp:

06/08/16 15:14:04 (9 years ago)

Author:

mkommend

Message:

#2557: Merged r13494, r13510 and r13676 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Common/3.3/ObjectExtensions.cs (modified) (2 diffs)
• HeuristicLab.Tests (modified) (1 prop)
• HeuristicLab.Tests/HeuristicLab-3.3/CollectObjectGraphTest.cs (modified) (1 diff)

stable/HeuristicLab.Common/3.3/ObjectExtensions.cs

@@ -66 +66 @@
     ///   * string, decimal, DateTime
     ///   * Arrays of types not collected
+    ///   * All types from System.Reflection.Emit
     /// </summary>
     private static bool ExcludeType(Type type) {
@@ -77 +78 @@
              typeof(Delegate).IsAssignableFrom(type) ||
              typeof(Pointer).IsAssignableFrom(type) ||
-             type == typeof(System.Reflection.Emit.SignatureHelper) ||
+             type.Namespace == "System.Reflection.Emit" ||
              (type.HasElementType && ExcludeType(type.GetElementType()));
     }

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

@@ -41 +41 @@
       get { return testContextInstance; }
       set { testContextInstance = value; }
+    }
+
+    [TestMethod]
+    [Description("Verify that the object graph traversal is working by checking the number of objects after traversal.")]
+    [TestCategory("General")]
+    [TestCategory("Essential")]
+    [TestProperty("Time", "medium")]
+    public void TestObjectGraphTraversal() {
+      GeneticAlgorithm ga = (GeneticAlgorithm)XmlParser.Deserialize(@"Test Resources\GA_SymbReg.hl");
+      var objects = ga.GetObjectGraphObjects().ToList();
+
+      // Should be 3982, but count may change slightly as members are added or removed
+      Assert.IsTrue(objects.Count > 1, "Number of objects in the object graph seems to small.");
     }