Changeset 13386

Timestamp:

11/24/15 18:24:01 (9 years ago)

Author:

ascheibe

Message:

#2520

• fixed duplicate guids
• adapted/added unit tests for new persistence

Location:

branches/PersistenceOverhaul

Files:

• HeuristicLab.Clients.Hive/3.3/HiveTasks/HiveTask.cs (modified) (1 diff)
• HeuristicLab.Collections/3.3/BidirectionalLookup.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/DirectedGraph/Arc.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Collections/DirectedGraph/Vertex.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/StochasticMultiBranch.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Problems/UserDefinedProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicNearestNeighbourClassificationModel.cs (modified) (1 diff)
• HeuristicLab.Tests/HeuristicLab.Persistence-3.3/StorableAttributeTests.cs (modified) (4 diffs)
• HeuristicLab.Tests/HeuristicLab.Persistence-3.3/UseCases.cs (modified) (29 diffs)
• HeuristicLab.Tests/HeuristicLab.Persistence-3.3/UseCasesPersistenceNew.cs (copied) (copied from branches/PersistenceOverhaul/HeuristicLab.Tests/HeuristicLab.Persistence-3.3/UseCases.cs) (79 diffs)
• HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (2 diffs)

branches/PersistenceOverhaul/HeuristicLab.Clients.Hive/3.3/HiveTasks/HiveTask.cs

@@ -541 +541 @@
 
   [Item("Hive Task", "Represents a hive task.")]
