Changeset 15020 for branches/PersistenceReintegration/HeuristicLab.Tests/HeuristicLab.Persistence-3.3/UseCasesPersistenceNew.cs

Timestamp:

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

Author:

gkronber

Message:

#2520: fixed unit tests checking for exceptions

File:

• branches/PersistenceReintegration/HeuristicLab.Tests/HeuristicLab.Persistence-3.3/UseCasesPersistenceNew.cs (modified) (10 diffs)

branches/PersistenceReintegration/HeuristicLab.Tests/HeuristicLab.Persistence-3.3/UseCasesPersistenceNew.cs

@@ -268 +268 @@
   }
 
-  [StorableType("6494ee1d-877b-4e78-83df-f3f55a77b9b4")]
   public class NonSerializable {
     int x = 0;
@@ -1382 +1381 @@
       int value;
       int PropertyValue { get; set; }
+
+      /*
+      [StorableConstructor]
+      public TestStruct(StorableConstructorFlag deserializing) {
+        value = 0;
+        PropertyValue = 0;
+      }
+      */
+
       public TestStruct(int value)
         : this() {
@@ -1584 +1592 @@
       public int Value4 { get; private set; }
       [StorableConstructor]
-      public AllFieldsStorable(bool isDeserializing) {
-        if (!isDeserializing) {
-          Value1 = 12;
-          Value2 = 23;
-          Value3 = 34;
-          Value4 = 56;
-        }
+      public AllFieldsStorable(StorableConstructorFlag isdeserializing) {
+      }
+
+      public void InitValues() {
+        Value1 = 12;
+        Value2 = 23;
+        Value3 = 34;
+        Value4 = 56;
       }
     }
@@ -1599 +1608 @@
     public void TestStorableTypeDiscoveryAllFields() {
       ProtoBufSerializer serializer = new ProtoBufSerializer();
-      AllFieldsStorable afs = new AllFieldsStorable(false);
+      AllFieldsStorable afs = new AllFieldsStorable(default(StorableConstructorFlag));
+      afs.InitValues();
       serializer.Serialize(afs, tempFile);
       AllFieldsStorable newAfs = (AllFieldsStorable)serializer.Deserialize(tempFile);
@@ -1615 +1625 @@
       public int Value3 { get; private set; }
       public int Value4 { get; private set; }
-      [StorableConstructor]
-      public AllPropertiesStorable(bool isDeserializing) {
-        if (!isDeserializing) {
-          Value1 = 12;
-          Value2 = 23;
-          Value3 = 34;
-          Value4 = 56;
-        }
+
+      public AllPropertiesStorable() {
+      }
+
+      public void InitValues() {
+        Value1 = 12;
+        Value2 = 23;
+        Value3 = 34;
+        Value4 = 56;
       }
     }
@@ -1631 +1642 @@
     public void TestStorableTypeDiscoveryAllProperties() {
       ProtoBufSerializer serializer = new ProtoBufSerializer();
-      AllPropertiesStorable afs = new AllPropertiesStorable(false);
+      AllPropertiesStorable afs = new AllPropertiesStorable();
+      afs.InitValues();
       serializer.Serialize(afs, tempFile);
       AllPropertiesStorable newAfs = (AllPropertiesStorable)serializer.Deserialize(tempFile);
@@ -1648 +1660 @@
       public int Value3 { get; private set; }
       public int Value4 { get; private set; }
-      [StorableConstructor]
-      public AllFieldsAndAllPropertiesStorable(bool isDeserializing) {
-        if (!isDeserializing) {
-          Value1 = 12;
-          Value2 = 23;
-          Value3 = 34;
-          Value4 = 56;
-        }
+
+      public AllFieldsAndAllPropertiesStorable() {
+      }
+
+      public void InitValues() {
+        Value1 = 12;
+        Value2 = 23;
+        Value3 = 34;
+        Value4 = 56;
+
       }
     }
@@ -1664 +1678 @@
     public void TestStorableTypeDiscoveryAllFieldsAndAllProperties() {
       ProtoBufSerializer serializer = new ProtoBufSerializer();
-      AllFieldsAndAllPropertiesStorable afs = new AllFieldsAndAllPropertiesStorable(false);
+      AllFieldsAndAllPropertiesStorable afs = new AllFieldsAndAllPropertiesStorable();
+      afs.InitValues();
       serializer.Serialize(afs, tempFile);
       AllFieldsAndAllPropertiesStorable newAfs = (AllFieldsAndAllPropertiesStorable)serializer.Deserialize(tempFile);
@@ -1680 +1695 @@
       public int Value3 { get; private set; }
       public int Value4 { get; private set; }
-      [StorableConstructor]
-      public MarkedOnlyStorable(bool isDeserializing) {
-        if (!isDeserializing) {
-          Value1 = 12;
-          Value2 = 23;
-          Value3 = 34;
-          Value4 = 56;
-        }
+      public MarkedOnlyStorable() {
+      }
+
+      public void InitValues() {
+        Value1 = 12;
+        Value2 = 23;
+        Value3 = 34;
+        Value4 = 56;
       }
     }
@@ -1696 +1711 @@
     public void TestStorableTypeDiscoveryMarkedOnly() {
       ProtoBufSerializer serializer = new ProtoBufSerializer();
-      MarkedOnlyStorable afs = new MarkedOnlyStorable(false);
+      MarkedOnlyStorable afs = new MarkedOnlyStorable();
+      afs.InitValues();
       serializer.Serialize(afs, tempFile);
       MarkedOnlyStorable newAfs = (MarkedOnlyStorable)serializer.Deserialize(tempFile);