[SHRINKRES-79] Do not consider ordering in value equality of exclusions

shrinkwrap · Oct 31, 2012 · 6198f6f · 6198f6f
1 parent 6d3ccc0
commit 6198f6f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/...src/main/java/org/jboss/shrinkwrap/resolver/api/maven/coordinate/MavenDependencyImpl.java b/...src/main/java/org/jboss/shrinkwrap/resolver/api/maven/coordinate/MavenDependencyImpl.java
@@ -18,7 +18,6 @@
 
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Set;
 
 import org.jboss.shrinkwrap.resolver.api.maven.PackagingType;
@@ -213,16 +212,9 @@ public boolean equals(Object obj) {
                 return false;
             }
             final Set<MavenDependencyExclusion> theirExclusions = other.exclusions;
-            final Iterator<MavenDependencyExclusion> theirIt = other.exclusions.iterator();
-            final Set<MavenDependencyExclusion> ourExclusions = exclusions;
-            if (ourExclusions.size() != theirExclusions.size()) {
+            if(!exclusions.equals(theirExclusions)) {
                 return false;
             }
-            for (final MavenDependencyExclusion exclusion : ourExclusions) {
-                if (!exclusion.equals(theirIt.next())) {
-                    return false;
-                }
-            }
         }
         if (optional != other.optional) {
             return false;

diff --git a/.../java/org/jboss/shrinkwrap/resolver/api/maven/coordinate/MavenDependencyImplTestCase.java b/.../java/org/jboss/shrinkwrap/resolver/api/maven/coordinate/MavenDependencyImplTestCase.java
@@ -53,6 +53,20 @@ public void equalsByValueExclusions() {
         Assert.assertEquals(dependency1, dependency2);
     }
 
+    @Test
+    public void equalsByValueExclusionsUnordered() {
+        final MavenCoordinate coordinate = this.createCoordinate();
+        final ScopeType scope = ScopeType.RUNTIME;
+        final boolean optional = true;
+        final MavenDependencyExclusion exclusion11 = new MavenDependencyExclusionImpl("groupId1", "artifactId1");
+        final MavenDependencyExclusion exclusion12 = new MavenDependencyExclusionImpl("groupId2", "artifactId2");
+        final MavenDependencyExclusion exclusion21 = new MavenDependencyExclusionImpl("groupId1", "artifactId1");
+        final MavenDependencyExclusion exclusion22 = new MavenDependencyExclusionImpl("groupId2", "artifactId2");
+        final MavenDependency dependency1 = new MavenDependencyImpl(coordinate, scope, optional, exclusion11, exclusion12);
+        final MavenDependency dependency2 = new MavenDependencyImpl(coordinate, scope, optional, exclusion22, exclusion21);
+        Assert.assertEquals(dependency1, dependency2);
+    }
+
     @Test
     public void notEqualsByValueExclusions() {
         final MavenCoordinate coordinate = this.createCoordinate();