-  [StorableClass("967DC1A1-7B0C-4D8B-AF9F-710B1FD676DF")]
+  [StorableClass("04AD6AF8-8248-48FB-AF3A-403A2D22F725")]
   public class HiveTask<T> : HiveTask where T : ItemTask {
 

branches/PersistenceOverhaul/HeuristicLab.Collections/3.3/BidirectionalLookup.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Collections {
-  [StorableClass("066A8A8B-784D-45CC-9063-F2FC8E9A4442")]
+  [StorableClass("0BF45891-847C-428B-9F2C-FD682320066C")]
   [Serializable]
   public class BidirectionalLookup<TFirst, TSecond> {

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/DirectedGraph/Arc.cs

@@ -26 +26 @@
 namespace HeuristicLab.Core {
   [Item("Arc", "A graph arc connecting two graph vertices, that can have a weight, label, and data object for holding additional info")]
-  [StorableClass("9C41B31C-E208-46A2-87FC-45A9F0A9A928")]
+  [StorableClass("B9E1D948-BCEF-4B07-AADD-2E39A80F15DF")]
   public class Arc : Item, IArc {
     [Storable]

branches/PersistenceOverhaul/HeuristicLab.Core/3.3/Collections/DirectedGraph/Vertex.cs

@@ -28 +28 @@
 namespace HeuristicLab.Core {
   [Item("Vertex", "An object representing a vertex in the graph. It can have a text label, a weight, and an additional data object.")]
-  [StorableClass("0B8261A0-8829-4BB8-B7EF-940A9A0AB1D9")]
+  [StorableClass("DC0C1D1F-82DF-4150-94CC-A10FD3667F72")]
   public class Vertex : Item, IVertex {
     [Storable]

branches/PersistenceOverhaul/HeuristicLab.Operators/3.3/StochasticMultiBranch.cs

@@ -35 +35 @@
   /// </summary>
   [Item("StochasticMultiBranch", "Selects one of its branches (if there are any) given a list of relative probabilities.")]
-  [StorableClass("7DE99E47-6B7D-4AE3-A8B8-0D7C9B82F3EE")]
+  [StorableClass("7FF6CB0B-F831-4A97-A8D3-40EBF6BE78B6")]
   public abstract class StochasticMultiBranch<T> : CheckedMultiOperator<T> where T : class, IOperator {
     /// <summary>

branches/PersistenceOverhaul/HeuristicLab.Optimization/3.3/Problems/UserDefinedProblem.cs

@@ -235 +235 @@
 
     [Item("EmptyUserDefinedProblemEvaluator", "A dummy evaluator that will throw an exception when executed.")]
-    [StorableClass("F3DF503B-3FCA-4A80-B5E8-776699E6F13E")]
+    [StorableClass("00D4B39A-2E69-4842-9045-6E9D8F01F6EB")]
     [NonDiscoverableType]
     private sealed class EmptyUserDefinedProblemEvaluator : ParameterizedNamedItem, ISingleObjectiveEvaluator {

branches/PersistenceOverhaul/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicNearestNeighbourClassificationModel.cs

@@ -32 +32 @@
   /// Represents a nearest neighbour model for regression and classification
   /// </summary>
-  [StorableClass("01561669-12E6-4C75-86BF-88C24DA53FDD")]
+  [StorableClass("225CCF16-C932-4D18-AF5A-0745FAD8F22C")]
   [Item("SymbolicNearestNeighbourClassificationModel", "Represents a nearest neighbour model for symbolic classification.")]
   public sealed class SymbolicNearestNeighbourClassificationModel : SymbolicClassificationModel {

branches/PersistenceOverhaul/HeuristicLab.Tests/HeuristicLab.Persistence-3.3/StorableAttributeTests.cs

@@ -24 +24 @@
 namespace HeuristicLab.Persistence.Tests {
 
-  [StorableClass("2CD1E9C4-DDBA-458D-ADDA-5649A48AD564")]
+  [StorableClass("E6CE21DC-FEA3-4763-BA60-CE8EB6B8E539")]
   class DemoClass {
 
@@ -36 +36 @@
   }
 
-  [StorableClass("2CD1E9C4-DDBA-458D-ADDA-5649A48AD564")]
+  [StorableClass("32FDC5F4-E5AD-4119-90E0-6D14785E87FD")]
   class Base {
     public string baseName;
@@ -46 +46 @@
   }
 
-  [StorableClass("2CD1E9C4-DDBA-458D-ADDA-5649A48AD564")]
+  [StorableClass("F2151C9F-FD83-4D6F-B987-08DF723158DB")]
   class Override : Base {
     [Storable]
@@ -55 +55 @@
   }
 
-  [StorableClass("2CD1E9C4-DDBA-458D-ADDA-5649A48AD564")]
+  [StorableClass("647B2E77-EC1E-458F-AB9D-ACFA8248352A")]
   class Intermediate : Override {
   }
 
-  [StorableClass("2CD1E9C4-DDBA-458D-ADDA-5649A48AD564")]
+  [StorableClass("AEAC61FF-896F-418C-82C8-33F0548AF3B2")]
   class New : Intermediate {
     public string newName;

branches/PersistenceOverhaul/HeuristicLab.Tests/HeuristicLab.Persistence-3.3/UseCases.cs

@@ -46 +46 @@
 namespace HeuristicLab.Persistence.Tests {
 
-  [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+  [StorableClass("777E5793-7389-4109-A617-D7D6EB74A2C7")]
   public class NumberTest {
     [Storable]
@@ -95 +95 @@
   }
 
-  [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+  [StorableClass("2911C342-74AB-4B47-9840-87F012AEF0C1")]
   public class NonDefaultConstructorClass {
     [Storable]
@@ -104 +104 @@
   }
 
-  [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+  [StorableClass("8621F4FA-8711-4DA4-A50B-7D04683440B8")]
   public class IntWrapper {
 
@@ -127 +127 @@
   }
 
-  [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+  [StorableClass("0B93C65E-1A4C-45DD-B40D-7614BA2B2ABA")]
   public class PrimitivesTest : NumberTest {
     [Storable]
@@ -159 +159 @@
   public enum TestEnum { va1, va2, va3, va8 } ;
 
-  [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+  [StorableClass("0DA4A6A5-0280-4F3C-80DA-0AB09461F66C")]
   public class RootBase {
     [Storable]
@@ -178 +178 @@
   }
 
-  [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+  [StorableClass("12CC2626-A1E2-45A5-9761-902333C88CCF")]
   public class Root : RootBase {
     [Storable]
@@ -213 +213 @@
   public enum TrickyEnum { zero = 0, one = 1, two = 2 }
 
-  [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+  [StorableClass("04BFD8AF-AB93-457A-B5CD-F2AB2B18874F")]
   public class EnumTest {
     [Storable]
@@ -223 +223 @@
   }
 
-  [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+  [StorableClass("41E5C615-82A6-4844-B6A4-4DB8ED8C03D8")]
   public class Custom {
     [Storable]
@@ -233 +233 @@
   }
 
-  [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+  [StorableClass("3D2455E6-0AD9-4141-B44A-759F71491443")]
   public class Manager {
 
@@ -246 +246 @@
   }
 
-  [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+  [StorableClass("D8D40F6E-91DC-4E20-8154-F95C0AF32CC8")]
   public class C {
     [Storable]
@@ -486 +486 @@
     }
 
-    [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+    [StorableClass("B2C78E8F-32F9-43BE-9DED-219F102125EB")]
     public class NestedType {
       [Storable]
@@ -692 +692 @@
       l.Add(new NonSerializable());
       try {
-        Serializer s = new Serializer(l,
+        HeuristicLab.Persistence.Core.Serializer s = new HeuristicLab.Persistence.Core.Serializer(l,
           ConfigurationService.Instance.GetConfiguration(new XmlFormat()),
           "ROOT", true);
@@ -711 +711 @@
     public void TestAssemblyVersionCheck() {
       IntWrapper i = new IntWrapper(1);
-      Serializer s = new Serializer(i, ConfigurationService.Instance.GetDefaultConfig(new XmlFormat()));
+      HeuristicLab.Persistence.Core.Serializer s = new HeuristicLab.Persistence.Core.Serializer(i, ConfigurationService.Instance.GetDefaultConfig(new XmlFormat()));
       XmlGenerator g = new XmlGenerator();
       StringBuilder dataString = new StringBuilder();
@@ -758 +758 @@
     }
 
-    [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+    [StorableClass("2B2FE809-CDA4-4BCD-BF4C-35F757678AB9")]
     class Child {
       [Storable]
@@ -764 +764 @@
     }
 
-    [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+    [StorableClass("C8F4E805-26DF-4129-910E-F7F51E4DDE41")]
     class Parent {
       [Storable]
@@ -770 +770 @@
     }
 
-    [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+    [StorableClass("0CF63740-F8C1-46EE-A3A0-7E350A8EBAA1")]
     class GrandParent {
       [Storable]
@@ -848 +848 @@
     }
 
-    [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+    [StorableClass("F5920537-7F03-41C4-8061-8F8D7CDDB6BE")]
     private class PersistenceHooks {
       [Storable]
@@ -885 +885 @@
     }
 
-    [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+    [StorableClass("935C5ECB-ACEF-48EA-93BC-4B4177DFE0A5")]
     private class CustomConstructor {
       public string Value = "none";
@@ -909 +909 @@
     }
 
-    [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+    [StorableClass("31D7CE01-E390-40CF-B9BF-BD79A8F850DA")]
     public class ExplodingDefaultConstructor {
       public ExplodingDefaultConstructor() {
@@ -961 +961 @@
     }
 
-    [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+    [StorableClass("9DEE1F8F-320C-401B-8103-65FBA6BD4F07")]
     public class HookInheritanceTestBase {
       [Storable]
@@ -972 +972 @@
     }
 
-    [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+    [StorableClass("97DF2931-2B23-4FAA-8E59-806FA58ADAED")]
     public class HookInheritanceTestDerivedClass : HookInheritanceTestBase {
       [Storable]
@@ -994 +994 @@
     }
 
-    [StorableClass(StorableClassType.AllFields, "B9AB42E8-1932-425B-B4CF-F31F07EAC599")]
+    [StorableClass(StorableClassType.AllFields, "6207E4E1-4CFC-4890-9741-33B7E1E43F26")]
     public class AllFieldsStorable {
       public int Value1 = 1;
@@ -1025 +1025 @@
     }
 
-    [StorableClass(StorableClassType.AllProperties, "CB7DC31C-AEF3-4EB8-91CA-248B767E9F92")]
+    [StorableClass(StorableClassType.AllProperties, "ADDB5A7C-4BA9-4E5F-BFAF-2B48C8646808")]
     public class AllPropertiesStorable {
       public int Value1 = 1;
@@ -1057 +1057 @@
     }
 
-    [StorableClass(StorableClassType.AllFieldsAndAllProperties, "0AD8D68F-E0FF-4FA8-8A72-1148CD91A2B9")]
+    [StorableClass(StorableClassType.AllFieldsAndAllProperties, "9C6136CB-A9AC-4527-B41A-7A2DB50ACE53")]
     public class AllFieldsAndAllPropertiesStorable {
       public int Value1 = 1;
@@ -1088 +1088 @@
     }
 
-    [StorableClass(StorableClassType.MarkedOnly, "0D94E6D4-64E3-4637-B1EE-DEF2B3F6E2E0")]
+    [StorableClass(StorableClassType.MarkedOnly, "75C9F6F0-1B2E-41E7-A327-AF9CF5C87D8D")]
     public class MarkedOnlyStorable {
       public int Value1 = 1;
@@ -1248 +1248 @@
     }
 
-    [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+    [StorableClass("A603ABE6-86DB-46F7-AF87-C7B40E4FF169")]
     public class ReadOnlyFail {
       [Storable]
@@ -1272 +1272 @@
 
 
-    [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+    [StorableClass("7EDE1D86-C8F5-4B51-846F-1634C0FE20BB")]
     public class WriteOnlyFail {
       [Storable]
@@ -1295 +1295 @@
     }
 
-    [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+    [StorableClass("65B13830-5D60-4C3F-8D9E-5DCDF1E3A977")]
     public class OneWayTest {
       public OneWayTest() { this.value = "default"; }
@@ -1314 +1314 @@
     public void TestOneWaySerialization() {
       var test = new OneWayTest();
-      var serializer = new Serializer(test, ConfigurationService.Instance.GetDefaultConfig(new XmlFormat()));
+      var serializer = new HeuristicLab.Persistence.Core.Serializer(test, ConfigurationService.Instance.GetDefaultConfig(new XmlFormat()));
       var it = serializer.GetEnumerator();
       it.MoveNext();

branches/PersistenceOverhaul/HeuristicLab.Tests/HeuristicLab.Persistence-3.3/UseCasesPersistenceNew.cs

@@ -29 +29 @@
 using System.Reflection;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using HeuristicLab.Algorithms.GeneticAlgorithm;
+using HeuristicLab.Persistence;
 using HeuristicLab.Persistence.Auxiliary;
 using HeuristicLab.Persistence.Core;
-using HeuristicLab.Persistence.Core.Tokens;
-using HeuristicLab.Persistence.Default.CompositeSerializers;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Persistence.Default.DebugString;
 using HeuristicLab.Persistence.Default.Xml;
-using HeuristicLab.Persistence.Default.Xml.Primitive;
-using HeuristicLab.Persistence.Interfaces;
+using HeuristicLab.Persistence.Tests;
 using HeuristicLab.Tests;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace HeuristicLab.Persistence.Tests {
-
-  [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+namespace HeuristicLab.PersistenceNew.Tests {
+  #region Test Classes
+  [StorableClass("7D9672BD-703D-42BB-9080-9929885D4580")]
   public class NumberTest {
     [Storable]
@@ -95 +92 @@
   }
 
-  [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+  [StorableClass("EEB19599-D5AC-48ED-A56B-CF213DFAF2E4")]
   public class NonDefaultConstructorClass {
     [Storable]
@@ -104 +101 @@
   }
 
-  [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+  [StorableClass("EE43FE7A-6D07-4D52-9338-C21B3485F82A")]
   public class IntWrapper {
 
@@ -127 +124 @@
   }
 
-  [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+  [StorableClass("00A8E48E-8E8A-443C-A327-9F6ACCBE7E80")]
   public class PrimitivesTest : NumberTest {
     [Storable]
@@ -159 +156 @@
   public enum TestEnum { va1, va2, va3, va8 } ;
 
-  [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+  [StorableClass("26BA37F6-926D-4665-A10A-1F39E1CF6468")]
   public class RootBase {
     [Storable]
@@ -178 +175 @@
   }
 
-  [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+  [StorableClass("F6BCB436-B5F2-40F6-8E2F-7A018CD1CBA0")]
   public class Root : RootBase {
     [Storable]
@@ -213 +210 @@
   public enum TrickyEnum { zero = 0, one = 1, two = 2 }
 
-  [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+  [StorableClass("2F6326ED-023A-415F-B5C7-9F9241940D05")]
   public class EnumTest {
     [Storable]
@@ -223 +220 @@
   }
 
-  [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+  [StorableClass("92365E2A-1184-4280-B763-4853C7ADF3E3")]
   public class Custom {
     [Storable]
@@ -233 +230 @@
   }
 
-  [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+  [StorableClass("7CF19EBC-1EC4-4FBE-BCA9-DA48E3CFE30D")]
   public class Manager {
 
@@ -246 +243 @@
   }
 
-  [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+  [StorableClass("9092C705-F5E9-4BA9-9750-4357DB29AABF")]
   public class C {
     [Storable]
@@ -267 +264 @@
   }
 
+  #endregion
 
   [TestClass]
-  public class UseCases {
-
+  public class UseCasesPersistenceNew {
+    #region Helpers
     private string tempFile;
+
+    [ClassInitialize]
+    public static void Initialize(TestContext testContext) {
+      ConfigurationService.Instance.Reset();
+    }
 
     [TestInitialize()]
@@ -285 +288 @@
       File.Delete(tempFile);
     }
-
+    #endregion
+
+    #region Persistence 4.0 test methods
+    [TestMethod]
+    [TestCategory("Persistence")]
+    [TestProperty("Time", "short")]
+    public void TestBool() {
+      bool test = true;
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
+      serializer.Serialize(test, tempFile);
+      object o = serializer.Deserialize(tempFile);
+      bool result = (bool)o;
+      Assert.AreEqual(test, result);
+    }
+
+    [TestMethod]
+    [TestCategory("Persistence")]
+    [TestProperty("Time", "short")]
+    public void TestInt() {
+      int test = 42;
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
+      serializer.Serialize(test, tempFile);
+      object o = serializer.Deserialize(tempFile);
+      int result = (int)o;
+      Assert.AreEqual(test, result);
+    }
+    #endregion
+
+
+    #region Old persistence test methods
     [TestMethod]
     [TestCategory("Persistence")]
     [TestProperty("Time", "short")]
     public void ComplexStorable() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       Root r = InitializeComplexStorable();
-      XmlGenerator.Serialize(r, tempFile);
-      Root newR = (Root)XmlParser.Deserialize(tempFile);
+      serializer.Serialize(r, tempFile);
+      Root newR = (Root)serializer.Deserialize(tempFile);
       CompareComplexStorables(r, newR);
-    }
-
-    [TestMethod]
-    [TestCategory("Persistence")]
-    [TestProperty("Time", "short")]
-    public void ComplexEasyStorable() {
-      Root r = InitializeComplexStorable();
-      ReadableXmlGenerator.Serialize(r, tempFile);
-      using (var reader = new StreamReader(tempFile)) {
-        string text = reader.ReadToEnd();
-        Assert.IsTrue(text.StartsWith("<Root"));
-      }
     }
 
@@ -391 +412 @@
     [TestProperty("Time", "short")]
     public void SelfReferences() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       C c = new C();
       C[][] cs = new C[2][];
@@ -397 +419 @@
       c.allCs = cs;
       c.kvpList = new KeyValuePair<List<C>, C>(new List<C> { c }, c);
-      XmlGenerator.Serialize(cs, tempFile);
-      object o = XmlParser.Deserialize(tempFile);
+      serializer.Serialize(cs, tempFile);
+      object o = serializer.Deserialize(tempFile);
       Assert.AreEqual(
         DebugStringGenerator.Serialize(cs),
@@ -418 +440 @@
     [TestProperty("Time", "short")]
     public void ArrayCreation() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       ArrayList[] arrayListArray = new ArrayList[4];
       arrayListArray[0] = new ArrayList();
@@ -431 +454 @@
                               new[] { 1, 2 }, new[] { 3, 4 });
       arrayListArray[2].Add(a);
-      XmlGenerator.Serialize(arrayListArray, tempFile);
-      object o = XmlParser.Deserialize(tempFile);
+      serializer.Serialize(arrayListArray, tempFile);
+      object o = serializer.Deserialize(tempFile);
       Assert.AreEqual(
         DebugStringGenerator.Serialize(arrayListArray),
@@ -447 +470 @@
     [TestProperty("Time", "short")]
     public void CustomSerializationProperty() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       Manager m = new Manager();
-      XmlGenerator.Serialize(m, tempFile);
-      Manager newM = (Manager)XmlParser.Deserialize(tempFile);
+      serializer.Serialize(m, tempFile);
+      Manager newM = (Manager)serializer.Deserialize(tempFile);
       Assert.AreNotEqual(
         DebugStringGenerator.Serialize(m),
@@ -463 +487 @@
     [TestProperty("Time", "short")]
     public void Primitives() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       PrimitivesTest sdt = new PrimitivesTest();
-      XmlGenerator.Serialize(sdt, tempFile);
-      object o = XmlParser.Deserialize(tempFile);
+      serializer.Serialize(sdt, tempFile);
+      object o = serializer.Deserialize(tempFile);
       Assert.AreEqual(
         DebugStringGenerator.Serialize(sdt),
@@ -475 +500 @@
     [TestProperty("Time", "short")]
     public void MultiDimensionalArray() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       string[,] mDimString = new string[,] {
         {"ora", "et", "labora"},
         {"Beten", "und", "Arbeiten"}
       };
-      XmlGenerator.Serialize(mDimString, tempFile);
-      object o = XmlParser.Deserialize(tempFile);
+      serializer.Serialize(mDimString, tempFile);
+      object o = serializer.Deserialize(tempFile);
       Assert.AreEqual(
         DebugStringGenerator.Serialize(mDimString),
@@ -486 +512 @@
     }
 
-    [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+    [StorableClass("87A331AF-14DC-48B3-B577-D49065743BE6")]
     public class NestedType {
       [Storable]
@@ -505 +531 @@
     [TestProperty("Time", "short")]
     public void NestedTypeTest() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       NestedType t = new NestedType();
-      XmlGenerator.Serialize(t, tempFile);
-      object o = XmlParser.Deserialize(tempFile);
+      serializer.Serialize(t, tempFile);
+      object o = serializer.Deserialize(tempFile);
       Assert.AreEqual(
         DebugStringGenerator.Serialize(t),
@@ -519 +546 @@
     [TestProperty("Time", "short")]
     public void SimpleArray() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       string[] strings = { "ora", "et", "labora" };
-      XmlGenerator.Serialize(strings, tempFile);
-      object o = XmlParser.Deserialize(tempFile);
+      serializer.Serialize(strings, tempFile);
+      object o = serializer.Deserialize(tempFile);
       Assert.AreEqual(
         DebugStringGenerator.Serialize(strings),
@@ -531 +559 @@
     [TestProperty("Time", "short")]
     public void PrimitiveRoot() {
-      XmlGenerator.Serialize(12.3f, tempFile);
-      object o = XmlParser.Deserialize(tempFile);
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
+      serializer.Serialize(12.3f, tempFile);
+      object o = serializer.Deserialize(tempFile);
       Assert.AreEqual(
         DebugStringGenerator.Serialize(12.3f),
@@ -584 +613 @@
     [TestCategory("Persistence")]
     [TestProperty("Time", "short")]
-    public void Number2StringDecomposer() {
-      NumberTest sdt = new NumberTest();
-      XmlGenerator.Serialize(sdt, tempFile,
-        new Configuration(new XmlFormat(),
-          new List<IPrimitiveSerializer> { new String2XmlSerializer() },
-          new List<ICompositeSerializer> { 
-            new StorableSerializer(),
-            new Number2StringSerializer() }));
-      object o = XmlParser.Deserialize(tempFile);
-      Assert.AreEqual(
-        DebugStringGenerator.Serialize(sdt),
-        DebugStringGenerator.Serialize(o));
-      Assert.IsTrue(sdt.Equals(o));
-    }
-
-    [TestMethod]
-    [TestCategory("Persistence")]
-    [TestProperty("Time", "short")]
     public void Enums() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       EnumTest et = new EnumTest();
       et.simpleEnum = SimpleEnum.two;
       et.complexEnum = ComplexEnum.three;
       et.trickyEnum = TrickyEnum.two | TrickyEnum.one;
-      XmlGenerator.Serialize(et, tempFile);
-      EnumTest newEt = (EnumTest)XmlParser.Deserialize(tempFile);
+      serializer.Serialize(et, tempFile);
+      EnumTest newEt = (EnumTest)serializer.Deserialize(tempFile);
       Assert.AreEqual(et.simpleEnum, SimpleEnum.two);
       Assert.AreEqual(et.complexEnum, ComplexEnum.three);
@@ -618 +630 @@
     [TestProperty("Time", "short")]
     public void TestAliasingWithOverriddenEquals() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       List<IntWrapper> ints = new List<IntWrapper>();
       ints.Add(new IntWrapper(1));
@@ -623 +636 @@
       Assert.AreEqual(ints[0], ints[1]);
       Assert.AreNotSame(ints[0], ints[1]);
-      XmlGenerator.Serialize(ints, tempFile);
-      List<IntWrapper> newInts = (List<IntWrapper>)XmlParser.Deserialize(tempFile);
+      serializer.Serialize(ints, tempFile);
+      List<IntWrapper> newInts = (List<IntWrapper>)serializer.Deserialize(tempFile);
       Assert.AreEqual(newInts[0].Value, 1);
       Assert.AreEqual(newInts[1].Value, 1);
@@ -635 +648 @@
     [TestProperty("Time", "short")]
     public void NonDefaultConstructorTest() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       NonDefaultConstructorClass c = new NonDefaultConstructorClass(1);
       try {
-        XmlGenerator.Serialize(c, tempFile);
+        serializer.Serialize(c, tempFile);
         Assert.Fail("Exception not thrown");
       }
@@ -648 +662 @@
     [TestProperty("Time", "short")]
     public void TestSavingException() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       List<int> list = new List<int> { 1, 2, 3 };
-      XmlGenerator.Serialize(list, tempFile);
+      serializer.Serialize(list, tempFile);
       NonSerializable s = new NonSerializable();
       try {
-        XmlGenerator.Serialize(s, tempFile);
+        serializer.Serialize(s, tempFile);
         Assert.Fail("Exception expected");
       }
       catch (PersistenceException) { }
-      List<int> newList = (List<int>)XmlParser.Deserialize(tempFile);
+      List<int> newList = (List<int>)serializer.Deserialize(tempFile);
       Assert.AreEqual(list[0], newList[0]);
       Assert.AreEqual(list[1], newList[1]);
@@ -686 +701 @@
     [TestCategory("Persistence")]
     [TestProperty("Time", "short")]
-    public void TestMultipleFailure() {
-      List<NonSerializable> l = new List<NonSerializable>();
-      l.Add(new NonSerializable());
-      l.Add(new NonSerializable());
-      l.Add(new NonSerializable());
-      try {
-        Serializer s = new Serializer(l,
-          ConfigurationService.Instance.GetConfiguration(new XmlFormat()),
-          "ROOT", true);
-        StringBuilder tokens = new StringBuilder();
-        foreach (var token in s) {
-          tokens.Append(token.ToString());
-        }
-        Assert.Fail("Exception expected");
-      }
-      catch (PersistenceException px) {
-        Assert.AreEqual(3, px.Data.Count);
-      }
-    }
-
-    [TestMethod]
-    [TestCategory("Persistence")]
-    [TestProperty("Time", "short")]
-    public void TestAssemblyVersionCheck() {
-      IntWrapper i = new IntWrapper(1);
-      Serializer s = new Serializer(i, ConfigurationService.Instance.GetDefaultConfig(new XmlFormat()));
-      XmlGenerator g = new XmlGenerator();
-      StringBuilder dataString = new StringBuilder();
-      foreach (var token in s) {
-        dataString.Append(g.Format(token));
-      }
-      StringBuilder typeString = new StringBuilder();
-      foreach (var line in g.Format(s.TypeCache))
-        typeString.Append(line);
-      Deserializer d = new Deserializer(XmlParser.ParseTypeCache(new StringReader(typeString.ToString())));
-      XmlParser p = new XmlParser(new StringReader(dataString.ToString()));
-      IntWrapper newI = (IntWrapper)d.Deserialize(p);
-      Assert.AreEqual(i.Value, newI.Value);
-
-      string newTypeString = Regex.Replace(typeString.ToString(),
-        "Version=\\d+\\.\\d+\\.\\d+\\.\\d+",
-        "Version=0.0.9999.9999");
-      try {
-        d = new Deserializer(XmlParser.ParseTypeCache(new StringReader(newTypeString)));
-        Assert.Fail("Exception expected");
-      }
-      catch (PersistenceException x) {
-        Assert.IsTrue(x.Message.Contains("incompatible"));
-      }
-      newTypeString = Regex.Replace(typeString.ToString(),
-        "Version=(\\d+\\.\\d+)\\.\\d+\\.\\d+",
-        "Version=$1.9999.9999");
-      try {
-        d = new Deserializer(XmlParser.ParseTypeCache(new StringReader(newTypeString)));
-        Assert.Fail("Exception expected");
-      }
-      catch (PersistenceException x) {
-        Assert.IsTrue(x.Message.Contains("newer"));
-      }
-    }
-
-    [TestMethod]
-    [TestCategory("Persistence")]
-    [TestProperty("Time", "short")]
     public void InheritanceTest() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       New n = new New();
-      XmlGenerator.Serialize(n, tempFile);
-      New nn = (New)XmlParser.Deserialize(tempFile);
+      serializer.Serialize(n, tempFile);
+      New nn = (New)serializer.Deserialize(tempFile);
       Assert.AreEqual(n.Name, nn.Name);
       Assert.AreEqual(((Override)n).Name, ((Override)nn).Name);
     }
 
-    [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+    [StorableClass("B963EF51-12B4-432E-8C54-88F026F9ACE2")]
     class Child {
       [Storable]
@@ -764 +716 @@
     }
 
-    [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+    [StorableClass("E66E9606-967A-4C35-A361-F6F0D21C064A")]
     class Parent {
       [Storable]
@@ -770 +722 @@
     }
 
-    [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+    [StorableClass("34D3893A-57AD-4F72-878B-81D6FA3F14A9")]
     class GrandParent {
       [Storable]
@@ -780 +732 @@
     [TestProperty("Time", "short")]
     public void InstantiateParentChainReference() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       GrandParent gp = new GrandParent();
       gp.parent = new Parent();
@@ -785 +738 @@
       gp.parent.child.grandParent = gp;
       Assert.AreSame(gp, gp.parent.child.grandParent);
-      XmlGenerator.Serialize(gp, tempFile);
-      GrandParent newGp = (GrandParent)XmlParser.Deserialize(tempFile);
+      serializer.Serialize(gp, tempFile);
+      GrandParent newGp = (GrandParent)serializer.Deserialize(tempFile);
       Assert.AreSame(newGp, newGp.parent.child.grandParent);
     }
@@ -804 +757 @@
     [TestProperty("Time", "short")]
     public void StructTest() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       TestStruct s = new TestStruct(10);
-      XmlGenerator.Serialize(s, tempFile);
-      TestStruct newS = (TestStruct)XmlParser.Deserialize(tempFile);
+      serializer.Serialize(s, tempFile);
+      TestStruct newS = (TestStruct)serializer.Deserialize(tempFile);
       Assert.AreEqual(s, newS);
     }
@@ -814 +768 @@
     [TestProperty("Time", "short")]
     public void PointTest() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       Point p = new Point(12, 34);
-      XmlGenerator.Serialize(p, tempFile);
-      Point newP = (Point)XmlParser.Deserialize(tempFile);
+      serializer.Serialize(p, tempFile);
+      Point newP = (Point)serializer.Deserialize(tempFile);
       Assert.AreEqual(p, newP);
     }
@@ -824 +779 @@
     [TestProperty("Time", "short")]
     public void NullableValueTypes() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       double?[] d = new double?[] { null, 1, 2, 3 };
-      XmlGenerator.Serialize(d, tempFile);
-      double?[] newD = (double?[])XmlParser.Deserialize(tempFile);
+      serializer.Serialize(d, tempFile);
+      double?[] newD = (double?[])serializer.Deserialize(tempFile);
       Assert.AreEqual(d[0], newD[0]);
       Assert.AreEqual(d[1], newD[1]);
@@ -837 +793 @@
     [TestProperty("Time", "short")]
     public void BitmapTest() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       Icon icon = System.Drawing.SystemIcons.Hand;
       Bitmap bitmap = icon.ToBitmap();
-      XmlGenerator.Serialize(bitmap, tempFile);
-      Bitmap newBitmap = (Bitmap)XmlParser.Deserialize(tempFile);
+      serializer.Serialize(bitmap, tempFile);
+      Bitmap newBitmap = (Bitmap)serializer.Deserialize(tempFile);
 
       Assert.AreEqual(bitmap.Size, newBitmap.Size);
@@ -848 +805 @@
     }
 
-    [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+    [StorableClass("E846BC49-20F3-4D3F-A3F3-73D4F2DB1C2E")]
     private class PersistenceHooks {
       [Storable]
@@ -870 +827 @@
     [TestProperty("Time", "short")]
     public void HookTest() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       PersistenceHooks hookTest = new PersistenceHooks();
       hookTest.a = 2;
@@ -875 +833 @@
       Assert.IsFalse(hookTest.WasSerialized);
       Assert.AreEqual(hookTest.sum, 0);
-      XmlGenerator.Serialize(hookTest, tempFile);
+      serializer.Serialize(hookTest, tempFile);
       Assert.IsTrue(hookTest.WasSerialized);
       Assert.AreEqual(hookTest.sum, 0);
-      PersistenceHooks newHookTest = (PersistenceHooks)XmlParser.Deserialize(tempFile);
+      PersistenceHooks newHookTest = (PersistenceHooks)serializer.Deserialize(tempFile);
       Assert.AreEqual(newHookTest.a, hookTest.a);
       Assert.AreEqual(newHookTest.b, hookTest.b);
@@ -885 +843 @@
     }
 
-    [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+    [StorableClass("A35D71DF-397F-4910-A950-ED6923BE9483")]
     private class CustomConstructor {
       public string Value = "none";
@@ -902 +860 @@
     [TestProperty("Time", "short")]
     public void TestCustomConstructor() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       CustomConstructor cc = new CustomConstructor();
       Assert.AreEqual(cc.Value, "default");
-      XmlGenerator.Serialize(cc, tempFile);
-      CustomConstructor newCC = (CustomConstructor)XmlParser.Deserialize(tempFile);
+      serializer.Serialize(cc, tempFile);
+      CustomConstructor newCC = (CustomConstructor)serializer.Deserialize(tempFile);
       Assert.AreEqual(newCC.Value, "persistence");
     }
 
-    [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+    [StorableClass("D276E825-1F35-4BAC-8937-9ABC91D5C316")]
     public class ExplodingDefaultConstructor {
       public ExplodingDefaultConstructor() {
@@ -922 +881 @@
     [TestProperty("Time", "short")]
     public void TestConstructorExceptionUnwrapping() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       ExplodingDefaultConstructor x = new ExplodingDefaultConstructor("password");
-      XmlGenerator.Serialize(x, tempFile);
+      serializer.Serialize(x, tempFile);
       try {
-        ExplodingDefaultConstructor newX = (ExplodingDefaultConstructor)XmlParser.Deserialize(tempFile);
+        ExplodingDefaultConstructor newX = (ExplodingDefaultConstructor)serializer.Deserialize(tempFile);
         Assert.Fail("Exception expected");
       }
@@ -937 +897 @@
     [TestProperty("Time", "short")]
     public void TestRejectionJustifications() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       NonSerializable ns = new NonSerializable();
       try {
-        XmlGenerator.Serialize(ns, tempFile);
+        serializer.Serialize(ns, tempFile);
         Assert.Fail("PersistenceException expected");
       }
@@ -951 +912 @@
     [TestProperty("Time", "short")]
     public void TestStreaming() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       using (MemoryStream stream = new MemoryStream()) {
         Root r = InitializeComplexStorable();
-        XmlGenerator.Serialize(r, stream);
+        serializer.Serialize(r, stream);
         using (MemoryStream stream2 = new MemoryStream(stream.ToArray())) {
-          Root newR = (Root)XmlParser.Deserialize(stream2);
+          Root newR = (Root)serializer.Deserialize(stream2);
           CompareComplexStorables(r, newR);
         }
@@ -961 +923 @@
     }
 
-    [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+    [StorableClass("4921031B-CB61-4677-97AD-9236A4CEC200")]
     public class HookInheritanceTestBase {
       [Storable]
@@ -972 +934 @@
     }
 
-    [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+    [StorableClass("321CEE0A-5201-4CE2-B135-2343890D96BF")]
     public class HookInheritanceTestDerivedClass : HookInheritanceTestBase {
       [Storable]
@@ -987 +949 @@
     [TestProperty("Time", "short")]
     public void TestLinkInheritance() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       HookInheritanceTestDerivedClass c = new HookInheritanceTestDerivedClass();
       c.a = new object();
-      XmlGenerator.Serialize(c, tempFile);
-      HookInheritanceTestDerivedClass newC = (HookInheritanceTestDerivedClass)XmlParser.Deserialize(tempFile);
+      serializer.Serialize(c, tempFile);
+      HookInheritanceTestDerivedClass newC = (HookInheritanceTestDerivedClass)serializer.Deserialize(tempFile);
       Assert.AreSame(c.b, c.link);
     }
@@ -1016 +979 @@
     [TestProperty("Time", "short")]
     public void TestStorableClassDiscoveryAllFields() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       AllFieldsStorable afs = new AllFieldsStorable(false);
-      XmlGenerator.Serialize(afs, tempFile);
-      AllFieldsStorable newAfs = (AllFieldsStorable)XmlParser.Deserialize(tempFile);
+      serializer.Serialize(afs, tempFile);
+      AllFieldsStorable newAfs = (AllFieldsStorable)serializer.Deserialize(tempFile);
       Assert.AreEqual(afs.Value1, newAfs.Value1);
       Assert.AreEqual(afs.Value2, newAfs.Value2);
@@ -1047 +1011 @@
     [TestProperty("Time", "short")]
     public void TestStorableClassDiscoveryAllProperties() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       AllPropertiesStorable afs = new AllPropertiesStorable(false);
-      XmlGenerator.Serialize(afs, tempFile);
-      AllPropertiesStorable newAfs = (AllPropertiesStorable)XmlParser.Deserialize(tempFile);
+      serializer.Serialize(afs, tempFile);
+      AllPropertiesStorable newAfs = (AllPropertiesStorable)serializer.Deserialize(tempFile);
       Assert.AreEqual(1, newAfs.Value1);
       Assert.AreEqual(2, newAfs.Value2);
@@ -1079 +1044 @@
     [TestProperty("Time", "short")]
     public void TestStorableClassDiscoveryAllFieldsAndAllProperties() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       AllFieldsAndAllPropertiesStorable afs = new AllFieldsAndAllPropertiesStorable(false);
-      XmlGenerator.Serialize(afs, tempFile);
-      AllFieldsAndAllPropertiesStorable newAfs = (AllFieldsAndAllPropertiesStorable)XmlParser.Deserialize(tempFile);
+      serializer.Serialize(afs, tempFile);
+      AllFieldsAndAllPropertiesStorable newAfs = (AllFieldsAndAllPropertiesStorable)serializer.Deserialize(tempFile);
       Assert.AreEqual(afs.Value1, newAfs.Value1);
       Assert.AreEqual(afs.Value2, newAfs.Value2);
@@ -1110 +1076 @@
     [TestProperty("Time", "short")]
     public void TestStorableClassDiscoveryMarkedOnly() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       MarkedOnlyStorable afs = new MarkedOnlyStorable(false);
-      XmlGenerator.Serialize(afs, tempFile);
-      MarkedOnlyStorable newAfs = (MarkedOnlyStorable)XmlParser.Deserialize(tempFile);
+      serializer.Serialize(afs, tempFile);
+      MarkedOnlyStorable newAfs = (MarkedOnlyStorable)serializer.Deserialize(tempFile);
       Assert.AreEqual(1, newAfs.Value1);
       Assert.AreEqual(afs.Value2, newAfs.Value2);
@@ -1123 +1090 @@
     [TestProperty("Time", "short")]
     public void TestLineEndings() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       List<string> lineBreaks = new List<string> { "\r\n", "\n", "\r", "\n\r", Environment.NewLine };
       List<string> lines = new List<string>();
       foreach (var br in lineBreaks)
         lines.Add("line1" + br + "line2");
-      XmlGenerator.Serialize(lines, tempFile);
-      List<string> newLines = XmlParser.Deserialize<List<string>>(tempFile);
+      serializer.Serialize(lines, tempFile);
+      List<string> newLines = (List<string>)serializer.Deserialize(tempFile);
       Assert.AreEqual(lines.Count, newLines.Count);
       for (int i = 0; i < lineBreaks.Count; i++) {
@@ -1139 +1107 @@
     [TestProperty("Time", "short")]
     public void TestSpecialNumbers() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       List<double> specials = new List<double>() { 1.0 / 0, -1.0 / 0, 0.0 / 0 };
       Assert.IsTrue(double.IsPositiveInfinity(specials[0]));
       Assert.IsTrue(double.IsNegativeInfinity(specials[1]));
       Assert.IsTrue(double.IsNaN(specials[2]));
-      XmlGenerator.Serialize(specials, tempFile);
-      List<double> newSpecials = XmlParser.Deserialize<List<double>>(tempFile);
+      serializer.Serialize(specials, tempFile);
+      List<double> newSpecials = (List<double>)serializer.Deserialize(tempFile);
       Assert.IsTrue(double.IsPositiveInfinity(newSpecials[0]));
       Assert.IsTrue(double.IsNegativeInfinity(newSpecials[1]));
@@ -1162 +1131 @@
     }
 
-    [TestMethod]
-    [TestCategory("Persistence")]
-    [TestProperty("Time", "medium")]
-    public void TestCompactNumberArraySerializer() {
-      System.Random r = new System.Random();
-      double[] a = new double[CompactNumberArray2StringSerializer.SPLIT_THRESHOLD * 2 + 1];
-      for (int i = 0; i < a.Length; i++)
-        a[i] = r.Next(10);
-      var config = ConfigurationService.Instance.GetDefaultConfig(new XmlFormat());
-      config = new Configuration(config.Format,
-        config.PrimitiveSerializers.Where(s => s.SourceType != typeof(double[])),
-        config.CompositeSerializers);
-      XmlGenerator.Serialize(a, tempFile, config);
-      double[] newA = XmlParser.Deserialize<double[]>(tempFile);
-      Assert.AreEqual(a.Length, newA.Length);
-      for (int i = 0; i < a.Rank; i++) {
-        Assert.AreEqual(a.GetLength(i), newA.GetLength(i));
-        Assert.AreEqual(a.GetLowerBound(i), newA.GetLowerBound(i));
-      }
-      for (int i = 0; i < a.Length; i++) {
-        Assert.AreEqual(a[i], newA[i]);
-      }
-    }
     private class IdentityComparer<T> : IEqualityComparer<T> {
 
@@ -1200 +1146 @@
     [TestProperty("Time", "short")]
     public void TestHashSetSerializer() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       var hashSets = new List<HashSet<int>>() {
         new HashSet<int>(new[] { 1, 2, 3 }),
         new HashSet<int>(new[] { 4, 5, 6 }, new IdentityComparer<int>()),
       };
-      XmlGenerator.Serialize(hashSets, tempFile);
-      var newHashSets = XmlParser.Deserialize<List<HashSet<int>>>(tempFile);
+      serializer.Serialize(hashSets, tempFile);
+      var newHashSets = (List<HashSet<int>>)serializer.Deserialize(tempFile);
       Assert.IsTrue(newHashSets[0].Contains(1));
       Assert.IsTrue(newHashSets[0].Contains(2));
@@ -1220 +1167 @@
     [TestProperty("Time", "short")]
     public void TestConcreteDictionarySerializer() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       var dictionaries = new List<Dictionary<int, int>>() {
         new Dictionary<int, int>(),
@@ -1230 +1178 @@
       dictionaries[1].Add(5, 5);
       dictionaries[1].Add(6, 6);
-      XmlGenerator.Serialize(dictionaries, tempFile, ConfigurationService.Instance.GetDefaultConfig(new XmlFormat()));
-      var newDictionaries = XmlParser.Deserialize<List<Dictionary<int, int>>>(tempFile);
+      serializer.Serialize(dictionaries, tempFile);
+      var newDictionaries = (List<Dictionary<int, int>>)serializer.Deserialize(tempFile);
       Assert.IsTrue(newDictionaries[0].ContainsKey(1));
       Assert.IsTrue(newDictionaries[0].ContainsKey(2));
@@ -1248 +1196 @@
     }
 
-    [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+    [StorableClass("A9B0D7FB-0CAF-4DD7-9045-EA136F9176F7")]
     public class ReadOnlyFail {
       [Storable]
@@ -1260 +1208 @@
     [TestProperty("Time", "short")]
     public void TestReadOnlyFail() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       try {
-        XmlGenerator.Serialize(new ReadOnlyFail(), tempFile);
+        serializer.Serialize(new ReadOnlyFail(), tempFile);
         Assert.Fail("Exception expected");
       }
@@ -1272 +1221 @@
 
 
-    [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+    [StorableClass("2C9CC576-6823-4784-817B-37C8AF0B1C29")]
     public class WriteOnlyFail {
       [Storable]
@@ -1284 +1233 @@
     [TestProperty("Time", "short")]
     public void TestWriteOnlyFail() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       try {
-        XmlGenerator.Serialize(new WriteOnlyFail(), tempFile);
+        serializer.Serialize(new WriteOnlyFail(), tempFile);
         Assert.Fail("Exception expected");
       }
@@ -1295 +1245 @@
     }
 
-    [StorableClass("3B2B27A5-3F0A-44ED-8672-0E89C9618026")]
+    [StorableClass("8052D9E3-6DDD-4AE1-9B5B-67C6D5436512")]
     public class OneWayTest {
       public OneWayTest() { this.value = "default"; }
@@ -1309 +1259 @@
     }
 
-    [TestMethod]
-    [TestCategory("Persistence")]
-    [TestProperty("Time", "short")]
-    public void TestOneWaySerialization() {
-      var test = new OneWayTest();
-      var serializer = new Serializer(test, ConfigurationService.Instance.GetDefaultConfig(new XmlFormat()));
-      var it = serializer.GetEnumerator();
-      it.MoveNext();
-      Assert.AreEqual("ROOT", ((BeginToken)it.Current).Name); it.MoveNext();
-      Assert.AreEqual("ReadOnly", ((PrimitiveToken)it.Current).Name); it.MoveNext();
-      Assert.AreEqual("ROOT", ((EndToken)it.Current).Name); it.MoveNext();
-      var deserializer = new Deserializer(new[] { 
-        new TypeMapping(0, typeof(OneWayTest).AssemblyQualifiedName, typeof(StorableSerializer).AssemblyQualifiedName),
-        new TypeMapping(1, typeof(string).AssemblyQualifiedName, typeof(String2XmlSerializer).AssemblyQualifiedName) });
-      var newTest = (OneWayTest)deserializer.Deserialize(new ISerializationToken[] {
-        new BeginToken("ROOT", 0, 0),
-        new PrimitiveToken("WriteOnly", 1, 1, new XmlString("<![CDATA[serial data]]>")),
-        new EndToken("ROOT", 0, 0)
-      });
-      Assert.AreEqual("serial data", newTest.value);
-    }
-
-    [TestMethod]
-    [TestCategory("Persistence")]
-    [TestProperty("Time", "short")]
-    public void TestTypeCacheExport() {
-      var test = new List<List<int>>();
-      test.Add(new List<int>() { 1, 2, 3 });
-      IEnumerable<Type> types;
-      using (var stream = new MemoryStream()) {
-        XmlGenerator.Serialize(test, stream, ConfigurationService.Instance.GetConfiguration(new XmlFormat()), false, out types);
-      }
-      List<Type> t = new List<Type>(types);
-      // Assert.IsTrue(t.Contains(typeof(int))); not serialized as an int list is directly transformed into a string
-      Assert.IsTrue(t.Contains(typeof(List<int>)));
-      Assert.IsTrue(t.Contains(typeof(List<List<int>>)));
-      Assert.AreEqual(t.Count, 2);
-    }
+    //TODO
+    /* [TestMethod]
+     [TestCategory("Persistence")]
+     [TestProperty("Time", "short")]
+     public void TestTypeCacheExport() {
+       ProtoBufSerializer serializer = new ProtoBufSerializer();
+       var test = new List<List<int>>();
+       test.Add(new List<int>() { 1, 2, 3 });
+       IEnumerable<Type> types;
+       using (var stream = new MemoryStream()) {
+         XmlGenerator.Serialize(test, stream, ConfigurationService.Instance.GetConfiguration(new XmlFormat()), false, out types);
+       }
+       List<Type> t = new List<Type>(types);
+       // Assert.IsTrue(t.Contains(typeof(int))); not serialized as an int list is directly transformed into a string
+       Assert.IsTrue(t.Contains(typeof(List<int>)));
+       Assert.IsTrue(t.Contains(typeof(List<List<int>>)));
+       Assert.AreEqual(t.Count, 2);
+     }*/
 
     [TestMethod]
@@ -1366 +1296 @@
     [TestProperty("Time", "short")]
     public void FontTest() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       List<Font> fonts = new List<Font>() {
         new Font(FontFamily.GenericSansSerif, 12),
@@ -1372 +1303 @@
         new Font("Helvetica", 21, FontStyle.Strikeout, GraphicsUnit.Inch, 0, true),
       };
-      XmlGenerator.Serialize(fonts, tempFile);
-      var newFonts = XmlParser.Deserialize<List<Font>>(tempFile);
+      serializer.Serialize(fonts, tempFile);
+      var newFonts = (List<Font>)serializer.Deserialize(tempFile);
       Assert.AreEqual(fonts[0], newFonts[0]);
       Assert.AreEqual(fonts[1], newFonts[1]);
@@ -1384 +1315 @@
     [TestProperty("Time", "medium")]
     public void ConcurrencyTest() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       int n = 20;
       Task[] tasks = new Task[n];
@@ -1390 +1322 @@
           byte[] data;
           using (var stream = new MemoryStream()) {
-            XmlGenerator.Serialize(new GeneticAlgorithm(), stream);
+            serializer.Serialize(new GeneticAlgorithm(), stream);
             data = stream.ToArray();
           }
@@ -1402 +1334 @@
     [TestProperty("Time", "medium")]
     public void ConcurrentBitmapTest() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       Bitmap b = new Bitmap(300, 300);
       System.Random r = new System.Random();
@@ -1414 +1347 @@
         tasks[i] = Task.Factory.StartNew((idx) => {
           using (var stream = new MemoryStream()) {
-            XmlGenerator.Serialize(b, stream);
+            serializer.Serialize(b, stream);
             datas[(int)idx] = stream.ToArray();
           }
@@ -1427 +1360 @@
     }
 
-    [TestMethod]
-    [TestCategory("Persistence")]
-    [TestProperty("Time", "short")]
-    public void TestInternalClassOfGeneric() {
-      var s = new G<int, char>.S();
-      var typeName = s.GetType().AssemblyQualifiedName;
-      Assert.AreEqual(
-        "UseCases.G<Int32,Char>.S",
-        TypeNameParser.Parse(typeName).GetTypeNameInCode(false));
-      XmlGenerator.Serialize(s, tempFile);
-      var s1 = XmlParser.Deserialize(tempFile);
-    }
-
-    [TestMethod]
-    [TestCategory("Persistence")]
-    [TestProperty("Time", "short")]
-    public void TestInternalClassOfGeneric2() {
-      var s = new G<int, float>.S2<int, char>();
-      var typeName = s.GetType().AssemblyQualifiedName;
-      Assert.AreEqual(
-        "UseCases.G<Int32,Single>.S2<Int32,Char>",
-        TypeNameParser.Parse(typeName).GetTypeNameInCode(false));
-      XmlGenerator.Serialize(s, tempFile);
-      var s1 = XmlParser.Deserialize(tempFile);
-    }
 
     [TestMethod]
@@ -1457 +1365 @@
     [TestProperty("Time", "short")]
     public void TestSpecialCharacters() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       var s = "abc" + "\x15" + "def";
-      XmlGenerator.Serialize(s, tempFile);
-      var newS = XmlParser.Deserialize(tempFile);
+      serializer.Serialize(s, tempFile);
+      var newS = serializer.Deserialize(tempFile);
       Assert.AreEqual(s, newS);
     }
@@ -1467 +1376 @@
     [TestProperty("Time", "short")]
     public void TestByteArray() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       var b = new byte[3];
       b[0] = 0;
       b[1] = 200;
       b[2] = byte.MaxValue;
-      XmlGenerator.Serialize(b, tempFile);
-      var newB = (byte[])XmlParser.Deserialize(tempFile);
+      serializer.Serialize(b, tempFile);
+      var newB = (byte[])serializer.Deserialize(tempFile);
       CollectionAssert.AreEqual(b, newB);
     }
@@ -1480 +1390 @@
     [TestProperty("Time", "short")]
     public void TestOptionalNumberEnumerable() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       var values = new List<double?> { 0, null, double.NaN, double.PositiveInfinity, double.MaxValue, 1 };
-      XmlGenerator.Serialize(values, tempFile);
-      var newValues = (List<double?>)XmlParser.Deserialize(tempFile);
+      serializer.Serialize(values, tempFile);
+      var newValues = (List<double?>)serializer.Deserialize(tempFile);
       CollectionAssert.AreEqual(values, newValues);
     }
@@ -1490 +1401 @@
     [TestProperty("Time", "short")]
     public void TestOptionalDateTimeEnumerable() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       var values = new List<DateTime?> { DateTime.MinValue, null, DateTime.Now, DateTime.Now.Add(TimeSpan.FromDays(1)),
         DateTime.ParseExact("10.09.2014 12:21", "dd.MM.yyyy hh:mm", CultureInfo.InvariantCulture), DateTime.MaxValue};
-      XmlGenerator.Serialize(values, tempFile);
-      var newValues = (List<DateTime?>)XmlParser.Deserialize(tempFile);
+      serializer.Serialize(values, tempFile);
+      var newValues = (List<DateTime?>)serializer.Deserialize(tempFile);
       CollectionAssert.AreEqual(values, newValues);
     }
@@ -1501 +1413 @@
     [TestProperty("Time", "short")]
     public void TestStringEnumerable() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       var values = new List<string> { "", null, "s", "string", string.Empty, "123", "<![CDATA[nice]]>", "<![CDATA[nasty unterminated" };
-      XmlGenerator.Serialize(values, tempFile);
-      var newValues = (List<String>)XmlParser.Deserialize(tempFile);
+      serializer.Serialize(values, tempFile);
+      var newValues = (List<String>)serializer.Deserialize(tempFile);
       CollectionAssert.AreEqual(values, newValues);
     }
@@ -1511 +1424 @@
     [TestProperty("Time", "short")]
     public void TestUnicodeCharArray() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       var s = Encoding.UTF8.GetChars(new byte[] { 0, 1, 2, 03, 04, 05, 06, 07, 08, 09, 0xa, 0xb });
-      XmlGenerator.Serialize(s, tempFile);
-      var newS = (char[])XmlParser.Deserialize(tempFile);
+      serializer.Serialize(s, tempFile);
+      var newS = (char[])serializer.Deserialize(tempFile);
       CollectionAssert.AreEqual(s, newS);
     }
@@ -1521 +1435 @@
     [TestProperty("Time", "short")]
     public void TestUnicode() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       var s = Encoding.UTF8.GetString(new byte[] { 0, 1, 2, 03, 04, 05, 06, 07, 08, 09, 0xa, 0xb });
-      XmlGenerator.Serialize(s, tempFile);
-      var newS = XmlParser.Deserialize(tempFile);
+      serializer.Serialize(s, tempFile);
+      var newS = serializer.Deserialize(tempFile);
       Assert.AreEqual(s, newS);
     }
@@ -1531 +1446 @@
     [TestProperty("Time", "short")]
     public void TestQueue() {
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
       var q = new Queue<int>(new[] { 1, 2, 3, 4, 0 });
-      XmlGenerator.Serialize(q, tempFile);
-      var newQ = (Queue<int>)XmlParser.Deserialize(tempFile);
+      serializer.Serialize(q, tempFile);
+      var newQ = (Queue<int>)serializer.Deserialize(tempFile);
       CollectionAssert.AreEqual(q, newQ);
     }
-
-
-
-    [ClassInitialize]
-    public static void Initialize(TestContext testContext) {
-      ConfigurationService.Instance.Reset();
-    }
+    #endregion
   }
 }

branches/PersistenceOverhaul/HeuristicLab.Tests/HeuristicLab.Tests.csproj

@@ -257 +257 @@
       <HintPath>..\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
       <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Persistence-4.0, Version=4.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\bin\HeuristicLab.Persistence-4.0.dll</HintPath>
     </Reference>
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
@@ -552 +556 @@
     <Compile Include="HeuristicLab.Persistence-3.3\StorableAttributeTests.cs" />
     <Compile Include="HeuristicLab.Persistence-3.3\UseCases.cs" />
+    <Compile Include="HeuristicLab.Persistence-3.3\UseCasesPersistenceNew.cs" />
     <Compile Include="HeuristicLab.PluginInfraStructure-3.3\InstallationManagerTest.cs" />
     <Compile Include="HeuristicLab.PluginInfraStructure-3.3\TypeExtensionsTest.cs" />