Changeset 1652

Timestamp:

04/24/09 13:51:57 (16 years ago)

Author:

epitzer

Message:

Implement missing primitive formatter for char and add more comprehensive tests. (#548)

Location:

trunk/sources/HeuristicLab.Persistence

Files:

• 3.3/Core/Serializer.cs (modified) (2 diffs)
• 3.3/Default/DebugString/Formatters/Char2DebugStringFormatter.cs (added)
• 3.3/Default/Decomposers/Storable/EmptyStorableClassAttribute.cs (modified) (1 diff)
• 3.3/Default/Xml/Primitive/Char2XmlFormatter.cs (added)
• 3.3/HeuristicLab.Persistence-3.3.csproj (modified) (2 diffs)
• UnitTests/UseCases.cs (modified) (9 diffs)

trunk/sources/HeuristicLab.Persistence/3.3/Core/Serializer.cs

@@ -2 +2 @@
 using System.Collections;
 using System;
+using System.Linq;
 using HeuristicLab.Persistence.Interfaces;
 using HeuristicLab.Persistence.Core.Tokens;
 using HeuristicLab.Persistence.Default.Decomposers.Storable;
+using System.Text;
 
 namespace HeuristicLab.Persistence.Core {
@@ -76 +78 @@
       throw new PersistenceException(
           String.Format(
-          "No suitable method for serializing values of type \"{0}\" found.",
-          value.GetType().VersionInvariantName()));
+          "No suitable method for serializing values of type \"{0}\" found\r\n" +
+          "Formatters:\r\n{1}\r\n" +
+          "Decomposers:\r\n{2}",
+          value.GetType().VersionInvariantName(),
+          string.Join("\r\n", configuration.Formatters.Select(f => f.GetType().VersionInvariantName()).ToArray()),
+          string.Join("\r\n", configuration.Decomposers.Select(d => d.GetType().VersionInvariantName()).ToArray())
+          ));
+
     }
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers/Storable/EmptyStorableClassAttribute.cs

@@ -17 +17 @@
       if (emptyTypeInfo.ContainsKey(type))
         return emptyTypeInfo[type];
