[portal-commits] JBoss Portal SVN: r13057 - in branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium: portal and 1 other directory.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Fri Mar 20 08:29:46 EDT 2009
Author: vrockai
Date: 2009-03-20 08:29:45 -0400 (Fri, 20 Mar 2009)
New Revision: 13057
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
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/portal/AdminPortalTestCase.java
Log:
hard-coded timeouts refactoring
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2009-03-20 11:43:40 UTC (rev 13056)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2009-03-20 12:29:45 UTC (rev 13057)
@@ -54,6 +54,7 @@
JBossSeleniumTestListener.selenium = selenium;
selenium.start();
selenium.setTimeout(PAGE_LOAD);
+ selenium.setSpeed("0");
}
@AfterClass
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-20 11:43:40 UTC (rev 13056)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/PortalAjaxSamplesTestCase.java 2009-03-20 12:29:45 UTC (rev 13057)
@@ -200,15 +200,15 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.select(EVT_SEL_COL, EVT_SEL_LAB_BLUE);
selenium.click(EVT_SUB_COLOR);
- waitFor(3500);
+ waitFor(AJAX_LOAD);
assertTrue(selenium.isElementPresent(EVT_DIV_BLUE));
selenium.select(EVT_SEL_COL, EVT_SEL_LAB_RED);
selenium.click(EVT_SUB_COLOR);
- waitFor(3500);
+ waitFor(AJAX_LOAD);
assertTrue(selenium.isElementPresent(EVT_DIV_RED));
selenium.select(EVT_SEL_COL, EVT_SEL_LAB_BLACK);
selenium.click(EVT_SUB_COLOR);
- waitFor(3500);
+ waitFor(AJAX_LOAD);
assertTrue(selenium.isElementPresent(EVT_DIV_BLACK));
}
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-20 11:43:40 UTC (rev 13056)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2009-03-20 12:29:45 UTC (rev 13057)
@@ -252,10 +252,10 @@
selenium.select(SEL_PP_LISTENER, "label=release_sessions_listener_self");
selenium.click(SUB_PP_LISTENER);
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.select(SEL_PP_LISTENER, "label=user_listener");
selenium.click(SUB_PP_LISTENER);
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
// Properties
@@ -266,81 +266,81 @@
selenium.type(INP_PP_PROPNAME, propName1);
selenium.click(SUB_PP_PROPADD);
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
r = findTableRow(TBL_PP_PROPS, propName1, 0) - 1;
selenium.type(MessageFormat.format(INP_PP_PROP_VAL,r), propVal1);
selenium.click(SUB_PP_PROPVAL_UPDATE);
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.type(INP_PP_PROPNAME, propName2);
selenium.click(SUB_PP_PROPADD);
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
r = findTableRow(TBL_PP_PROPS, propName2, 0) - 1;
selenium.type(MessageFormat.format(INP_PP_PROP_VAL,r), propVal2);
selenium.click(SUB_PP_PROPVAL_UPDATE);
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
r = findTableRow(TBL_PP_PROPS, propName1, 0) - 1;
selenium.click(MessageFormat.format(LNK_PP_PROP_DELETE,r));
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
// Portal & Page Error Handling
selenium.click(CHK_PP_UNAVAIL_CHECK);
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(CHK_PP_ACCESS_CHECK);
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(CHK_PP_ERROR_CHECK);
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(CHK_PP_INTERNAL_CHECK);
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(CHK_PP_NF_CHECK);
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(CHK_PP_RES_CHECK);
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.select(SEL_PP_ACCESS_SELECT, "label=Redirect to the specified resource");
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.select(SEL_PP_UNAVAIL_SELECT, "label=Redirect to the specified resource");
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.select(SEL_PP_ERROR_SELECT, "label=Display the default error message");
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.select(SEL_PP_INTERNAL_SELECT, "label=Display the default error message");
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.select(SEL_PP_NF_SELECT, "label=Redirect to the specified resource");
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.type(INP_PP_RES_INPUT, "/WEB-INF/jsp/error/portalx.jsp");
selenium.click(SUB_PP_ERROR_FORM_UPDATE);
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(CHK_PPA_ACCESS_CHECK);
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(CHK_PPA_CONTROL_CHECK);
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(CHK_PPA_ERROR_CHECK);
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(CHK_PPA_INTERNAL_CHECK);
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(CHK_PPA_NF_CHECK);
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(CHK_PPA_RES_CHECK);
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.select(SEL_PPA_ACCESS_SELECT, "label=Redirect to the specified resource");
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.select(SEL_PPA_CONTROL_SELECT, "label=Redirect to the specified resource");
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.select(SEL_PPA_ERROR_SELECT, "label=Display the default error message");
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.select(SEL_PPA_INTERNAL_SELECT, "label=Display the default error message");
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.select(SEL_PPA_NF_SELECT, "label=Redirect to the specified resource");
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.type(INP_PPA_RES_SELECT, "/WEB-INF/jsp/error/pagey.jsp");
selenium.click(SUB_PPA_FORM_UPDATE);
- selenium.waitForPageToLoad("30000");
+ selenium.waitForPageToLoad(PAGE_LOAD);
// logout login and property again
More information about the portal-commits
mailing list