Changeset 15878

Timestamp:

03/30/18 13:56:55 (7 years ago)

Author:

jkarder

Message:

#2520: worked on new persistence

• updated tests

File:

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

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

@@ -2560 +2560 @@
     [StorableType("41108958-227D-43C4-B049-80AD0D3DB7F6")]
     private class InheritanceB0 : InheritanceA0 {
-      //[Storable]
-      //public int x;
+      [Storable]
+      public int x;
+
+      [StorableConstructor]
+      private InheritanceB0(StorableConstructorFlag flag) { }
+      public InheritanceB0(int x) {
+        this.x = x;
+        base.x = x;
+      }
     }
 
@@ -2590 +2597 @@
       private static Dictionary<string, object> ConvertC0_C1(Dictionary<string, object> values) {
         var newValues = new Dictionary<string, object>();
-        newValues["41108958-227D-43C4-B049-80AD0D3DB7F6.x"] = (int)values["41108958-227D-43C4-B049-80AD0D3DB7F6.x"] * 2;
+        newValues["28A5F6B8-49AF-4C6A-AF0E-F92EB4511722.x"] = (int)values["28A5F6B8-49AF-4C6A-AF0E-F92EB4511722.x"] * 2;
         return newValues;
       }
+    }
+
+    private static class InheritanceConversionsWithNamesDemo {
+      [StorableConversion("A", 1)]
+      private static Dictionary<string, object> ConvertA1_A2(Dictionary<string, object> values) {
+        var newValues = new Dictionary<string, object>();
+        newValues["y"] = values["x"];
+        return newValues;
+      }
+
+      [StorableConversion("B", 1, baseGuid: "A", baseVersion: 2)]
+      private static Dictionary<string, object> ConvertB1_B2(Dictionary<string, object> values, out List<Tuple<string, uint>> typeChain) {
+        typeChain = new List<Tuple<string, uint>> {
+          Tuple.Create("C", 1u)
+        };
+
+        var newValues = new Dictionary<string, object>();
+        newValues["x"] = values["A.y"];
+        newValues["C.x"] = values["A.y"];
+        return newValues;
+      }
+
+      [StorableConversion("C", 1)]
+      private static Dictionary<string, object> ConvertC1_C2(Dictionary<string, object> values) {
+        var newValues = new Dictionary<string, object>();
+        newValues["x"] = (int)values["x"] * 2;
+        return newValues;
+      }
+
+      [StorableConversion("C", 1, "D", 1)]
+      [StorableConversion("D", 1, "E", 1)]
+      private static string Rename() { return "D"; }
     }
 
@@ -2600 +2639 @@
     public void TestInheritanceConversionCase1() {
       var test = new Func<InheritanceB0>(() => {
-        return new InheritanceB0() { x = 17 };
+        return new InheritanceB0(17);
       });
 
@@ -2629 +2668 @@
       var restoredC1 = (InheritanceC1)o;
       var restoredB1 = (InheritanceB1)o;
-      Assert.AreEqual(old.x, restoredB1.x);
       Assert.AreEqual(old.x * 2, restoredC1.x);
     }