You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2010/01/14 02:03:03 UTC

svn commit: r899014 - /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java

Author: brett
Date: Thu Jan 14 01:03:02 2010
New Revision: 899014

URL: http://svn.apache.org/viewvc?rev=899014&view=rev
Log:
merge prep step into test

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java?rev=899014&r1=899013&r2=899014&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java Thu Jan 14 01:03:02 2010
@@ -93,12 +93,13 @@
 	@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 @@
 		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'" );
 	}