Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix unit tests 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1349786 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-06-13 12:15:50 +00:00
parent b0db797847
commit 0db6c1faa2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/ArtifactDownloadInfoBuilder.java
View File

@ -62,7 +62,7 @@ public class ArtifactDownloadInfoBuilder
public Artifact build()
{
ArtifactReference ref = new ArtifactReference();
ref.setArtifactId( artifactMetadata.getProject() );
ref.setArtifactId( artifactMetadata.getId() );
ref.setGroupId( artifactMetadata.getNamespace() );
ref.setVersion( artifactMetadata.getVersion() );
@ -82,6 +82,7 @@ public class ArtifactDownloadInfoBuilder
String extension = FilenameUtils.getExtension( file.getName() );
Artifact artifact = new Artifact( ref.getGroupId(), ref.getArtifactId(), ref.getVersion() );
artifact.setRepositoryId( artifactMetadata.getRepositoryId() );
artifact.setClassifier( classifier );
artifact.setPackaging( type );
artifact.setFileExtension( extension );

3
archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/ShowArtifactActionTest.java
View File

@ -567,7 +567,8 @@ public class ShowArtifactActionTest
Artifact actual = list.get( 0 );
assertEquals( artifact.getNamespace(), actual.getGroupId() );
assertEquals( artifact.getId(), actual.getArtifactId() );
assertEquals( artifact.getProject(), actual.getGroupId() );
// olamy test has no more sense as we reuse an other object now
//assertEquals( artifact.getProject(), actual.getGroupId() );
assertEquals( artifact.getRepositoryId(), actual.getRepositoryId() );
assertEquals( artifact.getVersion(), actual.getVersion() );
assertEquals( TEST_TYPE, actual.getPackaging() );