Changeset 15034 for branches/PersistenceReintegration/HeuristicLab.Tests/HeuristicLab.Persistence-3.3/UseCasesPersistenceNew.cs

Timestamp:

06/16/17 11:32:56 (7 years ago)

Author:

gkronber

Message:

#2520: improved conversions

File:

• branches/PersistenceReintegration/HeuristicLab.Tests/HeuristicLab.Persistence-3.3/UseCasesPersistenceNew.cs (modified) (4 diffs)

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

@@ -2166 +2166 @@
     }
     [StorableType("00000000-0000-0000-0000-BADCAFFEE000", 2)] // for testing (version 2)
-    private partial class V2 : NewBaseType {
+    private class V2 : NewBaseType {
       [Storable]
       public int a;
@@ -2186 +2186 @@
     }
 
-    // conversion part
-    private partial class V2 : NewBaseType {
-      [StorableConversion(srcVersion: 1)]
+    [StorableType("00000000-0000-0000-0000-BADCAFFEE200", 3)] // for testing (version 3)
+    private class V3 : NewBaseType {
+      [Storable]
+      public int a;
+
+      [Storable]
+      public int[] val;
+
+      [Storable]
+      public V3 mySelf;
+
+      [Storable]
+      public Tuple<int, int> tup;
+
+      [Storable]
+      public Point coords;
+    }
+
+    private static class Conversions {
+      [StorableConversion("D211A828-6440-4E72-A8C7-AA4F9B4FFA75", 1)]
       private static Dictionary<string, object> ConvertV1(Dictionary<string, object> values) {
         var newValues = new Dictionary<string, object>();
@@ -2208 +2225 @@
         return newValues;
       }
-    }
-
-    [StorableType("00000000-0000-0000-0000-BADCAFFEE200", 3)] // for testing (version 3)
-    private partial class V3 : NewBaseType {
-      [Storable]
-      public int a;
-
-      [Storable]
-      public int[] val;
-
-      [Storable]
-      public V3 mySelf;
-
-      [Storable]
-      public Tuple<int, int> tup;
-
-      [Storable]
-      public Point coords;
-    }
-
-    // conversion part
-    private partial class V3 {
-      [StorableConversion(srcVersion: 1)]
-      private static Dictionary<string, object> ConvertV1(Dictionary<string, object> values) {
-        var newValues = new Dictionary<string, object>();
-        var items = (ItemCollection<IItem>)values["OldBaseType.items"];
-        newValues["NewBaseType.items"] = items.Select(iv => new DoubleValue((double)(((dynamic)iv).Value))).ToArray();
-        newValues["V2.a"] = ((IntValue)values["V1.a"]).Value;
-        newValues["V2.val"] = ((ItemList<IntValue>)values["V1.vals"]).Select(iv => iv.Value).ToArray();
-
-        newValues["V2.mySelf"] = values["V1.mySelf"]; // myself type will be mapped correctly
-
-        var tup = (Tuple<int, int>)values["V1.tup"];
-        if (tup != null) {
-          newValues["V2.TupItem1"] = tup.Item1;
-          newValues["V2.TupItem2"] = tup.Item2;
-        }
-
-        newValues["V2.coords"] = new Point((int)values["V1.x"], (int)values["V1.y"]);
-
-        return newValues;
-      }
-
-      [StorableConversion(srcVersion: 2)]
+
+      [StorableConversion("D211A828-6440-4E72-A8C7-AA4F9B4FFA75", 2)]
       private static Dictionary<string, object> ConvertV2(Dictionary<string, object> values) {
         var newValues = new Dictionary<string, object>();
@@ -2286 +2261 @@
       Mapper.StaticCache.DeregisterType(StorableTypeAttribute.GetStorableTypeAttribute(typeof(V1)).Guid);
       Mapper.StaticCache.DeregisterType(StorableTypeAttribute.GetStorableTypeAttribute(typeof(V2)).Guid);
-
-      Mapper.StaticCache.RegisterType(StorableTypeAttribute.GetStorableTypeAttribute(typeof(V1)).Guid, typeof(V2));
-
-      object o = serializer.Deserialize(tempFile);
-      var restored = (V2)o;
+      Mapper.StaticCache.DeregisterType(StorableTypeAttribute.GetStorableTypeAttribute(typeof(V3)).Guid);
+
+      Mapper.StaticCache.RegisterType(StorableTypeAttribute.GetStorableTypeAttribute(typeof(V1)).Guid, typeof(V3));
+      var pi = typeof(StorableTypeAttribute).GetProperty("Guid");
+      pi.SetValue(
+        Mapper.StaticCache.GetTypeInfo(typeof(V3)).StorableTypeAttribute,
+        StorableTypeAttribute.GetStorableTypeAttribute(typeof(V1)).Guid,
+        null);
+
+      object o = serializer.Deserialize(tempFile);
+      var restored = (V3)o;
       Assert.AreEqual(restored.a, old.a.Value);
-      Assert.IsTrue(restored.val.SequenceEqual(old.vals.Select(iv => iv.Value)));
-      Assert.IsTrue(restored.items.Select(item => item.Value).SequenceEqual(old.items.Select(iv => (double)((dynamic)iv).Value)));
-      // Assert.AreSame(restored.items[0], restored.items[1]);
-      Assert.AreSame(restored, restored.mySelf);
-
-      //string msg = Profile(test);
-      //Console.WriteLine(msg);
-    }
-
-    [TestMethod]
-    [TestCategory("Persistence4")]
-    [TestProperty("Time", "short")]
-    public void TestConversion2() {
-      var test = new Func<V2>(() => {
-        var p = new V2();
-        p.a = 1;
-        p.mySelf = p;
-        p.val = new int[] { 2, 3, 4 };
-        p.TupItem1 = 17;
-        p.TupItem2 = 4;
-        p.items = new DoubleValue[] { new DoubleValue(1.0), new DoubleValue(2.0) };
-        return p;
-      });
-
-      ProtoBufSerializer serializer = new ProtoBufSerializer();
-      var old = test();
-      serializer.Serialize(old, tempFile);
-      Mapper.StaticCache.DeregisterType(StorableTypeAttribute.GetStorableTypeAttribute(typeof(V1)).Guid);
-      Mapper.StaticCache.DeregisterType(StorableTypeAttribute.GetStorableTypeAttribute(typeof(V2)).Guid);
-      Mapper.StaticCache.DeregisterType(StorableTypeAttribute.GetStorableTypeAttribute(typeof(V3)).Guid);
-
-      Mapper.StaticCache.RegisterType(StorableTypeAttribute.GetStorableTypeAttribute(typeof(V2)).Guid, typeof(V3));
-
-      object o = serializer.Deserialize(tempFile);
-      var restored = (V3)o;
-      Assert.AreEqual(restored.a, old.a);
-      Assert.IsTrue(restored.val.SequenceEqual(old.val));
+      Assert.IsTrue(restored.val.SequenceEqual(old.vals.Select(iv=>iv.Value)));
       Assert.IsTrue(restored.items.Select(item => item.Value).SequenceEqual(old.items.Select(iv => (double)((dynamic)iv).Value)));
       // Assert.AreSame(restored.items[0], restored.items[1]);