Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-14 09:25:43 +01:00
Code Issues Packages Projects Releases Activity

Fix plugin load order

Browse Source 
The old algorithm failed, because the tree below lead to the issue, that
the scm-branchwp-plugin was loaded before the scm-review-plugin was
ready.

This commit changes the order in the way, that leafs are loaded last.

+- scm-editor-plugin d
   +- scm-branchwp-plugin a
+- scm-mail-plugin c
   +- scm-review-plugin b
      +- scm-branchwp-plugin a
   +- scm-branchwp-plugin a
This commit is contained in:
Rene Pfeuffer
2020-01-16 08:56:57 +01:00
parent 53403f26e2
commit 2d755aae9a
3 changed files with 83 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
scm-webapp/src/test/java/sonia/scm/plugin/PluginTreeTest.java
View File

@@ -76,7 +76,7 @@ public class PluginTreeTest
false, null, null);
ExplodedSmp smp = createSmp(plugin);
new PluginTree(smp).getRootNodes();
new PluginTree(smp).getLeafLastNodes();
}
/**
@@ -88,7 +88,7 @@ public class PluginTreeTest
@Test(expected = PluginNotInstalledException.class)
public void testPluginNotInstalled() throws IOException
{
new PluginTree(createSmpWithDependency("b", "a")).getRootNodes();
new PluginTree(createSmpWithDependency("b", "a")).getLeafLastNodes();
}
/**
@@ -98,10 +98,10 @@ public class PluginTreeTest
* @throws IOException
*/
@Test
public void testRootNotes() throws IOException
public void testNodes() throws IOException
{
List<ExplodedSmp> smps = createSmps("a", "b", "c");
List<String> nodes = unwrapIds(new PluginTree(smps).getRootNodes());
List<String> nodes = unwrapIds(new PluginTree(smps).getLeafLastNodes());
assertThat(nodes, containsInAnyOrder("a", "b", "c"));
}
@@ -119,7 +119,7 @@ public class PluginTreeTest
null, null);
ExplodedSmp smp = createSmp(plugin);
new PluginTree(smp).getRootNodes();
new PluginTree(smp).getLeafLastNodes();
}
/**
@@ -140,17 +140,31 @@ public class PluginTreeTest
//J+
PluginTree tree = new PluginTree(smps);
List<PluginNode> rootNodes = tree.getRootNodes();
List<PluginNode> nodes = tree.getLeafLastNodes();
assertThat(unwrapIds(rootNodes), containsInAnyOrder("a"));
System.out.println(tree);
PluginNode a = rootNodes.get(0);
assertThat(unwrapIds(nodes), contains("a", "b", "c"));
}
assertThat(unwrapIds(a.getChildren()), containsInAnyOrder("b", "c"));
@Test
public void testComplexDependencies() throws IOException
{
//J-
ExplodedSmp[] smps = new ExplodedSmp[]{
createSmpWithDependency("a", "b", "c", "d"),
createSmpWithDependency("b", "c"),
createSmpWithDependency("c"),
createSmpWithDependency("d")
};
//J+
PluginNode b = a.getChild("b");
PluginTree tree = new PluginTree(smps);
List<PluginNode> nodes = tree.getLeafLastNodes();
assertThat(unwrapIds(b.getChildren()), containsInAnyOrder("c"));
System.out.println(tree);
assertThat(unwrapIds(nodes), contains("d", "c", "b", "a"));
}
@Test
@@ -162,15 +176,11 @@ public class PluginTreeTest
};
PluginTree tree = new PluginTree(smps);
List<PluginNode> rootNodes = tree.getRootNodes();
List<PluginNode> nodes = tree.getLeafLastNodes();
assertThat(unwrapIds(rootNodes), containsInAnyOrder("a"));
System.out.println(tree);
PluginNode a = rootNodes.get(0);
assertThat(unwrapIds(a.getChildren()), containsInAnyOrder("b", "c"));
PluginNode b = a.getChild("b");
assertThat(unwrapIds(b.getChildren()), containsInAnyOrder("c"));
assertThat(unwrapIds(nodes), contains("a", "b", "c"));
}
@Test
@@ -185,15 +195,9 @@ public class PluginTreeTest
System.out.println(tree);
List<PluginNode> rootNodes = tree.getRootNodes();
List<PluginNode> nodes = tree.getLeafLastNodes();
assertThat(unwrapIds(rootNodes), containsInAnyOrder("a"));
PluginNode a = rootNodes.get(0);
assertThat(unwrapIds(a.getChildren()), containsInAnyOrder("b"));
PluginNode b = a.getChild("b");
assertThat(unwrapIds(b.getChildren()), containsInAnyOrder("c"));
assertThat(unwrapIds(nodes), contains("a", "b", "c"));
}
@Test
@@ -203,9 +207,9 @@ public class PluginTreeTest
};
PluginTree tree = new PluginTree(smps);
List<PluginNode> rootNodes = tree.getRootNodes();
List<PluginNode> nodes = tree.getLeafLastNodes();
assertThat(unwrapIds(rootNodes), containsInAnyOrder("a"));
assertThat(unwrapIds(nodes), containsInAnyOrder("a"));
}
/**