merge prep step into test

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@899014 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2010-01-14 01:03:02 +00:00
parent e81d9aebc9
commit d72a860d41
1 changed files with 5 additions and 8 deletions

View File

@ -93,12 +93,13 @@ public class ArtifactManagementTest
@Test(dependsOnMethods = { "testAddArtifactValidValues" } ) @Test(dependsOnMethods = { "testAddArtifactValidValues" } )
public void testAddArtifactBlockRedeployments() public void testAddArtifactBlockRedeployments()
{ {
addArtifact( getGroupId() , getArtifactId(), getVersion(), getPackaging() , getArtifactFilePath(), getRepositoryId() ); addArtifact( getGroupId() , getArtifactId(), getVersion(), getPackaging() , getArtifactFilePath(), getRepositoryId() );
assertTextPresent( "Overwriting released artifacts in repository '" + getRepositoryId() + "' is not allowed." ); assertTextPresent( "Overwriting released artifacts in repository '" + getRepositoryId() + "' is not allowed." );
} }
public void testAddArtifactValidValues1() public void testDeleteArtifact()
{ {
//prep
String groupId = getProperty( "GROUPID1" ); String groupId = getProperty( "GROUPID1" );
String artifactId = getProperty( "ARTIFACTID1" ); String artifactId = getProperty( "ARTIFACTID1" );
String version = getProperty( "VERSION1" ); String version = getProperty( "VERSION1" );
@ -106,11 +107,7 @@ public class ArtifactManagementTest
String repositoryId = getProperty( "REPOSITORYID1" ); String repositoryId = getProperty( "REPOSITORYID1" );
addArtifact( groupId , artifactId, version, packaging , getArtifactFilePath(), repositoryId ); addArtifact( groupId , artifactId, version, packaging , getArtifactFilePath(), repositoryId );
assertTextPresent( "Artifact 'delete:delete:1.0' was successfully deployed to repository 'internal'" ); assertTextPresent( "Artifact 'delete:delete:1.0' was successfully deployed to repository 'internal'" );
}
@Test(dependsOnMethods = { "testAddArtifactValidValues1" } )
public void testDeleteArtifact()
{
deleteArtifact( "delete", "delete", "1.0", "internal"); deleteArtifact( "delete", "delete", "1.0", "internal");
assertTextPresent( "Artifact 'delete:delete:1.0' was successfully deleted from repository 'internal'" ); assertTextPresent( "Artifact 'delete:delete:1.0' was successfully deleted from repository 'internal'" );
} }