Changeset 11498 for trunk/sources

Timestamp:

10/24/14 16:52:01 (10 years ago)

Author:

mkommend

Message:

#2268: Adapted unit test (cloning and tree creation) to work with the new empty expression tree grammar.

Location:

trunk/sources/HeuristicLab.Tests

Files:

• HeuristicLab-3.3/CloningConstructorTest.cs (modified) (1 diff)
• HeuristicLab-3.3/DeepCloneableCloningTest.cs (modified) (2 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4/Util.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/CloningConstructorTest.cs

@@ -47 +47 @@
         //test only types contained in HL plugin assemblies
         if (!PluginLoader.Assemblies.Contains(deepCloneableType.Assembly)) continue;
+        if (deepCloneableType.IsSealed) continue;
 
         bool found = false;

trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/DeepCloneableCloningTest.cs

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.Xml;
@@ -54 +55 @@
       excludedTypes.Add(typeof(HeuristicLab.Problems.DataAnalysis.ClassificationEnsembleSolution));
       excludedTypes.Add(typeof(HeuristicLab.Problems.DataAnalysis.RegressionEnsembleSolution));
+      excludedTypes.Add(typeof(SymbolicExpressionGrammar).Assembly.GetType("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.EmptySymbolicExpressionTreeGrammar"));
 
       foreach (var symbolType in ApplicationManager.Manager.GetTypes(typeof(HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbol)))

trunk/sources/HeuristicLab.Tests/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4/Util.cs

@@ -147 +147 @@
 
       foreach (var subtree in tree.Root.Subtrees) {
-        Assert.AreNotSame(subtree.Grammar, tree.Root.Grammar);
+        if (tree.Root.Grammar.GetType().Name != "EmptySymbolicExpressionTreeGrammar")
+          Assert.AreNotSame(subtree.Grammar, tree.Root.Grammar);
         IsValid(subtree.Grammar);
       }