You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2007/10/11 21:28:07 UTC
svn commit: r583925 -
/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/
Author: gawor
Date: Thu Oct 11 12:28:04 2007
New Revision: 583925
URL: http://svn.apache.org/viewvc?rev=583925&view=rev
Log:
updated basic console tests
Added:
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/BasicConsoleTestSupport.java (with props)
Modified:
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
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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,18 +29,14 @@
*/
@Test
public class ApacheConfigPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testApacheConfigLink() throws Exception {
- login();
-
selenium.click("link=Apache HTTP");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Apache mod_jk Configuration", 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"));
-
- logout();
+ assertEquals("Apache mod_jk Configuration",
+ selenium.getText(getPortletTitleLocation()));
}
}
Added: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/BasicConsoleTestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/BasicConsoleTestSupport.java?rev=583925&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/BasicConsoleTestSupport.java (added)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/BasicConsoleTestSupport.java Thu Oct 11 12:28:04 2007
@@ -0,0 +1,53 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.geronimo.testsuite.console;
+
+import org.testng.annotations.*;
+import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
+
+public class BasicConsoleTestSupport extends ConsoleTestSupport {
+
+ @BeforeMethod
+ public void signIn() throws Exception {
+ login();
+ }
+
+ @AfterMethod
+ public void singOut() throws Exception {
+ logout();
+ }
+
+ protected String getPortletTitleLocation() {
+ return getPortletTitleLocation(1);
+ }
+
+ protected String getPortletTitleLocation(int index) {
+ return "xpath=//div[@class = 'portlet'][" + index + "]/div/h2";
+ }
+
+ protected String getPortletHelpLocation() {
+ return getPortletHelpLocation(1);
+ }
+
+ protected String getPortletHelpLocation(int index) {
+ return "xpath=//div[@class = 'portlet'][" + index + "]/div/a[contains(@title, 'Help')]";
+ }
+
+}
Propchange: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/BasicConsoleTestSupport.java
------------------------------------------------------------------------------
svn:eol-style = native
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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,18 +29,14 @@
*/
@Test
public class CertificationAuthorityPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testCertificationAuthorityLink() throws Exception {
- login();
-
selenium.click("link=Certificate Authority");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Certification Authority", 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"));
-
- logout();
+ 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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,18 +29,14 @@
*/
@Test
public class ConfigManagerPortletAppClientTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testConfigManagerAppClientLink() throws Exception {
- login();
-
selenium.click("link=App Clients");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Installed Application Clients", 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"));
-
- logout();
+ 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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,18 +29,14 @@
*/
@Test
public class ConfigManagerPortletEARTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testConfigManagerEARLink() throws Exception {
- login();
-
selenium.click("link=Application EARs");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Installed Application EARs", 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"));
-
- logout();
+ 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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,18 +29,14 @@
*/
@Test
public class ConfigManagerPortletEJBTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testConfigManagerEJBLink() throws Exception {
- login();
-
selenium.click("link=EJB JARs");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Installed EJB JARs", 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"));
-
- logout();
+ 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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,18 +29,14 @@
*/
@Test
public class ConfigManagerPortletRARTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testConfigManagerRARLink() throws Exception {
- login();
-
selenium.click("link=J2EE Connectors");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Installed J2EE Connectors", 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"));
-
- logout();
+ 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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,18 +29,14 @@
*/
@Test
public class ConfigManagerPortletSysModulesTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testConfigManagerSysModulesLink() throws Exception {
- login();
-
selenium.click("link=System Modules");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Installed System Modules", 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"));
-
- logout();
+ 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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,18 +29,14 @@
*/
@Test
public class ConfigManagerPortletWARTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testConfigManagerWARLink() throws Exception {
- login();
-
selenium.click("link=Web App WARs");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Installed Web Applications", 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"));
-
- logout();
+ 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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,22 +29,18 @@
*/
@Test
public class ConnectorPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testConnectorLink() throws Exception {
- login();
-
selenium.click("link=Web Server");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Network Listeners", selenium.getText(
- "xpath=/html/body/table[@id='rootfragment']/tbody/tr[2]/td/table/tbody/tr[2]/td[4]/table/tbody/tr[3]/td/table/tbody/tr[1]/td/div/table/tbody/tr/td[2]/table/tbody/tr/td[1]/strong"));
+ assertEquals("Network Listeners",
+ selenium.getText(getPortletTitleLocation(2)));
// Test help link
- selenium.click("//tr[3]/td/table/tbody/tr[1]/td/div/table/tbody/tr/td[2]/table/tbody/tr/td[2]/a[1]");
+ selenium.click(getPortletHelpLocation(2));
selenium.waitForPageToLoad("30000");
selenium.isTextPresent("The Connector Manager displays connections of all types");
-
- logout();
}
}
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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,22 +29,18 @@
*/
@Test
public class DBViewerPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testDBViewerLink() throws Exception {
- login();
-
selenium.click("link=DB Manager");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("DB 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"));
+ assertEquals("DB Viewer",
+ selenium.getText(getPortletTitleLocation()));
// Test help link
- selenium.click("//td[2]/table/tbody/tr/td[2]/a[1]");
+ selenium.click(getPortletHelpLocation());
selenium.waitForPageToLoad("30000");
selenium.isTextPresent("Displays all the available databases and their tables");
-
- logout();
}
}
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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,18 +29,14 @@
*/
@Test
public class DatabasePoolPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testDatabasePoolLink() throws Exception {
- login();
-
selenium.click("link=Database Pools");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Database Pools", 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"));
-
- logout();
+ 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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,22 +29,18 @@
*/
@Test
public class DeploymentPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testDeploymentLink() throws Exception {
- login();
-
selenium.click("link=Deploy New");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Install New Applications", 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"));
+ assertEquals("Install New Applications",
+ selenium.getText(getPortletTitleLocation()));
// Test help link
- selenium.click("link=help");
+ selenium.click(getPortletHelpLocation());
selenium.waitForPageToLoad("30000");
selenium.isTextPresent("This portlet allows the user to deploy new applications on Geronimo.");
-
- logout();
}
}
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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,22 +29,18 @@
*/
@Test
public class DerbyLogViewerPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testDerbyLogViewerLink() throws Exception {
- login();
-
selenium.click("link=Server Logs");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Derby Log Viewer", selenium.getText(
- "xpath=/html/body/table[@id='rootfragment']/tbody/tr[2]/td/table/tbody/tr[2]/td[4]/table/tbody/tr[5]/td/table/tbody/tr[1]/td/div/table/tbody/tr/td[2]/table/tbody/tr/td[1]/strong"));
+ assertEquals("Derby Log Viewer",
+ selenium.getText(getPortletTitleLocation(4)));
// Test help link
- selenium.click("//tr[5]/td/table/tbody/tr[1]/td/div/table/tbody/tr/td[2]/table/tbody/tr/td[2]/a[1]");
+ selenium.click(getPortletHelpLocation(4));
selenium.waitForPageToLoad("30000");
selenium.isTextPresent("This portlet views the log file for Geronimo's internal database, Derby.");
-
- logout();
}
}
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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,18 +29,14 @@
*/
@Test
public class ImportExportPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testImportExportLink() throws Exception {
- login();
-
selenium.click("link=Plugins");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Create and Install Plugins", 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"));
-
- logout();
+ 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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,22 +29,18 @@
*/
@Test
public class InternalDBPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testInternalDBLink() throws Exception {
- login();
-
selenium.click("link=DB Info");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("DB Info", 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"));
+ assertEquals("DB Info",
+ selenium.getText(getPortletTitleLocation()));
// Test help link
- selenium.click("link=help");
+ selenium.click(getPortletHelpLocation());
selenium.waitForPageToLoad("30000");
selenium.isTextPresent("This page provides information about the internal database");
-
- logout();
}
}
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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,22 +29,18 @@
*/
@Test
public class JMSBrokerPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testJMSBrokerLink() throws Exception {
- login();
-
selenium.click("link=JMS Server");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("JMS Server Manager", 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"));
+ assertEquals("JMS Server Manager",
+ selenium.getText(getPortletTitleLocation()));
// Test help link
- selenium.click("//td[2]/table/tbody/tr/td[2]/a[1]");
+ selenium.click(getPortletHelpLocation());
selenium.waitForPageToLoad("30000");
selenium.isTextPresent("Shows the available JMS brokers");
-
- logout();
}
}
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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,22 +29,18 @@
*/
@Test
public class JMSConnectorPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testJMSConnectorLink() throws Exception {
- login();
-
selenium.click("link=JMS Server");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("JMS Network Listeners", selenium.getText(
- "xpath=/html/body/table[@id='rootfragment']/tbody/tr[2]/td/table/tbody/tr[2]/td[4]/table/tbody/tr[3]/td/table/tbody/tr[1]/td/div/table/tbody/tr/td[2]/table/tbody/tr/td[1]/strong"));
+ assertEquals("JMS Network Listeners",
+ selenium.getText(getPortletTitleLocation(2)));
// Test help link
- selenium.click("//tr[3]/td/table/tbody/tr[1]/td/div/table/tbody/tr/td[2]/table/tbody/tr/td[2]/a[1]");
+ selenium.click(getPortletHelpLocation(2));
selenium.waitForPageToLoad("30000");
selenium.isTextPresent("Shows all the network connectors configured for the currently available JMS brokers.");
-
- logout();
}
}
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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,18 +29,14 @@
*/
@Test
public class JMSResourcePortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testJMSResourceLink() throws Exception {
- login();
-
selenium.click("link=JMS Resources");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("JMS Resources", 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"));
-
- logout();
+ 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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,22 +29,18 @@
*/
@Test
public class JMXManagerPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testJMXManagerLink() throws Exception {
- login();
-
selenium.click("link=JMX Viewer");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("JMX 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"));
+ assertEquals("JMX Viewer",
+ selenium.getText(getPortletTitleLocation()));
// Test help link
- selenium.click("link=help");
+ selenium.click(getPortletHelpLocation());
selenium.waitForPageToLoad("30000");
selenium.isTextPresent("JMX Viewer Portlet Help");
-
- logout();
}
}
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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,22 +29,18 @@
*/
@Test
public class JavaSystemInfoPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testJavaSystemInfoLink() throws Exception {
- login();
-
- selenium.click("link=JVM");
+ selenium.click("link=Java System Info");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("System Property values for the Server JVM", 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"));
+ assertEquals("System Property values for the Server JVM",
+ selenium.getText(getPortletTitleLocation()));
// Test help link
- selenium.click("link=help");
+ selenium.click(getPortletHelpLocation());
selenium.waitForPageToLoad("30000");
selenium.isTextPresent("This page displays the values of the system properties available to the server process.");
-
- logout();
}
}
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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,18 +29,14 @@
*/
@Test
public class KeystoresPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testKeystoresLink() throws Exception {
- login();
-
selenium.click("link=Keystores");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Keystore Configuration", 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"));
-
- logout();
+ 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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,12 +29,10 @@
*/
@Test
public class LDAPManagerPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testLDAPManagerLink() throws Exception {
- login();
-
// TODO: Add a way to close problem connecting to server alert message.
// selenium.click("link=LDAP Viewer");
@@ -46,7 +44,5 @@
// selenium.click("link=help");
// selenium.waitForPageToLoad("30000");
// selenium.isTextPresent("The LDAP viewer portlet can be used to do the following");
-
- logout();
}
}
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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,12 +29,10 @@
*/
@Test
public class LinkCheckTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testServerInfoLink() throws Exception {
- login();
-
selenium.click("link=Information");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
@@ -42,10 +40,8 @@
assertTrue(selenium.isTextPresent("Geronimo Version"));
assertTrue(selenium.isTextPresent("Geronimo Start Time"));
- assertEquals("Server Info", 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"));
-
- logout();
+ assertEquals("Server Info",
+ selenium.getText(getPortletTitleLocation()));
}
}
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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,22 +29,18 @@
*/
@Test
public class LogManagerPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testLogManagerLink() throws Exception {
- login();
-
selenium.click("link=Server Logs");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Log Manager", 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"));
+ assertEquals("Log Manager",
+ selenium.getText(getPortletTitleLocation()));
// Test help link
- selenium.click("//td[2]/table/tbody/tr/td[2]/a[1]");
+ selenium.click(getPortletHelpLocation());
selenium.waitForPageToLoad("30000");
selenium.isTextPresent("This portlet allows the user to select a configuration file for logging");
-
- logout();
}
}
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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,22 +29,18 @@
*/
@Test
public class LogViewerPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testLogViewerLink() throws Exception {
- login();
-
selenium.click("link=Server Logs");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Server Log Viewer", selenium.getText(
- "xpath=/html/body/table[@id='rootfragment']/tbody/tr[2]/td/table/tbody/tr[2]/td[4]/table/tbody/tr[3]/td/table/tbody/tr[1]/td/div/table/tbody/tr/td[2]/table/tbody/tr/td[1]/strong"));
+ assertEquals("Server Log Viewer",
+ selenium.getText(getPortletTitleLocation(2)));
// Test help link
- selenium.click("//tr[3]/td/table/tbody/tr[1]/td/div/table/tbody/tr/td[2]/table/tbody/tr/td[2]/a[1]");
+ selenium.click(getPortletHelpLocation(2));
selenium.waitForPageToLoad("30000");
selenium.isTextPresent("This portlet displays the Geronimo server log");
-
- logout();
}
}
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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,22 +29,18 @@
*/
@Test
public class RepositoryViewPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testRepositoryViewLink() throws Exception {
- login();
-
- selenium.click("link=Common Libs");
+ selenium.click("link=Repository");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Repository 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"));
+ assertEquals("Repository Viewer",
+ selenium.getText(getPortletTitleLocation()));
// Test help link
- selenium.click("link=help");
+ selenium.click(getPortletHelpLocation());
selenium.waitForPageToLoad("30000");
selenium.isTextPresent("This page displays the artifacts installed in the server's repository.");
-
- logout();
}
}
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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,22 +29,18 @@
*/
@Test
public class RunSQLPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testRunSQLLink() throws Exception {
- login();
-
selenium.click("link=DB Manager");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Run SQL", selenium.getText(
- "xpath=/html/body/table[@id='rootfragment']/tbody/tr[2]/td/table/tbody/tr[2]/td[4]/table/tbody/tr[3]/td/table/tbody/tr[1]/td/div/table/tbody/tr/td[2]/table/tbody/tr/td[1]/strong"));
+ assertEquals("Run SQL",
+ selenium.getText(getPortletTitleLocation(2)));
// Test help link
- selenium.click("//tr[3]/td/table/tbody/tr[1]/td/div/table/tbody/tr/td[2]/table/tbody/tr/td[2]/a[1]");
+ selenium.click(getPortletHelpLocation(2));
selenium.waitForPageToLoad("30000");
selenium.isTextPresent("Allows the user to run SQL commands");
-
- logout();
}
}
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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,22 +29,18 @@
*/
@Test
public class SEGroupsPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testSEGroupsLink() throws Exception {
- login();
-
- selenium.click("link=Console Realm");
+ selenium.click("link=Users and Groups");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Console Realm Groups", selenium.getText(
- "xpath=/html/body/table[@id='rootfragment']/tbody/tr[2]/td/table/tbody/tr[2]/td[4]/table/tbody/tr[3]/td/table/tbody/tr[1]/td/div/table/tbody/tr/td[2]/table/tbody/tr/td[1]/strong"));
+ assertEquals("Console Realm Groups",
+ selenium.getText(getPortletTitleLocation(2)));
// Test help link
- selenium.click("//tr[3]/td/table/tbody/tr[1]/td/div/table/tbody/tr/td[2]/table/tbody/tr/td[2]/a[1]");
+ selenium.click(getPortletHelpLocation(2));
selenium.waitForPageToLoad("30000");
selenium.isTextPresent("This portlet lists all the Console Realm groups");
-
- logout();
}
}
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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,22 +29,18 @@
*/
@Test
public class SEUsersPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testSEUsersLink() throws Exception {
- login();
-
- selenium.click("link=Console Realm");
+ selenium.click("link=Users and Groups");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Console Realm Users", 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"));
+ assertEquals("Console Realm Users",
+ selenium.getText(getPortletTitleLocation()));
// Test help link
- selenium.click("//td[2]/table/tbody/tr/td[2]/a[1]");
+ selenium.click(getPortletHelpLocation());
selenium.waitForPageToLoad("30000");
selenium.isTextPresent("This portlet lists all the console realm users");
-
- logout();
}
}
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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,18 +29,14 @@
*/
@Test
public class SecurityRealmPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testSecurityRealmLink() throws Exception {
- login();
-
selenium.click("link=Security Realms");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Security Realms", 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"));
-
- logout();
+ 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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,22 +29,18 @@
*/
@Test
public class ServerInfoPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testServerInfoLink() throws Exception {
- login();
-
selenium.click("link=Information");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Server Info", 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"));
+ assertEquals("Server Info",
+ selenium.getText(getPortletTitleLocation()));
// Test help link
- selenium.click("link=help");
+ selenium.click(getPortletHelpLocation());
selenium.waitForPageToLoad("30000");
selenium.isTextPresent("This page provides information about the uptime of the server and the resources being used by the JVM.");
-
- logout();
}
}
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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,22 +29,18 @@
*/
@Test
public class ServerManagerPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testServerManagerLink() throws Exception {
- login();
-
selenium.click("link=Shutdown");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Server Manager", 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"));
+ assertEquals("Server Manager",
+ selenium.getText(getPortletTitleLocation()));
// Test help link
- selenium.click("link=help");
+ selenium.click(getPortletHelpLocation());
selenium.waitForPageToLoad("30000");
selenium.isTextPresent("This portlet give the admin the ability to remotely shutdown the Geronimo server.");
-
- logout();
}
}
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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -46,21 +46,23 @@
@Test
public void testClickSomeLinks() throws Exception {
- login();
-
- selenium.click("link=Information");
- selenium.waitForPageToLoad("30000");
- assertEquals("Geronimo Console", selenium.getTitle());
-
- selenium.click("link=JVM");
- selenium.waitForPageToLoad("30000");
- assertEquals("Geronimo Console", selenium.getTitle());
-
- selenium.click("link=DB Info");
- selenium.waitForPageToLoad("30000");
- assertEquals("Geronimo Console", selenium.getTitle());
-
- logout();
+ try {
+ login();
+
+ selenium.click("link=Information");
+ selenium.waitForPageToLoad("30000");
+ assertEquals("Geronimo Console", selenium.getTitle());
+
+ selenium.click("link=Java System Info");
+ selenium.waitForPageToLoad("30000");
+ assertEquals("Geronimo Console", selenium.getTitle());
+
+ selenium.click("link=DB Info");
+ selenium.waitForPageToLoad("30000");
+ 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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,18 +29,14 @@
*/
@Test
public class ThreadPoolPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testThreadPoolLink() throws Exception {
- login();
-
selenium.click("link=Thread Pools");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Thread Pool Configuration", 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"));
-
- logout();
+ 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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,22 +29,18 @@
*/
@Test
public class WebAccessLogViewerPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testWebAccessLogViewerLink() throws Exception {
- login();
-
selenium.click("link=Server Logs");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Web Access Log Viewer", selenium.getText(
- "xpath=/html/body/table[@id='rootfragment']/tbody/tr[2]/td/table/tbody/tr[2]/td[4]/table/tbody/tr[7]/td/table/tbody/tr[1]/td/div/table/tbody/tr/td[2]/table/tbody/tr/td[1]/strong"));
+ assertEquals("Web Access Log Viewer",
+ selenium.getText(getPortletTitleLocation(3)));
// Test help link
- selenium.click("//tr[7]/td/table/tbody/tr[1]/td/div/table/tbody/tr/td[2]/table/tbody/tr/td[2]/a[1]");
+ selenium.click(getPortletHelpLocation(3));
selenium.waitForPageToLoad("30000");
selenium.isTextPresent("This portlet displays and filters the Jetty log file.");
-
- logout();
}
}
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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,22 +29,18 @@
*/
@Test
public class WebManagerPortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testWebManagerLink() throws Exception {
- login();
-
selenium.click("link=Web Server");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Web Server Manager", 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"));
+ assertEquals("Web Server Manager",
+ selenium.getText(getPortletTitleLocation()));
// Test help link
- selenium.click("//td[2]/table/tbody/tr/td[2]/a[1]");
+ selenium.click(getPortletHelpLocation());
selenium.waitForPageToLoad("30000");
selenium.isTextPresent("Geronimo Console will collect statistics on the number of requests received");
-
- logout();
}
}
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=583925&r1=583924&r2=583925&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 Oct 11 12:28:04 2007
@@ -29,24 +29,19 @@
*/
@Test
public class WelcomePortletTest
- extends ConsoleTestSupport
+ extends BasicConsoleTestSupport
{
@Test
public void testWelcomeLink() throws Exception {
- login();
-
- selenium.click("link=JVM");
+ selenium.click("link=Java System Info");
selenium.waitForPageToLoad("30000");
selenium.click("link=Welcome");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Welcome", 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"));
+ assertEquals("Welcome", selenium.getText(getPortletTitleLocation()));
// Test help link
- selenium.click("link=help");
+ selenium.click(getPortletHelpLocation());
selenium.waitForPageToLoad("30000");
selenium.isTextPresent("This is the help for the Geronimo Administration Console Welcome.");
-
- logout();
}
}