This patch refactors the generic integration test war into two jar dependencies and individual modules for different servers. There is now a common approach for making configurations for the remaining server tests still executed through an Ant build script.tags/8.2.0.alpha3
@@ -1,5 +1,24 @@ | |||
# Vaadin Test | |||
This is a test project to verify the basic functionality of various related plugins and addons. | |||
To validate a given Vaadin Version, run `mvn clean verify -Dvaadin.version=VERSIONNUMBER` | |||
## General use | |||
To validate a given Vaadin Version, run `mvn clean verify -Dvaadin.version=VERSIONNUMBER`. | |||
## Server testing | |||
To validate only server compatibility, run `mvn clean verify -Dvaadin.version=VERSIONNUMBER` in the `servlet-containers` module. | |||
To test only a subset of the servers, there are profiles with the server name. For example `-P wildfly` runs all Wildfly tests, `-P glassfish,jetty` runs all the Glassfish and Jetty tests. | |||
## Running an individual test locally | |||
To install dependencies for testing an individual module locally, run `mvn clean install -Dinstall.skip=false` in the dependency module. | |||
For example you can install all dependencies for running any individual server test module with the following command in the test root: | |||
``` | |||
mvn clean install -Dinstall.skip=false -pl .,servlet-containers,servlet-containers/generic-ui,servlet-containers/generic-tests | |||
``` | |||
Note that `mvn clean install` needs to be executed in the top-level test project or in the widget-set-testutil subproject before running tests for any individual submodule. | |||
This will install the parent POMs on both levels as well as the UI and server test dependencies. |
@@ -18,8 +18,18 @@ | |||
<failOnMissingWebXml>false</failOnMissingWebXml> | |||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | |||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> | |||
<!-- Don't care about coding style for tests --> | |||
<sonar.skip>true</sonar.skip> | |||
<!-- Allow installing for local testing purposes --> | |||
<install.skip>true</install.skip> | |||
<!-- Default server.name is "jetty", used in server tests --> | |||
<server.name>jetty</server.name> | |||
<!-- Default reference screenshot location, relative to the module path --> | |||
<reference.directory>${project.basedir}/../screenshots</reference.directory> | |||
</properties> | |||
<repositories> | |||
@@ -53,6 +63,11 @@ | |||
<artifactId>vaadin-test-widget-set-testutil</artifactId> | |||
<version>${project.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>junit</groupId> | |||
<artifactId>junit</artifactId> | |||
<version>4.12</version> | |||
</dependency> | |||
</dependencies> | |||
</dependencyManagement> | |||
@@ -80,7 +95,6 @@ | |||
<dependency> | |||
<groupId>junit</groupId> | |||
<artifactId>junit</artifactId> | |||
<version>4.12</version> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
@@ -101,10 +115,11 @@ | |||
<module>space in directory</module> | |||
<module>vaadinservletconfiguration-widget-set</module> | |||
<module>spring-boot</module> | |||
<module>servlet-containers/generic</module> | |||
<module>cdi</module> | |||
<module>servlet-containers/jsp-integration</module> | |||
<module>servlet-containers/karaf</module> | |||
<!-- Servlet container tests --> | |||
<module>servlet-containers</module> | |||
<module>bean-api-validation</module> | |||
<module>bean-impl-validation</module> | |||
<module>dependency-rewrite-addon</module> | |||
@@ -150,7 +165,7 @@ | |||
<artifactId>maven-install-plugin</artifactId> | |||
<version>2.5.1</version> | |||
<configuration> | |||
<skip>true</skip> | |||
<skip>${install.skip}</skip> | |||
</configuration> | |||
</plugin> | |||
<plugin> | |||
@@ -233,7 +248,12 @@ | |||
<configuration> | |||
<systemPropertyVariables> | |||
<phantomjs.binary.path>${phantomjs.binary}</phantomjs.binary.path> | |||
<server-name>${server.name}</server-name> | |||
<com.vaadin.testbench.Parameters.screenshotReferenceDirectory>${reference.directory}</com.vaadin.testbench.Parameters.screenshotReferenceDirectory> | |||
<com.vaadin.testbench.Parameters.screenshotErrorDirectory>target/error-screenshots</com.vaadin.testbench.Parameters.screenshotErrorDirectory> | |||
</systemPropertyVariables> | |||
<!-- Run all the tests, don't stop on first failure --> | |||
<testFailureIgnore>true</testFailureIgnore> | |||
</configuration> | |||
</plugin> | |||
</plugins> |
@@ -0,0 +1,33 @@ | |||
<?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-servlet-containers-test</artifactId> | |||
<version>8.2-SNAPSHOT</version> | |||
</parent> | |||
<artifactId>vaadin-test-server-tests</artifactId> | |||
<name>vaadin-test-server-tests</name> | |||
<packaging>jar</packaging> | |||
<properties> | |||
<jetty.skip>true</jetty.skip> | |||
</properties> | |||
<dependencies> | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-test-server-ui</artifactId> | |||
<version>${project.version}</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-testbench-api</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>junit</groupId> | |||
<artifactId>junit</artifactId> | |||
</dependency> | |||
</dependencies> | |||
</project> |
@@ -3,7 +3,6 @@ package com.vaadin.tests.integration; | |||
import java.awt.image.BufferedImage; | |||
import java.io.File; | |||
import java.io.IOException; | |||
import java.util.List; | |||
import java.util.logging.Logger; | |||
import java.util.stream.Collectors; | |||
import java.util.stream.Stream; | |||
@@ -12,24 +11,19 @@ import javax.imageio.ImageIO; | |||
import org.junit.After; | |||
import org.junit.runner.RunWith; | |||
import org.openqa.selenium.remote.DesiredCapabilities; | |||
import org.openqa.selenium.support.ui.ExpectedCondition; | |||
import org.openqa.selenium.support.ui.WebDriverWait; | |||
import com.vaadin.testbench.annotations.BrowserConfiguration; | |||
import com.vaadin.testbench.annotations.BrowserFactory; | |||
import com.vaadin.testbench.annotations.RunOnHub; | |||
import com.vaadin.testbench.annotations.RunLocally; | |||
import com.vaadin.testbench.elements.UIElement; | |||
import com.vaadin.testbench.parallel.Browser; | |||
import com.vaadin.testbench.parallel.BrowserUtil; | |||
import com.vaadin.testbench.parallel.ParallelRunner; | |||
import com.vaadin.testbench.parallel.ParallelTest; | |||
import com.vaadin.testbench.parallel.TestNameSuffix; | |||
import com.vaadin.testbench.screenshot.ImageFileUtil; | |||
@RunOnHub("tb3-hub.intra.itmill.com") | |||
@RunLocally(Browser.PHANTOMJS) | |||
@RunWith(ParallelRunner.class) | |||
@BrowserFactory(CustomBrowserFactory.class) | |||
@TestNameSuffix(property = "server-name") | |||
public abstract class AbstractIntegrationTest extends ParallelTest { | |||
@@ -45,16 +39,6 @@ public abstract class AbstractIntegrationTest extends ParallelTest { | |||
private boolean screenshotErrors; | |||
@BrowserConfiguration | |||
public final List<DesiredCapabilities> getBrowsersToTest() { | |||
return getBrowsers().map(BrowserUtil.getBrowserFactory()::create) | |||
.collect(Collectors.toList()); | |||
} | |||
protected Stream<Browser> getBrowsers() { | |||
return Stream.of(Browser.PHANTOMJS); | |||
} | |||
@Override | |||
public void setup() throws Exception { | |||
super.setup(); | |||
@@ -88,8 +72,8 @@ public abstract class AbstractIntegrationTest extends ParallelTest { | |||
private String getDeploymentURL() { | |||
String deploymentUrl = System.getProperty("deployment.url"); | |||
if (deploymentUrl == null || deploymentUrl.isEmpty()) { | |||
throw new RuntimeException( | |||
"Deployment url must be given as deployment.url"); | |||
// Default to http://localhost:8080 | |||
return "http://localhost:8080"; | |||
} | |||
return deploymentUrl; | |||
} | |||
@@ -100,7 +84,8 @@ public abstract class AbstractIntegrationTest extends ParallelTest { | |||
+ ".png"; | |||
String errorFileName = identifier + "-" | |||
+ getDesiredCapabilities().getBrowserName().toLowerCase() + "-" | |||
+ System.getProperty("server-name") + ".png"; | |||
+ System.getProperty("server-name") + "[" | |||
+ getClass().getSimpleName() + "].png"; | |||
File referenceFile = ImageFileUtil | |||
.getReferenceScreenshotFile(refFileName); | |||
try { |
@@ -0,0 +1,30 @@ | |||
package com.vaadin.tests.integration; | |||
import org.junit.Assert; | |||
import org.junit.Test; | |||
import com.vaadin.testbench.elements.GridElement; | |||
import com.vaadin.testbench.elements.LabelElement; | |||
public abstract class AbstractServletIntegrationTest | |||
extends AbstractIntegrationTest { | |||
@Test | |||
public void runTest() throws Exception { | |||
// Test initial state | |||
GridElement grid = $(GridElement.class).first(); | |||
Assert.assertFalse("Row should not be initially selected", | |||
grid.getRow(0).isSelected()); | |||
compareScreen("initial"); | |||
// Test selection and side effects | |||
grid.getCell(0, 1).click(); | |||
Assert.assertTrue("Row should be selected on click", | |||
grid.getRow(0).isSelected()); | |||
Assert.assertEquals("Text label should contain 'FI'", "FI", | |||
$(LabelElement.class).first().getText()); | |||
compareScreen("finland"); | |||
} | |||
} |
@@ -20,6 +20,8 @@ import static org.junit.Assert.assertEquals; | |||
import java.util.ArrayList; | |||
import java.util.List; | |||
import org.junit.Assume; | |||
import org.junit.Before; | |||
import org.junit.Test; | |||
import org.junit.runner.RunWith; | |||
import org.junit.runners.Parameterized; | |||
@@ -28,7 +30,6 @@ import org.junit.runners.Parameterized.Parameters; | |||
import org.openqa.selenium.By; | |||
import org.openqa.selenium.WebElement; | |||
import com.vaadin.testbench.parallel.Browser; | |||
import com.vaadin.tests.integration.AbstractIntegrationTest; | |||
@RunWith(Parameterized.class) | |||
@@ -56,9 +57,10 @@ public class LongPollingProxyServerIT extends AbstractIntegrationTest { | |||
@Parameter(1) | |||
public String path; | |||
@Override | |||
@Before | |||
public void setup() throws Exception { | |||
setDesiredCapabilities(Browser.PHANTOMJS.getDesiredCapabilities()); | |||
Assume.assumeTrue( | |||
"wildfly9-nginx".equals(System.getProperty("server-name"))); | |||
super.setup(); | |||
} | |||
@@ -81,10 +83,15 @@ public class LongPollingProxyServerIT extends AbstractIntegrationTest { | |||
} | |||
@Override | |||
protected String getTestPath() { | |||
protected String getContextPath() { | |||
return "/" + path + "/demo"; | |||
} | |||
@Override | |||
protected String getTestPath() { | |||
return "/"; | |||
} | |||
private int getClientCounter() { | |||
WebElement clientCounterElem = findElement( | |||
By.id(BasicPush.CLIENT_COUNTER_ID)); |
@@ -0,0 +1,27 @@ | |||
<?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-servlet-containers-test</artifactId> | |||
<version>8.2-SNAPSHOT</version> | |||
</parent> | |||
<artifactId>vaadin-test-server-ui</artifactId> | |||
<name>vaadin-test-server-ui</name> | |||
<packaging>jar</packaging> | |||
<properties> | |||
<jetty.skip>true</jetty.skip> | |||
</properties> | |||
<dependencies> | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-client-compiled</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-push</artifactId> | |||
</dependency> | |||
</dependencies> | |||
</project> |
@@ -56,6 +56,7 @@ | |||
</antcall> | |||
</target> | |||
<target name="run-tb3-test"> | |||
<fail unless="phantomjs.binary.path" message="Define PhantomJS binary using -Dphantomjs.binary.path" /> | |||
<fail unless="server-name" message="Server name must be defined in server-name" /> | |||
<fail unless="deployment.url" message="Deplyoment url must be defined in deployment.url" /> | |||
<fail unless="com.vaadin.testbench.screenshot.directory" message="Screenshot directory must be defined in com.vaadin.testbench.screenshot.directory" /> | |||
@@ -73,6 +74,7 @@ | |||
<jvmarg value="-Djava.awt.headless=true" /> | |||
<jvmarg value="-Ddemo.war=${demo.war}" /> | |||
<jvmarg value="-Dvaadin.testbench.developer.license=${vaadin.testbench.developer.license}" /> | |||
<jvmarg value="-Dphantomjs.binary.path=${phantomjs.binary.path}" /> | |||
<test name="${junit.test.suite}" todir="${server.report.dir}" /> | |||
</junit> | |||
</target> | |||
@@ -102,14 +104,14 @@ | |||
<param name="target-server" value="jetty8" /> | |||
</antcall> | |||
</target> | |||
<!-- | |||
<target name="integration-test-jetty9"> | |||
<antcall target="run-generic-integration-test"> | |||
<param name="startDelay" value="90" /> | |||
<param name="target-server" value="jetty9" /> | |||
</antcall> | |||
</target> | |||
--> | |||
<target name="integration-test-jboss-eap6"> | |||
<antcall target="run-generic-integration-test"> | |||
<param name="startDelay" value="10" /> | |||
@@ -123,6 +125,7 @@ | |||
<param name="target-server" value="wildfly8" /> | |||
</antcall> | |||
</target> | |||
<!-- | |||
<target name="integration-test-wildfly9"> | |||
<antcall target="run-generic-integration-test"> | |||
<param name="startDelay" value="10" /> | |||
@@ -135,6 +138,7 @@ | |||
<param name="target-server" value="wildfly10" /> | |||
</antcall> | |||
</target> | |||
--> | |||
<target name="integration-test-wildfly9-nginx"> | |||
<antcall target="run-generic-integration-test"> | |||
<param name="startDelay" value="10" /> | |||
@@ -180,10 +184,10 @@ | |||
<antcall target="integration-test-payara" /> | |||
<antcall target="integration-test-jboss-eap6" /> | |||
<antcall target="integration-test-wildfly8" /> | |||
<antcall target="integration-test-wildfly9" /> | |||
<antcall target="integration-test-wildfly10" /> | |||
<!-- <antcall target="integration-test-wildfly9" /> | |||
<antcall target="integration-test-wildfly10" /> --> | |||
<antcall target="integration-test-jetty8" /> | |||
<antcall target="integration-test-jetty9" /> | |||
<!-- <antcall target="integration-test-jetty9" /> --> | |||
<antcall target="integration-test-tomcat7" /> | |||
<antcall target="integration-test-tomcat8" /> | |||
<antcall target="integration-test-tomcat7apacheproxy" /> |
@@ -4,9 +4,8 @@ | |||
<modelVersion>4.0.0</modelVersion> | |||
<parent> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-test</artifactId> | |||
<artifactId>vaadin-servlet-containers-test</artifactId> | |||
<version>8.2-SNAPSHOT</version> | |||
<relativePath>../..</relativePath> | |||
</parent> | |||
<artifactId>vaadin-test-generic-integration</artifactId> | |||
<name>vaadin-test-generic-integration</name> | |||
@@ -15,51 +14,42 @@ | |||
<jetty.skip>true</jetty.skip> | |||
</properties> | |||
<dependencies> | |||
<!-- Project modules --> | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-compatibility-server</artifactId> | |||
</dependency> | |||
<!-- This module exists only to run the Ant based server tests. | |||
It will be removed in the future. --> | |||
<dependencies> | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-compatibility-client-compiled</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-compatibility-themes</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-client-compiled</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-push</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-testbench-api</artifactId> | |||
<scope>test</scope> | |||
<artifactId>vaadin-test-server-ui</artifactId> | |||
<version>${project.version}</version> | |||
</dependency> | |||
</dependencies> | |||
<build> | |||
<plugins> | |||
<!--TODO run this on different servers --> | |||
<!-- Extract test classes for ant script to use --> | |||
<plugin> | |||
<groupId>org.eclipse.jetty</groupId> | |||
<artifactId>jetty-maven-plugin</artifactId> | |||
<version>${jetty.version}</version> | |||
<configuration> | |||
<webApp> | |||
<contextPath>/demo</contextPath> | |||
</webApp> | |||
</configuration> | |||
<artifactId>maven-dependency-plugin</artifactId> | |||
<executions> | |||
<execution> | |||
<id>unpack-tests</id> | |||
<phase>package</phase> | |||
<configuration> | |||
<artifactItems> | |||
<artifactItem> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-test-server-tests</artifactId> | |||
<version>${project.version}</version> | |||
<includes>**/*.class</includes> | |||
</artifactItem> | |||
</artifactItems> | |||
<outputDirectory>${project.build.directory}/test-classes</outputDirectory> | |||
</configuration> | |||
<goals> | |||
<goal>unpack</goal> | |||
</goals> | |||
</execution> | |||
</executions> | |||
</plugin> | |||
<plugin> | |||
<artifactId>maven-deploy-plugin</artifactId> |
@@ -1,21 +0,0 @@ | |||
package com.vaadin.tests.integration; | |||
import org.junit.Test; | |||
import com.vaadin.testbench.elements.GridElement; | |||
public abstract class AbstractServletIntegrationTest | |||
extends AbstractIntegrationTest { | |||
@Test | |||
public void runTest() throws Exception { | |||
// make sure no fading progress indicator from table update is lingering | |||
Thread.sleep(2000); | |||
compareScreen("initial"); | |||
$(GridElement.class).first().getCell(0, 1).click(); | |||
// without this, table fetch might have a fading progress indicator | |||
Thread.sleep(2000); | |||
compareScreen("finland"); | |||
} | |||
} |
@@ -1,21 +0,0 @@ | |||
package com.vaadin.tests.integration; | |||
import org.openqa.selenium.remote.DesiredCapabilities; | |||
import com.vaadin.testbench.parallel.Browser; | |||
import com.vaadin.testbench.parallel.BrowserUtil; | |||
import com.vaadin.testbench.parallel.DefaultBrowserFactory; | |||
public class CustomBrowserFactory extends DefaultBrowserFactory { | |||
@Override | |||
public DesiredCapabilities create(Browser browser) { | |||
DesiredCapabilities capabilities = super.create(browser); | |||
if (BrowserUtil.isPhantomJS(capabilities)) { | |||
capabilities.setVersion("2"); | |||
capabilities.setCapability("phantomjs.binary.path", | |||
"/usr/bin/phantomjs2"); | |||
} | |||
return capabilities; | |||
} | |||
} |
@@ -0,0 +1,43 @@ | |||
<?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-servlet-containers-test</artifactId> | |||
<version>8.2-SNAPSHOT</version> | |||
</parent> | |||
<artifactId>vaadin-test-jetty9-server</artifactId> | |||
<name>Vaadin Jetty 9 Test</name> | |||
<packaging>war</packaging> | |||
<properties> | |||
<jetty.skip>false</jetty.skip> | |||
<jetty.version>9.3.21.v20170918</jetty.version> | |||
<server.name>jetty9</server.name> | |||
</properties> | |||
<dependencies> | |||
<!-- UI classes and tests from dependencies --> | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-test-server-ui</artifactId> | |||
<version>${project.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-test-server-tests</artifactId> | |||
<version>${project.version}</version> | |||
<scope>test</scope> | |||
</dependency> | |||
</dependencies> | |||
<build> | |||
<plugins> | |||
<!-- Server configuration --> | |||
<plugin> | |||
<groupId>org.eclipse.jetty</groupId> | |||
<artifactId>jetty-maven-plugin</artifactId> | |||
</plugin> | |||
</plugins> | |||
</build> | |||
</project> |
@@ -4,9 +4,8 @@ | |||
<modelVersion>4.0.0</modelVersion> | |||
<parent> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-test</artifactId> | |||
<artifactId>vaadin-servlet-containers-test</artifactId> | |||
<version>8.2-SNAPSHOT</version> | |||
<relativePath>../..</relativePath> | |||
</parent> | |||
<artifactId>vaadin-test-jsp-integration</artifactId> | |||
<name>vaadin-test-jsp-integration</name> |
@@ -5,7 +5,6 @@ | |||
<parent> | |||
<artifactId>vaadin-test-karaf</artifactId> | |||
<groupId>com.vaadin</groupId> | |||
<relativePath>..</relativePath> | |||
<version>8.2-SNAPSHOT</version> | |||
</parent> | |||
<modelVersion>4.0.0</modelVersion> |
@@ -4,9 +4,8 @@ | |||
<modelVersion>4.0.0</modelVersion> | |||
<parent> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-test</artifactId> | |||
<artifactId>vaadin-servlet-containers-test</artifactId> | |||
<version>8.2-SNAPSHOT</version> | |||
<relativePath>../..</relativePath> | |||
</parent> | |||
<artifactId>vaadin-test-karaf</artifactId> | |||
<packaging>pom</packaging> |
@@ -7,7 +7,6 @@ | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-test-karaf</artifactId> | |||
<version>8.2-SNAPSHOT</version> | |||
<relativePath>..</relativePath> | |||
</parent> | |||
<artifactId>vaadin-karaf-bundle1</artifactId> | |||
<packaging>jar</packaging> |
@@ -6,7 +6,6 @@ | |||
<parent> | |||
<artifactId>vaadin-test-karaf</artifactId> | |||
<groupId>com.vaadin</groupId> | |||
<relativePath>..</relativePath> | |||
<version>8.2-SNAPSHOT</version> | |||
</parent> | |||
<artifactId>vaadin-karaf-bundle2</artifactId> |
@@ -0,0 +1,119 @@ | |||
<?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-test</artifactId> | |||
<version>8.2-SNAPSHOT</version> | |||
</parent> | |||
<artifactId>vaadin-servlet-containers-test</artifactId> | |||
<name>vaadin-servlet-containers-test</name> | |||
<packaging>pom</packaging> | |||
<modules> | |||
<module>generic-ui</module> | |||
<module>generic-tests</module> | |||
</modules> | |||
<build> | |||
<pluginManagement> | |||
<plugins> | |||
<plugin> | |||
<groupId>org.wildfly.plugins</groupId> | |||
<artifactId>wildfly-maven-plugin</artifactId> | |||
<version>1.2.0.Final</version> | |||
<executions> | |||
<execution> | |||
<id>start-wildfly</id> | |||
<phase>pre-integration-test</phase> | |||
<goals> | |||
<goal>start</goal> | |||
<goal>deploy</goal> | |||
</goals> | |||
<configuration> | |||
<!-- Context path comes from WAR deployment name --> | |||
<name>demo.war</name> | |||
</configuration> | |||
</execution> | |||
<execution> | |||
<id>stop-wildfly</id> | |||
<phase>post-integration-test</phase> | |||
<goals> | |||
<goal>shutdown</goal> | |||
</goals> | |||
</execution> | |||
</executions> | |||
</plugin> | |||
<plugin> | |||
<groupId>org.eclipse.jetty</groupId> | |||
<artifactId>jetty-maven-plugin</artifactId> | |||
<configuration> | |||
<webApp> | |||
<contextPath>/demo</contextPath> | |||
</webApp> | |||
</configuration> | |||
</plugin> | |||
<!-- General purpose plugins --> | |||
<plugin> | |||
<artifactId>maven-deploy-plugin</artifactId> | |||
<configuration> | |||
<skip>true</skip> | |||
</configuration> | |||
</plugin> | |||
<plugin> | |||
<artifactId>maven-surefire-plugin</artifactId> | |||
<configuration> | |||
<skip>true</skip> | |||
</configuration> | |||
</plugin> | |||
<plugin> | |||
<artifactId>maven-failsafe-plugin</artifactId> | |||
<configuration> | |||
<dependenciesToScan> | |||
<dependency>${project.groupId}:vaadin-test-server-tests</dependency> | |||
</dependenciesToScan> | |||
</configuration> | |||
</plugin> | |||
</plugins> | |||
</pluginManagement> | |||
</build> | |||
<profiles> | |||
<profile> | |||
<id>all</id> | |||
<activation> | |||
<activeByDefault>true</activeByDefault> | |||
</activation> | |||
<modules> | |||
<module>jsp-integration</module> | |||
<module>karaf</module> | |||
<module>wildfly10</module> | |||
<module>wildfly9</module> | |||
<module>jetty9</module> | |||
</modules> | |||
</profile> | |||
<!-- TODO Remove this when the ant build is no longer used. --> | |||
<profile> | |||
<id>ant-test</id> | |||
<modules> | |||
<module>generic</module> | |||
</modules> | |||
</profile> | |||
<profile> | |||
<id>wildfly</id> | |||
<modules> | |||
<module>wildfly10</module> | |||
<module>wildfly9</module> | |||
</modules> | |||
</profile> | |||
<profile> | |||
<id>jetty</id> | |||
<modules> | |||
<module>jetty9</module> | |||
</modules> | |||
</profile> | |||
</profiles> | |||
</project> |
@@ -0,0 +1,43 @@ | |||
<?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-servlet-containers-test</artifactId> | |||
<version>8.2-SNAPSHOT</version> | |||
</parent> | |||
<artifactId>vaadin-test-wildfly10-server</artifactId> | |||
<name>Vaadin Wildfly 10 Test</name> | |||
<packaging>war</packaging> | |||
<properties> | |||
<jetty.skip>true</jetty.skip> | |||
<wildfly.version>10.1.0.Final</wildfly.version> | |||
<server.name>wildfly10</server.name> | |||
</properties> | |||
<dependencies> | |||
<!-- UI classes and tests from dependencies --> | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-test-server-ui</artifactId> | |||
<version>${project.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-test-server-tests</artifactId> | |||
<version>${project.version}</version> | |||
<scope>test</scope> | |||
</dependency> | |||
</dependencies> | |||
<build> | |||
<plugins> | |||
<!-- Server configuration --> | |||
<plugin> | |||
<groupId>org.wildfly.plugins</groupId> | |||
<artifactId>wildfly-maven-plugin</artifactId> | |||
</plugin> | |||
</plugins> | |||
</build> | |||
</project> |
@@ -0,0 +1,43 @@ | |||
<?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-servlet-containers-test</artifactId> | |||
<version>8.2-SNAPSHOT</version> | |||
</parent> | |||
<artifactId>vaadin-test-wildfly9-server</artifactId> | |||
<name>Vaadin Wildfly 9 Test</name> | |||
<packaging>war</packaging> | |||
<properties> | |||
<jetty.skip>true</jetty.skip> | |||
<wildfly.version>9.0.2.Final</wildfly.version> | |||
<server.name>wildfly9</server.name> | |||
</properties> | |||
<dependencies> | |||
<!-- UI classes and tests from dependencies --> | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-test-server-ui</artifactId> | |||
<version>${project.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-test-server-tests</artifactId> | |||
<version>${project.version}</version> | |||
<scope>test</scope> | |||
</dependency> | |||
</dependencies> | |||
<build> | |||
<plugins> | |||
<!-- Server configuration --> | |||
<plugin> | |||
<groupId>org.wildfly.plugins</groupId> | |||
<artifactId>wildfly-maven-plugin</artifactId> | |||
</plugin> | |||
</plugins> | |||
</build> | |||
</project> |