This module will contain most of the classes shared between uitest and integration test modules. Change-Id: Ibc327339cf1d360252483287c0eeb8dd03c176d5tags/8.0.0.alpha1
@@ -59,6 +59,8 @@ | |||
resolver="vaadin-maven" /> | |||
<module organisation="com.vaadin" name="vaadin-liferay" | |||
resolver="vaadin-maven" /> | |||
<module organisation="com.vaadin" name="vaadin-uitest-common" | |||
resolver="vaadin-maven" /> | |||
</modules> | |||
@@ -100,6 +100,7 @@ | |||
<module>client-compiled</module> | |||
<module>themes</module> | |||
<module>widgets</module> | |||
<module>uitest-common</module> | |||
<module>uitest</module> | |||
<module>liferay</module> | |||
<module>all</module> |
@@ -0,0 +1,114 @@ | |||
<?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>8.0-SNAPSHOT</version> | |||
</parent> | |||
<artifactId>vaadin-uitest-common</artifactId> | |||
<name>vaadin-uitest-common</name> | |||
<packaging>jar</packaging> | |||
<properties> | |||
<skip.uitest.deployment>true</skip.uitest.deployment> | |||
</properties> | |||
<url>https://vaadin.com/</url> | |||
<description>Vaadin UI test common classes and dependencies</description> | |||
<repositories> | |||
<repository> | |||
<id>vaadin-addons</id> | |||
<url>http://maven.vaadin.com/vaadin-addons</url> | |||
</repository> | |||
</repositories> | |||
<dependencies> | |||
<!-- LIBRARY DEPENDENCIES (compile time) --> | |||
<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>junit</groupId> | |||
<artifactId>junit</artifactId> | |||
<version>4.11</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>commons-io</groupId> | |||
<artifactId>commons-io</artifactId> | |||
<version>${commons-io.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-testbench</artifactId> | |||
<version>4.0.3</version> | |||
</dependency> | |||
</dependencies> | |||
<build> | |||
<plugins> | |||
<plugin> | |||
<artifactId>maven-deploy-plugin</artifactId> | |||
<configuration> | |||
<skip>${skip.uitest.deployment}</skip> | |||
</configuration> | |||
</plugin> | |||
<plugin> | |||
<artifactId>maven-surefire-plugin</artifactId> | |||
<configuration> | |||
<skip>true</skip> | |||
</configuration> | |||
</plugin> | |||
<plugin> | |||
<groupId>org.codehaus.mojo</groupId> | |||
<artifactId>animal-sniffer-maven-plugin</artifactId> | |||
<configuration> | |||
<skip>true</skip> | |||
</configuration> | |||
</plugin> | |||
</plugins> | |||
<pluginManagement> | |||
<plugins> | |||
<plugin> | |||
<groupId>org.sonatype.plugins</groupId> | |||
<artifactId>nexus-staging-maven-plugin</artifactId> | |||
<configuration> | |||
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> | |||
</configuration> | |||
</plugin> | |||
<plugin> | |||
<artifactId>maven-javadoc-plugin</artifactId> | |||
<configuration> | |||
<skip>true</skip> | |||
</configuration> | |||
</plugin> | |||
</plugins> | |||
</pluginManagement> | |||
</build> | |||
<profiles> | |||
<profile> | |||
<!-- Profile used to deploy the uitest-common jar for testing --> | |||
<id>dev-build</id> | |||
<activation> | |||
<activeByDefault>false</activeByDefault> | |||
</activation> | |||
<properties> | |||
<skip.uitest.deployment>false</skip.uitest.deployment> | |||
</properties> | |||
</profile> | |||
</profiles> | |||
</project> |
@@ -72,7 +72,6 @@ import com.vaadin.testbench.elements.VerticalLayoutElement; | |||
import com.vaadin.testbench.parallel.Browser; | |||
import com.vaadin.testbench.parallel.BrowserUtil; | |||
import com.vaadin.testbench.parallel.ParallelTest; | |||
import com.vaadin.tests.components.AbstractTestUIWithLog; | |||
import com.vaadin.ui.UI; | |||
import elemental.json.JsonObject; | |||
@@ -507,7 +506,7 @@ public abstract class AbstractTB3Test extends ParallelTest { | |||
} | |||
/** | |||
* For tests extending {@link AbstractTestUIWithLog}, returns the element | |||
* For tests extending AbstractTestUIWithLog, returns the element | |||
* for the Nth log row | |||
* | |||
* @param rowNr | |||
@@ -519,7 +518,7 @@ public abstract class AbstractTB3Test extends ParallelTest { | |||
} | |||
/** | |||
* For tests extending {@link AbstractTestUIWithLog}, returns the text in | |||
* For tests extending AbstractTestUIWithLog, returns the text in | |||
* the Nth log row | |||
* | |||
* @param rowNr |
@@ -13,7 +13,7 @@ | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.tests.integration; | |||
package com.vaadin.tests.tb3; | |||
import java.lang.reflect.Method; | |||
import java.lang.reflect.Modifier; | |||
@@ -27,8 +27,6 @@ import org.junit.runners.Parameterized.Parameters; | |||
import org.junit.runners.model.FrameworkMethod; | |||
import org.junit.runners.model.InitializationError; | |||
import com.vaadin.tests.tb3.TB3Runner; | |||
/** | |||
* TestBench test runner which supports static @Parameters annotated methods | |||
* providing parameters for the corresponding setter. |
@@ -30,6 +30,10 @@ | |||
<!-- LIBRARY DEPENDENCIES (compile time) --> | |||
<!-- Project modules --> | |||
<dependency org="com.vaadin" name="vaadin-uitest-common" | |||
rev="${vaadin.version}" conf="build->default"> | |||
<exclude type="pom" /> | |||
</dependency> | |||
<dependency org="com.vaadin" name="vaadin-server" | |||
rev="${vaadin.version}" conf="build->default"> | |||
<exclude org="javax.servlet"></exclude> |
@@ -168,6 +168,14 @@ | |||
<version>3.1.0</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-uitest-common</artifactId> | |||
<version>${project.version}</version> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>junit</groupId> | |||
<artifactId>junit</artifactId> | |||
@@ -201,12 +209,6 @@ | |||
<artifactId>hsqldb</artifactId> | |||
<version>2.2.6</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-testbench</artifactId> | |||
<version>4.0.3</version> | |||
<scope>test</scope> | |||
</dependency> | |||
<!-- This should be removed once tests have been updated to use lang3 --> | |||
<dependency> | |||
<groupId>commons-lang</groupId> |
@@ -25,6 +25,7 @@ import org.junit.runner.RunWith; | |||
import org.junit.runners.Parameterized.Parameters; | |||
import com.vaadin.testbench.elements.TableElement; | |||
import com.vaadin.tests.tb3.ParameterizedTB3Runner; | |||
/** | |||
* Base class for servlet integration tests. Automatically prepends "/demo" to |
@@ -25,8 +25,6 @@ import org.junit.runner.RunWith; | |||
import org.junit.runners.Parameterized.Parameters; | |||
import org.openqa.selenium.remote.DesiredCapabilities; | |||
import com.vaadin.tests.integration.ParameterizedTB3Runner; | |||
/** | |||
* Test which uses theme returned by {@link #getTheme()} for running the test | |||
*/ |
@@ -25,8 +25,6 @@ import org.junit.runner.RunWith; | |||
import org.junit.runners.Parameterized.Parameters; | |||
import org.openqa.selenium.remote.DesiredCapabilities; | |||
import com.vaadin.tests.integration.ParameterizedTB3Runner; | |||
@RunWith(ParameterizedTB3Runner.class) | |||
public abstract class MultiBrowserThemeTestWithProxy extends | |||
MultiBrowserTestWithProxy { |