Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 133A43078 for ; Thu, 28 Apr 2011 23:00:33 +0000 (UTC) Received: (qmail 24412 invoked by uid 500); 28 Apr 2011 23:00:33 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 24286 invoked by uid 500); 28 Apr 2011 23:00:32 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 24279 invoked by uid 99); 28 Apr 2011 23:00:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Apr 2011 23:00:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Apr 2011 23:00:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7ED9A23889B1; Thu, 28 Apr 2011 23:00:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1097649 - in /geronimo/server/trunk: testsuite/console-testsuite/ testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ testsuite/console-testsuite/basic/src/test/resources/ testsupport/testsupport-selenium... Date: Thu, 28 Apr 2011 23:00:08 -0000 To: scm@geronimo.apache.org From: xiaming@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110428230009.7ED9A23889B1@eris.apache.org> Author: xiaming Date: Thu Apr 28 23:00:07 2011 New Revision: 1097649 URL: http://svn.apache.org/viewvc?rev=1097649&view=rev Log: GERONIMO-5787 fix admin console testsuite problem, patch provided by LiWenQin 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/AssemblyPortletTest.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/CreatePluginPortletTest.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/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/console-testsuite/basic/src/test/resources/testng.xml geronimo/server/trunk/testsuite/console-testsuite/pom.xml geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/ExtendedSelenium.java geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/SeleniumTestSupport.java geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/console/ConsoleTestSupport.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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class ApacheConfigPortletTest { @Test public void testApacheConfigLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Server")); + selenium.click("link=Apache HTTP"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/AssemblyPortletTest.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/AssemblyPortletTest.java?rev=1097649&r1=1097648&r2=1097649&view=diff ============================================================================== --- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/AssemblyPortletTest.java (original) +++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/AssemblyPortletTest.java Thu Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class AssemblyPortletTest { @Test public void testAssemblyLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Applications")); + //selenium.click(this.getNavigationTreeNodeLocation("Applications")); selenium.click("link=Plugins"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class CertificationAuthorityPortl { @Test public void testCertificationAuthorityLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Security")); + selenium.click("link=Certificate Authority"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class ConfigManagerPortletAppClie { @Test public void testConfigManagerAppClientLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Applications")); + selenium.click("link=App Clients"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -26,16 +26,13 @@ import org.testng.annotations.Test; * * @version $Rev$ $Date$ */ -public class ConfigManagerPortletEARTest - extends BasicConsoleTestSupport +public class ConfigManagerPortletEARTest extends BasicConsoleTestSupport { - @Test - public void testConfigManagerEARLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Applications")); - selenium.click("link=Application EARs"); - waitForPageLoad(); - assertEquals("Geronimo Console", selenium.getTitle()); - assertEquals("Installed Application EARs", - selenium.getText(getPortletTitleLocation())); - } + @Test + public void testConfigManagerEARLink() throws Exception { + selenium.click("link=Applications (EAR)"); + 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class ConfigManagerPortletEJBTest { @Test public void testConfigManagerEJBLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Applications")); + selenium.click("link=EJB JARs"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class ConfigManagerPortletRARTest { @Test public void testConfigManagerRARLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Applications")); + selenium.click("link=J2EE Connectors"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class ConfigManagerPortletSysModu { @Test public void testConfigManagerSysModulesLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Applications")); + selenium.click("link=System Modules"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,8 +31,8 @@ public class ConfigManagerPortletWARTest { @Test public void testConfigManagerWARLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Applications")); - selenium.click("link=Web App WARs"); + + selenium.click("link=Web Apps (WAR)"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); assertEquals("Installed Web Applications", 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class ConnectorPortletTest { @Test public void testConnectorLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Server")); + selenium.click("link=Web Server"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/CreatePluginPortletTest.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/CreatePluginPortletTest.java?rev=1097649&r1=1097648&r2=1097649&view=diff ============================================================================== --- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/CreatePluginPortletTest.java (original) +++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/CreatePluginPortletTest.java Thu Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class CreatePluginPortletTest { @Test public void testCreatePluginLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Applications")); + selenium.click("link=Plugins"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,12 +31,16 @@ public class DBViewerPortletTest { @Test public void testDBViewerLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Embedded DB")); + //selenium.click(this.getNavigationTreeNodeLocation("Embedded DB")); + //selenium.click("link=DB Info"); + //waitForPageLoad(); + //assertEquals("Geronimo Console", selenium.getTitle()); + //assertEquals("DB Info", selenium.getText(getPortletTitleLocation())); selenium.click("link=DB Manager"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); - assertEquals("DB Viewer", - selenium.getText(getPortletTitleLocation())); + assertEquals("DB Viewer", selenium.getText(getPortletTitleLocation())); + assertEquals("Run SQL", selenium.getText(getPortletTitleLocation(2))); // Test help link selenium.click(getPortletHelpLocation()); waitForPageLoad(); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,11 +31,11 @@ public class DatabasePoolPortletTest { @Test public void testDatabasePoolLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Services")); - selenium.click("link=Database Pools"); + //selenium.click(this.getNavigationTreeNodeLocation("Services")); + selenium.click("link=Datasources"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); - assertEquals("Database Pools", - selenium.getText(getPortletTitleLocation())); + assertEquals("Database Pools", selenium.getText(getPortletTitleLocation())); + assertEquals("Run SQL", selenium.getText(getPortletTitleLocation(2))); } } 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class DeploymentPortletTest { @Test public void testDeploymentLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Applications")); + selenium.click("link=Deployer"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -26,20 +26,21 @@ import org.testng.annotations.Test; * * @version $Rev$ $Date$ */ -public class DerbyLogViewerPortletTest - extends BasicConsoleTestSupport +public class DerbyLogViewerPortletTest extends BasicConsoleTestSupport { - @Test - public void testDerbyLogViewerLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Server")); - selenium.click("link=Server Logs"); - waitForPageLoad(); - assertEquals("Geronimo Console", selenium.getTitle()); - assertEquals("Derby Log Viewer", - selenium.getText(getPortletTitleLocation(4))); - // Test help link - selenium.click(getPortletHelpLocation(4)); - waitForPageLoad(); - selenium.isTextPresent("This portlet views the log file for Geronimo's internal database, Derby."); - } + @Test + public void testDerbyLogViewerLink() throws Exception { + //selenium.click(this.getNavigationTreeNodeLocation("Server")); + //selenium.click("link=Server Logs"); + selenium.click("link=Derby Logs"); + waitForPageLoad(); + assertEquals("Geronimo Console", selenium.getTitle()); + assertEquals("Log Manager", selenium.getText(getPortletTitleLocation())); + assertEquals("Server Log Viewer", selenium.getText(getPortletTitleLocation(2))); + assertEquals("Web Access Log Viewer", selenium.getText(getPortletTitleLocation(3))); + // Test help link + selenium.click(getPortletHelpLocation()); + 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class ImportExportPortletTest { @Test public void testImportExportLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Applications")); + selenium.click("link=Plugins"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class InternalDBPortletTest { @Test public void testInternalDBLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Embedded DB")); + //selenium.click(this.getNavigationTreeNodeLocation("Embedded DB")); selenium.click("link=DB Info"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class JMSBrokerPortletTest { @Test public void testJMSBrokerLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Server")); + //selenium.click(this.getNavigationTreeNodeLocation("Server")); selenium.click("link=JMS Server"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class JMSConnectorPortletTest { @Test public void testJMSConnectorLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Server")); + //selenium.click(this.getNavigationTreeNodeLocation("Server")); selenium.click("link=JMS Server"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class JMSResourcePortletTest { @Test public void testJMSResourceLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Services")); + //selenium.click(this.getNavigationTreeNodeLocation("Services")); selenium.click("link=JMS Resources"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class JMXManagerPortletTest { @Test public void testJMXManagerLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Debug Views")); + //selenium.click(this.getNavigationTreeNodeLocation("Debug Views")); selenium.click("link=JMX Viewer"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class JavaSystemInfoPortletTest { @Test public void testJavaSystemInfoLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Server")); + //selenium.click(this.getNavigationTreeNodeLocation("Server")); selenium.click("link=Java System Info"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class KeystoresPortletTest { @Test public void testKeystoresLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Security")); + selenium.click("link=Keystores"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -29,12 +29,12 @@ public class LinkCheckTest { @Test public void testServerInfoLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Server")); - selenium.click("link=Information"); + + selenium.click("link=Server Information"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); - selenium.selectFrame("index=0"); + //selenium.selectFrame("index=0"); assertTrue(selenium.isTextPresent("Version")); assertTrue(selenium.isTextPresent("Start Time")); assertTrue(selenium.isTextPresent("Up Time")); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class LogManagerPortletTest { @Test public void testLogManagerLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Server")); + selenium.click("link=Server Logs"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); @@ -40,7 +40,7 @@ public class LogManagerPortletTest // Test help link selenium.click(getPortletHelpLocation()); waitForPageLoad(); - selenium.selectFrame("index=0"); + //selenium.selectFrame("index=0"); assertTrue(selenium.isTextPresent("This portlet allows the user to temporarily select a configuration file for logging")); selenium.selectWindow("null"); } 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class LogViewerPortletTest { @Test public void testLogViewerLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Server")); + selenium.click("link=Server Logs"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); @@ -40,7 +40,7 @@ public class LogViewerPortletTest // Test help link selenium.click(getPortletHelpLocation(2)); waitForPageLoad(); - selenium.selectFrame("index=0"); + //selenium.selectFrame("index=0"); assertTrue(selenium.isTextPresent("This portlet displays the Geronimo server log")); selenium.selectWindow("null"); } 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class RepositoryViewPortletTest { @Test public void testRepositoryViewLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Services")); + selenium.click("link=Repository"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); @@ -40,7 +40,7 @@ public class RepositoryViewPortletTest // Test help link selenium.click(getPortletHelpLocation()); waitForPageLoad(); - selenium.selectFrame("index=0"); + //selenium.selectFrame("index=0"); assertTrue(selenium.isTextPresent("This page displays the artifacts installed in the server's repository.")); selenium.selectWindow("null"); } 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class RunSQLPortletTest { @Test public void testRunSQLLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Embedded DB")); + //selenium.click(this.getNavigationTreeNodeLocation("Embedded DB")); selenium.click("link=DB Manager"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class SEGroupsPortletTest { @Test public void testSEGroupsLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Security")); + selenium.click("link=Users and Groups"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class SEUsersPortletTest { @Test public void testSEUsersLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Security")); + selenium.click("link=Users and Groups"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,13 +31,13 @@ public class SecurityRealmPortletTest { @Test public void testSecurityRealmLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Security")); + selenium.click("link=Security Realms"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); assertEquals("Security Realms", selenium.getText(getPortletTitleLocation())); - selenium.selectFrame("index=0"); + //selenium.selectFrame("index=0"); assertTrue(selenium.isTextPresent("geronimo-admin")); //return to main window selenium.selectWindow("null"); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,8 +31,8 @@ public class ServerInfoPortletTest { @Test public void testServerInfoLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Server")); - selenium.click("link=Information"); + //selenium.click(this.getNavigationTreeNodeLocation("Server")); + selenium.click("link=Server Information"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); assertEquals("Server Info", 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class ServerManagerPortletTest { @Test public void testServerManagerLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Server")); + selenium.click("link=Shutdown"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -38,8 +38,7 @@ public class SimpleLoginTest public void testClickSomeLinks() throws Exception { try { login(); - selenium.click(getNavigationTreeNodeLocation("Server")); - selenium.click("link=Information"); + selenium.click("link=Server Information"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); @@ -48,7 +47,7 @@ public class SimpleLoginTest waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); selenium.open("/console"); - selenium.click(getNavigationTreeNodeLocation("Embedded DB")); + selenium.click("link=DB Info"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class ThreadPoolPortletTest { @Test public void testThreadPoolLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Server")); + selenium.click("link=Thread Pools"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class WebAccessLogViewerPortletTe { @Test public void testWebAccessLogViewerLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Server")); + selenium.click("link=Server Logs"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,7 +31,7 @@ public class WebManagerPortletTest { @Test public void testWebManagerLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Server")); + selenium.click("link=Web Server"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); 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=1097649&r1=1097648&r2=1097649&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 Apr 28 23:00:07 2011 @@ -31,16 +31,16 @@ public class WelcomePortletTest { @Test public void testWelcomeLink() throws Exception { - selenium.click(this.getNavigationTreeNodeLocation("Server")); - selenium.click("link=Java System Info"); - waitForPageLoad(); + selenium.click("link=Welcome"); waitForPageLoad(); assertEquals("Geronimo Console", selenium.getTitle()); assertEquals("Welcome", selenium.getText(getPortletTitleLocation())); + // Test help link selenium.click(getPortletHelpLocation()); waitForPageLoad(); - selenium.isTextPresent("This is the help for the Geronimo Administration Console Welcome."); + assertTrue(selenium.isTextPresent("Welcome to the Apache Geronimo")); + assertTrue(selenium.isTextPresent("The welcome portlet is the first page that users see when they log in")); } } Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/resources/testng.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/resources/testng.xml?rev=1097649&r1=1097648&r2=1097649&view=diff ============================================================================== --- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/resources/testng.xml (original) +++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/resources/testng.xml Thu Apr 28 23:00:07 2011 @@ -24,9 +24,41 @@ + + + + + + Modified: geronimo/server/trunk/testsuite/console-testsuite/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/pom.xml?rev=1097649&r1=1097648&r2=1097649&view=diff ============================================================================== --- geronimo/server/trunk/testsuite/console-testsuite/pom.xml (original) +++ geronimo/server/trunk/testsuite/console-testsuite/pom.xml Thu Apr 28 23:00:07 2011 @@ -56,12 +56,11 @@ ${project.build.testOutputDirectory}/testng.xml - - - geronimoVersion - ${project.version} - - + + ${project.version} + ${project.build.testOutputDirectory}/link.properties + + 0 Modified: geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/ExtendedSelenium.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/ExtendedSelenium.java?rev=1097649&r1=1097648&r2=1097649&view=diff ============================================================================== --- geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/ExtendedSelenium.java (original) +++ geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/ExtendedSelenium.java Thu Apr 28 23:00:07 2011 @@ -21,7 +21,9 @@ package org.apache.geronimo.testsupport; import com.thoughtworks.selenium.Selenium; import com.thoughtworks.selenium.DefaultSelenium; +import com.thoughtworks.selenium.SeleniumException; +import org.apache.geronimo.testsupport.console.ConsoleTestSupport; import org.openqa.selenium.server.SeleniumServer; /** @@ -29,23 +31,44 @@ import org.openqa.selenium.server.Seleni * * @version $Rev$ $Date$ */ -public class ExtendedSelenium - extends DefaultSelenium +public class ExtendedSelenium extends DefaultSelenium { - public ExtendedSelenium(final String serverHost, final int serverPort, final String browserStartCommand, final String browserURL) { - super(serverHost, serverPort, browserStartCommand, browserURL); - } - - /** - * Remove a cookie from the browser. - * - *

