Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 95645 invoked from network); 20 Jan 2007 18:24:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Jan 2007 18:24:41 -0000 Received: (qmail 98018 invoked by uid 500); 20 Jan 2007 18:24:47 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 97884 invoked by uid 500); 20 Jan 2007 18:24:47 -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 97870 invoked by uid 99); 20 Jan 2007 18:24:47 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Jan 2007 10:24:47 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Jan 2007 10:24:39 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 4176E1A981A; Sat, 20 Jan 2007 10:23:34 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r498150 - /geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ Date: Sat, 20 Jan 2007 18:23:33 -0000 To: scm@geronimo.apache.org From: ccardona@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070120182334.4176E1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ccardona Date: Sat Jan 20 10:23:32 2007 New Revision: 498150 URL: http://svn.apache.org/viewvc?view=rev&rev=498150 Log: - Test 'help' links - Test other portlet titles Modified: 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/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/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/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/LDAPManagerPortletTest.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/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/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/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?view=diff&rev=498150&r1=498149&r2=498150 ============================================================================== --- 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 Sat Jan 20 10:23:32 2007 @@ -37,9 +37,12 @@ selenium.click("link=Web Server"); selenium.waitForPageToLoad("30000"); assertEquals("Geronimo Console", selenium.getTitle()); - // TODO: Update xpath - // assertEquals("Network Listeners", 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("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")); + // 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.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?view=diff&rev=498150&r1=498149&r2=498150 ============================================================================== --- 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 Sat Jan 20 10:23:32 2007 @@ -39,7 +39,11 @@ 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")); - + // Test help link + selenium.click("//td[2]/table/tbody/tr/td[2]/a[1]"); + 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/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?view=diff&rev=498150&r1=498149&r2=498150 ============================================================================== --- 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 Sat Jan 20 10:23:32 2007 @@ -39,6 +39,10 @@ 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")); + // Test help link + selenium.click("link=help"); + 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?view=diff&rev=498150&r1=498149&r2=498150 ============================================================================== --- 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 Sat Jan 20 10:23:32 2007 @@ -37,9 +37,12 @@ selenium.click("link=Server Logs"); selenium.waitForPageToLoad("30000"); assertEquals("Geronimo Console", selenium.getTitle()); - // TODO: Update xpath - // 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[1]/td/table/tbody/tr[1]/td/div/table/tbody/tr/td[2]/table/tbody/tr/td[1]/strong")); + 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")); + // 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.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/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?view=diff&rev=498150&r1=498149&r2=498150 ============================================================================== --- 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 Sat Jan 20 10:23:32 2007 @@ -39,6 +39,10 @@ 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")); + // Test help link + selenium.click("link=help"); + 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?view=diff&rev=498150&r1=498149&r2=498150 ============================================================================== --- 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 Sat Jan 20 10:23:32 2007 @@ -39,7 +39,11 @@ 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")); - + // Test help link + selenium.click("//td[2]/table/tbody/tr/td[2]/a[1]"); + 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?view=diff&rev=498150&r1=498149&r2=498150 ============================================================================== --- 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 Sat Jan 20 10:23:32 2007 @@ -37,9 +37,12 @@ selenium.click("link=JMS Server"); selenium.waitForPageToLoad("30000"); assertEquals("Geronimo Console", selenium.getTitle()); - // TODO: Update xpath - // 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[1]/td/table/tbody/tr[1]/td/div/table/tbody/tr/td[2]/table/tbody/tr/td[1]/strong")); + 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")); + // 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.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/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?view=diff&rev=498150&r1=498149&r2=498150 ============================================================================== --- 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 Sat Jan 20 10:23:32 2007 @@ -39,7 +39,11 @@ 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")); - + // Test help link + selenium.click("link=help"); + 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?view=diff&rev=498150&r1=498149&r2=498150 ============================================================================== --- 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 Sat Jan 20 10:23:32 2007 @@ -39,6 +39,10 @@ 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")); + // Test help link + selenium.click("link=help"); + 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/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?view=diff&rev=498150&r1=498149&r2=498150 ============================================================================== --- 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 Sat Jan 20 10:23:32 2007 @@ -41,6 +41,10 @@ // assertEquals("Geronimo Console", selenium.getTitle()); // assertEquals("LDAP Viewer", selenium.getText( // "xpath=/html/body/table[@id='rootfragment']/tbody/tr[2]/td/table/tbody/tr[2]/td[4]/table/tbody/tr[1]/td/table/tbody/tr[1]/td/div/table/tbody/tr/td[2]/table/tbody/tr/td[1]/strong")); + // Test help link + // selenium.click("link=help"); + // selenium.waitForPageToLoad("30000"); + // 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/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?view=diff&rev=498150&r1=498149&r2=498150 ============================================================================== --- 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 Sat Jan 20 10:23:32 2007 @@ -39,7 +39,11 @@ 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")); - + // Test help link + selenium.click("//td[2]/table/tbody/tr/td[2]/a[1]"); + 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?view=diff&rev=498150&r1=498149&r2=498150 ============================================================================== --- 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 Sat Jan 20 10:23:32 2007 @@ -37,9 +37,12 @@ selenium.click("link=Server Logs"); selenium.waitForPageToLoad("30000"); assertEquals("Geronimo Console", selenium.getTitle()); - // TODO: Update xpath - // 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[1]/td/table/tbody/tr[1]/td/div/table/tbody/tr/td[2]/table/tbody/tr/td[1]/strong")); + 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")); + // 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.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?view=diff&rev=498150&r1=498149&r2=498150 ============================================================================== --- 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 Sat Jan 20 10:23:32 2007 @@ -39,6 +39,10 @@ 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")); + // Test help link + selenium.click("link=help"); + 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?view=diff&rev=498150&r1=498149&r2=498150 ============================================================================== --- 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 Sat Jan 20 10:23:32 2007 @@ -37,10 +37,13 @@ selenium.click("link=DB Manager"); selenium.waitForPageToLoad("30000"); assertEquals("Geronimo Console", selenium.getTitle()); - // TODO: Update xpath - // assertEquals("Run SQL", 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("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")); + // 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.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?view=diff&rev=498150&r1=498149&r2=498150 ============================================================================== --- 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 Sat Jan 20 10:23:32 2007 @@ -37,10 +37,13 @@ selenium.click("link=Console Realm"); selenium.waitForPageToLoad("30000"); assertEquals("Geronimo Console", selenium.getTitle()); - // TODO: Update xpath - // 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[1]/td/table/tbody/tr[1]/td/div/table/tbody/tr/td[2]/table/tbody/tr/td[1]/strong")); - + 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")); + // 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.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?view=diff&rev=498150&r1=498149&r2=498150 ============================================================================== --- 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 Sat Jan 20 10:23:32 2007 @@ -39,7 +39,11 @@ 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")); - + // Test help link + selenium.click("//td[2]/table/tbody/tr/td[2]/a[1]"); + 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/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?view=diff&rev=498150&r1=498149&r2=498150 ============================================================================== --- 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 Sat Jan 20 10:23:32 2007 @@ -39,6 +39,10 @@ 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")); + // Test help link + selenium.click("link=help"); + 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?view=diff&rev=498150&r1=498149&r2=498150 ============================================================================== --- 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 Sat Jan 20 10:23:32 2007 @@ -39,7 +39,11 @@ 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")); - + // Test help link + selenium.click("link=help"); + 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/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?view=diff&rev=498150&r1=498149&r2=498150 ============================================================================== --- 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 Sat Jan 20 10:23:32 2007 @@ -37,9 +37,12 @@ selenium.click("link=Server Logs"); selenium.waitForPageToLoad("30000"); assertEquals("Geronimo Console", selenium.getTitle()); - // TODO: Update xpath - // 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[1]/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( + "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")); + // 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.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?view=diff&rev=498150&r1=498149&r2=498150 ============================================================================== --- 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 Sat Jan 20 10:23:32 2007 @@ -39,7 +39,11 @@ 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")); - + // Test help link + selenium.click("//td[2]/table/tbody/tr/td[2]/a[1]"); + 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?view=diff&rev=498150&r1=498149&r2=498150 ============================================================================== --- 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 Sat Jan 20 10:23:32 2007 @@ -41,6 +41,10 @@ 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")); + // Test help link + selenium.click("link=help"); + selenium.waitForPageToLoad("30000"); + selenium.isTextPresent("This is the help for the Geronimo Administration Console Welcome."); logout(); }