From 886a837d6d16216606dcb564c5450e1b6bf136d3 Mon Sep 17 00:00:00 2001
From: Teemu Suo-Anttila <tsuoanttila@users.noreply.github.com>
Date: Mon, 9 Jan 2017 13:41:30 +0200
Subject: 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
---
 test/addon-using-init-param-widget-set/pom.xml             | 14 +++-----------
 .../AddonUsingInitParamWidgetSetUI.java                    |  2 +-
 .../AddonUsingInitParamWidgetSetIT.java                    |  2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

(limited to 'test/addon-using-init-param-widget-set')

diff --git a/test/addon-using-init-param-widget-set/pom.xml b/test/addon-using-init-param-widget-set/pom.xml
index 79939e6b1b..abae3e8347 100644
--- a/test/addon-using-init-param-widget-set/pom.xml
+++ b/test/addon-using-init-param-widget-set/pom.xml
@@ -14,25 +14,16 @@
         <dependency>
             <groupId>com.vaadin</groupId>
             <artifactId>vaadin-test-widget-set-testutil</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-test-widget-set-testutil</artifactId>
-            <version>${project.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
         </dependency>
         <!-- Included to ensure AppWidgetset is an option -->
         <dependency>
-            <groupId>com.vaadin.addon</groupId>
+            <groupId>com.vaadin</groupId>
             <artifactId>vaadin-context-menu</artifactId>
-            <version>0.7.4</version>
+            <version>${contextmenu.version}</version>
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
             <artifactId>vaadin-client-compiled</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
     </dependencies>
@@ -42,6 +33,7 @@
             <plugin>
                 <groupId>com.vaadin</groupId>
                 <artifactId>vaadin-maven-plugin</artifactId>
+                <version>${vaadin.plugin.version}</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/test/addon-using-init-param-widget-set/src/main/java/com/vaadin/test/addonusinginitparamwidgetset/AddonUsingInitParamWidgetSetUI.java b/test/addon-using-init-param-widget-set/src/main/java/com/vaadin/test/addonusinginitparamwidgetset/AddonUsingInitParamWidgetSetUI.java
index 41a240e006..06324af3ca 100644
--- a/test/addon-using-init-param-widget-set/src/main/java/com/vaadin/test/addonusinginitparamwidgetset/AddonUsingInitParamWidgetSetUI.java
+++ b/test/addon-using-init-param-widget-set/src/main/java/com/vaadin/test/addonusinginitparamwidgetset/AddonUsingInitParamWidgetSetUI.java
@@ -3,8 +3,8 @@ package com.vaadin.test.addonusinginitparamwidgetset;
 import javax.servlet.annotation.WebInitParam;
 import javax.servlet.annotation.WebServlet;
 
-import com.vaadin.addon.contextmenu.ContextMenu;
 import com.vaadin.annotations.VaadinServletConfiguration;
+import com.vaadin.contextmenu.ContextMenu;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinServlet;
 import com.vaadin.test.widgetset.AbstractTestWidgetSetUI;
diff --git a/test/addon-using-init-param-widget-set/src/test/java/com/vaadin/test/addonusinginitparamwidgetset/AddonUsingInitParamWidgetSetIT.java b/test/addon-using-init-param-widget-set/src/test/java/com/vaadin/test/addonusinginitparamwidgetset/AddonUsingInitParamWidgetSetIT.java
index 11f0d74ce2..7badc066c9 100644
--- a/test/addon-using-init-param-widget-set/src/test/java/com/vaadin/test/addonusinginitparamwidgetset/AddonUsingInitParamWidgetSetIT.java
+++ b/test/addon-using-init-param-widget-set/src/test/java/com/vaadin/test/addonusinginitparamwidgetset/AddonUsingInitParamWidgetSetIT.java
@@ -10,7 +10,7 @@ public class AddonUsingInitParamWidgetSetIT extends AbstractWidgetSetIT {
     public void appStartsUserCanInteract() {
         testAppStartsUserCanInteract("com.vaadin.DefaultWidgetSet", true);
         assertHasDebugMessage(
-                "does not contain an implementation for com.vaadin.addon.contextmenu.ContextMenu");
+                "does not contain an implementation for com.vaadin.contextmenu.ContextMenu");
     }
 
 }
\ No newline at end of file
-- 
cgit v1.2.3