[MRESOLVER-376] UT for bug

maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegateTestSupport.java

@@ -514,6 +514,23 @@ public void testTransitiveDepsUseRangesDirtyTree() throws DependencyCollectionEx
 
     protected abstract String getTransitiveDepsUseRangesDirtyTreeResource();
 
+    @Test
+    public void testTransitiveDepsUseRangesAndRelocationDirtyTree() throws DependencyCollectionException, IOException {
+        // Note: DF depends on version order (ultimately the order of versions as returned by VersionRangeResolver
+        // that in case of Maven, means order as in maven-metadata.xml
+        // BF on the other hand explicitly sorts versions from range in descending order
+        //
+        // Hence, the "dirty tree" of two will not match.
+        DependencyNode root = parser.parseResource(getTransitiveDepsUseRangesAndRelocationDirtyTreeResource());
+        Dependency dependency = root.getDependency();
+        CollectRequest request = new CollectRequest(dependency, singletonList(repository));
+
+        CollectResult result = collector.collectDependencies(session, request);
+        assertEqualSubtree(root, result.getRoot());
+    }
+
+    protected abstract String getTransitiveDepsUseRangesAndRelocationDirtyTreeResource();
+
     private DependencyNode toDependencyResult(
             final DependencyNode root, final String rootScope, final Boolean optional) {
         // Make the root artifact resultion result a dependency resolution result for the subtree check.

maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollectorTest.java

@@ -68,6 +68,11 @@ protected String getTransitiveDepsUseRangesDirtyTreeResource() {
         return "transitiveDepsUseRangesDirtyTreeResult_BF.txt";
     }
 
+    @Override
+    protected String getTransitiveDepsUseRangesAndRelocationDirtyTreeResource() {
+        return "transitiveDepsUseRangesAndRelocationDirtyTreeResult_BF.txt";
+    }
+
     private Dependency newDep(String coords, String scope, Collection<Exclusion> exclusions) {
         Dependency d = new Dependency(new DefaultArtifact(coords), scope);
         return d.setExclusions(exclusions);

maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/df/DfDependencyCollectorTest.java

@@ -36,4 +36,9 @@ protected void setupCollector() {
     protected String getTransitiveDepsUseRangesDirtyTreeResource() {
         return "transitiveDepsUseRangesDirtyTreeResult_DF.txt";
     }
+
+    @Override
+    protected String getTransitiveDepsUseRangesAndRelocationDirtyTreeResource() {
+        return "transitiveDepsUseRangesAndRelocationDirtyTreeResult_DF.txt";
+    }
 }

maven-resolver-impl/src/test/resources/artifact-descriptions/transitiveDepsUseRangesAndRelocationDirtyTreeResult_BF.txt

@@ -0,0 +1,2 @@
+transitiveDepsUseRangesAndRelocationDirtyTree:aid:ext:1 compile
++- transitiveDepsUseRangesAndRelocationDirtyTree:relocatedcid:ext:3 compile

maven-resolver-impl/src/test/resources/artifact-descriptions/transitiveDepsUseRangesAndRelocationDirtyTreeResult_DF.txt

@@ -0,0 +1,2 @@
+transitiveDepsUseRangesAndRelocationDirtyTree:aid:ext:1 compile
+\- transitiveDepsUseRangesAndRelocationDirtyTree:relocatedcid:ext:1 compile

maven-resolver-impl/src/test/resources/artifact-descriptions/transitiveDepsUseRangesAndRelocationDirtyTree_aid_1.ini

@@ -0,0 +1,2 @@
+[dependencies]
+transitiveDepsUseRangesAndRelocationDirtyTree:cid:ext:[1,3]

maven-resolver-impl/src/test/resources/artifact-descriptions/transitiveDepsUseRangesAndRelocationDirtyTree_cid_1.ini

@@ -0,0 +1,4 @@
+[relocation]
+transitiveDepsUseRangesAndRelocationDirtyTree:relocatedcid:ext:1
+
+[dependencies]

maven-resolver-impl/src/test/resources/artifact-descriptions/transitiveDepsUseRangesAndRelocationDirtyTree_cid_2.ini

@@ -0,0 +1,4 @@
+[relocation]
+transitiveDepsUseRangesAndRelocationDirtyTree:relocatedcid:ext:2
+
+[dependencies]

maven-resolver-impl/src/test/resources/artifact-descriptions/transitiveDepsUseRangesAndRelocationDirtyTree_cid_3.ini

@@ -0,0 +1,4 @@
+[relocation]
+transitiveDepsUseRangesAndRelocationDirtyTree:relocatedcid:ext:3
+
+[dependencies]

maven-resolver-impl/src/test/resources/artifact-descriptions/transitiveDepsUseRangesAndRelocationDirtyTree_relocatedcid_1.ini

@@ -0,0 +1 @@
+[dependencies]

maven-resolver-impl/src/test/resources/artifact-descriptions/transitiveDepsUseRangesAndRelocationDirtyTree_relocatedcid_2.ini

@@ -0,0 +1 @@
+[dependencies]

maven-resolver-impl/src/test/resources/artifact-descriptions/transitiveDepsUseRangesAndRelocationDirtyTree_relocatedcid_3.ini

@@ -0,0 +1 @@
+[dependencies]

maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReader.java

@@ -100,6 +100,7 @@ public ArtifactDescriptorResult readArtifactDescriptor(
                 ArtifactDescription data = reader.parse(resourceName);
                 if (data.getRelocation() != null) {
                     result.addRelocation(artifact);
+                    result.setArtifact(data.getRelocation());
                     artifact = data.getRelocation();
                 } else {
                     result.setArtifact(artifact);