Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 87215 invoked from network); 29 Apr 2009 23:01:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 29 Apr 2009 23:01:30 -0000 Received: (qmail 64473 invoked by uid 500); 29 Apr 2009 23:01:30 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 64436 invoked by uid 500); 29 Apr 2009 23:01:30 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 64427 invoked by uid 99); 29 Apr 2009 23:01:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2009 23:01:30 +0000 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; Wed, 29 Apr 2009 23:01:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D7F7923888A6; Wed, 29 Apr 2009 23:01:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r769984 - in /continuum/trunk/continuum-webapp-test: Readme.txt pom.xml src/test/resources/it.properties Date: Wed, 29 Apr 2009 23:01:01 -0000 To: commits@continuum.apache.org From: wsmoak@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090429230101.D7F7923888A6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wsmoak Date: Wed Apr 29 23:01:01 2009 New Revision: 769984 URL: http://svn.apache.org/viewvc?rev=769984&view=rev Log: [CONTINUUM-2073] Allow command line selection of which browser to use. Move container creation into a profile to make it easier to test against a running instance. Modified: continuum/trunk/continuum-webapp-test/Readme.txt continuum/trunk/continuum-webapp-test/pom.xml continuum/trunk/continuum-webapp-test/src/test/resources/it.properties Modified: continuum/trunk/continuum-webapp-test/Readme.txt URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/Readme.txt?rev=769984&r1=769983&r2=769984&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/Readme.txt (original) +++ continuum/trunk/continuum-webapp-test/Readme.txt Wed Apr 29 23:01:01 2009 @@ -6,19 +6,24 @@ * in Selenium IDE, modify the Base URL if necessary (for example, http://localhost:8080/continuum) * in Selenium IDE, click the 'Play entire test suite' icon -Run Selenium tests in src/test/it with Maven and Cargo using support for multiple data sources +Run Selenium tests in src/test/it with Maven, JUnit and Cargo * modify src/test/resources/it.properties as needed * mvn clean install -Run Selenium tests in src/test/java with Maven and Cargo with alternate configuration +Run Selenium tests in src/test/java with Maven and JUnit * modify src/test/resources/it.properties as needed * edit pom.xml and remove * for snapshot version of selenium(1.0-beta-SNAPSHOT), modify settings.xml/pom.xml to point to this repository http://nexus.openqa.org/content/repositories/snapshots * mvn clean install - + +Run Selenium tests against an existing Continuum instance + * modify src/test/resources/it.properties as needed + * mvn clean install -Dexisting-container + + (This skips the Cargo plugin configuration that starts a container with the Continuum webapp deployed) + Run Selenium tests in src/test/testNG with Maven and testNG * Start Continuum - * Config admin user for continuum application * modify src/test/resources/testng.properties as needed * mvn clean install -f testng-pom.xml Modified: continuum/trunk/continuum-webapp-test/pom.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/pom.xml?rev=769984&r1=769983&r2=769984&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/pom.xml (original) +++ continuum/trunk/continuum-webapp-test/pom.xml Wed Apr 29 23:01:01 2009 @@ -82,95 +82,6 @@ - org.codehaus.cargo - cargo-maven2-plugin - 1.0 - - - start-container - pre-integration-test - - start - - - false - - - - stop-container - post-integration-test - - stop - - - - - - ${container.name} - - ${container.url} - ${project.build.directory}/installs/${container.name} - - ${project.build.directory}/logs/${container.name}.log - ${project.build.directory}/logs/${container.name}.out - 600000 - - ${project.build.directory} - ${project.build.directory} - - - - org.apache.derby - derby - - - javax.mail - mail - - - javax.activation - activation - - - - - ${project.build.directory}/${container.name} - standalone - - 9595 - - cargo.datasource.driver=org.apache.derby.jdbc.EmbeddedDriver| - cargo.datasource.url=jdbc:derby:${project.build.directory}/databases/${container.name}/users;create=true| - cargo.datasource.jndi=jdbc/users| - cargo.datasource.username=sa - - - cargo.datasource.driver=org.apache.derby.jdbc.EmbeddedDriver| - cargo.datasource.url=jdbc:derby:${project.build.directory}/databases/${container.name}/builds;create=true| - cargo.datasource.jndi=jdbc/continuum| - cargo.datasource.username=sa - - - cargo.resource.name=mail/Session| - cargo.resource.type=javax.mail.Session| - cargo.resource.factory=org.apache.naming.factory.MailSessionFactory| - cargo.resource.parameters=mail.smtp.host=localhost - - - - - ${project.goupId} - continuum-webapp - war - - continuum - - - - - - - org.apache.maven.plugins maven-surefire-plugin @@ -180,6 +91,14 @@ test + + + + browser + ${browser} + + + @@ -189,13 +108,14 @@ org.openqa.selenium.client-drivers selenium-java-client-driver - test - - - org.openqa.selenium.client-drivers - selenium-java-client-driver 1.0-beta-SNAPSHOT test + + + commons-logging + commons-logging + + org.codehaus.plexus @@ -228,9 +148,112 @@ + create-container + + + !container + + + + + + org.codehaus.cargo + cargo-maven2-plugin + 1.0 + + + start-container + pre-integration-test + + start + + + false + + + + stop-container + post-integration-test + + stop + + + + + + ${container.name} + + ${container.url} + ${project.build.directory}/installs/${container.name} + + ${project.build.directory}/logs/${container.name}.log + ${project.build.directory}/logs/${container.name}.out + 600000 + + ${project.build.directory} + ${project.build.directory} + + + + org.apache.derby + derby + + + javax.mail + mail + + + javax.activation + activation + + + + + ${project.build.directory}/${container.name} + standalone + + 9595 + + cargo.datasource.driver=org.apache.derby.jdbc.EmbeddedDriver| + cargo.datasource.url=jdbc:derby:${project.build.directory}/databases/${container.name}/users;create=true| + cargo.datasource.jndi=jdbc/users| + cargo.datasource.username=sa + + + cargo.datasource.driver=org.apache.derby.jdbc.EmbeddedDriver| + cargo.datasource.url=jdbc:derby:${project.build.directory}/databases/${container.name}/builds;create=true| + cargo.datasource.jndi=jdbc/continuum| + cargo.datasource.username=sa + + + cargo.resource.name=mail/Session| + cargo.resource.type=javax.mail.Session| + cargo.resource.factory=org.apache.naming.factory.MailSessionFactory| + cargo.resource.parameters=mail.smtp.host=localhost + + + + + ${project.goupId} + continuum-webapp + war + + continuum + + + + + + + + + + tomcat5x - true + + !container + tomcat5x @@ -239,9 +262,21 @@ + existing-container + + + container + existing + + + + + firefox - true + + !browser + *firefox @@ -249,12 +284,36 @@ iexplore + + + browser + iexplore + + *iexplore + safari + + + browser + safari + + + + *safari + + + otherbrowser + + + browser + other + + *custom ${browserPath} Modified: continuum/trunk/continuum-webapp-test/src/test/resources/it.properties URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/resources/it.properties?rev=769984&r1=769983&r2=769984&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/resources/it.properties (original) +++ continuum/trunk/continuum-webapp-test/src/test/resources/it.properties Wed Apr 29 23:01:01 2009 @@ -10,4 +10,4 @@ SELENIUM_HOST=localhost SELENIUM_PORT=4444 -SELENIUM_BROWSER=*firefox +