geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r988041 - in /geronimo/server/trunk: testsuite/console-testsuite/ testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/ testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/consol...
Date Mon, 23 Aug 2010 09:28:34 GMT
Author: xiaming
Date: Mon Aug 23 09:28:32 2010
New Revision: 988041

URL: http://svn.apache.org/viewvc?rev=988041&view=rev
Log:
GERONIMO-5546 update console testsuite to support the dojo navigation tree, provided by janel Zhang

Modified:
    geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/ConsoleRealmTest.java
    geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java
    geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java
    geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java
    geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSServerTest.java
    geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java
    geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/TestSupport.java
    geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java
    geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ApacheConfigPortletTest.java
    geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/AssemblyPortletTest.java
    geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/BasicConsoleTestSupport.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/pom.xml
    geronimo/server/trunk/testsupport/testsupport-selenium/src/main/java/org/apache/geronimo/testsupport/console/ConsoleTestSupport.java

Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/ConsoleRealmTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/ConsoleRealmTest.java?rev=988041&r1=988040&r2=988041&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/ConsoleRealmTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/ConsoleRealmTest.java Mon Aug 23 09:28:32 2010
@@ -27,6 +27,7 @@ import org.testng.annotations.Test;
 public class ConsoleRealmTest extends TestSupport {
     @Test
     public void testNewUser() throws Exception {
+    	selenium.click(getNavigationTreeNodeLocation("Security"));
         selenium.click("link=Users and Groups");
         waitForPageLoad();
         selenium.click("link=Create New User");
@@ -36,18 +37,23 @@ public class ConsoleRealmTest extends Te
         selenium.type("confirm-password", "myuser");
         selenium.click("//input[@value='Add']");
         waitForPageLoad();
+        selenium.selectFrame("index=0");
         assertTrue(selenium.isTextPresent("myuser"));
         selenium.click("//a[@onclick=\"return confirm('Confirm Delete user myuser?');\"]");
         waitForPageLoad();
         assertTrue(selenium.getConfirmation().matches("^Confirm Delete user myuser[\\s\\S]$"));
         waitForPageLoad();
         assertFalse(selenium.isTextPresent("myuser"));
+        //return to main window
+        selenium.selectWindow("null");
     }
 
     @Test
     public void testNewGroup() throws Exception {
+    	selenium.click(getNavigationTreeNodeLocation("Security"));
         selenium.click("link=Users and Groups");
         waitForPageLoad();
+        selenium.selectFrame("index=0");
         selenium.click("link=Create New Group");
         waitForPageLoad();
         selenium.type("group", "mygroup");
@@ -59,5 +65,6 @@ public class ConsoleRealmTest extends Te
         assertTrue(selenium.getConfirmation().matches("^Confirm Delete group mygroup[\\s\\S]$"));
         waitForPageLoad();
         assertFalse(selenium.isTextPresent("mygroup"));
+        selenium.selectWindow("null");
     }
 }

Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java?rev=988041&r1=988040&r2=988041&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java Mon Aug 23 09:28:32 2010
@@ -58,7 +58,6 @@ public class DatabasePoolTest extends Te
         waitForPageLoad();
         assertTrue(selenium.isTextPresent("SQL command(s) executed successfully"));
     }
