[portal-commits] JBoss Portal SVN: r13083 - in branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests: src/org/jboss/portal/test/selenium/portal and 1 other directory.

Author: vrockai Date: 2009-03-25 11:04:09 -0400 (Wed, 25 Mar 2009) New Revision: 13083 Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/selenium-rc-server/user-extensions.js branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java Log: [JBPORTAL-2316] selenium extension fix Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/selenium-rc-server/user-extensions.js =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/selenium-rc-server/user-extensions.js 2009-03-24 21:21:20 UTC (rev 13082) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/selenium-rc-server/user-extensions.js 2009-03-25 15:04:09 UTC (rev 13083) @@ -12,10 +12,12 @@ continue; searchHtml = rowObj[rowNo].cells[searchCol].innerHTML; + searchHtml = searchHtml.replace(/(<([^>]+)>)/ig,""); + //alert(searchHtml); //if (searchHtml.replace(/\n/g, " ").match(/<TD.*>.*<\/TD>/i)) // continue; - + // Build the pattern to check search column var searchPat = new RegExp(".*"+searchText+".*", "m"); Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java 2009-03-24 21:21:20 UTC (rev 13082) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java 2009-03-25 15:04:09 UTC (rev 13083) @@ -15,8 +15,8 @@ private final String TBL_ALIASES = "//div[@id='aliasBindings']/form/div/table"; private final String LNK_T_ALIAS_RENAME = "//div[@id=''aliasBindings'']/form[2]/div/table/tbody/tr[{0}]/td[2]/table/tbody/tr/td[1]/a/span"; private final String LNK_T_ALIAS_DELETE = "//div[@id=''aliasBindings'']/form[2]/div/table/tbody/tr[{0}]/td[2]/table/tbody/tr/td[2]/a/span"; - private final String SUB_ALIAS_DEL_SUBMIT = "_jbpnsAdminPortletWindowsnpbj:j_id47:j_id34:j_id40:j_id41"; - private final String SUB_ALIAS_DEL_CANCEL = "_jbpnsAdminPortletWindowsnpbj:j_id47:j_id34:j_id40:j_id42"; + private final String SUB_ALIAS_DEL_SUBMIT = "//input[contains(@name,'j_id47:j_id34:j_id40:j_id41')]"; + private final String SUB_ALIAS_DEL_CANCEL = "//input[contains(@name,'j_id47:j_id34:j_id40:j_id42')]"; private final String CHK_EXPL_WIR = "//input[contains(@id,'useExplicitEvents')]"; private final String CHK_PARAM_BIND = "//input[contains(@id,'useExplicitBinding')]"; private final String SUB_CREATE_ALIAS = "//input[contains(@name,'create-alias-form') and @type='submit'][1]";