Author: mposolda(a)redhat.com Date: 2009-06-23 18:11:58 -0400 (Tue, 23 Jun 2009) New Revision: 13493 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/sso/TomcatSSOValveTestCase.java Log: Refactor locator.properties / fix test failures in selenium sso tests. 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-06-23 20:12:21 UTC (rev 13492) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-06-23 22:11:58 UTC (rev 13493) @@ -758,7 +758,7 @@ sso.tomcatvalve.ex.login=//input[@value='Login'] sso.tomcatvalve.ex.logout=//input[@value='Logout'] sso.tomcatvalve.ex.logged.user.label=//tr[1]/td[2]/b -sso.tomcatvalve.ex.logged.user.label=//tr[4]/td[2]/b +sso.tomcatvalve.ex.logged.role.auth.label=//tr[4]/td[2]/b sso.tomcatvalve.jmx.title.element=//h1 sso.tomcatvalve.jmx.image=//img[@alt='JBoss'] sso.tomcatvalve.lnk.login=link=Login @@ -766,4 +766,4 @@ sso.tomcatvalve.lnk.default=link=default sso.tomcatvalve.lnk.admin=link=Admin sso.tomcatvalve.lnk.wsrp=link=WSRP -sso.tomcatvalve.lnk.default=link=Dashboard +sso.tomcatvalve.lnk.default.dashboard=link=Dashboard Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/sso/TomcatSSOValveTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/sso/TomcatSSOValveTestCase.java 2009-06-23 20:12:21 UTC (rev 13492) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/sso/TomcatSSOValveTestCase.java 2009-06-23 22:11:58 UTC (rev 13493) @@ -24,7 +24,7 @@ protected final String EXAMPLE_LOGIN = getLoc(casePfx+"ex.login","//input[@value='Login']"); protected final String EXAMPLE_LOGOUT = getLoc(casePfx+"ex.logout","//input[@value='Logout']"); protected final String EXAMPLE_LOGGED_USER_OUTPUT = getLoc(casePfx+"ex.logged.user.label","//tr[1]/td[2]/b"); - protected final String EXAMPLE_AUTHORIZED_ROLE_OUTPUT = getLoc(casePfx+"ex.logged.user.label","//tr[4]/td[2]/b"); + protected final String EXAMPLE_AUTHORIZED_ROLE_OUTPUT = getLoc(casePfx+"ex.logged.role.auth.label","//tr[4]/td[2]/b"); protected final String JMX_TITLE_ELEMENT = getLoc(casePfx+"jmx.title.element", "//h1"); protected final String JMX_IMAGE = getLoc(casePfx+"jmx.image", "//img[@alt='JBoss']"); @@ -33,7 +33,7 @@ protected final String LNK_DEFAULT = getLoc(casePfx+"lnk.default","link=default"); protected final String LNK_ADMIN = getLoc(casePfx+"lnk.admin","link=Admin"); protected final String LNK_WSRP = getLoc(casePfx+"lnk.wsrp","link=WSRP"); - protected final String LNK_DASHBOARD = getLoc(casePfx+"lnk.default","link=Dashboard"); + protected final String LNK_DASHBOARD = getLoc(casePfx+"lnk.default.dashboard","link=Dashboard"); protected final String EXAMPLE_ADMIN_USERNAME = "admin"; protected final String EXAMPLE_ADMIN_PASSWORD = "password";