mirror of https://github.com/apache/archiva.git
fix junit
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1344324 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
bbadcdcf91
commit
fb7b1842b3
|
@ -19,8 +19,8 @@ package org.apache.archiva.rest.services;
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import org.apache.archiva.metadata.model.ProjectVersionMetadata;
|
import org.apache.archiva.metadata.model.ProjectVersionMetadata;
|
||||||
|
import org.apache.archiva.rest.api.model.Artifact;
|
||||||
import org.apache.archiva.rest.api.model.ArtifactContentEntry;
|
import org.apache.archiva.rest.api.model.ArtifactContentEntry;
|
||||||
import org.apache.archiva.rest.api.model.ArtifactDownloadInfo;
|
|
||||||
import org.apache.archiva.rest.api.model.BrowseResult;
|
import org.apache.archiva.rest.api.model.BrowseResult;
|
||||||
import org.apache.archiva.rest.api.model.BrowseResultEntry;
|
import org.apache.archiva.rest.api.model.BrowseResultEntry;
|
||||||
import org.apache.archiva.rest.api.model.Entry;
|
import org.apache.archiva.rest.api.model.Entry;
|
||||||
|
@ -346,7 +346,7 @@ public class BrowseServiceTest
|
||||||
|
|
||||||
BrowseService browseService = getBrowseService( authorizationHeader, true );
|
BrowseService browseService = getBrowseService( authorizationHeader, true );
|
||||||
|
|
||||||
List<ArtifactDownloadInfo> artifactDownloadInfos =
|
List<Artifact> artifactDownloadInfos =
|
||||||
browseService.getArtifactDownloadInfos( "commons-logging", "commons-logging", "1.1", testRepoId );
|
browseService.getArtifactDownloadInfos( "commons-logging", "commons-logging", "1.1", testRepoId );
|
||||||
|
|
||||||
log.info( "artifactDownloadInfos {}", artifactDownloadInfos );
|
log.info( "artifactDownloadInfos {}", artifactDownloadInfos );
|
||||||
|
|
|
@ -83,10 +83,11 @@ public class RepositoriesServiceTest
|
||||||
artifact.setArtifactId( "commons-logging" );
|
artifact.setArtifactId( "commons-logging" );
|
||||||
artifact.setVersion( "1.0.1" );
|
artifact.setVersion( "1.0.1" );
|
||||||
artifact.setPackaging( "jar" );
|
artifact.setPackaging( "jar" );
|
||||||
|
artifact.setContext( SOURCE_REPO_ID );
|
||||||
|
|
||||||
RepositoriesService repositoriesService = getRepositoriesService( null );
|
RepositoriesService repositoriesService = getRepositoriesService( null );
|
||||||
|
|
||||||
repositoriesService.deleteArtifact( artifact, SOURCE_REPO_ID );
|
repositoriesService.deleteArtifact( artifact );
|
||||||
}
|
}
|
||||||
catch ( ServerWebApplicationException e )
|
catch ( ServerWebApplicationException e )
|
||||||
{
|
{
|
||||||
|
@ -111,7 +112,7 @@ public class RepositoriesServiceTest
|
||||||
artifact.setVersion( "1.0.1" );
|
artifact.setVersion( "1.0.1" );
|
||||||
artifact.setPackaging( "jar" );
|
artifact.setPackaging( "jar" );
|
||||||
|
|
||||||
repositoriesService.deleteArtifact( artifact, null );
|
repositoriesService.deleteArtifact( artifact );
|
||||||
}
|
}
|
||||||
catch ( ServerWebApplicationException e )
|
catch ( ServerWebApplicationException e )
|
||||||
{
|
{
|
||||||
|
@ -138,10 +139,11 @@ public class RepositoriesServiceTest
|
||||||
artifact.setArtifactId( "commons-logging" );
|
artifact.setArtifactId( "commons-logging" );
|
||||||
artifact.setVersion( "1.0.1" );
|
artifact.setVersion( "1.0.1" );
|
||||||
artifact.setPackaging( "jar" );
|
artifact.setPackaging( "jar" );
|
||||||
|
artifact.setContext( SOURCE_REPO_ID );
|
||||||
|
|
||||||
RepositoriesService repositoriesService = getRepositoriesService( authorizationHeader );
|
RepositoriesService repositoriesService = getRepositoriesService( authorizationHeader );
|
||||||
|
|
||||||
repositoriesService.deleteArtifact( artifact, SOURCE_REPO_ID );
|
repositoriesService.deleteArtifact( artifact );
|
||||||
|
|
||||||
assertFalse( "artifact not deleted exists:" + artifactFile.getPath(), artifactFile.exists() );
|
assertFalse( "artifact not deleted exists:" + artifactFile.getPath(), artifactFile.exists() );
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue