Author: vrockai Date: 2008-10-15 14:07:27 -0400 (Wed, 15 Oct 2008) New Revision: 12073 Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java Log: few id fixes Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2008-10-15 17:05:09 UTC (rev 12072) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2008-10-15 18:07:27 UTC (rev 12073) @@ -11,16 +11,16 @@ @Test(groups = { "cms_dashboard" }, enabled = true, description = "Dashboard issues test case.") public class DashboardTestCase extends JBossPortalSeleniumTestCase { - private static final String SUBMIT_ADDCENTER = "layoutForm:a_center"; - private static final String SUBMIT_ADDLEFT = "layoutForm:a_left"; + private static final String SUBMIT_ADDCENTER = "//input[contains(@id,'layoutForm:a_center"; + private static final String SUBMIT_ADDLEFT = "//input[contains(@id,'layoutForm:a_left"; private static final String LINK_CONFIGURE_DASHBOARD = "link=Configure dashboard"; private static final String LINK_DASHBOARD = "link=Dashboard"; private static final String SELECT_PAGE = "page-selector-form:pageNameSelector"; - private static final String INPUT_PAGENAME = "dashboard-form:pageName"; - private static final String SUBMIT_CREATEPAGE = "dashboard-form:save-button"; - private static final String SELECT_LAYOUT = "dashboardLayoutForm:layoutSelector"; - private static final String SUBMIT_LAYOUTSEL = "dashboardLayoutForm:update-layout"; - private static final String SELECT_THEME = "dashboardThemeForm:themeSelector"; + private static final String INPUT_PAGENAME = "//input[contains(@id,'dashboard-form:pageName"; + private static final String SUBMIT_CREATEPAGE = "//input[contains(@id,'dashboard-form:save-button"; + private static final String SELECT_LAYOUT = "//input[contains(@id,'dashboardLayoutForm:layoutSelector"; + private static final String SUBMIT_LAYOUTSEL = "//input[contains(@id,'dashboardLayoutForm:update-layout"; + private static final String SELECT_THEME = "//input[contains(@id,'dashboardThemeForm:themeSelector"; private static final String SUBMIT_THEMESEL = "dashboardThemeForm:update-theme"; @BeforeMethod(groups = { "log" }) Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2008-10-15 17:05:09 UTC (rev 12072) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2008-10-15 18:07:27 UTC (rev 12073) @@ -16,8 +16,15 @@ @Test(groups = { "admin_ui" }, enabled = true) public class IdentityAdminTestCase extends JBossPortalSeleniumTestCase { - private static final String INPUT_PASS_CHANGE_SUBMIT = "//input[contains(@id,'jbpns_2fadmin_2fMembers_2fIdentityAdminPortletWindowsnpbj:_viewRoot:change-pwd-form:j_id31')]"; - private static final String INPUT_PASS_CHANGE_CANCEL = "//input[contains(@id,'change-pwd-form:cancel')]"; + private static final String SUB_EDIT_USER_EMAIL_CANCEL = "profile-form:cancel"; + private static final String INP_EDIT_USER_EMAIL = "profile-form:email"; + private static final String SUB_ROLE_SEARCH_USER = "//input[contains(@id,'search-user-form:search')]"; + private static final String INP_ROLE_SEARCH_USER = "//input[contains(@id,'search-user-form:searchString')]"; + private static final String SUB_EDIT_ROLE_SUBMIT = "//input[contains(@id,'edit-role-link:submit')]"; + private static final String SUB_EDIT_ROLE_CANCEL = "//input[contains(@id,'edit-role-link:cancel')]"; + private static final String INP_EDIT_ROLE_NAME = "//input[contains(@id,'edit-role-link:display-name')]"; + private static final String SUB_PASS_CHANGE_SUBMIT = "//input[contains(@id,'change-pwd-form:j_id31')]"; + private static final String SUB_PASS_CHANGE_CANCEL = "//input[contains(@id,'change-pwd-form:cancel')]"; private static final String INPUT_PASS_CHANGE_P2 = "//input[contains(@id,':change-pwd-form:passwordCheck')]"; private static final String INPUT_PASS_CHANGE_P1 = "//input[contains(@id,':change-pwd-form:password')]"; private static final String LINK_CHANGE_PASS = "//a[contains(@id,':profile-form:change-pwd-adm-link')]"; @@ -209,8 +216,8 @@ int r = findTableRow(TABLE_USERLIST, "editMe", 0); selenium.click(MessageFormat.format(LINK_T_USRLIST_EDIT, r - 1)); selenium.waitForPageToLoad(PAGE_LOAD); - selenium.type("profile-form:email", "editMe2(a)redhat.com"); - selenium.click("profile-form:cancel"); + selenium.type(INP_EDIT_USER_EMAIL, "editMe2(a)redhat.com"); + selenium.click(SUB_EDIT_USER_EMAIL_CANCEL); selenium.waitForPageToLoad(PAGE_LOAD); Assert.assertTrue(selenium.isTextPresent("editMe(a)redhat.com")); @@ -221,7 +228,7 @@ selenium.click(MessageFormat.format(LINK_T_USRLIST_EDIT, r - 1)); selenium.waitForPageToLoad(PAGE_LOAD); - selenium.type("profile-form:email", "editMe2(a)redhat.com"); + selenium.type(INP_EDIT_USER_EMAIL, "editMe2(a)redhat.com"); selenium.select("profile-form:timezone", "label=(GMT -12:00 hours) Eniwetok, Kwajalein"); selenium.select("profile-form:theme", "label=portal.industrial"); selenium.select("profile-form:locale", "label=Albanian"); @@ -271,7 +278,7 @@ selenium.waitForPageToLoad(PAGE_LOAD); selenium.type(INPUT_PASS_CHANGE_P1, "changePass2"); selenium.type(INPUT_PASS_CHANGE_P2, "changePass2"); - selenium.click(INPUT_PASS_CHANGE_CANCEL); + selenium.click(SUB_PASS_CHANGE_CANCEL); selenium.waitForPageToLoad(PAGE_LOAD); Assert.assertFalse(selenium.isTextPresent("Password has been updated.")); @@ -294,7 +301,7 @@ selenium.waitForPageToLoad(PAGE_LOAD); selenium.type(INPUT_PASS_CHANGE_P1, "changePass2"); selenium.type(INPUT_PASS_CHANGE_P2, "changePass2"); - selenium.click(INPUT_PASS_CHANGE_SUBMIT); + selenium.click(SUB_PASS_CHANGE_SUBMIT); selenium.waitForPageToLoad(PAGE_LOAD); Assert.assertTrue(selenium.isTextPresent("Password has been updated.")); @@ -322,16 +329,16 @@ selenium.waitForPageToLoad(PAGE_LOAD); //search for the real member of current role - selenium.type("search-user-form:searchString", "newRoleMember"); - selenium.click("search-user-form:search"); + selenium.type(INP_ROLE_SEARCH_USER, "newRoleMember"); + selenium.click(SUB_ROLE_SEARCH_USER); selenium.waitForPageToLoad(PAGE_LOAD); r = findTableRow(TABLE_ROLEMEMBERS, "newRoleMember", 0); Assert.assertTrue(r>0, "Assigned member not found in the role members table."); //search for the non-member user of current role - selenium.type("search-user-form:searchString", "newRoleNonMember"); - selenium.click("search-user-form:search"); + selenium.type(INP_ROLE_SEARCH_USER, "newRoleNonMember"); + selenium.click(SUB_ROLE_SEARCH_USER); selenium.waitForPageToLoad(PAGE_LOAD); Assert.assertFalse(selenium.isElementPresent(TABLE_ROLEMEMBERS), "Not assigned member found in the role members table."); @@ -361,8 +368,8 @@ selenium.click(MessageFormat.format(LINK_T_ROLLIST_EDIT, r -1)); selenium.waitForPageToLoad(PAGE_LOAD); - selenium.type("edit-role-link:display-Name", "editedRoleDisplay"); - selenium.click("edit-role-link:cancel"); + selenium.type(INP_EDIT_ROLE_NAME, "editedRoleDisplay"); + selenium.click(SUB_EDIT_ROLE_CANCEL); selenium.waitForPageToLoad(PAGE_LOAD); r = findTableRow(TABLE_ROLELIST, "editRoleDisplay", 1); @@ -376,8 +383,8 @@ selenium.click(MessageFormat.format(LINK_T_ROLLIST_EDIT, r-1)); selenium.waitForPageToLoad(PAGE_LOAD); - selenium.type("edit-role-link:display-Name", "editedRoleDisplay"); - selenium.click("edit-role-link:submit"); + selenium.type(INP_EDIT_ROLE_NAME, "editedRoleDisplay"); + selenium.click(SUB_EDIT_ROLE_SUBMIT); selenium.waitForPageToLoad(PAGE_LOAD); r = findTableRow(TABLE_ROLELIST, "editRoleDisplay", 1); Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-10-15 17:05:09 UTC (rev 12072) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-10-15 18:07:27 UTC (rev 12073) @@ -11,38 +11,39 @@ */ @Test(groups = { "cms_wsrp" }, enabled = true, description = "WSRP test case.") public class WSRPTestCase extends JBossPortalSeleniumTestCase { - - private static final String SUBMIT_REFRESH_CANCEL = "edit-cons-form:list-cons-link_1"; - private static final String SUBMIT_PROD_SAVE = "producer-form:save-producer"; - private static final String SUBMIT_CONSDEL_CONF = "confirm-delete-form:destroy-link"; + private static final String SUBMIT_REFRESH_CANCEL = "//input[contains(@id,'edit-cons-form:list-cons-link_1')]"; + private static final String SUBMIT_PROD_SAVE = "//input[contains(@id,'producer-form:save-producer')]"; + private static final String SUBMIT_CONSDEL_CONF = "//input[contains(@id,'confirm-delete-form:destroy-linkv"; - private static final String SUBMIT_CONS_REGVAL = "edit-cons-form:refresh-cons-link"; - private static final String SUBMIT_REFRESHFINAL = "edit-cons-form:refresh-cons-link"; + private static final String SUBMIT_CONS_REGVAL = "//input[contains(@id,'edit-cons-form:refresh-cons-link')]"; + private static final String SUBMIT_REFRESHFINAL = "//input[contains(@id,'edit-cons-form:refresh-cons-link')]"; - private static final String INPUT_CONS_REGVALUE = "edit-cons-form:prop-value-input"; - private static final String SUBMIT_REFRESHSAVE = "edit-cons-form:refresh-cons-link"; - private static final String INPUT_CONSWSDL = "edit-cons-form:wsdl"; - private static final String INPUT_CACHEEXP = "edit-cons-form:cache"; - private static final String SUBMIT_ADDPROP_INIT = "producer-form:add-reg-prop"; - private static final String SUBMIT_ADDPROP = "producer-form:add-reg-prop"; - private static final String INPUT_PROPHINT = "producer-form:reg-properties:0:hint"; - private static final String INPUT_PROPLABEL = "producer-form:reg-properties:0:label"; - private static final String INPUT_PROPNAME = "producer-form:reg-properties:0:name"; - private static final String SUBMIT_CREATECONS = "createConsumer:createConsumerButton"; - private static final String INPUT_CREATECONS = "createConsumer:consumerName"; - private static final String ID_LINK_PRODCONF = "cons-temp-form:producer-link"; - private static final String ID_LINK_CONSCONF = "producer-temp-form:consumersTab"; - private static final String LINK_CONSUMER_HOME ="cons-temp-form1:list-cons-link"; + private static final String INPUT_CONS_REGVALUE = "//input[contains(@id,'edit-cons-form:existingProps:0:prop-value-input')]"; + private static final String SUBMIT_REFRESHSAVE = "//input[contains(@id,'edit-cons-form:refresh-cons-link')]"; + private static final String INPUT_CONSWSDL = "//input[contains(@id,'edit-cons-form:wsdl')]"; + private static final String INPUT_CACHEEXP = "//input[contains(@id,'edit-cons-form:cache')]"; + private static final String SUBMIT_ADDPROP_INIT = "//input[contains(@id,'producer-form:add-reg-prop')]"; + private static final String SUBMIT_ADDPROP = "//input[contains(@id,'producer-form:add-reg-prop')]"; + private static final String INPUT_PROPHINT = "//input[contains(@id,'producer-form:reg-properties:0:hint')]"; + private static final String INPUT_PROPLABEL = "//input[contains(@id,'producer-form:reg-properties:0:label')]"; + private static final String INPUT_PROPNAME = "//input[contains(@id,'producer-form:reg-properties:0:name')]"; + private static final String SUBMIT_CREATECONS = "//input[contains(@id,'createConsumer:createConsumerButton')]"; + private static final String INPUT_CREATECONS = "//input[contains(@id,'createConsumer:consumerName')]"; + private static final String ID_LINK_PRODCONF = "//a[contains(@id,'cons-temp-form:producer-link')]"; + private static final String ID_LINK_CONSCONF = "//a[contains(@id,'producer-temp-form:consumersTab')]"; + private static final String LINK_CONSUMER_HOME ="//a[contains(@id,'cons-temp-form1:list-cons-link')]"; - private static final String LINK_T_CONS_CON="consumer-list-form:consumersList:{0}:configure"; - private static final String LINK_T_CONS_REF="consumer-list-form:consumersList:{0}:refresh"; - private static final String LINK_T_CONS_ACT="consumer-list-form:consumersList:{0}:activate"; - private static final String LINK_T_CONS_DEA="consumer-list-form:consumersList:{0}:activate"; - private static final String LINK_T_CONS_REG="consumer-list-form:consumersList:{0}:register"; - private static final String LINK_T_CONS_DER="consumer-list-form:consumersList:{0}:register"; - private static final String LINK_T_CONS_DEL="consumer-list-form:consumersList:{0}:delete"; + private static final String LINK_T_CONS_CON="//a[contains(@id,''consumer-list-form:consumersList:{0}:configure'')]"; + private static final String LINK_T_CONS_REF="//a[contains(@id,''consumer-list-form:consumersList:{0}:refresh'')]"; + private static final String LINK_T_CONS_ACT="//a[contains(@id,''consumer-list-form:consumersList:{0}:activate'')]"; + private static final String LINK_T_CONS_DEA="//a[contains(@id,''consumer-list-form:consumersList:{0}:activate'')]"; + private static final String LINK_T_CONS_REG="//a[contains(@id,''consumer-list-form:consumersList:{0}:register'')]"; + private static final String LINK_T_CONS_DER="//a[contains(@id,''consumer-list-form:consumersList:{0}:register'')]"; + private static final String LINK_T_CONS_DEL="//a[contains(@id,''consumer-list-form:consumersList:{0}:delete'')]"; + + public static String WSRP_CONSUMER_TABLE = "consumer-list-form:consumersList"; @BeforeMethod(groups = { "log" }) public void loginBeforeTest() {