From commits-return-4994-apmail-continuum-commits-archive=continuum.apache.org@continuum.apache.org Sun Mar 01 02:26:31 2009 Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 89869 invoked from network); 1 Mar 2009 02:26:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Mar 2009 02:26:30 -0000 Received: (qmail 98130 invoked by uid 500); 1 Mar 2009 02:26:30 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 98106 invoked by uid 500); 1 Mar 2009 02:26: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 98097 invoked by uid 99); 1 Mar 2009 02:26:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 28 Feb 2009 18:26:30 -0800 X-ASF-Spam-Status: No, hits=-1998.5 required=10.0 tests=ALL_TRUSTED,WEIRD_PORT 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; Sun, 01 Mar 2009 02:26:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 53F3923888F1; Sun, 1 Mar 2009 02:26:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r748952 - in /continuum/trunk/continuum-webapp-test: Readme.txt pom.xml src/test/java/org/apache/continuum/web/test/AboutTest.java src/test/resources/it.properties Date: Sun, 01 Mar 2009 02:26:02 -0000 To: commits@continuum.apache.org From: wsmoak@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090301022602.53F3923888F1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wsmoak Date: Sun Mar 1 02:26:01 2009 New Revision: 748952 URL: http://svn.apache.org/viewvc?rev=748952&view=rev Log: [CONTINUUM-2073] Use Cargo plugin's support for multiple data sources. Add in conditional logic to create the admin user, log in, and save the general configuration so that the About test will succeed. Modified: continuum/trunk/continuum-webapp-test/Readme.txt continuum/trunk/continuum-webapp-test/pom.xml continuum/trunk/continuum-webapp-test/src/test/java/org/apache/continuum/web/test/AboutTest.java 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=748952&r1=748951&r2=748952&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/Readme.txt (original) +++ continuum/trunk/continuum-webapp-test/Readme.txt Sun Mar 1 02:26:01 2009 @@ -6,12 +6,11 @@ * 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/java with Maven - * Start Continuum, create admin user, and save General Configuration +Run Selenium tests in src/test/java with Maven and Cargo using support for multiple data sources * modify src/test/resources/it.properties as needed * mvn clean install -Run Selenium tests in src/test/it with Maven +Run Selenium tests in src/test/it with Maven and Cargo with alternate configuration * modify src/test/resources/it.properties as needed * mvn clean install -f it-pom.xml Modified: continuum/trunk/continuum-webapp-test/pom.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/pom.xml?rev=748952&r1=748951&r2=748952&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/pom.xml (original) +++ continuum/trunk/continuum-webapp-test/pom.xml Sun Mar 1 02:26:01 2009 @@ -29,7 +29,6 @@ pom - org.apache.maven.plugins @@ -73,6 +72,95 @@ + org.codehaus.cargo + cargo-maven2-plugin + 1.0-SNAPSHOT + + + 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 @@ -106,17 +194,66 @@ test - + - org.codehaus.plexus - plexus-utils + org.apache.continuum + continuum-webapp + ${project.version} + war + + + + + org.apache.derby + derby + 10.1.3.1 + + + javax.mail + mail 1.4 - org.openqa.selenium.server - selenium-server - 0.8.1 + javax.activation + activation + 1.1 - + + + + tomcat5x + + true + + + tomcat5x + http://apache.mirrors.redwire.net/tomcat/tomcat-5/v5.5.27/bin/apache-tomcat-5.5.27.zip + + + + + firefox + + true + + + *firefox + + + + iexplore + + *iexplore + + + + otherbrowser + + *custom ${browserPath} + + + + + Modified: continuum/trunk/continuum-webapp-test/src/test/java/org/apache/continuum/web/test/AboutTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/java/org/apache/continuum/web/test/AboutTest.java?rev=748952&r1=748951&r2=748952&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/java/org/apache/continuum/web/test/AboutTest.java (original) +++ continuum/trunk/continuum-webapp-test/src/test/java/org/apache/continuum/web/test/AboutTest.java Sun Mar 1 02:26:01 2009 @@ -12,6 +12,10 @@ private String baseUrl; public String maxWaitTimeInMs; private Selenium selenium; + private String adminUsername; + private String adminFullname; + private String adminEmail; + private String adminPassword; public void setUp() throws Exception { @@ -25,8 +29,19 @@ int seleniumPort = Integer.parseInt( (p.getProperty( "SELENIUM_PORT" ) ) ); String seleniumBrowser = p.getProperty( "SELENIUM_BROWSER" ); + adminUsername = p.getProperty( "ADMIN_USERNAME" ); + adminFullname = p.getProperty( "ADMIN_FULLNAME" ); + adminEmail = p.getProperty( "ADMIN_EMAIL" ); + adminPassword = p.getProperty( "ADMIN_PASSWORD" ); + selenium = new DefaultSelenium( seleniumHost, seleniumPort, seleniumBrowser, baseUrl ); selenium.start(); + + //make sure the initial config has been done + createAdminUser(); + adminLogin(); + generalConfiguration(); + } public void tearDown() throws Exception { @@ -34,9 +49,46 @@ } public void testAboutDisplay() { + selenium.open( baseUrl + "/about.action" ); selenium.waitForPageToLoad( maxWaitTimeInMs ); assertEquals("Continuum - About", selenium.getTitle()); } -} + + private void createAdminUser() { + + selenium.open( baseUrl ); + + if( selenium.getTitle().endsWith( "Create Admin User") ) { + selenium.type( "user.fullName", adminFullname ); + selenium.type( "user.email", adminEmail ); + selenium.type( "user.password", adminPassword ); + selenium.type( "user.confirmPassword", adminPassword ); + selenium.click( "adminCreateForm_0" ); + selenium.waitForPageToLoad( maxWaitTimeInMs ); + } + } + + private void adminLogin() { + + selenium.open( baseUrl ); + + if ( selenium.getTitle().endsWith( "Login Page") ) { + selenium.type( "username", adminUsername ); + selenium.type( "password", adminPassword ); + selenium.click( "loginForm__login"); + selenium.waitForPageToLoad( maxWaitTimeInMs ); + } + } + + private void generalConfiguration() { + + selenium.open( baseUrl ); + + if ( selenium.getTitle().endsWith( "Configuration" ) ) { + selenium.click( "configuration_" ); + selenium.waitForPageToLoad( maxWaitTimeInMs ); + } + } +} \ No newline at end of file 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=748952&r1=748951&r2=748952&view=diff ============================================================================== --- continuum/trunk/continuum-webapp-test/src/test/resources/it.properties (original) +++ continuum/trunk/continuum-webapp-test/src/test/resources/it.properties Sun Mar 1 02:26:01 2009 @@ -1,9 +1,11 @@ #properties for integration tests -BASE_URL=http://localhost:9090 +BASE_URL=http://localhost:9595/continuum MAX_WAIT_TIME_IN_MS=60000 ADMIN_USERNAME=admin +ADMIN_FULLNAME=Administrator +ADMIN_EMAIL=admin@localhost ADMIN_PASSWORD=admin123 SELENIUM_HOST=localhost