JBoss Portal SVN: r13077 - branches.
by portal-commits＠lists.jboss.org
Author: mmillson
Date: 2009-03-24 10:13:08 -0400 (Tue, 24 Mar 2009)
New Revision: 13077
Added:
branches/Enterprise_Portal_Platform_4_3_GA_JBEPP-51/
Log:
Create JBEPP-51 patch branch from Enterprise_Portal_Platform_4_3_GA tag
Copied: branches/Enterprise_Portal_Platform_4_3_GA_JBEPP-51 (from rev 13076, tags/Enterprise_Portal_Platform_4_3_GA)
17 years, 1 month
JBoss Portal SVN: r13076 - in branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium: portal and 1 other directory.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-03-24 10:08:46 -0400 (Tue, 24 Mar 2009)
New Revision: 13076
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/PortalAjaxSamplesTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/PortalSamplesTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java
Log:
selenium - even more debug into portal admin
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/PortalAjaxSamplesTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/PortalAjaxSamplesTestCase.java 2009-03-24 13:07:38 UTC (rev 13075)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/PortalAjaxSamplesTestCase.java 2009-03-24 14:08:46 UTC (rev 13076)
@@ -235,18 +235,21 @@
selenium.click(JS_LNK);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.addSelection(JS_SEL_LETTER, JS_LAB_A);
+ waitFor(AJAX_TIMEOUT);
selenium.click(JS_OPT_1);
waitFor(AJAX_TIMEOUT);
assertFalse(selenium.isSomethingSelected(JS_SEL_LETTER));
selenium.addSelection(JS_SEL_LETTER, JS_LAB_B);
+ waitFor(AJAX_TIMEOUT);
selenium.click(JS_OPT_2);
waitFor(AJAX_TIMEOUT);
assertFalse(selenium.isSomethingSelected(JS_SEL_LETTER));
selenium.addSelection(JS_SEL_LETTER, JS_LAB_C);
+ waitFor(AJAX_TIMEOUT);
selenium.click(JS_OPT_3);
waitFor(AJAX_TIMEOUT);
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/PortalSamplesTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/PortalSamplesTestCase.java 2009-03-24 13:07:38 UTC (rev 13075)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/PortalSamplesTestCase.java 2009-03-24 14:08:46 UTC (rev 13076)
@@ -240,18 +240,21 @@
selenium.click(JS_LNK);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.addSelection(JS_SEL_LETTER, JS_LAB_A);
+ waitFor(AJAX_TIMEOUT);
selenium.click(JS_OPT_1);
selenium.waitForPageToLoad(PAGE_LOAD);
assertFalse(selenium.isSomethingSelected(JS_SEL_LETTER));
selenium.addSelection(JS_SEL_LETTER, JS_LAB_B);
+ waitFor(AJAX_TIMEOUT);
selenium.click(JS_OPT_2);
selenium.waitForPageToLoad(PAGE_LOAD);
assertFalse(selenium.isSomethingSelected(JS_SEL_LETTER));
selenium.addSelection(JS_SEL_LETTER, JS_LAB_C);
+ waitFor(AJAX_TIMEOUT);
selenium.click(JS_OPT_3);
selenium.waitForPageToLoad(PAGE_LOAD);
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2009-03-24 13:07:38 UTC (rev 13075)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2009-03-24 14:08:46 UTC (rev 13076)
@@ -107,6 +107,7 @@
selenium.click(INPUT_SUBMIT_CREATEPORTAL);
selenium.waitForPageToLoad(PAGE_LOAD);
+ debugScreenshot("pa" + ".jpg");
Assert.assertTrue(selenium.isTextPresent(portalName));
int r = findTableRow(TABLE_PORTAL_ADMIN, portalName, 0) - 1;
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 13:07:38 UTC (rev 13075)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PageCoordinationTestCase.java 2009-03-24 14:08:46 UTC (rev 13076)
@@ -75,6 +75,7 @@
clickIfVisible(TAB_PORTALOBJ_ID);
clickIfVisible(LINK_PORTALS_ID);
clickIfVisible(LINK_PORTAL_HOME);
+
Assert.assertTrue(selenium.isTextPresent("Create a portal named:"));
int r = findTableRow(TABLE_PORTAL_ADMIN, portalName, 0) - 1;
17 years, 1 month
JBoss Portal SVN: r13075 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/selenium-rc-server.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-03-24 09:07:38 -0400 (Tue, 24 Mar 2009)
New Revision: 13075
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/selenium-rc-server/user-extensions.js
Log:
selenium - javascript extension tweak
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 12:12:03 UTC (rev 13074)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/selenium-rc-server/user-extensions.js 2009-03-24 13:07:38 UTC (rev 13075)
@@ -13,8 +13,8 @@
searchHtml = rowObj[rowNo].cells[searchCol].innerHTML;
- if (searchHtml.replace(/\n/g, " ").match(/<TD.*>.*<\/TD>/i))
- continue;
+ //if (searchHtml.replace(/\n/g, " ").match(/<TD.*>.*<\/TD>/i))
+ // continue;
// Build the pattern to check search column
var searchPat = new RegExp(".*"+searchText+".*", "m");
17 years, 1 month
JBoss Portal SVN: r13074 - in branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests: src/org/jboss/portal/test/selenium/portal and 1 other directory.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-03-24 08:12:03 -0400 (Tue, 24 Mar 2009)
New Revision: 13074
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java
Log:
selenium - more debug into portal admin
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh 2009-03-24 11:49:16 UTC (rev 13073)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/run.sh 2009-03-24 12:12:03 UTC (rev 13074)
@@ -47,7 +47,7 @@
exit 0;
fi
ant -f build.xml copyApps
- ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true" -Dhtml-src="true"
+ ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true" -Dhtml-src="true" -Ddebug="true"
elif [ $1 = "end2end" ]; then
if [ -z "$2" -o ! -f "$2" ]; then
echo
@@ -55,7 +55,7 @@
exit 0;
fi
ant -f build.xml copyApps
- ant -f build.xml selenium-usecase -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true" -Dhtml-src="true"
+ ant -f build.xml selenium-usecase -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true" -Dhtml-src="true" -Ddebug="true"
elif [ $1 = "perf" ]; then
if [ -z "$2" -o ! -f "$2" ]; then
echo
@@ -63,7 +63,7 @@
exit 0;
fi
ant -f build.xml copyApps
- ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true" -Dhtml-src="true"
+ ant -f build.xml selenium-test -Dbrowser="*firefox $2" -Dworkspace="/home/vrockai/workspace/ui-tests/" -Dscreenshot="true" -Dhtml-src="true" -Ddebug="true"
elif [ $1 = "selenium" ]; then
ant -f build.xml run-src
elif [ $1 = "single" ]; then
@@ -77,6 +77,6 @@
echo "ERROR: Testclasss not set";
exit 0;
fi
- ant -f build.xml single-test -Dbrowser="*firefox $2" -Dtestname="$3" -Dscreenshot="true" -Dhtml-src="true"
+ ant -f build.xml single-test -Dbrowser="*firefox $2" -Dtestname="$3" -Dscreenshot="true" -Dhtml-src="true" -Ddebug="true"
fi
fi
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2009-03-24 11:49:16 UTC (rev 13073)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2009-03-24 12:12:03 UTC (rev 13074)
@@ -110,6 +110,7 @@
Assert.assertTrue(selenium.isTextPresent(portalName));
int r = findTableRow(TABLE_PORTAL_ADMIN, portalName, 0) - 1;
+ debugPrint(portalName + " : " + r);
Assert.assertTrue(selenium.isElementPresent(MessageFormat.format(POR_TL_MAIN, r)));
Assert.assertTrue(selenium.isElementPresent(MessageFormat.format(POR_TL_SECURITY, r)));
17 years, 1 month
JBoss Portal SVN: r13073 - in branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests: src/org/jboss/portal/test/selenium/portal and 1 other directory.
by portal-commits＠lists.jboss.org
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");
17 years, 1 month
JBoss Portal SVN: r13072 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-03-24 07:15:52 -0400 (Tue, 24 Mar 2009)
New Revision: 13072
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java
Log:
selenium - debug flag fix
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java 2009-03-23 20:06:42 UTC (rev 13071)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java 2009-03-24 11:15:52 UTC (rev 13072)
@@ -31,7 +31,7 @@
htmlSource = true;
}
- String sd = System.getProperty("html-src");
+ String sd = System.getProperty("debug");
if ("true".equals(sd)) {
debug = true;
}
17 years, 1 month