- * This requires some custom hooks in user-extensions.js. - * When using the selenium-maven-plugin the defaults should be merged - * into the user-extensions.js which is loaded by the server. - *

- */ - public void removeCookie(final String name, final String path) { - this.getEval("selenium.removeCookie('" + name + "', '" + path + "')"); - } + public ExtendedSelenium(final String serverHost, final int serverPort, final String browserStartCommand, final String browserURL) { + super(serverHost, serverPort, browserStartCommand, browserURL); + } + + /** + * Remove a cookie from the browser. + * + *

+ * This requires some custom hooks in user-extensions.js. + * When using the selenium-maven-plugin the defaults should be merged + * into the user-extensions.js which is loaded by the server. + *

+ */ + public void removeCookie(final String name, final String path) { + this.getEval("selenium.removeCookie('" + name + "', '" + path + "')"); + } + + // Override click method in order to add link converting logic according to static table in ConsoleTestsupport.java + @Override + public void click(String locator) { + try { + super.click(locator); + } + catch (SeleniumException se) { + if (se.getMessage().lastIndexOf("not found") > 0) { + String linkKey = locator; + if (ConsoleTestSupport.link2URL.containsKey(linkKey)) { + super.open(ConsoleTestSupport.link2URL.get(linkKey).toString()); + } + else { + throw se; + } + } + else { + throw se; + } + } + } } Modified: geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/SeleniumTestSupport.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/SeleniumTestSupport.java?rev=1097649&r1=1097648&r2=1097649&view=diff ============================================================================== --- geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/SeleniumTestSupport.java (original) +++ geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/SeleniumTestSupport.java Thu Apr 28 23:00:07 2011 @@ -33,8 +33,7 @@ import org.testng.annotations.AfterSuite * * @version $Rev$ $Date$ */ -public class SeleniumTestSupport - extends TestSupport +public class SeleniumTestSupport extends TestSupport { protected static ExtendedSelenium selenium; Modified: geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/console/ConsoleTestSupport.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/console/ConsoleTestSupport.java?rev=1097649&r1=1097648&r2=1097649&view=diff ============================================================================== --- geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/console/ConsoleTestSupport.java (original) +++ geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/console/ConsoleTestSupport.java Thu Apr 28 23:00:07 2011 @@ -22,6 +22,12 @@ package org.apache.geronimo.testsupport. import java.util.HashMap; import java.util.Map; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; + import org.apache.geronimo.testsupport.SeleniumTestSupport; /** @@ -29,58 +35,105 @@ import org.apache.geronimo.testsupport.S * * @version $Rev$ $Date$ */ -public abstract class ConsoleTestSupport - extends SeleniumTestSupport +public abstract class ConsoleTestSupport extends SeleniumTestSupport { - protected void login() throws Exception { - selenium.open("/"); - waitForPageLoad(); - - assertEquals("Apache Geronimo", selenium.getTitle()); - - selenium.deleteAllVisibleCookies(); - - selenium.click("link=Console"); - waitForPageLoad(); - - assertEquals("Geronimo Console Login", selenium.getTitle()); - - selenium.type("j_username", "system"); - selenium.type("j_password", "manager"); - selenium.click("submit"); - waitForPageLoad(); - assertEquals("Geronimo Console", selenium.getTitle()); - } - - protected void logout() throws Exception { - selenium.click("//a[contains(@href, '/console/logout.jsp')]"); - waitForPageLoad(); - - assertEquals("Geronimo Console Login", selenium.getTitle()); - - //selenium.removeCookie("JSESSIONID", "/"); - } - protected String getNavigationTreeNodeLocation(String navigationTreeLabel){ - //map label to id according to treeData - Map navigationTreeLabel2Index=new HashMap(); - navigationTreeLabel2Index.put("Welcome",0); - navigationTreeLabel2Index.put("Server",1); - navigationTreeLabel2Index.put("Services",2); - navigationTreeLabel2Index.put("Applications",3); - navigationTreeLabel2Index.put("Security",4); - navigationTreeLabel2Index.put("Debug Views",5); - navigationTreeLabel2Index.put("Embedded DB",6); - //get tree node id dynamicly - String script=" var navigationTree=this.browserbot.getCurrentWindow().dijit.byId('navigationTree');"; - script=script+"var wrapperNode =navigationTree._itemNodesMap["+navigationTreeLabel2Index.get(navigationTreeLabel).intValue()+"];"; - script+="wrapperNode[0].id;"; - String navigationTreeNodeId=selenium.getEval(script); - - //collapse the tree node - script=" var navigationTree=this.browserbot.getCurrentWindow().dijit.byId('navigationTree');"; - script=script+"var wrapperNode =navigationTree._itemNodesMap["+navigationTreeLabel2Index.get(navigationTreeLabel).intValue()+"];"; - script+="navigationTree._collapseNode(wrapperNode[0]);"; - selenium.getEval(script); - return "xpath=//div[@id='"+navigationTreeNodeId+"']/div[1]/img"; + // Setup a link map in order to get right url when the link is not found. + public static final Map link2URL; + public static String fileName; + static { + link2URL = new HashMap(); + fileName = System.getProperty("linkPropertyFile"); + try { + File file = new File(fileName); + FileReader f_reader; + try { + f_reader = new FileReader(file); + BufferedReader reader = new BufferedReader(f_reader); + String str = reader.readLine(); + while (str != null) { + if(!str.startsWith("#")) { + String[] lU = str.split(";"); + if(lU.length!=2) { + throw new IOException("File 'link.properties' formats error.Length is:"+lU.length+lU[0]+"aaa"); + } + link2URL.put(lU[0], lU[1]); + } + str = reader.readLine(); + } + + /* + link2URL.put("link=Welcome", "/console/portal/0/Welcome"); + // under Application Server + link2URL.put("link=Server Information", "/console/portal/1-1-1/Application Server/System Information/Server Information"); + link2URL.put("link=Java System Info", "/console/portal/1-1-2/Application Server/System Information/Java System Info"); + link2URL.put("link=Thread Pools", "/console/portal/1-1-4/Application Server/System Information/Thread Pools"); + link2URL.put("link=Web Server", "/console/portal/1-2/Application Server/Web Server"); + link2URL.put("link=EJB Server", "/console/portal/1-4/Application Server/EJB Server"); + link2URL.put("link=Shutdown", "/console/portal/1-6/Application Server/Shutdown"); + // under Applications + link2URL.put("link=Deployer", "/console/portal/2-1/Applications/Deployer"); + link2URL.put("link=Web App WARs", "/console/portal/2-2-1/Applications/User Assets/Web App WARs"); + link2URL.put("link=Application EARs", "/console/portal/2-2-2/Applications/User Assets/Application EARs"); + link2URL.put("link=EJB JARs", "/console/portal/2-2-3/Applications/User Assets/EJB JARs"); + link2URL.put("link=App Clients", "/console/portal/2-2-4/Applications/User Assets/App Clients"); + link2URL.put("link=Application EBAs", "/console/portal/2-2-5/Applications/User Assets/Application EBAs"); + // under Resources + link2URL.put("link=J2EE Connectors", "/console/portal/3-3/Resources/J2EE Connectors"); + link2URL.put("link=JAR Aliases", "/console/portal/3-4/Resources/JAR Aliases"); + link2URL.put("link=Repository", "/console/portal/3-5/Resources/Repository"); + link2URL.put("link=Apache HTTP", "/console/portal/3-6/Resources/Apache HTTP"); + link2URL.put("link=System Modules","/console/portal/3-7/Resources/System Modules"); + link2URL.put("link=Plugins", "/console/portal/3-8/Resources/Plugins"); + link2URL.put("link=OSGI Bundles", "/console/portal/3-10/Applications/OSGI Bundles"); + // under Security + link2URL.put("link=Users and Groups", "/console/portal/4-1/Security/Users and Groups"); + link2URL.put("link=Keystores", "/console/portal/4-2/Security/Keystores"); + link2URL.put("link=Certificate Authority", "/console/portal/4-3/Security/Certificate Authority"); + link2URL.put("link=Security Realms", "/console/portal/4-4/Security/Security Realms"); + // under Monitoring and Troubleshooting + link2URL.put("link=Server Logs", "/console/portal/5-2-2/Monitoring and Troubleshooting/Logs/Server Logs"); + */ + } + catch (FileNotFoundException e) { + // TODO Auto-generated catch block + System.out.println("!!!!!!!!!!!!!!!!!!!not find link.properties!"); + e.printStackTrace(); + } + } + catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } + + protected void login() throws Exception { + selenium.open("/"); + waitForPageLoad(); + + assertEquals("Apache Geronimo", selenium.getTitle()); + + selenium.deleteAllVisibleCookies(); + + selenium.click("link=Console"); + waitForPageLoad(); + + assertEquals("Geronimo Console Login", selenium.getTitle()); + + selenium.type("j_username", "system"); + selenium.type("j_password", "manager"); + selenium.click("submit"); + waitForPageLoad(); + assertEquals("Geronimo Console", selenium.getTitle()); + } + + protected void logout() throws Exception { + selenium.open("/console"); + selenium.click("//a[contains(@href, '/console/logout.jsp')]"); + waitForPageLoad(); + + assertEquals("Geronimo Console Login", selenium.getTitle()); + + //selenium.removeCookie("JSESSIONID", "/"); + } + } \ No newline at end of file