From b60226f360a4e332e8b1be6fa72a6d85279d9a24 Mon Sep 17 00:00:00 2001 From: "Marecor M. Baclay" Date: Tue, 30 Mar 2010 06:16:30 +0000 Subject: [PATCH] [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 git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@929005 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/test/resources/it.properties | 13 ------------- .../src/test/resources/testng.properties | 2 +- .../org/apache/archiva/web/test/BrowseTest.java | 2 +- .../test/parent/AbstractArtifactManagementTest.java | 2 +- 4 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/it.properties diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/it.properties b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/it.properties deleted file mode 100644 index a42183055..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/it.properties +++ /dev/null @@ -1,13 +0,0 @@ -#properties for integration tests - -BASE_URL=http://localhost:9696/archiva -MAX_WAIT_TIME_IN_MS=60000 - -ADMIN_USERNAME=admin -ADMIN_FULLNAME=Administrator -ADMIN_EMAIL=admin@localhost -ADMIN_PASSWORD=admin123 - -SELENIUM_HOST=localhost -SELENIUM_PORT=4444 -SELENIUM_BROWSER=*firefox diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties index b7b268e19..1230adab3 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties @@ -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 diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java index a82a8f584..1e7334383 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java @@ -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 ); diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java index 04f5242a7..2919b4441 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java @@ -30,7 +30,7 @@ public abstract class AbstractArtifactManagementTest 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() -- 2.39.5