From commits-return-5476-apmail-continuum-commits-archive=continuum.apache.org@continuum.apache.org Mon Jun 15 17:57:12 2009 Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 70904 invoked from network); 15 Jun 2009 17:57:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 15 Jun 2009 17:57:12 -0000 Received: (qmail 42957 invoked by uid 500); 15 Jun 2009 17:57:24 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 42903 invoked by uid 500); 15 Jun 2009 17:57:24 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 42893 invoked by uid 99); 15 Jun 2009 17:57:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Jun 2009 17:57:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Jun 2009 17:57:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 92E5D23888D0; Mon, 15 Jun 2009 17:56:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r784889 [1/3] - in /continuum/trunk/continuum-webapp-test: ./ src/test/resources/ src/test/testng/org/apache/continuum/web/test/ src/test/testng/org/apache/continuum/web/test/parent/ Date: Mon, 15 Jun 2009 17:56:53 -0000 To: commits@continuum.apache.org From: jmorales@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090615175654.92E5D23888D0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jmorales Date: Mon Jun 15 17:56:52 2009 New Revision: 784889 URL: http://svn.apache.org/viewvc?rev=784889&view=rev Log: [CONTINUUM-2267] . Error with backslash in Windows path for inatallation tests- - For intallations tools test I get escape properties. This methods read properties and get property with escape backslash. - I replace protected Poperties for protected method getProperty(String key) and getEscapeProperty(String key) - I add formater to some files. Replace tabs for spaces and aply Maven codestyle. Modified: continuum/trunk/continuum-webapp-test/pom.xml continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AboutTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AntProjectTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTemplateTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildEnvironmentTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/LocalRepositoriesTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/LoginTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MyAccountTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/NotifierTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/PurgeTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ScheduleTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ShellProjectTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/UserRolesManagementTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractSeleniumTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractUserRolesManagementTest.java Modified: continuum/trunk/continuum-webapp-test/pom.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/pom.xml?rev=784889&r1=784888&r2=784889&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/pom.xml (original) +++ continuum/trunk/continuum-webapp-test/pom.xml Mon Jun 15 17:56:52 2009 @@ -133,6 +133,12 @@ test jdk15 + + + commons-io + commons-io + 1.4 + Modified: continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties?rev=784889&r1=784888&r2=784889&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties (original) +++ continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties Mon Jun 15 17:56:52 2009 @@ -15,166 +15,166 @@ SELENIUM_HOST=localhost SELENIUM_PORT=4444 -DEFAULT_PROJ_GRP_NAME =Default Project Group -DEFAULT_PROJ_GRP_ID =default -DEFAULT_PROJ_GRP_DESCRIPTION =Contains all projects that do not have a group of their own +DEFAULT_PROJ_GRP_NAME=Default Project Group +DEFAULT_PROJ_GRP_ID=default +DEFAULT_PROJ_GRP_DESCRIPTION=Contains all projects that do not have a group of their own ######################## # mavenTwoProject group ######################## # Properties for testAddMavenTwoProject -M2_POM_URL =https://svn.apache.org/repos/asf/continuum/sandbox/continuum-build-queue-test-data/pom.xml +M2_POM_URL=https://svn.apache.org/repos/asf/continuum/sandbox/continuum-build-queue-test-data/pom.xml M2_PROJ_GRP_NAME=ContinuumBuildQueueTestData M2_PROJ_GRP_ID=org.apache.continuum M2_PROJ_GRP_DESCRIPTION=Project for testing continuum build queue -M2_POM_USERNAME = -M2_POM_PASSWORD = +M2_POM_USERNAME= +M2_POM_PASSWORD= # SCM element is missing from pom -NOT_SCM_POM_URL =http://svn.apache.org/repos/asf/continuum/trunk/continuum-webapp-test/src/test/resources/unit/maven-two-projects/missing-scm-element-pom.xml -MISS_CONECT_POM_URL =http://svn.apache.org/repos/asf/continuum/trunk/continuum-webapp-test/src/test/resources/unit/maven-two-projects/missing-connection-element-pom.xml -MISS_PARENT_POM_URL =http://svn.apache.org/repos/asf/continuum/trunk/continuum-webapp-test/src/test/resources/unit/maven-two-projects/missing-parent-pom.xml -MISS_SUBPRO_POM_URL =http://svn.apache.org/repos/asf/continuum/trunk/continuum-webapp-test/src/test/resources/unit/maven-two-projects/missing-modules-pom.xml +NOT_SCM_POM_URL=http://svn.apache.org/repos/asf/continuum/trunk/continuum-webapp-test/src/test/resources/unit/maven-two-projects/missing-scm-element-pom.xml +MISS_CONECT_POM_URL=http://svn.apache.org/repos/asf/continuum/trunk/continuum-webapp-test/src/test/resources/unit/maven-two-projects/missing-connection-element-pom.xml +MISS_PARENT_POM_URL=http://svn.apache.org/repos/asf/continuum/trunk/continuum-webapp-test/src/test/resources/unit/maven-two-projects/missing-parent-pom.xml +MISS_SUBPRO_POM_URL=http://svn.apache.org/repos/asf/continuum/trunk/continuum-webapp-test/src/test/resources/unit/maven-two-projects/missing-modules-pom.xml ######################## # mavenOneProject group ######################## # Properties for testAddMavenOneProject -M1_POM_URL =http://svn.apache.org/repos/asf/continuum/trunk/continuum-webapp-test/src/test/resources/unit/maven-one-projects/valid-project.xml +M1_POM_URL=http://svn.apache.org/repos/asf/continuum/trunk/continuum-webapp-test/src/test/resources/unit/maven-one-projects/valid-project.xml M1_PROJ_GRP_NAME=Maven One Project M1_PROJ_GRP_ID=maven-one-project M1_PROJ_GRP_DESCRIPTION=This is a sample Maven One Project -M1_POM_USERNAME = -M1_POM_PASSWORD = +M1_POM_USERNAME= +M1_POM_PASSWORD= -M1_MISS_REPO_POM_URL =http://svn.apache.org/repos/asf/continuum/trunk/continuum-webapp-test/src/test/resources/unit/maven-one-projects/missing-repository-element-project.xml -M1_EXTENDED_POM_URL =http://svn.apache.org/repos/asf/continuum/trunk/continuum-webapp-test/src/test/resources/unit/maven-one-projects/extend-element-project.xml -M1_UNPARSEABLE_POM_URL =http://svn.apache.org/repos/asf/continuum/trunk/continuum-webapp-test/src/test/resources/unit/maven-one-projects/unparseable-content-project.xml +M1_MISS_REPO_POM_URL=http://svn.apache.org/repos/asf/continuum/trunk/continuum-webapp-test/src/test/resources/unit/maven-one-projects/missing-repository-element-project.xml +M1_EXTENDED_POM_URL=http://svn.apache.org/repos/asf/continuum/trunk/continuum-webapp-test/src/test/resources/unit/maven-one-projects/extend-element-project.xml +M1_UNPARSEABLE_POM_URL=http://svn.apache.org/repos/asf/continuum/trunk/continuum-webapp-test/src/test/resources/unit/maven-one-projects/unparseable-content-project.xml ######################## # antProject group ######################## -ANT_NAME =Ant Project -ANT_DESCRIPTION =This is a sample Ant Project used for testing -ANT_VERSION =1.0.0-SNAPSHOT -ANT_TAG = -ANT_SCM_URL =http://svn.apache.org/repos/asf/ant/sandbox/parallelexecutor/ -ANT_SCM_USERNAME = -ANT_SCM_PASSWORD = +ANT_NAME=Ant Project +ANT_DESCRIPTION=This is a sample Ant Project used for testing +ANT_VERSION=1.0.0-SNAPSHOT +ANT_TAG= +ANT_SCM_URL=http://svn.apache.org/repos/asf/ant/sandbox/parallelexecutor/ +ANT_SCM_USERNAME= +ANT_SCM_PASSWORD= ######################## # shellProject group ######################## -SHELL_NAME =Shell Project -SHELL_DESCRIPTION =This is a sample Shell Project used for testing -SHELL_VERSION =1.0.0-SNAPSHOT -SHELL_TAG = -SHELL_SCM_URL =http://svn.apache.org/repos/asf/continuum/sandbox/examples/shell/ -SHELL_SCM_USERNAME = -SHELL_SCM_PASSWORD = +SHELL_NAME=Shell Project +SHELL_DESCRIPTION=This is a sample Shell Project used for testing +SHELL_VERSION=1.0.0-SNAPSHOT +SHELL_TAG= +SHELL_SCM_URL=http://svn.apache.org/repos/asf/continuum/sandbox/examples/shell/ +SHELL_SCM_USERNAME= +SHELL_SCM_PASSWORD= ######################## # projectGroup group ######################## -TEST_PROJ_GRP_NAME =Test Project Group Name -TEST_PROJ_GRP_ID =Test Project Group Id -TEST_PROJ_GRP_DESCRIPTION =Test Project Group Description +TEST_PROJ_GRP_NAME=Test Project Group Name +TEST_PROJ_GRP_ID=Test Project Group Id +TEST_PROJ_GRP_DESCRIPTION=Test Project Group Description ## Second project group without projects -TEST2_PROJ_GRP_NAME =Test Project Group 2 Name -TEST2_PROJ_GRP_ID =Test Project Group 2 Id -TEST2_PROJ_GRP_DESCRIPTION =Test Project Group 2 Description +TEST2_PROJ_GRP_NAME=Test Project Group 2 Name +TEST2_PROJ_GRP_ID=Test Project Group 2 Id +TEST2_PROJ_GRP_DESCRIPTION=Test Project Group 2 Description ######################## # notifier group ######################## -WAGON_NOTIFIER_URL =http://svn.apache.org/repos/asf/maven/pom/trunk/maven/pom.xml -WAGON_SERVER_ID =wagoId -MAIL_NOTIFIER_ADDRESS =test@test.com -IRC_NOTIFIER_HOST =test.com -IRC_NOTIFIER_CHANNEL =test_channel -JABBER_NOTIFIER_HOST =test -JABBER_NOTIFIER_LOGIN =test_login -JABBER_NOTIFIER_PASSWORD =hello -JABBER_NOTIFIER_ADDRESS =test@address.com -MSN_NOTIFIER_ADDRESS =test@address.com -MSN_NOTIFIER_LOGIN =test -MSN_NOTIFIER_PASSWORD =hello +WAGON_NOTIFIER_URL=http://svn.apache.org/repos/asf/maven/pom/trunk/maven/pom.xml +WAGON_SERVER_ID=wagoId +MAIL_NOTIFIER_ADDRESS=test@test.com +IRC_NOTIFIER_HOST=test.com +IRC_NOTIFIER_CHANNEL=test_channel +JABBER_NOTIFIER_HOST=test +JABBER_NOTIFIER_LOGIN=test_login +JABBER_NOTIFIER_PASSWORD=hello +JABBER_NOTIFIER_ADDRESS=test@address.com +MSN_NOTIFIER_ADDRESS=test@address.com +MSN_NOTIFIER_LOGIN=test +MSN_NOTIFIER_PASSWORD=hello ######################## # buildDefinition group ######################## -BUILD_POM_NAME =pom.xml -BUILD_GOALS =test -BUILD_ARGUMENTS =--batch-mode --non-recursive -BUILD_DESCRIPTION =Maven 2 Build Definition Description +BUILD_POM_NAME=pom.xml +BUILD_GOALS=test +BUILD_ARGUMENTS=--batch-mode --non-recursive +BUILD_DESCRIPTION=Maven 2 Build Definition Description ######################## # queue group ######################## -BUILD_QUEUE_NAME =name_build_queue +BUILD_QUEUE_NAME=name_build_queue ######################## # purge group ######################## -PURGE_REPOSITORY_DESCRIPTION =repository_description -PURGE_REPOSITORY_DAYS =100 -PURGE_REPOSITORY_RETETION =3 -PURGE_DIRECTORY_DESCRIPTION =directory_description -PURGE_DIRECTORY_DAYS =90 -PURGE_DIRECTORY_RETETION =4 +PURGE_REPOSITORY_DESCRIPTION=repository_description +PURGE_REPOSITORY_DAYS=100 +PURGE_REPOSITORY_RETETION=3 +PURGE_DIRECTORY_DESCRIPTION=directory_description +PURGE_DIRECTORY_DAYS=90 +PURGE_DIRECTORY_RETETION=4 ######################## # local repository group ######################## -LOCAL_REPOSITORY_NAME =repository_name -LOCAL_REPOSITORY_LOCATION =/usr/m2/repository +LOCAL_REPOSITORY_NAME=repository_name +LOCAL_REPOSITORY_LOCATION=/usr/m2/repository ######################## # schedules group ######################## -SCHEDULE_NAME =schedule_name -SCHEDULE_DESCRIPTION =schedule_description -SCHEDULE_EXPR_SECOND =10 -SCHEDULE_EXPR_MINUTE =10 -SCHEDULE_EXPR_HOUR =20 -SCHEDULE_EXPR_DAY_MONTH =* -SCHEDULE_EXPR_MONTH =* -SCHEDULE_EXPR_DAY_WEEK =? -SCHEDULE_EXPR_YEAR =2009 -SCHEDULE_MAX_TIME =60000 -SCHEDULE_PERIOD =36000 +SCHEDULE_NAME=schedule_name +SCHEDULE_DESCRIPTION=schedule_description +SCHEDULE_EXPR_SECOND=10 +SCHEDULE_EXPR_MINUTE=10 +SCHEDULE_EXPR_HOUR=20 +SCHEDULE_EXPR_DAY_MONTH=* +SCHEDULE_EXPR_MONTH=* +SCHEDULE_EXPR_DAY_WEEK=? +SCHEDULE_EXPR_YEAR=2009 +SCHEDULE_MAX_TIME=60000 +SCHEDULE_PERIOD=36000 ######################## # installations group ######################## # Correct location for JDK -INSTALL_TOOL_JDK_NAME =JDK6 -INSTALL_TOOL_JDK_PATH =${java.home} +INSTALL_TOOL_JDK_NAME=JDK6 +INSTALL_TOOL_JDK_PATH=${java.home} # Correct location for maven 2 -INTALLA_TOOL_MAVEN_NAME =M9_HOME -INTALLA_TOOL_MAVEN_PATH =${maven.home} +INTALL_TOOL_MAVEN_NAME=M9_HOME +INTALL_TOOL_MAVEN_PATH=${maven.home} # Not neccesary correct location -INSTALL_VAR_NAME =JDK5 -INSTALL_VAR_VARIABLE_NAME =/usr/lib/jvm/java-5-sun-1.5.0.12 -INSTALL_VAR_PATH =JAVA5_HOME +INSTALL_VAR_NAME=JDK5 +INSTALL_VAR_VARIABLE_NAME=/usr/lib/jvm/java-5-sun-1.5.0.12 +INSTALL_VAR_PATH=JAVA5_HOME ######################## # buildEnvironment group ######################## -BUIL_ENV_NAME =APPLICATION_JDK4 +BUIL_ENV_NAME=APPLICATION_JDK4 ######################## # buildTemplate group ######################## -TEMPLATE_NAME =PROJECT_MAVEN_TEMPLATE -TEMPLATE_BUILD_POM_NAME =pom.xml -TEMPLATE_BUILD_GOALS =test -TEMPLATE_BUILD_ARGUMENTS =--batch-mode --non-recursive -TEMPLATE_BUILD_DESCRIPTION =Template Maven Test +TEMPLATE_NAME=PROJECT_MAVEN_TEMPLATE +TEMPLATE_BUILD_POM_NAME=pom.xml +TEMPLATE_BUILD_GOALS=test +TEMPLATE_BUILD_ARGUMENTS=--batch-mode --non-recursive +TEMPLATE_BUILD_DESCRIPTION=Template Maven Test ######################## # userRoles group Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AboutTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AboutTest.java?rev=784889&r1=784888&r2=784889&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AboutTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AboutTest.java Mon Jun 15 17:56:52 2009 @@ -20,7 +20,6 @@ */ import org.apache.continuum.web.test.parent.AbstractContinuumTest; -import org.testng.Assert; import org.testng.annotations.AfterTest; import org.testng.annotations.BeforeSuite; import org.testng.annotations.BeforeTest; @@ -28,7 +27,7 @@ /** * Based on AboutTest of Wendy Smoak test. - * + * * @author José Morales Martínez * @version $Id$ */ @@ -46,10 +45,10 @@ if ( title.equals( "Create Admin User" ) ) { assertCreateAdmin(); - String fullname = p.getProperty( "ADMIN_FULLNAME" ); - String username = p.getProperty( "ADMIN_USERNAME" ); - String mail = p.getProperty( "ADMIN_MAIL" ); - String password = p.getProperty( "ADMIN_PASSWORD" ); + String fullname = getProperty( "ADMIN_FULLNAME" ); + String username = getProperty( "ADMIN_USERNAME" ); + String mail = getProperty( "ADMIN_MAIL" ); + String password = getProperty( "ADMIN_PASSWORD" ); submitAdminData( fullname, mail, password ); assertAutenticatedPage( username ); assertEditConfigurationPage(); @@ -58,7 +57,7 @@ } super.close(); } - + private void postAdminUserCreation() { if ( getTitle().endsWith( "Continuum - Configuration" ) ) @@ -76,6 +75,7 @@ } } + @Override @BeforeTest( groups = { "about" } ) public void open() throws Exception @@ -85,9 +85,7 @@ public void displayAboutPage() { - getSelenium().open( baseUrl + "/about.action" ); - getSelenium().waitForPageToLoad( maxWaitTimeInMs ); - Assert.assertEquals( "Continuum - About", getSelenium().getTitle() ); + goToAboutPage(); } @Override Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AntProjectTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AntProjectTest.java?rev=784889&r1=784888&r2=784889&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AntProjectTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AntProjectTest.java Mon Jun 15 17:56:52 2009 @@ -24,7 +24,7 @@ /** * Based on AddAntProjectTestCase of Emmanuel Venisse. - * + * * @author José Morales Martínez * @version $Id$ */ @@ -36,16 +36,16 @@ public void testAddAntProject() throws Exception { - String ANT_NAME = p.getProperty( "ANT_NAME" ); - String ANT_DESCRIPTION = p.getProperty( "ANT_DESCRIPTION" ); - String ANT_VERSION = p.getProperty( "ANT_VERSION" ); - String ANT_TAG = p.getProperty( "ANT_TAG" ); - String ANT_SCM_URL = p.getProperty( "ANT_SCM_URL" ); - String ANT_SCM_USERNAME = p.getProperty( "ANT_SCM_USERNAME" ); - String ANT_SCM_PASSWORD = p.getProperty( "ANT_SCM_PASSWORD" ); - String TEST_PROJ_GRP_NAME = p.getProperty( "TEST_PROJ_GRP_NAME" ); - String TEST_PROJ_GRP_ID = p.getProperty( "TEST_PROJ_GRP_ID" ); - String TEST_PROJ_GRP_DESCRIPTION = p.getProperty( "TEST_PROJ_GRP_DESCRIPTION" ); + String ANT_NAME = getProperty( "ANT_NAME" ); + String ANT_DESCRIPTION = getProperty( "ANT_DESCRIPTION" ); + String ANT_VERSION = getProperty( "ANT_VERSION" ); + String ANT_TAG = getProperty( "ANT_TAG" ); + String ANT_SCM_URL = getProperty( "ANT_SCM_URL" ); + String ANT_SCM_USERNAME = getProperty( "ANT_SCM_USERNAME" ); + String ANT_SCM_PASSWORD = getProperty( "ANT_SCM_PASSWORD" ); + String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String TEST_PROJ_GRP_ID = getProperty( "TEST_PROJ_GRP_ID" ); + String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" ); goToAddAntProjectPage(); addProject( ANT_NAME, ANT_DESCRIPTION, ANT_VERSION, ANT_SCM_URL, ANT_SCM_USERNAME, ANT_SCM_PASSWORD, ANT_TAG, false, TEST_PROJ_GRP_NAME, null, true ); @@ -66,13 +66,13 @@ public void testAddDupliedAntProject() throws Exception { - String ANT_NAME = p.getProperty( "ANT_NAME" ); - String ANT_DESCRIPTION = p.getProperty( "ANT_DESCRIPTION" ); - String ANT_VERSION = p.getProperty( "ANT_VERSION" ); - String ANT_TAG = p.getProperty( "ANT_TAG" ); - String ANT_SCM_URL = p.getProperty( "ANT_SCM_URL" ); - String ANT_SCM_USERNAME = p.getProperty( "ANT_SCM_USERNAME" ); - String ANT_SCM_PASSWORD = p.getProperty( "ANT_SCM_PASSWORD" ); + String ANT_NAME = getProperty( "ANT_NAME" ); + String ANT_DESCRIPTION = getProperty( "ANT_DESCRIPTION" ); + String ANT_VERSION = getProperty( "ANT_VERSION" ); + String ANT_TAG = getProperty( "ANT_TAG" ); + String ANT_SCM_URL = getProperty( "ANT_SCM_URL" ); + String ANT_SCM_USERNAME = getProperty( "ANT_SCM_USERNAME" ); + String ANT_SCM_PASSWORD = getProperty( "ANT_SCM_PASSWORD" ); goToAddAntProjectPage(); addProject( ANT_NAME, ANT_DESCRIPTION, ANT_VERSION, ANT_SCM_URL, ANT_SCM_USERNAME, ANT_SCM_PASSWORD, ANT_TAG, false, null, null, false ); Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTemplateTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTemplateTest.java?rev=784889&r1=784888&r2=784889&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTemplateTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTemplateTest.java Mon Jun 15 17:56:52 2009 @@ -33,7 +33,7 @@ public void testAddTemplate() throws Exception { - String TEMPLATE_NAME = p.getProperty( "TEMPLATE_NAME" ); + String TEMPLATE_NAME = getProperty( "TEMPLATE_NAME" ); goToAddTemplate(); addEditTemplate( TEMPLATE_NAME, new String[] { "Default Maven 2 Build Definition", "Default Maven 1 Build Definition" }, new String[] {}, true ); @@ -51,7 +51,7 @@ public void testEditTemplate() throws Exception { - String TEMPLATE_NAME = p.getProperty( "TEMPLATE_NAME" ); + String TEMPLATE_NAME = getProperty( "TEMPLATE_NAME" ); String newName = "new_name"; goToEditTemplate( TEMPLATE_NAME, new String[] { "Default Maven 2 Build Definition", "Default Maven 1 Build Definition" } ); @@ -66,17 +66,17 @@ @Test( dependsOnMethods = { "testEditTemplate" } ) public void testDeleteTemplate() { - String TEMPLATE_NAME = p.getProperty( "TEMPLATE_NAME" ); + String TEMPLATE_NAME = getProperty( "TEMPLATE_NAME" ); removeTemplate( TEMPLATE_NAME ); } public void testAddBuildDefinitionTemplate() throws Exception { - String TEMPLATE_BUILD_POM_NAME = p.getProperty( "TEMPLATE_BUILD_POM_NAME" ); - String TEMPLATE_BUILD_GOALS = p.getProperty( "TEMPLATE_BUILD_GOALS" ); - String TEMPLATE_BUILD_ARGUMENTS = p.getProperty( "TEMPLATE_BUILD_ARGUMENTS" ); - String TEMPLATE_BUILD_DESCRIPTION = p.getProperty( "TEMPLATE_BUILD_DESCRIPTION" ); + String TEMPLATE_BUILD_POM_NAME = getProperty( "TEMPLATE_BUILD_POM_NAME" ); + String TEMPLATE_BUILD_GOALS = getProperty( "TEMPLATE_BUILD_GOALS" ); + String TEMPLATE_BUILD_ARGUMENTS = getProperty( "TEMPLATE_BUILD_ARGUMENTS" ); + String TEMPLATE_BUILD_DESCRIPTION = getProperty( "TEMPLATE_BUILD_DESCRIPTION" ); goToAddBuildDefinitionTemplate(); addEditBuildDefinitionTemplate( TEMPLATE_BUILD_POM_NAME, TEMPLATE_BUILD_GOALS, TEMPLATE_BUILD_ARGUMENTS, TEMPLATE_BUILD_DESCRIPTION, true, true, true, true ); @@ -95,10 +95,10 @@ public void testEditBuildDefinitionTemplate() throws Exception { - String TEMPLATE_BUILD_POM_NAME = p.getProperty( "TEMPLATE_BUILD_POM_NAME" ); - String TEMPLATE_BUILD_GOALS = p.getProperty( "TEMPLATE_BUILD_GOALS" ); - String TEMPLATE_BUILD_ARGUMENTS = p.getProperty( "TEMPLATE_BUILD_ARGUMENTS" ); - String TEMPLATE_BUILD_DESCRIPTION = p.getProperty( "TEMPLATE_BUILD_DESCRIPTION" ); + String TEMPLATE_BUILD_POM_NAME = getProperty( "TEMPLATE_BUILD_POM_NAME" ); + String TEMPLATE_BUILD_GOALS = getProperty( "TEMPLATE_BUILD_GOALS" ); + String TEMPLATE_BUILD_ARGUMENTS = getProperty( "TEMPLATE_BUILD_ARGUMENTS" ); + String TEMPLATE_BUILD_DESCRIPTION = getProperty( "TEMPLATE_BUILD_DESCRIPTION" ); goToEditBuildDefinitionTemplate( TEMPLATE_BUILD_DESCRIPTION ); addEditBuildDefinitionTemplate( TEMPLATE_BUILD_POM_NAME, TEMPLATE_BUILD_GOALS, TEMPLATE_BUILD_ARGUMENTS, TEMPLATE_BUILD_DESCRIPTION, false, false, false, true ); @@ -107,7 +107,7 @@ @Test( dependsOnMethods = { "testEditBuildDefinitionTemplate" } ) public void testDeleteBuildDefinitionTemplate() { - String TEMPLATE_BUILD_DESCRIPTION = p.getProperty( "TEMPLATE_BUILD_DESCRIPTION" ); + String TEMPLATE_BUILD_DESCRIPTION = getProperty( "TEMPLATE_BUILD_DESCRIPTION" ); removeBuildDefinitionTemplate( TEMPLATE_BUILD_DESCRIPTION ); } } Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java?rev=784889&r1=784888&r2=784889&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildDefinitionTest.java Mon Jun 15 17:56:52 2009 @@ -33,9 +33,9 @@ public void testDefaultGroupBuildDefinition() throws Exception { - String DEFAULT_PROJ_GRP_NAME = p.getProperty( "DEFAULT_PROJ_GRP_NAME" ); - String DEFAULT_PROJ_GRP_ID = p.getProperty( "DEFAULT_PROJ_GRP_ID" ); - String DEFAULT_PROJ_GRP_DESCRIPTION = p.getProperty( "DEFAULT_PROJ_GRP_DESCRIPTION" ); + String DEFAULT_PROJ_GRP_NAME = getProperty( "DEFAULT_PROJ_GRP_NAME" ); + String DEFAULT_PROJ_GRP_ID = getProperty( "DEFAULT_PROJ_GRP_ID" ); + String DEFAULT_PROJ_GRP_DESCRIPTION = getProperty( "DEFAULT_PROJ_GRP_DESCRIPTION" ); goToGroupBuildDefinitionPage( DEFAULT_PROJ_GRP_NAME, DEFAULT_PROJ_GRP_ID, DEFAULT_PROJ_GRP_DESCRIPTION ); String tableElement = "ec_table"; @@ -70,9 +70,9 @@ public void testAddInvalidGroupBuildDefinition() throws Exception { - String TEST2_PROJ_GRP_NAME = p.getProperty( "TEST2_PROJ_GRP_NAME" ); - String TEST2_PROJ_GRP_ID = p.getProperty( "TEST2_PROJ_GRP_ID" ); - String TEST2_PROJ_GRP_DESCRIPTION = p.getProperty( "TEST2_PROJ_GRP_DESCRIPTION" ); + String TEST2_PROJ_GRP_NAME = getProperty( "TEST2_PROJ_GRP_NAME" ); + String TEST2_PROJ_GRP_ID = getProperty( "TEST2_PROJ_GRP_ID" ); + String TEST2_PROJ_GRP_DESCRIPTION = getProperty( "TEST2_PROJ_GRP_DESCRIPTION" ); goToGroupBuildDefinitionPage( TEST2_PROJ_GRP_NAME, TEST2_PROJ_GRP_ID, TEST2_PROJ_GRP_DESCRIPTION ); clickButtonWithValue( "Add" ); setFieldValue( "buildFile", "" ); @@ -84,9 +84,9 @@ public void testBuildFromGroupBuildDefinition() throws Exception { - String TEST2_PROJ_GRP_NAME = p.getProperty( "TEST2_PROJ_GRP_NAME" ); - String TEST2_PROJ_GRP_ID = p.getProperty( "TEST2_PROJ_GRP_ID" ); - String TEST2_PROJ_GRP_DESCRIPTION = p.getProperty( "TEST2_PROJ_GRP_DESCRIPTION" ); + String TEST2_PROJ_GRP_NAME = getProperty( "TEST2_PROJ_GRP_NAME" ); + String TEST2_PROJ_GRP_ID = getProperty( "TEST2_PROJ_GRP_ID" ); + String TEST2_PROJ_GRP_DESCRIPTION = getProperty( "TEST2_PROJ_GRP_DESCRIPTION" ); goToGroupBuildDefinitionPage( TEST2_PROJ_GRP_NAME, TEST2_PROJ_GRP_ID, TEST2_PROJ_GRP_DESCRIPTION ); clickImgWithAlt( "Build" ); assertProjectGroupSummaryPage( TEST2_PROJ_GRP_NAME, TEST2_PROJ_GRP_ID, TEST2_PROJ_GRP_DESCRIPTION ); @@ -96,13 +96,13 @@ public void testAddDefautltGroupBuildDefinition() throws Exception { - String TEST2_PROJ_GRP_NAME = p.getProperty( "TEST2_PROJ_GRP_NAME" ); - String TEST2_PROJ_GRP_ID = p.getProperty( "TEST2_PROJ_GRP_ID" ); - String TEST2_PROJ_GRP_DESCRIPTION = p.getProperty( "TEST2_PROJ_GRP_DESCRIPTION" ); - String BUILD_POM_NAME = p.getProperty( "BUILD_POM_NAME" ); - String BUILD_GOALS = p.getProperty( "BUILD_GOALS" ); - String BUILD_ARGUMENTS = p.getProperty( "BUILD_ARGUMENTS" ); - String BUILD_DESCRIPTION = p.getProperty( "BUILD_DESCRIPTION" ); + String TEST2_PROJ_GRP_NAME = getProperty( "TEST2_PROJ_GRP_NAME" ); + String TEST2_PROJ_GRP_ID = getProperty( "TEST2_PROJ_GRP_ID" ); + String TEST2_PROJ_GRP_DESCRIPTION = getProperty( "TEST2_PROJ_GRP_DESCRIPTION" ); + String BUILD_POM_NAME = getProperty( "BUILD_POM_NAME" ); + String BUILD_GOALS = getProperty( "BUILD_GOALS" ); + String BUILD_ARGUMENTS = getProperty( "BUILD_ARGUMENTS" ); + String BUILD_DESCRIPTION = getProperty( "BUILD_DESCRIPTION" ); goToGroupBuildDefinitionPage( TEST2_PROJ_GRP_NAME, TEST2_PROJ_GRP_ID, TEST2_PROJ_GRP_DESCRIPTION ); clickButtonWithValue( "Add" ); addEditGroupBuildDefinition( TEST2_PROJ_GRP_NAME, BUILD_POM_NAME, BUILD_GOALS, BUILD_ARGUMENTS, @@ -113,13 +113,13 @@ public void testAddNotDefautltGroupBuildDefinition() throws Exception { - String TEST2_PROJ_GRP_NAME = p.getProperty( "TEST2_PROJ_GRP_NAME" ); - String TEST2_PROJ_GRP_ID = p.getProperty( "TEST2_PROJ_GRP_ID" ); - String TEST2_PROJ_GRP_DESCRIPTION = p.getProperty( "TEST2_PROJ_GRP_DESCRIPTION" ); - String BUILD_POM_NAME = p.getProperty( "BUILD_POM_NAME" ); - String BUILD_GOALS = p.getProperty( "BUILD_GOALS" ); - String BUILD_ARGUMENTS = p.getProperty( "BUILD_ARGUMENTS" ); - String BUILD_DESCRIPTION = p.getProperty( "BUILD_DESCRIPTION" ); + String TEST2_PROJ_GRP_NAME = getProperty( "TEST2_PROJ_GRP_NAME" ); + String TEST2_PROJ_GRP_ID = getProperty( "TEST2_PROJ_GRP_ID" ); + String TEST2_PROJ_GRP_DESCRIPTION = getProperty( "TEST2_PROJ_GRP_DESCRIPTION" ); + String BUILD_POM_NAME = getProperty( "BUILD_POM_NAME" ); + String BUILD_GOALS = getProperty( "BUILD_GOALS" ); + String BUILD_ARGUMENTS = getProperty( "BUILD_ARGUMENTS" ); + String BUILD_DESCRIPTION = getProperty( "BUILD_DESCRIPTION" ); goToGroupBuildDefinitionPage( TEST2_PROJ_GRP_NAME, TEST2_PROJ_GRP_ID, TEST2_PROJ_GRP_DESCRIPTION ); clickButtonWithValue( "Add" ); addEditGroupBuildDefinition( TEST2_PROJ_GRP_NAME, BUILD_POM_NAME, BUILD_GOALS, BUILD_ARGUMENTS, @@ -130,13 +130,13 @@ public void testEditGroupBuildDefinition() throws Exception { - String TEST2_PROJ_GRP_NAME = p.getProperty( "TEST2_PROJ_GRP_NAME" ); - String TEST2_PROJ_GRP_ID = p.getProperty( "TEST2_PROJ_GRP_ID" ); - String TEST2_PROJ_GRP_DESCRIPTION = p.getProperty( "TEST2_PROJ_GRP_DESCRIPTION" ); - String BUILD_POM_NAME = p.getProperty( "BUILD_POM_NAME" ); - String BUILD_GOALS = p.getProperty( "BUILD_GOALS" ); - String BUILD_ARGUMENTS = p.getProperty( "BUILD_ARGUMENTS" ); - String BUILD_DESCRIPTION = p.getProperty( "BUILD_DESCRIPTION" ); + String TEST2_PROJ_GRP_NAME = getProperty( "TEST2_PROJ_GRP_NAME" ); + String TEST2_PROJ_GRP_ID = getProperty( "TEST2_PROJ_GRP_ID" ); + String TEST2_PROJ_GRP_DESCRIPTION = getProperty( "TEST2_PROJ_GRP_DESCRIPTION" ); + String BUILD_POM_NAME = getProperty( "BUILD_POM_NAME" ); + String BUILD_GOALS = getProperty( "BUILD_GOALS" ); + String BUILD_ARGUMENTS = getProperty( "BUILD_ARGUMENTS" ); + String BUILD_DESCRIPTION = getProperty( "BUILD_DESCRIPTION" ); String newPom = "newpom.xml"; String newGoals = "new goals"; String newArguments = "new arguments"; @@ -154,11 +154,11 @@ public void testDeleteGroupBuildDefinition() throws Exception { - String TEST2_PROJ_GRP_NAME = p.getProperty( "TEST2_PROJ_GRP_NAME" ); - String TEST2_PROJ_GRP_ID = p.getProperty( "TEST2_PROJ_GRP_ID" ); - String TEST2_PROJ_GRP_DESCRIPTION = p.getProperty( "TEST2_PROJ_GRP_DESCRIPTION" ); - String BUILD_GOALS = p.getProperty( "BUILD_GOALS" ); - String BUILD_DESCRIPTION = p.getProperty( "BUILD_DESCRIPTION" ); + String TEST2_PROJ_GRP_NAME = getProperty( "TEST2_PROJ_GRP_NAME" ); + String TEST2_PROJ_GRP_ID = getProperty( "TEST2_PROJ_GRP_ID" ); + String TEST2_PROJ_GRP_DESCRIPTION = getProperty( "TEST2_PROJ_GRP_DESCRIPTION" ); + String BUILD_GOALS = getProperty( "BUILD_GOALS" ); + String BUILD_DESCRIPTION = getProperty( "BUILD_DESCRIPTION" ); goToGroupBuildDefinitionPage( TEST2_PROJ_GRP_NAME, TEST2_PROJ_GRP_ID, TEST2_PROJ_GRP_DESCRIPTION ); // Click in Delete Image clickLinkWithXPath( "(//a[contains(@href,'removeGroupBuildDefinition')])//img" ); @@ -171,12 +171,12 @@ public void testAddNotDefautltProjectBuildDefinition() throws Exception { - String TEST_PROJ_GRP_NAME = p.getProperty( "TEST_PROJ_GRP_NAME" ); - String M2_PROJ_GRP_NAME = p.getProperty( "M2_PROJ_GRP_NAME" ); - String BUILD_POM_NAME = p.getProperty( "BUILD_POM_NAME" ); - String BUILD_GOALS = p.getProperty( "BUILD_GOALS" ); - String BUILD_ARGUMENTS = p.getProperty( "BUILD_ARGUMENTS" ); - String BUILD_DESCRIPTION = p.getProperty( "BUILD_DESCRIPTION" ); + String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" ); + String BUILD_POM_NAME = getProperty( "BUILD_POM_NAME" ); + String BUILD_GOALS = getProperty( "BUILD_GOALS" ); + String BUILD_ARGUMENTS = getProperty( "BUILD_ARGUMENTS" ); + String BUILD_DESCRIPTION = getProperty( "BUILD_DESCRIPTION" ); goToProjectInformationPage( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME ); clickLinkWithXPath( "//input[contains(@id,'buildDefinition')]" ); addEditGroupBuildDefinition( null, BUILD_POM_NAME, BUILD_GOALS, BUILD_ARGUMENTS, BUILD_DESCRIPTION, false, @@ -187,10 +187,10 @@ public void testDeleteProjectBuildDefinition() throws Exception { - String TEST_PROJ_GRP_NAME = p.getProperty( "TEST_PROJ_GRP_NAME" ); - String M2_PROJ_GRP_NAME = p.getProperty( "M2_PROJ_GRP_NAME" ); - String BUILD_GOALS = p.getProperty( "BUILD_GOALS" ); - String BUILD_DESCRIPTION = p.getProperty( "BUILD_DESCRIPTION" ); + String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" ); + String BUILD_GOALS = getProperty( "BUILD_GOALS" ); + String BUILD_DESCRIPTION = getProperty( "BUILD_DESCRIPTION" ); goToProjectInformationPage( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME ); // Click in Delete Image clickLinkWithXPath( "(//a[contains(@href,'removeProjectBuildDefinition')])//img" ); Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildEnvironmentTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildEnvironmentTest.java?rev=784889&r1=784888&r2=784889&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildEnvironmentTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/BuildEnvironmentTest.java Mon Jun 15 17:56:52 2009 @@ -32,7 +32,7 @@ { public void testAddBuildEnvironment() { - String BUIL_ENV_NAME = p.getProperty( "BUIL_ENV_NAME" ); + String BUIL_ENV_NAME = getProperty( "BUIL_ENV_NAME" ); goToAddBuildEnvironment(); addBuildEnvironment( BUIL_ENV_NAME, new String[] {}, true ); } @@ -47,7 +47,7 @@ @Test( dependsOnMethods = { "testAddBuildEnvironment" } ) public void testEditInvalidBuildEnvironment() { - String BUIL_ENV_NAME = p.getProperty( "BUIL_ENV_NAME" ); + String BUIL_ENV_NAME = getProperty( "BUIL_ENV_NAME" ); goToEditBuildEnvironment( BUIL_ENV_NAME ); editBuildEnvironment( "", new String[] {}, false ); assertTextPresent( "You must define a name" ); @@ -56,7 +56,7 @@ @Test( dependsOnMethods = { "testAddBuildEnvironment" } ) public void testAddDuplicatedBuildEnvironment() { - String BUIL_ENV_NAME = p.getProperty( "BUIL_ENV_NAME" ); + String BUIL_ENV_NAME = getProperty( "BUIL_ENV_NAME" ); goToAddBuildEnvironment(); addBuildEnvironment( BUIL_ENV_NAME, new String[] {}, false ); assertTextPresent( "A Build Environment with the same name already exists" ); @@ -65,7 +65,7 @@ @Test( dependsOnMethods = { "testAddBuildEnvironment" } ) public void testEditBuildEnvironment() { - String BUIL_ENV_NAME = p.getProperty( "BUIL_ENV_NAME" ); + String BUIL_ENV_NAME = getProperty( "BUIL_ENV_NAME" ); String newName = "new_name"; goToEditBuildEnvironment( BUIL_ENV_NAME ); editBuildEnvironment( newName, new String[] {}, true ); @@ -78,7 +78,7 @@ "testAddDuplicatedBuildEnvironment", "testEditInvalidBuildEnvironment" } ) public void testDeleteBuildEnvironment() { - String BUIL_ENV_NAME = p.getProperty( "BUIL_ENV_NAME" ); + String BUIL_ENV_NAME = getProperty( "BUIL_ENV_NAME" ); removeBuildEnvironment( BUIL_ENV_NAME ); } } Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java?rev=784889&r1=784888&r2=784889&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/InstallationTest.java Mon Jun 15 17:56:52 2009 @@ -32,26 +32,26 @@ { public void testAddJdkToolWithoutBuildEnvirotment() { - String INSTALL_TOOL_JDK_NAME = p.getProperty( "INSTALL_TOOL_JDK_NAME" ); - String INSTALL_TOOL_JDK_PATH = p.getProperty( "INSTALL_TOOL_JDK_PATH" ); + String INSTALL_TOOL_JDK_NAME = getProperty( "INSTALL_TOOL_JDK_NAME" ); + String INSTALL_TOOL_JDK_PATH = getEscapeProperty( "INSTALL_TOOL_JDK_PATH" ); goToAddInstallationTool(); addInstallation( INSTALL_TOOL_JDK_NAME, "JDK", INSTALL_TOOL_JDK_PATH, false, true, true ); } public void testAddMavenToolWithBuildEnvirotment() { - String INTALLA_TOOL_MAVEN_NAME = p.getProperty( "INTALLA_TOOL_MAVEN_NAME" ); - String INTALLA_TOOL_MAVEN_PATH = p.getProperty( "INTALLA_TOOL_MAVEN_PATH" ); + String INTALL_TOOL_MAVEN_NAME = getProperty( "INTALL_TOOL_MAVEN_NAME" ); + String INTALL_TOOL_MAVEN_PATH = getEscapeProperty( "INTALL_TOOL_MAVEN_PATH" ); goToAddInstallationTool(); - addInstallation( INTALLA_TOOL_MAVEN_NAME, "Maven 2", INTALLA_TOOL_MAVEN_PATH, true, true, true ); + addInstallation( INTALL_TOOL_MAVEN_NAME, "Maven 2", INTALL_TOOL_MAVEN_PATH, true, true, true ); // TODO: Validate build envirotment } public void testAddInstallationVariableWithBuildEnvirotment() { - String INSTALL_VAR_NAME = p.getProperty( "INSTALL_VAR_NAME" ); - String INSTALL_VAR_VARIABLE_NAME = p.getProperty( "INSTALL_VAR_VARIABLE_NAME" ); - String INSTALL_VAR_PATH = p.getProperty( "INSTALL_VAR_PATH" ); + String INSTALL_VAR_NAME = getProperty( "INSTALL_VAR_NAME" ); + String INSTALL_VAR_VARIABLE_NAME = getProperty( "INSTALL_VAR_VARIABLE_NAME" ); + String INSTALL_VAR_PATH = getProperty( "INSTALL_VAR_PATH" ); goToAddInstallationVariable(); addInstallation( INSTALL_VAR_NAME, INSTALL_VAR_VARIABLE_NAME, INSTALL_VAR_PATH, true, false, true ); // TODO: Validate build envirotment @@ -99,8 +99,8 @@ @Test( dependsOnMethods = { "testAddJdkToolWithoutBuildEnvirotment" } ) public void testAddDuplicatedInstallationTool() { - String INSTALL_TOOL_JDK_NAME = p.getProperty( "INSTALL_TOOL_JDK_NAME" ); - String INSTALL_TOOL_JDK_PATH = p.getProperty( "INSTALL_TOOL_JDK_PATH" ); + String INSTALL_TOOL_JDK_NAME = getProperty( "INSTALL_TOOL_JDK_NAME" ); + String INSTALL_TOOL_JDK_PATH = getEscapeProperty( "INSTALL_TOOL_JDK_PATH" ); goToAddInstallationTool(); addInstallation( INSTALL_TOOL_JDK_NAME, "JDK", INSTALL_TOOL_JDK_PATH, false, true, false ); assertTextPresent( "Installation name already exists" ); @@ -109,9 +109,9 @@ @Test( dependsOnMethods = { "testAddInstallationVariableWithBuildEnvirotment" } ) public void testAddDuplicatedInstallationVariable() { - String INSTALL_VAR_NAME = p.getProperty( "INSTALL_VAR_NAME" ); - String INSTALL_VAR_VARIABLE_NAME = p.getProperty( "INSTALL_VAR_VARIABLE_NAME" ); - String INSTALL_VAR_PATH = p.getProperty( "INSTALL_VAR_PATH" ); + String INSTALL_VAR_NAME = getProperty( "INSTALL_VAR_NAME" ); + String INSTALL_VAR_VARIABLE_NAME = getProperty( "INSTALL_VAR_VARIABLE_NAME" ); + String INSTALL_VAR_PATH = getProperty( "INSTALL_VAR_PATH" ); goToAddInstallationVariable(); addInstallation( INSTALL_VAR_NAME, INSTALL_VAR_VARIABLE_NAME, INSTALL_VAR_PATH, false, false, false ); assertTextPresent( "Installation name already exists" ); @@ -120,8 +120,8 @@ @Test( dependsOnMethods = { "testAddJdkToolWithoutBuildEnvirotment" } ) public void testEditInstallationTool() { - String INSTALL_TOOL_JDK_NAME = p.getProperty( "INSTALL_TOOL_JDK_NAME" ); - String INSTALL_TOOL_JDK_PATH = p.getProperty( "INSTALL_TOOL_JDK_PATH" ); + String INSTALL_TOOL_JDK_NAME = getProperty( "INSTALL_TOOL_JDK_NAME" ); + String INSTALL_TOOL_JDK_PATH = getEscapeProperty( "INSTALL_TOOL_JDK_PATH" ); String newName = "new_name"; goToEditInstallation( INSTALL_TOOL_JDK_NAME, "JDK", INSTALL_TOOL_JDK_PATH, true ); editInstallation( newName, "JDK", INSTALL_TOOL_JDK_PATH, true, true ); @@ -132,9 +132,9 @@ @Test( dependsOnMethods = { "testAddInstallationVariableWithBuildEnvirotment" } ) public void testEditInstallationVariable() { - String INSTALL_VAR_NAME = p.getProperty( "INSTALL_VAR_NAME" ); - String INSTALL_VAR_VARIABLE_NAME = p.getProperty( "INSTALL_VAR_VARIABLE_NAME" ); - String INSTALL_VAR_PATH = p.getProperty( "INSTALL_VAR_PATH" ); + String INSTALL_VAR_NAME = getProperty( "INSTALL_VAR_NAME" ); + String INSTALL_VAR_VARIABLE_NAME = getProperty( "INSTALL_VAR_VARIABLE_NAME" ); + String INSTALL_VAR_PATH = getProperty( "INSTALL_VAR_PATH" ); String newName = "new_name"; String newVarName = "new_var_name"; String newPath = "new_path"; @@ -147,14 +147,14 @@ @Test( dependsOnMethods = { "testEditInstallationTool", "testAddDuplicatedInstallationTool" } ) public void testDeleteInstallationTool() { - String INSTALL_TOOL_JDK_NAME = p.getProperty( "INSTALL_TOOL_JDK_NAME" ); + String INSTALL_TOOL_JDK_NAME = getProperty( "INSTALL_TOOL_JDK_NAME" ); removeInstallation( INSTALL_TOOL_JDK_NAME ); } @Test( dependsOnMethods = { "testEditInstallationVariable", "testAddDuplicatedInstallationVariable" } ) public void testDeleteInstallationVariable() { - String INSTALL_VAR_NAME = p.getProperty( "INSTALL_VAR_NAME" ); + String INSTALL_VAR_NAME = getProperty( "INSTALL_VAR_NAME" ); removeInstallation( INSTALL_VAR_NAME ); } } Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/LocalRepositoriesTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/LocalRepositoriesTest.java?rev=784889&r1=784888&r2=784889&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/LocalRepositoriesTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/LocalRepositoriesTest.java Mon Jun 15 17:56:52 2009 @@ -32,8 +32,8 @@ { public void testAddLocalRepository() { - String LOCAL_REPOSITORY_NAME = p.getProperty( "LOCAL_REPOSITORY_NAME" ); - String LOCAL_REPOSITORY_LOCATION = p.getProperty( "LOCAL_REPOSITORY_LOCATION" ); + String LOCAL_REPOSITORY_NAME = getProperty( "LOCAL_REPOSITORY_NAME" ); + String LOCAL_REPOSITORY_LOCATION = getProperty( "LOCAL_REPOSITORY_LOCATION" ); goToAddLocalRepository(); addEditLocalRepository( LOCAL_REPOSITORY_NAME, LOCAL_REPOSITORY_LOCATION, true ); } @@ -49,8 +49,8 @@ @Test( dependsOnMethods = { "testAddLocalRepository" } ) public void testAddDuplicatedLocalRepository() { - String LOCAL_REPOSITORY_NAME = p.getProperty( "LOCAL_REPOSITORY_NAME" ); - String LOCAL_REPOSITORY_LOCATION = p.getProperty( "LOCAL_REPOSITORY_LOCATION" ); + String LOCAL_REPOSITORY_NAME = getProperty( "LOCAL_REPOSITORY_NAME" ); + String LOCAL_REPOSITORY_LOCATION = getProperty( "LOCAL_REPOSITORY_LOCATION" ); goToAddLocalRepository(); addEditLocalRepository( LOCAL_REPOSITORY_NAME, LOCAL_REPOSITORY_LOCATION, false ); assertTextPresent( "Local repository name must be unique" ); @@ -60,8 +60,8 @@ @Test( dependsOnMethods = { "testAddDuplicatedLocalRepository" } ) public void testEditLocalRepository() { - String LOCAL_REPOSITORY_NAME = p.getProperty( "LOCAL_REPOSITORY_NAME" ); - String LOCAL_REPOSITORY_LOCATION = p.getProperty( "LOCAL_REPOSITORY_LOCATION" ); + String LOCAL_REPOSITORY_NAME = getProperty( "LOCAL_REPOSITORY_NAME" ); + String LOCAL_REPOSITORY_LOCATION = getProperty( "LOCAL_REPOSITORY_LOCATION" ); String newName = "new_name"; String newLocation = "new_location"; goToEditLocalRepository( LOCAL_REPOSITORY_NAME, LOCAL_REPOSITORY_LOCATION ); @@ -73,7 +73,7 @@ @Test( dependsOnMethods = { "testEditLocalRepository" } ) public void testDeleteLocalRepository() { - String LOCAL_REPOSITORY_NAME = p.getProperty( "LOCAL_REPOSITORY_NAME" ); + String LOCAL_REPOSITORY_NAME = getProperty( "LOCAL_REPOSITORY_NAME" ); removeLocalRepository( LOCAL_REPOSITORY_NAME ); } } Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/LoginTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/LoginTest.java?rev=784889&r1=784888&r2=784889&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/LoginTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/LoginTest.java Mon Jun 15 17:56:52 2009 @@ -31,7 +31,7 @@ */ /** * Based on LoginTest of Emmanuel Venisse test. - * + * * @author José Morales Martínez * @version $Id$ */ @@ -43,7 +43,7 @@ { goToLoginPage(); getSelenium().type( "loginForm_username", "badUsername" ); - getSelenium().type( "loginForm_username", p.getProperty( "ADMIN_PASSWORD" ) ); + getSelenium().type( "loginForm_username", getProperty( "ADMIN_PASSWORD" ) ); getSelenium().click( "loginForm__login" ); getSelenium().waitForPageToLoad( maxWaitTimeInMs ); assertTextPresent( "You have entered an incorrect username and/or password" ); @@ -53,7 +53,7 @@ public void testWithBadPassword() { goToLoginPage(); - getSelenium().type( "loginForm_username", p.getProperty( "ADMIN_USERNAME" ) ); + getSelenium().type( "loginForm_username", getProperty( "ADMIN_USERNAME" ) ); getSelenium().type( "loginForm_password", "badPassword" ); getSelenium().click( "loginForm__login" ); getSelenium().waitForPageToLoad( maxWaitTimeInMs ); @@ -74,7 +74,7 @@ public void testWithEmptyPassword() { goToLoginPage(); - getSelenium().type( "loginForm_username", p.getProperty( "ADMIN_USERNAME" ) ); + getSelenium().type( "loginForm_username", getProperty( "ADMIN_USERNAME" ) ); getSelenium().click( "loginForm__login" ); getSelenium().waitForPageToLoad( maxWaitTimeInMs ); assertTextPresent( "You have entered an incorrect username and/or password" ); @@ -84,15 +84,16 @@ public void testWithCorrectUsernamePassword() { goToLoginPage(); - getSelenium().type( "loginForm_username", p.getProperty( "ADMIN_USERNAME" ) ); - getSelenium().type( "loginForm_password", p.getProperty( "ADMIN_PASSWORD" ) ); + getSelenium().type( "loginForm_username", getProperty( "ADMIN_USERNAME" ) ); + getSelenium().type( "loginForm_password", getProperty( "ADMIN_PASSWORD" ) ); getSelenium().click( "loginForm__login" ); getSelenium().waitForPageToLoad( maxWaitTimeInMs ); assertTextPresent( "Edit Details" ); assertTextPresent( "Logout" ); - assertTextPresent( p.getProperty( "ADMIN_USERNAME" ) ); + assertTextPresent( getProperty( "ADMIN_USERNAME" ) ); } + @Override @BeforeTest public void open() throws Exception Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java?rev=784889&r1=784888&r2=784889&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java Mon Jun 15 17:56:52 2009 @@ -24,7 +24,7 @@ /** * Based on AddMavenOneProjectTestCase of Emmanuel Venisse. - * + * * @author José Morales Martínez * @version $Id$ */ @@ -38,12 +38,12 @@ public void testValidPomUrl() throws Exception { - String M1_POM_URL = p.getProperty( "M1_POM_URL" ); - String M1_POM_USERNAME = p.getProperty( "M1_POM_USERNAME" ); - String M1_POM_PASSWORD = p.getProperty( "M1_POM_PASSWORD" ); - String M1_PROJ_GRP_NAME = p.getProperty( "M1_PROJ_GRP_NAME" ); - String M1_PROJ_GRP_ID = p.getProperty( "M1_PROJ_GRP_ID" ); - String M1_PROJ_GRP_DESCRIPTION = p.getProperty( "M1_PROJ_GRP_DESCRIPTION" ); + String M1_POM_URL = getProperty( "M1_POM_URL" ); + String M1_POM_USERNAME = getProperty( "M1_POM_USERNAME" ); + String M1_POM_PASSWORD = getProperty( "M1_POM_PASSWORD" ); + String M1_PROJ_GRP_NAME = getProperty( "M1_PROJ_GRP_NAME" ); + String M1_PROJ_GRP_ID = getProperty( "M1_PROJ_GRP_ID" ); + String M1_PROJ_GRP_DESCRIPTION = getProperty( "M1_PROJ_GRP_DESCRIPTION" ); // Enter values into Add Maven Two Project fields, and submit goToAddMavenOneProjectPage(); addMavenOneProject( M1_POM_URL, M1_POM_USERNAME, M1_POM_PASSWORD, null, null, true ); @@ -54,12 +54,12 @@ public void testAddMavenOneProjectFromRemoteSourceToNonDefaultProjectGroup() throws Exception { - String TEST_PROJ_GRP_NAME = p.getProperty( "TEST_PROJ_GRP_NAME" ); - String TEST_PROJ_GRP_ID = p.getProperty( "TEST_PROJ_GRP_ID" ); - String TEST_PROJ_GRP_DESCRIPTION = p.getProperty( "TEST_PROJ_GRP_DESCRIPTION" ); - String M1_POM_URL = p.getProperty( "M1_POM_URL" ); - String M1_POM_USERNAME = p.getProperty( "M1_POM_USERNAME" ); - String M1_POM_PASSWORD = p.getProperty( "M1_POM_PASSWORD" ); + String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String TEST_PROJ_GRP_ID = getProperty( "TEST_PROJ_GRP_ID" ); + String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" ); + String M1_POM_URL = getProperty( "M1_POM_URL" ); + String M1_POM_USERNAME = getProperty( "M1_POM_USERNAME" ); + String M1_POM_PASSWORD = getProperty( "M1_POM_PASSWORD" ); goToAddMavenOneProjectPage(); addMavenOneProject( M1_POM_URL, M1_POM_USERNAME, M1_POM_PASSWORD, TEST_PROJ_GRP_NAME, null, true ); assertProjectGroupSummaryPage( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION ); @@ -82,9 +82,9 @@ public void testMissingElementInPom() throws Exception { - String M1_MISS_REPO_POM_URL = p.getProperty( "M1_MISS_REPO_POM_URL" ); - String M1_POM_USERNAME = p.getProperty( "M1_POM_USERNAME" ); - String M1_POM_PASSWORD = p.getProperty( "M1_POM_PASSWORD" ); + String M1_MISS_REPO_POM_URL = getProperty( "M1_MISS_REPO_POM_URL" ); + String M1_POM_USERNAME = getProperty( "M1_POM_USERNAME" ); + String M1_POM_PASSWORD = getProperty( "M1_POM_PASSWORD" ); goToAddMavenOneProjectPage(); addMavenOneProject( M1_MISS_REPO_POM_URL, M1_POM_USERNAME, M1_POM_PASSWORD, null, null, false ); assertTextPresent( "Missing 'repository' element in the POM." ); @@ -96,9 +96,9 @@ public void testWithExtendElementPom() throws Exception { - String M1_EXTENDED_POM_URL = p.getProperty( "M1_EXTENDED_POM_URL" ); - String M1_POM_USERNAME = p.getProperty( "M1_POM_USERNAME" ); - String M1_POM_PASSWORD = p.getProperty( "M1_POM_PASSWORD" ); + String M1_EXTENDED_POM_URL = getProperty( "M1_EXTENDED_POM_URL" ); + String M1_POM_USERNAME = getProperty( "M1_POM_USERNAME" ); + String M1_POM_PASSWORD = getProperty( "M1_POM_PASSWORD" ); goToAddMavenOneProjectPage(); addMavenOneProject( M1_EXTENDED_POM_URL, M1_POM_USERNAME, M1_POM_PASSWORD, null, null, false ); assertTextPresent( "Cannot use a POM with an 'extend' element" ); @@ -110,9 +110,9 @@ public void testUnparseableXmlContent() throws Exception { - String M1_UNPARSEABLE_POM_URL = p.getProperty( "M1_UNPARSEABLE_POM_URL" ); - String M1_POM_USERNAME = p.getProperty( "M1_POM_USERNAME" ); - String M1_POM_PASSWORD = p.getProperty( "M1_POM_PASSWORD" ); + String M1_UNPARSEABLE_POM_URL = getProperty( "M1_UNPARSEABLE_POM_URL" ); + String M1_POM_USERNAME = getProperty( "M1_POM_USERNAME" ); + String M1_POM_PASSWORD = getProperty( "M1_POM_PASSWORD" ); goToAddMavenOneProjectPage(); addMavenOneProject( M1_UNPARSEABLE_POM_URL, M1_POM_USERNAME, M1_POM_PASSWORD, null, null, false ); assertTextPresent( "The XML content of the POM can not be parsed." ); Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java?rev=784889&r1=784888&r2=784889&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java Mon Jun 15 17:56:52 2009 @@ -24,7 +24,7 @@ /** * Based on AddMavenTwoProjectTest of Emmanuel Venisse test. - * + * * @author José Morales Martínez * @version $Id$ */ @@ -36,13 +36,13 @@ public void testAddMavenTwoProject() throws Exception { - String M2_POM_URL = p.getProperty( "M2_POM_URL" ); - String M2_POM_USERNAME = p.getProperty( "M2_POM_USERNAME" ); - String M2_POM_PASSWORD = p.getProperty( "M2_POM_PASSWORD" ); - - String M2_PROJ_GRP_NAME = p.getProperty( "M2_PROJ_GRP_NAME" ); - String M2_PROJ_GRP_ID = p.getProperty( "M2_PROJ_GRP_ID" ); - String M2_PROJ_GRP_DESCRIPTION = p.getProperty( "M2_PROJ_GRP_DESCRIPTION" ); + String M2_POM_URL = getProperty( "M2_POM_URL" ); + String M2_POM_USERNAME = getProperty( "M2_POM_USERNAME" ); + String M2_POM_PASSWORD = getProperty( "M2_POM_PASSWORD" ); + + String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" ); + String M2_PROJ_GRP_ID = getProperty( "M2_PROJ_GRP_ID" ); + String M2_PROJ_GRP_DESCRIPTION = getProperty( "M2_PROJ_GRP_DESCRIPTION" ); // Enter values into Add Maven Two Project fields, and submit addMavenTwoProject( M2_POM_URL, M2_POM_USERNAME, M2_POM_PASSWORD, null, true ); // Wait Struct Listener @@ -53,13 +53,13 @@ public void testAddMavenTwoProjectFromRemoteSourceToNonDefaultProjectGroup() throws Exception { - String TEST_PROJ_GRP_NAME = p.getProperty( "TEST_PROJ_GRP_NAME" ); - String TEST_PROJ_GRP_ID = p.getProperty( "TEST_PROJ_GRP_ID" ); - String TEST_PROJ_GRP_DESCRIPTION = p.getProperty( "TEST_PROJ_GRP_DESCRIPTION" ); - - String M2_POM_URL = p.getProperty( "M2_POM_URL" ); - String M2_POM_USERNAME = p.getProperty( "M2_POM_USERNAME" ); - String M2_POM_PASSWORD = p.getProperty( "M2_POM_PASSWORD" ); + String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String TEST_PROJ_GRP_ID = getProperty( "TEST_PROJ_GRP_ID" ); + String TEST_PROJ_GRP_DESCRIPTION = getProperty( "TEST_PROJ_GRP_DESCRIPTION" ); + + String M2_POM_URL = getProperty( "M2_POM_URL" ); + String M2_POM_USERNAME = getProperty( "M2_POM_USERNAME" ); + String M2_POM_PASSWORD = getProperty( "M2_POM_PASSWORD" ); addMavenTwoProject( M2_POM_URL, M2_POM_USERNAME, M2_POM_PASSWORD, TEST_PROJ_GRP_NAME, true ); assertProjectGroupSummaryPage( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION ); @@ -81,7 +81,7 @@ public void testMissingScmElementPom() throws Exception { - String pomUrl = p.getProperty( "NOT_SCM_POM_URL" ); + String pomUrl = getProperty( "NOT_SCM_POM_URL" ); submitAddMavenTwoProjectPage( pomUrl, false ); assertTextPresent( "Missing ''scm'' element in the POM, project Maven Two Project" ); } @@ -103,7 +103,7 @@ public void testMissingConnectionElement() throws Exception { - String pomUrl = p.getProperty( "MISS_CONECT_POM_URL" ); + String pomUrl = getProperty( "MISS_CONECT_POM_URL" ); submitAddMavenTwoProjectPage( pomUrl, false ); assertTextPresent( "Missing 'connection' sub-element in the 'scm' element in the POM." ); } @@ -125,7 +125,7 @@ public void testMissingParentPom() throws Exception { - String pomUrl = p.getProperty( "MISS_PARENT_POM_URL" ); + String pomUrl = getProperty( "MISS_PARENT_POM_URL" ); submitAddMavenTwoProjectPage( pomUrl, false ); assertTextPresent( "Missing artifact trying to build the POM. Check that its parent POM is available or add it first in Continuum." ); } @@ -136,7 +136,7 @@ public void testMissingModules() throws Exception { - String pomUrl = p.getProperty( "MISS_SUBPRO_POM_URL" ); + String pomUrl = getProperty( "MISS_SUBPRO_POM_URL" ); submitAddMavenTwoProjectPage( pomUrl, false ); assertTextPresent( "Unknown error trying to build POM." ); } Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MyAccountTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MyAccountTest.java?rev=784889&r1=784888&r2=784889&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MyAccountTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MyAccountTest.java Mon Jun 15 17:56:52 2009 @@ -25,7 +25,7 @@ /** * Based on MyAccountTest of Emmanuel Venisse test. - * + * * @author José Morales Martínez * @version $Id$ */ @@ -51,11 +51,11 @@ clickLinkWithText( "Edit Details" ); assertFieldValue( newFullName, "user.fullName" ); assertFieldValue( newEmail, "user.email" ); - setFieldValue( "user.fullName", p.getProperty( "ADMIN_USERNAME" ) ); + setFieldValue( "user.fullName", getProperty( "ADMIN_USERNAME" ) ); setFieldValue( "user.email", email ); submit(); clickLinkWithText( "Edit Details" ); - assertFieldValue( p.getProperty( "ADMIN_USERNAME" ), "user.fullName" ); + assertFieldValue( getProperty( "ADMIN_USERNAME" ), "user.fullName" ); assertFieldValue( email, "user.email" ); } }