diff options
author | Teemu Suo-Anttila <tsuoanttila@users.noreply.github.com> | 2017-01-09 13:41:30 +0200 |
---|---|---|
committer | Henri Sara <henri.sara@gmail.com> | 2017-01-09 13:41:30 +0200 |
commit | 886a837d6d16216606dcb564c5450e1b6bf136d3 (patch) | |
tree | cf7a38c71f8e982e1f5b26f32c1d10caac5cf05a /test/widget-set-testutil | |
parent | 4fd968314f47338c0ea61025e6a22f036f8e725d (diff) | |
download | vaadin-framework-886a837d6d16216606dcb564c5450e1b6bf136d3.tar.gz vaadin-framework-886a837d6d16216606dcb564c5450e1b6bf136d3.zip |
Fix vaadin-test and all its submodules (#8076)
This patch applies following fixes:
* ContextMenu with correct version for Vaadin 8
* Correctly skip install plugin for test submodules
* Make widgetset-test-util a test depdendency, don't use test-jar
* Fix vaadin-test project structure and dependencies
* Clean up testutil pom
* Add README.md
Diffstat (limited to 'test/widget-set-testutil')
-rw-r--r-- | test/widget-set-testutil/pom.xml | 47 | ||||
-rw-r--r-- | test/widget-set-testutil/src/main/java/com/vaadin/test/defaultwidgetset/AbstractWidgetSetIT.java (renamed from test/widget-set-testutil/src/test/java/com/vaadin/test/defaultwidgetset/AbstractWidgetSetIT.java) | 0 |
2 files changed, 25 insertions, 22 deletions
diff --git a/test/widget-set-testutil/pom.xml b/test/widget-set-testutil/pom.xml index 3dcc6db865..0a81446a54 100644 --- a/test/widget-set-testutil/pom.xml +++ b/test/widget-set-testutil/pom.xml @@ -2,31 +2,34 @@ <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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-test</artifactId> - <version>8.0-SNAPSHOT</version> - </parent> + <groupId>com.vaadin</groupId> <artifactId>vaadin-test-widget-set-testutil</artifactId> + <version>8.0-SNAPSHOT</version> <packaging>jar</packaging> + <properties> + <vaadin.version>8.0-SNAPSHOT</vaadin.version> + </properties> + <dependencies> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-server</artifactId> + <version>${vaadin.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-testbench-api</artifactId> + <version>${vaadin.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>provided</scope> + </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project>
\ No newline at end of file +</project> diff --git a/test/widget-set-testutil/src/test/java/com/vaadin/test/defaultwidgetset/AbstractWidgetSetIT.java b/test/widget-set-testutil/src/main/java/com/vaadin/test/defaultwidgetset/AbstractWidgetSetIT.java index c6d4f1756b..c6d4f1756b 100644 --- a/test/widget-set-testutil/src/test/java/com/vaadin/test/defaultwidgetset/AbstractWidgetSetIT.java +++ b/test/widget-set-testutil/src/main/java/com/vaadin/test/defaultwidgetset/AbstractWidgetSetIT.java |