From 98c9137dab5b4f86790cd51b1c7469dc7f5f1347 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 29 Feb 2012 22:17:57 +0000 Subject: [PATCH] rename file to be more generic git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1295317 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/test/resources/testng.properties | 143 ------------------ .../web/test/parent/AbstractSeleniumTest.java | 4 +- 2 files changed, 2 insertions(+), 145 deletions(-) delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test-js/src/test/resources/testng.properties diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/resources/testng.properties b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/resources/testng.properties deleted file mode 100644 index 1913b032f..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/resources/testng.properties +++ /dev/null @@ -1,143 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -# properties for integration tests - -ADMIN_USERNAME=admin -ADMIN_FULLNAME=Administrator -ADMIN_EMAIL=admin@localhost.fr -ADMIN_PASSWORD=admin1 - -SELENIUM_HOST=localhost -SELENIUM_PORT=4444 -SELENIUM_BROWSER=*firefox - -# Search, Artifact Management -SEARCH_BAD_ARTIFACT=asdf -# Existing Artifact -ARTIFACT_GROUPID=test -ARTIFACT_ARTIFACTID=test -ARTIFACT_VERSION=1.0 -ARTIFACT_PACKAGING=jar -ARTIFACT_CLASSNAME=test.App - -# Artifact for testing add artifact with valid values -VALIDARTIFACT_GROUPID=addArtifactValidValues -VALIDARTIFACT_ARTIFACTID=addArtifactValidValues-artifact - -# Artifact for upload action in audit log report - MRM-1304 -AUDITLOGARTIFACT_GROUPID=group.auditLogUpload -AUDITLOGARTIFACT_ARTIFACTID=auditLogUpload-artifact -AUDITLOG_EXPECTED_ARTIFACT=group/auditLogUpload/auditLogUpload-artifact/1.0/auditLogUpload-artifact-1.0.jar - -# Reports -REPOSITORY_NAME=internal -START_DATE=05/01/2009 -END_DATE=05/30/2009 - -# User Management -# For password and new password -USERROLE_EMAIL=admin@localhost.fr -USERROLE_PASSWORD=password1 -NEW_USERROLE_PASSWORD=password123 - -# Guest Role -GUEST_USERNAME=guest_user -GUEST_FULLNAME=The Test Guest -# Registered User Role -REGISTERED_USERNAME=reg_user -REGISTERED_FULLNAME=Registered User -# System Administrator -SYSAD_USERNAME=sys_admin -SYSAD_FULLNAME=System Administrator -# User Administrator -USERADMIN_USERNAME=user_admin -USERADMIN_FULLNAME=User Administrator -# Global Repository Manager -GLOBALREPOMANAGER_USERNAME=globalrepo_manager -GLOBALREPOMANAGER_FULLNAME=Global Repository Manager -# Global Repository Observer -GLOBALREPOOBSERVER_USERNAME=globalrepo_observer -GLOBALREPOOBSERVER_FULLNAME=Global Repository Observer -# Repository Manager - internal -REPOMANAGER_INTERNAL_USERNAME=repomanager_internal -REPOMANAGER_INTERNAL_FULLNAME=Repository Manager - internal -# Repository Manager - snapshots -REPOMANAGER_SNAPSHOTS_USERNAME=repomanager_snapshots -REPOMANAGER_SNAPSHOTS_FULLNAME=Repository Manager - snapshots -# Repository Observer - internal -REPOOBSERVER_INTERNAL_USERNAME=repoobserver_internal -REPOOBSERVER_INTERNAL_FULLNAME=Repository Observer - internal -# Repository Observer - snapshots -REPOOBSERVER_SNAPSHOTS_USERNAME=repoobserver_snapshots -REPOOBSERVER_SNAPSHOTS_FULLNAME=Repository Observer - snapshots - -# Add Artifact -GROUPID=test -ARTIFACTID=test -VERSION=1.0 -PACKAGING=jar -ARTIFACTFILEPATH=test -REPOSITORYID=internal - -GROUPID1=delete -ARTIFACTID1=delete -VERSION1=1.0 -PACKAGING1=jar -ARTIFACTFILEPATH1=test -REPOSITORYID1=internal - -GROUPID_DOTNETARTIFACT=dotNetTypes -ARTIFACTID_DOTNETARTIFACT=dotNetTypes -PACKAGING_DOTNETARTIFACT=library - -SNAPSHOT_GROUPID=org.apache.archiva -SNAPSHOT_ARTIFACTID=archiva-test -SNAPSHOT_VERSION=1.0-SNAPSHOT -SNAPSHOT_PACKAGING=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 - -ADD_REMOVE_GROUPID=artifact.dummy -ADD_REMOVE_ARTIFACTID=artifact-dummy - -# REPOSITORIES -# Manage Repositories -MANAGED_IDENTIFIER=testing1 -MANAGED_NAME=Testing Managed Repository -MANAGED_DIRECTORY= -MANAGED_INDEX_DIRECTORY= -MANAGED_TYPE= -MANAGED_CRON= -MANAGED_REPOPURGE_DAYSOLDERTHAN= -MANAGED_REPOPURGE_RETENTIONCOUNT= - -# Network Proxies -NETWORKPROXY_IDENTIFIER=networkproxytest -NETWORKPROXY_PROTOCOL=http -NETWORKPROXY_HOSTNAME= -NETWORKPROXY_PORT=8080 -NETWORKPROXY_USERNAME=admin -NETWORKPROXY_PASSWORD=admin123 - -# Browse - MRM-1278 test -SNAPSHOTS_REPOSITORY=snapshots -RELEASES_REPOSITORY=releases - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java index c0d7e409e..a394b5923 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java @@ -56,7 +56,7 @@ public abstract class AbstractSeleniumTest throws Exception { p = new Properties(); - p.load( this.getClass().getClassLoader().getResourceAsStream( "testng.properties" ) ); + p.load( this.getClass().getClassLoader().getResourceAsStream( "test.properties" ) ); } /** @@ -99,7 +99,7 @@ public abstract class AbstractSeleniumTest protected String getEscapeProperty( String key ) { - InputStream input = this.getClass().getClassLoader().getResourceAsStream( "testng.properties" ); + InputStream input = this.getClass().getClassLoader().getResourceAsStream( "test.properties" ); String value = null; List lines; try -- 2.39.5