Changeset 13395 for trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3

Timestamp:

11/25/15 13:59:23 (8 years ago)

Author:

pfleck

Message:

#2525

• Changed unit test that it also lists types that have a StorableConstructor but are not marked as StorableClass.
• Put both storable tests in a single StorableTest.cs.
• Added missing StorableClassAttributes.

Location:

trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3

Files:

• StorableClassTest.cs (deleted)
• StorableTest.cs (moved) (moved from trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/StorableConstructorTest.cs) (3 diffs)

trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/StorableTest.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
@@ -32 +32 @@
 namespace HeuristicLab.Tests {
   [TestClass]
-  public class StorableConstructorTest {
+  public class StorableTest {
     [TestMethod]
     [TestCategory("General")]
@@ -51 +51 @@
         else {
           if (storableType.IsSealed && !storableConstructor.IsPrivate)
-            errorMessage.Append(Environment.NewLine + storableType.ToString() + ": Storable constructor must be private in sealed classes.");
+            errorMessage.Append(Environment.NewLine + storableType.Namespace + "." + storableType.GetPrettyName() + ": Storable constructor must be private in sealed classes.");
           else if (!storableType.IsSealed && !(storableConstructor.IsFamily || storableConstructor.IsPublic))
-            errorMessage.Append(Environment.NewLine + storableType.ToString() + ": Storable constructor must be protected (can be public in rare cases).");
+            errorMessage.Append(Environment.NewLine + storableType.Namespace + "." + storableType.GetPrettyName() + ": Storable constructor must be protected (can be public in rare cases).");
+        }
+      }
+      Assert.IsTrue(errorMessage.Length == 0, errorMessage.ToString());
+    }
+
+    [TestMethod]
+    [TestCategory("General")]
+    [TestCategory("Essential")]
+    [TestProperty("Time", "short")]
+    public void TestStorableClass() {
+      var errorMessage = new StringBuilder();
+
+      foreach (var type in ApplicationManager.Manager.GetTypes(typeof(object), onlyInstantiable: false, includeGenericTypeDefinitions: true)
+        .Where(t => t.Namespace != null && !t.Namespace.Contains(".Tests"))
+        .Where(t => !StorableClassAttribute.IsStorableClass(t))) {
+        var members = type.GetMembers(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.DeclaredOnly);
+        var storableConstructor = members.SingleOrDefault(m => Attribute.IsDefined(m, typeof(StorableConstructorAttribute), inherit: false));
+        var storableMembers = members.Where(m => Attribute.IsDefined(m, typeof(StorableAttribute), inherit: false));
+
+        if (storableConstructor != null) {
+          errorMessage.Append(Environment.NewLine + type.Namespace + "." + type.GetPrettyName() + ": Contains a storable constructor but is not a storable class.");
+        } else if (storableMembers.Any()) {
+          errorMessage.Append(Environment.NewLine + type.Namespace + "." + type.GetPrettyName() + ": Contains at least one storable member but is not a storable class.");
         }
       }