Changeset 16723 for branches/2521_ProblemRefactoring/HeuristicLab.Tests/HeuristicLab.Persistence-3.3/StorableAttributeTests.cs

Timestamp:

03/28/19 16:54:20 (6 years ago)

Author:

abeham

Message:

#2521: merged changes from r15684 to trunk HEAD (r16716) and resolved all merge conflicts

• it doesn't build

Location:

branches/2521_ProblemRefactoring

Files:

• . (modified) (1 prop)
• HeuristicLab.Tests (modified) (1 prop)
• HeuristicLab.Tests/HeuristicLab.Persistence-3.3/StorableAttributeTests.cs (modified) (6 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Tests/HeuristicLab.Persistence-3.3/StorableAttributeTests.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Persistence.Tests {
 
-  [StorableClass]
+  [StorableType("EF55A82D-7D9B-486E-B811-4DCC389FDB05")]
   class DemoClass {
 
@@ -34 +34 @@
 
     public int y = 0;
+
+    [StorableConstructor]
+    protected DemoClass(StorableConstructorFlag _) {
+    }
+    public DemoClass() {
+    }
   }
 
-  [StorableClass]
+  [StorableType("31F18F9A-C25D-449D-900A-FEBF95D7CE39")]
   class Base {
     public string baseName;
@@ -44 +50 @@
       set { baseName = value; }
     }
+
+    [StorableConstructor]
+    protected Base(StorableConstructorFlag _) {
+    }
+    public Base() {
+    }
   }
 
-  [StorableClass]
+  [StorableType("DF26C284-08C4-4703-A1A4-AFE834079B85")]
   class Override : Base {
     [Storable]
@@ -53 +65 @@
       set { base.Name = value; }
     }
+
+    [StorableConstructor]
+    protected Override(StorableConstructorFlag _) : base(_) {
+    }
+    public Override() {
+    }
   }
 
-  [StorableClass]
+  [StorableType("6BFB1984-6670-4D5E-AEAC-3E77C627AF98")]
   class Intermediate : Override {
+    [StorableConstructor]
+    protected Intermediate(StorableConstructorFlag _) : base(_) {
+    }
+    public Intermediate() {
+    }
   }
 
-  [StorableClass]
+  [StorableType("856F9BDB-A20C-4B80-981B-5B4F5188FBCD")]
   class New : Intermediate {
     public string newName;
@@ -67 +90 @@
       set { newName = value; }
     }
+
+    [StorableConstructor]
+    protected New(StorableConstructorFlag _) : base(_) {
+    }
+    public New() {
+    }
   }
 }