From 3cbd834842319d151d9248706bc14e14a3abca42 Mon Sep 17 00:00:00 2001 From: Teemu Suo-Anttila Date: Thu, 5 Oct 2017 10:09:22 +0300 Subject: [PATCH] Add maven based server tests for Wildfly and Jetty (#10116) 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. --- test/README.md | 23 +++- test/pom.xml | 30 ++++- test/servlet-containers/generic-tests/pom.xml | 33 +++++ .../integration/AbstractIntegrationTest.java | 27 +--- .../AbstractServletIntegrationTest.java | 30 +++++ .../ServletIntegrationDefaultPushIT.java | 0 .../integration/ServletIntegrationIT.java | 0 .../ServletIntegrationLongPollingIT.java | 0 .../ServletIntegrationStreamingIT.java | 0 .../integration/ServletIntegrationTests.java | 0 .../push/LongPollingProxyServerIT.java | 15 ++- .../ServletIntegrationWebsocketIT.java | 0 .../ServletIntegrationJSR356WebsocketIT.java | 0 test/servlet-containers/generic-ui/pom.xml | 27 ++++ .../tests/IntegrationTestUIProvider.java | 0 .../java/com/vaadin/tests/JSR356Servlet.java | 0 .../tests/ServerIntegrationTestServlet.java | 0 .../tests/integration/FlagSeResource.java | 0 .../ServletIntegrationDefaultPushUI.java | 0 .../ServletIntegrationLongPollingUI.java | 0 .../ServletIntegrationStreamingUI.java | 0 .../integration/ServletIntegrationUI.java | 0 .../ServletIntegrationWebsocketUI.java | 0 .../integration/push/AbstractTestUI.java | 0 .../tests/integration/push/BasicPush.java | 0 .../push/BasicPushLongPolling.java | 0 .../tests/integration/LabelFromDesign.html | 0 .../com/vaadin/tests/integration/fi.gif | Bin .../com/vaadin/tests/integration/se.gif | Bin .../generic/integration_tests.xml | 14 ++- test/servlet-containers/generic/pom.xml | 66 +++++----- .../AbstractServletIntegrationTest.java | 21 ---- .../integration/CustomBrowserFactory.java | 21 ---- test/servlet-containers/jetty9/pom.xml | 43 +++++++ .../jsp-integration/pom.xml | 3 +- .../karaf/karaf-run/pom.xml | 1 - test/servlet-containers/karaf/pom.xml | 3 +- .../karaf/vaadin-karaf-bundle1/pom.xml | 1 - .../karaf/vaadin-karaf-bundle2/pom.xml | 1 - test/servlet-containers/pom.xml | 119 ++++++++++++++++++ .../screenshots/finland-phantomjs.png | Bin 0 -> 10897 bytes .../screenshots/initial-phantomjs.png | Bin 0 -> 10130 bytes test/servlet-containers/wildfly10/pom.xml | 43 +++++++ test/servlet-containers/wildfly9/pom.xml | 43 +++++++ 44 files changed, 440 insertions(+), 124 deletions(-) create mode 100644 test/servlet-containers/generic-tests/pom.xml rename test/servlet-containers/{generic/src/test => generic-tests/src/main}/java/com/vaadin/tests/integration/AbstractIntegrationTest.java (81%) create mode 100644 test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java rename test/servlet-containers/{generic/src/test => generic-tests/src/main}/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushIT.java (100%) rename test/servlet-containers/{generic/src/test => generic-tests/src/main}/java/com/vaadin/tests/integration/ServletIntegrationIT.java (100%) rename test/servlet-containers/{generic/src/test => generic-tests/src/main}/java/com/vaadin/tests/integration/ServletIntegrationLongPollingIT.java (100%) rename test/servlet-containers/{generic/src/test => generic-tests/src/main}/java/com/vaadin/tests/integration/ServletIntegrationStreamingIT.java (100%) rename test/servlet-containers/{generic/src/test => generic-tests/src/main}/java/com/vaadin/tests/integration/ServletIntegrationTests.java (100%) rename test/servlet-containers/{generic/src/test => generic-tests/src/main}/java/com/vaadin/tests/integration/push/LongPollingProxyServerIT.java (93%) rename test/servlet-containers/{generic/src/test => generic-tests/src/main}/java/com/vaadin/tests/integration/websocket/ServletIntegrationWebsocketIT.java (100%) rename test/servlet-containers/{generic/src/test => generic-tests/src/main}/java/com/vaadin/tests/integration/websocket/jsr356/ServletIntegrationJSR356WebsocketIT.java (100%) create mode 100644 test/servlet-containers/generic-ui/pom.xml rename test/servlet-containers/{generic => generic-ui}/src/main/java/com/vaadin/tests/IntegrationTestUIProvider.java (100%) rename test/servlet-containers/{generic => generic-ui}/src/main/java/com/vaadin/tests/JSR356Servlet.java (100%) rename test/servlet-containers/{generic => generic-ui}/src/main/java/com/vaadin/tests/ServerIntegrationTestServlet.java (100%) rename test/servlet-containers/{generic => generic-ui}/src/main/java/com/vaadin/tests/integration/FlagSeResource.java (100%) rename test/servlet-containers/{generic => generic-ui}/src/main/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushUI.java (100%) rename test/servlet-containers/{generic => generic-ui}/src/main/java/com/vaadin/tests/integration/ServletIntegrationLongPollingUI.java (100%) rename test/servlet-containers/{generic => generic-ui}/src/main/java/com/vaadin/tests/integration/ServletIntegrationStreamingUI.java (100%) rename test/servlet-containers/{generic => generic-ui}/src/main/java/com/vaadin/tests/integration/ServletIntegrationUI.java (100%) rename test/servlet-containers/{generic => generic-ui}/src/main/java/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java (100%) rename test/servlet-containers/{generic => generic-ui}/src/main/java/com/vaadin/tests/integration/push/AbstractTestUI.java (100%) rename test/servlet-containers/{generic => generic-ui}/src/main/java/com/vaadin/tests/integration/push/BasicPush.java (100%) rename test/servlet-containers/{generic => generic-ui}/src/main/java/com/vaadin/tests/integration/push/BasicPushLongPolling.java (100%) rename test/servlet-containers/{generic => generic-ui}/src/main/resources/com/vaadin/tests/integration/LabelFromDesign.html (100%) rename test/servlet-containers/{generic => generic-ui}/src/main/resources/com/vaadin/tests/integration/fi.gif (100%) rename test/servlet-containers/{generic => generic-ui}/src/main/resources/com/vaadin/tests/integration/se.gif (100%) delete mode 100644 test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java delete mode 100644 test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/CustomBrowserFactory.java create mode 100644 test/servlet-containers/jetty9/pom.xml create mode 100644 test/servlet-containers/pom.xml create mode 100644 test/servlet-containers/screenshots/finland-phantomjs.png create mode 100644 test/servlet-containers/screenshots/initial-phantomjs.png create mode 100644 test/servlet-containers/wildfly10/pom.xml create mode 100644 test/servlet-containers/wildfly9/pom.xml diff --git a/test/README.md b/test/README.md index ca9e61c57c..b89a34da49 100644 --- a/test/README.md +++ b/test/README.md @@ -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. diff --git a/test/pom.xml b/test/pom.xml index 421eeae590..57b0143a80 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -18,8 +18,18 @@ false UTF-8 UTF-8 + true + + + true + + + jetty + + + ${project.basedir}/../screenshots @@ -53,6 +63,11 @@ vaadin-test-widget-set-testutil ${project.version} + + junit + junit + 4.12 + @@ -80,7 +95,6 @@ junit junit - 4.12 test @@ -101,10 +115,11 @@ space in directory vaadinservletconfiguration-widget-set spring-boot - servlet-containers/generic cdi - servlet-containers/jsp-integration - servlet-containers/karaf + + + servlet-containers + bean-api-validation bean-impl-validation dependency-rewrite-addon @@ -150,7 +165,7 @@ maven-install-plugin 2.5.1 - true + ${install.skip} @@ -233,7 +248,12 @@ ${phantomjs.binary} + ${server.name} + ${reference.directory} + target/error-screenshots + + true diff --git a/test/servlet-containers/generic-tests/pom.xml b/test/servlet-containers/generic-tests/pom.xml new file mode 100644 index 0000000000..b107c40d0a --- /dev/null +++ b/test/servlet-containers/generic-tests/pom.xml @@ -0,0 +1,33 @@ + + + 4.0.0 + + com.vaadin + vaadin-servlet-containers-test + 8.2-SNAPSHOT + + vaadin-test-server-tests + vaadin-test-server-tests + jar + + true + + + + + com.vaadin + vaadin-test-server-ui + ${project.version} + provided + + + com.vaadin + vaadin-testbench-api + + + junit + junit + + + diff --git a/test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/AbstractIntegrationTest.java b/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/AbstractIntegrationTest.java similarity index 81% rename from test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/AbstractIntegrationTest.java rename to test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/AbstractIntegrationTest.java index 10ad299a4b..79d75f6651 100644 --- a/test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/AbstractIntegrationTest.java +++ b/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/AbstractIntegrationTest.java @@ -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 getBrowsersToTest() { - return getBrowsers().map(BrowserUtil.getBrowserFactory()::create) - .collect(Collectors.toList()); - } - - protected Stream 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 { diff --git a/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java b/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java new file mode 100644 index 0000000000..03d4f1ce18 --- /dev/null +++ b/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java @@ -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"); + + } + +} diff --git a/test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushIT.java b/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushIT.java similarity index 100% rename from test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushIT.java rename to test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushIT.java diff --git a/test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/ServletIntegrationIT.java b/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/ServletIntegrationIT.java similarity index 100% rename from test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/ServletIntegrationIT.java rename to test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/ServletIntegrationIT.java diff --git a/test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/ServletIntegrationLongPollingIT.java b/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/ServletIntegrationLongPollingIT.java similarity index 100% rename from test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/ServletIntegrationLongPollingIT.java rename to test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/ServletIntegrationLongPollingIT.java diff --git a/test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/ServletIntegrationStreamingIT.java b/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/ServletIntegrationStreamingIT.java similarity index 100% rename from test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/ServletIntegrationStreamingIT.java rename to test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/ServletIntegrationStreamingIT.java diff --git a/test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/ServletIntegrationTests.java b/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/ServletIntegrationTests.java similarity index 100% rename from test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/ServletIntegrationTests.java rename to test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/ServletIntegrationTests.java diff --git a/test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/push/LongPollingProxyServerIT.java b/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/push/LongPollingProxyServerIT.java similarity index 93% rename from test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/push/LongPollingProxyServerIT.java rename to test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/push/LongPollingProxyServerIT.java index aa8f87686a..7dfd2aa6e6 100644 --- a/test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/push/LongPollingProxyServerIT.java +++ b/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/push/LongPollingProxyServerIT.java @@ -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)); diff --git a/test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/websocket/ServletIntegrationWebsocketIT.java b/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/websocket/ServletIntegrationWebsocketIT.java similarity index 100% rename from test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/websocket/ServletIntegrationWebsocketIT.java rename to test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/websocket/ServletIntegrationWebsocketIT.java diff --git a/test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/websocket/jsr356/ServletIntegrationJSR356WebsocketIT.java b/test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/websocket/jsr356/ServletIntegrationJSR356WebsocketIT.java similarity index 100% rename from test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/websocket/jsr356/ServletIntegrationJSR356WebsocketIT.java rename to test/servlet-containers/generic-tests/src/main/java/com/vaadin/tests/integration/websocket/jsr356/ServletIntegrationJSR356WebsocketIT.java diff --git a/test/servlet-containers/generic-ui/pom.xml b/test/servlet-containers/generic-ui/pom.xml new file mode 100644 index 0000000000..d54579cec6 --- /dev/null +++ b/test/servlet-containers/generic-ui/pom.xml @@ -0,0 +1,27 @@ + + + 4.0.0 + + com.vaadin + vaadin-servlet-containers-test + 8.2-SNAPSHOT + + vaadin-test-server-ui + vaadin-test-server-ui + jar + + true + + + + + com.vaadin + vaadin-client-compiled + + + com.vaadin + vaadin-push + + + diff --git a/test/servlet-containers/generic/src/main/java/com/vaadin/tests/IntegrationTestUIProvider.java b/test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/IntegrationTestUIProvider.java similarity index 100% rename from test/servlet-containers/generic/src/main/java/com/vaadin/tests/IntegrationTestUIProvider.java rename to test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/IntegrationTestUIProvider.java diff --git a/test/servlet-containers/generic/src/main/java/com/vaadin/tests/JSR356Servlet.java b/test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/JSR356Servlet.java similarity index 100% rename from test/servlet-containers/generic/src/main/java/com/vaadin/tests/JSR356Servlet.java rename to test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/JSR356Servlet.java diff --git a/test/servlet-containers/generic/src/main/java/com/vaadin/tests/ServerIntegrationTestServlet.java b/test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/ServerIntegrationTestServlet.java similarity index 100% rename from test/servlet-containers/generic/src/main/java/com/vaadin/tests/ServerIntegrationTestServlet.java rename to test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/ServerIntegrationTestServlet.java diff --git a/test/servlet-containers/generic/src/main/java/com/vaadin/tests/integration/FlagSeResource.java b/test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/integration/FlagSeResource.java similarity index 100% rename from test/servlet-containers/generic/src/main/java/com/vaadin/tests/integration/FlagSeResource.java rename to test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/integration/FlagSeResource.java diff --git a/test/servlet-containers/generic/src/main/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushUI.java b/test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushUI.java similarity index 100% rename from test/servlet-containers/generic/src/main/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushUI.java rename to test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushUI.java diff --git a/test/servlet-containers/generic/src/main/java/com/vaadin/tests/integration/ServletIntegrationLongPollingUI.java b/test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/integration/ServletIntegrationLongPollingUI.java similarity index 100% rename from test/servlet-containers/generic/src/main/java/com/vaadin/tests/integration/ServletIntegrationLongPollingUI.java rename to test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/integration/ServletIntegrationLongPollingUI.java diff --git a/test/servlet-containers/generic/src/main/java/com/vaadin/tests/integration/ServletIntegrationStreamingUI.java b/test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/integration/ServletIntegrationStreamingUI.java similarity index 100% rename from test/servlet-containers/generic/src/main/java/com/vaadin/tests/integration/ServletIntegrationStreamingUI.java rename to test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/integration/ServletIntegrationStreamingUI.java diff --git a/test/servlet-containers/generic/src/main/java/com/vaadin/tests/integration/ServletIntegrationUI.java b/test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/integration/ServletIntegrationUI.java similarity index 100% rename from test/servlet-containers/generic/src/main/java/com/vaadin/tests/integration/ServletIntegrationUI.java rename to test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/integration/ServletIntegrationUI.java diff --git a/test/servlet-containers/generic/src/main/java/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java b/test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java similarity index 100% rename from test/servlet-containers/generic/src/main/java/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java rename to test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java diff --git a/test/servlet-containers/generic/src/main/java/com/vaadin/tests/integration/push/AbstractTestUI.java b/test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/integration/push/AbstractTestUI.java similarity index 100% rename from test/servlet-containers/generic/src/main/java/com/vaadin/tests/integration/push/AbstractTestUI.java rename to test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/integration/push/AbstractTestUI.java diff --git a/test/servlet-containers/generic/src/main/java/com/vaadin/tests/integration/push/BasicPush.java b/test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/integration/push/BasicPush.java similarity index 100% rename from test/servlet-containers/generic/src/main/java/com/vaadin/tests/integration/push/BasicPush.java rename to test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/integration/push/BasicPush.java diff --git a/test/servlet-containers/generic/src/main/java/com/vaadin/tests/integration/push/BasicPushLongPolling.java b/test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/integration/push/BasicPushLongPolling.java similarity index 100% rename from test/servlet-containers/generic/src/main/java/com/vaadin/tests/integration/push/BasicPushLongPolling.java rename to test/servlet-containers/generic-ui/src/main/java/com/vaadin/tests/integration/push/BasicPushLongPolling.java diff --git a/test/servlet-containers/generic/src/main/resources/com/vaadin/tests/integration/LabelFromDesign.html b/test/servlet-containers/generic-ui/src/main/resources/com/vaadin/tests/integration/LabelFromDesign.html similarity index 100% rename from test/servlet-containers/generic/src/main/resources/com/vaadin/tests/integration/LabelFromDesign.html rename to test/servlet-containers/generic-ui/src/main/resources/com/vaadin/tests/integration/LabelFromDesign.html diff --git a/test/servlet-containers/generic/src/main/resources/com/vaadin/tests/integration/fi.gif b/test/servlet-containers/generic-ui/src/main/resources/com/vaadin/tests/integration/fi.gif similarity index 100% rename from test/servlet-containers/generic/src/main/resources/com/vaadin/tests/integration/fi.gif rename to test/servlet-containers/generic-ui/src/main/resources/com/vaadin/tests/integration/fi.gif diff --git a/test/servlet-containers/generic/src/main/resources/com/vaadin/tests/integration/se.gif b/test/servlet-containers/generic-ui/src/main/resources/com/vaadin/tests/integration/se.gif similarity index 100% rename from test/servlet-containers/generic/src/main/resources/com/vaadin/tests/integration/se.gif rename to test/servlet-containers/generic-ui/src/main/resources/com/vaadin/tests/integration/se.gif diff --git a/test/servlet-containers/generic/integration_tests.xml b/test/servlet-containers/generic/integration_tests.xml index d8a5bba18b..28f941e696 100644 --- a/test/servlet-containers/generic/integration_tests.xml +++ b/test/servlet-containers/generic/integration_tests.xml @@ -56,6 +56,7 @@ + @@ -73,6 +74,7 @@ + @@ -102,14 +104,14 @@ - + @@ -123,6 +125,7 @@ + @@ -180,10 +184,10 @@ - - + - + diff --git a/test/servlet-containers/generic/pom.xml b/test/servlet-containers/generic/pom.xml index aff6403ff5..95e30c7fed 100644 --- a/test/servlet-containers/generic/pom.xml +++ b/test/servlet-containers/generic/pom.xml @@ -4,9 +4,8 @@ 4.0.0 com.vaadin - vaadin-test + vaadin-servlet-containers-test 8.2-SNAPSHOT - ../.. vaadin-test-generic-integration vaadin-test-generic-integration @@ -15,51 +14,42 @@ true - - - - - com.vaadin - vaadin-compatibility-server - + + com.vaadin - vaadin-compatibility-client-compiled - - - com.vaadin - vaadin-compatibility-themes - - - com.vaadin - vaadin-client-compiled - - - com.vaadin - vaadin-push - - - com.vaadin - vaadin-testbench-api - test + vaadin-test-server-ui + ${project.version} - - - + - org.eclipse.jetty - jetty-maven-plugin - ${jetty.version} - - - /demo - - + maven-dependency-plugin + + + unpack-tests + package + + + + com.vaadin + vaadin-test-server-tests + ${project.version} + **/*.class + + + ${project.build.directory}/test-classes + + + unpack + + + maven-deploy-plugin diff --git a/test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java b/test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java deleted file mode 100644 index ddfcb9ec3b..0000000000 --- a/test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java +++ /dev/null @@ -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"); - } - -} diff --git a/test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/CustomBrowserFactory.java b/test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/CustomBrowserFactory.java deleted file mode 100644 index e66d4b6df5..0000000000 --- a/test/servlet-containers/generic/src/test/java/com/vaadin/tests/integration/CustomBrowserFactory.java +++ /dev/null @@ -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; - } -} diff --git a/test/servlet-containers/jetty9/pom.xml b/test/servlet-containers/jetty9/pom.xml new file mode 100644 index 0000000000..d53486f9ff --- /dev/null +++ b/test/servlet-containers/jetty9/pom.xml @@ -0,0 +1,43 @@ + + + 4.0.0 + + com.vaadin + vaadin-servlet-containers-test + 8.2-SNAPSHOT + + vaadin-test-jetty9-server + Vaadin Jetty 9 Test + war + + false + 9.3.21.v20170918 + jetty9 + + + + + + com.vaadin + vaadin-test-server-ui + ${project.version} + + + com.vaadin + vaadin-test-server-tests + ${project.version} + test + + + + + + + + org.eclipse.jetty + jetty-maven-plugin + + + + diff --git a/test/servlet-containers/jsp-integration/pom.xml b/test/servlet-containers/jsp-integration/pom.xml index ed77a8b931..41eaf6cbf4 100644 --- a/test/servlet-containers/jsp-integration/pom.xml +++ b/test/servlet-containers/jsp-integration/pom.xml @@ -4,9 +4,8 @@ 4.0.0 com.vaadin - vaadin-test + vaadin-servlet-containers-test 8.2-SNAPSHOT - ../.. vaadin-test-jsp-integration vaadin-test-jsp-integration diff --git a/test/servlet-containers/karaf/karaf-run/pom.xml b/test/servlet-containers/karaf/karaf-run/pom.xml index 95a7a6f6c6..ca4e7dcd96 100644 --- a/test/servlet-containers/karaf/karaf-run/pom.xml +++ b/test/servlet-containers/karaf/karaf-run/pom.xml @@ -5,7 +5,6 @@ vaadin-test-karaf com.vaadin - .. 8.2-SNAPSHOT 4.0.0 diff --git a/test/servlet-containers/karaf/pom.xml b/test/servlet-containers/karaf/pom.xml index b7411f3523..5e4915e90c 100644 --- a/test/servlet-containers/karaf/pom.xml +++ b/test/servlet-containers/karaf/pom.xml @@ -4,9 +4,8 @@ 4.0.0 com.vaadin - vaadin-test + vaadin-servlet-containers-test 8.2-SNAPSHOT - ../.. vaadin-test-karaf pom diff --git a/test/servlet-containers/karaf/vaadin-karaf-bundle1/pom.xml b/test/servlet-containers/karaf/vaadin-karaf-bundle1/pom.xml index fed65baf27..b49842c4dc 100644 --- a/test/servlet-containers/karaf/vaadin-karaf-bundle1/pom.xml +++ b/test/servlet-containers/karaf/vaadin-karaf-bundle1/pom.xml @@ -7,7 +7,6 @@ com.vaadin vaadin-test-karaf 8.2-SNAPSHOT - .. vaadin-karaf-bundle1 jar diff --git a/test/servlet-containers/karaf/vaadin-karaf-bundle2/pom.xml b/test/servlet-containers/karaf/vaadin-karaf-bundle2/pom.xml index 4a6a0efe24..52227d0a66 100644 --- a/test/servlet-containers/karaf/vaadin-karaf-bundle2/pom.xml +++ b/test/servlet-containers/karaf/vaadin-karaf-bundle2/pom.xml @@ -6,7 +6,6 @@ vaadin-test-karaf com.vaadin - .. 8.2-SNAPSHOT vaadin-karaf-bundle2 diff --git a/test/servlet-containers/pom.xml b/test/servlet-containers/pom.xml new file mode 100644 index 0000000000..7727c86c4f --- /dev/null +++ b/test/servlet-containers/pom.xml @@ -0,0 +1,119 @@ + + + 4.0.0 + + com.vaadin + vaadin-test + 8.2-SNAPSHOT + + vaadin-servlet-containers-test + vaadin-servlet-containers-test + pom + + + generic-ui + generic-tests + + + + + + + org.wildfly.plugins + wildfly-maven-plugin + 1.2.0.Final + + + start-wildfly + pre-integration-test + + start + deploy + + + + demo.war + + + + stop-wildfly + post-integration-test + + shutdown + + + + + + org.eclipse.jetty + jetty-maven-plugin + + + /demo + + + + + + + maven-deploy-plugin + + true + + + + maven-surefire-plugin + + true + + + + maven-failsafe-plugin + + + ${project.groupId}:vaadin-test-server-tests + + + + + + + + + + all + + true + + + jsp-integration + karaf + wildfly10 + wildfly9 + jetty9 + + + + + ant-test + + generic + + + + wildfly + + wildfly10 + wildfly9 + + + + jetty + + jetty9 + + + + + diff --git a/test/servlet-containers/screenshots/finland-phantomjs.png b/test/servlet-containers/screenshots/finland-phantomjs.png new file mode 100644 index 0000000000000000000000000000000000000000..78533075842e67f28c5ca4123be65a431270f212 GIT binary patch literal 10897 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 NId1k{p5eu?e**Dk3WWdw literal 0 HcmV?d00001 diff --git a/test/servlet-containers/screenshots/initial-phantomjs.png b/test/servlet-containers/screenshots/initial-phantomjs.png new file mode 100644 index 0000000000000000000000000000000000000000..8764e467f2957062c0747e9ea135f7f028aea66d GIT binary patch literal 10130 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 AoB#j- literal 0 HcmV?d00001 diff --git a/test/servlet-containers/wildfly10/pom.xml b/test/servlet-containers/wildfly10/pom.xml new file mode 100644 index 0000000000..97697110d4 --- /dev/null +++ b/test/servlet-containers/wildfly10/pom.xml @@ -0,0 +1,43 @@ + + + 4.0.0 + + com.vaadin + vaadin-servlet-containers-test + 8.2-SNAPSHOT + + vaadin-test-wildfly10-server + Vaadin Wildfly 10 Test + war + + true + 10.1.0.Final + wildfly10 + + + + + + com.vaadin + vaadin-test-server-ui + ${project.version} + + + com.vaadin + vaadin-test-server-tests + ${project.version} + test + + + + + + + + org.wildfly.plugins + wildfly-maven-plugin + + + + diff --git a/test/servlet-containers/wildfly9/pom.xml b/test/servlet-containers/wildfly9/pom.xml new file mode 100644 index 0000000000..074dc4aa52 --- /dev/null +++ b/test/servlet-containers/wildfly9/pom.xml @@ -0,0 +1,43 @@ + + + 4.0.0 + + com.vaadin + vaadin-servlet-containers-test + 8.2-SNAPSHOT + + vaadin-test-wildfly9-server + Vaadin Wildfly 9 Test + war + + true + 9.0.2.Final + wildfly9 + + + + + + com.vaadin + vaadin-test-server-ui + ${project.version} + + + com.vaadin + vaadin-test-server-tests + ${project.version} + test + + + + + + + + org.wildfly.plugins + wildfly-maven-plugin + + + + -- 2.39.5