-
     /*
     // cannot test yet. jetty is having problems rending the page
     

Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java?rev=988041&r1=988040&r2=988041&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java Mon Aug 23 09:28:32 2010
@@ -27,10 +27,13 @@ import org.testng.annotations.Test;
 public class DeploymentTest extends TestSupport {
     @Test
     public void testEmptyDeployment() throws Exception {
-        selenium.click("link=Deploy New");
+    	selenium.click(getNavigationTreeNodeLocation("Applications"));
+        selenium.click("link=Deployer");
         waitForPageLoad();
+        selenium.selectFrame("index=0");
         selenium.click("//input[@value='Install']");
         waitForPageLoad();
-        assertTrue(selenium.isTextPresent("Deployment Failed"));
+        assertTrue(selenium.isTextPresent("The application was not deployed."));
+        selenium.selectWindow("null");
     }
 }

Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java?rev=988041&r1=988040&r2=988041&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java Mon Aug 23 09:28:32 2010
@@ -27,6 +27,7 @@ import org.testng.annotations.Test;
 public class JMSResourcesTest extends TestSupport {
     @Test
     public void testNewJMSResource() throws Exception {
+    	selenium.click(getNavigationTreeNodeLocation("Services"));
         selenium.click("link=JMS Resources");
         waitForPageLoad();
         selenium.click("link=For ActiveMQ");
@@ -63,7 +64,6 @@ public class JMSResourcesTest extends Te
         waitForPageLoad();
         assertFalse(selenium.isTextPresent("UniqueName (console.jms/UniqueName/1.0/car)"));
     }
-
     private boolean waitForButton() throws InterruptedException {
         for (int i = 0; i < 12; i++) {
             if (selenium.isElementPresent("dijit_form_Button_0")) {

Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSServerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSServerTest.java?rev=988041&r1=988040&r2=988041&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSServerTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSServerTest.java Mon Aug 23 09:28:32 2010
@@ -25,7 +25,7 @@ import org.testng.annotations.Test;
  * @version $Rev$ $Date$
  */
 public class JMSServerTest extends TestSupport {
-    // @Test
+    @Test
     public void testNewListener() throws Exception {
         selenium.click("link=JMS Server");
         waitForPageLoad();
@@ -43,7 +43,7 @@ public class JMSServerTest extends TestS
         assertTrue(selenium.getConfirmation().matches("^Are you sure you want to delete uniquename[\\s\\S]$"));
     }
     
-    //@Test
+    @Test
     public void testStartStopListener() throws Exception {
         selenium.click("link=JMS Server");
         waitForPageLoad();
@@ -55,7 +55,7 @@ public class JMSServerTest extends TestS
         assertEquals("running", selenium.getText("//tr[3]/td[5]"));
     }
     
-    // @Test
+    @Test
     public void testEditNetworkListener() throws Exception {
         selenium.click("link=JMS Server");
         waitForPageLoad();

Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java?rev=988041&r1=988040&r2=988041&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java Mon Aug 23 09:28:32 2010
@@ -30,38 +30,40 @@ public class PluginsTest extends TestSup
         String link = "http://geronimo-server:8080/plugin/maven-repo/";
         String actualLink = "http://localhost:8080/plugin/maven-repo/";
         String updatedLink = "http://geronimo.apache.org/plugins/geronimo-";
-            
+        selenium.click(getNavigationTreeNodeLocation("Applications"));     
         selenium.click("link=Plugins");
         waitForPageLoad();
+        selenium.selectFrame("index=0");
         assertTrue(selenium.isTextPresent(link));
         
         selenium.click("link=Update Repository List");
         waitForPageLoad();
         assertTrue(selenium.isTextPresent(updatedLink));
         
-        selenium.click("link=Add Repository");
+        selenium.click("link=Add repository");
         waitForPageLoad();
         assertTrue(selenium.isTextPresent(link));
                     
         selenium.type("newRepository", actualLink);
-        selenium.click("//input[@value='Add Repository']");
+        selenium.click("//input[@value='Add repository']");
         waitForPageLoad();
 
         if (selenium.isTextPresent("Already have an entry for repository " + actualLink)) {
             selenium.click("link=Cancel");
             waitForPageLoad();
         }
-        
         selenium.select("repository", "label=" + actualLink);
         selenium.type("username", "system");
-        selenium.type("password", "manager");            
-        selenium.click("//input[@value = 'Show Plugins in selected repository']");
+        selenium.type("password", "manager");     
+        selenium.click("//input[@value = 'Show plugins in selected repository']");
         waitForPageLoad();
         
-        assertTrue(selenium.isTextPresent("Geronimo Assemblies :: Boilerplate"));
-        selenium.click("link=Geronimo Assemblies :: Boilerplate");
+        assertTrue(selenium.isTextPresent("Geronimo Assemblies :: Karaf Boilerplate Framework"));
+        selenium.click("link=Geronimo Assemblies :: Karaf Boilerplate Framework");
         waitForPageLoad();
         
         assertTrue(selenium.isTextPresent("Geronimo-Versions"));
+      //return to main window
+       selenium.selectWindow("null");
     }
 }

Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/TestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/TestSupport.java?rev=988041&r1=988040&r2=988041&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/TestSupport.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/TestSupport.java Mon Aug 23 09:28:32 2010
@@ -19,6 +19,9 @@
 
 package org.apache.geronimo.testsuite.console;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;

Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java?rev=988041&r1=988040&r2=988041&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java Mon Aug 23 09:28:32 2010
@@ -36,10 +36,13 @@ public class WebServerTest
         addConnector(name, 8081);
         
         deleteConnector(name);