+      if (type == typeof(object)) {
+        return true;
+      }
       foreach (var attribute in type.GetCustomAttributes(false)) {
         EmptyStorableClassAttribute empty = attribute as EmptyStorableClassAttribute;

trunk/sources/HeuristicLab.Persistence/3.3/HeuristicLab.Persistence-3.3.csproj

@@ -95 +95 @@
     <Compile Include="Core\Configuration.cs" />
     <Compile Include="Core\PersistenceException.cs" />
+    <Compile Include="Default\DebugString\Formatters\Char2DebugStringFormatter.cs" />
     <Compile Include="Default\Decomposers\Number2StringConverter.cs" />
     <Compile Include="Default\Decomposers\Storable\EmptyStorableClassAttribute.cs" />
@@ -137 +138 @@
     <Compile Include="Default\Decomposers\Storable\DataMemberAccessor.cs" />
     <Compile Include="Default\Xml\Compact\IntList2XmlFormatter.cs" />
+    <Compile Include="Default\Xml\Primitive\Char2XmlFormatter.cs" />
     <Compile Include="Default\Xml\XmlStringConstants.cs" />
     <Compile Include="Default\Xml\XmlString.cs" />

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

@@ -17 +17 @@
 namespace HeuristicLab.Persistence.UnitTest {
 
-  public class PrimitivesTest {
+  public class NumberTest {
     [Storable]
     private bool _bool = true;
@@ -36 +36 @@
     [Storable]
     private ulong _ulong = 123456;
+  }
+
+  public class PrimitivesTest : NumberTest {
+    [Storable]
+    private char c = 'e';
     [Storable]
     private long[,] _long_array =
@@ -41 +46 @@
     [Storable]
     public List<int> list = new List<int> { 1, 2, 3, 4, 5 };
+    [Storable]
+    private object o = new object();
   }
 
@@ -132 +139 @@
       r.dict.Add("three", 3);
       r.myEnum = TestEnum.va1;
+      r.i = new[] { 7, 5, 6 };
+      r.s = "new value";
+      r.intArray = new ArrayList { 3, 2, 1 };
+      r.intList = new List<int> { 9, 8, 7 };
+      r.multiDimArray = new double[,] { { 5, 4, 3 }, { 1, 4, 6 } };
+      r.boolean = false;
+      r.dateTime = DateTime.Now;
+      r.kvp = new KeyValuePair<string, int>("string key", 321);
+      r.uninitialized = null;
       XmlGenerator.Serialize(r, tempFile);
       object o = XmlParser.DeSerialize(tempFile);
@@ -140 +156 @@
       Assert.AreSame(newR, newR.selfReferences[0]);
       Assert.AreNotSame(r, newR);
+      Assert.AreEqual(r.myEnum, TestEnum.va1);
+      Assert.AreEqual(r.i[0], 7);
+      Assert.AreEqual(r.i[1], 5);
+      Assert.AreEqual(r.i[2], 6);
+      Assert.AreSame(r.s, "new value");
+      Assert.AreEqual(r.intArray[0], 3);
+      Assert.AreEqual(r.intArray[1], 2);
+      Assert.AreEqual(r.intArray[2], 1);
+      Assert.AreEqual(r.intList[0], 9);
+      Assert.AreEqual(r.intList[1], 8);
+      Assert.AreEqual(r.intList[2], 7);      
+      Assert.AreEqual(r.multiDimArray[0, 0], 5);
+      Assert.AreEqual(r.multiDimArray[0, 1], 4);
+      Assert.AreEqual(r.multiDimArray[0, 2], 3);
+      Assert.AreEqual(r.multiDimArray[1, 0], 1);
+      Assert.AreEqual(r.multiDimArray[1, 1], 4);
+      Assert.AreEqual(r.multiDimArray[1, 2], 6);
+      Assert.IsFalse(r.boolean);
+      Assert.IsTrue((DateTime.Now - r.dateTime).TotalSeconds < 10);      
+      Assert.AreSame(r.kvp.Key, "string key");
+      Assert.AreEqual(r.kvp.Value, 321);
+      Assert.IsNull(r.uninitialized);
     }
 
@@ -274 +312 @@
     }
 
-    private string formatFullMemberName(MemberInfo mi) {     
+    private string formatFullMemberName(MemberInfo mi) {
       return new StringBuilder()
         .Append(mi.DeclaringType.Assembly.GetName().Name)
@@ -292 +330 @@
       foreach (Assembly a in AppDomain.CurrentDomain.GetAssemblies()) {
         if (!a.GetName().Name.StartsWith("HeuristicLab"))
-          continue;        
+          continue;
         foreach (Type t in a.GetTypes()) {
           foreach (MemberInfo mi in t.GetMembers(BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static)) {
@@ -304 +342 @@
                 !mi.Name.StartsWith("set_") &&
                 !mi.Name.StartsWith("add_") &&
-                !mi.Name.StartsWith("remove_") )
+                !mi.Name.StartsWith("remove_"))
                 lowerCaseMethodNames.Add(formatFullMemberName(mi));
             }
@@ -317 +355 @@
     [TestMethod]
     public void Number2StringDecomposer() {
-      PrimitivesTest sdt = new PrimitivesTest();
+      NumberTest sdt = new NumberTest();
       XmlGenerator.Serialize(sdt, tempFile,
         new Configuration(new XmlFormat(),
-          new Dictionary<Type, IFormatter> { { typeof(string), new String2XmlFormatter() } },
-          new List<IDecomposer> { new Number2StringDecomposer() }));
-      object o = XmlParser.DeSerialize(tempFile);      
+          new Dictionary<Type, IFormatter> {
+          { typeof(string), new String2XmlFormatter() } },
+          new List<IDecomposer> { 
+            new StorableDecomposer(),
+            new Number2StringDecomposer() }));
+      object o = XmlParser.DeSerialize(tempFile);
       Assert.AreEqual(
         DebugStringGenerator.Serialize(sdt),