Changeset 1684

Timestamp:

04/28/09 13:58:49 (16 years ago)

Author:

epitzer

Message:

Fix EnumDecomposer to be applicable for flag enums and enums without names. (#603)

Location:

trunk/sources/HeuristicLab.Persistence

Files:

• 3.3/Default/Decomposers/EnumDecomposer.cs (modified) (1 diff)
• UnitTests/UseCases.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers/EnumDecomposer.cs

@@ -19 +19 @@
 
     public IEnumerable<Tag> CreateMetaInfo(object obj) {
-      yield return new Tag(Enum.GetName(obj.GetType(), obj));
+      yield return new Tag(Enum.Format(obj.GetType(), obj, "G"));
     }
 

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

@@ -100 +100 @@
     [Storable(DefaultValue = "default")]
     public string uninitialized;
+  }
+
+  public enum SimpleEnum { one, two, three }
+  public enum ComplexEnum { one = 1, two = 2, three = 3 }
+  [FlagsAttribute]
+  public enum TrickyEnum { zero = 0, one = 1, two = 2 }
+
+  public class EnumTest {
+    [Storable]
+    public SimpleEnum simpleEnum = SimpleEnum.one;
+    [Storable]
+    public ComplexEnum complexEnum = (ComplexEnum)2;
+    [Storable]
+    public TrickyEnum trickyEnum = (TrickyEnum)15;
   }
 
@@ -422 +436 @@
     }
 
+    [TestMethod]
+    public void Enums() {
+      EnumTest et = new EnumTest();
+      et.simpleEnum = SimpleEnum.two;
+      et.complexEnum = ComplexEnum.three;
+      et.trickyEnum = TrickyEnum.two | TrickyEnum.one;
+      XmlGenerator.Serialize(et, tempFile);
+      EnumTest newEt = (EnumTest)XmlParser.DeSerialize(tempFile);
+      Assert.AreEqual(et.simpleEnum, SimpleEnum.two);
+      Assert.AreEqual(et.complexEnum, ComplexEnum.three);
+      Assert.AreEqual(et.trickyEnum, (TrickyEnum)3);
+    }
+
 
     [ClassInitialize]