Changeset 1705

Timestamp:

04/29/09 15:32:59 (15 years ago)

Author:

epitzer

Message:

Check for default constructor in all decomposers to ensure failure during serialization instead of deserialization. (#606)

Location:

trunk/sources/HeuristicLab.Persistence

Files:

• 3.3/Default/Decomposers/DictionaryDecomposer.cs (modified) (3 diffs)
• 3.3/Default/Decomposers/EnumerableDecomposer.cs (modified) (2 diffs)
• 3.3/Default/Decomposers/NumberEnumerable2StringDecomposer.cs (modified) (2 diffs)
• 3.3/Default/Decomposers/Storable/StorableDecomposer.cs (modified) (3 diffs)
• UnitTests/UseCases.cs (modified) (7 diffs)

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

@@ -5 +5 @@
 using System.Collections.Generic;
 using HeuristicLab.Persistence.Default.Decomposers.Storable;
+using HeuristicLab.Persistence.Auxiliary;
 
 namespace HeuristicLab.Persistence.Default.Decomposers {
@@ -17 +18 @@
 
     public bool CanDecompose(Type type) {
-      return type.GetInterface(typeof(IDictionary).FullName) != null;
+      return ReflectionTools.HasDefaultConstructor(type) &&
+        type.GetInterface(typeof(IDictionary).FullName) != null;
     }
 
@@ -54 +56 @@
       } catch (ArgumentException e) {
         throw new PersistenceException("Duplicate dictionary key.", e);
-      }      
+      }
     }
   }

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

@@ -6 +6 @@
 using System.Collections.Generic;
 using HeuristicLab.Persistence.Default.Decomposers.Storable;
+using HeuristicLab.Persistence.Auxiliary;
 
 namespace HeuristicLab.Persistence.Default.Decomposers {
@@ -19 +20 @@
     public bool CanDecompose(Type type) {
       return
+        ReflectionTools.HasDefaultConstructor(type) &&
         type.GetInterface(typeof(IEnumerable).FullName) != null &&
         type.GetMethod("Add") != null &&

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

@@ -7 +7 @@
 using System.Text;
 using HeuristicLab.Persistence.Default.Decomposers.Storable;
+using HeuristicLab.Persistence.Auxiliary;
 
 namespace HeuristicLab.Persistence.Default.Decomposers {
@@ -54 +55 @@
     public bool CanDecompose(Type type) {
       return
+        ReflectionTools.HasDefaultConstructor(type) &&
         ImplementsGenericEnumerable(type) &&
         HasAddMethod(type);

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

@@ -4 +4 @@
 using HeuristicLab.Persistence.Interfaces;
 using HeuristicLab.Persistence.Core;
+using System.Reflection;
+using HeuristicLab.Persistence.Auxiliary;
 
 namespace HeuristicLab.Persistence.Default.Decomposers.Storable {
@@ -15 +17 @@
 
     public bool CanDecompose(Type type) {
-      return StorableAttribute.GetStorableMembers(type, false).Count() > 0 ||
-        EmptyStorableClassAttribute.IsEmptyStorable(type);
+      return ReflectionTools.HasDefaultConstructor(type) &&
+        (StorableAttribute.GetStorableMembers(type, false).Count() > 0 ||
+          EmptyStorableClassAttribute.IsEmptyStorable(type));
 
     }
@@ -26 +29 @@
     public IEnumerable<Tag> Decompose(object obj) {
       foreach (var mapping in StorableAttribute.GetStorableAccessors(obj)) {
-        yield return new Tag(mapping.Value.Name ?? mapping.Key, mapping.Value.Get());        
+        yield return new Tag(mapping.Value.Name ?? mapping.Key, mapping.Value.Get());
       }
     }

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

@@ -38 +38 @@
   }
 
+  public class NonDefaultConstructorClass {
+    [Storable]
+    int value;
+    public NonDefaultConstructorClass(int value) {
+      this.value = value;
+    }
+  }
+
   public class IntWrapper {
 
@@ -100 +108 @@
     [Storable]
     public int[] i = new[] { 3, 4, 5, 6 };
-    [Storable(Name="Test String")]
+    [Storable(Name = "Test String")]
     public string s;
     [Storable]
@@ -178 +186 @@
 
     [TestCleanup()]
-    public void ClearTempFile() {      
+    public void ClearTempFile() {
       StreamReader reader = new StreamReader(tempFile);
       string s = reader.ReadToEnd();
@@ -210 +218 @@
       Assert.AreEqual(
         DebugStringGenerator.Serialize(r),
-        DebugStringGenerator.Serialize(newR));      
+        DebugStringGenerator.Serialize(newR));
       Assert.AreSame(newR, newR.selfReferences[0]);
       Assert.AreNotSame(r, newR);
@@ -223 +231 @@
       Assert.AreEqual(r.intList[0], 9);
       Assert.AreEqual(r.intList[1], 8);
-      Assert.AreEqual(r.intList[2], 7);      
+      Assert.AreEqual(r.intList[2], 7);
       Assert.AreEqual(r.multiDimArray[0, 0], 5);
       Assert.AreEqual(r.multiDimArray[0, 1], 4);
@@ -231 +239 @@
       Assert.AreEqual(r.multiDimArray[1, 2], 6);
       Assert.IsFalse(r.boolean);
-      Assert.IsTrue((DateTime.Now - r.dateTime).TotalSeconds < 10);      
+      Assert.IsTrue((DateTime.Now - r.dateTime).TotalSeconds < 10);
       Assert.AreEqual(r.kvp.Key, "string key");
       Assert.AreEqual(r.kvp.Value, 321);
@@ -486 +494 @@
     }
 
+    [TestMethod]
+    public void NonDefaultConstructorTest() {
+      NonDefaultConstructorClass c = new NonDefaultConstructorClass(1);
+      try {
+        XmlGenerator.Serialize(c, tempFile);
+        Assert.Fail("Exception not thrown");
+      } catch (PersistenceException) {
+      }
+    }
+
     [ClassInitialize]
     public static void Initialize(TestContext testContext) {