- Timestamp:
- 01/28/19 17:39:41 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/HeuristicLab.Tests/HeuristicLab-3.3/StorableTest.cs
r16565 r16571 42 42 43 43 foreach (Type storableType in ApplicationManager.Manager.GetTypes(typeof(object)) 44 .Where(Storable ClassAttribute.IsStorableClass)) {44 .Where(StorableTypeAttribute.IsStorableType)) { 45 45 //test only types contained in HL plugin assemblies 46 if (!storableType.Namespace.StartsWith("HeuristicLab")) continue; 46 47 if (storableType.Namespace.Contains(".Tests")) continue; 47 48 if (!PluginLoader.Assemblies.Contains(storableType.Assembly)) continue; 48 49 50 if (storableType.IsEnum || storableType.IsInterface) continue; 51 var storableFields = storableType 52 .GetFields(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public) 53 .Where(fi => StorableAttribute.IsStorable(fi)); 54 var storableProps = storableType 55 .GetProperties(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public) 56 .Where(fi => StorableAttribute.IsStorable(fi)); 57 58 // a storable constructor should be given but is not absolutely required. 59 // when there are no storable fields then a storable ctor has no real purpose. 60 if (!storableFields.Any() && !storableProps.Any()) continue; 61 49 62 IEnumerable<ConstructorInfo> ctors = storableType.GetConstructors(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public); 50 ConstructorInfo storableConstructor = ctors.Where(c => c.GetParameters().Count() == 1 && c.GetParameters().First().ParameterType == typeof( bool)).FirstOrDefault();63 ConstructorInfo storableConstructor = ctors.Where(c => c.GetParameters().Count() == 1 && c.GetParameters().First().ParameterType == typeof(HEAL.Attic.StorableConstructorFlag)).FirstOrDefault(); 51 64 if (storableConstructor == null) errorMessage.Append(Environment.NewLine + storableType.ToString() + ": No storable constructor is defined."); 52 65 else { … … 69 82 foreach (var type in ApplicationManager.Manager.GetTypes(typeof(object), onlyInstantiable: false, includeGenericTypeDefinitions: true) 70 83 .Where(t => t.Namespace != null && !t.Namespace.Contains(".Tests")) 71 .Where(t => !Storable ClassAttribute.IsStorableClass(t))) {84 .Where(t => !StorableTypeAttribute.IsStorableType(t))) { 72 85 var members = type.GetMembers(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.DeclaredOnly); 73 86 var storableConstructor = members.SingleOrDefault(m => Attribute.IsDefined(m, typeof(StorableConstructorAttribute), inherit: false)); … … 75 88 76 89 if (storableConstructor != null) { 77 errorMessage.Append(Environment.NewLine + type.Namespace + "." + type.GetPrettyName() + ": Contains a storable constructor but is not a storable class.");90 errorMessage.Append(Environment.NewLine + type.Namespace + "." + type.GetPrettyName() + ": Contains a storable constructor but is not a storable type."); 78 91 } else if (storableMembers.Any()) { 79 errorMessage.Append(Environment.NewLine + type.Namespace + "." + type.GetPrettyName() + ": Contains at least one storable member but is not a storable class.");92 errorMessage.Append(Environment.NewLine + type.Namespace + "." + type.GetPrettyName() + ": Contains at least one storable member but is not a storable type."); 80 93 } 81 94 }
Note: See TracChangeset
for help on using the changeset viewer.