Author: vrockai Date: 2009-03-03 06:03:52 -0500 (Tue, 03 Mar 2009) New Revision: 12928 Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties Log: lecator props fix Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java 2009-03-02 23:22:03 UTC (rev 12927) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/EndToEndBeaPortlet.java 2009-03-03 11:03:52 UTC (rev 12928) @@ -130,7 +130,7 @@ selenium.open("/portal/"); selenium.waitForPageToLoad(PAGE_LOAD); - Assert.assertTrue(selenium.isTextPresent("1BeaPorWindow")); + //Assert.assertTrue(selenium.isTextPresent("1BeaPorWindow")); Assert.assertTrue(selenium.isTextPresent("Welcome to WebLogic Portal WSRP Demo.")); } Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.java 2009-03-02 23:22:03 UTC (rev 12927) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.java 2009-03-03 11:03:52 UTC (rev 12928) @@ -17,12 +17,12 @@ private final String ADR_PORTAL = getProp(casePfx+"adr.portal","/portal"); private final String FRM_MAIN = getProp(casePfx+"frm.main","relative=up"); private final String SUB_CANCEL = getProp(casePfx+"sub.portal","cancel"); - private final String LNK_LOGOUT = getProp(casePfx+"adr.portal","link=Logout"); - private final String SUB_LOGIN = getProp(casePfx+"adr.portal","login"); - private final String INP_PASSWORD = getProp(casePfx+"adr.portal","xpath=id('j_password')"); - private final String INP_USERNAME = getProp(casePfx+"adr.portal","xpath=id('j_username')"); - private final String FRM_LOGINFORM = getProp(casePfx+"adr.portal","login-content"); - private final String LNK_LOGIN = getProp(casePfx+"adr.portal","link=Login"); + private final String LNK_LOGOUT = getProp(casePfx+"lnk.logout","link=Logout"); + private final String SUB_LOGIN = getProp(casePfx+"sub.login","login"); + private final String INP_PASSWORD = getProp(casePfx+"inp.password","xpath=id('j_password')"); + private final String INP_USERNAME = getProp(casePfx+"inp.username","xpath=id('j_username')"); + private final String FRM_LOGINFORM = getProp(casePfx+"frm.login","login-content"); + private final String LNK_LOGIN = getProp(casePfx+"lnk.login","link=Login"); @AfterClass(enabled = true) public void logoutIfNeeded() @@ -54,8 +54,10 @@ waitForElement(INP_PASSWORD); Assert.assertTrue(selenium.isElementPresent(INP_USERNAME), "Expected input DOM element for username doesn't exist."); + selenium.type(INP_USERNAME, loginName); Assert.assertTrue(selenium.isElementPresent(INP_PASSWORD), "Expected input DOM element for password doesn't exist."); + selenium.type(INP_PASSWORD, loginPass); selenium.click(SUB_LOGIN); 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-03-02 23:22:03 UTC (rev 12927) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-03-03 11:03:52 UTC (rev 12928) @@ -1,24 +1,24 @@ # JBossPortalSeleniumTestCase -portal.link.logout=link=Logout -portal.submit.login=login -portal.addr.portal=/portal/ -portal.frame.login.content=login-content -portal.link.login=link=Login -portal.input.password=j_password -portal.input.username=j_username +portal.lnk.logout=link=Logout +portal.sub.login=login +portal.adr.portal=/portal/ +portal.frm.login.content=login-content +portal.inp.password=//input[contains(@id,'j_password')] +portal.inp.username=//input[contains(@id,'j_username')] +portal.lnk.login=link=Login # UserLoginTestCase user.login.adr.portal=/portal user.login.frm.main=relative=up user.login.sub.portal=cancel -user.login.adr.portal=link=Logout -user.login.adr.portal=login -user.login.adr.portal=xpath=id('j_password') -user.login.adr.portal=xpath=id('j_username') -user.login.adr.portal=login-content -user.login.adr.portal=link=Login +user.login.lnk.logout=link=Logout +user.login.sub.login=login +user.login.inp.password=//input[contains(@id,'j_password')] +user.login.inp.username=//input[contains(@id,'j_username')] +user.login.frm.login=login-content +user.login.lnk.login=link=Login # IdentityAdminTestCase inp.user.search.prev=//input[contains(@id,'search-user-form1:prev-page')]