Skip to content

Commit

Permalink
Build uitest with maven ant runner
Browse files Browse the repository at this point in the history 
Change-Id: Ia7ba1cb6b1c8c4e70b6e834d86feb6c161ab5a29
  • Loading branch information
elmot authored and Teemu Suo-Anttila committed Apr 1, 2016
1 parent bca7458 commit dd69d1a
Show file tree
Hide file tree
Showing 4 changed files with 342 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
View file
Expand Up @@ -94,6 +94,7 @@ buildhelpers/target/
client-compiled/target/
liferay/target/
themes/target/
uitest/target/
widgets/target/

.sass-cache
Expand Down
1 change: 1 addition & 0 deletions pom.xml
View file
Expand Up @@ -71,6 +71,7 @@
<module>client-compiled</module>
<module>themes</module>
<module>widgets</module>
<module>uitest</module>
<module>liferay</module>
</modules>

Expand Down
3 changes: 2 additions & 1 deletion uitest/build.xml
View file
Expand Up @@ -251,7 +251,8 @@

<target name="test-tb3" depends="clean-testbench-errors">
<property name="war.file"
location="${vaadin.basedir}/result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" />
location="${vaadin.basedir}/uitest/result/lib/vaadin-uitest-${vaadin.version}.war" />
<mkdir dir="${vaadin.basedir}/result" />
<parallel>
<daemons>
<ant antfile="${uitest.dir}/vaadin-server.xml"
Expand Down
338 changes: 338 additions & 0 deletions uitest/pom.xml
View file
@@ -0,0 +1,338 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-root</artifactId>
<version>7.7.0-SNAPSHOT</version>
</parent>
<artifactId>vaadin-uitest</artifactId>
<name>vaadin-uitest</name>
<packaging>pom</packaging>
<properties>
<jetty.version>8.1.12.v20130726</jetty.version>
</properties>

<organization>
<name>Vaadin Ltd</name>
</organization>
<url>https://vaadin.com/</url>
<description>Vaadin UI tests</description>

<repositories>
<repository>
<id>vaadin-addons</id>
<url>http://maven.vaadin.com/vaadin-addons</url>
</repository>
</repositories>
<dependencies>

<!-- API DEPENDENCIES -->
<dependency>
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
<version>2.0</version>
</dependency>

<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>1.0.0.GA</version>
</dependency>

<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>4.2.0.Final</version>
</dependency>
<!-- Google App Engine -->
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>1.7.7</version>
</dependency>

<!-- LIBRARY DEPENDENCIES (compile time) -->
<!-- Project modules -->
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-server</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-client</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>javax.validation</groupId>
<artifactId>javax.servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-client-compiled</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-themes</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-push</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>javax.validation</groupId>
<artifactId>javax.servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- For compiling TestingWidgetSet -->
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-client-compiler</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Servlet 3.0 API -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${jetty.version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>orbit</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- jetty-servlets needed by ProxyTest, but not by jetty-runner -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
<version>${jetty.version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>orbit</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-websocket</artifactId>
<version>${jetty.version}</version>

<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>orbit</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>${jetty.version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>orbit</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>${jetty.version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>orbit</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-runner</artifactId>
<version>${jetty.version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>orbit</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>1.3</version>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
<version>0.1.52</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.5</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
</dependency>
<!-- Mainly for SQLContainer tests -->
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.2.6</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-testbench</artifactId>
<version>4.0.3</version>
</dependency>
<!-- This should be removed once tests have been updated to use lang3 -->
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>

<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-sass-compiler</artifactId>
<version>${vaadin.sass.version}</version>
</dependency>

<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-buildhelpers</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
<version>3.5.1.201410131835-r</version>
<exclusions>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<filesets>
<fileset>
<directory>result</directory>
</fileset>
</filesets>
</configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>war</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<!-- <inherited>false</inherited> -->
<configuration>
<target>
<ant antfile="build.xml" target="war">
<property name="build.compiler" value="extJavac"/>
<property name="vaadin.version" value="${project.version}"/>
</ant>
</target>
</configuration>
</execution>
<!--
<execution>
<id>test-tb3</id>
<phase>integration-test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<ant antfile="build.xml" target="test-tb3">
<property name="browsers.include" value="phantomjs1"/>
<property name="categories.exclude" value="push"/>
<property name="com.vaadin.testbench.max.retries" value="4"/>
<property name="com.vaadin.testbench.screenshot.directory" value="../../vaadin-screenshots"/>
<property name="extraParams" value="-ea"/>
<property name="teamcity.ant.junit-support.enabled" value="false"/>
<property name="useLocalWebDriver" value="true"/>
<property name="vaadin.maven.version" value="7.6.LATEST"/>
<property name="vaadin.version" value="${project.version}"/>
</ant>
</target>
</configuration>
</execution>
-->

</executions>
<dependencies>
<dependency>
<groupId>org.apache.ivy</groupId>
<artifactId>ivy</artifactId>
<version>2.4.0</version>
</dependency>
</dependencies>
</plugin>


<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.4</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.7</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>

</project>

0 comments on commit dd69d1a

Please sign in to comment.