From d72a860d416f6f6a389f3deb3399347fb6310cae Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Thu, 14 Jan 2010 01:03:02 +0000 Subject: [PATCH] merge prep step into test git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@899014 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva/web/test/ArtifactManagementTest.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java index ca03471de..3558e1500 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java @@ -93,12 +93,13 @@ public class ArtifactManagementTest @Test(dependsOnMethods = { "testAddArtifactValidValues" } ) public void testAddArtifactBlockRedeployments() { - addArtifact( getGroupId() , getArtifactId(), getVersion(), getPackaging() , getArtifactFilePath(), getRepositoryId() ); - assertTextPresent( "Overwriting released artifacts in repository '" + getRepositoryId() + "' is not allowed." ); + addArtifact( getGroupId() , getArtifactId(), getVersion(), getPackaging() , getArtifactFilePath(), getRepositoryId() ); + assertTextPresent( "Overwriting released artifacts in repository '" + getRepositoryId() + "' is not allowed." ); } - public void testAddArtifactValidValues1() + public void testDeleteArtifact() { + //prep String groupId = getProperty( "GROUPID1" ); String artifactId = getProperty( "ARTIFACTID1" ); String version = getProperty( "VERSION1" ); @@ -106,11 +107,7 @@ public class ArtifactManagementTest String repositoryId = getProperty( "REPOSITORYID1" ); addArtifact( groupId , artifactId, version, packaging , getArtifactFilePath(), repositoryId ); assertTextPresent( "Artifact 'delete:delete:1.0' was successfully deployed to repository 'internal'" ); - } - - @Test(dependsOnMethods = { "testAddArtifactValidValues1" } ) - public void testDeleteArtifact() - { + deleteArtifact( "delete", "delete", "1.0", "internal"); assertTextPresent( "Artifact 'delete:delete:1.0' was successfully deleted from repository 'internal'" ); } -- 2.39.5