Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 54342 invoked from network); 4 Nov 2008 03:21:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Nov 2008 03:21:09 -0000 Received: (qmail 66501 invoked by uid 500); 4 Nov 2008 03:21:15 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 66445 invoked by uid 500); 4 Nov 2008 03:21:15 -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 66436 invoked by uid 99); 4 Nov 2008 03:21:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Nov 2008 19:21:15 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Nov 2008 03:20:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B929F23889B7; Mon, 3 Nov 2008 19:20:18 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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... Date: Tue, 04 Nov 2008 03:20:18 -0000 To: scm@geronimo.apache.org From: mcconne@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081104032018.B929F23889B7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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();