+        //return to main window
+        selenium.selectWindow("null");
     }
 
-    @Test
+   @Test
     public void testEditConnector() throws Exception {
+    	selenium.setSpeed("3000");
         String name = "uniquename2";
         addConnector(name, 8082);
 
@@ -62,6 +65,8 @@ public class WebServerTest
         assertTrue(selenium.isTextPresent("8009"));
 
         deleteConnector(name);
+        //return to main window
+        selenium.selectWindow("null");
     }
     
     @Test
@@ -80,12 +85,16 @@ public class WebServerTest
         assertEquals("running", selenium.getText(connectorSelector + "/td[4]"));
 
         deleteConnector(name);
+        //return to main window
+        selenium.selectWindow("null");
     }
 
     private void addConnector(String name, int port) throws Exception {
+    	selenium.click(getNavigationTreeNodeLocation("Server"));
         selenium.click("link=Web Server");
         waitForPageLoad();
         String container = JETTY;
+        selenium.selectFrame("index=0");
         if (selenium.isTextPresent(TOMCAT)) {
             container = TOMCAT;
         }

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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +31,7 @@ public class AssemblyPortletTest
 {
     @Test
     public void testAssemblyLink() 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/BasicConsoleTestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/BasicConsoleTestSupport.java?rev=988041&r1=988040&r2=988041&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/BasicConsoleTestSupport.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/BasicConsoleTestSupport.java Mon Aug 23 09:28:32 2010
@@ -19,6 +19,9 @@
 
 package org.apache.geronimo.testsuite.console;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
@@ -50,5 +53,4 @@ public class BasicConsoleTestSupport ext
     protected String getPortletHelpLocation(int index) {
         return "xpath=//div[@class = 'portlet'][" + index + "]/div/a[contains(@title, 'Help')]";
     }
-
 }

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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +31,7 @@ public class ConfigManagerPortletEARTest
 {
     @Test
     public void testConfigManagerEARLink() throws Exception {
+    	selenium.click(this.getNavigationTreeNodeLocation("Applications"));
         selenium.click("link=Application EARs");
         waitForPageLoad();
         assertEquals("Geronimo Console", selenium.getTitle());

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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +31,7 @@ public class ConfigManagerPortletWARTest
 {
     @Test
     public void testConfigManagerWARLink() throws Exception {
+    	selenium.click(this.getNavigationTreeNodeLocation("Applications"));
         selenium.click("link=Web App WARs");
         waitForPageLoad();
         assertEquals("Geronimo Console", selenium.getTitle());

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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +31,7 @@ public class DBViewerPortletTest
 {
     @Test
     public void testDBViewerLink() throws Exception {
+        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/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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -29,8 +29,9 @@ import org.testng.annotations.Test;
 public class DatabasePoolPortletTest
     extends BasicConsoleTestSupport
 {
-    @Test
+     @Test
     public void testDatabasePoolLink() throws Exception {
+    	selenium.click(this.getNavigationTreeNodeLocation("Services"));
         selenium.click("link=Database Pools");
         waitForPageLoad();
         assertEquals("Geronimo Console", selenium.getTitle());

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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,10 +31,11 @@ public class DeploymentPortletTest
 {
     @Test
     public void testDeploymentLink() throws Exception {
-        selenium.click("link=Deploy New");
+    	selenium.click(this.getNavigationTreeNodeLocation("Applications"));
+        selenium.click("link=Deployer");
         waitForPageLoad();
         assertEquals("Geronimo Console", selenium.getTitle());
-        assertEquals("Install New Applications", 
+        assertEquals("Install Application", 
                      selenium.getText(getPortletTitleLocation()));
         // Test help link
         selenium.click(getPortletHelpLocation());

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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +31,7 @@ public class DerbyLogViewerPortletTest
 {
     @Test
     public void testDerbyLogViewerLink() 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/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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +31,7 @@ public class InternalDBPortletTest
 {
     @Test
     public void testInternalDBLink() throws Exception {
+    	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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +31,7 @@ public class JMSBrokerPortletTest
 {
     @Test
     public void testJMSBrokerLink() throws Exception {
+    	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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +31,7 @@ public class JMSConnectorPortletTest
 {
     @Test
     public void testJMSConnectorLink() throws Exception {
+    	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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +31,7 @@ public class JMSResourcePortletTest
 {
     @Test
     public void testJMSResourceLink() throws Exception {
+    	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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -29,8 +29,9 @@ import org.testng.annotations.Test;
 public class JMXManagerPortletTest
     extends BasicConsoleTestSupport
 {
-    @Test
+	@Test
     public void testJMXManagerLink() throws Exception {
+    	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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +31,7 @@ public class JavaSystemInfoPortletTest
 {
     @Test
     public void testJavaSystemInfoLink() throws Exception {
+    	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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -29,16 +29,20 @@ public class LinkCheckTest
 {
     @Test
     public void testServerInfoLink() throws Exception {
+    	selenium.click(this.getNavigationTreeNodeLocation("Server"));
         selenium.click("link=Information");
         waitForPageLoad();
         assertEquals("Geronimo Console", selenium.getTitle());
         
+        selenium.selectFrame("index=0");
         assertTrue(selenium.isTextPresent("Version"));
         assertTrue(selenium.isTextPresent("Start Time"));
         assertTrue(selenium.isTextPresent("Up Time"));
         
         assertEquals("Server Info", 
                      selenium.getText(getPortletTitleLocation())); 
+        //return to main window
+        selenium.selectWindow("null");
     }
 }
 

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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +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());
@@ -39,6 +40,8 @@ public class LogManagerPortletTest
         // Test help link
         selenium.click(getPortletHelpLocation());
         waitForPageLoad();
-        selenium.isTextPresent("This portlet allows the user to select a configuration file for logging");
+        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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +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());
@@ -39,6 +40,8 @@ public class LogViewerPortletTest
         // Test help link
         selenium.click(getPortletHelpLocation(2));
         waitForPageLoad();
-        selenium.isTextPresent("This portlet displays the Geronimo server log");
+        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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +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());
@@ -39,6 +40,8 @@ public class RepositoryViewPortletTest
         // Test help link
         selenium.click(getPortletHelpLocation());
         waitForPageLoad();
-        selenium.isTextPresent("This page displays the artifacts installed in the server's repository.");
+        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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -29,8 +29,9 @@ import org.testng.annotations.Test;
 public class RunSQLPortletTest
     extends BasicConsoleTestSupport
 {
-    @Test
+	@Test
     public void testRunSQLLink() throws Exception {
+    	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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,11 +31,15 @@ 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");
         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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +31,7 @@ public class ServerInfoPortletTest
 {
     @Test
     public void testServerInfoLink() throws Exception {
+    	selenium.click(this.getNavigationTreeNodeLocation("Server"));
         selenium.click("link=Information");
         waitForPageLoad();
         assertEquals("Geronimo Console", selenium.getTitle());

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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -38,15 +38,17 @@ public class SimpleLoginTest
     public void testClickSomeLinks() throws Exception {
         try {
             login();
-            
+            selenium.click(getNavigationTreeNodeLocation("Server"));
             selenium.click("link=Information");
             waitForPageLoad();
             assertEquals("Geronimo Console", selenium.getTitle());
             
+            selenium.open("/console");
             selenium.click("link=Java System Info");
             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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -31,6 +31,7 @@ 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");

Modified: geronimo/server/trunk/testsuite/console-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/pom.xml?rev=988041&r1=988040&r2=988041&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/pom.xml Mon Aug 23 09:28:32 2010
@@ -41,6 +41,11 @@
     <profiles>
         <profile>
             <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
             <build>
                 <pluginManagement>
                     <plugins>

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=988041&r1=988040&r2=988041&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 Mon Aug 23 09:28:32 2010
@@ -19,6 +19,9 @@
 
 package org.apache.geronimo.testsupport.console;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.geronimo.testsupport.SeleniumTestSupport;
 
 /**
@@ -57,5 +60,27 @@ public abstract class ConsoleTestSupport
         
         //selenium.removeCookie("JSESSIONID", "/");
     }
-}
-
+    protected String getNavigationTreeNodeLocation(String navigationTreeLabel){
+		//map label to id according to treeData
+		Map<String,Integer> navigationTreeLabel2Index=new HashMap<String,Integer>();
+		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";
+	}
+}
\ No newline at end of file



Mime
View raw message