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

svn commit: r929005 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test: resources/ testng/org/apache/archiva/web/test/ testng/org/apache/archiva/web/test/parent/

Author: mbaclay
Date: Tue Mar 30 06:16:30 2010
New Revision: 929005

URL: http://svn.apache.org/viewvc?rev=929005&view=rev
Log:
[MRM-1276] Selenium tests need a clean up
- removed it.properties in src/test/resources
- updated the path in property file and some classes for the changes made in r.928992


Removed:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/it.properties
Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties?rev=929005&r1=929004&r2=929005&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties Tue Mar 30 06:16:30 2010
@@ -93,7 +93,7 @@ SNAPSHOT_GROUPID=org.apache.archiva
 SNAPSHOT_ARTIFACTID=archiva-test
 SNAPSHOT_VERSION=1.0-SNAPSHOT
 SNAPSHOT_PACKAGING=jar
-SNAPSHOT_ARTIFACTFILEPATH=src/test/it-resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar
+SNAPSHOT_ARTIFACTFILEPATH=src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar
 SNAPSHOT_REPOSITORYID=snapshots
 
 # REPOSITORIES

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java?rev=929005&r1=929004&r2=929005&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java Tue Mar 30 06:16:30 2010
@@ -60,7 +60,7 @@ public class BrowseTest 
         
         String snapshotsRepo = getProperty( "SNAPSHOTS_REPOSITORY" );
 
-        String path = "src/test/it-resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar";
+        String path = "src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar";
         // TODO: do this differently as uploading doesn't work on browsers other than *chrome (below as well)
         // upload a snapshot artifact to repository 'releases'        
         addArtifact( "archiva", "archiva-webapp", "1.0-SNAPSHOT", "jar", path, releasesRepo );

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java?rev=929005&r1=929004&r2=929005&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java Tue Mar 30 06:16:30 2010
@@ -30,7 +30,7 @@ public abstract class AbstractArtifactMa
 	
 	public String getArtifactFilePath()
 	{
-		return "src/test/it-resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar";
+		return "src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar";
 	}
 	
 	public String getRepositoryId()