Changeset 6876 for branches/GeneralizedQAP/HeuristicLab

Timestamp:

10/05/11 21:30:50 (13 years ago)

Author:

abeham

Message:

#1628

• excluded static fields
• excluded types with private default constructor

File:

• branches/GeneralizedQAP/HeuristicLab/3.3/Tests/DeepCloneableCloningTest.cs (modified) (5 diffs)

branches/GeneralizedQAP/HeuristicLab/3.3/Tests/DeepCloneableCloningTest.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -82 +81 @@
     #endregion
 
-    private ManualResetEvent waitHandle;
-
     [TestMethod]
     [DeploymentItem("SamplesExperimentFinished.hl")]
     public void TestCloningFinishedExperiment() {
-      waitHandle = new ManualResetEvent(false);
       Experiment experiment = (Experiment)XmlParser.Deserialize("SamplesExperimentFinished.hl");
 
@@ -94 +90 @@
 
       Assert.IsTrue(ProcessEqualObjects(experiment, intersections));
-    }
-
-    private void batchrun_Stopped(object sender, EventArgs e) {
-      waitHandle.Set();
     }
 
@@ -114 +106 @@
         IDeepCloneable item = null;
         try {
-          item = (IDeepCloneable)Activator.CreateInstance(deepCloneableType, nonPublic: true);
+          item = (IDeepCloneable)Activator.CreateInstance(deepCloneableType, nonPublic: false);
         } catch { continue; } // no default constructor
 
@@ -128 +120 @@
 
     private IEnumerable<object> CheckTotalInequality(object original, object clone) {
-      HashSet<object> originalObjects = new HashSet<object>(original.GetObjectGraphObjects().Where(x => !x.GetType().IsValueType), new ReferenceEqualityComparer());
-      HashSet<object> clonedObjects = new HashSet<object>(clone.GetObjectGraphObjects().Where(x => !x.GetType().IsValueType), new ReferenceEqualityComparer());
+      HashSet<object> originalObjects = new HashSet<object>(original.GetObjectGraphObjects(true).Where(x => !x.GetType().IsValueType), new ReferenceEqualityComparer());
+      HashSet<object> clonedObjects = new HashSet<object>(clone.GetObjectGraphObjects(true).Where(x => !x.GetType().IsValueType), new ReferenceEqualityComparer());
 
       return originalObjects.Intersect(clonedObjects);