Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 70972 invoked from network); 15 Jun 2009 17:57:14 -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:14 -0000 Received: (qmail 43043 invoked by uid 500); 15 Jun 2009 17:57:26 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 42988 invoked by uid 500); 15 Jun 2009 17:57:26 -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 42979 invoked by uid 99); 15 Jun 2009 17:57:26 -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:26 +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 9CD5823888D8; 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 [2/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.9CD5823888D8@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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=784889&r1=784888&r2=784889&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 Jun 15 17:56:52 2009 @@ -33,9 +33,9 @@ public void testAddValidMailProjectNotifier() 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 MAIL_NOTIFIER_ADDRESS = p.getProperty( "MAIL_NOTIFIER_ADDRESS" ); + String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" ); + String MAIL_NOTIFIER_ADDRESS = getProperty( "MAIL_NOTIFIER_ADDRESS" ); goToProjectNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME ); addMailNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME, MAIL_NOTIFIER_ADDRESS, true ); } @@ -44,9 +44,9 @@ public void testEditValidMailProjectNotifier() 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 MAIL_NOTIFIER_ADDRESS = p.getProperty( "MAIL_NOTIFIER_ADDRESS" ); + String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" ); + String MAIL_NOTIFIER_ADDRESS = getProperty( "MAIL_NOTIFIER_ADDRESS" ); String newMail = "newmail@mail.com"; goToProjectInformationPage( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME ); editMailNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME, MAIL_NOTIFIER_ADDRESS, newMail, true ); @@ -57,9 +57,9 @@ public void testEditInvalidMailProjectNotifier() 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 MAIL_NOTIFIER_ADDRESS = p.getProperty( "MAIL_NOTIFIER_ADDRESS" ); + String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" ); + String MAIL_NOTIFIER_ADDRESS = getProperty( "MAIL_NOTIFIER_ADDRESS" ); goToProjectInformationPage( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME ); editMailNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME, MAIL_NOTIFIER_ADDRESS, "invalid_email_add", false ); } @@ -67,8 +67,8 @@ public void testAddInvalidMailProjectNotifier() 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 TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" ); goToProjectNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME ); addMailNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME, "invalid_email_add", false ); } @@ -76,10 +76,10 @@ public void testAddValidMailGroupNotifier() 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 MAIL_NOTIFIER_ADDRESS = p.getProperty( "MAIL_NOTIFIER_ADDRESS" ); + 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 MAIL_NOTIFIER_ADDRESS = getProperty( "MAIL_NOTIFIER_ADDRESS" ); goToGroupNotifier( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION ); addMailNotifier( TEST_PROJ_GRP_NAME, null, MAIL_NOTIFIER_ADDRESS, true ); } @@ -88,10 +88,10 @@ public void testEditValidMailGroupNotifier() 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 MAIL_NOTIFIER_ADDRESS = p.getProperty( "MAIL_NOTIFIER_ADDRESS" ); + 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 MAIL_NOTIFIER_ADDRESS = getProperty( "MAIL_NOTIFIER_ADDRESS" ); String newMail = "newmail@mail.com"; showProjectGroup( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION ); clickLinkWithText( "Notifiers" ); @@ -104,10 +104,10 @@ public void testEditInvalidMailGroupNotifier() 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 MAIL_NOTIFIER_ADDRESS = p.getProperty( "MAIL_NOTIFIER_ADDRESS" ); + 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 MAIL_NOTIFIER_ADDRESS = getProperty( "MAIL_NOTIFIER_ADDRESS" ); showProjectGroup( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION ); clickLinkWithText( "Notifiers" ); assertGroupNotifierPage( TEST_PROJ_GRP_NAME ); @@ -117,9 +117,9 @@ public void testAddInvalidMailGroupNotifier() 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 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" ); goToGroupNotifier( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION ); addMailNotifier( TEST_PROJ_GRP_NAME, null, "invalid_email_add", false ); } @@ -127,10 +127,10 @@ public void testAddValidIrcProjectNotifier() 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 IRC_NOTIFIER_HOST = p.getProperty( "IRC_NOTIFIER_HOST" ); - String IRC_NOTIFIER_CHANNEL = p.getProperty( "IRC_NOTIFIER_CHANNEL" ); + String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" ); + String IRC_NOTIFIER_HOST = getProperty( "IRC_NOTIFIER_HOST" ); + String IRC_NOTIFIER_CHANNEL = getProperty( "IRC_NOTIFIER_CHANNEL" ); goToProjectNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME ); addIrcNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME, IRC_NOTIFIER_HOST, IRC_NOTIFIER_CHANNEL, true ); } @@ -139,10 +139,10 @@ public void testEditValidIrcProjectNotifier() 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 IRC_NOTIFIER_HOST = p.getProperty( "IRC_NOTIFIER_HOST" ); - String IRC_NOTIFIER_CHANNEL = p.getProperty( "IRC_NOTIFIER_CHANNEL" ); + String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" ); + String IRC_NOTIFIER_HOST = getProperty( "IRC_NOTIFIER_HOST" ); + String IRC_NOTIFIER_CHANNEL = getProperty( "IRC_NOTIFIER_CHANNEL" ); String newHost = "new.test.com"; String newChannel = "new_test_channel"; goToProjectInformationPage( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME ); @@ -156,10 +156,10 @@ public void testEditInvalidIrcProjectNotifier() 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 IRC_NOTIFIER_HOST = p.getProperty( "IRC_NOTIFIER_HOST" ); - String IRC_NOTIFIER_CHANNEL = p.getProperty( "IRC_NOTIFIER_CHANNEL" ); + String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" ); + String IRC_NOTIFIER_HOST = getProperty( "IRC_NOTIFIER_HOST" ); + String IRC_NOTIFIER_CHANNEL = getProperty( "IRC_NOTIFIER_CHANNEL" ); goToProjectInformationPage( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME ); editIrcNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME, IRC_NOTIFIER_HOST, IRC_NOTIFIER_CHANNEL, "", "", false ); } @@ -167,8 +167,8 @@ public void testAddInvalidIrcProjectNotifier() 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 TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" ); goToProjectNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME ); addIrcNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME, "", "", false ); } @@ -176,11 +176,11 @@ public void testAddValidIrcGroupNotifier() 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 IRC_NOTIFIER_HOST = p.getProperty( "IRC_NOTIFIER_HOST" ); - String IRC_NOTIFIER_CHANNEL = p.getProperty( "IRC_NOTIFIER_CHANNEL" ); + 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 IRC_NOTIFIER_HOST = getProperty( "IRC_NOTIFIER_HOST" ); + String IRC_NOTIFIER_CHANNEL = getProperty( "IRC_NOTIFIER_CHANNEL" ); goToGroupNotifier( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION ); addIrcNotifier( TEST_PROJ_GRP_NAME, null, IRC_NOTIFIER_HOST, IRC_NOTIFIER_CHANNEL, true ); } @@ -189,11 +189,11 @@ public void testEditValidIrcGroupNotifier() 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 IRC_NOTIFIER_HOST = p.getProperty( "IRC_NOTIFIER_HOST" ); - String IRC_NOTIFIER_CHANNEL = p.getProperty( "IRC_NOTIFIER_CHANNEL" ); + 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 IRC_NOTIFIER_HOST = getProperty( "IRC_NOTIFIER_HOST" ); + String IRC_NOTIFIER_CHANNEL = getProperty( "IRC_NOTIFIER_CHANNEL" ); String newHost = "new.test.com"; String newChannel = "new_test_channel"; showProjectGroup( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION ); @@ -207,11 +207,11 @@ public void testEditInvalidIrcGroupNotifier() 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 IRC_NOTIFIER_HOST = p.getProperty( "IRC_NOTIFIER_HOST" ); - String IRC_NOTIFIER_CHANNEL = p.getProperty( "IRC_NOTIFIER_CHANNEL" ); + 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 IRC_NOTIFIER_HOST = getProperty( "IRC_NOTIFIER_HOST" ); + String IRC_NOTIFIER_CHANNEL = getProperty( "IRC_NOTIFIER_CHANNEL" ); showProjectGroup( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION ); clickLinkWithText( "Notifiers" ); assertGroupNotifierPage( TEST_PROJ_GRP_NAME ); @@ -221,9 +221,9 @@ public void testAddInvalidIrcGroupNotifier() 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 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" ); goToGroupNotifier( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION ); addIrcNotifier( TEST_PROJ_GRP_NAME, null, "", "", false ); } @@ -231,12 +231,12 @@ public void testAddValidJabberProjectNotifier() throws Exception { - String TEST_PROJ_GRP_NAME = p.getProperty( "TEST_PROJ_GRP_NAME" ); - String JABBER_NOTIFIER_HOST = p.getProperty( "JABBER_NOTIFIER_HOST" ); - String JABBER_NOTIFIER_LOGIN = p.getProperty( "JABBER_NOTIFIER_LOGIN" ); - String JABBER_NOTIFIER_PASSWORD = p.getProperty( "JABBER_NOTIFIER_PASSWORD" ); - String JABBER_NOTIFIER_ADDRESS = p.getProperty( "JABBER_NOTIFIER_ADDRESS" ); - String M2_PROJ_GRP_NAME = p.getProperty( "M2_PROJ_GRP_NAME" ); + String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String JABBER_NOTIFIER_HOST = getProperty( "JABBER_NOTIFIER_HOST" ); + String JABBER_NOTIFIER_LOGIN = getProperty( "JABBER_NOTIFIER_LOGIN" ); + String JABBER_NOTIFIER_PASSWORD = getProperty( "JABBER_NOTIFIER_PASSWORD" ); + String JABBER_NOTIFIER_ADDRESS = getProperty( "JABBER_NOTIFIER_ADDRESS" ); + String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" ); goToProjectNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME ); addJabberNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME, JABBER_NOTIFIER_HOST, JABBER_NOTIFIER_LOGIN, JABBER_NOTIFIER_PASSWORD, JABBER_NOTIFIER_ADDRESS, true ); @@ -246,12 +246,12 @@ public void testEditValidJabberProjectNotifier() 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 JABBER_NOTIFIER_HOST = p.getProperty( "JABBER_NOTIFIER_HOST" ); - String JABBER_NOTIFIER_LOGIN = p.getProperty( "JABBER_NOTIFIER_LOGIN" ); - String JABBER_NOTIFIER_PASSWORD = p.getProperty( "JABBER_NOTIFIER_PASSWORD" ); - String JABBER_NOTIFIER_ADDRESS = p.getProperty( "JABBER_NOTIFIER_ADDRESS" ); + String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" ); + String JABBER_NOTIFIER_HOST = getProperty( "JABBER_NOTIFIER_HOST" ); + String JABBER_NOTIFIER_LOGIN = getProperty( "JABBER_NOTIFIER_LOGIN" ); + String JABBER_NOTIFIER_PASSWORD = getProperty( "JABBER_NOTIFIER_PASSWORD" ); + String JABBER_NOTIFIER_ADDRESS = getProperty( "JABBER_NOTIFIER_ADDRESS" ); String newHost = "new_test"; String newLogin = "new_test_login"; String newPassword = "new_password"; @@ -267,11 +267,11 @@ public void testEditInvalidJabberProjectNotifier() 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 JABBER_NOTIFIER_HOST = p.getProperty( "JABBER_NOTIFIER_HOST" ); - String JABBER_NOTIFIER_LOGIN = p.getProperty( "JABBER_NOTIFIER_LOGIN" ); - String JABBER_NOTIFIER_ADDRESS = p.getProperty( "JABBER_NOTIFIER_ADDRESS" ); + String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" ); + String JABBER_NOTIFIER_HOST = getProperty( "JABBER_NOTIFIER_HOST" ); + String JABBER_NOTIFIER_LOGIN = getProperty( "JABBER_NOTIFIER_LOGIN" ); + String JABBER_NOTIFIER_ADDRESS = getProperty( "JABBER_NOTIFIER_ADDRESS" ); goToProjectInformationPage( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME ); editJabberNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME, JABBER_NOTIFIER_HOST, JABBER_NOTIFIER_LOGIN, JABBER_NOTIFIER_ADDRESS, "", "", "", "", false ); @@ -280,8 +280,8 @@ public void testAddInvalidJabberProjectNotifier() 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 TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" ); goToProjectNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME ); addJabberNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME, "", "", "", "", false ); } @@ -289,13 +289,13 @@ public void testAddValidJabberGroupNotifier() 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 JABBER_NOTIFIER_HOST = p.getProperty( "JABBER_NOTIFIER_HOST" ); - String JABBER_NOTIFIER_LOGIN = p.getProperty( "JABBER_NOTIFIER_LOGIN" ); - String JABBER_NOTIFIER_PASSWORD = p.getProperty( "JABBER_NOTIFIER_PASSWORD" ); - String JABBER_NOTIFIER_ADDRESS = p.getProperty( "JABBER_NOTIFIER_ADDRESS" ); + 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 JABBER_NOTIFIER_HOST = getProperty( "JABBER_NOTIFIER_HOST" ); + String JABBER_NOTIFIER_LOGIN = getProperty( "JABBER_NOTIFIER_LOGIN" ); + String JABBER_NOTIFIER_PASSWORD = getProperty( "JABBER_NOTIFIER_PASSWORD" ); + String JABBER_NOTIFIER_ADDRESS = getProperty( "JABBER_NOTIFIER_ADDRESS" ); goToGroupNotifier( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION ); addJabberNotifier( TEST_PROJ_GRP_NAME, null, JABBER_NOTIFIER_HOST, JABBER_NOTIFIER_LOGIN, JABBER_NOTIFIER_PASSWORD, JABBER_NOTIFIER_ADDRESS, true ); @@ -305,13 +305,13 @@ public void testEditValidJabberGroupNotifier() 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 JABBER_NOTIFIER_HOST = p.getProperty( "JABBER_NOTIFIER_HOST" ); - String JABBER_NOTIFIER_LOGIN = p.getProperty( "JABBER_NOTIFIER_LOGIN" ); - String JABBER_NOTIFIER_PASSWORD = p.getProperty( "JABBER_NOTIFIER_PASSWORD" ); - String JABBER_NOTIFIER_ADDRESS = p.getProperty( "JABBER_NOTIFIER_ADDRESS" ); + 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 JABBER_NOTIFIER_HOST = getProperty( "JABBER_NOTIFIER_HOST" ); + String JABBER_NOTIFIER_LOGIN = getProperty( "JABBER_NOTIFIER_LOGIN" ); + String JABBER_NOTIFIER_PASSWORD = getProperty( "JABBER_NOTIFIER_PASSWORD" ); + String JABBER_NOTIFIER_ADDRESS = getProperty( "JABBER_NOTIFIER_ADDRESS" ); String newHost = "new_test"; String newLogin = "new_test_login"; String newPassword = "new_password"; @@ -329,12 +329,12 @@ public void testEditInvalidJabberGroupNotifier() 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 JABBER_NOTIFIER_HOST = p.getProperty( "JABBER_NOTIFIER_HOST" ); - String JABBER_NOTIFIER_LOGIN = p.getProperty( "JABBER_NOTIFIER_LOGIN" ); - String JABBER_NOTIFIER_ADDRESS = p.getProperty( "JABBER_NOTIFIER_ADDRESS" ); + 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 JABBER_NOTIFIER_HOST = getProperty( "JABBER_NOTIFIER_HOST" ); + String JABBER_NOTIFIER_LOGIN = getProperty( "JABBER_NOTIFIER_LOGIN" ); + String JABBER_NOTIFIER_ADDRESS = getProperty( "JABBER_NOTIFIER_ADDRESS" ); showProjectGroup( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION ); clickLinkWithText( "Notifiers" ); assertGroupNotifierPage( TEST_PROJ_GRP_NAME ); @@ -345,9 +345,9 @@ public void testAddInvalidJabberGroupNotifier() 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 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" ); goToGroupNotifier( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION ); addJabberNotifier( TEST_PROJ_GRP_NAME, null, "", "", "", "", false ); } @@ -355,11 +355,11 @@ public void testAddValidMsnProjectNotifier() 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 MSN_NOTIFIER_ADDRESS = p.getProperty( "MSN_NOTIFIER_ADDRESS" ); - String MSN_NOTIFIER_LOGIN = p.getProperty( "MSN_NOTIFIER_LOGIN" ); - String MSN_NOTIFIER_PASSWORD = p.getProperty( "MSN_NOTIFIER_PASSWORD" ); + String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" ); + String MSN_NOTIFIER_ADDRESS = getProperty( "MSN_NOTIFIER_ADDRESS" ); + String MSN_NOTIFIER_LOGIN = getProperty( "MSN_NOTIFIER_LOGIN" ); + String MSN_NOTIFIER_PASSWORD = getProperty( "MSN_NOTIFIER_PASSWORD" ); goToProjectNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME ); addMsnNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME, MSN_NOTIFIER_LOGIN, MSN_NOTIFIER_PASSWORD, MSN_NOTIFIER_ADDRESS, true ); @@ -369,11 +369,11 @@ public void testEditValidMsnProjectNotifier() 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 MSN_NOTIFIER_ADDRESS = p.getProperty( "MSN_NOTIFIER_ADDRESS" ); - String MSN_NOTIFIER_LOGIN = p.getProperty( "MSN_NOTIFIER_LOGIN" ); - String MSN_NOTIFIER_PASSWORD = p.getProperty( "MSN_NOTIFIER_PASSWORD" ); + String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" ); + String MSN_NOTIFIER_ADDRESS = getProperty( "MSN_NOTIFIER_ADDRESS" ); + String MSN_NOTIFIER_LOGIN = getProperty( "MSN_NOTIFIER_LOGIN" ); + String MSN_NOTIFIER_PASSWORD = getProperty( "MSN_NOTIFIER_PASSWORD" ); String newLogin = "new_test_login"; String newPassword = "new_password"; String newAddress = "new.test@mail.com"; @@ -388,10 +388,10 @@ public void testEditInvalidMsnProjectNotifier() 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 MSN_NOTIFIER_ADDRESS = p.getProperty( "MSN_NOTIFIER_ADDRESS" ); - String MSN_NOTIFIER_LOGIN = p.getProperty( "MSN_NOTIFIER_LOGIN" ); + String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" ); + String MSN_NOTIFIER_ADDRESS = getProperty( "MSN_NOTIFIER_ADDRESS" ); + String MSN_NOTIFIER_LOGIN = getProperty( "MSN_NOTIFIER_LOGIN" ); goToProjectInformationPage( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME ); editMsnNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME, MSN_NOTIFIER_LOGIN, MSN_NOTIFIER_ADDRESS, "", "", "", false ); @@ -400,8 +400,8 @@ public void testAddInvalidMsnProjectNotifier() 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 TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" ); goToProjectNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME ); addMsnNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME, "", "", "", false ); } @@ -409,12 +409,12 @@ public void testAddValidMsnGroupNotifier() 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 MSN_NOTIFIER_ADDRESS = p.getProperty( "MSN_NOTIFIER_ADDRESS" ); - String MSN_NOTIFIER_LOGIN = p.getProperty( "MSN_NOTIFIER_LOGIN" ); - String MSN_NOTIFIER_PASSWORD = p.getProperty( "MSN_NOTIFIER_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 MSN_NOTIFIER_ADDRESS = getProperty( "MSN_NOTIFIER_ADDRESS" ); + String MSN_NOTIFIER_LOGIN = getProperty( "MSN_NOTIFIER_LOGIN" ); + String MSN_NOTIFIER_PASSWORD = getProperty( "MSN_NOTIFIER_PASSWORD" ); goToGroupNotifier( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION ); addMsnNotifier( TEST_PROJ_GRP_NAME, null, MSN_NOTIFIER_LOGIN, MSN_NOTIFIER_PASSWORD, MSN_NOTIFIER_ADDRESS, true ); } @@ -423,12 +423,12 @@ public void testEditValidMsnGroupNotifier() 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 MSN_NOTIFIER_ADDRESS = p.getProperty( "MSN_NOTIFIER_ADDRESS" ); - String MSN_NOTIFIER_LOGIN = p.getProperty( "MSN_NOTIFIER_LOGIN" ); - String MSN_NOTIFIER_PASSWORD = p.getProperty( "MSN_NOTIFIER_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 MSN_NOTIFIER_ADDRESS = getProperty( "MSN_NOTIFIER_ADDRESS" ); + String MSN_NOTIFIER_LOGIN = getProperty( "MSN_NOTIFIER_LOGIN" ); + String MSN_NOTIFIER_PASSWORD = getProperty( "MSN_NOTIFIER_PASSWORD" ); String newLogin = "new_test_login"; String newPassword = "new_password"; String newAddress = "new.test@mail.com"; @@ -445,11 +445,11 @@ public void testEditInvalidMsnGroupNotifier() 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 MSN_NOTIFIER_ADDRESS = p.getProperty( "MSN_NOTIFIER_ADDRESS" ); - String MSN_NOTIFIER_LOGIN = p.getProperty( "MSN_NOTIFIER_LOGIN" ); + 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 MSN_NOTIFIER_ADDRESS = getProperty( "MSN_NOTIFIER_ADDRESS" ); + String MSN_NOTIFIER_LOGIN = getProperty( "MSN_NOTIFIER_LOGIN" ); showProjectGroup( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION ); clickLinkWithText( "Notifiers" ); assertGroupNotifierPage( TEST_PROJ_GRP_NAME ); @@ -459,9 +459,9 @@ public void testAddInvalidMsnGroupNotifier() 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 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" ); goToGroupNotifier( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION ); addMsnNotifier( TEST_PROJ_GRP_NAME, null, "", "", "", false ); } @@ -469,10 +469,10 @@ public void testAddValidWagonProjectNotifier() 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 WAGON_NOTIFIER_URL = p.getProperty( "WAGON_NOTIFIER_URL" ); - String WAGON_SERVER_ID = p.getProperty( "WAGON_SERVER_ID" ); + String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" ); + String WAGON_NOTIFIER_URL = getProperty( "WAGON_NOTIFIER_URL" ); + String WAGON_SERVER_ID = getProperty( "WAGON_SERVER_ID" ); goToProjectNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME ); addWagonNotifierPage( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME, WAGON_NOTIFIER_URL, WAGON_SERVER_ID, true ); } @@ -481,10 +481,10 @@ public void testEditValidWagonProjectNotifier() 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 WAGON_NOTIFIER_URL = p.getProperty( "WAGON_NOTIFIER_URL" ); - String WAGON_SERVER_ID = p.getProperty( "WAGON_SERVER_ID" ); + String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" ); + 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 ); @@ -498,10 +498,10 @@ public void testEditInvalidWagonProjectNotifier() 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 WAGON_NOTIFIER_URL = p.getProperty( "WAGON_NOTIFIER_URL" ); - String WAGON_SERVER_ID = p.getProperty( "WAGON_SERVER_ID" ); + String TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" ); + String WAGON_NOTIFIER_URL = getProperty( "WAGON_NOTIFIER_URL" ); + String WAGON_SERVER_ID = getProperty( "WAGON_SERVER_ID" ); goToProjectInformationPage( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME ); editWagonNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME, WAGON_NOTIFIER_URL, WAGON_SERVER_ID, "", "", false ); } @@ -509,8 +509,8 @@ public void testAddInvalidWagonProjectNotifier() 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 TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" ); goToProjectNotifier( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME ); addWagonNotifierPage( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME, "", "", false ); } @@ -518,11 +518,11 @@ public void testAddValidWagonGroupNotifier() 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 WAGON_NOTIFIER_URL = p.getProperty( "WAGON_NOTIFIER_URL" ); - String WAGON_SERVER_ID = p.getProperty( "WAGON_SERVER_ID" ); + 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 WAGON_NOTIFIER_URL = getProperty( "WAGON_NOTIFIER_URL" ); + String WAGON_SERVER_ID = getProperty( "WAGON_SERVER_ID" ); goToGroupNotifier( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION ); addWagonNotifierPage( TEST_PROJ_GRP_NAME, null, WAGON_NOTIFIER_URL, WAGON_SERVER_ID, true ); } @@ -531,11 +531,11 @@ public void testEditValidWagonGroupNotifier() 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 WAGON_NOTIFIER_URL = p.getProperty( "WAGON_NOTIFIER_URL" ); - String WAGON_SERVER_ID = p.getProperty( "WAGON_SERVER_ID" ); + 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 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 ); @@ -549,11 +549,11 @@ public void testEditInvalidWagonGroupNotifier() 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 WAGON_NOTIFIER_URL = p.getProperty( "WAGON_NOTIFIER_URL" ); - String WAGON_SERVER_ID = p.getProperty( "WAGON_SERVER_ID" ); + 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 WAGON_NOTIFIER_URL = getProperty( "WAGON_NOTIFIER_URL" ); + String WAGON_SERVER_ID = getProperty( "WAGON_SERVER_ID" ); showProjectGroup( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION ); clickLinkWithText( "Notifiers" ); assertGroupNotifierPage( TEST_PROJ_GRP_NAME ); @@ -563,9 +563,9 @@ public void testAddInvalidWagonGroupNotifier() 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 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" ); goToGroupNotifier( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION ); addWagonNotifierPage( TEST_PROJ_GRP_NAME, null, "", "", false ); } @@ -574,9 +574,9 @@ public void testDeleteGroupNotifier() 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 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" ); showProjectGroup( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION ); clickLinkWithText( "Notifiers" ); assertGroupNotifierPage( TEST_PROJ_GRP_NAME ); @@ -591,8 +591,8 @@ public void testDeleteProjectNotifier() 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 TEST_PROJ_GRP_NAME = getProperty( "TEST_PROJ_GRP_NAME" ); + String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" ); goToProjectInformationPage( TEST_PROJ_GRP_NAME, M2_PROJ_GRP_NAME ); // Delete clickLinkWithXPath( "(//a[contains(@href,'deleteProjectNotifier') and contains(@href,'mail')])//img" ); 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=784889&r1=784888&r2=784889&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 Jun 15 17:56:52 2009 @@ -24,7 +24,7 @@ /** * Based on ProjectGroupTest of Emmanuel Venisse test. - * + * * @author José Morales Martínez * @version $Id$ */ @@ -36,9 +36,9 @@ public void testAddProjectGroup() 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 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" ); addProjectGroup( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION, true ); showProjectGroup( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION ); @@ -47,9 +47,9 @@ public void testAddProjectGroup2() 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" ); addProjectGroup( TEST2_PROJ_GRP_NAME, TEST2_PROJ_GRP_ID, TEST2_PROJ_GRP_DESCRIPTION, true ); showProjectGroup( TEST2_PROJ_GRP_NAME, TEST2_PROJ_GRP_ID, TEST2_PROJ_GRP_DESCRIPTION ); @@ -59,13 +59,13 @@ public void testMoveProject() 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 DEFAULT_PROJ_GRP_NAME = p.getProperty( "DEFAULT_PROJ_GRP_NAME" ); - String DEFAULT_PROJ_GRP_ID = p.getProperty( "DEFAULT_PROJ_GRP_NAME" ); - String DEFAULT_PROJ_GRP_DESCRIPTION = p.getProperty( "DEFAULT_PROJ_GRP_NAME" ); - String M2_PROJ_GRP_NAME = p.getProperty( "M2_PROJ_GRP_NAME" ); + 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 DEFAULT_PROJ_GRP_NAME = getProperty( "DEFAULT_PROJ_GRP_NAME" ); + String DEFAULT_PROJ_GRP_ID = getProperty( "DEFAULT_PROJ_GRP_NAME" ); + String DEFAULT_PROJ_GRP_DESCRIPTION = getProperty( "DEFAULT_PROJ_GRP_NAME" ); + String M2_PROJ_GRP_NAME = getProperty( "M2_PROJ_GRP_NAME" ); // move the project of the test project group to the default project group moveProjectToProjectGroup( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION, M2_PROJ_GRP_NAME, @@ -102,9 +102,9 @@ final String sNewProjectName = "New Project Group Name"; final String sNewProjectDescription = "New Project Group Description"; - 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" ); editProjectGroup( TEST2_PROJ_GRP_NAME, TEST2_PROJ_GRP_ID, TEST2_PROJ_GRP_DESCRIPTION, sNewProjectName, sNewProjectDescription ); @@ -120,9 +120,9 @@ 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" ); editProjectGroup( TEST2_PROJ_GRP_NAME, TEST2_PROJ_GRP_ID, TEST2_PROJ_GRP_DESCRIPTION, " ", TEST2_PROJ_GRP_DESCRIPTION ); assertTextPresent( "Project Group Name cannot contain spaces only" ); @@ -132,9 +132,9 @@ public void testProjectGroupAllBuildSuccess() throws Exception { - 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_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" ); buildProjectGroup( M2_PROJ_GRP_NAME, M2_PROJ_GRP_ID, M2_PROJ_GRP_DESCRIPTION, M2_PROJ_GRP_NAME ); clickButtonWithValue( "Release" ); assertReleaseSuccess(); Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/PurgeTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/PurgeTest.java?rev=784889&r1=784888&r2=784889&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/PurgeTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/PurgeTest.java Mon Jun 15 17:56:52 2009 @@ -32,16 +32,16 @@ { public void testAddRepositoryPurge() { - String PURGE_REPOSITORY_DESCRIPTION = p.getProperty( "PURGE_REPOSITORY_DESCRIPTION" ); - String PURGE_REPOSITORY_DAYS = p.getProperty( "PURGE_REPOSITORY_DAYS" ); - String PURGE_REPOSITORY_RETETION = p.getProperty( "PURGE_REPOSITORY_RETETION" ); + String PURGE_REPOSITORY_DESCRIPTION = getProperty( "PURGE_REPOSITORY_DESCRIPTION" ); + String PURGE_REPOSITORY_DAYS = getProperty( "PURGE_REPOSITORY_DAYS" ); + String PURGE_REPOSITORY_RETETION = getProperty( "PURGE_REPOSITORY_RETETION" ); goToAddRepositoryPurge(); addEditRepositoryPurge( PURGE_REPOSITORY_DAYS, PURGE_REPOSITORY_RETETION, PURGE_REPOSITORY_DESCRIPTION, true ); } public void testAddInvalidRepositoryPurge() { - String PURGE_REPOSITORY_DESCRIPTION = p.getProperty( "PURGE_REPOSITORY_DESCRIPTION" ); + String PURGE_REPOSITORY_DESCRIPTION = getProperty( "PURGE_REPOSITORY_DESCRIPTION" ); goToAddRepositoryPurge(); addEditRepositoryPurge( "", "", PURGE_REPOSITORY_DESCRIPTION, false ); assertTextPresent( "Retention Count must be greater than 0." ); @@ -50,9 +50,9 @@ @Test( dependsOnMethods = { "testAddRepositoryPurge" } ) public void testEditRepositoryPurge() { - String PURGE_REPOSITORY_DESCRIPTION = p.getProperty( "PURGE_REPOSITORY_DESCRIPTION" ); - String PURGE_REPOSITORY_DAYS = p.getProperty( "PURGE_REPOSITORY_DAYS" ); - String PURGE_REPOSITORY_RETETION = p.getProperty( "PURGE_REPOSITORY_RETETION" ); + String PURGE_REPOSITORY_DESCRIPTION = getProperty( "PURGE_REPOSITORY_DESCRIPTION" ); + String PURGE_REPOSITORY_DAYS = getProperty( "PURGE_REPOSITORY_DAYS" ); + String PURGE_REPOSITORY_RETETION = getProperty( "PURGE_REPOSITORY_RETETION" ); String newDescription = "new_description"; String newDays = "45"; String newRetention = "4"; @@ -65,22 +65,22 @@ @Test( dependsOnMethods = { "testEditRepositoryPurge" } ) public void testDeleteRepositoryPurge() { - String PURGE_REPOSITORY_DESCRIPTION = p.getProperty( "PURGE_REPOSITORY_DESCRIPTION" ); + String PURGE_REPOSITORY_DESCRIPTION = getProperty( "PURGE_REPOSITORY_DESCRIPTION" ); removeRepositoryPurge( PURGE_REPOSITORY_DESCRIPTION ); } public void testAddDirectoryPurge() { - String PURGE_DIRECTORY_DESCRIPTION = p.getProperty( "PURGE_DIRECTORY_DESCRIPTION" ); - String PURGE_DIRECTORY_DAYS = p.getProperty( "PURGE_DIRECTORY_DAYS" ); - String PURGE_DIRECTORY_RETETION = p.getProperty( "PURGE_DIRECTORY_RETETION" ); + String PURGE_DIRECTORY_DESCRIPTION = getProperty( "PURGE_DIRECTORY_DESCRIPTION" ); + String PURGE_DIRECTORY_DAYS = getProperty( "PURGE_DIRECTORY_DAYS" ); + String PURGE_DIRECTORY_RETETION = getProperty( "PURGE_DIRECTORY_RETETION" ); goToAddDirectoryPurge(); addEditDirectoryPurge( PURGE_DIRECTORY_DAYS, PURGE_DIRECTORY_RETETION, PURGE_DIRECTORY_DESCRIPTION, true ); } public void testAddInvalidDirectoryPurge() { - String PURGE_DIRECTORY_DESCRIPTION = p.getProperty( "PURGE_DIRECTORY_DESCRIPTION" ); + String PURGE_DIRECTORY_DESCRIPTION = getProperty( "PURGE_DIRECTORY_DESCRIPTION" ); goToAddDirectoryPurge(); addEditDirectoryPurge( "", "", PURGE_DIRECTORY_DESCRIPTION, false ); assertTextPresent( "Retention Count must be greater than 0." ); @@ -89,9 +89,9 @@ @Test( dependsOnMethods = { "testAddDirectoryPurge" } ) public void testEditDirectoryPurge() { - String PURGE_DIRECTORY_DESCRIPTION = p.getProperty( "PURGE_DIRECTORY_DESCRIPTION" ); - String PURGE_DIRECTORY_DAYS = p.getProperty( "PURGE_DIRECTORY_DAYS" ); - String PURGE_DIRECTORY_RETETION = p.getProperty( "PURGE_DIRECTORY_RETETION" ); + String PURGE_DIRECTORY_DESCRIPTION = getProperty( "PURGE_DIRECTORY_DESCRIPTION" ); + String PURGE_DIRECTORY_DAYS = getProperty( "PURGE_DIRECTORY_DAYS" ); + String PURGE_DIRECTORY_RETETION = getProperty( "PURGE_DIRECTORY_RETETION" ); String newDescription = "new_description"; String newDays = "45"; String newRetention = "4"; @@ -104,7 +104,7 @@ @Test( dependsOnMethods = { "testEditDirectoryPurge" } ) public void testDeleteDirectoryPurge() { - String PURGE_DIRECTORY_DESCRIPTION = p.getProperty( "PURGE_DIRECTORY_DESCRIPTION" ); + String PURGE_DIRECTORY_DESCRIPTION = getProperty( "PURGE_DIRECTORY_DESCRIPTION" ); removeDirectoryPurge( PURGE_DIRECTORY_DESCRIPTION ); } } 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=784889&r1=784888&r2=784889&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 Jun 15 17:56:52 2009 @@ -32,11 +32,11 @@ public class QueueTest extends AbstractBuildQueueTest { - + public void testAddBuildQueue() { setMaxBuildQueue( 2 ); - String BUILD_QUEUE_NAME = p.getProperty( "BUILD_QUEUE_NAME" ); + String BUILD_QUEUE_NAME = getProperty( "BUILD_QUEUE_NAME" ); addBuildQueue( BUILD_QUEUE_NAME, true ); } @@ -53,11 +53,11 @@ public void testAddAlreadyExistBuildQueue() { setMaxBuildQueue( 3 ); - String BUILD_QUEUE_NAME = p.getProperty( "BUILD_QUEUE_NAME" ); + String BUILD_QUEUE_NAME = getProperty( "BUILD_QUEUE_NAME" ); addBuildQueue( BUILD_QUEUE_NAME, false ); assertTextPresent( "Build queue name already exists." ); } - + //@Test( dependsOnMethods = { "testAddAlreadyExistBuildQueue" } ) public void testAddEmptyBuildQueue() { @@ -70,22 +70,22 @@ public void testDeleteBuildQueue() { goToBuildQueuePage(); - String BUILD_QUEUE_NAME = p.getProperty( "BUILD_QUEUE_NAME" ); + String BUILD_QUEUE_NAME = getProperty( "BUILD_QUEUE_NAME" ); removeBuildQueue( BUILD_QUEUE_NAME ); assertTextNotPresent( BUILD_QUEUE_NAME ); } - - + + @Test( dependsOnMethods = { "testAddMavenTwoProject" } ) public void testQueuePageWithProjectCurrentlyBuilding() throws Exception - { + { //build a project - 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_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 ); - + //check queue page while building clickAndWait( "link=Queues" ); assertPage( "Continuum - Build Queue" ); @@ -103,7 +103,7 @@ waitForElementPresent( "//img[@alt='Success']" ); Thread.sleep( 10000 ); } - + //@Test( dependsOnMethods = { "testDeleteBuildQueue" } ) public void testQueuePageWithoutBuild() { @@ -117,7 +117,7 @@ assertTextPresent( "Checkout Queue " ); assertTextPresent( "Current Prepare Build" ); assertTextPresent( "Prepare Build Queue" ); - - } - + + } + } Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ScheduleTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ScheduleTest.java?rev=784889&r1=784888&r2=784889&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ScheduleTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ScheduleTest.java Mon Jun 15 17:56:52 2009 @@ -32,17 +32,17 @@ { public void testAddSchedule() { - String SCHEDULE_NAME = p.getProperty( "SCHEDULE_NAME" ); - String SCHEDULE_DESCRIPTION = p.getProperty( "SCHEDULE_DESCRIPTION" ); - String SCHEDULE_EXPR_SECOND = p.getProperty( "SCHEDULE_EXPR_SECOND" ); - String SCHEDULE_EXPR_MINUTE = p.getProperty( "SCHEDULE_EXPR_MINUTE" ); - String SCHEDULE_EXPR_HOUR = p.getProperty( "SCHEDULE_EXPR_HOUR" ); - String SCHEDULE_EXPR_DAY_MONTH = p.getProperty( "SCHEDULE_EXPR_DAY_MONTH" ); - String SCHEDULE_EXPR_MONTH = p.getProperty( "SCHEDULE_EXPR_MONTH" ); - String SCHEDULE_EXPR_DAY_WEEK = p.getProperty( "SCHEDULE_EXPR_DAY_WEEK" ); - String SCHEDULE_EXPR_YEAR = p.getProperty( "SCHEDULE_EXPR_YEAR" ); - String SCHEDULE_MAX_TIME = p.getProperty( "SCHEDULE_MAX_TIME" ); - String SCHEDULE_PERIOD = p.getProperty( "SCHEDULE_PERIOD" ); + String SCHEDULE_NAME = getProperty( "SCHEDULE_NAME" ); + String SCHEDULE_DESCRIPTION = getProperty( "SCHEDULE_DESCRIPTION" ); + String SCHEDULE_EXPR_SECOND = getProperty( "SCHEDULE_EXPR_SECOND" ); + String SCHEDULE_EXPR_MINUTE = getProperty( "SCHEDULE_EXPR_MINUTE" ); + String SCHEDULE_EXPR_HOUR = getProperty( "SCHEDULE_EXPR_HOUR" ); + String SCHEDULE_EXPR_DAY_MONTH = getProperty( "SCHEDULE_EXPR_DAY_MONTH" ); + String SCHEDULE_EXPR_MONTH = getProperty( "SCHEDULE_EXPR_MONTH" ); + String SCHEDULE_EXPR_DAY_WEEK = getProperty( "SCHEDULE_EXPR_DAY_WEEK" ); + String SCHEDULE_EXPR_YEAR = getProperty( "SCHEDULE_EXPR_YEAR" ); + String SCHEDULE_MAX_TIME = getProperty( "SCHEDULE_MAX_TIME" ); + String SCHEDULE_PERIOD = getProperty( "SCHEDULE_PERIOD" ); goToAddSchedule(); addEditSchedule( SCHEDULE_NAME, SCHEDULE_DESCRIPTION, SCHEDULE_EXPR_SECOND, SCHEDULE_EXPR_MINUTE, SCHEDULE_EXPR_HOUR, SCHEDULE_EXPR_DAY_MONTH, SCHEDULE_EXPR_MONTH, SCHEDULE_EXPR_DAY_WEEK, @@ -61,17 +61,17 @@ @Test( dependsOnMethods = { "testAddSchedule" } ) public void testAddDuplicatedSchedule() { - String SCHEDULE_NAME = p.getProperty( "SCHEDULE_NAME" ); - String SCHEDULE_DESCRIPTION = p.getProperty( "SCHEDULE_DESCRIPTION" ); - String SCHEDULE_EXPR_SECOND = p.getProperty( "SCHEDULE_EXPR_SECOND" ); - String SCHEDULE_EXPR_MINUTE = p.getProperty( "SCHEDULE_EXPR_MINUTE" ); - String SCHEDULE_EXPR_HOUR = p.getProperty( "SCHEDULE_EXPR_HOUR" ); - String SCHEDULE_EXPR_DAY_MONTH = p.getProperty( "SCHEDULE_EXPR_DAY_MONTH" ); - String SCHEDULE_EXPR_MONTH = p.getProperty( "SCHEDULE_EXPR_MONTH" ); - String SCHEDULE_EXPR_DAY_WEEK = p.getProperty( "SCHEDULE_EXPR_DAY_WEEK" ); - String SCHEDULE_EXPR_YEAR = p.getProperty( "SCHEDULE_EXPR_YEAR" ); - String SCHEDULE_MAX_TIME = p.getProperty( "SCHEDULE_MAX_TIME" ); - String SCHEDULE_PERIOD = p.getProperty( "SCHEDULE_PERIOD" ); + String SCHEDULE_NAME = getProperty( "SCHEDULE_NAME" ); + String SCHEDULE_DESCRIPTION = getProperty( "SCHEDULE_DESCRIPTION" ); + String SCHEDULE_EXPR_SECOND = getProperty( "SCHEDULE_EXPR_SECOND" ); + String SCHEDULE_EXPR_MINUTE = getProperty( "SCHEDULE_EXPR_MINUTE" ); + String SCHEDULE_EXPR_HOUR = getProperty( "SCHEDULE_EXPR_HOUR" ); + String SCHEDULE_EXPR_DAY_MONTH = getProperty( "SCHEDULE_EXPR_DAY_MONTH" ); + String SCHEDULE_EXPR_MONTH = getProperty( "SCHEDULE_EXPR_MONTH" ); + String SCHEDULE_EXPR_DAY_WEEK = getProperty( "SCHEDULE_EXPR_DAY_WEEK" ); + String SCHEDULE_EXPR_YEAR = getProperty( "SCHEDULE_EXPR_YEAR" ); + String SCHEDULE_MAX_TIME = getProperty( "SCHEDULE_MAX_TIME" ); + String SCHEDULE_PERIOD = getProperty( "SCHEDULE_PERIOD" ); goToAddSchedule(); addEditSchedule( SCHEDULE_NAME, SCHEDULE_DESCRIPTION, SCHEDULE_EXPR_SECOND, SCHEDULE_EXPR_MINUTE, SCHEDULE_EXPR_HOUR, SCHEDULE_EXPR_DAY_MONTH, SCHEDULE_EXPR_MONTH, SCHEDULE_EXPR_DAY_WEEK, @@ -82,17 +82,17 @@ @Test( dependsOnMethods = { "testAddDuplicatedSchedule" } ) public void testEditSchedule() { - String SCHEDULE_NAME = p.getProperty( "SCHEDULE_NAME" ); - String SCHEDULE_DESCRIPTION = p.getProperty( "SCHEDULE_DESCRIPTION" ); - String SCHEDULE_EXPR_SECOND = p.getProperty( "SCHEDULE_EXPR_SECOND" ); - String SCHEDULE_EXPR_MINUTE = p.getProperty( "SCHEDULE_EXPR_MINUTE" ); - String SCHEDULE_EXPR_HOUR = p.getProperty( "SCHEDULE_EXPR_HOUR" ); - String SCHEDULE_EXPR_DAY_MONTH = p.getProperty( "SCHEDULE_EXPR_DAY_MONTH" ); - String SCHEDULE_EXPR_MONTH = p.getProperty( "SCHEDULE_EXPR_MONTH" ); - String SCHEDULE_EXPR_DAY_WEEK = p.getProperty( "SCHEDULE_EXPR_DAY_WEEK" ); - String SCHEDULE_EXPR_YEAR = p.getProperty( "SCHEDULE_EXPR_YEAR" ); - String SCHEDULE_MAX_TIME = p.getProperty( "SCHEDULE_MAX_TIME" ); - String SCHEDULE_PERIOD = p.getProperty( "SCHEDULE_PERIOD" ); + String SCHEDULE_NAME = getProperty( "SCHEDULE_NAME" ); + String SCHEDULE_DESCRIPTION = getProperty( "SCHEDULE_DESCRIPTION" ); + String SCHEDULE_EXPR_SECOND = getProperty( "SCHEDULE_EXPR_SECOND" ); + String SCHEDULE_EXPR_MINUTE = getProperty( "SCHEDULE_EXPR_MINUTE" ); + String SCHEDULE_EXPR_HOUR = getProperty( "SCHEDULE_EXPR_HOUR" ); + String SCHEDULE_EXPR_DAY_MONTH = getProperty( "SCHEDULE_EXPR_DAY_MONTH" ); + String SCHEDULE_EXPR_MONTH = getProperty( "SCHEDULE_EXPR_MONTH" ); + String SCHEDULE_EXPR_DAY_WEEK = getProperty( "SCHEDULE_EXPR_DAY_WEEK" ); + String SCHEDULE_EXPR_YEAR = getProperty( "SCHEDULE_EXPR_YEAR" ); + String SCHEDULE_MAX_TIME = getProperty( "SCHEDULE_MAX_TIME" ); + String SCHEDULE_PERIOD = getProperty( "SCHEDULE_PERIOD" ); String name = "new_name"; String description = "new_description"; String second = "1"; @@ -117,7 +117,7 @@ @Test( dependsOnMethods = { "testEditSchedule" } ) public void testDeleteSchedule() { - String SCHEDULE_NAME = p.getProperty( "SCHEDULE_NAME" ); + String SCHEDULE_NAME = getProperty( "SCHEDULE_NAME" ); removeSchedule( SCHEDULE_NAME ); } } 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=784889&r1=784888&r2=784889&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 Jun 15 17:56:52 2009 @@ -24,7 +24,7 @@ /** * Based on AddShellProjectTestCase of Emmanuel Venisse. - * + * * @author José Morales Martínez * @version $Id$ */ @@ -35,16 +35,16 @@ public void testAddShellProject() throws Exception { - String SHELL_NAME = p.getProperty( "SHELL_NAME" ); - String SHELL_DESCRIPTION = p.getProperty( "SHELL_DESCRIPTION" ); - String SHELL_VERSION = p.getProperty( "SHELL_VERSION" ); - String SHELL_TAG = p.getProperty( "SHELL_TAG" ); - String SHELL_SCM_URL = p.getProperty( "SHELL_SCM_URL" ); - String SHELL_SCM_USERNAME = p.getProperty( "SHELL_SCM_USERNAME" ); - String SHELL_SCM_PASSWORD = p.getProperty( "SHELL_SCM_PASSWORD" ); - 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 SHELL_NAME = getProperty( "SHELL_NAME" ); + String SHELL_DESCRIPTION = getProperty( "SHELL_DESCRIPTION" ); + String SHELL_VERSION = getProperty( "SHELL_VERSION" ); + String SHELL_TAG = getProperty( "SHELL_TAG" ); + String SHELL_SCM_URL = getProperty( "SHELL_SCM_URL" ); + 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, true ); @@ -65,13 +65,13 @@ public void testAddDupliedShellProject() throws Exception { - String SHELL_NAME = p.getProperty( "SHELL_NAME" ); - String SHELL_DESCRIPTION = p.getProperty( "SHELL_DESCRIPTION" ); - String SHELL_VERSION = p.getProperty( "SHELL_VERSION" ); - String SHELL_TAG = p.getProperty( "SHELL_TAG" ); - String SHELL_SCM_URL = p.getProperty( "SHELL_SCM_URL" ); - String SHELL_SCM_USERNAME = p.getProperty( "SHELL_SCM_USERNAME" ); - String SHELL_SCM_PASSWORD = p.getProperty( "SHELL_SCM_PASSWORD" ); + String SHELL_NAME = getProperty( "SHELL_NAME" ); + String SHELL_DESCRIPTION = getProperty( "SHELL_DESCRIPTION" ); + String SHELL_VERSION = getProperty( "SHELL_VERSION" ); + String SHELL_TAG = getProperty( "SHELL_TAG" ); + String SHELL_SCM_URL = getProperty( "SHELL_SCM_URL" ); + String SHELL_SCM_USERNAME = getProperty( "SHELL_SCM_USERNAME" ); + 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 ); 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=784889&r1=784888&r2=784889&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 Jun 15 17:56:52 2009 @@ -5,33 +5,33 @@ @Test( groups = { "userroles" }, dependsOnMethods = { "testWithCorrectUsernamePassword" } ) -public class UserRolesManagementTest +public class UserRolesManagementTest extends AbstractUserRolesManagementTest { public void testBasicAddDeleteUser() { - username = p.getProperty( "GUEST_USERNAME" ); - fullname = p.getProperty( "GUEST_FULLNAME" ); - + username = getProperty( "GUEST_USERNAME" ); + fullname = getProperty( "GUEST_FULLNAME" ); + createUser( username, fullname, getUserEmail(), getUserRolePassword(), true); deleteUser( username, fullname, getUserEmail() ); clickLinkWithText( "Logout" ); } - + @Test( dependsOnMethods = { "testBasicAddDeleteUser" } ) public void testUserWithGuestRole() { - username = p.getProperty("GUEST_USERNAME"); - fullname = p.getProperty("GUEST_FULLNAME"); - + username = getProperty( "GUEST_USERNAME" ); + fullname = getProperty( "GUEST_FULLNAME" ); + createUser(username, fullname, getUserEmail(), getUserRolePassword(), true); clickLinkWithText( username ); clickLinkWithText( "Edit Roles" ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); - + clickLinkWithText("Logout"); - + login( username, getUserRolePassword() ); changePassword( getUserRolePassword(), getUserRoleNewPassword() ); // this section will be removed if issue from redback after changing password will be fixed. @@ -39,7 +39,7 @@ waitPage(); clickLinkWithText("Logout"); //assertTextPresent("You are already logged in."); - + login(username, getUserRoleNewPassword()); assertLeftNavMenuWithRole( fullname ); clickLinkWithText( "Show Project Groups" ); @@ -50,26 +50,26 @@ @Test( dependsOnMethods = { "testBasicAddDeleteUser" } ) public void testUserWithRegisteredUserRole() { - username = p.getProperty( "REGISTERED_USERNAME" ); - fullname = p.getProperty( "REGISTERED_FULLNAME" ); - + username = getProperty( "REGISTERED_USERNAME" ); + fullname = getProperty( "REGISTERED_FULLNAME" ); + createUser(username, fullname, getUserEmail(), getUserRolePassword(), true); clickLinkWithText( username ); clickLinkWithText( "Edit Roles" ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); - + clickLinkWithText("Logout"); - + login( username, getUserRolePassword() ); changePassword( getUserRolePassword(), getUserRoleNewPassword() ); - + // this section will be removed if issue from redback after changing password will be fixed. getSelenium().goBack(); waitPage(); clickLinkWithText("Logout"); //assertTextPresent("You are already logged in."); - + login(username, getUserRoleNewPassword()); assertLeftNavMenuWithRole( fullname ); clickLinkWithText( "Show Project Groups" ); @@ -78,29 +78,29 @@ login( getAdminUsername(), getAdminPassword()); } - @Test( dependsOnMethods = { "testBasicAddDeleteUser" } ) + @Test( dependsOnMethods = { "testBasicAddDeleteUser" } ) public void testUserWithSystemAdminRole() { - username = p.getProperty( "SYSAD_USERNAME" ); - fullname = p.getProperty( "SYSAD_FULLNAME" ); - + username = getProperty( "SYSAD_USERNAME" ); + fullname = getProperty( "SYSAD_FULLNAME" ); + createUser(username, fullname, getUserEmail(), getUserRolePassword(), true); clickLinkWithText( username ); clickLinkWithText( "Edit Roles" ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); - + clickLinkWithText("Logout"); - + login( username, getUserRolePassword() ); changePassword( getUserRolePassword(), getUserRoleNewPassword() ); - + // this section will be removed if issue from redback after changing password will be fixed. getSelenium().goBack(); waitPage(); clickLinkWithText("Logout"); //assertTextPresent("You are already logged in."); - + login(username, getUserRoleNewPassword()); assertLeftNavMenuWithRole( fullname ); clickLinkWithText( "Show Project Groups" ); @@ -108,13 +108,13 @@ clickLinkWithText("Logout"); login( getAdminUsername(), getAdminPassword()); } - + @Test( dependsOnMethods = { "testBasicAddDeleteUser" } ) public void testUserWithUserAdminRole() { - username = p.getProperty( "USERADMIN_USERNAME" ); - fullname = p.getProperty( "USERADMIN_FULLNAME" ); - + username = getProperty( "USERADMIN_USERNAME" ); + fullname = getProperty( "USERADMIN_FULLNAME" ); + createUser(username, fullname, getUserEmail(), getUserRolePassword(), true); selectValue( "name=ec_rd" , "50" ); waitPage(); @@ -122,18 +122,18 @@ clickLinkWithText( "Edit Roles" ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); - + clickLinkWithText("Logout"); - + login( username, getUserRolePassword() ); changePassword( getUserRolePassword(), getUserRoleNewPassword() ); - + // this section will be removed if issue from redback after changing password will be fixed. getSelenium().goBack(); waitPage(); clickLinkWithText("Logout"); //assertTextPresent("You are already logged in."); - + login(username, getUserRoleNewPassword()); assertLeftNavMenuWithRole( fullname ); clickLinkWithText( "Show Project Groups" ); @@ -141,378 +141,378 @@ clickLinkWithText("Logout"); login( getAdminUsername(), getAdminPassword()); } - + @Test( dependsOnMethods = { "testBasicAddDeleteUser" } ) public void testUserWithContinuumGroupProjectAdminRole() { - username = p.getProperty( "GROUPPROJECTADMIN_USERNAME" ); - fullname = p.getProperty( "GROUPPROJECTADMIN_FULLNAME" ); - + username = getProperty( "GROUPPROJECTADMIN_USERNAME" ); + fullname = getProperty( "GROUPPROJECTADMIN_FULLNAME" ); + createUser(username, fullname, getUserEmail(), getUserRolePassword(), true); clickLinkWithText( username ); clickLinkWithText( "Edit Roles" ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); - + clickLinkWithText("Logout"); - + login( username, getUserRolePassword() ); changePassword( getUserRolePassword(), getUserRoleNewPassword() ); - + // this section will be removed if issue from redback after changing password will be fixed. getSelenium().goBack(); waitPage(); clickLinkWithText("Logout"); //assertTextPresent("You are already logged in."); - + login(username, getUserRoleNewPassword()); assertLeftNavMenuWithRole( fullname ); clickLinkWithText("Logout"); login( getAdminUsername(), getAdminPassword()); } - + @Test( dependsOnMethods = { "testBasicAddDeleteUser" } ) public void testUserWithContinuumGroupProjectDeveloperRole() { - username = p.getProperty( "GROUPPROJECTDEVELOPER_USERNAME" ); - fullname = p.getProperty( "GROUPPROJECTDEVELOPER_FULLNAME" ); - + username = getProperty( "GROUPPROJECTDEVELOPER_USERNAME" ); + fullname = getProperty( "GROUPPROJECTDEVELOPER_FULLNAME" ); + createUser(username, fullname, getUserEmail(), getUserRolePassword(), true); clickLinkWithText( username ); clickLinkWithText( "Edit Roles" ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); - + clickLinkWithText("Logout"); - + login( username, getUserRolePassword() ); changePassword( getUserRolePassword(), getUserRoleNewPassword() ); - + // this section will be removed if issue from redback after changing password will be fixed. getSelenium().goBack(); waitPage(); clickLinkWithText("Logout"); //assertTextPresent("You are already logged in."); - + login(username, getUserRoleNewPassword()); assertLeftNavMenuWithRole( fullname ); clickLinkWithText("Logout"); login( getAdminUsername(), getAdminPassword()); } - + @Test( dependsOnMethods = { "testBasicAddDeleteUser" } ) public void testUserWithContinuumGroupProjectUserRole() { - username = p.getProperty( "GROUPPROJECTUSER_USERNAME" ); - fullname = p.getProperty( "GROUPPROJECTUSER_FULLNAME" ); - + username = getProperty( "GROUPPROJECTUSER_USERNAME" ); + fullname = getProperty( "GROUPPROJECTUSER_FULLNAME" ); + createUser(username, fullname, getUserEmail(), getUserRolePassword(), true); clickLinkWithText( username ); clickLinkWithText( "Edit Roles" ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); - + clickLinkWithText("Logout"); - + login( username, getUserRolePassword() ); changePassword( getUserRolePassword(), getUserRoleNewPassword() ); - + // this section will be removed if issue from redback after changing password will be fixed. getSelenium().goBack(); waitPage(); clickLinkWithText("Logout"); //assertTextPresent("You are already logged in."); - + login(username, getUserRoleNewPassword()); assertLeftNavMenuWithRole( fullname ); clickLinkWithText("Logout"); login( getAdminUsername(), getAdminPassword()); } - + @Test( dependsOnMethods = { "testBasicAddDeleteUser" } ) public void testUserWithContinuumManageBuildEnvironmentRole() { - username = p.getProperty( "MANAGEBUILDENVIRONMENT_USERNAME" ); - fullname = p.getProperty( "MANAGEBUILDENVIRONMENT_FULLNAME" ); - + username = getProperty( "MANAGEBUILDENVIRONMENT_USERNAME" ); + fullname = getProperty( "MANAGEBUILDENVIRONMENT_FULLNAME" ); + createUser(username, fullname, getUserEmail(), getUserRolePassword(), true); clickLinkWithText( username ); clickLinkWithText( "Edit Roles" ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); - + clickLinkWithText("Logout"); - + login( username, getUserRolePassword() ); changePassword( getUserRolePassword(), getUserRoleNewPassword() ); - + // this section will be removed if issue from redback after changing password will be fixed. getSelenium().goBack(); waitPage(); clickLinkWithText("Logout"); //assertTextPresent("You are already logged in."); - + login(username, getUserRoleNewPassword()); assertLeftNavMenuWithRole( fullname ); clickLinkWithText("Logout"); login( getAdminUsername(), getAdminPassword()); } - + @Test( dependsOnMethods = { "testBasicAddDeleteUser" } ) public void testUserWithContinuumManageBuildTemplatesRole() { - username = p.getProperty( "MANAGEBUILDTEMPLATES_USERNAME" ); - fullname = p.getProperty( "MANAGEBUILDTEMPLATES_FULLNAME" ); - + username = getProperty( "MANAGEBUILDTEMPLATES_USERNAME" ); + fullname = getProperty( "MANAGEBUILDTEMPLATES_FULLNAME" ); + createUser(username, fullname, getUserEmail(), getUserRolePassword(), true); clickLinkWithText( username ); clickLinkWithText( "Edit Roles" ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); - + clickLinkWithText("Logout"); - + login( username, getUserRolePassword() ); changePassword( getUserRolePassword(), getUserRoleNewPassword() ); - + // this section will be removed if issue from redback after changing password will be fixed. getSelenium().goBack(); waitPage(); clickLinkWithText("Logout"); //assertTextPresent("You are already logged in."); - + login(username, getUserRoleNewPassword()); assertLeftNavMenuWithRole( fullname ); clickLinkWithText("Logout"); login( getAdminUsername(), getAdminPassword()); } - + @Test( dependsOnMethods = { "testBasicAddDeleteUser" } ) public void testUserWithContinuumManageInstallationsRole() { - username = p.getProperty( "MANAGEINSTALLATIONS_USERNAME" ); - fullname = p.getProperty( "MANAGEINSTALLATIONS_FULLNAME" ); - + username = getProperty( "MANAGEINSTALLATIONS_USERNAME" ); + fullname = getProperty( "MANAGEINSTALLATIONS_FULLNAME" ); + createUser(username, fullname, getUserEmail(), getUserRolePassword(), true); clickLinkWithText( username ); clickLinkWithText( "Edit Roles" ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); - + clickLinkWithText("Logout"); - + login( username, getUserRolePassword() ); changePassword( getUserRolePassword(), getUserRoleNewPassword() ); - + // this section will be removed if issue from redback after changing password will be fixed. getSelenium().goBack(); waitPage(); clickLinkWithText("Logout"); //assertTextPresent("You are already logged in."); - + login(username, getUserRoleNewPassword()); assertLeftNavMenuWithRole( fullname ); clickLinkWithText("Logout"); login( getAdminUsername(), getAdminPassword()); } - + @Test( dependsOnMethods = { "testBasicAddDeleteUser" } ) public void testUserWithContinuumManageLocalRepoRole() { - username = p.getProperty( "MANAGELOCALREPOS_USERNAME" ); - fullname = p.getProperty( "MANAGELOCALREPOS_FULLNAME" ); - + username = getProperty( "MANAGELOCALREPOS_USERNAME" ); + fullname = getProperty( "MANAGELOCALREPOS_FULLNAME" ); + createUser(username, fullname, getUserEmail(), getUserRolePassword(), true); clickLinkWithText( username ); clickLinkWithText( "Edit Roles" ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); - + clickLinkWithText("Logout"); - + login( username, getUserRolePassword() ); changePassword( getUserRolePassword(), getUserRoleNewPassword() ); - + // this section will be removed if issue from redback after changing password will be fixed. getSelenium().goBack(); waitPage(); clickLinkWithText("Logout"); //assertTextPresent("You are already logged in."); - + login(username, getUserRoleNewPassword()); assertLeftNavMenuWithRole( fullname ); clickLinkWithText("Logout"); login( getAdminUsername(), getAdminPassword()); } - + @Test( dependsOnMethods = { "testBasicAddDeleteUser" } ) public void testUserWithContinuumManagePurgingRole() { - username = p.getProperty( "MANAGEPURGING_USERNAME" ); - fullname = p.getProperty( "MANAGEPURGING_FULLNAME" ); - + username = getProperty( "MANAGEPURGING_USERNAME" ); + fullname = getProperty( "MANAGEPURGING_FULLNAME" ); + createUser(username, fullname, getUserEmail(), getUserRolePassword(), true); clickLinkWithText( username ); clickLinkWithText( "Edit Roles" ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); - + clickLinkWithText("Logout"); - + login( username, getUserRolePassword() ); changePassword( getUserRolePassword(), getUserRoleNewPassword() ); - + // this section will be removed if issue from redback after changing password will be fixed. getSelenium().goBack(); waitPage(); clickLinkWithText("Logout"); //assertTextPresent("You are already logged in."); - + login(username, getUserRoleNewPassword()); assertLeftNavMenuWithRole( fullname ); clickLinkWithText("Logout"); login( getAdminUsername(), getAdminPassword()); } - + @Test( dependsOnMethods = { "testBasicAddDeleteUser" } ) public void testUserWithContinuumManageQueuesRole() { - username = p.getProperty( "MANAGEQUEUES_USERNAME" ); - fullname = p.getProperty( "MANAGEQUEUES_FULLNAME" ); - + username = getProperty( "MANAGEQUEUES_USERNAME" ); + fullname = getProperty( "MANAGEQUEUES_FULLNAME" ); + createUser(username, fullname, getUserEmail(), getUserRolePassword(), true); clickLinkWithText( username ); clickLinkWithText( "Edit Roles" ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); - + clickLinkWithText("Logout"); - + login( username, getUserRolePassword() ); changePassword( getUserRolePassword(), getUserRoleNewPassword() ); - + // this section will be removed if issue from redback after changing password will be fixed. getSelenium().goBack(); waitPage(); clickLinkWithText("Logout"); //assertTextPresent("You are already logged in."); - + login(username, getUserRoleNewPassword()); assertLeftNavMenuWithRole( fullname ); clickLinkWithText("Logout"); login( getAdminUsername(), getAdminPassword()); } - + @Test( dependsOnMethods = { "testBasicAddDeleteUser" } ) public void testUserWithContinuumManageSchedulingRole() { - username = p.getProperty( "MANAGESCHEDULING_USERNAME" ); - fullname = p.getProperty( "MANAGESCHEDULING_FULLNAME" ); - + username = getProperty( "MANAGESCHEDULING_USERNAME" ); + fullname = getProperty( "MANAGESCHEDULING_FULLNAME" ); + createUser(username, fullname, getUserEmail(), getUserRolePassword(), true); clickLinkWithText( username ); clickLinkWithText( "Edit Roles" ); checkUserRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); - + clickLinkWithText("Logout"); - + login( username, getUserRolePassword() ); changePassword( getUserRolePassword(), getUserRoleNewPassword() ); - + // this section will be removed if issue from redback after changing password will be fixed. getSelenium().goBack(); waitPage(); clickLinkWithText("Logout"); //assertTextPresent("You are already logged in."); - + login(username, getUserRoleNewPassword()); assertLeftNavMenuWithRole( fullname ); clickLinkWithText("Logout"); login( getAdminUsername(), getAdminPassword()); } - + @Test( dependsOnMethods = { "testBasicAddDeleteUser" } ) public void testUserWithProjectAdminDefaultProjectGroup() { - username = p.getProperty( "PROJECTADMINISTRATOR_DEFAULTPROJECTGROUP_USERNAME" ); - fullname = p.getProperty( "PROJECTADMINISTRATOR_DEFAULTPROJECTGROUP_FULLNAME" ); - + username = getProperty( "PROJECTADMINISTRATOR_DEFAULTPROJECTGROUP_USERNAME" ); + fullname = getProperty( "PROJECTADMINISTRATOR_DEFAULTPROJECTGROUP_FULLNAME" ); + createUser(username, fullname, getUserEmail(), getUserRolePassword(), true); clickLinkWithText( username ); clickLinkWithText( "Edit Roles" ); checkResourceRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); - + clickLinkWithText("Logout"); - + login( username, getUserRolePassword() ); changePassword( getUserRolePassword(), getUserRoleNewPassword() ); - + // this section will be removed if issue from redback after changing password will be fixed. getSelenium().goBack(); waitPage(); clickLinkWithText("Logout"); //assertTextPresent("You are already logged in."); - + login(username, getUserRoleNewPassword()); assertLeftNavMenuWithRole( fullname ); clickLinkWithText("Logout"); login( getAdminUsername(), getAdminPassword()); } - + @Test( dependsOnMethods = { "testBasicAddDeleteUser" } ) public void testUserWithProjectDevDefaultProjectGroup() { - username = p.getProperty( "PROJECTDEVELOPER_DEFAULTPROJECTGROUP_USERNAME" ); - fullname = p.getProperty( "PROJECTDEVELOPER_DEFAULTPROJECTGROUP_FULLNAME" ); - + username = getProperty( "PROJECTDEVELOPER_DEFAULTPROJECTGROUP_USERNAME" ); + fullname = getProperty( "PROJECTDEVELOPER_DEFAULTPROJECTGROUP_FULLNAME" ); + createUser(username, fullname, getUserEmail(), getUserRolePassword(), true); clickLinkWithText( username ); clickLinkWithText( "Edit Roles" ); checkResourceRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); - + clickLinkWithText("Logout"); - + login( username, getUserRolePassword() ); changePassword( getUserRolePassword(), getUserRoleNewPassword() ); - + // this section will be removed if issue from redback after changing password will be fixed. getSelenium().goBack(); waitPage(); clickLinkWithText("Logout"); //assertTextPresent("You are already logged in."); - + login(username, getUserRoleNewPassword()); assertLeftNavMenuWithRole( fullname ); clickLinkWithText("Logout"); - login( getAdminUsername(), getAdminPassword()); + login( getAdminUsername(), getAdminPassword()); } - + @Test( dependsOnMethods = { "testBasicAddDeleteUser" } ) public void testUserWithProjectUserDefaultProjectGroup() { - username = p.getProperty( "PROJECTUSER_DEFAULTPROJECTGROUP_USERNAME" ); - fullname = p.getProperty( "PROJECTUSER_DEFAULTPROJECTGROUP_FULLNAME" ); - + username = getProperty( "PROJECTUSER_DEFAULTPROJECTGROUP_USERNAME" ); + fullname = getProperty( "PROJECTUSER_DEFAULTPROJECTGROUP_FULLNAME" ); + createUser(username, fullname, getUserEmail(), getUserRolePassword(), true); clickLinkWithText( username ); clickLinkWithText( "Edit Roles" ); checkResourceRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); - + clickLinkWithText("Logout"); - + login( username, getUserRolePassword() ); changePassword( getUserRolePassword(), getUserRoleNewPassword() ); - + // this section will be removed if issue from redback after changing password will be fixed. getSelenium().goBack(); waitPage(); clickLinkWithText("Logout"); //assertTextPresent("You are already logged in."); - + login(username, getUserRoleNewPassword()); assertLeftNavMenuWithRole( fullname ); clickLinkWithText("Logout");