Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/NotifierTest.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/NotifierTest.java?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/NotifierTest.java (original) +++ continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/NotifierTest.java Thu May 6 09:23:13 2010 @@ -26,16 +26,16 @@ import org.testng.annotations.Test; * @author José Morales Martínez * @version $Id$ */ -@Test( groups = { "notifier" }, dependsOnMethods = { "testAddMavenTwoProject" } ) +@Test( groups = { "notifier" }, dependsOnMethods = { "testAddMavenTwoProjectFromRemoteSourceToNonDefaultProjectGroup" } ) public class NotifierTest extends AbstractNotifierTest { 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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 class NotifierTest 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" ); Propchange: continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/NotifierTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/NotifierTest.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java (original) +++ continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java Thu May 6 09:23:13 2010 @@ -20,11 +20,12 @@ package org.apache.continuum.web.test; */ import org.apache.continuum.web.test.parent.AbstractContinuumTest; +import org.apache.continuum.web.test.parent.AbstractSeleniumTest; import org.testng.annotations.Test; /** * Based on ProjectGroupTest of Emmanuel Venisse test. - * + * * @author José Morales Martínez * @version $Id$ */ @@ -36,9 +37,9 @@ public class ProjectGroupTest 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 +48,9 @@ public class ProjectGroupTest 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,14 +60,16 @@ public class ProjectGroupTest 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" ); + // TODO: need to wait for checkout to complete. Can we add a special IT type of project that doesn't require checkout? + // currently we get away with it due to the usualy duration between the dependant test and this test // 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, DEFAULT_PROJ_GRP_NAME ); @@ -102,9 +105,9 @@ public class ProjectGroupTest 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 +123,9 @@ public class ProjectGroupTest 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,11 +135,90 @@ public class ProjectGroupTest 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(); } + + @Test( dependsOnMethods = { "testAddProjectGroup" } ) + public void testDeleteProjectGroup() + throws Exception + { + String TEST_GRP_NAME = getProperty( "TEST_DELETE_GRP_NAME" ); + String TEST_GRP_ID = getProperty( "TEST_DELETE_GRP_ID" ); + String TEST_GRP_DESCRIPTION = getProperty( "TEST_DELETE_GRP_DESCRIPTION" ); + + // delete group - delete icon + addProjectGroup( TEST_GRP_NAME, TEST_GRP_ID, TEST_GRP_DESCRIPTION, true ); + assertLinkPresent( TEST_GRP_NAME ); + clickLinkWithXPath( "//tbody/tr['0']/td['4']/a/img[@alt='Delete Group']" ); + assertTextPresent( "Project Group Removal" ); + clickButtonWithValue( "Delete" ); + assertProjectGroupsSummaryPage(); + assertLinkNotPresent( TEST_GRP_NAME ); + + // delete group - "Delete Group" button + addProjectGroup( TEST_GRP_NAME, TEST_GRP_ID, TEST_GRP_DESCRIPTION, true ); + assertLinkPresent( TEST_GRP_NAME ); + removeProjectGroup( TEST_GRP_NAME ); + assertLinkNotPresent( TEST_GRP_NAME ); + assertProjectGroupsSummaryPage(); + assertLinkNotPresent( TEST_GRP_NAME ); + } + + public void testProjectGroupMembers() + throws Exception + { + String GRP_NAME_ONE = getProperty( "TEST_PROJ_GRP_NAME_ONE" ); + String GRP_ID_ONE = getProperty( "TEST_PROJ_GRP_ID_ONE" ); + String GRP_DESCRIPTION_ONE = getProperty( "TEST_PROJ_GRP_DESCRIPTION_ONE" ); + String GRP_NAME_TWO = getProperty( "TEST_PROJ_GRP_NAME_TWO" ); + String GRP_ID_TWO = getProperty( "TEST_PROJ_GRP_ID_TWO" ); + String GRP_DESCRIPTION_TWO = getProperty( "TEST_PROJ_GRP_DESCRIPTION_TWO" ); + String GRP_NAME_THREE = getProperty( "TEST_PROJ_GRP_NAME_THREE" ); + String GRP_ID_THREE = getProperty( "TEST_PROJ_GRP_ID_THREE" ); + String GRP_DESCRIPTION_THREE = getProperty( "TEST_PROJ_GRP_DESCRIPTION_THREE" ); + + addProjectGroup( GRP_NAME_ONE, GRP_ID_ONE, GRP_DESCRIPTION_ONE, true ); + assertLinkPresent( GRP_NAME_ONE ); + + addProjectGroup( GRP_NAME_TWO, GRP_ID_TWO, GRP_DESCRIPTION_TWO, true ); + assertLinkPresent( GRP_NAME_TWO ); + + addProjectGroup( GRP_NAME_THREE, GRP_ID_THREE, GRP_DESCRIPTION_THREE, true ); + assertLinkPresent( GRP_NAME_THREE ); + + createAndAddUserAsDeveloperToGroup( "username1", "user1", "user1@something.com", "password123", GRP_NAME_ONE ); + createAndAddUserAsDeveloperToGroup( "username2", "user2", "user2@something.com", "password123", GRP_NAME_ONE ); + createAndAddUserAsDeveloperToGroup( "username3", "user3", "user3@something.com", "password123", GRP_NAME_TWO ); + createAndAddUserAsDeveloperToGroup( "username4", "user4", "user4@something.com", "password123", GRP_NAME_THREE ); + + showMembers( GRP_NAME_ONE, GRP_ID_ONE, GRP_DESCRIPTION_ONE ); + assertUserPresent( "username1", "user1", "user1@something.com" ); + assertUserPresent( "username2", "user2", "user2@something.com" ); + assertUserNotPresent( "username3", "user3", "user3@something.com" ); + assertUserNotPresent( "username4", "user4", "user4@something.com" ); + + showMembers( GRP_NAME_TWO, GRP_ID_TWO, GRP_DESCRIPTION_TWO ); + assertUserNotPresent( "username1", "user1", "user1@something.com" ); + assertUserNotPresent( "username2", "user2", "user2@something.com" ); + assertUserPresent( "username3", "user3", "user3@something.com" ); + assertUserNotPresent( "username4", "user4", "user4@something.com" ); + + showMembers( GRP_NAME_THREE, GRP_ID_THREE, GRP_DESCRIPTION_THREE ); + assertUserNotPresent( "username1", "user1", "user1@something.com" ); + assertUserNotPresent( "username2", "user2", "user2@something.com" ); + assertUserNotPresent( "username3", "user3", "user3@something.com" ); + assertUserPresent( "username4", "user4", "user4@something.com" ); + + removeProjectGroup( GRP_NAME_ONE ); + assertLinkNotPresent( GRP_NAME_ONE ); + removeProjectGroup( GRP_NAME_TWO ); + assertLinkNotPresent( GRP_NAME_TWO ); + removeProjectGroup( GRP_NAME_THREE ); + assertLinkNotPresent( GRP_NAME_THREE ); + } } Propchange: continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ProjectGroupTest.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/PurgeTest.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/PurgeTest.java?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/PurgeTest.java (original) +++ continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/PurgeTest.java Thu May 6 09:23:13 2010 @@ -32,16 +32,16 @@ public class PurgeTest { 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 @@ public class PurgeTest @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 @@ public class PurgeTest @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 @@ public class PurgeTest @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 @@ public class PurgeTest @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 ); } } Propchange: continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/PurgeTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/PurgeTest.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java (original) +++ continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java Thu May 6 09:23:13 2010 @@ -21,11 +21,15 @@ package org.apache.continuum.web.test; import org.apache.continuum.web.test.parent.AbstractBuildQueueTest; import org.testng.annotations.Test; +import org.apache.continuum.web.test.ScheduleTest; + /** * @author José Morales Martínez * @version $Id$ */ + + @Test( groups = { "queue" }, dependsOnMethods = { "testWithCorrectUsernamePassword" } ) public class QueueTest extends AbstractBuildQueueTest @@ -34,11 +38,55 @@ public class QueueTest 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 ); } - @Test( dependsOnMethods = { "testAddBuildQueue" } ) + @Test( dependsOnMethods = { "testAddBuildQueue" } ) //"testDeleteBuildQueue" } ) + public void testQueuePageWithoutBuild() + { + clickAndWait( "link=Queues" ); + assertPage( "Continuum - Build Queue" ); + assertTextPresent( "Nothing is building" ); + assertTextNotPresent( "Project Name* Build Definition" ); + assertTextPresent( "Current Build" ); + assertTextPresent( "Build Queue" ); + assertTextPresent( "Current Checkout" ); + assertTextPresent( "Checkout Queue " ); + assertTextPresent( "Current Prepare Build" ); + assertTextPresent( "Prepare Build Queue" ); + } + + @Test( dependsOnMethods = { "testAddBuildQueue", "testAddSchedule" } ) + public void testAddBuildQueueToSchedule() + { + ScheduleTest sched = new ScheduleTest(); + + 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 BUILD_QUEUE_NAME = getProperty( "BUILD_QUEUE_NAME" ); + + + sched.goToEditSchedule( SCHEDULE_NAME, SCHEDULE_DESCRIPTION, SCHEDULE_EXPR_SECOND, SCHEDULE_EXPR_MINUTE, + SCHEDULE_EXPR_HOUR, SCHEDULE_EXPR_DAY_MONTH, SCHEDULE_EXPR_MONTH, SCHEDULE_EXPR_DAY_WEEK, + SCHEDULE_EXPR_YEAR, SCHEDULE_MAX_TIME, SCHEDULE_PERIOD ); + getSelenium().addSelection("saveSchedule_availableBuildQueuesIds", "label="+BUILD_QUEUE_NAME); + getSelenium().click("//input[@value='->']"); + submit(); + + } + + @Test( dependsOnMethods = { "testAddBuildQueue" } ) public void testAddNotAllowedBuildQueue() { setMaxBuildQueue( 1 ); @@ -51,11 +99,12 @@ public class QueueTest 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() { setMaxBuildQueue( 3 ); @@ -63,22 +112,69 @@ public class QueueTest assertTextPresent( "You must define a name" ); } - @Test( dependsOnMethods = { "testAddBuildQueue", "testAddAlreadyExistBuildQueue" } ) + @Test( dependsOnMethods = { "testAddBuildQueueToSchedule" } ) 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 ); } - public void testQueuePage() - { - clickLinkWithText( "Queues" ); + @Test( dependsOnMethods = { "testAddMavenTwoProject" } ) + public void testQueuePageWithProjectCurrentlyBuilding() + throws Exception + { + //build a project + 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 ); + String location = getSelenium().getLocation(); + + //check queue page while building + getSelenium().open( "/continuum/admin/displayQueues!display.action" ); assertPage( "Continuum - Build Queue" ); assertTextPresent( "Current Build" ); - assertTextPresent( "Continuum - Build Queue" ); + assertTextPresent( "Build Queue" ); assertTextPresent( "Current Checkout" ); - assertTextPresent( "Checkout Queue" ); - assertButtonWithValuePresent( "Cancel Entries" ); + assertTextPresent( "Checkout Queue " ); + assertTextPresent( "Current Prepare Build" ); + assertTextPresent( "Prepare Build Queue" ); + assertElementPresent("//table[@id='ec_table']/tbody/tr/td[4]"); + assertTextPresent( M2_PROJ_GRP_NAME ); + getSelenium().open( location ); + waitPage(); + waitForElementPresent( "//img[@alt='Success']" ); + } + + @Test( dependsOnMethods = { "testQueuePageWithProjectCurrentlyBuilding", "testAddBuildAgent" } ) + public void testQueuePageWithProjectCurrentlyBuildingInDistributedBuilds() + throws Exception + { + 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" ); + + try + { + enableDistributedBuilds(); + buildProjectForQueuePageTest( M2_PROJ_GRP_NAME, M2_PROJ_GRP_ID, M2_PROJ_GRP_DESCRIPTION, M2_PROJ_GRP_NAME ); + + //check queue page while building + getSelenium().open( "/continuum/admin/displayQueues!display.action" ); + assertPage( "Continuum - View Distributed Builds" ); + assertTextPresent( "Current Build" ); + assertTextPresent( "Build Queue" ); + assertTextPresent( "Current Prepare Build" ); + assertTextPresent( "Prepare Build Queue" ); + assertTextPresent( M2_PROJ_GRP_NAME ); + assertTextPresent( "Build Agent URL" ); + } + finally + { + disableDistributedBuilds(); + } } -} + + } Propchange: continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/QueueTest.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ScheduleTest.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ScheduleTest.java?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ScheduleTest.java (original) +++ continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ScheduleTest.java Thu May 6 09:23:13 2010 @@ -30,29 +30,50 @@ import org.testng.annotations.Test; public class ScheduleTest extends AbstractScheduleTest { + public void testAddScheduleNoBuildQueueToBeUsed() + { + 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, + SCHEDULE_EXPR_YEAR, SCHEDULE_MAX_TIME, SCHEDULE_PERIOD, false, false ); + assertTextPresent( "Used Build Queues cannot be empty" ); + } + + @Test( dependsOnMethods = { "testAddScheduleNoBuildQueueToBeUsed" } ) 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, - SCHEDULE_EXPR_YEAR, SCHEDULE_MAX_TIME, SCHEDULE_PERIOD, true ); + SCHEDULE_EXPR_YEAR, SCHEDULE_MAX_TIME, SCHEDULE_PERIOD, true, true ); } public void testAddInvalidSchedule() { goToAddSchedule(); - addEditSchedule( "", "", "", "", "", "", "", "", "", "", "", false ); + addEditSchedule( "", "", "", "", "", "", "", "", "", "", "", true, false ); assertTextPresent( "Invalid cron expression value(s)" ); assertTextPresent( "Name is required and cannot contain spaces only" ); assertTextPresent( "Description is required and cannot contain spaces only" ); @@ -61,38 +82,38 @@ public class ScheduleTest @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, - SCHEDULE_EXPR_YEAR, SCHEDULE_MAX_TIME, SCHEDULE_PERIOD, false ); + SCHEDULE_EXPR_YEAR, SCHEDULE_MAX_TIME, SCHEDULE_PERIOD, true, false ); assertTextPresent( "A Schedule with the same name already exists" ); } @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"; @@ -107,17 +128,17 @@ public class ScheduleTest goToEditSchedule( SCHEDULE_NAME, SCHEDULE_DESCRIPTION, SCHEDULE_EXPR_SECOND, SCHEDULE_EXPR_MINUTE, SCHEDULE_EXPR_HOUR, SCHEDULE_EXPR_DAY_MONTH, SCHEDULE_EXPR_MONTH, SCHEDULE_EXPR_DAY_WEEK, SCHEDULE_EXPR_YEAR, SCHEDULE_MAX_TIME, SCHEDULE_PERIOD ); - addEditSchedule( name, description, second, minute, hour, dayMonth, month, dayWeek, year, maxTime, period, true ); + addEditSchedule( name, description, second, minute, hour, dayMonth, month, dayWeek, year, maxTime, period, false, true ); goToEditSchedule( name, description, second, minute, hour, dayMonth, month, dayWeek, year, maxTime, period ); 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, - SCHEDULE_EXPR_YEAR, SCHEDULE_MAX_TIME, SCHEDULE_PERIOD, true ); + SCHEDULE_EXPR_YEAR, SCHEDULE_MAX_TIME, SCHEDULE_PERIOD, false, true ); } @Test( dependsOnMethods = { "testEditSchedule" } ) public void testDeleteSchedule() { - String SCHEDULE_NAME = p.getProperty( "SCHEDULE_NAME" ); + String SCHEDULE_NAME = getProperty( "SCHEDULE_NAME" ); removeSchedule( SCHEDULE_NAME ); } } Propchange: continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ScheduleTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ScheduleTest.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ShellProjectTest.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ShellProjectTest.java?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ShellProjectTest.java (original) +++ continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ShellProjectTest.java Thu May 6 09:23:13 2010 @@ -24,7 +24,7 @@ import org.testng.annotations.Test; /** * Based on AddShellProjectTestCase of Emmanuel Venisse. - * + * * @author José Morales Martínez * @version $Id$ */ @@ -35,19 +35,19 @@ public class ShellProjectTest 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 ); + SHELL_SCM_PASSWORD, SHELL_TAG, false, DEFAULT_PROJ_GRP_NAME, null, true, "shell" ); assertProjectGroupSummaryPage( DEFAULT_PROJ_GRP_NAME, DEFAULT_PROJ_GRP_ID, DEFAULT_PROJ_GRP_DESCRIPTION ); } @@ -62,19 +62,19 @@ public class ShellProjectTest } @Test( dependsOnMethods = { "testAddShellProject" } ) - public void testAddDupliedShellProject() + public void testAddDuplicateShellProject() 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 ); + SHELL_SCM_PASSWORD, SHELL_TAG, false, null, null, false, "shell" ); assertTextPresent( "Project name already exist" ); } } Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildEnvironmentTest.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildEnvironmentTest.java?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildEnvironmentTest.java (original) +++ continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildEnvironmentTest.java Thu May 6 09:23:13 2010 @@ -24,7 +24,7 @@ package org.apache.continuum.web.test.pa * @version $Id$ */ public abstract class AbstractBuildEnvironmentTest - extends AbstractSeleniumTest + extends AbstractContinuumTest { public void goToBuildEnvironmentPage() { @@ -71,6 +71,13 @@ public abstract class AbstractBuildEnvir editBuildEnvironment( name, installations, success ); } + public void addBuildEnvironmentWithBuildAgentGroup( String name, String[] installations, String buildAgentGroupName, boolean success ) + { + setFieldValue( "profile.name", name ); + submit(); + editBuildEnvironmentWithBuildAgentGroup( name, installations, buildAgentGroupName, success ); + } + public void editBuildEnvironment( String name, String[] installations, boolean success ) { setFieldValue( "profile.name", name ); @@ -90,6 +97,26 @@ public abstract class AbstractBuildEnvir } } + public void editBuildEnvironmentWithBuildAgentGroup( String name, String[] installations, String buildAgentGroupName, boolean success ) + { + setFieldValue( "profile.name", name ); + selectValue( "profile.buildAgentGroup", buildAgentGroupName ); + for ( String i : installations ) + { + selectValue( "installationId", i ); + clickButtonWithValue( "Add" ); + } + submit(); + if ( success ) + { + assertBuildEnvironmentPage(); + } + else + { + assertAddBuildEnvironmentPage(); + } + } + public void goToEditBuildEnvironment( String name ) { goToBuildEnvironmentPage(); Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildQueueTest.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildQueueTest.java?rev=941625&r1=941624&r2=941625&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildQueueTest.java (original) +++ continuum/branches/continuum-flat-multi-module/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractBuildQueueTest.java Thu May 6 09:23:13 2010 @@ -1,5 +1,7 @@ package org.apache.continuum.web.test.parent; +import org.testng.Assert; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -64,22 +66,32 @@ public abstract class AbstractBuildQueue assertButtonWithValuePresent( "Cancel" ); } - public void addBuildQueue( String name, boolean success ) - { - goToBuildQueuePage(); - assertBuildQueuePage(); - submit(); - assertAddBuildQueuePage(); - setFieldValue( "name", name ); - submit(); - if ( success ) - { - assertBuildQueuePage(); - assertTextPresent( name ); - } - else - { - assertAddBuildQueuePage(); - } - } + public void addBuildQueue( String name, boolean success ) + { + goToBuildQueuePage(); + assertBuildQueuePage(); + submit(); + assertAddBuildQueuePage(); + setFieldValue( "name", name ); + submit(); + if ( success ) + { + assertBuildQueuePage(); + assertTextPresent( name ); + } + else + { + assertAddBuildQueuePage(); + } + } + + public void buildProjectForQueuePageTest( String projectGroupName, String groupId, String description, String projectName ) + throws Exception + { + showProjectGroup( projectGroupName, groupId, description ); + clickButtonWithValue( "Build all projects" ); + waitForElementPresent( "//img[@alt='Building']" ); + } + + }