Changeset 3010

Timestamp:

03/12/10 10:43:08 (14 years ago)

Author:

epitzer

Message:

invoke storable hooks in more predictable orders, call hooks defined on base classes first. (#548)

Location:

trunk/sources/HeuristicLab.Persistence/3.3

Files:

• Default/CompositeSerializers/Storable/StorableHookAttribute.cs (modified) (2 diffs)
• Tests/UseCases.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableHookAttribute.cs

@@ -46 +46 @@
     }
 
-    private static readonly BindingFlags instanceMembers =
-      BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public;
+    private static readonly BindingFlags declaredInstanceMembers =
+      BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.DeclaredOnly;
 
     private static readonly object[] emptyArgs = new object[] { };
@@ -79 +79 @@
     }
 
-    private static IEnumerable<MethodInfo> CollectHooks(HookType hookType, Type type) {      
-      foreach (MemberInfo memberInfo in type.GetMembers(instanceMembers)) {
+    private static IEnumerable<MethodInfo> CollectHooks(HookType hookType, Type type) {  
+      if (type.BaseType != null)
+        foreach (var mi in CollectHooks(hookType, type.BaseType))
+          yield return mi;
+      foreach (MemberInfo memberInfo in type.GetMembers(declaredInstanceMembers)) {
         foreach (StorableHookAttribute hook in memberInfo.GetCustomAttributes(typeof(StorableHookAttribute), false)) {
           if (hook != null && hook.HookType == hookType) {

trunk/sources/HeuristicLab.Persistence/3.3/Tests/UseCases.cs

@@ -784 +784 @@
     }
 
+    [StorableClass(StorableClassType.MarkedOnly)]
+    public class HookInheritanceTestBase {
+      [Storable]
+      public object a;
+      public object link;
+      [StorableHook(HookType.AfterDeserialization)]
+      private void relink() {
+        link = a;
+      }
+    }
+
+    [StorableClass(StorableClassType.Empty)]
+    public class HookInheritanceTestDerivedClass : HookInheritanceTestBase {
+      [Storable]
+      public object b;
+      [StorableHook(HookType.AfterDeserialization)]
+      private void relink() {
+        Assert.AreSame(a, link);
+        link = b;
+      }
+    }
+
+    [TestMethod]
+    public void TestLinkInheritance() {
+      HookInheritanceTestDerivedClass c = new HookInheritanceTestDerivedClass();
+      c.a = new object();
+      XmlGenerator.Serialize(c, tempFile);
+      HookInheritanceTestDerivedClass newC = (HookInheritanceTestDerivedClass)XmlParser.Deserialize(tempFile);
+      Assert.AreSame(c.b, c.link);
+    }
+
     [ClassInitialize]
     public static void Initialize(TestContext testContext) {