Changeset 1938 for trunk/sources/HeuristicLab.Persistence/UnitTests

Timestamp:

05/28/09 18:06:43 (16 years ago)

Author:

epitzer

Message:

Resolve name clashes of overridden and shadowed properties (#659)

Location:

trunk/sources/HeuristicLab.Persistence/UnitTests

Files:

• StorableAttributeTests.cs (modified) (4 diffs)
• UseCases.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Persistence/UnitTests/StorableAttributeTests.cs

@@ -4 +4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using System.Reflection;
 
 namespace HeuristicLab.Persistence.Test {
@@ -19 +20 @@
   }
 
+  class Base {
+    public string baseName;
+    [Storable]
+    public virtual string Name {
+      get { return "Base"; }
+      set { baseName = value; }
+    }
+  }
+
+  class Override : Base {
+    [Storable]
+    public override string Name {
+      get { return "Override"; }
+      set { base.Name = value; }
+    }
+  }
+
+  [EmptyStorableClass]
+  class Intermediate : Override {
+  }
+
+  class New : Intermediate {
+    public string newName;
+    [Storable]
+    public new string Name {
+      get { return "New"; }
+      set { newName = value; }
+    }
+  }
+
   [TestClass]
   public class AttributeTest {
@@ -26 +57 @@
       DemoClass t = new DemoClass();
       Dictionary<string, DataMemberAccessor> accessors = StorableAttribute.GetStorableAccessors(t);
-      Assert.IsTrue(accessors.ContainsKey("o"));
+      Assert.IsTrue(accessors.ContainsKey("TestProperty"));
       Assert.IsTrue(accessors.ContainsKey("x"));
       Assert.IsFalse(accessors.ContainsKey("y"));
       object o = new object();
       t.o = o;
-      Assert.AreSame(accessors["o"].Get(), o);
+      Assert.AreSame(accessors["TestProperty"].Get(), o);
       t.x = 12;
       Assert.AreEqual(accessors["x"].Get(), 12);
       t.y = 312890;
-      accessors["o"].Set(null);
+      accessors["TestProperty"].Set(null);
       Assert.IsNull(t.o);
       accessors["x"].Set(123);
@@ -41 +72 @@
     }
 
+    [TestMethod]
+    public void TestInheritance() {
+      New n = new New();
+      var accessors = StorableAttribute.GetStorableAccessors(n);
+      var accessDict = new Dictionary<string, DataMemberAccessor>();
+      foreach (var accessor in accessors) // assert uniqueness
+        accessDict.Add(accessor.Key, accessor.Value);
+      Assert.IsTrue(accessDict.ContainsKey(typeof(New).FullName + ".Name"));
+      Assert.IsTrue(accessDict.ContainsKey(typeof(Override).FullName + ".Name"));
+      Assert.AreEqual("New", accessDict[typeof(New).FullName + ".Name"].Get());
+      Assert.AreEqual("Override", accessDict[typeof(Override).FullName + ".Name"].Get());
+    }
+
   }
 

trunk/sources/HeuristicLab.Persistence/UnitTests/UseCases.cs

@@ -16 +16 @@
 using HeuristicLab.Persistence.Auxiliary;
 using System.Text.RegularExpressions;
+using HeuristicLab.Persistence.Test;
 
 namespace HeuristicLab.Persistence.UnitTest {
@@ -541 +542 @@
     }
 
+    [TestMethod]
+    public void InheritanceTest() {
+      New n = new New();
+      XmlGenerator.Serialize(n, tempFile);
+      New nn = (New)XmlParser.Deserialize(tempFile);
+      Assert.AreEqual(n.Name, nn.Name);
+      Assert.AreEqual(((Override)n).Name, ((Override)nn).Name);
+    }
+
     [ClassInitialize]
     public static void Initialize(TestContext testContext) {