belingueres commented on code in PR #281:
URL: https://github.com/apache/maven/pull/281#discussion_r3942371703
##########
impl/maven-core/src/test/java/org/apache/maven/RepositoryUtilsTest.java:
##########
@@ -32,4 +44,113 @@ void
testToArtifactMethodsReturnNullWhenInputParameterIsNull() {
assertNull(RepositoryUtils.toArtifact((Artifact) null));
assertNull(RepositoryUtils.toArtifact((org.apache.maven.artifact.Artifact)
null));
}
+
+ @ParameterizedTest
+ @EnumSource(
+ value = RepositoryUtils.ArtifactOrdering.class,
+ names = {"BFS", "BFS2"})
+ public void
testToArtifactsCollectionOrderedByNodeDepth(RepositoryUtils.ArtifactOrdering
ordering) {
+ RepositoryUtils.setArtifactOrdering(ordering);
+
+ List<org.apache.maven.artifact.Artifact> artifacts = new ArrayList<>();
+
+ DependencyNode root = createDependencyTree();
+
+ List<String> trail = new ArrayList<>();
+ DependencyFilter filter = null;
+
+ RepositoryUtils.toArtifacts(artifacts, root.getChildren(), trail,
filter);
+
+ String expected =
+ "[gid:zlevel1:jar:1:, gid:ylevel1:jar:1:, gid:xlevel1:jar:1:,
gid:alevel2:jar:1:, gid:blevel2:jar:1:, gid:clevel2:jar:1:,
gid:alevel3:jar:1:]";
+ assertEquals(expected, artifacts.toString());
+
+ String[][] expectedTrails = {
+ {"gid:zlevel1:jar:1"},
+ {"gid:ylevel1:jar:1"},
+ {"gid:xlevel1:jar:1"},
+ {"gid:zlevel1:jar:1", "gid:alevel2:jar:1"},
+ {"gid:ylevel1:jar:1", "gid:blevel2:jar:1"},
+ {"gid:xlevel1:jar:1", "gid:clevel2:jar:1"},
+ {"gid:ylevel1:jar:1", "gid:blevel2:jar:1", "gid:alevel3:jar:1"}
+ };
+
+ assertDependencyTrails(artifacts, expectedTrails);
+ }
+
+ @ParameterizedTest
+ @EnumSource(
+ value = RepositoryUtils.ArtifactOrdering.class,
+ names = {"BFS", "BFS2"})
+ public void
testToArtifactsCollectionOrderedByNodeDepthWithFilter(RepositoryUtils.ArtifactOrdering
ordering) {
+ RepositoryUtils.setArtifactOrdering(ordering);
+
+ List<org.apache.maven.artifact.Artifact> artifacts = new ArrayList<>();
+
+ DependencyNode root = createDependencyTree();
+
+ List<String> trail = new ArrayList<>();
+ DependencyFilter filter = new DependencyFilter() {
+ @Override
+ public boolean accept(DependencyNode node, List<DependencyNode>
parents) {
+ // accept node if artifactId does NOT contain "level2"
+ return !node.getArtifact().getArtifactId().contains("level2");
+ }
+ };
+
+ RepositoryUtils.toArtifacts(artifacts, root.getChildren(), trail,
filter);
+
+ String expected = "[gid:zlevel1:jar:1:, gid:ylevel1:jar:1:,
gid:xlevel1:jar:1:, gid:alevel3:jar:1:]";
+ assertEquals(expected, artifacts.toString());
+
+ String[][] expectedTrails = {
+ {"gid:zlevel1:jar:1"},
+ {"gid:ylevel1:jar:1"},
+ {"gid:xlevel1:jar:1"},
+ {"gid:ylevel1:jar:1", "gid:blevel2:jar:1", "gid:alevel3:jar:1"}
+ };
+
+ assertDependencyTrails(artifacts, expectedTrails);
+ }
+
+ private void assertDependencyTrails(List<Artifact> artifacts, String[][]
expectedTrails) {
+ assertEquals(
+ expectedTrails.length,
+ artifacts.size(),
+ "Expected " + expectedTrails.length + " artifacts but got " +
artifacts.size());
+
+ for (int i = 0; i < artifacts.size(); i++) {
+ Artifact artifact = artifacts.get(i);
+ assertIterableEquals(
+ List.of(expectedTrails[i]),
+ artifact.getDependencyTrail(),
+ "Wrong dependency trail for artifact at index " + i + " ("
+ artifact.getId() + ")");
+ }
+ }
+
+ /**
+ * Create a dependency tree.
+ *
+ * @return the root node or the tree.
+ */
+ private DependencyNode createDependencyTree() {
+ DependencyGraphParser parser = new DependencyGraphParser();
+ String dependencyGraph = """
+ gid:root:1
+ +- gid:zlevel1:1
+ | \\- gid:alevel2:1
+ \\- gid:ylevel1:1
+ | \\- gid:blevel2:1
+ | \\- gid:alevel3:1
+ \\- gid:xlevel1:1
+ \\- gid:clevel2:1
+ """;
+
+ try {
+ return parser.parseLiteral(dependencyGraph);
+ } catch (IOException e) {
+ fail("Failed the parsing of the dependency node graph");
Review Comment:
fixed
##########
impl/maven-core/src/test/java/org/apache/maven/RepositoryUtilsTest.java:
##########
@@ -18,11 +18,23 @@
*/
package org.apache.maven;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.eclipse.aether.graph.Dependency;
+import org.eclipse.aether.graph.DependencyFilter;
+import org.eclipse.aether.graph.DependencyNode;
+import org.eclipse.aether.internal.test.util.DependencyGraphParser;
Review Comment:
fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
