Author: vrockai Date: 2009-03-24 07:49:16 -0400 (Tue, 24 Mar 2009) New Revision: 13073 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: selenium - more debug into coordination 2 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 11:15:52 UTC (rev 13072) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/selenium-rc-server/user-extensions.js 2009-03-24 11:49:16 UTC (rev 13073) @@ -7,23 +7,22 @@ for (rowNo=0; rowNo<rowObj.length; rowNo++) { // No need to read too short rows var maxCol = rowObj[rowNo].cells.length; - if (maxCol <= searchCol || maxCol <= minCol) {continue;} - ///alert("1" + searchText); - // Read the content of the search colomn + + if (maxCol <= searchCol || maxCol <= minCol) + continue; + searchHtml = rowObj[rowNo].cells[searchCol].innerHTML; - //alert("2"+searchHtml); - // Let's ignore <TD> inside <TD>s. - // Due to some odd reasons 'm' switch does not work in 'match' - // - Sumith (10th Dec, 2006) - if (searchHtml.replace(/\n/g, " ").match(/<TD.*>.*<\/TD>/i)) continue; - ///alert("3"+searchHtml); + + if (searchHtml.replace(/\n/g, " ").match(/<TD.*>.*<\/TD>/i)) + continue; + // Build the pattern to check search column var searchPat = new RegExp(".*"+searchText+".*", "m"); - //var searchPat = new RegExp("^(.*<[^<>]*>)?\\s*"+searchText+"\\s*(<[^<>]*>.*)?$", "m"); - //alert("4"+"|"+searchText+"|"+searchHtml+"|"); + // No more processing for unmatched rows - if (!searchHtml.match(searchPat)) {continue;} - //alert("5"+"|"+searchText+"|"+searchHtml+"|"); + if (!searchHtml.match(searchPat)) + continue; + // Got the row! Let's simply return it return rowNo; } 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 11:15:52 UTC (rev 13072) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java 2009-03-24 11:49:16 UTC (rev 13073) @@ -121,6 +121,7 @@ Assert.assertTrue(selenium.isTextPresent("Create a portal named:")); int r = findTableRow(TABLE_PORTAL_ADMIN, portalName, 0) - 1; debugPrint(portalName +" : "+r); + debugPrint(portalName +" - tableRows : " + TABLE_PORTAL_ADMIN + " : " + countTableRows(TABLE_PORTAL_ADMIN)); clickAndWait(MessageFormat.format(POR_TL_MAIN, r)); debugScreenshot(++count + ".jpg");