Return-Path: X-Original-To: apmail-continuum-commits-archive@www.apache.org Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DB4D5D7E1 for ; Mon, 6 Aug 2012 09:25:55 +0000 (UTC) Received: (qmail 51549 invoked by uid 500); 6 Aug 2012 09:25:55 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 51496 invoked by uid 500); 6 Aug 2012 09:25:55 -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 51489 invoked by uid 99); 6 Aug 2012 09:25:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Aug 2012 09:25:55 +0000 X-ASF-Spam-Status: No, hits=-1999.6 required=5.0 tests=ALL_TRUSTED,FILL_THIS_FORM,FILL_THIS_FORM_FRAUD_PHISH 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, 06 Aug 2012 09:25:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3354623888E3 for ; Mon, 6 Aug 2012 09:24:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1369756 [1/3] - in /continuum/trunk/continuum-webapp-test: ./ src/test/java/org/apache/continuum/web/test/ src/test/resources/ src/test/testng/org/apache/continuum/web/test/ src/test/testng/org/apache/continuum/web/test/listener/ src/test/... Date: Mon, 06 Aug 2012 09:24:57 -0000 To: commits@continuum.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120806092459.3354623888E3@eris.apache.org> Author: brett Date: Mon Aug 6 09:24:56 2012 New Revision: 1369756 URL: http://svn.apache.org/viewvc?rev=1369756&view=rev Log: cleanup unused code based on inspections to make it easier to adjust some of the intertwined tests Removed: continuum/trunk/continuum-webapp-test/src/test/java/org/apache/continuum/web/test/AboutTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/XPathExpressionUtil.java 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/AntProjectTest.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/DistributedBuildTest.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/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/QueueTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ReleaseTest.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/listener/CaptureScreenShotsListener.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractAdminTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildAgentsTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildDefinitionTemplateTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildEnvironmentTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildQueueTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractConfigurationTest.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/AbstractInstallationTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractLocalRepositoryTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractNotifierTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractPurgeTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractReleaseTest.java continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractScheduleTest.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=1369756&r1=1369755&r2=1369756&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/pom.xml (original) +++ continuum/trunk/continuum-webapp-test/pom.xml Mon Aug 6 09:24:56 2012 @@ -565,6 +565,7 @@ under the License. 4444 http://localhost:9595/continuum/ *firefox + -Xmx512m -XX:MaxPermSize=128m 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=1369756&r1=1369755&r2=1369756&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties (original) +++ continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties Mon Aug 6 09:24:56 2012 @@ -4,11 +4,10 @@ # General properties ####################### -MAX_WAIT_TIME_IN_MS=20000 +MAX_WAIT_TIME_IN_MS=60000 MAX_PROJECT_WAIT_TIME_IN_MS=120000 WAIT_TRIES=80 -PAGE_LOAD_TIME_IN_MS=20000 ADMIN_USERNAME=admin ADMIN_FULLNAME=admin @@ -36,7 +35,6 @@ M2_POM_PASSWORD= M2_DELETE_POM_URL=http://localhost:9595/example-projects/simple-example/pom.xml M2_DELETE_PROJ_GRP_NAME=Continuum Simple Example Project M2_DELETE_PROJ_GRP_ID=org.apache.continuum.examples.simple -M2_DELETE_PROJ_GRP_DESCRIPTION=Delete test project M2_DELETE_PROJ_GRP_SCM_ROOT_URL=scm:svn:${svn.base.url}/trunk/simple-example M2_DELETE_PROJ_TAGBASE=scm:svn:${svn.base.url}/tags M2_DELETE_PROJ_TAG=simple-example-1.0 @@ -68,14 +66,13 @@ M2_RELEASE_PROJECT_NAME=Continuum Simple M2_RELEASE_GRP_NAME=Simple Example Project Release M2_RELEASE_GRP_ID=org.apache.continuum.examples.simple.release M2_RELEASE_GRP_DESCRIPTION=Release test project -M2_RELEASE_GRP_SCM_ROOT_URL=scm:svn:${svn.base.url}/trunk/simple-example M2_RELEASE_TAG=simple-example-1.0-test M2_RELEASE_RELEASE_VERSION=1.0-test M2_RELEASE_DEVELOPMENT_VERSION=1.0-SNAPSHOT M2_RELEASE_TAGBASE_URL=http://localhost:9595/example-projects/tags M2_RELEASE_BUILD_ENV=RELEASE_BUILD_ENV M2_RELEASE_AGENT_GROUP=RELEASE_BUILDAGENT_GROUP -M2_RELEASE_NO_AGENT_MESSAGE=Unable to prepare release because build agent +M2_RELEASE_NO_AGENT_MESSAGE=Unable to prepare release because build agent M2_FAILING_PROJ_POM_URL=http://localhost:9595/example-projects/continuum-failing-project/pom.xml M2_FAILING_PROJ_GRP_NAME=Continuum Sample Failing Project @@ -97,8 +94,6 @@ M1_POM_PASSWORD= # Properties for testDeleteMavenOneProject M1_DELETE_POM_URL=http://localhost:9595/example-projects/maven-one-projects/valid-project.xml M1_DELETE_PROJ_GRP_NAME=Maven One Project -M1_DELETE_PROJ_GRP_ID=maven-one-project -M1_DELETE_PROJ_GRP_DESCRIPTION=This is a sample Maven One Project. M1_MISS_REPO_POM_URL=http://localhost:9595/example-projects/maven-one-projects/missing-repository-element-project.xml M1_EXTENDED_POM_URL=http://localhost:9595/example-projects/maven-one-projects/extend-element-project.xml @@ -317,7 +312,5 @@ PROJECTUSER_DEFAULTPROJECTGROUP_FULLNAME ######################## # buildAgents group ######################## -BUILD_AGENT_DESCRIPTION2=Agent_description2 BUILD_AGENT_DESCRIPTION=Agent_description -BUILD_AGENT_DESCRIPTION3=Agent_description3 BUILD_AGENT_GROUPNAME=agent_groupname 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=1369756&r1=1369755&r2=1369756&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 Aug 6 09:24:56 2012 @@ -20,7 +20,6 @@ package org.apache.continuum.web.test; */ import org.apache.continuum.web.test.parent.AbstractAdminTest; -import org.apache.continuum.web.test.parent.AbstractContinuumTest; import org.testng.annotations.Test; /** @@ -48,7 +47,7 @@ public class AntProjectTest String TEST_PROJ_GRP_DESCRIPTION = getProperty( "DEFAULT_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, "ant" ); + TEST_PROJ_GRP_NAME, true, "ant" ); assertProjectGroupSummaryPage( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION ); } @@ -64,8 +63,8 @@ public class AntProjectTest String ANT_SCM_PASSWORD = getProperty( "ANT_SCM_PASSWORD" ); String DEFAULT_PROJ_GRP_NAME = getProperty( "DEFAULT_PROJ_GRP_NAME" ); goToAddAntProjectPage(); - addProject( ANT_NAME, ANT_DESCRIPTION, ANT_VERSION, ANT_SCM_URL, ANT_SCM_USERNAME, - ANT_SCM_PASSWORD, ANT_TAG, false, DEFAULT_PROJ_GRP_NAME, null, false, "ant" ); + addProject( ANT_NAME, ANT_DESCRIPTION, ANT_VERSION, ANT_SCM_URL, ANT_SCM_USERNAME, ANT_SCM_PASSWORD, ANT_TAG, + DEFAULT_PROJ_GRP_NAME, false, "ant" ); assertTextPresent( "Name contains invalid characters." ); assertTextPresent( "Version contains invalid characters." ); assertTextPresent( "SCM Url contains invalid characters." ); @@ -95,7 +94,7 @@ public class AntProjectTest 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, "ant" ); + null, false, "ant" ); assertTextPresent( "Project name already exist" ); } } 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=1369756&r1=1369755&r2=1369756&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 Aug 6 09:24:56 2012 @@ -99,7 +99,7 @@ public class BuildEnvironmentTest String BUILD_ENV_NAME = getProperty( "BUILD_ENV_NAME" ); String BUILD_AGENT_GROUPNAME = getProperty( "BUILD_AGENT_GROUPNAME" ); goToAddBuildEnvironment(); - addBuildEnvironmentWithBuildAgentGroup( BUILD_ENV_NAME, new String[] {}, BUILD_AGENT_GROUPNAME, true ); + addBuildEnvironmentWithBuildAgentGroup( BUILD_ENV_NAME, new String[] {}, BUILD_AGENT_GROUPNAME ); } finally { Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/DistributedBuildTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/DistributedBuildTest.java?rev=1369756&r1=1369755&r2=1369756&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/DistributedBuildTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/DistributedBuildTest.java Mon Aug 6 09:24:56 2012 @@ -68,7 +68,10 @@ public class DistributedBuildTest String M2_PROJ_GRP_ID = getProperty( "M2_DELETE_PROJ_GRP_ID" ); projectGroupName = M2_PROJ_GRP_NAME; - addMaven2Project( projectGroupName ); + addMavenTwoProject( getProperty( "M2_DELETE_POM_URL" ), getProperty( "M2_POM_USERNAME" ), + getProperty( "M2_POM_PASSWORD" ), null, true ); + goToProjectGroupsSummaryPage(); + assertLinkPresent( projectGroupName ); clickLinkWithText( projectGroupName ); assertPage( "Continuum - Project Group" ); @@ -88,7 +91,10 @@ public class DistributedBuildTest addBuildAgent( getBuildAgentUrl() ); - addMaven2Project( M2_PROJ_GRP_NAME ); + addMavenTwoProject( getProperty( "M2_DELETE_POM_URL" ), getProperty( "M2_POM_USERNAME" ), + getProperty( "M2_POM_PASSWORD" ), null, true ); + goToProjectGroupsSummaryPage(); + assertLinkPresent( M2_PROJ_GRP_NAME ); clickLinkWithText( M2_PROJ_GRP_NAME ); assertPage( "Continuum - Project Group" ); @@ -111,7 +117,10 @@ public class DistributedBuildTest String BUILD_ENV_NAME = getProperty( "BUILD_ENV_NAME" ); projectGroupName = M2_PROJ_GRP_NAME; - addMaven2Project( M2_PROJ_GRP_NAME ); + addMavenTwoProject( getProperty( "M2_DELETE_POM_URL" ), getProperty( "M2_POM_USERNAME" ), + getProperty( "M2_POM_PASSWORD" ), null, true ); + goToProjectGroupsSummaryPage(); + assertLinkPresent( M2_PROJ_GRP_NAME ); clickLinkWithText( M2_PROJ_GRP_NAME ); assertPage( "Continuum - Project Group" ); @@ -176,7 +185,7 @@ public class DistributedBuildTest goToAddShellProjectPage(); addProject( SHELL_NAME, SHELL_DESCRIPTION, SHELL_VERSION, SHELL_SCM_URL, SHELL_SCM_USERNAME, - SHELL_SCM_PASSWORD, SHELL_TAG, false, SHELL_GROUP_NAME, null, true, "shell" ); + SHELL_SCM_PASSWORD, SHELL_TAG, SHELL_GROUP_NAME, true, "shell" ); assertProjectGroupSummaryPage( SHELL_GROUP_NAME, SHELL_GROUP_ID, SHELL_GROUP_DESC ); goToProjectGroupsSummaryPage(); @@ -184,7 +193,7 @@ public class DistributedBuildTest clickLinkWithText( "Build Definitions" ); clickLinkWithXPath( "//table[@id='ec_table']/tbody/tr/td[14]/a/img" ); - editBuildDefinitionShellType( "build.sh", "", "description", "shell", true ); + editBuildDefinitionShellType(); goToProjectGroupsSummaryPage(); @@ -192,16 +201,13 @@ public class DistributedBuildTest } - private void editBuildDefinitionShellType( String buildFile, String arguments, String description, String buildDefinitionType, boolean alwaysBuild ) + private void editBuildDefinitionShellType() { - setFieldValue( "buildFile", buildFile); - setFieldValue( "arguments", arguments ); - setFieldValue( "description", description ); - setFieldValue( "buildDefinitionType", buildDefinitionType ); - if( alwaysBuild ) - { - checkField( "alwaysBuild" ); - } + setFieldValue( "buildFile", "build.sh" ); + setFieldValue( "arguments", "" ); + setFieldValue( "description", "description" ); + setFieldValue( "buildDefinitionType", "shell" ); + checkField( "alwaysBuild" ); submit(); } 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=1369756&r1=1369755&r2=1369756&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 Aug 6 09:24:56 2012 @@ -186,6 +186,6 @@ public class InstallationTest { String os = System.getProperty("os.name").toLowerCase(); //windows - return (os.indexOf( "win" ) >= 0); + return os.contains( "win" ); } } 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=1369756&r1=1369755&r2=1369756&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 Aug 6 09:24:56 2012 @@ -20,7 +20,6 @@ package org.apache.continuum.web.test; */ import org.apache.continuum.web.test.parent.AbstractAdminTest; -import org.apache.continuum.web.test.parent.AbstractContinuumTest; import org.testng.annotations.Test; /** @@ -46,7 +45,7 @@ public class MavenOneProjectTest removeDefaultBuildDefinitionFromTemplate( "maven1" ); goToAddMavenOneProjectPage(); - addMavenOneProject( M1_POM_URL, M1_POM_USERNAME, M1_POM_PASSWORD, null, null, true ); + addMavenOneProject( M1_POM_URL, M1_POM_USERNAME, M1_POM_PASSWORD, null, true ); assertProjectGroupSummaryPage( M1_PROJ_GRP_NAME, M1_PROJ_GRP_ID, M1_PROJ_GRP_DESCRIPTION ); // Delete project group @@ -71,7 +70,7 @@ public class MavenOneProjectTest 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 ); + addMavenOneProject( M1_POM_URL, M1_POM_USERNAME, M1_POM_PASSWORD, null, true ); assertProjectGroupSummaryPage( M1_PROJ_GRP_NAME, M1_PROJ_GRP_ID, M1_PROJ_GRP_DESCRIPTION ); } @@ -86,7 +85,7 @@ public class MavenOneProjectTest 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 ); + addMavenOneProject( M1_POM_URL, M1_POM_USERNAME, M1_POM_PASSWORD, TEST_PROJ_GRP_NAME, true ); assertProjectGroupSummaryPage( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION ); } @@ -97,7 +96,7 @@ public class MavenOneProjectTest throws Exception { goToAddMavenOneProjectPage(); - addMavenOneProject( "", "", "", null, null, false ); + addMavenOneProject( "", "", "", null, false ); assertTextPresent( "Either POM URL or Upload POM is required." ); } @@ -111,7 +110,7 @@ public class MavenOneProjectTest 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 ); + addMavenOneProject( M1_MISS_REPO_POM_URL, M1_POM_USERNAME, M1_POM_PASSWORD, null, false ); assertTextPresent( "Missing 'repository' element in the POM." ); } @@ -125,7 +124,7 @@ public class MavenOneProjectTest 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 ); + addMavenOneProject( M1_EXTENDED_POM_URL, M1_POM_USERNAME, M1_POM_PASSWORD, null, false ); assertTextPresent( "Cannot use a POM with an 'extend' element" ); } @@ -139,7 +138,7 @@ public class MavenOneProjectTest 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 ); + addMavenOneProject( M1_UNPARSEABLE_POM_URL, M1_POM_USERNAME, M1_POM_PASSWORD, null, false ); assertTextPresent( "The XML content of the POM can not be parsed." ); } @@ -151,7 +150,7 @@ public class MavenOneProjectTest { String pomUrl = "aaa"; goToAddMavenOneProjectPage(); - addMavenOneProject( pomUrl, "", "", null, null, false ); + addMavenOneProject( pomUrl, "", "", null, false ); assertTextPresent( "The specified resource cannot be accessed. Please try again later or contact your administrator." ); } @@ -163,7 +162,7 @@ public class MavenOneProjectTest { String pomUrl = "http://localhost:9595/"; goToAddMavenOneProjectPage(); - addMavenOneProject( pomUrl, "", "", null, null, false ); + addMavenOneProject( pomUrl, "", "", null, false ); assertTextPresent( "POM file does not exist. Either the POM you specified or one of its modules does not exist." ); } @@ -223,17 +222,14 @@ public class MavenOneProjectTest } private void addMaven1Project( String groupName ) - throws Exception { String M1_POM_URL = getProperty( "M1_DELETE_POM_URL" ); String M1_POM_USERNAME = getProperty( "M1_POM_USERNAME" ); String M1_POM_PASSWORD = getProperty( "M1_POM_PASSWORD" ); - String M1_PROJ_GRP_ID = getProperty( "M1_DELETE_PROJ_GRP_ID" ); - String M1_PROJ_GRP_DESCRIPTION = getProperty( "M1_DELETE_PROJ_GRP_DESCRIPTION" ); - + goToAddMavenOneProjectPage(); assertLinkNotPresent( groupName ); - addMavenOneProject( M1_POM_URL, M1_POM_USERNAME, M1_POM_PASSWORD, null, null, true ); + addMavenOneProject( M1_POM_URL, M1_POM_USERNAME, M1_POM_PASSWORD, null, true ); goToProjectGroupsSummaryPage(); assertLinkPresent( groupName ); } 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=1369756&r1=1369755&r2=1369756&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 Aug 6 09:24:56 2012 @@ -157,7 +157,7 @@ public class MavenTwoProjectTest public void testNoPomSpecified() throws Exception { - submitAddMavenTwoProjectPage( "", false ); + submitAddMavenTwoProjectPage( "" ); assertTextPresent( "Either POM URL or Upload POM is required." ); } @@ -168,7 +168,7 @@ public class MavenTwoProjectTest throws Exception { String pomUrl = getProperty( "NOT_SCM_POM_URL" ); - submitAddMavenTwoProjectPage( pomUrl, false ); + submitAddMavenTwoProjectPage( pomUrl ); assertTextPresent( "Missing ''scm'' element in the POM, project Maven Two Project" ); } @@ -179,7 +179,7 @@ public class MavenTwoProjectTest throws Exception { String pomUrl = "aaa"; - submitAddMavenTwoProjectPage( pomUrl, false ); + submitAddMavenTwoProjectPage( pomUrl ); assertTextPresent( "The specified resource cannot be accessed. Please try again later or contact your administrator." ); } @@ -190,7 +190,7 @@ public class MavenTwoProjectTest throws Exception { String pomUrl = getProperty( "MISS_CONECT_POM_URL" ); - submitAddMavenTwoProjectPage( pomUrl, false ); + submitAddMavenTwoProjectPage( pomUrl ); assertTextPresent( "Missing 'connection' sub-element in the 'scm' element in the POM." ); } @@ -201,7 +201,7 @@ public class MavenTwoProjectTest throws Exception { String pomUrl = "file:///pom.xml"; - submitAddMavenTwoProjectPage( pomUrl, false ); + submitAddMavenTwoProjectPage( pomUrl ); assertTextPresent( "The specified resource isn't a file or the protocol used isn't allowed." ); } @@ -212,7 +212,7 @@ public class MavenTwoProjectTest throws Exception { String pomUrl = getProperty( "MISS_PARENT_POM_URL" ); - submitAddMavenTwoProjectPage( pomUrl, false ); + submitAddMavenTwoProjectPage( pomUrl ); assertTextPresent( "Missing artifact trying to build the POM. Check that its parent POM is available or add it first in Continuum." ); } @@ -223,7 +223,7 @@ public class MavenTwoProjectTest throws Exception { String pomUrl = getProperty( "MISS_SUBPRO_POM_URL" ); - submitAddMavenTwoProjectPage( pomUrl, false ); + submitAddMavenTwoProjectPage( pomUrl ); assertTextPresent( "Unknown error trying to build POM." ); } @@ -234,7 +234,7 @@ public class MavenTwoProjectTest throws Exception { String pomUrl = "http://localhost:9595/"; - submitAddMavenTwoProjectPage( pomUrl, false ); + submitAddMavenTwoProjectPage( pomUrl ); assertTextPresent( "POM file does not exist. Either the POM you specified or one of its modules does not exist." ); } @@ -258,7 +258,10 @@ public class MavenTwoProjectTest goToProjectGroupsSummaryPage(); // delete project - delete icon - addMaven2Project( M2_PROJ_GRP_NAME ); + addMavenTwoProject( getProperty( "M2_DELETE_POM_URL" ), getProperty( "M2_POM_USERNAME" ), + getProperty( "M2_POM_PASSWORD" ), null, true ); + goToProjectGroupsSummaryPage(); + assertLinkPresent( M2_PROJ_GRP_NAME ); clickLinkWithText( M2_PROJ_GRP_NAME ); assertPage( "Continuum - Project Group" ); @@ -281,7 +284,10 @@ public class MavenTwoProjectTest assertLinkNotPresent( M2_PROJ_GRP_NAME ); // delete project - "Delete Project(s)" button - addMaven2Project( M2_PROJ_GRP_NAME ); + addMavenTwoProject( getProperty( "M2_DELETE_POM_URL" ), getProperty( "M2_POM_USERNAME" ), + getProperty( "M2_POM_PASSWORD" ), null, true ); + goToProjectGroupsSummaryPage(); + assertLinkPresent( M2_PROJ_GRP_NAME ); clickLinkWithText( M2_PROJ_GRP_NAME ); assertPage( "Continuum - Project Group" ); 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=1369756&r1=1369755&r2=1369756&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 Aug 6 09:24:56 2012 @@ -20,7 +20,6 @@ package org.apache.continuum.web.test; */ import org.apache.continuum.web.test.parent.AbstractAdminTest; -import org.apache.continuum.web.test.parent.AbstractSeleniumTest; import org.testng.Assert; import org.testng.annotations.Test; @@ -34,28 +33,30 @@ import org.testng.annotations.Test; public class MyAccountTest extends AbstractAdminTest { - public String newFullName = "Admin_FullName"; - public String newEmail = "new_admin@mail.com"; + private static final String NEW_FULL_NAME = "Admin_FullName"; + + private static final String NEW_EMAIL = "new_admin@mail.com"; public void testMyAccountEdit() throws Exception { clickLinkWithText( "Edit Details" ); String email = getFieldValue( "user.email" ); - setFieldValue( "user.fullName", newFullName ); - setFieldValue( "user.email", newEmail ); + String fullName = getFieldValue( "user.fullName" ); + setFieldValue( "user.fullName", NEW_FULL_NAME ); + setFieldValue( "user.email", NEW_EMAIL ); submit(); getSelenium().waitForPageToLoad( maxWaitTimeInMs ); Assert.assertEquals( "Continuum - Group Summary", getTitle() ); clickLinkWithText( "Edit Details" ); - assertFieldValue( newFullName, "user.fullName" ); - assertFieldValue( newEmail, "user.email" ); - setFieldValue( "user.fullName", getProperty( "ADMIN_USERNAME" ) ); + assertFieldValue( NEW_FULL_NAME, "user.fullName" ); + assertFieldValue( NEW_EMAIL, "user.email" ); + setFieldValue( "user.fullName", fullName ); setFieldValue( "user.email", email ); submit(); clickLinkWithText( "Edit Details" ); - assertFieldValue( getProperty( "ADMIN_USERNAME" ), "user.fullName" ); + assertFieldValue( fullName, "user.fullName" ); assertFieldValue( email, "user.email" ); } } Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/NotifierTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/NotifierTest.java?rev=1369756&r1=1369755&r2=1369756&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/NotifierTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/NotifierTest.java Mon Aug 6 09:24:56 2012 @@ -570,11 +570,11 @@ public class NotifierTest String WAGON_NOTIFIER_URL = getProperty( "WAGON_NOTIFIER_URL" ); String WAGON_SERVER_ID = getProperty( "WAGON_SERVER_ID" ); String newId = "newId"; - String newUrl = WAGON_NOTIFIER_URL; goToProjectInformationPage( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME ); - editWagonNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME, WAGON_NOTIFIER_URL, WAGON_SERVER_ID, newUrl, newId, + editWagonNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME, WAGON_NOTIFIER_URL, WAGON_SERVER_ID, + WAGON_NOTIFIER_URL, newId, true ); - editWagonNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME, newUrl, newId, WAGON_NOTIFIER_URL, WAGON_SERVER_ID, + editWagonNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME, WAGON_NOTIFIER_URL, newId, WAGON_NOTIFIER_URL, WAGON_SERVER_ID, true ); } @@ -623,12 +623,11 @@ public class NotifierTest String WAGON_NOTIFIER_URL = getProperty( "WAGON_NOTIFIER_URL" ); String WAGON_SERVER_ID = getProperty( "WAGON_SERVER_ID" ); String newId = "newId"; - String newUrl = WAGON_NOTIFIER_URL; showProjectGroup( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION ); clickLinkWithText( "Notifiers" ); assertGroupNotifierPage( TEST_PROJ_GRP_NAME ); - editWagonNotifier( TEST_PROJ_GRP_NAME, null, WAGON_NOTIFIER_URL, WAGON_SERVER_ID, newUrl, newId, true ); - editWagonNotifier( TEST_PROJ_GRP_NAME, null, newUrl, newId, WAGON_NOTIFIER_URL, WAGON_SERVER_ID, true ); + editWagonNotifier( TEST_PROJ_GRP_NAME, null, WAGON_NOTIFIER_URL, WAGON_SERVER_ID, WAGON_NOTIFIER_URL, newId, true ); + editWagonNotifier( TEST_PROJ_GRP_NAME, null, WAGON_NOTIFIER_URL, newId, WAGON_NOTIFIER_URL, WAGON_SERVER_ID, true ); } @Test( dependsOnMethods = { "testAddValidWagonGroupNotifier" } ) Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java?rev=1369756&r1=1369755&r2=1369756&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java Mon Aug 6 09:24:56 2012 @@ -20,8 +20,6 @@ package org.apache.continuum.web.test; */ import org.apache.continuum.web.test.parent.AbstractAdminTest; -import org.apache.continuum.web.test.parent.AbstractContinuumTest; -import org.apache.continuum.web.test.parent.AbstractSeleniumTest; import org.testng.annotations.Test; /** @@ -179,10 +177,10 @@ public class ProjectGroupTest addProjectGroup( GRP_NAME_THREE, GRP_ID_THREE, GRP_DESCRIPTION_THREE, true ); assertLinkPresent( GRP_NAME_THREE ); - createAndAddUserAsDeveloperToGroup( "username1", "user1", "user1@something.com", "password123", GRP_NAME_ONE ); - createAndAddUserAsDeveloperToGroup( "username2", "user2", "user2@something.com", "password123", GRP_NAME_ONE ); - createAndAddUserAsDeveloperToGroup( "username3", "user3", "user3@something.com", "password123", GRP_NAME_TWO ); - createAndAddUserAsDeveloperToGroup( "username4", "user4", "user4@something.com", "password123", GRP_NAME_THREE ); + createAndAddUserAsDeveloperToGroup( "username1", "user1", "user1@something.com", GRP_NAME_ONE ); + createAndAddUserAsDeveloperToGroup( "username2", "user2", "user2@something.com", GRP_NAME_ONE ); + createAndAddUserAsDeveloperToGroup( "username3", "user3", "user3@something.com", GRP_NAME_TWO ); + createAndAddUserAsDeveloperToGroup( "username4", "user4", "user4@something.com", GRP_NAME_THREE ); showMembers( GRP_NAME_ONE, GRP_ID_ONE, GRP_DESCRIPTION_ONE ); assertUserPresent( "username1", "user1", "user1@something.com" ); Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java?rev=1369756&r1=1369755&r2=1369756&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java Mon Aug 6 09:24:56 2012 @@ -21,7 +21,6 @@ package org.apache.continuum.web.test; import org.apache.continuum.web.test.parent.AbstractBuildQueueTest; import org.testng.annotations.Test; -import org.apache.continuum.web.test.ScheduleTest; /** @@ -129,7 +128,7 @@ public class QueueTest 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" ); - buildProjectForQueuePageTest( M2_PROJ_GRP_NAME, M2_PROJ_GRP_ID, M2_PROJ_GRP_DESCRIPTION, M2_PROJ_GRP_NAME ); + buildProjectForQueuePageTest( M2_PROJ_GRP_NAME, M2_PROJ_GRP_ID, M2_PROJ_GRP_DESCRIPTION ); String location = getSelenium().getLocation(); //check queue page while building @@ -159,7 +158,7 @@ public class QueueTest try { enableDistributedBuilds(); - buildProjectForQueuePageTest( M2_PROJ_GRP_NAME, M2_PROJ_GRP_ID, M2_PROJ_GRP_DESCRIPTION, M2_PROJ_GRP_NAME ); + buildProjectForQueuePageTest( M2_PROJ_GRP_NAME, M2_PROJ_GRP_ID, M2_PROJ_GRP_DESCRIPTION ); //check queue page while building getSelenium().open( "/continuum/admin/displayQueues!display.action" ); Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ReleaseTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ReleaseTest.java?rev=1369756&r1=1369755&r2=1369756&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ReleaseTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ReleaseTest.java Mon Aug 6 09:24:56 2012 @@ -19,10 +19,12 @@ package org.apache.continuum.web.test; * under the License. */ -import java.io.File; import org.apache.continuum.web.test.parent.AbstractReleaseTest; import org.testng.annotations.Test; +import java.io.File; +import java.io.IOException; + @Test( groups = { "release" } ) public class ReleaseTest extends AbstractReleaseTest @@ -54,7 +56,7 @@ public class ReleaseTest clickButtonWithValue( "Release" ); assertReleaseSuccess(); releasePrepareProject( M2_PROJ_USERNAME, M2_PROJ_PASSWORD, M2_PROJ_TAGBASE, M2_PROJ_TAG, - M2_PROJ_RELEASE_VERSION, M2_PROJ_DEVELOPMENT_VERSION, M2_PROJECT_BUILD_ENV, false ); + M2_PROJ_RELEASE_VERSION, M2_PROJ_DEVELOPMENT_VERSION, M2_PROJECT_BUILD_ENV ); assertPreparedReleasesFileCreated(); } finally @@ -118,10 +120,8 @@ public class ReleaseTest public void testReleasePrepareProjectWithNoBuildagentGroupInBuildEnvironment() throws Exception { - String M2_PROJECT_NAME = getProperty( "M2_RELEASE_PROJECT_NAME" ); String M2_PROJECT_GROUP_NAME = getProperty( "M2_RELEASE_GRP_NAME" ); String M2_PROJECT_GROUP_ID = getProperty( "M2_RELEASE_GRP_ID" ); - String M2_PROJECT_DESCRIPTION = getProperty( "M2_RELEASE_GRP_DESCRIPTION" ); String M2_PROJECT_TAGBASE = getProperty( "M2_RELEASE_TAGBASE_URL" ); String M2_PROJECT_TAG = getProperty( "M2_RELEASE_TAG" ); String M2_PROJECT_RELEASE_VERSION = getProperty( "M2_RELEASE_RELEASE_VERSION" ); @@ -162,10 +162,8 @@ public class ReleaseTest public void testReleasePrepareProjectWithNoBuildEnvironment() throws Exception { - String M2_PROJECT_NAME = getProperty( "M2_RELEASE_PROJECT_NAME" ); String M2_PROJECT_GROUP_NAME = getProperty( "M2_RELEASE_GRP_NAME" ); String M2_PROJECT_GROUP_ID = getProperty( "M2_RELEASE_GRP_ID" ); - String M2_PROJECT_DESCRIPTION = getProperty( "M2_RELEASE_GRP_DESCRIPTION" ); String M2_PROJECT_TAGBASE = getProperty( "M2_RELEASE_TAGBASE_URL" ); String M2_PROJECT_TAG = getProperty( "M2_RELEASE_TAG" ); String M2_PROJECT_RELEASE_VERSION = getProperty( "M2_RELEASE_RELEASE_VERSION" ); @@ -220,7 +218,7 @@ public class ReleaseTest clickButtonWithValue( "Release" ); assertReleaseSuccess(); releasePerformProjectWithProvideParameters( M2_PROJ_USERNAME, M2_PROJ_PASSWORD, M2_PROJ_TAGBASE, M2_PROJ_TAG, - M2_PROJ_SCM_URL, M2_PROJECT_BUILD_ENV, false ); + M2_PROJ_SCM_URL, M2_PROJECT_BUILD_ENV ); assertPreparedReleasesFileCreated(); removeProjectGroup( M2_PROJ_GRP_NAME ); @@ -233,17 +231,20 @@ public class ReleaseTest } private void init() + throws IOException { File file = new File( "target/conf/prepared-releases.xml" ); if ( file.exists() ) { - file.delete(); + if ( !file.delete() ) + { + throw new IOException( "Unable to delete existing prepared-releases.xml file" ); + } } } private void createBuildEnvAndBuildagentGroup() - throws Exception { String M2_PROJECT_BUILD_ENV = getProperty( "M2_RELEASE_BUILD_ENV" ); String M2_PROJECT_AGENT_GROUP = getProperty( "M2_RELEASE_AGENT_GROUP" ); @@ -295,7 +296,6 @@ public class ReleaseTest } private void attachBuildagentInGroup() - throws Exception { String M2_PROJECT_AGENT_GROUP = getProperty( "M2_RELEASE_AGENT_GROUP" ); String buildAgent = getBuildAgentUrl(); @@ -313,7 +313,6 @@ public class ReleaseTest } private void detachBuildagentFromGroup() - throws Exception { String M2_PROJECT_AGENT_GROUP = getProperty( "M2_RELEASE_AGENT_GROUP" ); String buildAgent = getBuildAgentUrl(); Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ShellProjectTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ShellProjectTest.java?rev=1369756&r1=1369755&r2=1369756&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ShellProjectTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ShellProjectTest.java Mon Aug 6 09:24:56 2012 @@ -20,7 +20,6 @@ package org.apache.continuum.web.test; */ import org.apache.continuum.web.test.parent.AbstractAdminTest; -import org.apache.continuum.web.test.parent.AbstractContinuumTest; import org.testng.annotations.Test; /** @@ -48,7 +47,7 @@ public class ShellProjectTest String DEFAULT_PROJ_GRP_DESCRIPTION = getProperty( "DEFAULT_PROJ_GRP_DESCRIPTION" ); goToAddShellProjectPage(); addProject( SHELL_NAME, SHELL_DESCRIPTION, SHELL_VERSION, SHELL_SCM_URL, SHELL_SCM_USERNAME, - SHELL_SCM_PASSWORD, SHELL_TAG, false, DEFAULT_PROJ_GRP_NAME, null, true, "shell" ); + SHELL_SCM_PASSWORD, SHELL_TAG, DEFAULT_PROJ_GRP_NAME, true, "shell" ); assertProjectGroupSummaryPage( DEFAULT_PROJ_GRP_NAME, DEFAULT_PROJ_GRP_ID, DEFAULT_PROJ_GRP_DESCRIPTION ); } @@ -63,11 +62,9 @@ public class ShellProjectTest String SHELL_SCM_USERNAME = getProperty( "SHELL_SCM_USERNAME" ); String SHELL_SCM_PASSWORD = getProperty( "SHELL_SCM_PASSWORD" ); 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" ); goToAddShellProjectPage(); - addProject( SHELL_NAME, SHELL_DESCRIPTION, SHELL_VERSION, SHELL_SCM_URL, SHELL_SCM_USERNAME, - SHELL_SCM_PASSWORD, SHELL_TAG, false, DEFAULT_PROJ_GRP_NAME, null, false, "shell" ); + addProject( SHELL_NAME, SHELL_DESCRIPTION, SHELL_VERSION, SHELL_SCM_URL, SHELL_SCM_USERNAME, SHELL_SCM_PASSWORD, + SHELL_TAG, DEFAULT_PROJ_GRP_NAME, false, "shell" ); assertTextPresent( "Name contains invalid characters." ); assertTextPresent( "Version contains invalid characters." ); assertTextPresent( "SCM Url contains invalid characters." ); @@ -97,7 +94,7 @@ public class ShellProjectTest String SHELL_SCM_PASSWORD = getProperty( "SHELL_SCM_PASSWORD" ); goToAddShellProjectPage(); addProject( SHELL_NAME, SHELL_DESCRIPTION, SHELL_VERSION, SHELL_SCM_URL, SHELL_SCM_USERNAME, - SHELL_SCM_PASSWORD, SHELL_TAG, false, null, null, false, "shell" ); + SHELL_SCM_PASSWORD, SHELL_TAG, null, false, "shell" ); assertTextPresent( "Project name already exist" ); } Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/UserRolesManagementTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/UserRolesManagementTest.java?rev=1369756&r1=1369755&r2=1369756&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/UserRolesManagementTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/UserRolesManagementTest.java Mon Aug 6 09:24:56 2012 @@ -12,8 +12,8 @@ public class UserRolesManagementTest username = getProperty( "GUEST_USERNAME" ); fullname = getProperty( "GUEST_FULLNAME" ); - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); - deleteUser( username, fullname, getUserEmail() ); + createUser( username, fullname, getUserEmail(), getUserRolePassword() ); + deleteUser( username ); clickLinkWithText( "Logout" ); } @@ -28,7 +28,7 @@ public class UserRolesManagementTest username = getProperty( "GUEST_USERNAME" ); fullname = getProperty( "GUEST_FULLNAME" ); - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); + createUser( username, fullname, getUserEmail(), getUserRolePassword() ); assertCreatedUserInfo( username ); //checkUserRoleWithValue( fullname ); clickLinkWithLocator( "addRolesToUser_addNDSelectedRoles", false ); @@ -66,7 +66,7 @@ public class UserRolesManagementTest username = getProperty( "REGISTERED_USERNAME" ); fullname = getProperty( "REGISTERED_FULLNAME" ); - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); + createUser( username, fullname, getUserEmail(), getUserRolePassword() ); assertCreatedUserInfo( username ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); @@ -107,7 +107,7 @@ public class UserRolesManagementTest username = getProperty( "SYSAD_USERNAME" ); fullname = getProperty( "SYSAD_FULLNAME" ); - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); + createUser( username, fullname, getUserEmail(), getUserRolePassword() ); assertCreatedUserInfo( username ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); @@ -147,7 +147,7 @@ public class UserRolesManagementTest username = getProperty( "USERADMIN_USERNAME" ); fullname = getProperty( "USERADMIN_FULLNAME" ); - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); + createUser( username, fullname, getUserEmail(), getUserRolePassword() ); assertCreatedUserInfo( username ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); @@ -185,7 +185,7 @@ public class UserRolesManagementTest selectValue( "name=ec_rd", "50" ); waitPage(); // delete user - deleteUser( "guest0", "guest0", "guest0@guest0.com" ); + deleteUser( "guest0" ); // TODO edit user clickLinkWithText( "Logout" ); @@ -204,7 +204,7 @@ public class UserRolesManagementTest username = getProperty( "GROUPPROJECTADMIN_USERNAME" ); fullname = getProperty( "GROUPPROJECTADMIN_FULLNAME" ); - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); + createUser( username, fullname, getUserEmail(), getUserRolePassword() ); assertCreatedUserInfo( username ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); @@ -339,7 +339,7 @@ public class UserRolesManagementTest username = getProperty( "GROUPPROJECTDEVELOPER_USERNAME" ); fullname = getProperty( "GROUPPROJECTDEVELOPER_FULLNAME" ); - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); + createUser( username, fullname, getUserEmail(), getUserRolePassword() ); assertCreatedUserInfo( username ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); @@ -361,7 +361,7 @@ public class UserRolesManagementTest username = getProperty( "GROUPPROJECTUSER_USERNAME" ); fullname = getProperty( "GROUPPROJECTUSER_FULLNAME" ); - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); + createUser( username, fullname, getUserEmail(), getUserRolePassword() ); assertCreatedUserInfo( username ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); @@ -383,7 +383,7 @@ public class UserRolesManagementTest username = getProperty( "MANAGEBUILDENVIRONMENT_USERNAME" ); fullname = getProperty( "MANAGEBUILDENVIRONMENT_FULLNAME" ); - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); + createUser( username, fullname, getUserEmail(), getUserRolePassword() ); assertCreatedUserInfo( username ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); @@ -405,7 +405,7 @@ public class UserRolesManagementTest username = getProperty( "MANAGEBUILDTEMPLATES_USERNAME" ); fullname = getProperty( "MANAGEBUILDTEMPLATES_FULLNAME" ); - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); + createUser( username, fullname, getUserEmail(), getUserRolePassword() ); assertCreatedUserInfo( username ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); @@ -427,7 +427,7 @@ public class UserRolesManagementTest username = getProperty( "MANAGEINSTALLATIONS_USERNAME" ); fullname = getProperty( "MANAGEINSTALLATIONS_FULLNAME" ); - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); + createUser( username, fullname, getUserEmail(), getUserRolePassword() ); assertCreatedUserInfo( username ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); @@ -449,7 +449,7 @@ public class UserRolesManagementTest username = getProperty( "MANAGELOCALREPOS_USERNAME" ); fullname = getProperty( "MANAGELOCALREPOS_FULLNAME" ); - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); + createUser( username, fullname, getUserEmail(), getUserRolePassword() ); assertCreatedUserInfo( username ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); @@ -471,7 +471,7 @@ public class UserRolesManagementTest username = getProperty( "MANAGEPURGING_USERNAME" ); fullname = getProperty( "MANAGEPURGING_FULLNAME" ); - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); + createUser( username, fullname, getUserEmail(), getUserRolePassword() ); assertCreatedUserInfo( username ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); @@ -493,7 +493,7 @@ public class UserRolesManagementTest username = getProperty( "MANAGEQUEUES_USERNAME" ); fullname = getProperty( "MANAGEQUEUES_FULLNAME" ); - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); + createUser( username, fullname, getUserEmail(), getUserRolePassword() ); assertCreatedUserInfo( username ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); @@ -515,7 +515,7 @@ public class UserRolesManagementTest username = getProperty( "MANAGESCHEDULING_USERNAME" ); fullname = getProperty( "MANAGESCHEDULING_FULLNAME" ); - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); + createUser( username, fullname, getUserEmail(), getUserRolePassword() ); assertCreatedUserInfo( username ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); @@ -537,7 +537,7 @@ public class UserRolesManagementTest username = getProperty( "PROJECTADMINISTRATOR_DEFAULTPROJECTGROUP_USERNAME" ); fullname = getProperty( "PROJECTADMINISTRATOR_DEFAULTPROJECTGROUP_FULLNAME" ); - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); + createUser( username, fullname, getUserEmail(), getUserRolePassword() ); assertCreatedUserInfo( username ); checkResourceRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); @@ -559,7 +559,7 @@ public class UserRolesManagementTest username = getProperty( "PROJECTDEVELOPER_DEFAULTPROJECTGROUP_USERNAME" ); fullname = getProperty( "PROJECTDEVELOPER_DEFAULTPROJECTGROUP_FULLNAME" ); - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); + createUser( username, fullname, getUserEmail(), getUserRolePassword() ); assertCreatedUserInfo( username ); checkResourceRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); @@ -581,7 +581,7 @@ public class UserRolesManagementTest username = getProperty( "PROJECTUSER_DEFAULTPROJECTGROUP_USERNAME" ); fullname = getProperty( "PROJECTUSER_DEFAULTPROJECTGROUP_FULLNAME" ); - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); + createUser( username, fullname, getUserEmail(), getUserRolePassword() ); assertCreatedUserInfo( username ); checkResourceRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/listener/CaptureScreenShotsListener.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/listener/CaptureScreenShotsListener.java?rev=1369756&r1=1369755&r2=1369756&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/listener/CaptureScreenShotsListener.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/listener/CaptureScreenShotsListener.java Mon Aug 6 09:24:56 2012 @@ -19,18 +19,18 @@ package org.apache.continuum.web.test.li * under the License. */ +import com.thoughtworks.selenium.Selenium; +import org.apache.commons.io.FileUtils; +import org.apache.continuum.web.test.parent.AbstractSeleniumTest; +import org.testng.ITestResult; +import org.testng.TestListenerAdapter; + import java.io.File; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.regex.Pattern; -import org.apache.continuum.web.test.parent.AbstractSeleniumTest; -import org.apache.commons.io.FileUtils; -import org.testng.ITestResult; -import org.testng.TestListenerAdapter; -import com.thoughtworks.selenium.Selenium; - public class CaptureScreenShotsListener extends TestListenerAdapter { @@ -85,7 +85,10 @@ public class CaptureScreenShotsListener int lNumber = stackTrace[index].getLineNumber(); String lineNumber = Integer.toString( lNumber ); String className = cName.substring( cName.lastIndexOf( '.' ) + 1 ); - targetPath.mkdirs(); + if ( !targetPath.mkdirs() ) + { + System.out.println( "Unable to create screenshots directory" ); + } String fileBaseName = methodName + "_" + className + ".java_" + lineNumber + "-" + time; try { @@ -134,9 +137,4 @@ public class CaptureScreenShotsListener i--; return i; } - - public static void captureScreenshotAndSource( String name ) - { - captureScreenshotAndSource( name, new Exception() ); - } } Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractAdminTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractAdminTest.java?rev=1369756&r1=1369755&r2=1369756&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractAdminTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractAdminTest.java Mon Aug 6 09:24:56 2012 @@ -70,7 +70,7 @@ public abstract class AbstractAdminTest } } - public void goToAddBuildAgent() + protected void goToAddBuildAgent() { goToBuildAgentPage(); assertBuildAgentPage(); @@ -78,7 +78,7 @@ public abstract class AbstractAdminTest assertAddEditBuildAgentPage( true ); } - public void assertAddEditBuildAgentPage( boolean isChecked ) + void assertAddEditBuildAgentPage( boolean isChecked ) { assertPage( "Continuum - Add/Edit Build Agent" ); assertTextPresent( "Add/Edit Build Agent" ); @@ -90,23 +90,10 @@ public abstract class AbstractAdminTest if ( isChecked ) { - assertIsChecked( "saveBuildAgent_buildAgent_enabled" ); + assertIsChecked(); } assertButtonWithValuePresent( "Save" ); assertButtonWithValuePresent( "Cancel" ); } - - protected void addMaven2Project( String groupName ) - throws Exception - { - String M2_POM_URL = getProperty( "M2_DELETE_POM_URL" ); - String M2_POM_USERNAME = getProperty( "M2_POM_USERNAME" ); - String M2_POM_PASSWORD = getProperty( "M2_POM_PASSWORD" ); - String M2_PROJ_GRP_DESCRIPTION = getProperty( "M2_DELETE_PROJ_GRP_DESCRIPTION" ); - - addMavenTwoProject( M2_POM_URL, M2_POM_USERNAME, M2_POM_PASSWORD, null, true ); - goToProjectGroupsSummaryPage(); - assertLinkPresent( groupName ); - } } Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildAgentsTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildAgentsTest.java?rev=1369756&r1=1369755&r2=1369756&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildAgentsTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildAgentsTest.java Mon Aug 6 09:24:56 2012 @@ -24,13 +24,13 @@ import java.net.URLEncoder; public abstract class AbstractBuildAgentsTest extends AbstractAdminTest { - public void removeBuildAgent( String agentName ) + protected void removeBuildAgent( String agentName ) throws Exception { removeBuildAgent( agentName, true ); } - public void removeBuildAgent( String agentName, boolean failIfMissing ) + protected void removeBuildAgent( String agentName, boolean failIfMissing ) throws Exception { String deleteButton = "//a[contains(@href,'deleteBuildAgent.action') and contains(@href, '" + URLEncoder.encode( @@ -48,7 +48,8 @@ public abstract class AbstractBuildAgent } } - public void addBuildAgent( String agentURL, String description, boolean success, boolean enabled, boolean pingOk ) + protected void addBuildAgent( String agentURL, String description, boolean success, boolean enabled, + boolean pingOk ) { setFieldValue( "saveBuildAgent_buildAgent_url", agentURL ); setFieldValue("saveBuildAgent_buildAgent_description", description ); @@ -82,7 +83,7 @@ public abstract class AbstractBuildAgent } } - public void goToEditBuildAgent( String name, String description ) + protected void goToEditBuildAgent( String name, String description ) { goToBuildAgentPage(); clickImgWithAlt( "Edit" ); @@ -91,7 +92,7 @@ public abstract class AbstractBuildAgent assertFieldValue( description, "saveBuildAgent_buildAgent_description" ); } - public void addEditBuildAgent( String agentName, String newDesc ) + protected void addEditBuildAgent( String agentName, String newDesc ) { assertFieldValue( agentName, "saveBuildAgent_buildAgent_url" ); setFieldValue( "saveBuildAgent_buildAgent_description", newDesc ); @@ -100,7 +101,7 @@ public abstract class AbstractBuildAgent assertTextPresent( newDesc ); } - public void enableDisableBuildAgent( String agentName, boolean enable ) + protected void enableDisableBuildAgent( String agentName, boolean enable ) { assertFieldValue( agentName, "saveBuildAgent_buildAgent_url" ); @@ -114,10 +115,10 @@ public abstract class AbstractBuildAgent } submit(); assertBuildAgentPage(); - assertTextPresent( new Boolean( enable ).toString() ); + assertTextPresent( Boolean.toString( enable ) ); } - public void goToAddBuildAgentGroup() + protected void goToAddBuildAgentGroup() { goToBuildAgentPage(); clickAndWait("editBuildAgentGroup_0"); //add button @@ -126,8 +127,8 @@ public abstract class AbstractBuildAgent assertAddEditBuildAgentGroupPage( options, null ); } - public void addEditBuildAgentGroup( String name, String[] addBuildAgents, String[] removeBuildAgents, - boolean success ) throws Exception + protected void addEditBuildAgentGroup( String name, String[] addBuildAgents, String[] removeBuildAgents, + boolean success ) { setFieldValue( "saveBuildAgentGroup_buildAgentGroup_name", name ); if ( addBuildAgents != null && addBuildAgents.length > 0 ) @@ -157,7 +158,7 @@ public abstract class AbstractBuildAgent } } - public void assertAddEditBuildAgentGroupPage( String[] availableBuildAgents, String[] usedBuildAgents ) + void assertAddEditBuildAgentGroupPage( String[] availableBuildAgents, String[] usedBuildAgents ) { assertPage( "Continuum - Add/Edit Build Agent Group" ); assertTextPresent( "Add/Edit Build Agent Group" ); @@ -177,7 +178,7 @@ public abstract class AbstractBuildAgent assertButtonWithValuePresent( "Cancel" ); } - public void goToEditBuildAgentGroup( String name, String[] buildAgents ) + protected void goToEditBuildAgentGroup( String name, String[] buildAgents ) { goToBuildAgentPage(); String xPath = "//preceding::td[text()='" + name + "']//following::img[@alt='Edit']"; @@ -186,7 +187,7 @@ public abstract class AbstractBuildAgent assertFieldValue( name, "buildAgentGroup.name" ); } - public void removeBuildAgentGroup( String name ) + protected void removeBuildAgentGroup( String name ) { goToBuildAgentPage(); clickLinkWithXPath( "(//a[contains(@href,'deleteBuildAgentGroup.action') and contains(@href, '" + name + "')])//img" ); Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildDefinitionTemplateTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildDefinitionTemplateTest.java?rev=1369756&r1=1369755&r2=1369756&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildDefinitionTemplateTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildDefinitionTemplateTest.java Mon Aug 6 09:24:56 2012 @@ -26,13 +26,13 @@ package org.apache.continuum.web.test.pa public abstract class AbstractBuildDefinitionTemplateTest extends AbstractAdminTest { - public void goToBuildDefinitionTemplatePage() + void goToBuildDefinitionTemplatePage() { clickLinkWithText( "Build Definition Templates" ); assertBuildDefinitionTemplatePage(); } - public void assertBuildDefinitionTemplatePage() + void assertBuildDefinitionTemplatePage() { assertPage( "Continuum - Build Definition Templates" ); assertTextPresent( "Available Templates" ); @@ -41,7 +41,7 @@ public abstract class AbstractBuildDefin assertButtonWithIdPresent( "buildDefinitionAsTemplate_0" ); } - public void goToAddTemplate() + protected void goToAddTemplate() { goToBuildDefinitionTemplatePage(); clickSubmitWithLocator( "buildDefinitionTemplate_0" ); @@ -52,7 +52,7 @@ public abstract class AbstractBuildDefin assertAddEditTemplatePage( options, null ); } - public void assertAddEditTemplatePage( String[] pendingSelectBuild, String[] selectedBuild ) + void assertAddEditTemplatePage( String[] pendingSelectBuild, String[] selectedBuild ) { assertPage( "Continuum - Build Definition Template" ); assertTextPresent( "Build Definition Template" ); @@ -71,9 +71,8 @@ public abstract class AbstractBuildDefin assertButtonWithValuePresent( "Cancel" ); } - public void addEditTemplate( String name, String[] addBuildDefinitions, String[] removeBuildDefinitions, - boolean success ) - throws Exception + protected void addEditTemplate( String name, String[] addBuildDefinitions, String[] removeBuildDefinitions, + boolean success ) { setFieldValue( "buildDefinitionTemplate.name", name ); if ( addBuildDefinitions != null && addBuildDefinitions.length > 0 ) @@ -103,7 +102,7 @@ public abstract class AbstractBuildDefin } } - public void goToEditTemplate( String name, String[] buildDefinitions ) + protected void goToEditTemplate( String name, String[] buildDefinitions ) { goToBuildDefinitionTemplatePage(); String xPath = "//preceding::td[text()='" + name + "']//following::img[@alt='Edit']"; @@ -112,7 +111,7 @@ public abstract class AbstractBuildDefin assertFieldValue( name, "buildDefinitionTemplate.name" ); } - public void removeTemplate( String name ) + protected void removeTemplate( String name ) { goToBuildDefinitionTemplatePage(); clickLinkWithXPath( "(//a[contains(@href,'deleteDefinitionTemplate') and contains(@href, '" + name @@ -126,14 +125,14 @@ public abstract class AbstractBuildDefin assertBuildDefinitionTemplatePage(); } - public void goToAddBuildDefinitionTemplate() + protected void goToAddBuildDefinitionTemplate() { goToBuildDefinitionTemplatePage(); clickSubmitWithLocator( "buildDefinitionAsTemplate_0" ); assertAddEditBuildDefinitionTemplatePage(); } - public void goToEditBuildDefinitionTemplate( String description ) + protected void goToEditBuildDefinitionTemplate( String description ) { goToBuildDefinitionTemplatePage(); String xPath = "//preceding::td[text()='" + description + "']//following::img[@alt='Edit']"; @@ -141,7 +140,7 @@ public abstract class AbstractBuildDefin assertAddEditBuildDefinitionTemplatePage(); } - public void assertAddEditBuildDefinitionTemplatePage() + void assertAddEditBuildDefinitionTemplatePage() { assertPage( "Continuum - Build Definition Template" ); assertTextPresent( "Build Definition Template" ); @@ -168,9 +167,9 @@ public abstract class AbstractBuildDefin assertButtonWithValuePresent( "Cancel" ); } - public void addEditBuildDefinitionTemplate( String buildFile, String goals, String arguments, String description, - boolean buildFresh, boolean alwaysBuild, boolean isDefault, - boolean success ) + protected void addEditBuildDefinitionTemplate( String buildFile, String goals, String arguments, String description, + boolean buildFresh, boolean alwaysBuild, boolean isDefault, + boolean success ) { // Enter values into Add Build Definition fields, and submit setFieldValue( "buildDefinition.buildFile", buildFile ); @@ -212,7 +211,7 @@ public abstract class AbstractBuildDefin } } - public void removeBuildDefinitionTemplate( String description ) + protected void removeBuildDefinitionTemplate( String description ) { goToBuildDefinitionTemplatePage(); String xPath = "//preceding::td[text()='" + description + "']//following::img[@alt='Delete']"; Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildEnvironmentTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildEnvironmentTest.java?rev=1369756&r1=1369755&r2=1369756&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildEnvironmentTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildEnvironmentTest.java Mon Aug 6 09:24:56 2012 @@ -26,27 +26,27 @@ package org.apache.continuum.web.test.pa public abstract class AbstractBuildEnvironmentTest extends AbstractAdminTest { - public void goToBuildEnvironmentPage() + void goToBuildEnvironmentPage() { clickLinkWithText( "Build Environments" ); assertBuildEnvironmentPage(); } - public void assertBuildEnvironmentPage() + void assertBuildEnvironmentPage() { assertPage( "Continuum - Build Environments" ); assertTextPresent( "Build Environments" ); assertButtonWithValuePresent( "Add" ); } - public void goToAddBuildEnvironment() + protected void goToAddBuildEnvironment() { goToBuildEnvironmentPage(); clickButtonWithValue( "Add" ); assertAddBuildEnvironmentPage(); } - public void assertAddBuildEnvironmentPage() + void assertAddBuildEnvironmentPage() { assertPage( "Continuum - Build Environment" ); assertTextPresent( "Build Environment" ); @@ -56,7 +56,7 @@ public abstract class AbstractBuildEnvir assertButtonWithValuePresent( "Cancel" ); } - public void assertEditBuildEnvironmentPage( String name ) + void assertEditBuildEnvironmentPage( String name ) { assertAddBuildEnvironmentPage(); assertTextPresent( "Installation Name" ); @@ -64,21 +64,22 @@ public abstract class AbstractBuildEnvir assertFieldValue( name, "profile.name" ); } - public void addBuildEnvironment( String name, String[] installations, boolean success ) + protected void addBuildEnvironment( String name, String[] installations, boolean success ) { setFieldValue( "profile.name", name ); submit(); editBuildEnvironment( name, installations, success ); } - public void addBuildEnvironmentWithBuildAgentGroup( String name, String[] installations, String buildAgentGroupName, boolean success ) + protected void addBuildEnvironmentWithBuildAgentGroup( String name, String[] installations, + String buildAgentGroupName ) { setFieldValue( "profile.name", name ); submit(); - editBuildEnvironmentWithBuildAgentGroup( name, installations, buildAgentGroupName, success ); + editBuildEnvironmentWithBuildAgentGroup( name, installations, buildAgentGroupName, true ); } - public void editBuildEnvironment( String name, String[] installations, boolean success ) + protected void editBuildEnvironment( String name, String[] installations, boolean success ) { setFieldValue( "profile.name", name ); for ( String i : installations ) @@ -97,7 +98,8 @@ public abstract class AbstractBuildEnvir } } - public void editBuildEnvironmentWithBuildAgentGroup( String name, String[] installations, String buildAgentGroupName, boolean success ) + protected void editBuildEnvironmentWithBuildAgentGroup( String name, String[] installations, + String buildAgentGroupName, boolean success ) { setFieldValue( "profile.name", name ); selectValue( "profile.buildAgentGroup", buildAgentGroupName ); @@ -117,7 +119,7 @@ public abstract class AbstractBuildEnvir } } - public void goToEditBuildEnvironment( String name ) + protected void goToEditBuildEnvironment( String name ) { goToBuildEnvironmentPage(); String xPath = "//preceding::td[text()='" + name + "']//following::img[@alt='Edit']"; @@ -125,7 +127,7 @@ public abstract class AbstractBuildEnvir assertEditBuildEnvironmentPage( name ); } - public void removeBuildEnvironment( String name ) + protected void removeBuildEnvironment( String name ) { goToBuildEnvironmentPage(); String xPath = "//preceding::td[text()='" + name + "']//following::img[@alt='Delete']"; Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildQueueTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildQueueTest.java?rev=1369756&r1=1369755&r2=1369756&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildQueueTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildQueueTest.java Mon Aug 6 09:24:56 2012 @@ -1,7 +1,5 @@ package org.apache.continuum.web.test.parent; -import org.testng.Assert; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -28,14 +26,14 @@ import org.testng.Assert; public abstract class AbstractBuildQueueTest extends AbstractAdminTest { - public void goToBuildQueuePage() + protected void goToBuildQueuePage() { clickLinkWithText( "Build Queue" ); assertBuildQueuePage(); } - public void assertBuildQueuePage() + void assertBuildQueuePage() { assertPage( "Continumm - Parallel Build Queue" ); assertTextPresent( "Continuum - Parallel Build Queue" ); @@ -44,7 +42,7 @@ public abstract class AbstractBuildQueue assertButtonWithValuePresent( "Add" ); } - public void removeBuildQueue( String queueName ) + protected void removeBuildQueue( String queueName ) { clickLinkWithXPath( "(//a[contains(@href,'deleteBuildQueue.action') and contains(@href, '" + queueName + "')])//img" ); @@ -56,7 +54,7 @@ public abstract class AbstractBuildQueue assertBuildQueuePage(); } - public void assertAddBuildQueuePage() + void assertAddBuildQueuePage() { assertPage( "Continuum - Add/Edit Parallel Build Queue" ); assertTextPresent( "Continuum - Add/Edit Parallel Build Queue" ); @@ -66,7 +64,7 @@ public abstract class AbstractBuildQueue assertButtonWithValuePresent( "Cancel" ); } - public void addBuildQueue( String name, boolean success ) + protected void addBuildQueue( String name, boolean success ) { goToBuildQueuePage(); assertBuildQueuePage(); @@ -85,9 +83,8 @@ public abstract class AbstractBuildQueue } } - public void buildProjectForQueuePageTest( String projectGroupName, String groupId, String description, String projectName ) - throws Exception - { + protected void buildProjectForQueuePageTest( String projectGroupName, String groupId, String description ) + { showProjectGroup( projectGroupName, groupId, description ); clickButtonWithValue( "Build all projects" ); waitForElementPresent( "//img[@alt='Building']" ); Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractConfigurationTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractConfigurationTest.java?rev=1369756&r1=1369755&r2=1369756&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractConfigurationTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractConfigurationTest.java Mon Aug 6 09:24:56 2012 @@ -32,8 +32,8 @@ public abstract class AbstractConfigurat assertEditConfigurationPage(); } - public void assertEditedConfigurationPage( String working, String buildOutput, String releaseOutput, - String deploymentRepository, String baseUrl, String numberBuildParallel ) + void assertEditedConfigurationPage( String working, String buildOutput, String releaseOutput, + String deploymentRepository, String baseUrl, String numberBuildParallel ) { assertPage( "Continuum - Configuration" ); assertTextPresent( "General Configuration " ); @@ -61,9 +61,9 @@ public abstract class AbstractConfigurat } - public void submitConfiguration( String working, String buildOutput, String releaseOutput, - String deploymentRepository, String baseUrl, String numberBuildParallel, - boolean distributed, boolean success ) + protected void submitConfiguration( String working, String buildOutput, String releaseOutput, + String deploymentRepository, String baseUrl, String numberBuildParallel, + boolean distributed, boolean success ) { setFieldValue( "workingDirectory", working ); setFieldValue( "buildOutputDirectory", buildOutput ); @@ -98,7 +98,7 @@ public abstract class AbstractConfigurat assertAppearancePage(); } - protected void assertAppearancePage() + void assertAppearancePage() { assertPage( "Configure Appearance" ); assertTextPresent( "Company Details" );