From photark-commits-return-264-apmail-incubator-photark-commits-archive=incubator.apache.org@incubator.apache.org Mon May 10 15:02:05 2010 Return-Path: Delivered-To: apmail-incubator-photark-commits-archive@minotaur.apache.org Received: (qmail 72971 invoked from network); 10 May 2010 15:02:05 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 10 May 2010 15:02:05 -0000 Received: (qmail 60550 invoked by uid 500); 10 May 2010 15:02:05 -0000 Delivered-To: apmail-incubator-photark-commits-archive@incubator.apache.org Received: (qmail 60521 invoked by uid 500); 10 May 2010 15:02:05 -0000 Mailing-List: contact photark-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: photark-dev@incubator.apache.org Delivered-To: mailing list photark-commits@incubator.apache.org Received: (qmail 60513 invoked by uid 99); 10 May 2010 15:02:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 May 2010 15:02:05 +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; Mon, 10 May 2010 15:02:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 61CD123888E3; Mon, 10 May 2010 15:01:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r942771 - in /incubator/photark/trunk: ./ photark-ui-test/ photark-ui-test/src/test/java/org/apache/photark/ui/ photark-webapp/ Date: Mon, 10 May 2010 15:01:04 -0000 To: photark-commits@incubator.apache.org From: lresende@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100510150104.61CD123888E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: lresende Date: Mon May 10 15:01:03 2010 New Revision: 942771 URL: http://svn.apache.org/viewvc?rev=942771&view=rev Log: PHOTARK-27 - Automating execution of HTML Unit tests via mvn -Pintegration Added: incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/FF3BrowserTestCase.java (contents, props changed) - copied, changed from r941155, incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/FF3TestBrowser.java incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/IE7BrowserTestCase.java (contents, props changed) - copied, changed from r941155, incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/IE7TestBrowser.java incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/IE8BrowserTestCase.java (contents, props changed) - copied, changed from r941155, incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/IE8TestBrowser.java Removed: incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/FF3TestBrowser.java incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/IE7TestBrowser.java incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/IE8TestBrowser.java Modified: incubator/photark/trunk/photark-ui-test/pom.xml incubator/photark/trunk/photark-webapp/pom.xml incubator/photark/trunk/pom.xml Modified: incubator/photark/trunk/photark-ui-test/pom.xml URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-test/pom.xml?rev=942771&r1=942770&r2=942771&view=diff ============================================================================== --- incubator/photark/trunk/photark-ui-test/pom.xml (original) +++ incubator/photark/trunk/photark-ui-test/pom.xml Mon May 10 15:01:03 2010 @@ -28,7 +28,21 @@ photark-ui-tests Apache PhotArk UI Integration Test + + + 8080 + http://localhost:${http.port}/photark + ${env.CATALINA_HOME} + + + + org.apache.photark + photark-webapp + 1.0-incubating-SNAPSHOT + war + + junit junit @@ -43,4 +57,122 @@ test + + + + + + org.codehaus.cargo + cargo-maven2-plugin + 1.0.1-beta-1 + + + false + + + tomcat6x + installed + ${tomcat.home} + + + org.apache.commons.logging.impl.SimpleLog + + + + + + + ${http.port} + + existing + ${tomcat.home} + + + + org.apache.photark + photark-webapp + war + + photark + + + + + + + + + + + + + start-container + pre-integration-test + + deployer-deploy + start + + + + stop-container + post-integration-test + + stop + + + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + test + test + + test + + + true + + + + integration + integration-test + + test + + + false + + + + + + + Copied: incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/FF3BrowserTestCase.java (from r941155, incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/FF3TestBrowser.java) URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/FF3BrowserTestCase.java?p2=incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/FF3BrowserTestCase.java&p1=incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/FF3TestBrowser.java&r1=941155&r2=942771&rev=942771&view=diff ============================================================================== --- incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/FF3TestBrowser.java (original) +++ incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/FF3BrowserTestCase.java Mon May 10 15:01:03 2010 @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import com.gargoylesoftware.htmlunit.BrowserVersion; @@ -44,7 +45,7 @@ import com.gargoylesoftware.htmlunit.htm import com.gargoylesoftware.htmlunit.html.HtmlTable; -public class FF3TestBrowser { +public class FF3BrowserTestCase { public static WebClient webClient; @@ -71,7 +72,8 @@ public class FF3TestBrowser { //albums loaded assertTrue( table.getRow(1).getCell(0).asText().contains("boston")); //Gallery pictures loaded - assertTrue( table.getRow(3).getCell(0).asXml().contains("http://localhost:8080/photark/gallery/vegas/dsc00860.jpg")); + assertTrue( table.getRow(3).getCell(0).asXml().contains("http://localhost:8080/photark/gallery/vegas/dsc00")); //Don't use a specific image + //as we can get <> order in <> OS //clicking on an image assertTrue(page.getElementById("albumImage").getAttribute("src").contains("space.gif")); @@ -81,8 +83,8 @@ public class FF3TestBrowser { Thread.sleep(3000); //checking whether there are images in the album - assertTrue( page2.getElementById("albumImage").getAttribute("src").contains("/photark/gallery/vegas/dsc00860.jpg")); - + assertTrue( page2.getElementById("albumImage").getAttribute("src").contains("/photark/gallery/vegas/dsc00")); //Don't use a specific image + //as we can get <> order in <> OS } @Test @@ -90,7 +92,7 @@ public class FF3TestBrowser { //passing credentials final List collectedAlerts = new ArrayList(); webClient.setAlertHandler(new CollectingAlertHandler(collectedAlerts)); - ((DefaultCredentialsProvider) webClient.getCredentialsProvider()).addCredentials("admin", "password"); + ((DefaultCredentialsProvider) webClient.getCredentialsProvider()).addCredentials("photark-admin", "password"); final HtmlPage page = webClient.getPage("http://localhost:8080/photark/admin/upload.html"); Thread.sleep(3000); Propchange: incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/FF3BrowserTestCase.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/FF3BrowserTestCase.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/IE7BrowserTestCase.java (from r941155, incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/IE7TestBrowser.java) URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/IE7BrowserTestCase.java?p2=incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/IE7BrowserTestCase.java&p1=incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/IE7TestBrowser.java&r1=941155&r2=942771&rev=942771&view=diff ============================================================================== --- incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/IE7TestBrowser.java (original) +++ incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/IE7BrowserTestCase.java Mon May 10 15:01:03 2010 @@ -44,7 +44,7 @@ import com.gargoylesoftware.htmlunit.htm import com.gargoylesoftware.htmlunit.html.HtmlTable; -public class IE7TestBrowser { +public class IE7BrowserTestCase { public static WebClient webClient; @@ -71,7 +71,8 @@ public class IE7TestBrowser { //albums loaded assertTrue( table.getRow(1).getCell(0).asText().contains("boston")); //Gallery pictures loaded - assertTrue( table.getRow(3).getCell(0).asXml().contains("http://localhost:8080/photark/gallery/vegas/dsc00860.jpg")); + assertTrue( table.getRow(3).getCell(0).asXml().contains("http://localhost:8080/photark/gallery/vegas/dsc00")); //Don't use a specific image + //as we can get <> order in <> OS //clicking on an image assertTrue(page.getElementById("albumImage").getAttribute("src").contains("space.gif")); @@ -80,7 +81,8 @@ public class IE7TestBrowser { final HtmlPage page2= anchor.click(); Thread.sleep(3000); //checking whether there are images in the album - assertTrue( page2.getElementById("albumImage").getAttribute("src").contains("/photark/gallery/vegas/dsc00860.jpg")); + assertTrue( page2.getElementById("albumImage").getAttribute("src").contains("/photark/gallery/vegas/dsc00")); //Don't use a specific image + //as we can get <> order in <> OS } @@ -89,7 +91,7 @@ public class IE7TestBrowser { //passing credentials final List collectedAlerts = new ArrayList(); webClient.setAlertHandler(new CollectingAlertHandler(collectedAlerts)); - ((DefaultCredentialsProvider) webClient.getCredentialsProvider()).addCredentials("admin", "password"); + ((DefaultCredentialsProvider) webClient.getCredentialsProvider()).addCredentials("photark-admin", "password"); final HtmlPage page = webClient.getPage("http://localhost:8080/photark/admin/upload.html"); Thread.sleep(3000); Propchange: incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/IE7BrowserTestCase.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/IE7BrowserTestCase.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/IE8BrowserTestCase.java (from r941155, incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/IE8TestBrowser.java) URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/IE8BrowserTestCase.java?p2=incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/IE8BrowserTestCase.java&p1=incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/IE8TestBrowser.java&r1=941155&r2=942771&rev=942771&view=diff ============================================================================== --- incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/IE8TestBrowser.java (original) +++ incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/IE8BrowserTestCase.java Mon May 10 15:01:03 2010 @@ -44,7 +44,7 @@ import com.gargoylesoftware.htmlunit.htm import com.gargoylesoftware.htmlunit.html.HtmlTable; -public class IE8TestBrowser { +public class IE8BrowserTestCase { public static WebClient webClient; @@ -71,7 +71,8 @@ public class IE8TestBrowser { //albums loaded assertTrue( table.getRow(1).getCell(0).asText().contains("boston")); //Gallery pictures loaded - assertTrue( table.getRow(3).getCell(0).asXml().contains("http://localhost:8080/photark/gallery/vegas/dsc00860.jpg")); + assertTrue( table.getRow(3).getCell(0).asXml().contains("http://localhost:8080/photark/gallery/vegas/dsc00")); //Don't use a specific image + //as we can get <> order in <> OS //clicking on an image assertTrue(page.getElementById("albumImage").getAttribute("src").contains("space.gif")); @@ -80,7 +81,8 @@ public class IE8TestBrowser { final HtmlPage page2= anchor.click(); Thread.sleep(3000); //checking whether there are images in the album - assertTrue( page2.getElementById("albumImage").getAttribute("src").contains("/photark/gallery/vegas/dsc00860.jpg")); + assertTrue( page2.getElementById("albumImage").getAttribute("src").contains("/photark/gallery/vegas/dsc00")); //Don't use a specific image + //as we can get <> order in <> OS } @@ -89,7 +91,7 @@ public class IE8TestBrowser { //passing credentials final List collectedAlerts = new ArrayList(); webClient.setAlertHandler(new CollectingAlertHandler(collectedAlerts)); - ((DefaultCredentialsProvider) webClient.getCredentialsProvider()).addCredentials("admin", "password"); + ((DefaultCredentialsProvider) webClient.getCredentialsProvider()).addCredentials("photark-admin", "password"); final HtmlPage page = webClient.getPage("http://localhost:8080/photark/admin/upload.html"); Thread.sleep(3000); Propchange: incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/IE8BrowserTestCase.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/photark/trunk/photark-ui-test/src/test/java/org/apache/photark/ui/IE8BrowserTestCase.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: incubator/photark/trunk/photark-webapp/pom.xml URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-webapp/pom.xml?rev=942771&r1=942770&r2=942771&view=diff ============================================================================== --- incubator/photark/trunk/photark-webapp/pom.xml (original) +++ incubator/photark/trunk/photark-webapp/pom.xml Mon May 10 15:01:03 2010 @@ -154,6 +154,12 @@ 1.5.3 + + log4j + log4j + 1.2.16 + + javax.servlet Modified: incubator/photark/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/photark/trunk/pom.xml?rev=942771&r1=942770&r2=942771&view=diff ============================================================================== --- incubator/photark/trunk/pom.xml (original) +++ incubator/photark/trunk/pom.xml Mon May 10 15:01:03 2010 @@ -149,6 +149,9 @@ codehaus-snapshot Codehaus Snapshot Repository http://snapshots.repository.codehaus.org + + true + true @@ -188,12 +191,11 @@ photark-jcr photark-ui photark-ui-admin - photark-ui-test photark-appengine-webapp photark-webapp - + @@ -206,13 +208,28 @@ photark-jcr photark-ui photark-ui-admin - photark-ui-test photark-appengine-webapp photark-webapp - + + + + + integration + + distribution + photark + photark-filesystem + photark-jcr + photark-ui + photark-ui-admin + photark-ui-test + photark-appengine-webapp + photark-webapp + +