]> source.dussan.org Git - archiva.git/commitdiff
[MRM-1327] make sorting more consistent for other implementations
authorBrett Porter <brett@apache.org>
Thu, 18 Mar 2010 14:33:12 +0000 (14:33 +0000)
committerBrett Porter <brett@apache.org>
Thu, 18 Mar 2010 14:33:12 +0000 (14:33 +0000)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@924830 13f79535-47bb-0310-9956-ffa450edef68

archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java

index d2e8a29ec45bff30e264a116bfca3bb3ed7b43e7..606d50bc9e5144f29ec4129dbd79dcff2f73786c 100644 (file)
@@ -34,7 +34,6 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
@@ -348,8 +347,11 @@ public abstract class AbstractMetadataRepositoryTest
         repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact1 );
         repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact2 );
 
-        assertEquals( new HashSet<String>( Arrays.asList( version2, version1 ) ), repository.getArtifactVersions(
-            TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION ) );
+        List<String> versions = new ArrayList<String>( repository.getArtifactVersions( TEST_REPO_ID, TEST_NAMESPACE,
+                                                                                       TEST_PROJECT,
+                                                                                       TEST_PROJECT_VERSION ) );
+        Collections.sort( versions );
+        assertEquals( Arrays.asList( version1, version2 ), versions );
     }
 
     public void testGetArtifactVersionsMultipleArtifactsSingleVersion()
@@ -499,8 +501,10 @@ public abstract class AbstractMetadataRepositoryTest
         artifact2.setProject( newProjectId );
         repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, newProjectId, TEST_PROJECT_VERSION, artifact2 );
 
-        assertEquals( Arrays.asList( artifact2, artifact1 ), repository.getArtifactsByChecksum( TEST_REPO_ID,
-                                                                                                TEST_SHA1 ) );
+        List<ArtifactMetadata> artifacts = new ArrayList<ArtifactMetadata>( repository.getArtifactsByChecksum(
+            TEST_REPO_ID, TEST_SHA1 ) );
+        Collections.sort( artifacts, new ArtifactMetadataComparator() );
+        assertEquals( Arrays.asList( artifact2, artifact1 ), artifacts );
     }
 
     public void testGetArtifactsByChecksumNoResult()