Changeset 6737 for branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/Tests

Timestamp:

09/12/11 10:12:50 (14 years ago)

Author:

epitzer

Message:

#1530 Split type and serializer tokens and include special handling for CachedTypeSerializer (this should also fix #1527)

File:

• branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/Tests/UseCases.cs (modified) (2 diffs)

branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/Tests/UseCases.cs

@@ -1129 +1129 @@
       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) });
+      ReverseTypeCache typeCache = new ReverseTypeCache();
+      typeCache.AddType(0, typeof(OneWayTest));
+      typeCache.AddSerializer(0, typeof(StorableSerializer));
+      typeCache.AddType(1, typeof(string));
+      typeCache.AddSerializer(1, typeof(String2XmlSerializer));
+      var deserializer = new Deserializer(typeCache);
       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)
+        new EndToken()
       });
       Assert.AreEqual("serial data", newTest.value);
@@ -1168 +1170 @@
     }
 
+    [TestMethod]
+    public void TestCachedTypeSerializer() {
+      List<Type> types = new List<Type> { typeof(object), typeof(UseCases), typeof(XmlGenerator) };
+      var s = new Serializer(types, ConfigurationService.Instance.GetDefaultConfig(new XmlFormat()));
+      var tokens = s.ToList();
+      foreach (var type in types)
+        Assert.IsTrue(s.SerializedTypes.Contains(type));
+      var d = new Deserializer(s.TypeCache.Reverse());
+      var newTypes = (List<Type>)d.Deserialize(tokens);
+      for (int i = 0; i < types.Count; i++)
+        Assert.AreEqual(types[i], newTypes[i]);
+    }
+