Changeset 17940

Timestamp:

04/14/21 19:57:29 (4 years ago)

Author:

gkronber

Message:

#3117: changed plugin dependency test case to allow plugin dependencies to the same plugin in different versions.

File:

• trunk/HeuristicLab.Tests/HeuristicLab-3.3/PluginDependenciesTest.cs (modified) (4 diffs)

trunk/HeuristicLab.Tests/HeuristicLab-3.3/PluginDependenciesTest.cs

@@ -34 +34 @@
     private static Dictionary<Assembly, Type> loadedPlugins;
     private static Dictionary<string, string> pluginNames;
+    private static Dictionary<string, Version> pluginVersions;
     private static Dictionary<string, Assembly> pluginFilesToPluginLookup = new Dictionary<string, Assembly>();
 
@@ -47 +48 @@
 
       pluginNames = loadedPlugins.ToDictionary(a => a.Key.GetName().FullName, a => GetPluginName(a.Value));
+      pluginVersions = loadedPlugins.ToDictionary(a => a.Key.GetName().FullName, a => GetPluginVersion(a.Value));
 
       foreach (Assembly pluginAssembly in loadedPlugins.Keys) {
@@ -71 +73 @@
         var referencedAssemblies = pluginAssemblies.SelectMany(a => a.GetReferencedAssemblies()).ToList();
 
-        Dictionary<string, PluginDependencyAttribute> pluginDependencies = Attribute.GetCustomAttributes(plugin, false).OfType<PluginDependencyAttribute>().ToDictionary(a => a.Dependency);
+        var pluginDependencies = Attribute.GetCustomAttributes(plugin, false).OfType<PluginDependencyAttribute>().ToArray();
+
+        bool versionLessThan(Version a, Version b) => a.Major < b.Major || ((a.Major == b.Major) && (a.Minor <= b.Minor));
+
+        bool compatiblePluginAvailable(string referencedAssemblyName) => pluginDependencies.Any(pd => pd.Dependency == pluginNames[referencedAssemblyName] && versionLessThan(pd.Version, pluginVersions[referencedAssemblyName]));
 
         foreach (AssemblyName referencedAssemblyName in referencedAssemblies) {
           if (IsPluginAssemblyName(referencedAssemblyName)) {
-            if (!pluginDependencies.ContainsKey(pluginNames[referencedAssemblyName.FullName]))
-              errorMessage.AppendLine("Missing dependency in plugin " + plugin + " to referenced plugin " + pluginNames[referencedAssemblyName.FullName] + ".");
+            if (!compatiblePluginAvailable(referencedAssemblyName.FullName))
+              errorMessage.AppendLine("Missing dependency in plugin " + plugin + " to referenced plugin " + pluginNames[referencedAssemblyName.FullName] + " in version >= " + pluginVersions[referencedAssemblyName.FullName] + ".");
           } else { //no plugin assembly => test if the assembly is delivered by another plugin
             if (pluginFilesToPluginLookup.ContainsKey(referencedAssemblyName.Name)) {
               string containingPluginFullName = pluginFilesToPluginLookup[referencedAssemblyName.Name].FullName;
-              if (containingPluginFullName != pluginAssembly.FullName && !pluginDependencies.ContainsKey(pluginNames[containingPluginFullName]))
-                errorMessage.AppendLine("Missing dependency in plugin " + plugin + " to plugin " + pluginNames[containingPluginFullName] + " due to a reference to " + referencedAssemblyName.FullName + ".");
+              if (containingPluginFullName != pluginAssembly.FullName && !compatiblePluginAvailable(containingPluginFullName))
+                errorMessage.AppendLine("Missing dependency in plugin " + plugin + " to plugin " + pluginNames[containingPluginFullName] + " in version >= " + pluginVersions[containingPluginFullName] + " due to a reference to " + referencedAssemblyName.FullName + ".");
             }
           }
@@ -136 +142 @@
     }
 
+    private static Version GetPluginVersion(Type plugin) {
+      var version = new Version();
+      PluginAttribute pluginAttribute = (PluginAttribute)Attribute.GetCustomAttribute(plugin, typeof(PluginAttribute));
+      if (pluginAttribute != null) {
+        version = pluginAttribute.Version;
+      }
+      return version;
+    }
+
     private static bool IsPluginAssemblyName(AssemblyName assemblyName) {
       return pluginNames.ContainsKey(assemblyName.FullName);