10:42 a.m.
Author: vrockai
Date: 2008-12-09 11:42:43 -0500 (Tue, 09 Dec 2008)
New Revision: 12366
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/JBossSelenium.java
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/UserLoginTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml
Log:
some timeout tweaks
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 2008-12-08
23:00:09 UTC (rev 12365)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-12-09
16:42:43 UTC (rev 12366)
@@ -26,14 +26,15 @@
protected Selenium selenium;
// Generic timeout in miliseconds
- protected static final String PAGE_LOAD = "900000";
+ protected static final String PAGE_LOAD = "12000000";
// Element timeout in seconds
- protected static final int ELEM_TIMEOUT = 120;
+ protected static final int ELEM_TIMEOUT = 220;
@BeforeClass
public void setupChromeForLogin() throws Exception {
String browser = System.getProperty("browser");
+ //String browser ="*firefox /usr/lib64/firefox-3.0.1/firefox";
selenium = new DefaultSelenium("127.0.0.1", 44444, browser,
"http://localhost:8080/portal/");
JBossSeleniumTestListener.selenium = selenium;
selenium.start();
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSelenium.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSelenium.java 2008-12-08
23:00:09 UTC (rev 12365)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSelenium.java 2008-12-09
16:42:43 UTC (rev 12366)
@@ -13,7 +13,7 @@
public class JBossSelenium extends DefaultSelenium {
- protected static String PAGE_LOAD= "250000";
+ protected static String PAGE_LOAD= "350000";
protected static int count;
@Override
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 2008-12-08
23:00:09 UTC (rev 12365)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java 2008-12-09
16:42:43 UTC (rev 12366)
@@ -17,14 +17,15 @@
import com.thoughtworks.selenium.Selenium;
import com.thoughtworks.selenium.SeleniumException;
-public class JBossSeleniumTestListener extends TestListenerAdapter {//extends
ITestListener {
+public class JBossSeleniumTestListener extends TestListenerAdapter {
protected static Selenium selenium;
protected static int count;
-
+ protected static boolean screenshot = false;
+
@Override
- public void onTestFailure(ITestResult tr) {
- String name = "F_"+tr.getName()+"-" + count ;
+ public void onTestFailure(ITestResult tr) {
+ String name = "F_" + tr.getName() + "-" + count;
try {
PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(name +
".html")));
out.println(selenium.getHtmlSource());
@@ -32,14 +33,14 @@
} catch (IOException e1) {
e1.printStackTrace();
}
- /*
- try {
- selenium.windowMaximize();
- selenium.captureScreenshot(name + ".jpg");
- } catch (SeleniumException e2) {
- e2.printStackTrace();
- }
- */
+ if (screenshot)
+ try {
+ selenium.windowMaximize();
+ selenium.captureScreenshot(name + ".jpg");
+ } catch (SeleniumException e2) {
+ e2.printStackTrace();
+ }
+
count++;
}
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 2008-12-08
23:00:09 UTC (rev 12365)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.java 2008-12-09
16:42:43 UTC (rev 12366)
@@ -25,6 +25,7 @@
@Test(enabled = true, description = "login as default user 'user' with
password 'user'.")
public void testDefaultUserLogin() throws Exception {
+ //selenium.setSpeed("7000");
selenium.open("/portal");
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -34,6 +35,9 @@
selenium.click("link=Login");
selenium.selectFrame("login-content");
+ waitForElement("xpath=id('j_username')");
+ waitForElement("xpath=id('j_password')");
+
Assert.assertTrue(selenium.isElementPresent("xpath=id('j_username')"),
"Expected input DOM element for username doesn't exist.");
selenium.type("j_username", "user");
Assert.assertTrue(selenium.isElementPresent("xpath=id('j_password')"),
"Expected input DOM element for password doesn't exist.");
@@ -63,6 +67,9 @@
selenium.click("link=Login");
selenium.selectFrame("login-content");
+ waitForElement("xpath=id('j_username')");
+ waitForElement("xpath=id('j_password')");
+
Assert.assertTrue(selenium.isElementPresent("xpath=id('j_username')"),
"Expected input DOM element for username doesn't exist.");
selenium.type("j_username", "admin");
Assert.assertTrue(selenium.isElementPresent("xpath=id('j_password')"),
"Expected input DOM element for password doesn't exist.");
@@ -94,6 +101,9 @@
selenium.click("link=Login");
selenium.selectFrame("login-content");
+ waitForElement("xpath=id('j_username')");
+ waitForElement("xpath=id('j_password')");
+
Assert.assertTrue(selenium.isElementPresent("xpath=id('j_username')"),
"Expected input DOM element for username doesn't exist.");
selenium.type("j_username", "saki");
Assert.assertTrue(selenium.isElementPresent("xpath=id('j_password')"),
"Expected input DOM element for password doesn't exist.");
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-12-08
23:00:09 UTC (rev 12365)
+++
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-12-09
16:42:43 UTC (rev 12366)
@@ -283,6 +283,7 @@
clickIfVisible(ID_LINK_CONSCONF);
clickIfVisible(LINK_CONSUMER_HOME);
+ waitForElement(WSRP_CONSUMER_TABLE);
r = findTableRow(WSRP_CONSUMER_TABLE, name, 0);
Assert.assertTrue(r<0, "Renamed consumer still in table");
@@ -302,18 +303,17 @@
selenium.click(SUBMIT_CREATECONS);
selenium.waitForPageToLoad(PAGE_LOAD);
- //selenium.setSpeed("5000");
-
+ waitForElement(INPUT_CACHEEXP);
selenium.type(INPUT_CACHEEXP, timeout);
+ waitForElement(INPUT_CONSWSDL);
selenium.type(INPUT_CONSWSDL, address);
selenium.click(SUBMIT_REFRESHSAVE);
selenium.waitForPageToLoad(PAGE_LOAD);
+ waitForElement(INPUT_CONS_REGVALUE);
selenium.type(INPUT_CONS_REGVALUE, "public");
selenium.click(SUBMIT_CONS_REGVAL);
selenium.waitForPageToLoad(PAGE_LOAD);
- //selenium.setSpeed("0");
-
selenium.click(SUBMIT_REFRESHFINAL);
selenium.waitForPageToLoad(PAGE_LOAD);
}
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml 2008-12-08 23:00:09 UTC
(rev 12365)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/testng.xml 2008-12-09 16:42:43 UTC
(rev 12366)
@@ -45,7 +45,7 @@
<classes>
<class
name="org.jboss.portal.test.selenium.cms.CMSDirectoryTestCase"></class></classes>
</test>
- -->
+
<test name="org.jboss.portal.test.selenium.cms.CMSFileUploadTestCase"
verbose="2" annotations="JDK">
<classes>