geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From de...@apache.org
Subject svn commit: r1022037 - in /geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common: selenium/ ui/
Date Wed, 13 Oct 2010 09:10:53 GMT
Author: delos
Date: Wed Oct 13 09:10:53 2010
New Revision: 1022037

URL: http://svn.apache.org/viewvc?rev=1022037&view=rev
Log:
GERONIMODEVTOOLS-675 update texts of widgets used in installing server according to new UI
of eclipse helios SR1

Modified:
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/selenium/EclipseSeleniumServer.java
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/AbbotHelper.java
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ProjectTasks.java
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ServerTasks.java

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/selenium/EclipseSeleniumServer.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/selenium/EclipseSeleniumServer.java?rev=1022037&r1=1022036&r2=1022037&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/selenium/EclipseSeleniumServer.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/selenium/EclipseSeleniumServer.java
Wed Oct 13 09:10:53 2010
@@ -23,7 +23,7 @@ import org.eclipse.core.runtime.ISafeRun
 import org.eclipse.swt.widgets.Shell;
 import org.openqa.selenium.server.SeleniumServer;
 import org.openqa.selenium.server.browserlaunchers.BrowserLauncherFactory;
-import org.openqa.selenium.server.browserlaunchers.Firefox3Launcher;
+import org.openqa.selenium.server.browserlaunchers.MockBrowserLauncher;
 
 /**
  * EclipseSeleniumServer
@@ -61,8 +61,8 @@ public class EclipseSeleniumServer imple
 
     public void run() throws Exception {
         try {
-            //BrowserLauncherFactory.addBrowserLauncher("EclipseBrowser", EclipseBrowserLauncher.class);
-            BrowserLauncherFactory.addBrowserLauncher("Firefox Browser", Firefox3Launcher.class);
+            BrowserLauncherFactory.addBrowserLauncher("MockBrowser", MockBrowserLauncher.class);
+            //BrowserLauncherFactory.addBrowserLauncher("Firefox Browser", Firefox3Launcher.class);
             //SeleniumServer.setDebugMode (true);
             server = new SeleniumServer();
             server.start();

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/AbbotHelper.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/AbbotHelper.java?rev=1022037&r1=1022036&r2=1022037&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/AbbotHelper.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/AbbotHelper.java
Wed Oct 13 09:10:53 2010
@@ -102,6 +102,13 @@ public class AbbotHelper {
         ItemTester.getItemTester().actionClick (item, 3, 3);       
         waitTime (WAIT_STANDARD);
     }
+    
+    // helper method
+    public void clickTreeItem (Shell aShell, String itemText) throws MultipleFoundException,
NotFoundException {
+    	TreeItem item = (TreeItem) finder.find (aShell, new WidgetTextMatcher (itemText, TreeItem.class));
+        TreeItemTester.getTreeItemTester().actionClickItem(item);       
+        waitTime (WAIT_STANDARD);
+    }
 
     // helper method
     public void clickCombo(Shell aShell, String itemText) throws MultipleFoundException,
NotFoundException {

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ProjectTasks.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ProjectTasks.java?rev=1022037&r1=1022036&r2=1022037&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ProjectTasks.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ProjectTasks.java
Wed Oct 13 09:10:53 2010
@@ -69,7 +69,7 @@ public class ProjectTasks {
 
     private void createEARProject() throws MultipleFoundException, NotFoundException {
         Shell wizardShell = abbotHelper.clickMenuItem (workbenchShell,
-                new String[] {"&File", "&New\tAlt+Shift+N", "&Other..."},
+                new String[] {"&File", "&New\tShift+Alt+N", "&Other..."},
                 "New");
 
         abbotHelper.clickTreeItem (wizardShell,
@@ -89,7 +89,7 @@ public class ProjectTasks {
 
     private void createEJBProject() throws MultipleFoundException, NotFoundException {
         Shell wizardShell = abbotHelper.clickMenuItem (workbenchShell,
-                new String[] {"&File", "&New\tAlt+Shift+N", "&Other..."},
+                new String[] {"&File", "&New\tShift+Alt+N", "&Other..."},
                 "New");
 
         abbotHelper.clickTreeItem (wizardShell,
@@ -118,7 +118,7 @@ public class ProjectTasks {
 
     private void createWARProject() throws MultipleFoundException, NotFoundException {
         Shell wizardShell = abbotHelper.clickMenuItem (workbenchShell,
-                new String[] {"&File", "&New\tAlt+Shift+N", "&Other..."},
+                new String[] {"&File", "&New\tShift+Alt+N", "&Other..."},
                 "New");
 
         abbotHelper.clickTreeItem (wizardShell,

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ServerTasks.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ServerTasks.java?rev=1022037&r1=1022036&r2=1022037&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ServerTasks.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ServerTasks.java
Wed Oct 13 09:10:53 2010
@@ -42,16 +42,18 @@ public class ServerTasks {
         try {
             // Launch the New Project wizard and aHelper.wait for it to open.
             Shell wizardShell = abbotHelper.clickMenuItem (workbenchShell,
-                    new String[] {"&File", "&New\tAlt+Shift+N", "&Other..."},
+                    new String[] {"&File", "&New\tShift+Alt+N", "&Other..."},
                     "New");
-
+          
             // Having 2 tree items with the same name is not very good design
             abbotHelper.clickTreeItem (wizardShell,
                     new String[] {"Server", "Server"});
+         //   abbotHelper.clickTreeItem(wizardShell,"Server");
             abbotHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
 
+            
             // Select the proper Server. why do we have this in there twice?
-            abbotHelper.clickItem (wizardShell, Constants.getConstant(serverVersion, Constants.SERVERNAME));
+            abbotHelper.clickTreeItem(wizardShell,Constants.getConstant(serverVersion, Constants.SERVERNAME));
             abbotHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
 
             // TODO would be nice to install the server instead of have to know where it
is in advance



Mime
View raw message