diff options
Diffstat (limited to 'uitest/src/main')
7 files changed, 13 insertions, 59 deletions
diff --git a/uitest/src/main/java/com/vaadin/tests/components/UnknownComponentConnector.java b/uitest/src/main/java/com/vaadin/tests/components/UnknownComponentConnector.java deleted file mode 100644 index 11f4255719..0000000000 --- a/uitest/src/main/java/com/vaadin/tests/components/UnknownComponentConnector.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2000-2016 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.tests.components; - -import com.vaadin.server.VaadinRequest; -import com.vaadin.ui.AbstractComponent; - -public class UnknownComponentConnector extends AbstractTestUI { - - public static class ComponentWithoutConnector extends AbstractComponent { - - } - - @Override - protected void setup(VaadinRequest request) { - ComponentWithoutConnector component = new ComponentWithoutConnector(); - component.setId("no-connector-component"); - addComponent(component); - } - - @Override - protected String getTestDescription() { - // TODO Auto-generated method stub - return null; - } - - @Override - protected Integer getTicketNumber() { - // TODO Auto-generated method stub - return null; - } - -} diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetset.java b/uitest/src/main/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetset.java index 554a461c37..bf243a53e2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetset.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetset.java @@ -1,9 +1,11 @@ package com.vaadin.tests.components.ui; +import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent; +@Widgetset("com.vaadin.DefaultWidgetSet") public class ComponentMissingFromDefaultWidgetset extends AbstractTestUI { @Override 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 86e6108a4a..42c8040600 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,14 +15,14 @@ */ package com.vaadin.tests.widgetset.client.grid; -import com.vaadin.client.connectors.AbstractRendererConnector; +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; @Connect(com.vaadin.tests.components.grid.IntArrayRenderer.class) public class IntArrayRendererConnector - extends AbstractRendererConnector<int[]> { + extends AbstractGridRendererConnector<int[]> { public static class IntArrayRenderer implements Renderer<int[]> { private static final String JOINER = " :: "; 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 82ba236fce..eef728e130 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,7 +15,7 @@ */ package com.vaadin.tests.widgetset.client.grid; -import com.vaadin.client.connectors.AbstractRendererConnector; +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; @@ -23,7 +23,7 @@ import com.vaadin.tests.widgetset.client.SimpleTestBean; @Connect(com.vaadin.tests.components.grid.BeanRenderer.class) public class PojoRendererConnector - extends AbstractRendererConnector<SimpleTestBean> { + extends AbstractGridRendererConnector<SimpleTestBean> { public static class BeanRenderer implements Renderer<SimpleTestBean> { @Override 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 8b1c00d71c..444d4f7b26 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,7 +22,7 @@ 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.AbstractRendererConnector; +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; @@ -33,7 +33,7 @@ import com.vaadin.shared.ui.Connect; import elemental.json.JsonObject; @Connect(com.vaadin.tests.components.grid.RowAwareRenderer.class) -public class RowAwareRendererConnector extends AbstractRendererConnector<Void> { +public class RowAwareRendererConnector extends AbstractGridRendererConnector<Void> { public interface RowAwareRendererRpc extends ServerRpc { void clicky(String key); } 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 3878e85193..53fa88e704 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,8 +1,7 @@ <module> <!-- WS Compiler: manually edited --> - <!-- Inherit the DefaultWidgetSet --> - <inherits name="com.vaadin.DefaultWidgetSet" /> + <inherits name="com.vaadin.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 0def4001b8..c8b8c9caec 100644 --- a/uitest/src/main/webapp/WEB-INF/web.xml +++ b/uitest/src/main/webapp/WEB-INF/web.xml @@ -12,6 +12,10 @@ <param-name>productionMode</param-name> <param-value>false</param-value> </context-param> + <context-param> + <param-name>widgetset</param-name> + <param-value>com.vaadin.Vaadin7WidgetSet</param-value> + </context-param> <context-param> <param-name>resourceCacheTime</param-name> @@ -64,10 +68,6 @@ <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class> <!-- Non-default values for testing purposes --> <init-param> - <param-name>legacyPropertyToString</param-name> - <param-value>false</param-value> - </init-param> - <init-param> <param-name>heartbeatInterval</param-name> <param-value>301</param-value> </init-param> |