summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2016-08-18 23:27:29 +0300
committerArtur Signell <artur@vaadin.com>2016-08-22 20:08:25 +0300
commit8328038b3c695da27f6247fc9b33ed97c0e0d771 (patch)
treec9d69b66fc37c27e93f82342506c62d8e9845cb2 /uitest
parenta6873053f005c195c5e43211761c5f936be14a4e (diff)
downloadvaadin-framework-8328038b3c695da27f6247fc9b33ed97c0e0d771.tar.gz
vaadin-framework-8328038b3c695da27f6247fc9b33ed97c0e0d771.zip
Rename packages in compatibility-client to use com.vaadin.v7
Change-Id: Id0f178dfc3910ee7492c860d381b2d413e82ba73
Diffstat (limited to 'uitest')
-rw-r--r--uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateWithoutStateClassConnector.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/widgetset/client/VExtendedTextArea.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClickExtensionConnector.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/IntArrayRendererConnector.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/MySelectionModelConnector.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/PojoRendererConnector.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/RowAwareRendererConnector.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/widgetset/client/superText/ExtraSuperTextAreaConnector.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/widgetset/client/superText/SuperTextAreaConnector.java2
-rw-r--r--uitest/src/main/resources/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml2
-rw-r--r--uitest/src/main/webapp/WEB-INF/web.xml2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/application/DeploymentConfigurationTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java4
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetsetTest.java5
14 files changed, 17 insertions, 16 deletions
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateWithoutStateClassConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateWithoutStateClassConnector.java
index 2571c8b3bc..b7092d4b17 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateWithoutStateClassConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateWithoutStateClassConnector.java
@@ -17,9 +17,9 @@
package com.vaadin.tests.widgetset.client;
import com.google.gwt.core.shared.GWT;
-import com.vaadin.client.ui.textarea.TextAreaConnector;
import com.vaadin.shared.ui.Connect;
import com.vaadin.tests.widgetset.server.DelegateWithoutStateClassComponent;
+import com.vaadin.v7.client.ui.textarea.TextAreaConnector;
@Connect(DelegateWithoutStateClassComponent.class)
public class DelegateWithoutStateClassConnector extends TextAreaConnector {
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/VExtendedTextArea.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/VExtendedTextArea.java
index 5cd699895a..40ffca4f5d 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/VExtendedTextArea.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/VExtendedTextArea.java
@@ -16,7 +16,7 @@
package com.vaadin.tests.widgetset.client;
-import com.vaadin.client.ui.VTextArea;
+import com.vaadin.v7.client.ui.VTextArea;
public class VExtendedTextArea extends VTextArea {
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClickExtensionConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClickExtensionConnector.java
index 0c40626d9d..6073c2dab4 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClickExtensionConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClickExtensionConnector.java
@@ -17,7 +17,6 @@ package com.vaadin.tests.widgetset.client.grid;
import com.vaadin.client.MouseEventDetailsBuilder;
import com.vaadin.client.ServerConnector;
-import com.vaadin.client.connectors.GridConnector;
import com.vaadin.client.extensions.AbstractExtensionConnector;
import com.vaadin.client.widget.grid.CellReference;
import com.vaadin.client.widget.grid.events.BodyClickHandler;
@@ -27,6 +26,7 @@ import com.vaadin.shared.MouseEventDetails;
import com.vaadin.shared.communication.ServerRpc;
import com.vaadin.shared.ui.Connect;
import com.vaadin.tests.components.grid.GridExtensionCommunication.GridClickExtension;
+import com.vaadin.v7.client.connectors.GridConnector;
import elemental.json.JsonObject;
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/IntArrayRendererConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/IntArrayRendererConnector.java
index 42c8040600..a161e84122 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/IntArrayRendererConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/IntArrayRendererConnector.java
@@ -15,10 +15,10 @@
*/
package com.vaadin.tests.widgetset.client.grid;
-import com.vaadin.client.connectors.AbstractGridRendererConnector;
import com.vaadin.client.renderers.Renderer;
import com.vaadin.client.widget.grid.RendererCellReference;
import com.vaadin.shared.ui.Connect;
+import com.vaadin.v7.client.connectors.AbstractGridRendererConnector;
@Connect(com.vaadin.tests.components.grid.IntArrayRenderer.class)
public class IntArrayRendererConnector
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/MySelectionModelConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/MySelectionModelConnector.java
index c44daecf0d..44727e3058 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/MySelectionModelConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/MySelectionModelConnector.java
@@ -16,13 +16,13 @@
package com.vaadin.tests.widgetset.client.grid;
import com.vaadin.client.ServerConnector;
-import com.vaadin.client.connectors.MultiSelectionModelConnector;
import com.vaadin.client.renderers.ComplexRenderer;
import com.vaadin.client.widget.grid.selection.ClickSelectHandler;
import com.vaadin.client.widget.grid.selection.SelectionModel.Multi;
import com.vaadin.client.widgets.Grid;
import com.vaadin.shared.ui.Connect;
import com.vaadin.tests.components.grid.GridCustomSelectionModel.MySelectionModel;
+import com.vaadin.v7.client.connectors.MultiSelectionModelConnector;
import elemental.json.JsonObject;
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/PojoRendererConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/PojoRendererConnector.java
index eef728e130..31d920cf07 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/PojoRendererConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/PojoRendererConnector.java
@@ -15,11 +15,11 @@
*/
package com.vaadin.tests.widgetset.client.grid;
-import com.vaadin.client.connectors.AbstractGridRendererConnector;
import com.vaadin.client.renderers.Renderer;
import com.vaadin.client.widget.grid.RendererCellReference;
import com.vaadin.shared.ui.Connect;
import com.vaadin.tests.widgetset.client.SimpleTestBean;
+import com.vaadin.v7.client.connectors.AbstractGridRendererConnector;
@Connect(com.vaadin.tests.components.grid.BeanRenderer.class)
public class PojoRendererConnector
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/RowAwareRendererConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/RowAwareRendererConnector.java
index 444d4f7b26..9aeb8daf97 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/RowAwareRendererConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/RowAwareRendererConnector.java
@@ -22,13 +22,13 @@ import com.google.gwt.dom.client.BrowserEvents;
import com.google.gwt.dom.client.DivElement;
import com.google.gwt.dom.client.NativeEvent;
import com.google.gwt.user.client.DOM;
-import com.vaadin.client.connectors.AbstractGridRendererConnector;
import com.vaadin.client.renderers.ComplexRenderer;
import com.vaadin.client.renderers.Renderer;
import com.vaadin.client.widget.grid.CellReference;
import com.vaadin.client.widget.grid.RendererCellReference;
import com.vaadin.shared.communication.ServerRpc;
import com.vaadin.shared.ui.Connect;
+import com.vaadin.v7.client.connectors.AbstractGridRendererConnector;
import elemental.json.JsonObject;
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/superText/ExtraSuperTextAreaConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/superText/ExtraSuperTextAreaConnector.java
index b9037208f9..20c849389d 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/superText/ExtraSuperTextAreaConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/superText/ExtraSuperTextAreaConnector.java
@@ -1,8 +1,8 @@
package com.vaadin.tests.widgetset.client.superText;
-import com.vaadin.client.ui.textarea.TextAreaConnector;
import com.vaadin.shared.ui.Connect;
import com.vaadin.tests.widgetset.server.ExtraSuperTextArea;
+import com.vaadin.v7.client.ui.textarea.TextAreaConnector;
@Connect(ExtraSuperTextArea.class)
public class ExtraSuperTextAreaConnector extends TextAreaConnector {
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/superText/SuperTextAreaConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/superText/SuperTextAreaConnector.java
index fda1fc6f0a..c114fcc7fb 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/superText/SuperTextAreaConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/superText/SuperTextAreaConnector.java
@@ -1,8 +1,8 @@
package com.vaadin.tests.widgetset.client.superText;
-import com.vaadin.client.ui.textarea.TextAreaConnector;
import com.vaadin.shared.ui.Connect;
import com.vaadin.tests.widgetset.server.SuperTextArea;
+import com.vaadin.v7.client.ui.textarea.TextAreaConnector;
/**
* @author artamonov
diff --git a/uitest/src/main/resources/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml b/uitest/src/main/resources/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml
index 53fa88e704..ef4dbeda1f 100644
--- a/uitest/src/main/resources/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml
+++ b/uitest/src/main/resources/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml
@@ -1,7 +1,7 @@
<module>
<!-- WS Compiler: manually edited -->
- <inherits name="com.vaadin.Vaadin7WidgetSet" />
+ <inherits name="com.vaadin.v7.Vaadin7WidgetSet" />
<inherits name="com.google.gwt.user.theme.standard.Standard" />
diff --git a/uitest/src/main/webapp/WEB-INF/web.xml b/uitest/src/main/webapp/WEB-INF/web.xml
index c8b8c9caec..99d2ced7a7 100644
--- a/uitest/src/main/webapp/WEB-INF/web.xml
+++ b/uitest/src/main/webapp/WEB-INF/web.xml
@@ -14,7 +14,7 @@
</context-param>
<context-param>
<param-name>widgetset</param-name>
- <param-value>com.vaadin.Vaadin7WidgetSet</param-value>
+ <param-value>com.vaadin.v7.Vaadin7WidgetSet</param-value>
</context-param>
<context-param>
diff --git a/uitest/src/test/java/com/vaadin/tests/application/DeploymentConfigurationTest.java b/uitest/src/test/java/com/vaadin/tests/application/DeploymentConfigurationTest.java
index 499b828fbc..6de1d16d41 100644
--- a/uitest/src/test/java/com/vaadin/tests/application/DeploymentConfigurationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/DeploymentConfigurationTest.java
@@ -32,7 +32,7 @@ public class DeploymentConfigurationTest extends SingleBrowserTest {
public void testParameters() {
openTestURL();
List<String> texts = new ArrayList<String>(Arrays.asList(
- "Init parameters:", "widgetset: com.vaadin.Vaadin7WidgetSet",
+ "Init parameters:", "widgetset: com.vaadin.v7.Vaadin7WidgetSet",
"closeIdleSessions: true", "productionMode: false",
"testParam: 42", "heartbeatInterval: 301",
"resourceCacheTime: 3601"));
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java
index f0c2cbcce5..00787cca8e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java
@@ -24,9 +24,9 @@ import org.openqa.selenium.Dimension;
import org.openqa.selenium.WebDriver.Window;
import org.openqa.selenium.WebElement;
-import com.vaadin.client.ui.VFilterSelect;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.client.ui.VFilterSelect;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
/**
* ComboBox suggestion popup should not obscure the text input box.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetsetTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetsetTest.java
index 99213638fa..d64bd88046 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetsetTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetsetTest.java
@@ -20,14 +20,15 @@ import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.openqa.selenium.WebElement;
-import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.tests.tb3.SingleBrowserTest;
/**
* Test for testing if a component is missing from a widgetset.
*
* @author Vaadin Ltd
*/
-public class ComponentMissingFromDefaultWidgetsetTest extends MultiBrowserTest {
+public class ComponentMissingFromDefaultWidgetsetTest
+ extends SingleBrowserTest {
@Test
public void testComponentInTestingWidgetset() {