Changeset 15020 for branches/PersistenceReintegration/HeuristicLab.Persistence

Timestamp:

06/01/17 15:15:25 (8 years ago)

Author:

gkronber

Message:

#2520: fixed unit tests checking for exceptions

Location:

branches/PersistenceReintegration/HeuristicLab.Persistence/4.0/Core

Files:

• Mapper.cs (modified) (1 diff)
• Serializer.cs (modified) (2 diffs)
• StaticCache.cs (modified) (1 diff)
• StorableConstructorFlag.cs (modified) (1 diff)
• TypeInfo.cs (modified) (5 diffs)

branches/PersistenceReintegration/HeuristicLab.Persistence/4.0/Core/Mapper.cs

@@ -134 +134 @@
 
     public object CreateInstance(Type type) {
-      return StaticCache.GetTypeInfo(type).GetConstructor()();
+      try {
+        return StaticCache.GetTypeInfo(type).GetConstructor()();
+      } catch (Exception e) {
+        throw new PersistenceException("Deserialization failed.", e);
+      }
     }
 

branches/PersistenceReintegration/HeuristicLab.Persistence/4.0/Core/Serializer.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.IO;
 using System.IO.Compression;
@@ -29 +30 @@
     }
     public virtual void Serialize(object o, string path) {
-      using (var fileStream = new FileStream(path, FileMode.Create)) {
-        using (var zipStream = new DeflateStream(fileStream, CompressionMode.Compress)) {
+      string tempfile = Path.GetTempFileName();
+
+      using (FileStream stream = File.Create(tempfile)) {
+        using (var zipStream = new DeflateStream(stream, CompressionMode.Compress)) {
           Serialize(o, zipStream);
         }
       }
+
+      File.Copy(tempfile, path, true);
+      File.Delete(tempfile);
     }
     public virtual byte[] Serialize(object o) {

branches/PersistenceReintegration/HeuristicLab.Persistence/4.0/Core/StaticCache.cs

@@ -244 +244 @@
         TypeInfo typeInfo;
         if (!typeInfos.TryGetValue(type, out typeInfo)) {
-          var transformer = guid2Transformer.Values.OrderBy(x => x.Priority).First(x => x.CanTransformType(type));
+          var transformer = guid2Transformer.Values.OrderBy(x => x.Priority).FirstOrDefault(x => x.CanTransformType(type));
+          if(transformer == null) throw new PersistenceException("No transformer found for type " + type.AssemblyQualifiedName);
           typeInfo = new TypeInfo(type, transformer);
           typeInfos.Add(type, typeInfo);

branches/PersistenceReintegration/HeuristicLab.Persistence/4.0/Core/StorableConstructorFlag.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Persistence {
-  // the enum type which is used for the definition of storable constructors
-  public struct StorableConstructorFlag {
+  // the type which is used for the definition of storable constructors
+  public struct StorableConstructorFlag  {
     // empty
   };

branches/PersistenceReintegration/HeuristicLab.Persistence/4.0/Core/TypeInfo.cs

@@ -58 +58 @@
       StorableTypeAttribute = StorableTypeAttribute.GetStorableTypeAttribute(type);
       if (StorableTypeAttribute != null) {
-        // traverse type hierarchy from base type to sub types
-        Stack<Type> types = new Stack<Type>();
+        // check constructors (
+        if (!type.IsValueType && !type.IsEnum && !type.IsInterface && 
+          GetStorableConstructor() == null && GetDefaultConstructor() == null)
+          throw new PersistenceException("No storable constructor or parameterless constructor found.");
+
+          // traverse type hierarchy from base type to sub types
+          Stack<Type> types = new Stack<Type>();
         while (type != null) {
           types.Push(type);
@@ -90 +95 @@
             foreach (var property in propertyInfos) {
               var attrib = StorableAttribute.GetStorableAttribute(property);
+              if (!attrib.AllowOneWay && (!property.CanRead || !property.CanWrite))
+                throw new PersistenceException("Properties must be readable and writable or explicity enable one way serialization.");
+
               var name = attrib == null || string.IsNullOrEmpty(attrib.Name) ? property.Name : attrib.Name;
               properties.Add(new ComponentInfo(type.Name + '.' + name, property, attrib, property.CanRead, property.CanWrite));
@@ -118 +126 @@
 
       // get storable constructor
-      var ctor = Type.GetConstructors(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
-                     .Where(x => StorableConstructorAttribute.IsStorableConstructor(x))
-                     .Where(x => (x.GetParameters().Length == 1) && (x.GetParameters()[0].ParameterType == typeof(StorableConstructorFlag)))
-                     .FirstOrDefault();
+      var ctor = GetStorableConstructor();
       if (ctor != null) {
         DynamicMethod dm = new DynamicMethod("", typeof(object), null, Type, true);
@@ -136 +141 @@
 
       // get default constructor
-      ctor = Type.GetConstructor(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic,
-                                 null, Type.EmptyTypes, null);
+      ctor = GetDefaultConstructor();
       if (ctor != null) {
         DynamicMethod dm = new DynamicMethod("", typeof(object), null, Type, true);
@@ -147 +151 @@
       }
 
-      throw new Exception("No storable constructor or parameterless constructor found.");
+      throw new PersistenceException("No storable constructor or parameterless constructor found.");
+    }
+
+    private ConstructorInfo GetStorableConstructor() {
+      return Type.GetConstructors(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
+               .Where(x => StorableConstructorAttribute.IsStorableConstructor(x))
+               .Where(x => (x.GetParameters().Length == 1) && (x.GetParameters()[0].ParameterType == typeof(StorableConstructorFlag)))
+               .FirstOrDefault();
+    }
+
+    private ConstructorInfo GetDefaultConstructor() {
+      return Type.GetConstructor(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic,
+                             null, Type.EmptyTypes, null);
     }
   }