You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by mc...@apache.org on 2008/11/04 04:20:18 UTC
svn commit: r711165 - in
/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins:
org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/
org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuit...
Author: mcconne
Date: Mon Nov 3 19:20:18 2008
New Revision: 711165
URL: http://svn.apache.org/viewvc?rev=711165&view=rev
Log:
GERONIMODEVTOOLS-528 Eliminate duplicate code in testsuite plugins
Removed:
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/Tutorial5Minute.java
Modified:
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.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/Tutorial5MinuteTest.java
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/Tutorial5MinuteTest.java
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/Tutorial5MinuteTest.java
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=711165&r1=711164&r2=711165&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 Mon Nov 3 19:20:18 2008
@@ -19,6 +19,8 @@
import java.io.FileInputStream;
+import org.apache.geronimo.testsuite.common.AssertUtil;
+import org.apache.geronimo.testsuite.common.selenium.EclipseSelenium;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
@@ -157,6 +159,10 @@
// copy over the correct contents
aFile = aProject.getFile("src/sampleear/MyServlet.java");
aFile.setContents(new FileInputStream (fileDir + "/MyServlet.java"), true, true, null);
+
+ // close the open file
+ aHelper.clickMenuItem (workbenchShell,
+ new String[] {"&File", "&Close"});
}
public void deleteProject (String projectName) throws MultipleFoundException, NotFoundException {
@@ -169,4 +175,20 @@
aHelper.waitForDialogDisposal (questionShell);
}
+ public void webTesting () throws Exception {
+ EclipseSelenium selenium = new EclipseSelenium();
+ selenium.start();
+ selenium.open( "http://localhost:8080/SampleWAR/");
+ selenium.type("name", "Tom");
+ selenium.click("submit");
+ selenium.waitForPageToLoad( "3000" );
+ AssertUtil.assertTrue(selenium.getHtmlSource().indexOf( "says hello to" ) > 0);
+
+ // TODO fill in a name and click the Process button
+ // This is a problem, HTML objects are not the same as SWT objects and
+ // Abbot cannot find these
+ //aHelper.setTextField(workbenchShell, "", "MyName");
+ //aHelper.clickButton (workbenchShell, "Press me!");
+ selenium.stop();
+ }
}
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/Tutorial5MinuteTest.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/Tutorial5MinuteTest.java?rev=711165&r1=711164&r2=711165&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/Tutorial5MinuteTest.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/Tutorial5MinuteTest.java Mon Nov 3 19:20:18 2008
@@ -21,7 +21,6 @@
import org.apache.geronimo.testsuite.common.ui.Constants;
import org.apache.geronimo.testsuite.common.ui.ProjectTasks;
import org.apache.geronimo.testsuite.common.ui.ServerTasks;
-import org.apache.geronimo.testsuite.common.ui.Tutorial5Minute;
import org.apache.geronimo.testsuite.common.ui.WorkbenchTasks;
import org.eclipse.swt.widgets.Shell;
@@ -67,13 +66,12 @@
// create server from an installed instance
serverTasks.createServer();
- Tutorial5Minute tutorial = new Tutorial5Minute (workbenchShell, aHelper);
- tutorial.createProjects ();
+ projectTasks.createProjects ();
serverTasks.publishAllProjects();
serverTasks.startServer();
- tutorial.webTesting();
+ projectTasks.webTesting();
serverTasks.stopServer();
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/Tutorial5MinuteTest.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/Tutorial5MinuteTest.java?rev=711165&r1=711164&r2=711165&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/Tutorial5MinuteTest.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/Tutorial5MinuteTest.java Mon Nov 3 19:20:18 2008
@@ -23,7 +23,6 @@
import org.apache.geronimo.testsuite.common.ui.Constants;
import org.apache.geronimo.testsuite.common.ui.ProjectTasks;
import org.apache.geronimo.testsuite.common.ui.ServerTasks;
-import org.apache.geronimo.testsuite.common.ui.Tutorial5Minute;
import org.apache.geronimo.testsuite.common.ui.WorkbenchTasks;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -74,13 +73,12 @@
// create server from an installed instance
serverTasks.createServer();
- Tutorial5Minute tutorial = new Tutorial5Minute (workbenchShell, aHelper);
- tutorial.createProjects ();
+ projectTasks.createProjects ();
serverTasks.publishAllProjects();
serverTasks.startServer();
- tutorial.webTesting();
+ projectTasks.webTesting();
serverTasks.stopServer();
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/Tutorial5MinuteTest.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/Tutorial5MinuteTest.java?rev=711165&r1=711164&r2=711165&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/Tutorial5MinuteTest.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/Tutorial5MinuteTest.java Mon Nov 3 19:20:18 2008
@@ -23,7 +23,6 @@
import org.apache.geronimo.testsuite.common.ui.Constants;
import org.apache.geronimo.testsuite.common.ui.ProjectTasks;
import org.apache.geronimo.testsuite.common.ui.ServerTasks;
-import org.apache.geronimo.testsuite.common.ui.Tutorial5Minute;
import org.apache.geronimo.testsuite.common.ui.WorkbenchTasks;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -74,13 +73,12 @@
// create server from an installed instance
serverTasks.createServer();
- Tutorial5Minute tutorial = new Tutorial5Minute (workbenchShell, aHelper);
- tutorial.createProjects ();
+ projectTasks.createProjects ();
serverTasks.publishAllProjects();
serverTasks.startServer();
- tutorial.webTesting();
+ projectTasks.webTesting();
serverTasks.stopServer();