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 294D010347 for ; Mon, 18 Nov 2013 07:42:35 +0000 (UTC) Received: (qmail 79379 invoked by uid 500); 18 Nov 2013 07:42:34 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 79308 invoked by uid 500); 18 Nov 2013 07:42:31 -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 79147 invoked by uid 99); 18 Nov 2013 07:42:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Nov 2013 07:42:26 +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; Mon, 18 Nov 2013 07:42:23 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 250792388B4E; Mon, 18 Nov 2013 07:42:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1542940 - in /continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test: QueueTest.java ScheduleTest.java parent/AbstractAdminTest.java Date: Mon, 18 Nov 2013 07:42:02 -0000 To: commits@continuum.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131118074202.250792388B4E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Mon Nov 18 07:42:01 2013 New Revision: 1542940 URL: http://svn.apache.org/r1542940 Log: [CONTINUUM-2713] ensure test can be re-run Modified: continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ScheduleTest.java continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractAdminTest.java Modified: continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java?rev=1542940&r1=1542939&r2=1542940&view=diff ============================================================================== --- continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java (original) +++ continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java Mon Nov 18 07:42:01 2013 @@ -20,6 +20,7 @@ package org.apache.continuum.web.test; */ import org.apache.continuum.web.test.parent.AbstractAdminTest; +import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -41,6 +42,13 @@ public class QueueTest buildQueueName = getProperty( "BUILD_QUEUE_NAME" ); } + @AfterClass + protected void tearDown() + { + goToBuildQueuePage(); + removeBuildQueue( buildQueueName ); + } + public void testAddBuildQueue() { setMaxBuildQueue( 2 ); @@ -79,12 +87,16 @@ public class QueueTest goToAddSchedule(); addEditSchedule( scheduleName, scheduleDescription, second, minute, hour, dayOfMonth, month, dayOfWeek, year, maxTime, period, true, true ); - goToEditSchedule( scheduleName, scheduleDescription, second, minute, hour, dayOfMonth, month, dayOfWeek, year, - maxTime, period ); + try { + goToEditSchedule( scheduleName, scheduleDescription, second, minute, hour, dayOfMonth, month, dayOfWeek, year, + maxTime, period ); - getSelenium().addSelection( "saveSchedule_availableBuildQueuesIds", "label=" + buildQueueName ); - getSelenium().click( "//input[@value='->']" ); - submit(); + getSelenium().addSelection( "saveSchedule_availableBuildQueuesIds", "label=" + buildQueueName ); + getSelenium().click( "//input[@value='->']" ); + submit(); + } finally { + removeSchedule( scheduleName ); + } } @Test( dependsOnMethods = { "testAddBuildQueue" } ) @@ -134,9 +146,13 @@ public class QueueTest String projectGroupId = getProperty( "MAVEN2_QUEUE_TEST_POM_PROJECT_GROUP_ID" ); String projectGroupDescription = getProperty( "MAVEN2_QUEUE_TEST_POM_PROJECT_GROUP_DESCRIPTION" ); - //build a project - goToAddMavenTwoProjectPage(); - addMavenTwoProject( pomUrl, pomUsername, pomPassword, null, true ); + goToProjectGroupsSummaryPage(); + if ( !isLinkPresent( projectGroupName ) ) + { + //build a project + goToAddMavenTwoProjectPage(); + addMavenTwoProject( pomUrl, pomUsername, pomPassword, null, true ); + } buildProjectForQueuePageTest( projectGroupName, projectGroupId, projectGroupDescription ); String location = getSelenium().getLocation(); Modified: continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ScheduleTest.java URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ScheduleTest.java?rev=1542940&r1=1542939&r2=1542940&view=diff ============================================================================== --- continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ScheduleTest.java (original) +++ continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ScheduleTest.java Mon Nov 18 07:42:01 2013 @@ -163,17 +163,4 @@ public class ScheduleTest String SCHEDULE_NAME = getProperty( "SCHEDULE_NAME" ); removeSchedule( SCHEDULE_NAME ); } - - protected void removeSchedule( String name ) - { - goToSchedulePage(); - clickLinkWithXPath( "(//a[contains(@href,'removeSchedule.action') and contains(@href, '" + name + "')])//img" ); - assertPage( "Continuum - Delete Schedule" ); - assertTextPresent( "Delete Schedule" ); - assertTextPresent( "Are you sure you want to delete the schedule \"" + name + "\"?" ); - assertButtonWithValuePresent( "Delete" ); - assertButtonWithValuePresent( "Cancel" ); - clickButtonWithValue( "Delete" ); - assertSchedulePage(); - } } Modified: continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractAdminTest.java URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractAdminTest.java?rev=1542940&r1=1542939&r2=1542940&view=diff ============================================================================== --- continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractAdminTest.java (original) +++ continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractAdminTest.java Mon Nov 18 07:42:01 2013 @@ -349,4 +349,17 @@ public abstract class AbstractAdminTest assertBuildAgentPage(); assertTextPresent( newDesc ); } + + protected void removeSchedule( String name ) + { + goToSchedulePage(); + clickLinkWithXPath( "(//a[contains(@href,'removeSchedule.action') and contains(@href, '" + name + "')])//img" ); + assertPage( "Continuum - Delete Schedule" ); + assertTextPresent( "Delete Schedule" ); + assertTextPresent( "Are you sure you want to delete the schedule \"" + name + "\"?" ); + assertButtonWithValuePresent( "Delete" ); + assertButtonWithValuePresent( "Cancel" ); + clickButtonWithValue( "Delete" ); + assertSchedulePage(); + } }