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 AC166D4E0 for ; Wed, 1 Aug 2012 06:19:17 +0000 (UTC) Received: (qmail 27236 invoked by uid 500); 1 Aug 2012 06:19:17 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 27170 invoked by uid 500); 1 Aug 2012 06:19:16 -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 27133 invoked by uid 99); 1 Aug 2012 06:19:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Aug 2012 06:19:15 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Wed, 01 Aug 2012 06:19:11 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6D80623888FE for ; Wed, 1 Aug 2012 06:18:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1367865 - in /continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test: AntProjectTest.java DistributedBuildTest.java ShellProjectTest.java parent/AbstractContinuumTest.java Date: Wed, 01 Aug 2012 06:18:27 -0000 To: commits@continuum.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120801061827.6D80623888FE@eris.apache.org> Author: brett Date: Wed Aug 1 06:18:26 2012 New Revision: 1367865 URL: http://svn.apache.org/viewvc?rev=1367865&view=rev Log: some shell / ant fixes and move shell distributed builds under the same test Modified: 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/DistributedBuildTest.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/parent/AbstractContinuumTest.java 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=1367865&r1=1367864&r2=1367865&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 Wed Aug 1 06:18:26 2012 @@ -67,7 +67,6 @@ public class AntProjectTest 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" ); assertTextPresent( "Name contains invalid characters." ); - assertTextPresent( "Description contains invalid characters." ); assertTextPresent( "Version contains invalid characters." ); assertTextPresent( "SCM Url contains invalid characters." ); assertTextPresent( "SCM Tag contains invalid characters." ); 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=1367865&r1=1367864&r2=1367865&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 Wed Aug 1 06:18:26 2012 @@ -153,4 +153,56 @@ public class DistributedBuildTest buildProjectGroup( M2_PROJ_GRP_NAME, M2_PROJ_GRP_ID, M2_PROJ_GRP_DESCRIPTION, M2_PROJ_GRP_NAME, true ); } + public void testBuildShellProjectWithDistributedBuildsEnabled() + throws Exception + { + String SHELL_GROUP_NAME = getProperty( "SHELL_GROUP_NAME" ); + String SHELL_GROUP_ID = getProperty( "SHELL_GROUP_ID" ); + String SHELL_GROUP_DESC = getProperty( "SHELL_GROUP_DESC" ); + + String SHELL_NAME = getProperty( "SHELL_NAME_TWO" ); + String SHELL_DESCRIPTION = getProperty( "SHELL_DESCRIPTION_TWO" ); + String SHELL_VERSION = getProperty( "SHELL_VERSION_TWO" ); + String SHELL_TAG = getProperty( "SHELL_TAG_TWO" ); + String SHELL_SCM_URL = getProperty( "SHELL_SCM_URL_TWO" ); + String SHELL_SCM_USERNAME = getProperty( "SHELL_SCM_USERNAME_TWO" ); + String SHELL_SCM_PASSWORD = getProperty( "SHELL_SCM_PASSWORD_TWO" ); + + addProjectGroup( SHELL_GROUP_NAME, SHELL_GROUP_ID, SHELL_GROUP_DESC, true ); + + projectGroupName = SHELL_GROUP_NAME; + + addBuildAgent( getBuildAgentUrl() ); + + 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" ); + assertProjectGroupSummaryPage( SHELL_GROUP_NAME, SHELL_GROUP_ID, SHELL_GROUP_DESC ); + + goToProjectGroupsSummaryPage(); + clickLinkWithText( SHELL_GROUP_NAME ); + clickLinkWithText( "Build Definitions" ); + clickLinkWithXPath( "//table[@id='ec_table']/tbody/tr/td[14]/a/img" ); + + editBuildDefinitionShellType( "build.sh", "", "description", "shell", true ); + + goToProjectGroupsSummaryPage(); + + buildProjectGroup( SHELL_GROUP_NAME ,SHELL_GROUP_ID , SHELL_GROUP_DESC ,SHELL_NAME, true ); + + } + + private void editBuildDefinitionShellType( String buildFile, String arguments, String description, String buildDefinitionType, boolean alwaysBuild ) + { + setFieldValue( "buildFile", buildFile); + setFieldValue( "arguments", arguments ); + setFieldValue( "description", description ); + setFieldValue( "buildDefinitionType", buildDefinitionType ); + if( alwaysBuild ) + { + checkField( "alwaysBuild" ); + } + + submit(); + } } 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=1367865&r1=1367864&r2=1367865&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 Wed Aug 1 06:18:26 2012 @@ -69,7 +69,6 @@ public class ShellProjectTest 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" ); assertTextPresent( "Name contains invalid characters." ); - assertTextPresent( "Description contains invalid characters." ); assertTextPresent( "Version contains invalid characters." ); assertTextPresent( "SCM Url contains invalid characters." ); assertTextPresent( "SCM Tag contains invalid characters." ); @@ -102,62 +101,4 @@ public class ShellProjectTest assertTextPresent( "Project name already exist" ); } - @Test( dependsOnMethods = { "testAddBuildAgent" } ) - public void testBuildShellProjectWithDistributedBuildsEnabled() - throws Exception - { - String SHELL_GROUP_NAME = getProperty( "SHELL_GROUP_NAME" ); - String SHELL_GROUP_ID = getProperty( "SHELL_GROUP_ID" ); - String SHELL_GROUP_DESC = getProperty( "SHELL_GROUP_DESC" ); - - String SHELL_NAME = getProperty( "SHELL_NAME_TWO" ); - String SHELL_DESCRIPTION = getProperty( "SHELL_DESCRIPTION_TWO" ); - String SHELL_VERSION = getProperty( "SHELL_VERSION_TWO" ); - String SHELL_TAG = getProperty( "SHELL_TAG_TWO" ); - String SHELL_SCM_URL = getProperty( "SHELL_SCM_URL_TWO" ); - String SHELL_SCM_USERNAME = getProperty( "SHELL_SCM_USERNAME_TWO" ); - String SHELL_SCM_PASSWORD = getProperty( "SHELL_SCM_PASSWORD_TWO" ); - - addProjectGroup( SHELL_GROUP_NAME, SHELL_GROUP_ID, SHELL_GROUP_DESC, true ); - - 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" ); - assertProjectGroupSummaryPage( SHELL_GROUP_NAME, SHELL_GROUP_ID, SHELL_GROUP_DESC ); - - goToProjectGroupsSummaryPage(); - clickLinkWithText( SHELL_GROUP_NAME ); - clickLinkWithText( "Build Definitions" ); - clickLinkWithXPath( "//table[@id='ec_table']/tbody/tr/td[14]/a/img" ); - - editBuildDefinitionShellType( "build.sh", "", "description", "shell", true ); - - try - { - enableDistributedBuilds(); - - goToProjectGroupsSummaryPage(); - - buildProjectGroup( SHELL_GROUP_NAME ,SHELL_GROUP_ID , SHELL_GROUP_DESC ,SHELL_NAME, true ); - } - finally - { - disableDistributedBuilds(); - } - - } - - private void editBuildDefinitionShellType( String buildFile, String arguments, String description, String buildDefinitionType, boolean alwaysBuild ) - { - setFieldValue( "buildFile", buildFile); - setFieldValue( "arguments", arguments ); - setFieldValue( "description", description ); - setFieldValue( "buildDefinitionType", buildDefinitionType ); - if( alwaysBuild ) - { - checkField( "alwaysBuild" ); - } - - submit(); - } } Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java?rev=1367865&r1=1367864&r2=1367865&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java Wed Aug 1 06:18:26 2012 @@ -368,6 +368,7 @@ public abstract class AbstractContinuumT { showProjectGroup( projectGroupName, groupId, description ); waitForProjectUpdate(); + waitForElementPresent( "//button[@value='Build all projects']" ); clickButtonWithValue( "Build all projects" ); // wait for project to finish building