mirror of https://github.com/apache/archiva.git
[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
This commit is contained in:
parent
1ba8d3688a
commit
203660343d
|
@ -34,7 +34,6 @@ import java.util.Collections;
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
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, artifact1 );
|
||||||
repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact2 );
|
repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact2 );
|
||||||
|
|
||||||
assertEquals( new HashSet<String>( Arrays.asList( version2, version1 ) ), repository.getArtifactVersions(
|
List<String> versions = new ArrayList<String>( repository.getArtifactVersions( TEST_REPO_ID, TEST_NAMESPACE,
|
||||||
TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION ) );
|
TEST_PROJECT,
|
||||||
|
TEST_PROJECT_VERSION ) );
|
||||||
|
Collections.sort( versions );
|
||||||
|
assertEquals( Arrays.asList( version1, version2 ), versions );
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testGetArtifactVersionsMultipleArtifactsSingleVersion()
|
public void testGetArtifactVersionsMultipleArtifactsSingleVersion()
|
||||||
|
@ -499,8 +501,10 @@ public abstract class AbstractMetadataRepositoryTest
|
||||||
artifact2.setProject( newProjectId );
|
artifact2.setProject( newProjectId );
|
||||||
repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, newProjectId, TEST_PROJECT_VERSION, artifact2 );
|
repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, newProjectId, TEST_PROJECT_VERSION, artifact2 );
|
||||||
|
|
||||||
assertEquals( Arrays.asList( artifact2, artifact1 ), repository.getArtifactsByChecksum( TEST_REPO_ID,
|
List<ArtifactMetadata> artifacts = new ArrayList<ArtifactMetadata>( repository.getArtifactsByChecksum(
|
||||||
TEST_SHA1 ) );
|
TEST_REPO_ID, TEST_SHA1 ) );
|
||||||
|
Collections.sort( artifacts, new ArtifactMetadataComparator() );
|
||||||
|
assertEquals( Arrays.asList( artifact2, artifact1 ), artifacts );
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testGetArtifactsByChecksumNoResult()
|
public void testGetArtifactsByChecksumNoResult()
|
||||||
|
|
Loading…
Reference in New Issue