Author: mposolda(a)redhat.com Date: 2009-07-10 10:53:03 -0400 (Fri, 10 Jul 2009) New Revision: 13538 Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/sso/CASSeleniumTestCase.java branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/sso/JOSSOSeleniumTestCase.java branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/sso/SSOSeleniumTestCase.java branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/sso/TomcatSSOValveTestCase.java Log: Refactor SSO and Ldap tests to remove compilation failures. Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-07-10 14:25:44 UTC (rev 13537) +++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-07-10 14:53:03 UTC (rev 13538) @@ -30,7 +30,7 @@ private final String INP_USER_SEARCH_NEXT = getLoc(casePfx + "inp.user.search.next", "//input[contains(@id,'search-user-form1:next-page')]"); private final String SEL_SEARCHUSER_LIMIT = getLoc(casePfx + "sel.searchuser.limit", "//select[contains(@id,'search-user-form:limit')]"); - private final String SUB_EDIT_PROF = getLoc(casePfx + "sub.edit.prof", "//input[contains(@id,'profile-form:submit')]"); + final String SUB_EDIT_PROF = getLoc(casePfx + "sub.edit.prof", "//input[contains(@id,'profile-form:submit')]"); private final String SUB_PAGIN_LEFT = getLoc(casePfx + "sub.pagin.left", INP_USER_SEARCH_PREV); private final String SUB_PAGIN_RIGHT = getLoc(casePfx + "sub.pagin.right", INP_USER_SEARCH_NEXT); @@ -89,7 +89,7 @@ private final String LNK_USERMANG_MAIN2 = getLoc(casePfx + "lnk.usermang.main2", "//a[contains(@id,'user-temp-form1:user-mgm-link')]"); private final String LNK_CREATE_USER = getLoc(casePfx + "lnk.create.user", "//a[contains(@id,':user-form:create-user-link')]"); - private final String CHK_ROLE = getLoc(casePfx + "chk.role", "//input[contains(@name,''assign-roles-form:roles'') and @value=''{0}'']"); + final String CHK_ROLE = getLoc(casePfx + "chk.role", "//input[contains(@name,''assign-roles-form:roles'') and @value=''{0}'']"); private final String MSG_CREATE_ROLE = getMess(casePfx + "chk.role", "Create role"); @@ -102,7 +102,7 @@ return MessageFormat.format(LNK_T_USRLIST_DEL, r - 1); } - private String butUsrRol_id(String userName) { + String butUsrRol_id(String userName) { String table = TBL_USERLIST; int r = findTableRow(table, userName, 0); return MessageFormat.format(LNK_T_USRLIST_ROLES, r - 1); @@ -723,7 +723,7 @@ Assert.assertTrue(selenium.isTextPresent("is an invalid")); } - private void goToEdit(String userName, String userMail) { + void goToEdit(String userName, String userMail) { searchUser(userName, userMail); int r = findTableRow(TBL_USERLIST, userName, 0); @@ -957,7 +957,7 @@ } - private void deleteUser(String username, String email) { + void deleteUser(String username, String email) { selenium.open("/portal/"); selenium.waitForPageToLoad(PAGE_LOAD); selenium.click(LNK_ADMIN); @@ -998,7 +998,7 @@ selenium.waitForPageToLoad(PAGE_LOAD); } - private void createRole(String roleName, String roleDisplayName) { + void createRole(String roleName, String roleDisplayName) { selenium.open("/portal/"); selenium.waitForPageToLoad(PAGE_LOAD); selenium.click(LNK_ADMIN); @@ -1025,7 +1025,7 @@ Assert.assertTrue(selenium.isTextPresent(roleDisplayName), "Display name of newly created role is missing."); } - private void deleteRole(String roleName) { + void deleteRole(String roleName) { selenium.open("/portal/"); selenium.waitForPageToLoad(PAGE_LOAD); selenium.click(LNK_ADMIN); Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/sso/CASSeleniumTestCase.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/sso/CASSeleniumTestCase.java 2009-07-10 14:25:44 UTC (rev 13537) +++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/sso/CASSeleniumTestCase.java 2009-07-10 14:53:03 UTC (rev 13538) @@ -24,9 +24,7 @@ private final String PORTAL_CYRIL_MAIL = "cyril(a)redhat.com"; private final String PORTAL_CYRIL_ROLE = "Cyril"; - // TODO: uncomment and remove getProp part - - /*private final String ADR_PORTAL = getLoc(casePfx+"adr.portal","/portal"); + private final String ADR_PORTAL = getLoc(casePfx+"adr.portal","/portal"); private final String ADR_PORTAL_ADMIN = getLoc(casePfx+"adr.portal.admin","/portal/auth/portal/admin"); private final String ADR_PORTAL_DEFAULT = getLoc(casePfx+"adr.portal.default","/portal/auth/portal/default"); @@ -49,33 +47,8 @@ private final String CAS_LOGOUT_SUCCESSFULL = getMess(casePfx + "cas.logout.succ", "Logout successful"); private final String PORTAL_LOGGED_IN_AS_MESSAGE = getMess(casePfx + "logged.in.mess", "Logged in as: "); - private final String PORTAL_FORBIDDEN_MESS = getMess(casePfx + "forbidden.mess", "HTTP Status 403 -");*/ + private final String PORTAL_FORBIDDEN_MESS = getMess(casePfx + "forbidden.mess", "HTTP Status 403 -"); - private final String ADR_PORTAL = getProp(casePfx+"adr.portal","/portal"); - private final String ADR_PORTAL_ADMIN = getProp(casePfx+"adr.portal.admin","/portal/auth/portal/admin"); - private final String ADR_PORTAL_DEFAULT = getProp(casePfx+"adr.portal.default","/portal/auth/portal/default"); - - private final String LINK_LOGIN = getProp(casePfx+"lnk.login", "link=Login"); - private final String LINK_ADMIN = getProp(casePfx+"lnk.admin", "link=Admin"); - private final String LINK_WEATHER = getProp(casePfx+"lnk.weather", "link=Weather"); - private final String LINK_COPY_DASHBOARD = getProp(casePfx+"lnk.cp.dashboard", "link=Copy to my dashboard"); - private final String LINK_CONFIGURE_DASHBOARD = getProp(casePfx+"lnk.conf.dashboard", "link=Configure dashboard"); - private final String LINK_DASHBOARD = getProp(casePfx+"lnk.dashboard", "link=Dashboard"); - private final String LINK_LOGOUT = getProp(casePfx+"lnk.logout", "link=Logout"); - private final String FORBIDDEN_ELEMENT = getProp(casePfx+"forbidden.element", "//h1"); - - private final String CAS_INPUT_USERNAME = getProp(casePfx + "cas.input.username", "username"); - private final String CAS_INPUT_PASSWORD = getProp(casePfx + "cas.input.password", "password"); - private final String CAS_SUBMIT_LOGIN = getProp(casePfx + "cas.submit.login", "//input[@value='LOGIN']"); - private final String CAS_IMAGE = getProp(casePfx + "cas.image", "//img[@alt='Central Authentication Service']"); - - private final String CAS_INVALID_AUTH = getProp(casePfx + "cas.invalid.auth", "The credentials you provided cannot be determined to be authentic."); - private final String CAS_LOGIN_MESSAGE = getProp(casePfx + "cas.login.mess", "Enter your JA-SIG NetID and Password."); - private final String CAS_LOGOUT_SUCCESSFULL = getProp(casePfx + "cas.logout.succ", "Logout successful"); - - private final String PORTAL_LOGGED_IN_AS_MESSAGE = getProp(casePfx + "logged.in.mess", "Logged in as: "); - private final String PORTAL_FORBIDDEN_MESS = getProp(casePfx + "forbidden.mess", "HTTP Status 403 -"); - @BeforeMethod(groups = { "log" }) private void logoutBeforeTest() { logoutIfPossible(); Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/sso/JOSSOSeleniumTestCase.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/sso/JOSSOSeleniumTestCase.java 2009-07-10 14:25:44 UTC (rev 13537) +++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/sso/JOSSOSeleniumTestCase.java 2009-07-10 14:53:03 UTC (rev 13538) @@ -24,9 +24,7 @@ private final String PORTAL_JOSEPH_MAIL = "joseph(a)redhat.com"; private final String PORTAL_JOSEPH_ROLE = "Joseph"; - // TODO: uncomment and remove getProp part - - /*private final String ADR_PORTAL = getLoc(casePfx+"adr.portal","/portal"); + private final String ADR_PORTAL = getLoc(casePfx+"adr.portal","/portal"); private final String ADR_PORTAL_ADMIN = getLoc(casePfx+"adr.portal.admin","/portal/auth/portal/admin"); private final String ADR_PORTAL_DEFAULT = getLoc(casePfx+"adr.portal.default","/portal/auth/portal/default"); private final String ADR_PORTAL_SESSION_TEST = getLoc(casePfx+"adr.portal.test.session","/portal/auth/portal/default/Test/Session+test"); @@ -59,42 +57,7 @@ private final String SES_SUB_PSCOPE = getLoc("samples.ses.sub.pscope", "portlet"); private final String SES_INP_VAL = getLoc("samples.ses.inp.val", "value"); private final String SES_INP_NAM = getLoc("samples.ses.inp.nam", "name"); - */ - private final String ADR_PORTAL = getProp(casePfx+"adr.portal","/portal"); - private final String ADR_PORTAL_ADMIN = getProp(casePfx+"adr.portal.admin","/portal/auth/portal/admin"); - private final String ADR_PORTAL_DEFAULT = getProp(casePfx+"adr.portal.default","/portal/auth/portal/default"); - private final String ADR_PORTAL_SESSION_TEST = getProp(casePfx+"adr.portal.test.session","/portal/auth/portal/default/Test/Session+test"); - - private final String LINK_LOGIN = getProp(casePfx+"lnk.login", "link=Login"); - private final String LINK_ADMIN = getProp(casePfx+"lnk.admin", "link=Admin"); - private final String LINK_WEATHER = getProp(casePfx+"lnk.weather", "link=Weather"); - private final String LINK_COPY_DASHBOARD = getProp(casePfx+"lnk.cp.dashboard", "link=Copy to my dashboard"); - private final String LINK_CONFIGURE_DASHBOARD = getProp(casePfx+"lnk.conf.dashboard", "link=Configure dashboard"); - private final String LINK_DASHBOARD = getProp(casePfx+"lnk.dashboard", "link=Dashboard"); - private final String LINK_LOGOUT = getProp(casePfx+"lnk.logout", "link=Logout"); - private final String FORBIDDEN_ELEMENT = getProp(casePfx+"forbidden.element", "//h1"); - - private final String JOSSO_INPUT_USERNAME = getProp(casePfx + "josso.input.username", "josso_username"); - private final String JOSSO_INPUT_PASSWORD = getProp(casePfx + "josso.input.password", "josso_password"); - private final String JOSSO_SUBMIT_LOGIN = getProp(casePfx + "josso.submit.login", "//input[@value='Login']"); - private final String JOSSO_IMAGE = getProp(casePfx + "josso.image", "//img[@alt='Java Open Single SignOn']"); - - private final String JOSSO_INVALID_AUTH = getProp(casePfx + "josso.invalid.auth", "Invalid Authentication Information"); - - private final String PORTAL_LOGGED_IN_AS_MESSAGE = getProp(casePfx + "logged.in.mess", "Logged in as: "); - private final String PORTAL_FORBIDDEN_MESS = getProp(casePfx + "forbidden.mess", "HTTP Status 403 -"); - private final String PORTAL_SESSION_TEST_NO_SESSION = getProp("samples.ses.no", "No session"); - private final String PORTAL_SESSION_TEST_ID = getProp("samples.ses.id", "Session id"); - - public final String TBL_CMS_FILE = getProp("cms.file.tbl.cms.file", "//div[@id='center']/div/div/div[3]/table"); - - private final long SESSION_TIMEOUT = 60000; - private final long SESSION_TIMEOUT_WAITING = SESSION_TIMEOUT + 30000; // It's session timeout and some additional time to wait for session timeout - private final String SES_SUB_PSCOPE = getProp("samples.ses.sub.pscope", "portlet"); - private final String SES_INP_VAL = getProp("samples.ses.inp.val", "value"); - private final String SES_INP_NAM = getProp("samples.ses.inp.nam", "name"); - @BeforeMethod(groups = { "log" }) private void logoutBeforeTest() { logoutIfPossible(); Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/sso/SSOSeleniumTestCase.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/sso/SSOSeleniumTestCase.java 2009-07-10 14:25:44 UTC (rev 13537) +++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/sso/SSOSeleniumTestCase.java 2009-07-10 14:53:03 UTC (rev 13538) @@ -16,10 +16,8 @@ /** prefix for locator properties */ public String casePfx = "iden.man."; - - // TODO: uncomment and remove getProp part - /*private final String TBL_ROLELIST = getLoc(casePfx + "tbl.rolelist", "//table[contains(@id,'roles-form:userlist')]"); + private final String TBL_ROLELIST = getLoc(casePfx + "tbl.rolelist", "//table[contains(@id,'roles-form:userlist')]"); private final String LNK_T_ROLLIST_DEL = getLoc(casePfx + "lnk.t.rollist.del", "//a[contains(@id,''roles-form:userlist:{0}:delete-role-link'')]"); @@ -52,43 +50,8 @@ private final String LNK_CREATE_USER = getLoc(casePfx + "lnk.create.user", "//a[contains(@id,':user-form:create-user-link')]"); //private final String CHK_ROLE = getLoc(casePfx + "chk.role", "//input[contains(@name,''assign-roles-form:roles'') and @value=''{0}'']"); - private final String CHK_REGISTER_ROLE = getLoc(casePfx + "chk.reg.role", "//input[contains(@name,''register-role-form:roles'') and @value=''{0}'']");*/ + private final String CHK_REGISTER_ROLE = getLoc(casePfx + "chk.reg.role", "//input[contains(@name,''register-role-form:roles'') and @value=''{0}'']"); - private final String TBL_ROLELIST = getProp(casePfx + "tbl.rolelist", "//table[contains(@id,'roles-form:userlist')]"); - - private final String LNK_T_ROLLIST_DEL = getProp(casePfx + "lnk.t.rollist.del", "//a[contains(@id,''roles-form:userlist:{0}:delete-role-link'')]"); - - private final String SUB_CONF_CREATE_USER = getProp(casePfx + "sub.conf.create.user", "//input[contains(@id,'confirm-form:admin')]"); - private final String SUB_DELETE_ROLE = getProp(casePfx + "sub.delete.role", "//input[contains(@id,'delete-role-form:confirm')]"); - private final String SUB_ROLE_CREATE = getProp(casePfx + "sub.role.create", "//input[contains(@id,'create-role-form:submit')]"); - private final String INP_ROLEDISNAME = getProp(casePfx + "inp.roledisname", "//input[contains(@id,'create-role-form:roledisplayname')]"); - private final String INP_ROLENAME = getProp(casePfx + "inp.rolename", "//input[contains(@id,'create-role-form:rolename')]"); - private final String TBL_USERLIST = getProp(casePfx + "tbl.userlist", "//table[contains(@id,'search-user-form1:userlist')]"); - private final String LNK_ROLE_CREATE = getProp(casePfx + "lnk.role.create", "//a[contains(@id, 'create-role-form:create-role-link')]"); - private final String SUB_DEL_USER = getProp(casePfx + "sub.del.user", "//input[contains(@id,'delete-user-form:submit')]"); - - private final String SUB_USER_ROLE = getProp(casePfx + "sub.user.role", "//input[contains(@id,'register-role-form:submit')]"); - private final String SUB_CREATE_USER = getProp(casePfx + "sub.create.user", "//input[contains(@id,'register-form:submit')]"); - private final String INP_PASSWORD_CHK = getProp(casePfx + "inp.password.chk", "//input[contains(@id,'register-form:passwordCheck')]"); - private final String INP_PASSWORD = getProp(casePfx + "inp.password", "//input[contains(@id,'register-form:password')]"); - private final String INP_USEREMAIL = getProp(casePfx + "inp.useremail", "//input[contains(@id,'register-form:email')]"); - private final String INP_USERNAME = getProp(casePfx + "inp.username", "//input[contains(@id,'register-form:username')]"); - private final String SUB_SEARCH_USER = getProp(casePfx + "sub.search.user", "//input[contains(@id,'search-user-form:search') and @type='submit']"); - private final String INP_SEARCH_USER = getProp(casePfx + "inp.search.user", "//input[contains(@id,'search-user-form:searchString')]"); - private final String LNK_SEARCH_USER = getProp(casePfx + "lnk.search.user", "//a[contains(@id,'user-form:search-user-link')]"); - private final String LNK_USERTAB = getProp(casePfx + "lnk.usertab", "//a[contains(@id,'role-temp-form:manage-users')]"); - private final String LNK_USERMAIN = getProp(casePfx + "lnk.usermain", "//a[contains(@id,'user-temp-form1:user-adm-link')]"); - private final String LNK_T_USRLIST_DEL = getProp(casePfx + "lnk.t.usrlist.del", "//a[contains(@id,''search-user-form1:userlist:{0}:delete-user-link'')]"); - private final String LNK_ROLETAB = getProp(casePfx + "lnk.roletab", "//a[contains(@id,'user-temp-form:role-mgm-link')]"); - - private final String LNK_ROLEMAIN = getProp(casePfx + "lnk.rolemain", "//a[contains(@id, 'role-temp-form1:role-admin-link')]"); - private final String LNK_USERMANG_MAIN = getProp(casePfx + "lnk.usermang.main", "//a[contains(@id,'user-temp-form1:assign-role-link')]"); - private final String LNK_USERMANG_MAIN2 = getProp(casePfx + "lnk.usermang.main2", "//a[contains(@id,'user-temp-form1:user-mgm-link')]"); - private final String LNK_CREATE_USER = getProp(casePfx + "lnk.create.user", "//a[contains(@id,':user-form:create-user-link')]"); - - //private final String CHK_ROLE = getProp(casePfx + "chk.role", "//input[contains(@name,''assign-roles-form:roles'') and @value=''{0}'']"); - private final String CHK_REGISTER_ROLE = getProp(casePfx + "chk.reg.role", "//input[contains(@name,''register-role-form:roles'') and @value=''{0}'']"); - private final long SEARCH_TIMEOUT = 10000; protected void createRole(String roleName, String roleDisplayName) { Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/sso/TomcatSSOValveTestCase.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/sso/TomcatSSOValveTestCase.java 2009-07-10 14:25:44 UTC (rev 13537) +++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/sso/TomcatSSOValveTestCase.java 2009-07-10 14:53:03 UTC (rev 13538) @@ -15,9 +15,6 @@ /** prefix for locator properties */ public String casePfx = "sso.tomcatvalve."; - // TODO: uncomment and remove getProp part - - /* protected final String ADR_PORTAL = getLoc(casePfx+"adr.portal","/portal"); protected final String ADR_EXAMPLE = getLoc(casePfx+"adr.example","/TomcatSSOValveExampleApp"); protected final String ADR_JMX_CONSOLE = getLoc(casePfx+"adr.jmx","/jmx-console/"); @@ -43,34 +40,7 @@ protected final String LOGGED_IN_AS_MESSAGE = getMess(casePfx+"logged.in.mess", "Logged in as: "); protected final String JMX_AGENT_VIEW = getMess(casePfx+"jmx.agnview", "JMX Agent View"); protected final String PORTAL_FORBIDDEN_MESS = getMess(casePfx + "forbidden.mess", "HTTP Status 403 -"); - */ - protected final String ADR_PORTAL = getProp(casePfx+"adr.portal","/portal"); - protected final String ADR_EXAMPLE = getProp(casePfx+"adr.example","/TomcatSSOValveExampleApp"); - protected final String ADR_JMX_CONSOLE = getProp(casePfx+"adr.jmx","/jmx-console/"); - protected final String EXAMPLE_TITLE_ELEMENT = getProp(casePfx+"ex.title","//h1"); - protected final String EXAMPLE_INP_USERNAME = getProp(casePfx+"ex.inp.username","j_username"); - protected final String EXAMPLE_INP_PASSWORD = getProp(casePfx+"ex.inp.password","j_password"); - protected final String EXAMPLE_LOGIN = getProp(casePfx+"ex.login","//input[@value='Login']"); - protected final String EXAMPLE_LOGOUT = getProp(casePfx+"ex.logout","//input[@value='Logout']"); - protected final String EXAMPLE_LOGGED_USER_OUTPUT = getProp(casePfx+"ex.logged.user.label","//tr[1]/td[2]/b"); - protected final String EXAMPLE_AUTHORIZED_ROLE_OUTPUT = getProp(casePfx+"ex.logged.role.auth.label","//tr[4]/td[2]/b"); - protected final String JMX_TITLE_ELEMENT = getProp(casePfx+"jmx.title.element", "//h1"); - protected final String JMX_IMAGE = getProp(casePfx+"jmx.image", "//img[@alt='JBoss']"); - - protected final String LNK_LOGIN = getProp(casePfx+"lnk.login","link=Login"); - protected final String LNK_LOGOUT = getProp(casePfx+"lnk.logout","link=Logout"); - protected final String LNK_DEFAULT = getProp(casePfx+"lnk.default","link=default"); - protected final String LNK_ADMIN = getProp(casePfx+"lnk.admin","link=Admin"); - protected final String LNK_WSRP = getProp(casePfx+"lnk.wsrp","link=WSRP"); - protected final String LNK_DASHBOARD = getProp(casePfx+"lnk.default.dashboard","link=Dashboard"); - - protected final String EXAMPLE_LOGIN_FORM = getProp(casePfx+"example.login.form", "Login form"); - protected final String EXAMPLE_TITLE_OUTPUT = getProp(casePfx+"example.title.output", "Tomcat SSO valve example servlet"); - protected final String LOGGED_IN_AS_MESSAGE = getProp(casePfx+"logged.in.mess", "Logged in as: "); - protected final String JMX_AGENT_VIEW = getProp(casePfx+"jmx.agnview", "JMX Agent View"); - protected final String PORTAL_FORBIDDEN_MESS = getProp(casePfx + "forbidden.mess", "HTTP Status 403 -"); - protected final String EXAMPLE_ADMIN_USERNAME = "admin"; protected final String EXAMPLE_ADMIN_PASSWORD = "password"; protected final String EXAMPLE_ADMIN2_USERNAME = "admin2";