You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/05/09 08:16:48 UTC
svn commit: r654690 [1/2] - in /geronimo/server/trunk:
testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/
testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/
testsuite/deployment...
Author: jdillon
Date: Thu May 8 23:16:46 2008
New Revision: 654690
URL: http://svn.apache.org/viewvc?rev=654690&view=rev
Log:
Use waitForPageLoad()
Modified:
geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/ConsoleRealmTest.java
geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java
geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java
geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java
geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java
geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSServerTest.java
geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java
geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ApacheConfigPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/CertificationAuthorityPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletAppClientTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEARTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEJBTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletRARTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletSysModulesTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletWARTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConnectorPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DBViewerPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DeploymentPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DerbyLogViewerPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ImportExportPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/InternalDBPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSBrokerPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSConnectorPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcePortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMXManagerPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JavaSystemInfoPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/KeystoresPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LDAPManagerPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogManagerPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogViewerPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RepositoryViewPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RunSQLPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEGroupsPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEUsersPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SecurityRealmPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerInfoPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerManagerPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ThreadPoolPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebAccessLogViewerPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebManagerPortletTest.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WelcomePortletTest.java
geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java
geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear14Test.java
geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jcacms/CmsTest.java
geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/JMSTest.java
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/java/org/apache/geronimo/testsuite/jpa/JPATest.java
geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/src/test/java/org/apache/geronimo/testsuite/security/RunAsTest.java
geronimo/server/trunk/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestConsoleSecurity.java
geronimo/server/trunk/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java
geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/test/java/org/apache/geronimo/testsuite/jsps/TestJsps.java
geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/test/java/org/apache/geronimo/testsuite/servlets/TestServlets.java
geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/src/test/java/org/apache/geronimo/testsuite/myfaces/TestMyFaces.java
geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/java/org/apache/geronimo/testsuite/web/forward/ServletForwardTest.java
geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/org/apache/geronimo/testsuite/web/references/WebReferencesTest.java
geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/SeleniumTestSupport.java
Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/ConsoleRealmTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/ConsoleRealmTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/ConsoleRealmTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/ConsoleRealmTest.java Thu May 8 23:16:46 2008
@@ -30,19 +30,19 @@
login();
selenium.click("link=Users and Groups");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.click("link=Create New User");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.type("userId", "myuser");
selenium.type("password", "myuser");
selenium.type("confirmpassword", "myuser");
selenium.click("//input[@value='Add']");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.isTextPresent("myuser"));
selenium.click("link=Delete");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.getConfirmation().matches("^Confirm Delete user myuser[\\s\\S]$"));
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertFalse(selenium.isTextPresent("myuser"));
} finally {
logout();
@@ -55,17 +55,17 @@
login();
selenium.click("link=Users and Groups");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.click("link=Create New Group");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.type("group", "mygroup");
selenium.click("//input[@value='Add']");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.isTextPresent("mygroup"));
selenium.click("//a[@onclick=\"return confirm('Confirm Delete group mygroup?');\"]");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.getConfirmation().matches("^Confirm Delete group mygroup[\\s\\S]$"));
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertFalse(selenium.isTextPresent("mygroup"));
} finally {
logout();
Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java Thu May 8 23:16:46 2008
@@ -30,26 +30,26 @@
login();
selenium.click("link=DB Manager");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.type("createDB", "MyUniqueDB");
selenium.click("action");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.isTextPresent("MyUniqueDB"));
selenium.type("sqlStmts", "create table myTable ( id int primary key );");
selenium.select("useDB", "label=SystemDatabase");
selenium.select("useDB", "label=MyUniqueDB");
selenium.click("//input[@value = 'Run SQL']");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
//selenium.click("link=Application");
selenium.click("//a[contains(@href, 'db=MyUniqueDB')]");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.isTextPresent("MYTABLE"));
selenium.select("deleteDB", "label=SystemDatabase");
selenium.select("deleteDB", "label=MyUniqueDB");
selenium.click("//input[@value = 'Delete']");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.getConfirmation().matches("^Are you sure you want to delete this database[\\s\\S]$"));
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.isTextPresent("Database deleted: MyUniqueDB"));
} finally {
logout();
Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java Thu May 8 23:16:46 2008
@@ -32,20 +32,20 @@
String geronimoVersion = System.getProperty("geronimoVersion");
selenium.click("link=Database Pools");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.click("link=Using the Geronimo database pool wizard");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.type("name", "UniquePool");
selenium.select("dbtype", "label=Derby embedded");
selenium.click("//input[@value='Next']");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.addSelection("jars", "label=org.apache.geronimo.configs/system-database/" + geronimoVersion + "/car");
selenium.type("property-DatabaseName", "SystemDatabase");
selenium.click("//input[@value='Deploy']");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.isTextPresent("UniquePool"));
selenium.click("//tr[td[1] = 'UniquePool']/td[4]/a[3]");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertFalse(selenium.isTextPresent("UniquePool"));
} finally {
logout();
@@ -60,21 +60,21 @@
login();
selenium.click("link=Database Pools");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.isTextPresent("running"));
selenium.click("link=edit");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.type("maxSize", "101");
selenium.click("//input[@value='Save']");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.click("link=edit");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("101", selenium.getValue("maxSize"));
selenium.type("maxSize", "100");
selenium.click("//input[@value='Save']");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.click("link=edit");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("100", selenium.getValue("maxSize"));
} catch(Exception e) {
Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java Thu May 8 23:16:46 2008
@@ -30,9 +30,9 @@
login();
selenium.click("link=Deploy New");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.click("//input[@value='Install']");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.isTextPresent("Deployment failed:"));
} finally {
logout();
Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java Thu May 8 23:16:46 2008
@@ -30,38 +30,38 @@
login();
selenium.click("link=JMS Resources");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.click("link=For ActiveMQ");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.type("instanceName", "UniqueName");
selenium.click("//input[@value='Next']");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.click("//input[@value='Add Connection Factory']");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.select("factoryType", "label=javax.jms.QueueConnectionFactory");
selenium.click("//input[@value='Next']");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.type("factory.0.instanceName", "ConnectionFactory");
selenium.click("//input[@value='Next']");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.click("//input[@value='Add Destination']");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.click("//input[@value='Next']");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.type("destination.0.name", "mdb/Unique");
selenium.type("destination.0.instance-config-0", "mdb/Unique");
selenium.click("//input[@value='Next']");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.click("//input[@value='Deploy Now']");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.isTextPresent("UniqueName (console.jms/UniqueName/1.0/rar)"));
selenium.click("link=J2EE Connectors");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.click("link=Uninstall");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.getConfirmation().matches("^Are you certain you wish to uninstall console\\.jms/UniqueName/1\\.0/rar[\\s\\S]*"));
selenium.click("link=JMS Resources");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertFalse(selenium.isTextPresent("UniqueName (console.jms/UniqueName/1.0/rar)"));
} finally {
logout();
Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSServerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSServerTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSServerTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSServerTest.java Thu May 8 23:16:46 2008
@@ -30,18 +30,18 @@
login();
selenium.click("link=JMS Server");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.click("link=Add new tcp listener");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.type("name", "uniquename");
selenium.type("host", "0.0.0.0");
selenium.type("port", "2097");
selenium.click("submit");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.isTextPresent("uniquename"));
//selenium.click("link=delete");
selenium.click("//a[@onclick=\"return confirm('Are you sure you want to delete uniquename?');\"]");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.getConfirmation().matches("^Are you sure you want to delete uniquename[\\s\\S]$"));
} finally {
logout();
@@ -54,12 +54,12 @@
login();
selenium.click("link=JMS Server");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.click("//tr[4]/td[6]/a[1]");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("stopped", selenium.getText("//tr[4]/td[5]"));
selenium.click("//tr[4]/td[6]/a[1]");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("running", selenium.getText("//tr[4]/td[5]"));
} finally {
logout();
@@ -72,19 +72,19 @@
login();
selenium.click("link=JMS Server");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.isTextPresent("61613"));
selenium.click("link=edit");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.type("port", "6161");
selenium.click("submit");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.isTextPresent("6161"));
selenium.click("link=edit");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.type("port", "61612");
selenium.click("submit");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.isTextPresent("61612"));
} finally {
logout();
Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java Thu May 8 23:16:46 2008
@@ -34,26 +34,26 @@
String actualLink = "http://localhost:8080/plugin/maven-repo/";
selenium.click("link=Plugins");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.isTextPresent(link));
selenium.click("link=Add Repository");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.isTextPresent(link));
selenium.type("newRepository", actualLink);
selenium.click("//input[@value='Add Repository']");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.select("repository", "label=" + actualLink);
selenium.type("username", "system");
selenium.type("password", "manager");
selenium.click("//input[@value = 'Show Plugins in selected repository']");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.isTextPresent("Geronimo Assemblies :: Boilerplate Minimal"));
selenium.click("link=Geronimo Assemblies :: Boilerplate Minimal");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.isTextPresent("Geronimo-Versions"));
} finally {
Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java Thu May 8 23:16:46 2008
@@ -53,19 +53,19 @@
String connectorSelector = "//tr[td[1] = \"" + name + "\"]";
selenium.click(connectorSelector + "/td[5]/a[3]");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.type("port", "8008");
selenium.click("submit");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.isTextPresent("8008"));
selenium.click(connectorSelector + "/td[5]/a[3]");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.type("port", "8009");
selenium.click("submit");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.isTextPresent("8009"));
deleteConnector(name);
@@ -86,10 +86,10 @@
assertEquals("running", selenium.getText(connectorSelector + "/td[4]"));
selenium.click(connectorSelector + "/td[5]/a[1]");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("stopped", selenium.getText(connectorSelector + "/td[4]"));
selenium.click(connectorSelector + "/td[5]/a[1]");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("running", selenium.getText(connectorSelector + "/td[4]"));
deleteConnector(name);
@@ -100,24 +100,24 @@
private void addConnector(String name, int port) throws Exception {
selenium.click("link=Web Server");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
String container = JETTY;
if(selenium.isTextPresent(TOMCAT)) {
container = TOMCAT;
}
selenium.click("link=" + container + " BIO HTTP Connector");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.type("uniqueName", name);
selenium.type("port", String.valueOf(port));
selenium.click("submit");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.isTextPresent(name));
}
private void deleteConnector(String name) throws Exception {
selenium.click("//a[@onclick=\"return confirm('Are you sure you want to delete " + name + "?');\"]");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.getConfirmation().matches("^Are you sure you want to delete " + name + "[\\s\\S]$"));
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ApacheConfigPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ApacheConfigPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ApacheConfigPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ApacheConfigPortletTest.java Thu May 8 23:16:46 2008
@@ -34,7 +34,7 @@
@Test
public void testApacheConfigLink() throws Exception {
selenium.click("link=Apache HTTP");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Apache mod_jk Configuration",
selenium.getText(getPortletTitleLocation()));
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/CertificationAuthorityPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/CertificationAuthorityPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/CertificationAuthorityPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/CertificationAuthorityPortletTest.java Thu May 8 23:16:46 2008
@@ -34,7 +34,7 @@
@Test
public void testCertificationAuthorityLink() throws Exception {
selenium.click("link=Certificate Authority");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Certification Authority",
selenium.getText(getPortletTitleLocation()));
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletAppClientTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletAppClientTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletAppClientTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletAppClientTest.java Thu May 8 23:16:46 2008
@@ -34,7 +34,7 @@
@Test
public void testConfigManagerAppClientLink() throws Exception {
selenium.click("link=App Clients");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Installed Application Clients",
selenium.getText(getPortletTitleLocation()));
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEARTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEARTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEARTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEARTest.java Thu May 8 23:16:46 2008
@@ -34,7 +34,7 @@
@Test
public void testConfigManagerEARLink() throws Exception {
selenium.click("link=Application EARs");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Installed Application EARs",
selenium.getText(getPortletTitleLocation()));
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEJBTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEJBTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEJBTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEJBTest.java Thu May 8 23:16:46 2008
@@ -34,7 +34,7 @@
@Test
public void testConfigManagerEJBLink() throws Exception {
selenium.click("link=EJB JARs");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Installed EJB JARs",
selenium.getText(getPortletTitleLocation()));
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletRARTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletRARTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletRARTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletRARTest.java Thu May 8 23:16:46 2008
@@ -34,7 +34,7 @@
@Test
public void testConfigManagerRARLink() throws Exception {
selenium.click("link=J2EE Connectors");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Installed J2EE Connectors",
selenium.getText(getPortletTitleLocation()));
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletSysModulesTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletSysModulesTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletSysModulesTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletSysModulesTest.java Thu May 8 23:16:46 2008
@@ -34,7 +34,7 @@
@Test
public void testConfigManagerSysModulesLink() throws Exception {
selenium.click("link=System Modules");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Installed System Modules",
selenium.getText(getPortletTitleLocation()));
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletWARTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletWARTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletWARTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletWARTest.java Thu May 8 23:16:46 2008
@@ -34,7 +34,7 @@
@Test
public void testConfigManagerWARLink() throws Exception {
selenium.click("link=Web App WARs");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Installed Web Applications",
selenium.getText(getPortletTitleLocation()));
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConnectorPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConnectorPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConnectorPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConnectorPortletTest.java Thu May 8 23:16:46 2008
@@ -34,13 +34,13 @@
@Test
public void testConnectorLink() throws Exception {
selenium.click("link=Web Server");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Network Listeners",
selenium.getText(getPortletTitleLocation(2)));
// Test help link
selenium.click(getPortletHelpLocation(2));
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.isTextPresent("The Connector Manager displays connections of all types");
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DBViewerPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DBViewerPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DBViewerPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DBViewerPortletTest.java Thu May 8 23:16:46 2008
@@ -34,13 +34,13 @@
@Test
public void testDBViewerLink() throws Exception {
selenium.click("link=DB Manager");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("DB Viewer",
selenium.getText(getPortletTitleLocation()));
// Test help link
selenium.click(getPortletHelpLocation());
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.isTextPresent("Displays all the available databases and their tables");
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolPortletTest.java Thu May 8 23:16:46 2008
@@ -34,7 +34,7 @@
@Test
public void testDatabasePoolLink() throws Exception {
selenium.click("link=Database Pools");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Database Pools",
selenium.getText(getPortletTitleLocation()));
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DeploymentPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DeploymentPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DeploymentPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DeploymentPortletTest.java Thu May 8 23:16:46 2008
@@ -34,13 +34,13 @@
@Test
public void testDeploymentLink() throws Exception {
selenium.click("link=Deploy New");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Install New Applications",
selenium.getText(getPortletTitleLocation()));
// Test help link
selenium.click(getPortletHelpLocation());
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.isTextPresent("This portlet allows the user to deploy new applications on Geronimo.");
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DerbyLogViewerPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DerbyLogViewerPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DerbyLogViewerPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DerbyLogViewerPortletTest.java Thu May 8 23:16:46 2008
@@ -34,13 +34,13 @@
@Test
public void testDerbyLogViewerLink() throws Exception {
selenium.click("link=Server Logs");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Derby Log Viewer",
selenium.getText(getPortletTitleLocation(4)));
// Test help link
selenium.click(getPortletHelpLocation(4));
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.isTextPresent("This portlet views the log file for Geronimo's internal database, Derby.");
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ImportExportPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ImportExportPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ImportExportPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ImportExportPortletTest.java Thu May 8 23:16:46 2008
@@ -34,7 +34,7 @@
@Test
public void testImportExportLink() throws Exception {
selenium.click("link=Plugins");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Create and Install Plugins",
selenium.getText(getPortletTitleLocation()));
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/InternalDBPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/InternalDBPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/InternalDBPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/InternalDBPortletTest.java Thu May 8 23:16:46 2008
@@ -34,13 +34,13 @@
@Test
public void testInternalDBLink() throws Exception {
selenium.click("link=DB Info");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("DB Info",
selenium.getText(getPortletTitleLocation()));
// Test help link
selenium.click(getPortletHelpLocation());
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.isTextPresent("This page provides information about the internal database");
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSBrokerPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSBrokerPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSBrokerPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSBrokerPortletTest.java Thu May 8 23:16:46 2008
@@ -34,13 +34,13 @@
@Test
public void testJMSBrokerLink() throws Exception {
selenium.click("link=JMS Server");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("JMS Server Manager",
selenium.getText(getPortletTitleLocation()));
// Test help link
selenium.click(getPortletHelpLocation());
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.isTextPresent("Shows the available JMS brokers");
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSConnectorPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSConnectorPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSConnectorPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSConnectorPortletTest.java Thu May 8 23:16:46 2008
@@ -34,13 +34,13 @@
@Test
public void testJMSConnectorLink() throws Exception {
selenium.click("link=JMS Server");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("JMS Network Listeners",
selenium.getText(getPortletTitleLocation(2)));
// Test help link
selenium.click(getPortletHelpLocation(2));
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.isTextPresent("Shows all the network connectors configured for the currently available JMS brokers.");
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcePortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcePortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcePortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcePortletTest.java Thu May 8 23:16:46 2008
@@ -34,7 +34,7 @@
@Test
public void testJMSResourceLink() throws Exception {
selenium.click("link=JMS Resources");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("JMS Resources",
selenium.getText(getPortletTitleLocation()));
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMXManagerPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMXManagerPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMXManagerPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMXManagerPortletTest.java Thu May 8 23:16:46 2008
@@ -34,13 +34,13 @@
@Test
public void testJMXManagerLink() throws Exception {
selenium.click("link=JMX Viewer");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("JMX Viewer",
selenium.getText(getPortletTitleLocation()));
// Test help link
selenium.click(getPortletHelpLocation());
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.isTextPresent("JMX Viewer Portlet Help");
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JavaSystemInfoPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JavaSystemInfoPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JavaSystemInfoPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JavaSystemInfoPortletTest.java Thu May 8 23:16:46 2008
@@ -34,13 +34,13 @@
@Test
public void testJavaSystemInfoLink() throws Exception {
selenium.click("link=Java System Info");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("System Property values for the Server JVM",
selenium.getText(getPortletTitleLocation()));
// Test help link
selenium.click(getPortletHelpLocation());
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.isTextPresent("This page displays the values of the system properties available to the server process.");
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/KeystoresPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/KeystoresPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/KeystoresPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/KeystoresPortletTest.java Thu May 8 23:16:46 2008
@@ -34,7 +34,7 @@
@Test
public void testKeystoresLink() throws Exception {
selenium.click("link=Keystores");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Keystore Configuration",
selenium.getText(getPortletTitleLocation()));
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LDAPManagerPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LDAPManagerPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LDAPManagerPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LDAPManagerPortletTest.java Thu May 8 23:16:46 2008
@@ -36,13 +36,13 @@
// TODO: Add a way to close problem connecting to server alert message.
// selenium.click("link=LDAP Viewer");
- // selenium.waitForPageToLoad("30000");
+ // waitForPageLoad();
// assertEquals("Geronimo Console", selenium.getTitle());
// assertEquals("LDAP Viewer", selenium.getText(
// "xpath=/html/body/table[@id='rootfragment']/tbody/tr[2]/td/table/tbody/tr[2]/td[4]/table/tbody/tr[1]/td/table/tbody/tr[1]/td/div/table/tbody/tr/td[2]/table/tbody/tr/td[1]/strong"));
// Test help link
// selenium.click("link=help");
- // selenium.waitForPageToLoad("30000");
+ // waitForPageLoad();
// selenium.isTextPresent("The LDAP viewer portlet can be used to do the following");
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java Thu May 8 23:16:46 2008
@@ -34,7 +34,7 @@
@Test
public void testServerInfoLink() throws Exception {
selenium.click("link=Information");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertTrue(selenium.isTextPresent("Version"));
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogManagerPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogManagerPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogManagerPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogManagerPortletTest.java Thu May 8 23:16:46 2008
@@ -34,13 +34,13 @@
@Test
public void testLogManagerLink() throws Exception {
selenium.click("link=Server Logs");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Log Manager",
selenium.getText(getPortletTitleLocation()));
// Test help link
selenium.click(getPortletHelpLocation());
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.isTextPresent("This portlet allows the user to select a configuration file for logging");
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogViewerPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogViewerPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogViewerPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogViewerPortletTest.java Thu May 8 23:16:46 2008
@@ -34,13 +34,13 @@
@Test
public void testLogViewerLink() throws Exception {
selenium.click("link=Server Logs");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Server Log Viewer",
selenium.getText(getPortletTitleLocation(2)));
// Test help link
selenium.click(getPortletHelpLocation(2));
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.isTextPresent("This portlet displays the Geronimo server log");
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RepositoryViewPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RepositoryViewPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RepositoryViewPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RepositoryViewPortletTest.java Thu May 8 23:16:46 2008
@@ -34,13 +34,13 @@
@Test
public void testRepositoryViewLink() throws Exception {
selenium.click("link=Repository");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Repository Viewer",
selenium.getText(getPortletTitleLocation()));
// Test help link
selenium.click(getPortletHelpLocation());
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.isTextPresent("This page displays the artifacts installed in the server's repository.");
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RunSQLPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RunSQLPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RunSQLPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RunSQLPortletTest.java Thu May 8 23:16:46 2008
@@ -34,13 +34,13 @@
@Test
public void testRunSQLLink() throws Exception {
selenium.click("link=DB Manager");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Run SQL",
selenium.getText(getPortletTitleLocation(2)));
// Test help link
selenium.click(getPortletHelpLocation(2));
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.isTextPresent("Allows the user to run SQL commands");
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEGroupsPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEGroupsPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEGroupsPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEGroupsPortletTest.java Thu May 8 23:16:46 2008
@@ -34,13 +34,13 @@
@Test
public void testSEGroupsLink() throws Exception {
selenium.click("link=Users and Groups");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Console Realm Groups",
selenium.getText(getPortletTitleLocation(2)));
// Test help link
selenium.click(getPortletHelpLocation(2));
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.isTextPresent("This portlet lists all the Console Realm groups");
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEUsersPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEUsersPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEUsersPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEUsersPortletTest.java Thu May 8 23:16:46 2008
@@ -34,13 +34,13 @@
@Test
public void testSEUsersLink() throws Exception {
selenium.click("link=Users and Groups");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Console Realm Users",
selenium.getText(getPortletTitleLocation()));
// Test help link
selenium.click(getPortletHelpLocation());
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.isTextPresent("This portlet lists all the console realm users");
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SecurityRealmPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SecurityRealmPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SecurityRealmPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SecurityRealmPortletTest.java Thu May 8 23:16:46 2008
@@ -34,7 +34,7 @@
@Test
public void testSecurityRealmLink() throws Exception {
selenium.click("link=Security Realms");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Security Realms",
selenium.getText(getPortletTitleLocation()));
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerInfoPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerInfoPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerInfoPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerInfoPortletTest.java Thu May 8 23:16:46 2008
@@ -34,13 +34,13 @@
@Test
public void testServerInfoLink() throws Exception {
selenium.click("link=Information");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Server Info",
selenium.getText(getPortletTitleLocation()));
// Test help link
selenium.click(getPortletHelpLocation());
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.isTextPresent("This page provides information about the uptime of the server and the resources being used by the JVM.");
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerManagerPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerManagerPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerManagerPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerManagerPortletTest.java Thu May 8 23:16:46 2008
@@ -34,13 +34,13 @@
@Test
public void testServerManagerLink() throws Exception {
selenium.click("link=Shutdown");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Server Manager",
selenium.getText(getPortletTitleLocation()));
// Test help link
selenium.click(getPortletHelpLocation());
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.isTextPresent("This portlet give the admin the ability to remotely shutdown the Geronimo server.");
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java Thu May 8 23:16:46 2008
@@ -50,15 +50,15 @@
login();
selenium.click("link=Information");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
selenium.click("link=Java System Info");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
selenium.click("link=DB Info");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
} finally {
logout();
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ThreadPoolPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ThreadPoolPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ThreadPoolPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ThreadPoolPortletTest.java Thu May 8 23:16:46 2008
@@ -34,7 +34,7 @@
@Test
public void testThreadPoolLink() throws Exception {
selenium.click("link=Thread Pools");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Thread Pool Configuration",
selenium.getText(getPortletTitleLocation()));
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebAccessLogViewerPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebAccessLogViewerPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebAccessLogViewerPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebAccessLogViewerPortletTest.java Thu May 8 23:16:46 2008
@@ -34,13 +34,13 @@
@Test
public void testWebAccessLogViewerLink() throws Exception {
selenium.click("link=Server Logs");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Web Access Log Viewer",
selenium.getText(getPortletTitleLocation(3)));
// Test help link
selenium.click(getPortletHelpLocation(3));
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.isTextPresent("This portlet displays and filters the Jetty log file.");
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebManagerPortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebManagerPortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebManagerPortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebManagerPortletTest.java Thu May 8 23:16:46 2008
@@ -34,13 +34,13 @@
@Test
public void testWebManagerLink() throws Exception {
selenium.click("link=Web Server");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Web Server Manager",
selenium.getText(getPortletTitleLocation()));
// Test help link
selenium.click(getPortletHelpLocation());
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.isTextPresent("Geronimo Console will collect statistics on the number of requests received");
}
}
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WelcomePortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WelcomePortletTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WelcomePortletTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WelcomePortletTest.java Thu May 8 23:16:46 2008
@@ -34,14 +34,14 @@
@Test
public void testWelcomeLink() throws Exception {
selenium.click("link=Java System Info");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.click("link=Welcome");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Welcome", selenium.getText(getPortletTitleLocation()));
// Test help link
selenium.click(getPortletHelpLocation());
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
selenium.isTextPresent("This is the help for the Geronimo Administration Console Welcome.");
}
}
Modified: geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java Thu May 8 23:16:46 2008
@@ -39,7 +39,7 @@
*/
/*
selenium.open("/test-1_3/");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Hello J2EE 1.3", selenium.getTitle());
assertEquals("Hello J2EE 1.3", selenium.getText("xpath=/html/body"));
*/
Modified: geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear14Test.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear14Test.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear14Test.java (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/src/test/java/org/apache/geronimo/testsuite/deployment/Ear14Test.java Thu May 8 23:16:46 2008
@@ -34,7 +34,7 @@
@Test
public void testIndexContent() throws Exception {
selenium.open("/test-1_4/");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("Hello J2EE 1.4", selenium.getTitle());
assertEquals("Hello J2EE 1.4", selenium.getText("xpath=/html/body"));
}
Modified: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jcacms/CmsTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jcacms/CmsTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jcacms/CmsTest.java (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jcacms/CmsTest.java Thu May 8 23:16:46 2008
@@ -34,7 +34,7 @@
@Test
public void testPageContent1() throws Exception {
selenium.open("http://localhost:8080/jca-cms/default-subject-servlet");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
String body = selenium.getText("xpath=/html/body");
@@ -65,7 +65,7 @@
@Test
public void testPageContent2() throws Exception {
selenium.open("http://localhost:8080/jca-cms/run-as-servlet");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
String body = selenium.getText("xpath=/html/body");
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/JMSTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/JMSTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/JMSTest.java (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/JMSTest.java Thu May 8 23:16:46 2008
@@ -34,17 +34,17 @@
@Test
public void testIndexContent() throws Exception {
selenium.open("/testjms/JMSQueueSender");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("JMS Sender", selenium.getTitle());
assertEquals("Sent JMS Queue Message", selenium.getText("xpath=/html/body"));
selenium.open("/testjms/JMSQueueReceiver");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("JMS Receiver", selenium.getTitle());
assertEquals("Received JMS Queue Message", selenium.getText("xpath=/html/body"));
selenium.open("/testjms/JMSTopicSenderReceiver");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("JMS Topic Sender Receiver", selenium.getTitle());
assertEquals("Received JMS Topic Message", selenium.getText("xpath=/html/body"));
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/java/org/apache/geronimo/testsuite/jpa/JPATest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/java/org/apache/geronimo/testsuite/jpa/JPATest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/java/org/apache/geronimo/testsuite/jpa/JPATest.java (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/src/test/java/org/apache/geronimo/testsuite/jpa/JPATest.java Thu May 8 23:16:46 2008
@@ -34,7 +34,7 @@
@Test
public void testIndexContent() throws Exception {
selenium.open("/jpa/servlet");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
//assertEquals("Hello J2EE 1.4", selenium.getTitle());
assertEquals("TestServlet\n" +
"Test EJB container managed entity manager test OK: true\n" +
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/src/test/java/org/apache/geronimo/testsuite/security/RunAsTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/src/test/java/org/apache/geronimo/testsuite/security/RunAsTest.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/src/test/java/org/apache/geronimo/testsuite/security/RunAsTest.java (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/src/test/java/org/apache/geronimo/testsuite/security/RunAsTest.java Thu May 8 23:16:46 2008
@@ -45,7 +45,7 @@
@Test
public void testServletRunAs() throws Exception {
selenium.open("/sec/servlet");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
System.out.println("----------------------------------------------");
System.out.println(selenium.getText("xpath=/html/body"));
assertEquals("TestServlet principal: foo\n" +
@@ -57,7 +57,7 @@
@Test
public void testJspRunAs() throws Exception {
selenium.open("/sec/jsp");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
System.out.println("----------------------------------------------");
System.out.println(selenium.getText("xpath=/html/body"));
assertEquals("TestServlet principal: foo Test EJB principal: bar Correctly received security exception on noAccess method", selenium.getText("xpath=/html/body"));
Modified: geronimo/server/trunk/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestConsoleSecurity.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestConsoleSecurity.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestConsoleSecurity.java (original)
+++ geronimo/server/trunk/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestConsoleSecurity.java Thu May 8 23:16:46 2008
@@ -32,7 +32,7 @@
selenium.type("j_username", "system");
selenium.type("j_password", "manager");
selenium.click("submit");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.isTextPresent("Deploy New"));
}
@@ -75,7 +75,7 @@
selenium.type("j_password", password);
}
selenium.click("submit");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.isTextPresent("Invalid Username and"));
}
Modified: geronimo/server/trunk/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java?rev=654690&r1=654689&r2=654690&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java (original)
+++ geronimo/server/trunk/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java Thu May 8 23:16:46 2008
@@ -31,7 +31,7 @@
selenium.type("j_username", "george");
selenium.type("j_password", "bone");
selenium.click("submit");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertEquals("hello world.", selenium.getText("xpath=/html"));
}
@@ -74,7 +74,7 @@
selenium.type("j_password", password);
}
selenium.click("submit");
- selenium.waitForPageToLoad("30000");
+ waitForPageLoad();
assertTrue(selenium.isTextPresent("Authentication ERROR"));
}