summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <tsuoanttila@users.noreply.github.com>2017-01-31 22:03:59 +0200
committerPekka Hyvönen <pekka@vaadin.com>2017-01-31 22:03:59 +0200
commit9a6550a25142df533da0b796e256100df39e73b8 (patch)
treedf82eed41235416985f0b8ac59bf36896acf0151
parent9fad817c77d84019e6e49c1a02107a63bfd17c4e (diff)
downloadvaadin-framework-9a6550a25142df533da0b796e256100df39e73b8.tar.gz
vaadin-framework-9a6550a25142df533da0b796e256100df39e73b8.zip
Add test for compiling a widgetset that inherits Vaadin7WidgetSet (#8403)
* Add test for compiling a widgetset that inherits Vaadin7WidgetSet * Remove unnecessary dependency management block * Minor style fixes
-rw-r--r--test/default-widget-set/src/test/java/com/vaadin/test/defaultwidgetset/DefaultWidgetSetIT.java4
-rw-r--r--test/pom.xml1
-rw-r--r--test/vaadin7-widget-set/pom.xml35
-rw-r--r--test/vaadin7-widget-set/src/main/java/com/vaadin/test/vaadin7widgetset/Vaadin7WidgetSetUI.java15
-rw-r--r--test/vaadin7-widget-set/src/test/java/com/vaadin/test/vaadin7widgetset/Vaadin7WidgetSetIT.java13
5 files changed, 66 insertions, 2 deletions
diff --git a/test/default-widget-set/src/test/java/com/vaadin/test/defaultwidgetset/DefaultWidgetSetIT.java b/test/default-widget-set/src/test/java/com/vaadin/test/defaultwidgetset/DefaultWidgetSetIT.java
index 8fda5812d0..a053b68a26 100644
--- a/test/default-widget-set/src/test/java/com/vaadin/test/defaultwidgetset/DefaultWidgetSetIT.java
+++ b/test/default-widget-set/src/test/java/com/vaadin/test/defaultwidgetset/DefaultWidgetSetIT.java
@@ -2,10 +2,10 @@ package com.vaadin.test.defaultwidgetset;
import org.junit.Test;
-public abstract class DefaultWidgetSetIT extends AbstractWidgetSetIT {
+public class DefaultWidgetSetIT extends AbstractWidgetSetIT {
@Test
public void appStartsUserCanInteract() {
testAppStartsUserCanInteract("com.vaadin.DefaultWidgetSet");
}
-} \ No newline at end of file
+}
diff --git a/test/pom.xml b/test/pom.xml
index b9493fcb55..e44986ffb1 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -93,6 +93,7 @@
<modules>
<module>widget-set-testutil</module>
<module>default-widget-set</module>
+ <module>vaadin7-widget-set</module>
<module>own-widget-set</module>
<module>addon-using-own-widget-set</module>
<module>addon-using-no-defined-widget-set</module>
diff --git a/test/vaadin7-widget-set/pom.xml b/test/vaadin7-widget-set/pom.xml
new file mode 100644
index 0000000000..17f73402c1
--- /dev/null
+++ b/test/vaadin7-widget-set/pom.xml
@@ -0,0 +1,35 @@
+<?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/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>
+ <artifactId>vaadin-test-vaadin7-widget-set</artifactId>
+ <packaging>war</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-test-widget-set-testutil</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-compatibility-client</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-maven-plugin</artifactId>
+ <configuration>
+ <extraJvmArgs>-Xmx1G</extraJvmArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/test/vaadin7-widget-set/src/main/java/com/vaadin/test/vaadin7widgetset/Vaadin7WidgetSetUI.java b/test/vaadin7-widget-set/src/main/java/com/vaadin/test/vaadin7widgetset/Vaadin7WidgetSetUI.java
new file mode 100644
index 0000000000..8da754eb12
--- /dev/null
+++ b/test/vaadin7-widget-set/src/main/java/com/vaadin/test/vaadin7widgetset/Vaadin7WidgetSetUI.java
@@ -0,0 +1,15 @@
+package com.vaadin.test.vaadin7widgetset;
+
+import javax.servlet.annotation.WebServlet;
+
+import com.vaadin.annotations.VaadinServletConfiguration;
+import com.vaadin.server.VaadinServlet;
+import com.vaadin.test.widgetset.AbstractTestWidgetSetUI;
+
+public class Vaadin7WidgetSetUI extends AbstractTestWidgetSetUI {
+
+ @WebServlet(urlPatterns = "/*", name = "MyUIServlet", asyncSupported = true)
+ @VaadinServletConfiguration(ui = Vaadin7WidgetSetUI.class, productionMode = false)
+ public static class MyUIServlet extends VaadinServlet {
+ }
+}
diff --git a/test/vaadin7-widget-set/src/test/java/com/vaadin/test/vaadin7widgetset/Vaadin7WidgetSetIT.java b/test/vaadin7-widget-set/src/test/java/com/vaadin/test/vaadin7widgetset/Vaadin7WidgetSetIT.java
new file mode 100644
index 0000000000..5072032673
--- /dev/null
+++ b/test/vaadin7-widget-set/src/test/java/com/vaadin/test/vaadin7widgetset/Vaadin7WidgetSetIT.java
@@ -0,0 +1,13 @@
+package com.vaadin.test.vaadin7widgetset;
+
+import org.junit.Test;
+
+import com.vaadin.test.defaultwidgetset.AbstractWidgetSetIT;
+
+public class Vaadin7WidgetSetIT extends AbstractWidgetSetIT {
+
+ @Test
+ public void appStartsUserCanInteract() {
+ testAppStartsUserCanInteract("AppWidgetset");
+ }
+}