From 203660343de0f78c9bc7bd7d4b0fa1f4e1f463a7 Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Thu, 18 Mar 2010 14:33:12 +0000 Subject: [PATCH] [MRM-1327] make sorting more consistent for other implementations git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@924830 13f79535-47bb-0310-9956-ffa450edef68 --- .../repository/AbstractMetadataRepositoryTest.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java b/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java index d2e8a29ec..606d50bc9 100644 --- a/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java +++ b/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java @@ -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( Arrays.asList( version2, version1 ) ), repository.getArtifactVersions( - TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION ) ); + List versions = new ArrayList( 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 artifacts = new ArrayList( repository.getArtifactsByChecksum( + TEST_REPO_ID, TEST_SHA1 ) ); + Collections.sort( artifacts, new ArtifactMetadataComparator() ); + assertEquals( Arrays.asList( artifact2, artifact1 ), artifacts ); } public void testGetArtifactsByChecksumNoResult() -- 2.39.5