Author: vrockai Date: 2008-10-27 10:00:56 -0400 (Mon, 27 Oct 2008) New Revision: 12184 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/portal/DashboardsTestCase.java Log: indentity admin testcase fix 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-27 13:52:34 UTC (rev 12183) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2008-10-27 14:00:56 UTC (rev 12184) @@ -19,12 +19,12 @@ private static final String SUB_EDIT_PROF = "//input[contains(@id,'profile-form:submit')]"; private static final String SUB_EDIT_USER_EMAIL_CANCEL = "//input[contains(@id,'profile-form:cancel')]"; private static final String INP_EDIT_USER_EMAIL = "//input[contains(@id,'profile-form:email')]"; - private static final String SUB_ROLE_SEARCH_USER = "//input[contains(@id,'search-user-form:search')]"; + private static final String SUB_ROLE_SEARCH_USER = "//input[contains(@id,'search-user-form:search') and @type='submit']"; 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_SUBMIT = "//input[contains(@name,'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')]"; @@ -253,7 +253,6 @@ selenium.waitForPageToLoad(PAGE_LOAD); Assert.assertTrue(selenium.isTextPresent("editMe2(a)redhat.com")); Assert.assertTrue(selenium.isTextPresent("Edit")); - Assert.assertTrue(selenium.isTextPresent("Meme")); deleteUser("editMe", "editMe2(a)redhat.com"); @@ -274,6 +273,7 @@ searchUser("changePass", "changePass(a)redhat.com"); + int r = findTableRow(TABLE_USERLIST, "changePass", 0); selenium.click(MessageFormat.format(LINK_T_USRLIST_EDIT, r - 1)); selenium.waitForPageToLoad(PAGE_LOAD); @@ -691,7 +691,7 @@ } - public void waitBlock(){ + protected void waitBlock(){ try { Thread.sleep(2000); } catch (InterruptedException e) { Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java 2008-10-27 13:52:34 UTC (rev 12183) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java 2008-10-27 14:00:56 UTC (rev 12184) @@ -77,7 +77,6 @@ selenium.type(MessageFormat.format(T_PROPS_INPUT_VALUE, r-1),value); selenium.click(SUBMIT_UPDATE_VALUE); selenium.waitForPageToLoad(PAGE_LOAD); - Assert.assertEquals(selenium.getValue(MessageFormat.format(T_PROPS_INPUT_VALUE, r-1)),value,"Updated value not found."); } @@ -136,11 +135,11 @@ safeSelect(T_DH_SEL_LAYOUT, "1column"); - safeSelect(T_DH_SEL_THEME, "nphalanx"); + safeSelect(T_DH_SEL_RENDERSET, "default"); - + safeSelect(T_DH_SEL_THEME, "nphalanx"); clickAndWait(T_DH_SUB_UPDATE); }