Author: vrockai Date: 2009-02-23 05:53:13 -0500 (Mon, 23 Feb 2009) New Revision: 12859 Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh 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/JBossSeleniumTestListener.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties Log: [JBPORTAL-2308] - locators to identity managment added, fix of role create element Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-02-23 09:38:02 UTC (rev 12858) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2009-02-23 10:53:13 UTC (rev 12859) @@ -134,6 +134,7 @@ <sysproperty key="workspace" value="${workspace}" /> <sysproperty key="userCount" value="${userCount}" /> <sysproperty key="html-src" value="${html-src}" /> + <sysproperty key="output-dir" value="${testng.output.dir}" /> <jvmarg value="-ea" /> </testng> @@ -154,7 +155,7 @@ <sysproperty key="workspace" value="${workspace}" /> <sysproperty key="userCount" value="${userCount}" /> <sysproperty key="html-src" value="${html-src}" /> - + <sysproperty key="output-dir" value="${testng.output.dir}" /> <jvmarg value="-ea" /> </testng> <antcall target="cleanup" /> @@ -174,6 +175,8 @@ <sysproperty key="workspace" value="${workspace}" /> <sysproperty key="userCount" value="${userCount}" /> <sysproperty key="html-src" value="${html-src}" /> + <sysproperty key="output-dir" value="${testng.output.dir}" /> + <jvmarg value="-ea" /> @@ -194,7 +197,7 @@ <sysproperty key="workspace" value="${workspace}" /> <sysproperty key="userCount" value="${userCount}" /> <sysproperty key="html-src" value="${html-src}" /> - + <sysproperty key="output-dir" value="${testng.output.dir}" /> <jvmarg value="-ea" /> </testng> Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh 2009-02-23 09:38:02 UTC (rev 12858) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh 2009-02-23 10:53:13 UTC (rev 12859) @@ -47,7 +47,7 @@ exit 0; fi ant -f build.xml copyApps - ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true" + ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true" -Dhtml-src="true" elif [ $1 = "end2end" ]; then if [ -z "$2" -o ! -f "$2" ]; then echo @@ -55,7 +55,7 @@ exit 0; fi ant -f build.xml copyApps - ant -f build.xml selenium-usecase -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true" + ant -f build.xml selenium-usecase -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true" -Dhtml-src="true" elif [ $1 = "perf" ]; then if [ -z "$2" -o ! -f "$2" ]; then echo @@ -63,7 +63,7 @@ exit 0; fi ant -f build.xml copyApps - ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" + ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true" -Dhtml-src="true" elif [ $1 = "selenium" ]; then ant -f build.xml run-src elif [ $1 = "single" ]; then @@ -77,6 +77,6 @@ echo "ERROR: Testclasss not set"; exit 0; fi - ant -f build.xml single-test -Dbrowser="*firefox $2" -Dtestname="$3" + ant -f build.xml single-test -Dbrowser="*firefox $2" -Dtestname="$3" -Dscreenshot="true" -Dhtml-src="true" fi fi 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 2009-02-23 09:38:02 UTC (rev 12858) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-02-23 10:53:13 UTC (rev 12859) @@ -14,70 +14,72 @@ @Test(groups = { "admin_ui" }, enabled = true) public class IdentityAdminTestCase extends JBossPortalSeleniumTestCase { - private static final String SEL_SEARCHUSER_LIMIT = "//select[contains(@id,'search-user-form:limit')]"; - private static final String SUB_EDIT_PROF = "//input[contains(@id,'profile-form:submit')]"; + public String casePfx = "iden.man."; - private static final String SUB_PAGIN_LEFT = "//input[contains(@id,'search-user-form1:prev-page')]"; - private static final String SUB_PAGIN_RIGHT = "//input[contains(@id,'search-user-form1:next-page')]"; + private final String SEL_SEARCHUSER_LIMIT = getProp(casePfx + "sel.searchuser.limit", "//select[contains(@id,'search-user-form:limit')]"); + private final String SUB_EDIT_PROF = getProp(casePfx + "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') 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(@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 INP_PASS_CHANGE_P2 = "//input[contains(@id,':change-pwd-form:passwordCheck')]"; - private static final String INP_PASS_CHANGE_P1 = "//input[contains(@id,':change-pwd-form:password')]"; - private static final String LNK_CHANGE_PASS = "//a[contains(@id,':profile-form:change-pwd-adm-link')]"; - public static final String TBL_USERLIST = "//table[contains(@id,'search-user-form1:userlist')]"; - public static final String LNK_T_USRLIST_DEL = "//a[contains(@id,''search-user-form1:userlist:{0}:delete-user-link'')]"; - public static final String LNK_T_USRLIST_ROLES = "//a[contains(@id,''search-user-form1:userlist:{0}:assign-role-link'')]"; - public static final String LNK_T_USRLIST_DIS = "//a[contains(@id,''search-user-form1:userlist:{0}:enable-user-link'')]"; - public static final String LNK_T_USRLIST_EDIT = "//a[contains(@id,''search-user-form1:userlist:{0}:rename-link'')]"; + private final String SUB_PAGIN_LEFT = getProp(casePfx + "sub.pagin.left", "//input[contains(@id,'search-user-form1:prev-page')]"); + private final String SUB_PAGIN_RIGHT = getProp(casePfx + "sub.pagin.right", "//input[contains(@id,'search-user-form1:next-page')]"); - public static final String TBL_ROLELIST = "//table[contains(@id,':_viewRoot:roles-form:userlist')]"; + private final String SUB_EDIT_USER_EMAIL_CANCEL = getProp(casePfx + "sub.edit.user.email.cancel", "//input[contains(@id,'profile-form:cancel')]"); + private final String INP_EDIT_USER_EMAIL = getProp(casePfx + "inp.edit.user.email", "//input[contains(@id,'profile-form:email')]"); + private final String SUB_ROLE_SEARCH_USER = getProp(casePfx + "sub.role.search.user", "//input[contains(@id,'search-user-form:search') and @type='submit']"); + private final String INP_ROLE_SEARCH_USER = getProp(casePfx + "inp.role.search.user", "//input[contains(@id,'search-user-form:searchString')]"); + private final String SUB_EDIT_ROLE_SUBMIT = getProp(casePfx + "sub.edit.role.submit", "//input[contains(@id,'edit-role-link:submit')]"); + private final String SUB_EDIT_ROLE_CANCEL = getProp(casePfx + "sub.edit.role.cancel", "//input[contains(@id,'edit-role-link:cancel')]"); + private final String INP_EDIT_ROLE_NAME = getProp(casePfx + "inp.edit.role.name", "//input[contains(@id,'edit-role-link:display-name')]"); + private final String SUB_PASS_CHANGE_SUBMIT = getProp(casePfx + "sub.pass.change.submit", "//input[contains(@name,'change-pwd-form:j_id31')]"); + private final String SUB_PASS_CHANGE_CANCEL = getProp(casePfx + "sub.pass.change.cancel", "//input[contains(@id,'change-pwd-form:cancel')]"); + private final String INP_PASS_CHANGE_P2 = getProp(casePfx + "inp.pass.change.p2", "//input[contains(@id,':change-pwd-form:passwordCheck')]"); + private final String INP_PASS_CHANGE_P1 = getProp(casePfx + "inp.pass.change.p1", "//input[contains(@id,':change-pwd-form:password')]"); + private final String LNK_CHANGE_PASS = getProp(casePfx + "lnk.change.pass", "//a[contains(@id,':profile-form:change-pwd-adm-link')]"); + public final String TBL_USERLIST = getProp(casePfx + "tbl.userlist", "//table[contains(@id,'search-user-form1:userlist')]"); + public final String LNK_T_USRLIST_DEL = getProp(casePfx + "lnk.t.usrlist.del", "//a[contains(@id,''search-user-form1:userlist:{0}:delete-user-link'')]"); + public final String LNK_T_USRLIST_ROLES = getProp(casePfx + "lnk.t.usrlist.roles", "//a[contains(@id,''search-user-form1:userlist:{0}:assign-role-link'')]"); + public final String LNK_T_USRLIST_DIS = getProp(casePfx + "lnk.t.usrlist.dis", "//a[contains(@id,''search-user-form1:userlist:{0}:enable-user-link'')]"); + public final String LNK_T_USRLIST_EDIT = getProp(casePfx + "lnk.t.usrlist.edit", "//a[contains(@id,''search-user-form1:userlist:{0}:rename-link'')]"); - public static final String LNK_T_ROLLIST_DEL = "//a[contains(@id,''roles-form:userlist:{0}:delete-role-link'')]"; - public static final String LNK_T_ROLLIST_MEMBERS = "//a[contains(@id,''roles-form:userlist:{0}:view-role-link'')]"; - public static final String LNK_T_ROLLIST_EDIT = "//a[contains(@id,''roles-form:userlist:{0}:edit-role-link'')]"; + public final String TBL_ROLELIST = getProp(casePfx + "tbl.rolelist", "//table[contains(@id,'roles-form:userlist')]"); - public static final String TBL_ROLEMEMBERS = "//table[contains(@id,'role-members-form:role-data-table')]"; + public final String LNK_T_ROLLIST_DEL = getProp(casePfx + "lnk.t.rollist.del", "//a[contains(@id,''roles-form:userlist:{0}:delete-role-link'')]"); + public final String LNK_T_ROLLIST_MEMBERS = getProp(casePfx + "lnk.t.rollist.members", "//a[contains(@id,''roles-form:userlist:{0}:view-role-link'')]"); + public final String LNK_T_ROLLIST_EDIT = getProp(casePfx + "lnk.t.rollist.edit", "//a[contains(@id,''roles-form:userlist:{0}:edit-role-link'')]"); - public static final String SUB_CONF_CREATE_USER = "//input[contains(@id,'confirm-form:admin')]"; - public static final String SUB_DELETE_ROLE = "//input[contains(@id,'delete-role-form:confirm')]"; - public static final String SUB_ROLE_CREATE = "//input[contains(@id,':_viewRoot:create-role-form:submit')]"; - public static final String INP_ROLEDISNAME = "//input[contains(@id,':_viewRoot:create-role-form:roledisplayname')]"; - public static final String INP_ROLENAME = "//input[contains(@id,':_viewRoot:create-role-form:rolename')]"; + public final String TBL_ROLEMEMBERS = getProp(casePfx + "tbl.rolemembers", "//table[contains(@id,'role-members-form:role-data-table')]"); - public static final String LNK_ROLE_CREATE = "//a[contains(@id, ':_viewRoot:create-role-form:create-role-link')]"; - public static final String SUB_DEL_USER = "//input[contains(@id,'delete-user-form:submit')]"; - public static final String SUB_ASSIGN_ROLE = "//input[contains(@id,'assign-roles-form:submit')]"; - public static final String SUB_USER_ROLE = "//input[contains(@id,'register-role-form:submit')]"; - public static final String SUB_CREATE_USER = "//input[contains(@id,'register-form:submit')]"; - public static final String INP_PASSWORD_CHK = "//input[contains(@id,'register-form:passwordCheck')]"; - public static final String INP_PASSWORD = "//input[contains(@id,'register-form:password')]"; - public static final String INP_USEREMAIL = "//input[contains(@id,'register-form:email')]"; - public static final String INP_USERNAME = "//input[contains(@id,'register-form:username')]"; - public static final String SUB_SEARCH_USER = "//input[contains(@id,'search-user-form:search')]"; - public static final String INP_SEARCH_USER = "//input[contains(@id,'search-user-form:searchString')]"; - public static final String LNK_SEARCH_USER = "//a[contains(@id,'user-form:search-user-link')]"; - public static final String LNK_USERTAB = "//a[contains(@id,'role-temp-form:manage-users')]"; - public static final String LNK_USERMAIN = "//a[contains(@id,'user-temp-form1:user-adm-link')]"; + public final String SUB_CONF_CREATE_USER = getProp(casePfx + "sub.conf.create.user", "//input[contains(@id,'confirm-form:admin')]"); + public final String SUB_DELETE_ROLE = getProp(casePfx + "sub.delete.role", "//input[contains(@id,'delete-role-form:confirm')]"); + public final String SUB_ROLE_CREATE = getProp(casePfx + "sub.role.create", "//input[contains(@id,'create-role-form:submit')]"); + public final String INP_ROLEDISNAME = getProp(casePfx + "inp.roledisname", "//input[contains(@id,'create-role-form:roledisplayname')]"); + public final String INP_ROLENAME = getProp(casePfx + "inp.rolename", "//input[contains(@id,'create-role-form:rolename')]"); - public static final String LNK_ROLETAB = "//a[contains(@id,'_viewRoot:user-temp-form:role-mgm-link')]"; + public final String LNK_ROLE_CREATE = getProp(casePfx + "lnk.role.create", "//a[contains(@id, 'create-role-form:create-role-link')]"); + public final String SUB_DEL_USER = getProp(casePfx + "sub.del.user", "//input[contains(@id,'delete-user-form:submit')]"); + public final String SUB_ASSIGN_ROLE = getProp(casePfx + "sub.assign.role", "//input[contains(@id,'assign-roles-form:submit')]"); + public final String SUB_USER_ROLE = getProp(casePfx + "sub.user.role", "//input[contains(@id,'register-role-form:submit')]"); + public final String SUB_CREATE_USER = getProp(casePfx + "sub.create.user", "//input[contains(@id,'register-form:submit')]"); + public final String INP_PASSWORD_CHK = getProp(casePfx + "inp.password.chk", "//input[contains(@id,'register-form:passwordCheck')]"); + public final String INP_PASSWORD = getProp(casePfx + "inp.password", "//input[contains(@id,'register-form:password')]"); + public final String INP_USEREMAIL = getProp(casePfx + "inp.useremail", "//input[contains(@id,'register-form:email')]"); + public final String INP_USERNAME = getProp(casePfx + "inp.username", "//input[contains(@id,'register-form:username')]"); + public final String SUB_SEARCH_USER = getProp(casePfx + "sub.search.user", "//input[contains(@id,'search-user-form:search')]"); + public final String INP_SEARCH_USER = getProp(casePfx + "inp.search.user", "//input[contains(@id,'search-user-form:searchString')]"); + public final String LNK_SEARCH_USER = getProp(casePfx + "lnk.search.user", "//a[contains(@id,'user-form:search-user-link')]"); + public final String LNK_USERTAB = getProp(casePfx + "lnk.usertab", "//a[contains(@id,'role-temp-form:manage-users')]"); + public final String LNK_USERMAIN = getProp(casePfx + "lnk.usermain", "//a[contains(@id,'user-temp-form1:user-adm-link')]"); - public static final String LNK_ROLEMAIN = "//a[contains(@id, ':_viewRoot:role-temp-form1:role-admin-link')]"; - public static final String LNK_USERMANG_MAIN = "//a[contains(@id,'user-temp-form1:assign-role-link')]"; - public static final String LNK_USERMANG_MAIN2 = "//a[contains(@id,'user-temp-form1:user-mgm-link')]"; - public static final String LNK_CREATE_USER = "//a[contains(@id,':user-form:create-user-link')]"; + public final String LNK_ROLETAB = getProp(casePfx + "lnk.roletab", "//a[contains(@id,'user-temp-form:role-mgm-link')]"); - public static final String CHK_ROLE = "//input[contains(@name,''assign-roles-form:roles'') and @value=''{0}'']"; + public final String LNK_ROLEMAIN = getProp(casePfx + "lnk.rolemain", "//a[contains(@id, 'role-temp-form1:role-admin-link')]"); + public final String LNK_USERMANG_MAIN = getProp(casePfx + "lnk.usermang.main", "//a[contains(@id,'user-temp-form1:assign-role-link')]"); + public final String LNK_USERMANG_MAIN2 = getProp(casePfx + "lnk.usermang.main2", "//a[contains(@id,'user-temp-form1:user-mgm-link')]"); + public final String LNK_CREATE_USER = getProp(casePfx + "lnk.create.user", "//a[contains(@id,':user-form:create-user-link')]"); - public static final long SEARCH_TIMEOUT = 5000; + public final String CHK_ROLE = getProp(casePfx + "chk.role", "//input[contains(@name,''assign-roles-form:roles'') and @value=''{0}'']"); + public final long SEARCH_TIMEOUT = 5000; + private String butDelUsr_id(String userName) { String table = TBL_USERLIST; int r = findTableRow(table, userName, 0); @@ -424,12 +426,12 @@ } @Test(enabled = true) - public void testManyUsers(){ + public void testManyUsers() { for (int i = 0; i < 25; i++) { createUser("user0" + i + "", "useruser", "user0" + i + "" + &quot;(a)portal.com&quot;); } } - + @Test(enabled = true, description = "Altering the number of rows in user search") public void testSearchUserCount() { Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java 2009-02-23 09:38:02 UTC (rev 12858) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java 2009-02-23 10:53:13 UTC (rev 12859) @@ -17,6 +17,7 @@ protected static int count; protected static boolean screenshot = false; protected static boolean htmlSource = false; + protected static String outputDir = ""; static { String ss = System.getProperty("screenshot"); @@ -28,12 +29,17 @@ if ("true".equals(sh)) { htmlSource = true; } + + String so = System.getProperty("output-dir"); + if (so != null) { + outputDir = so; + } } @Override public void onTestFailure(ITestResult tr) { - String name = "F_" + tr.getName() + "-" + count; + String name = outputDir +"/"+ "F_" + tr.getName() + "-" + count; if (htmlSource) { try { Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java 2009-02-23 09:38:02 UTC (rev 12858) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java 2009-02-23 10:53:13 UTC (rev 12859) @@ -32,7 +32,24 @@ private static final String LNK_ADMIN = "link=Admin"; private static final String LNK_LOGOUT = "link=Logout"; private static final String SEL_CMS_ACTION = "//div[@id='center']/div/div/div[1]/div/select"; - + + public String caseIPfx = "iden.man."; + public final String LNK_ROLETAB = getProp(caseIPfx + "lnk.roletab", "//a[contains(@id,'user-temp-form:role-mgm-link')]"); + public final String LNK_ROLEMAIN = getProp(caseIPfx + "lnk.rolemain", "//a[contains(@id, 'role-temp-form1:role-admin-link')]"); + public final String LNK_ROLE_CREATE = getProp(caseIPfx + "lnk.role.create", "//a[contains(@id, 'create-role-form:create-role-link')]"); + public final String INP_ROLEDISNAME = getProp(caseIPfx + "inp.roledisname", "//input[contains(@id,'create-role-form:roledisplayname')]"); + public final String INP_ROLENAME = getProp(caseIPfx + "inp.rolename", "//input[contains(@id,'create-role-form:rolename')]"); + public final String SUB_ROLE_CREATE = getProp(caseIPfx + "sub.role.create", "//input[contains(@id,'create-role-form:submit')]"); + public final String SUB_ASSIGN_ROLE = getProp(caseIPfx + "sub.assign.role", "//input[contains(@id,'assign-roles-form:submit')]"); + public final String CHK_ROLE = getProp(caseIPfx + "chk.role", "//input[contains(@name,''assign-roles-form:roles'') and @value=''{0}'']"); + public final String LNK_USERTAB = getProp(caseIPfx + "lnk.usertab", "//a[contains(@id,'role-temp-form:manage-users')]"); + public final String LNK_USERMAIN = getProp(caseIPfx + "lnk.usermain", "//a[contains(@id,'user-temp-form1:user-adm-link')]"); + public final String LNK_USERMANG_MAIN = getProp(caseIPfx + "lnk.usermang.main", "//a[contains(@id,'user-temp-form1:assign-role-link')]"); + public final String SUB_SEARCH_USER = getProp(caseIPfx + "sub.search.user", "//input[contains(@id,'search-user-form:search')]"); + public final String INP_SEARCH_USER = getProp(caseIPfx + "inp.search.user", "//input[contains(@id,'search-user-form:searchString')]"); + public final String LNK_SEARCH_USER = getProp(caseIPfx + "lnk.search.user", "//a[contains(@id,'user-form:search-user-link')]"); + public final String TBL_USERLIST = getProp(caseIPfx + "tbl.userlist", "//table[contains(@id,'search-user-form1:userlist')]"); + public final String LNK_T_USRLIST_ROLES = getProp(caseIPfx + "lnk.t.usrlist.roles", "//a[contains(@id,''search-user-form1:userlist:{0}:assign-role-link'')]"); @AfterMethod(groups = { "log" }) public void logoutAfterTestIfPossible() { @@ -81,15 +98,15 @@ selenium.click(LNK_MEMBERS); selenium.waitForPageToLoad(PAGE_LOAD); - clickIfVisible(IdentityAdminTestCase.LNK_ROLETAB); - clickIfVisible(IdentityAdminTestCase.LNK_ROLEMAIN); + clickIfVisible(LNK_ROLETAB); + clickIfVisible(LNK_ROLEMAIN); - selenium.click(IdentityAdminTestCase.LNK_ROLE_CREATE); + selenium.click(LNK_ROLE_CREATE); selenium.waitForPageToLoad(PAGE_LOAD); - selenium.type(IdentityAdminTestCase.INP_ROLENAME, roleName); - selenium.type(IdentityAdminTestCase.INP_ROLEDISNAME, roleDisplayName); - selenium.click(IdentityAdminTestCase.SUB_ROLE_CREATE); + selenium.type(INP_ROLENAME, roleName); + selenium.type(INP_ROLEDISNAME, roleDisplayName); + selenium.click(SUB_ROLE_CREATE); selenium.waitForPageToLoad(PAGE_LOAD); logout(); } @@ -338,11 +355,11 @@ selenium.waitForPageToLoad(PAGE_LOAD); Assert.assertTrue(selenium.isTextPresent(roleDisplay), "Role display name: " + roleDisplay + " not found on the page."); - final String CHECK_ROLE = MessageFormat.format(IdentityAdminTestCase.CHK_ROLE, role); + final String CHECK_ROLE = MessageFormat.format(CHK_ROLE, role); if (!selenium.isChecked(CHECK_ROLE)) { selenium.click(CHECK_ROLE); - selenium.click(IdentityAdminTestCase.SUB_ASSIGN_ROLE); + selenium.click(SUB_ASSIGN_ROLE); selenium.waitForPageToLoad(PAGE_LOAD); } searchUser(user, email); @@ -362,11 +379,11 @@ Assert.assertTrue(selenium.isTextPresent(roleDisplay), "Role display name: " + roleDisplay + " not found on the page."); // check the tempRole check box - final String CHECK_ROLE = MessageFormat.format(IdentityAdminTestCase.CHK_ROLE, role); + final String CHECK_ROLE = MessageFormat.format(CHK_ROLE, role); if (selenium.isChecked(CHECK_ROLE)) { selenium.click(CHECK_ROLE); - selenium.click(IdentityAdminTestCase.SUB_ASSIGN_ROLE); + selenium.click(SUB_ASSIGN_ROLE); selenium.waitForPageToLoad(PAGE_LOAD); } searchUser(user, email); @@ -386,15 +403,15 @@ selenium.click("link=Members"); selenium.waitForPageToLoad(PAGE_LOAD); - clickIfVisible(IdentityAdminTestCase.LNK_USERTAB); - clickIfVisible(IdentityAdminTestCase.LNK_USERMAIN); - clickIfVisible(IdentityAdminTestCase.LNK_USERMANG_MAIN); + clickIfVisible(LNK_USERTAB); + clickIfVisible(LNK_USERMAIN); + clickIfVisible(LNK_USERMANG_MAIN); - selenium.click(IdentityAdminTestCase.LNK_SEARCH_USER); + selenium.click(LNK_SEARCH_USER); selenium.waitForPageToLoad(PAGE_LOAD); - selenium.type(IdentityAdminTestCase.INP_SEARCH_USER, username); - selenium.click(IdentityAdminTestCase.SUB_SEARCH_USER); + selenium.type(INP_SEARCH_USER, username); + selenium.click(SUB_SEARCH_USER); try { Thread.sleep(5000); @@ -408,8 +425,8 @@ } private String butUsrRol_id(String userName) { - String table = IdentityAdminTestCase.TBL_USERLIST; + String table = TBL_USERLIST; int r = findTableRow(table, userName, 0); - return MessageFormat.format(IdentityAdminTestCase.LNK_T_USRLIST_ROLES, r - 1); + return MessageFormat.format(LNK_T_USRLIST_ROLES, r - 1); } } Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-02-23 09:38:02 UTC (rev 12858) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-02-23 10:53:13 UTC (rev 12859) @@ -1,3 +1,58 @@ +# IdentityAdminTestCase + +iden.man.sel.searchuser.limit=//select[contains(@id,'search-user-form:limit')] +iden.man.sub.edit.prof=//input[contains(@id,'profile-form:submit')] +iden.man.sub.pagin.left=//input[contains(@id,'search-user-form1:prev-page')] +iden.man.sub.pagin.right=//input[contains(@id,'search-user-form1:next-page')] +iden.man.sub.edit.user.email.cancel=//input[contains(@id,'profile-form:cancel')] +iden.man.inp.edit.user.email=//input[contains(@id,'profile-form:email')] +iden.man.sub.role.search.user=//input[contains(@id,'search-user-form:search') and @type='submit'] +iden.man.inp.role.search.user=//input[contains(@id,'search-user-form:searchString')] +iden.man.sub.edit.role.submit=//input[contains(@id,'edit-role-link:submit')] +iden.man.sub.edit.role.cancel=//input[contains(@id,'edit-role-link:cancel')] +iden.man.inp.edit.role.name=//input[contains(@id,'edit-role-link:display-name')] +iden.man.sub.pass.change.submit=//input[contains(@name,'change-pwd-form:j_id31')] +iden.man.sub.pass.change.cancel=//input[contains(@id,'change-pwd-form:cancel')] +iden.man.inp.pass.change.p2=//input[contains(@id,':change-pwd-form:passwordCheck')] +iden.man.inp.pass.change.p1=//input[contains(@id,':change-pwd-form:password')] +iden.man.lnk.change.pass=//a[contains(@id,':profile-form:change-pwd-adm-link')] +iden.man.tbl.userlist=//table[contains(@id,'search-user-form1:userlist')] +iden.man.lnk.t.usrlist.del=//a[contains(@id,''search-user-form1:userlist:{0}:delete-user-link'')] +iden.man.lnk.t.usrlist.roles=//a[contains(@id,''search-user-form1:userlist:{0}:assign-role-link'')] +iden.man.lnk.t.usrlist.dis=//a[contains(@id,''search-user-form1:userlist:{0}:enable-user-link'')] +iden.man.lnk.t.usrlist.edit=//a[contains(@id,''search-user-form1:userlist:{0}:rename-link'')] +iden.man.tbl.rolelist=//table[contains(@id,'roles-form:userlist')] +iden.man.lnk.t.rollist.del=//a[contains(@id,''roles-form:userlist:{0}:delete-role-link'')] +iden.man.lnk.t.rollist.members=//a[contains(@id,''roles-form:userlist:{0}:view-role-link'')] +iden.man.lnk.t.rollist.edit=//a[contains(@id,''roles-form:userlist:{0}:edit-role-link'')] +iden.man.tbl.rolemembers=//table[contains(@id,'role-members-form:role-data-table')] +iden.man.sub.conf.create.user=//input[contains(@id,'confirm-form:admin')] +iden.man.sub.delete.role=//input[contains(@id,'delete-role-form:confirm')] +iden.man.sub.role.create=//input[contains(@id,'create-role-form:submit')] +iden.man.inp.roledisname=//input[contains(@id,'create-role-form:roledisplayname')] +iden.man.inp.rolename=//input[contains(@id,'create-role-form:rolename')] +iden.man.lnk.role.create=//a[contains(@id, 'create-role-form:create-role-link')] +iden.man.sub.del.user=//input[contains(@id,'delete-user-form:submit')] +iden.man.sub.assign.role=//input[contains(@id,'assign-roles-form:submit')] +iden.man.sub.user.role=//input[contains(@id,'register-role-form:submit')] +iden.man.sub.create.user=//input[contains(@id,'register-form:submit')] +iden.man.inp.password.chk=//input[contains(@id,'register-form:passwordCheck')] +iden.man.inp.password=//input[contains(@id,'register-form:password')] +iden.man.inp.useremail=//input[contains(@id,'register-form:email')] +iden.man.inp.username=//input[contains(@id,'register-form:username')] +iden.man.sub.search.user=//input[contains(@id,'search-user-form:search')] +iden.man.inp.search.user=//input[contains(@id,'search-user-form:searchString')] +iden.man.lnk.search.user=//a[contains(@id,'user-form:search-user-link')] +iden.man.lnk.usertab=//a[contains(@id,'role-temp-form:manage-users')] +iden.man.lnk.usermain=//a[contains(@id,'user-temp-form1:user-adm-link')] +iden.man.lnk.roletab=//a[contains(@id,'user-temp-form:role-mgm-link')] +iden.man.lnk.rolemain=//a[contains(@id, 'role-temp-form1:role-admin-link')] +iden.man.lnk.usermang.main=//a[contains(@id,'user-temp-form1:assign-role-link')] +iden.man.lnk.usermang.main2=//a[contains(@id,'user-temp-form1:user-mgm-link')] +iden.man.lnk.create.user=//a[contains(@id,':user-form:create-user-link')] +iden.man.chk.role=//input[contains(@name,''assign-roles-form:roles'') and @value=''{0}''] + + # EndToEndBeaPortlet e2e.wsrp.inp.consumer.name=//input[contains(@id,'edit-cons-form:id')]