diff options
611 files changed, 1138 insertions, 1231 deletions
diff --git a/server/src/main/java/com/vaadin/server/Constants.java b/server/src/main/java/com/vaadin/server/Constants.java index daa9d55032..a5ed28cd50 100644 --- a/server/src/main/java/com/vaadin/server/Constants.java +++ b/server/src/main/java/com/vaadin/server/Constants.java @@ -152,7 +152,7 @@ public interface Constants { @Deprecated static final String ERROR_NO_UI_FOUND = "No UIProvider returned a UI for the request."; - static final String DEFAULT_THEME_NAME = "reindeer"; + static final String DEFAULT_THEME_NAME = "valo"; static final String INVALID_SECURITY_KEY_MSG = "Invalid security key."; diff --git a/server/src/main/java/com/vaadin/server/LegacyApplication.java b/server/src/main/java/com/vaadin/server/LegacyApplication.java index 210520cfaa..b417c0f9ee 100644 --- a/server/src/main/java/com/vaadin/server/LegacyApplication.java +++ b/server/src/main/java/com/vaadin/server/LegacyApplication.java @@ -40,7 +40,7 @@ import com.vaadin.ui.UI; @Deprecated public abstract class LegacyApplication implements ErrorHandler { private LegacyWindow mainWindow; - private String theme; + private String theme = "reindeer"; private Map<String, LegacyWindow> legacyUINames = new HashMap<>(); @@ -105,6 +105,9 @@ public abstract class LegacyApplication implements ErrorHandler { /** * Sets the application's theme. * <p> + * The default theme for {@link LegacyApplication} is reindeer, unlike for + * {@link UI} the default theme is valo. + * <p> * Note that this theme can be overridden for a specific UI with * {@link VaadinSession#getThemeForUI(UI)}. Setting theme to be * <code>null</code> selects the default theme. For the available theme diff --git a/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java b/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java index 419fe1213c..e4b90630e8 100644 --- a/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java +++ b/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java @@ -25,7 +25,6 @@ import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.vaadin.annotations.Theme; import com.vaadin.event.ShortcutAction.KeyCode; import com.vaadin.event.ShortcutListener; import com.vaadin.server.ExternalResource; @@ -45,7 +44,6 @@ import com.vaadin.v7.data.Property.ValueChangeListener; import com.vaadin.v7.data.util.BeanItemContainer; import com.vaadin.v7.ui.Table; -@Theme("valo") public class ScreenshotBrowser extends UI { private static final File screenshotDir = findScreenshotDir(); diff --git a/uitest/src/main/java/com/vaadin/tests/CurrentTimeMillis.java b/uitest/src/main/java/com/vaadin/tests/CurrentTimeMillis.java index f632a05c20..db2e16588f 100644 --- a/uitest/src/main/java/com/vaadin/tests/CurrentTimeMillis.java +++ b/uitest/src/main/java/com/vaadin/tests/CurrentTimeMillis.java @@ -16,14 +16,14 @@ package com.vaadin.tests; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; /** * Test UI (empty) to check high resolution time availability in browser. * * @author Vaadin Ltd */ -public class CurrentTimeMillis extends AbstractTestUI { +public class CurrentTimeMillis extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/VerifyJreVersion.java b/uitest/src/main/java/com/vaadin/tests/VerifyJreVersion.java index 9a85995d52..603486cd93 100644 --- a/uitest/src/main/java/com/vaadin/tests/VerifyJreVersion.java +++ b/uitest/src/main/java/com/vaadin/tests/VerifyJreVersion.java @@ -20,10 +20,10 @@ package com.vaadin.tests; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; -public class VerifyJreVersion extends AbstractTestUI { +public class VerifyJreVersion extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/accessibility/WindowWaiAriaRoles.java b/uitest/src/main/java/com/vaadin/tests/accessibility/WindowWaiAriaRoles.java index c2df4fe38e..3ff6ac6b09 100644 --- a/uitest/src/main/java/com/vaadin/tests/accessibility/WindowWaiAriaRoles.java +++ b/uitest/src/main/java/com/vaadin/tests/accessibility/WindowWaiAriaRoles.java @@ -19,7 +19,7 @@ import java.util.Stack; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.window.WindowRole; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -30,7 +30,7 @@ import com.vaadin.ui.Window; * * @author Vaadin Ltd */ -public class WindowWaiAriaRoles extends AbstractTestUI { +public class WindowWaiAriaRoles extends AbstractReindeerTestUI { Stack<Window> windows = new Stack<>(); /* diff --git a/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java b/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java index 2f6443fa14..b2c921029c 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java +++ b/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.application; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinServlet; import com.vaadin.tests.components.AbstractTestUIWithLog; @@ -38,7 +37,6 @@ import com.vaadin.v7.ui.TextField; * @since * @author Vaadin Ltd */ -@Theme("valo") public class CommErrorEmulatorUI extends AbstractTestUIWithLog { private static class Response { diff --git a/uitest/src/main/java/com/vaadin/tests/application/CriticalNotifications.java b/uitest/src/main/java/com/vaadin/tests/application/CriticalNotifications.java index afa96d827b..9627f5de6a 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/CriticalNotifications.java +++ b/uitest/src/main/java/com/vaadin/tests/application/CriticalNotifications.java @@ -22,13 +22,13 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinResponse; import com.vaadin.server.VaadinService; import com.vaadin.shared.JsonConstants; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.CheckBox; -public class CriticalNotifications extends AbstractTestUI { +public class CriticalNotifications extends AbstractReindeerTestUI { private SystemMessages systemMessages; private CheckBox includeDetails; diff --git a/uitest/src/main/java/com/vaadin/tests/application/DeploymentConfiguration.java b/uitest/src/main/java/com/vaadin/tests/application/DeploymentConfiguration.java index 91fadbf9a4..f0ff6d00ba 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/DeploymentConfiguration.java +++ b/uitest/src/main/java/com/vaadin/tests/application/DeploymentConfiguration.java @@ -4,10 +4,10 @@ import java.util.Properties; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.MarginInfo; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; -public class DeploymentConfiguration extends AbstractTestUI { +public class DeploymentConfiguration extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/application/MissingHierarchyDetection.java b/uitest/src/main/java/com/vaadin/tests/application/MissingHierarchyDetection.java index 03f195c7d4..8f35d69112 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/MissingHierarchyDetection.java +++ b/uitest/src/main/java/com/vaadin/tests/application/MissingHierarchyDetection.java @@ -16,7 +16,7 @@ package com.vaadin.tests.application; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; @@ -24,7 +24,7 @@ import com.vaadin.ui.CssLayout; import com.vaadin.ui.Label; import com.vaadin.ui.SelectiveRenderer; -public class MissingHierarchyDetection extends AbstractTestUI { +public class MissingHierarchyDetection extends AbstractReindeerTestUI { private boolean isChildRendered = true; private BrokenCssLayout brokenLayout = new BrokenCssLayout(); diff --git a/uitest/src/main/java/com/vaadin/tests/application/NavigateWithOngoingXHR.java b/uitest/src/main/java/com/vaadin/tests/application/NavigateWithOngoingXHR.java index eb021b9661..6193b4d5ee 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/NavigateWithOngoingXHR.java +++ b/uitest/src/main/java/com/vaadin/tests/application/NavigateWithOngoingXHR.java @@ -24,12 +24,12 @@ import com.vaadin.server.RequestHandler; import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinResponse; import com.vaadin.server.VaadinSession; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Link; import com.vaadin.v7.shared.ui.progressindicator.ProgressIndicatorServerRpc; import com.vaadin.v7.ui.ProgressIndicator; -public class NavigateWithOngoingXHR extends AbstractTestUI { +public class NavigateWithOngoingXHR extends AbstractReindeerTestUI { private final RequestHandler slowRequestHandler = new RequestHandler() { @Override public boolean handleRequest(VaadinSession session, diff --git a/uitest/src/main/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeat.java b/uitest/src/main/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeat.java index 93efe7babf..67c3660444 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeat.java +++ b/uitest/src/main/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeat.java @@ -19,13 +19,13 @@ import com.vaadin.annotations.PreserveOnRefresh; import com.vaadin.launcher.CustomDeploymentConfiguration; import com.vaadin.launcher.CustomDeploymentConfiguration.Conf; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; @PreserveOnRefresh @CustomDeploymentConfiguration({ @Conf(name = "heartbeatInterval", value = "5") }) -public class PreserveWithExpiredHeartbeat extends AbstractTestUI { +public class PreserveWithExpiredHeartbeat extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/application/ReconnectDialogUI.java b/uitest/src/main/java/com/vaadin/tests/application/ReconnectDialogUI.java index 631be27009..5624ba0495 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/ReconnectDialogUI.java +++ b/uitest/src/main/java/com/vaadin/tests/application/ReconnectDialogUI.java @@ -16,12 +16,12 @@ package com.vaadin.tests.application; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUIWithLog; +import com.vaadin.tests.components.AbstractReindeerTestUIWithLog; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -public class ReconnectDialogUI extends AbstractTestUIWithLog { +public class ReconnectDialogUI extends AbstractReindeerTestUIWithLog { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/application/RefreshStatePreserveTitle.java b/uitest/src/main/java/com/vaadin/tests/application/RefreshStatePreserveTitle.java index ff9c84a20a..12bd5a6633 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/RefreshStatePreserveTitle.java +++ b/uitest/src/main/java/com/vaadin/tests/application/RefreshStatePreserveTitle.java @@ -2,11 +2,11 @@ package com.vaadin.tests.application; import com.vaadin.annotations.PreserveOnRefresh; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; @PreserveOnRefresh -public class RefreshStatePreserveTitle extends AbstractTestUI { +public class RefreshStatePreserveTitle extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/application/VaadinSessionAttribute.java b/uitest/src/main/java/com/vaadin/tests/application/VaadinSessionAttribute.java index 7884fab492..7c9538a371 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/VaadinSessionAttribute.java +++ b/uitest/src/main/java/com/vaadin/tests/application/VaadinSessionAttribute.java @@ -17,12 +17,12 @@ package com.vaadin.tests.application; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Notification; -public class VaadinSessionAttribute extends AbstractTestUI { +public class VaadinSessionAttribute extends AbstractReindeerTestUI { private static final String ATTR_NAME = "myAttribute"; diff --git a/uitest/src/main/java/com/vaadin/tests/application/WebBrowserSize.java b/uitest/src/main/java/com/vaadin/tests/application/WebBrowserSize.java index 0ce8e95290..d264c3e570 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/WebBrowserSize.java +++ b/uitest/src/main/java/com/vaadin/tests/application/WebBrowserSize.java @@ -1,12 +1,12 @@ package com.vaadin.tests.application; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -public class WebBrowserSize extends AbstractTestUI { +public class WebBrowserSize extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/application/WebBrowserTimeZone.java b/uitest/src/main/java/com/vaadin/tests/application/WebBrowserTimeZone.java index b591635a73..4d0f9caf9a 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/WebBrowserTimeZone.java +++ b/uitest/src/main/java/com/vaadin/tests/application/WebBrowserTimeZone.java @@ -5,12 +5,12 @@ import java.util.Date; import java.util.TimeZone; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -public class WebBrowserTimeZone extends AbstractTestUI { +public class WebBrowserTimeZone extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/application/calculator/Calc.java b/uitest/src/main/java/com/vaadin/tests/application/calculator/Calc.java index 148c080c01..dccb25c381 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/calculator/Calc.java +++ b/uitest/src/main/java/com/vaadin/tests/application/calculator/Calc.java @@ -17,7 +17,7 @@ package com.vaadin.tests.application.calculator; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -32,7 +32,7 @@ import com.vaadin.v7.ui.Table.ColumnHeaderMode; import com.vaadin.v7.ui.TextField; @SuppressWarnings("serial") -public class Calc extends AbstractTestUI { +public class Calc extends AbstractReindeerTestUI { private class Log extends VerticalLayout { diff --git a/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseSession.java b/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseSession.java index 0781aed0f6..2d990b0b1f 100644 --- a/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseSession.java +++ b/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseSession.java @@ -23,13 +23,13 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinService; import com.vaadin.server.VaadinSession; import com.vaadin.server.WrappedHttpSession; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.util.Log; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI; -public class CloseSession extends AbstractTestUI { +public class CloseSession extends AbstractReindeerTestUI { private static final String OLD_HASH_PARAM = "oldHash"; private static final String OLD_SESSION_ID_PARAM = "oldSessionId"; diff --git a/uitest/src/main/java/com/vaadin/tests/applicationservlet/CustomDeploymentConf.java b/uitest/src/main/java/com/vaadin/tests/applicationservlet/CustomDeploymentConf.java index c38a48ae52..d92c3417fc 100644 --- a/uitest/src/main/java/com/vaadin/tests/applicationservlet/CustomDeploymentConf.java +++ b/uitest/src/main/java/com/vaadin/tests/applicationservlet/CustomDeploymentConf.java @@ -20,13 +20,13 @@ import com.vaadin.launcher.CustomDeploymentConfiguration; import com.vaadin.launcher.CustomDeploymentConfiguration.Conf; import com.vaadin.server.DeploymentConfiguration; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; @CustomDeploymentConfiguration({ @Conf(name = "customParam", value = "customValue"), @Conf(name = "resourceCacheTime", value = "3599") }) -public class CustomDeploymentConf extends AbstractTestUI { +public class CustomDeploymentConf extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/applicationservlet/SystemMessages.java b/uitest/src/main/java/com/vaadin/tests/applicationservlet/SystemMessages.java index e515155dd7..cab012f3ef 100644 --- a/uitest/src/main/java/com/vaadin/tests/applicationservlet/SystemMessages.java +++ b/uitest/src/main/java/com/vaadin/tests/applicationservlet/SystemMessages.java @@ -6,7 +6,7 @@ import com.vaadin.launcher.ApplicationRunnerServlet; import com.vaadin.server.CustomizedSystemMessages; import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinService; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -16,7 +16,7 @@ import com.vaadin.v7.ui.NativeSelect; import elemental.json.JsonObject; -public class SystemMessages extends AbstractTestUI { +public class SystemMessages extends AbstractReindeerTestUI { public class MyButton extends Button { private boolean fail = false; diff --git a/uitest/src/main/java/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.java b/uitest/src/main/java/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.java index b1682d29cc..c070870434 100644 --- a/uitest/src/main/java/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.java +++ b/uitest/src/main/java/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.java @@ -17,7 +17,7 @@ package com.vaadin.tests.browserfeatures; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.GridLayout; @@ -27,7 +27,7 @@ import com.vaadin.ui.Window; import com.vaadin.v7.ui.ListSelect; @SuppressWarnings("serial") -public class WebkitScrollbarTest extends AbstractTestUI { +public class WebkitScrollbarTest extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/componentlocator/ComponentLocatorOldClasses.java b/uitest/src/main/java/com/vaadin/tests/componentlocator/ComponentLocatorOldClasses.java index fc1471dd14..6365be89f9 100644 --- a/uitest/src/main/java/com/vaadin/tests/componentlocator/ComponentLocatorOldClasses.java +++ b/uitest/src/main/java/com/vaadin/tests/componentlocator/ComponentLocatorOldClasses.java @@ -1,9 +1,9 @@ package com.vaadin.tests.componentlocator; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; -public class ComponentLocatorOldClasses extends AbstractTestUI { +public class ComponentLocatorOldClasses extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java index c52e332b94..bf5ef2df13 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java +++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java @@ -15,7 +15,7 @@ import com.vaadin.ui.Layout.SpacingHandler; import com.vaadin.v7.ui.Field; public abstract class AbstractComponentTestCase<T extends AbstractComponent> - extends AbstractTestUI { + extends AbstractReindeerTestUI { protected static final ThemeResource ICON_16_HELP_PNG_CACHEABLE = cacheableThemeResource( "../runo/icons/16/help.png"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptions.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptions.java index c3e7f214cd..b46cd4dfcb 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptions.java +++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptions.java @@ -27,7 +27,7 @@ import com.vaadin.v7.ui.TextField; * * @author Vaadin Ltd */ -public class AbstractOrderedLayoutWithCaptions extends AbstractTestUI { +public class AbstractOrderedLayoutWithCaptions extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractReindeerTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractReindeerTestUI.java new file mode 100644 index 0000000000..5e396f3760 --- /dev/null +++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractReindeerTestUI.java @@ -0,0 +1,22 @@ +/* + * 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.annotations.Theme; + +@Theme("reindeer") +public abstract class AbstractReindeerTestUI extends AbstractTestUI { +} diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractReindeerTestUIWithLog.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractReindeerTestUIWithLog.java new file mode 100644 index 0000000000..9f08a9b875 --- /dev/null +++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractReindeerTestUIWithLog.java @@ -0,0 +1,24 @@ +/* + * 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.annotations.Theme; + +@Theme("reindeer") +public abstract class AbstractReindeerTestUIWithLog + extends AbstractTestUIWithLog { + +} diff --git a/uitest/src/main/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayout.java b/uitest/src/main/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayout.java index 39329d7341..dcf0f2c1a1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayout.java @@ -4,7 +4,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -17,7 +16,6 @@ import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; @SuppressWarnings("serial") -@Theme("valo") public class NoLayoutUpdateWhichNeedsLayout extends UI { private ProgressBar progressBar; diff --git a/uitest/src/main/java/com/vaadin/tests/components/OutOfSync.java b/uitest/src/main/java/com/vaadin/tests/components/OutOfSync.java index a4f80c4cc1..8b71c537fb 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/OutOfSync.java +++ b/uitest/src/main/java/com/vaadin/tests/components/OutOfSync.java @@ -6,7 +6,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Notification; -public class OutOfSync extends AbstractTestUI { +public class OutOfSync extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/SaneErrors.java b/uitest/src/main/java/com/vaadin/tests/components/SaneErrors.java index 4e002e0a97..6ac39310b4 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/SaneErrors.java +++ b/uitest/src/main/java/com/vaadin/tests/components/SaneErrors.java @@ -12,7 +12,7 @@ import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Table.RowHeaderMode; -public class SaneErrors extends AbstractTestUI { +public class SaneErrors extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/TestBase.java b/uitest/src/main/java/com/vaadin/tests/components/TestBase.java index f2d48a9ffa..729e737cb7 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/TestBase.java +++ b/uitest/src/main/java/com/vaadin/tests/components/TestBase.java @@ -8,8 +8,9 @@ import com.vaadin.ui.VerticalLayout; /** * - * @deprecated Use {@link AbstractTestUI} or {@link AbstractTestUIWithLog} - * instead. TestBase is a LegacyApplication + * @deprecated Use {@link AbstractReindeerTestUI} or + * {@link AbstractTestUIWithLog} instead. TestBase is a + * LegacyApplication */ @Deprecated public abstract class TestBase extends AbstractTestCase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/TooltipDelay.java b/uitest/src/main/java/com/vaadin/tests/components/TooltipDelay.java index 8fab1fbc2a..ca7ab65fe1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/TooltipDelay.java +++ b/uitest/src/main/java/com/vaadin/tests/components/TooltipDelay.java @@ -23,7 +23,7 @@ import com.vaadin.ui.Button; * * @author Vaadin Ltd */ -public class TooltipDelay extends AbstractTestUI { +public class TooltipDelay extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest vaadinRequest) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/TooltipPosition.java b/uitest/src/main/java/com/vaadin/tests/components/TooltipPosition.java index 4f17e292ad..ea00b238ba 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/TooltipPosition.java +++ b/uitest/src/main/java/com/vaadin/tests/components/TooltipPosition.java @@ -26,7 +26,7 @@ import com.vaadin.ui.VerticalLayout; * * @author Vaadin Ltd */ -public class TooltipPosition extends AbstractTestUI { +public class TooltipPosition extends AbstractReindeerTestUI { public static final int NUMBER_OF_BUTTONS = 5; diff --git a/uitest/src/main/java/com/vaadin/tests/components/TouchDevicesTooltip.java b/uitest/src/main/java/com/vaadin/tests/components/TouchDevicesTooltip.java index 24ba6c3a20..f6085d50b2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/TouchDevicesTooltip.java +++ b/uitest/src/main/java/com/vaadin/tests/components/TouchDevicesTooltip.java @@ -11,7 +11,7 @@ import com.vaadin.v7.data.validator.IntegerRangeValidator; import com.vaadin.v7.ui.TextField; @Viewport(value = "width=device-width,height=device-height") -public class TouchDevicesTooltip extends AbstractTestUI { +public class TouchDevicesTooltip extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutHideComponent.java b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutHideComponent.java index 0722813e26..a440b36d59 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutHideComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutHideComponent.java @@ -17,7 +17,7 @@ package com.vaadin.tests.components.absolutelayout; import com.vaadin.server.ThemeResource; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.AbsoluteLayout; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; @@ -30,7 +30,7 @@ import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.PasswordField; import com.vaadin.v7.ui.TextField; -public class AbsoluteLayoutHideComponent extends AbstractTestUI { +public class AbsoluteLayoutHideComponent extends AbstractReindeerTestUI { private AbsoluteLayout mainLayout; private VerticalLayout topBar = new VerticalLayout(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContent.java b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContent.java index ccb30fb5e5..b62029df5a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContent.java @@ -18,7 +18,7 @@ package com.vaadin.tests.components.absolutelayout; import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.MarginInfo; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.AbsoluteLayout; import com.vaadin.ui.Component; import com.vaadin.ui.HorizontalLayout; @@ -30,7 +30,7 @@ import com.vaadin.v7.ui.Table; * @author Vaadin Ltd */ @Theme("tests-tickets") -public class AbsoluteLayoutRelativeSizeContent extends AbstractTestUI { +public class AbsoluteLayoutRelativeSizeContent extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java index 1eab44df0b..9b7e1a221a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java @@ -17,13 +17,13 @@ package com.vaadin.tests.components.abstractcomponent; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.VaadinClasses; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Component; import com.vaadin.ui.GridLayout; import com.vaadin.ui.LegacyWindow; -public class AllComponentTooltipTest extends AbstractTestUI { +public class AllComponentTooltipTest extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/ChangeHierarchyBeforeResponse.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/ChangeHierarchyBeforeResponse.java index 125e5f1dd6..ac55e7f3e2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/ChangeHierarchyBeforeResponse.java +++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/ChangeHierarchyBeforeResponse.java @@ -16,13 +16,13 @@ package com.vaadin.tests.components.abstractcomponent; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CssLayout; import com.vaadin.ui.Label; -public class ChangeHierarchyBeforeResponse extends AbstractTestUI { +public class ChangeHierarchyBeforeResponse extends AbstractReindeerTestUI { private CssLayout layout = new CssLayout() { @Override public void beforeClientResponse(boolean initial) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java index 628cde1ae4..f5b465a98c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java +++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java @@ -16,13 +16,13 @@ package com.vaadin.tests.components.abstractcomponent; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.v7.ui.TextField; -public class PrimaryStyle extends AbstractTestUI { +public class PrimaryStyle extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.java index c6bde32ad2..acaf7000e6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.java @@ -17,10 +17,10 @@ package com.vaadin.tests.components.abstractcomponent; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; -public class RemSizeUnitTest extends AbstractTestUI { +public class RemSizeUnitTest extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/UseStateFromHierachy.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/UseStateFromHierachy.java index fc1f596fb8..c35b1546c0 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/UseStateFromHierachy.java +++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/UseStateFromHierachy.java @@ -18,7 +18,7 @@ package com.vaadin.tests.components.abstractcomponent; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.tests.widgetset.server.UseStateFromHierachyComponent; import com.vaadin.ui.Button; @@ -26,7 +26,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; @Widgetset(TestingWidgetSet.NAME) -public class UseStateFromHierachy extends AbstractTestUI { +public class UseStateFromHierachy extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java index e5062a65a9..96e5dc7c45 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java +++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java @@ -3,13 +3,13 @@ package com.vaadin.tests.components.abstractfield; import java.util.Arrays; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.CheckBox; import com.vaadin.ui.NativeButton; import com.vaadin.v7.ui.OptionGroup; import com.vaadin.v7.ui.TextField; -public class FieldFocusOnClick extends AbstractTestUI { +public class FieldFocusOnClick extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.java index f8a237417b..71fc98c504 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.java +++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.java @@ -4,7 +4,7 @@ import java.util.HashSet; import java.util.Set; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.AbsoluteLayout; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; @@ -17,7 +17,7 @@ import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.Field; import com.vaadin.v7.ui.TextField; -public class RequiredIndicatorForFieldsWithoutCaption extends AbstractTestUI { +public class RequiredIndicatorForFieldsWithoutCaption extends AbstractReindeerTestUI { private Set<Field> fields = new HashSet<>(); @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionAddTab.java b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionAddTab.java index 19be9f5567..1fb150d2a9 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionAddTab.java +++ b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionAddTab.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.accordion; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Accordion; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -32,7 +32,7 @@ import com.vaadin.ui.VerticalLayout; * @since 7.2 * @author Vaadin Ltd */ -public class AccordionAddTab extends AbstractTestUI { +public class AccordionAddTab extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionRemoveComponent.java b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionRemoveComponent.java index f228d6ee96..3304f8b088 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionRemoveComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionRemoveComponent.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.accordion; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Accordion; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -26,7 +26,7 @@ import com.vaadin.ui.Button.ClickEvent; * * @author Vaadin Ltd */ -public class AccordionRemoveComponent extends AbstractTestUI { +public class AccordionRemoveComponent extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionRemoveTab.java b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionRemoveTab.java index 9256848d2c..ab9f8b16cd 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionRemoveTab.java +++ b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionRemoveTab.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.accordion; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Accordion; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -30,7 +30,7 @@ import com.vaadin.ui.VerticalLayout; * @since 7.2 * @author Vaadin Ltd */ -public class AccordionRemoveTab extends AbstractTestUI { +public class AccordionRemoveTab extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionTabIds.java b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionTabIds.java index a13485f511..54cebed7fd 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionTabIds.java +++ b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionTabIds.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.accordion; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Accordion; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -10,7 +10,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet.Tab; @SuppressWarnings("serial") -public class AccordionTabIds extends AbstractTestUI { +public class AccordionTabIds extends AbstractReindeerTestUI { protected static final String FIRST_TAB_ID = "ID 1"; protected static final String FIRST_TAB_MESSAGE = "First tab"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbars.java b/uitest/src/main/java/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbars.java index 5151ad5dd3..321df40e61 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbars.java +++ b/uitest/src/main/java/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbars.java @@ -2,11 +2,11 @@ package com.vaadin.tests.components.browserframe; import com.vaadin.server.ExternalResource; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.BrowserFrame; import com.vaadin.ui.TabSheet; -public class BrowserFrameDoubleScrollbars extends AbstractTestUI { +public class BrowserFrameDoubleScrollbars extends AbstractReindeerTestUI { @Override protected Integer getTicketNumber() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonClick.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonClick.java index ed64d4756d..1b716e5ebb 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonClick.java +++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonClick.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.button; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -24,7 +24,7 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; -public class ButtonClick extends AbstractTestUI { +public class ButtonClick extends AbstractReindeerTestUI { public final static String SUCCESS_TEXT = "Click received succesfully!"; public final static String WRONG_BUTTON_TEXT = "Wrong button clicked."; diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonIOSDragTest.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonIOSDragTest.java index d80fd028d2..bca7bfefc6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonIOSDragTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonIOSDragTest.java @@ -17,7 +17,7 @@ package com.vaadin.tests.components.button; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.DragAndDropWrapper; @@ -25,7 +25,7 @@ import com.vaadin.ui.DragAndDropWrapper.DragStartMode; import com.vaadin.ui.Notification; import com.vaadin.ui.VerticalLayout; -public class ButtonIOSDragTest extends AbstractTestUI { +public class ButtonIOSDragTest extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonKeyboardClick.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonKeyboardClick.java index bcbc7b9d14..fc4cc4957c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonKeyboardClick.java +++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonKeyboardClick.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.button; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -27,7 +27,7 @@ import com.vaadin.ui.Label; * * @author Vaadin Ltd */ -public class ButtonKeyboardClick extends AbstractTestUI { +public class ButtonKeyboardClick extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonUndefinedWidth.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonUndefinedWidth.java index 6864edb916..51a683f512 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonUndefinedWidth.java +++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonUndefinedWidth.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.button; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.NativeButton; import com.vaadin.v7.data.Item; @@ -13,7 +13,7 @@ import com.vaadin.v7.ui.Table; * @since 7.2 * @author Vaadin Ltd */ -public class ButtonUndefinedWidth extends AbstractTestUI { +public class ButtonUndefinedWidth extends AbstractReindeerTestUI { @Override protected String getTestDescription() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonUpdateAltText.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonUpdateAltText.java index ddbdd90e8c..44e8fc3ecf 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonUpdateAltText.java +++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonUpdateAltText.java @@ -21,7 +21,7 @@ package com.vaadin.tests.components.button; import com.vaadin.server.ThemeResource; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; @@ -30,7 +30,7 @@ import com.vaadin.ui.CheckBox; * @since * @author Vaadin Ltd */ -public class ButtonUpdateAltText extends AbstractTestUI { +public class ButtonUpdateAltText extends AbstractReindeerTestUI { private final ThemeResource ICON = new ThemeResource( "../runo/icons/16/folder.png"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionEventSource.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionEventSource.java index 9eb409de45..dbd9dc7056 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionEventSource.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionEventSource.java @@ -24,7 +24,7 @@ import java.util.List; import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; import com.vaadin.v7.ui.Calendar; import com.vaadin.v7.ui.Calendar.TimeFormat; @@ -33,7 +33,7 @@ import com.vaadin.v7.ui.components.calendar.event.BasicEvent; import com.vaadin.v7.ui.components.calendar.event.CalendarEvent; import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider; -public class CalendarActionEventSource extends AbstractTestUI { +public class CalendarActionEventSource extends AbstractReindeerTestUI { private Calendar calendar; diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.java index 9fdf1e24d6..b1e5677de1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.java @@ -24,7 +24,7 @@ import java.util.List; import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Notification; import com.vaadin.v7.ui.Calendar; import com.vaadin.v7.ui.Calendar.TimeFormat; @@ -37,7 +37,7 @@ import com.vaadin.v7.ui.components.calendar.event.BasicEvent; import com.vaadin.v7.ui.components.calendar.event.CalendarEvent; import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider; -public class CalendarActionsMenuTest extends AbstractTestUI { +public class CalendarActionsMenuTest extends AbstractReindeerTestUI { private Calendar calendar; diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarBackwardForward.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarBackwardForward.java index 6064413567..3b407413f6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarBackwardForward.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarBackwardForward.java @@ -21,7 +21,7 @@ import java.util.Locale; import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.ui.Calendar; import com.vaadin.v7.ui.Calendar.TimeFormat; import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResizeHandler; @@ -33,7 +33,7 @@ import com.vaadin.v7.ui.components.calendar.event.BasicEvent; * @author Vaadin Ltd */ @Theme("tests-calendar") -public class CalendarBackwardForward extends AbstractTestUI { +public class CalendarBackwardForward extends AbstractReindeerTestUI { private static final long serialVersionUID = 1L; private Calendar calendar; diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarDragAndDrop.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarDragAndDrop.java index 77167150d8..215c929af5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarDragAndDrop.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarDragAndDrop.java @@ -27,7 +27,7 @@ import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptAll; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.HorizontalLayout; import com.vaadin.v7.ui.Calendar; import com.vaadin.v7.ui.Table; @@ -36,7 +36,7 @@ import com.vaadin.v7.ui.Table.TableTransferable; import com.vaadin.v7.ui.components.calendar.CalendarTargetDetails; import com.vaadin.v7.ui.components.calendar.event.BasicEvent; -public class CalendarDragAndDrop extends AbstractTestUI { +public class CalendarDragAndDrop extends AbstractReindeerTestUI { private Calendar calendar; diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarHtmlInEvents.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarHtmlInEvents.java index 8bb73fe14b..03048fd88a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarHtmlInEvents.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarHtmlInEvents.java @@ -20,7 +20,7 @@ import java.util.Date; import java.util.List; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUIWithLog; +import com.vaadin.tests.components.AbstractReindeerTestUIWithLog; import com.vaadin.ui.Alignment; import com.vaadin.ui.CheckBox; import com.vaadin.ui.HorizontalLayout; @@ -32,7 +32,7 @@ import com.vaadin.v7.ui.components.calendar.event.BasicEvent; import com.vaadin.v7.ui.components.calendar.event.CalendarEvent; import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider; -public class CalendarHtmlInEvents extends AbstractTestUIWithLog { +public class CalendarHtmlInEvents extends AbstractReindeerTestUIWithLog { private Calendar calendar = new Calendar(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEvent.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEvent.java index cc284d6087..09739f1f73 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEvent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEvent.java @@ -19,7 +19,7 @@ import java.util.Date; import java.util.List; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.v7.ui.Calendar; @@ -34,7 +34,7 @@ import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider.EventSet * * @author Vaadin Ltd */ -public class CalendarMonthViewDndEvent extends AbstractTestUI { +public class CalendarMonthViewDndEvent extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarReadOnly.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarReadOnly.java index d1b4a69ecd..a0cadd24b2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarReadOnly.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarReadOnly.java @@ -3,15 +3,12 @@ package com.vaadin.tests.components.calendar; import java.text.ParseException; import java.text.SimpleDateFormat; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; -import com.vaadin.ui.themes.ValoTheme; import com.vaadin.v7.ui.Calendar; import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents; import com.vaadin.v7.ui.components.calendar.event.BasicEvent; -@Theme(ValoTheme.THEME_NAME) public class CalendarReadOnly extends AbstractTestUI { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarRescheduleEvent.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarRescheduleEvent.java index bfb5af8435..873d9df233 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarRescheduleEvent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarRescheduleEvent.java @@ -19,7 +19,7 @@ import java.util.Date; import java.util.List; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.v7.ui.Calendar; @@ -34,7 +34,7 @@ import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider.EventSet * * @author Vaadin Ltd */ -public class CalendarRescheduleEvent extends AbstractTestUI { +public class CalendarRescheduleEvent extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEvents.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEvents.java index b7c2780ed8..0fd9396c59 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEvents.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEvents.java @@ -23,7 +23,7 @@ import java.util.Date; import java.util.List; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.ui.Calendar; import com.vaadin.v7.ui.components.calendar.event.BasicEvent; import com.vaadin.v7.ui.components.calendar.event.CalendarEvent; @@ -33,7 +33,7 @@ import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider; * * @author Vaadin Ltd */ -public class CalendarResizeOverlappingEvents extends AbstractTestUI { +public class CalendarResizeOverlappingEvents extends AbstractReindeerTestUI { /* * (non-Javadoc) diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfView.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfView.java index b9b856d2c9..7b68174666 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfView.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfView.java @@ -20,7 +20,7 @@ import java.text.SimpleDateFormat; import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.ui.Calendar; import com.vaadin.v7.ui.Calendar.TimeFormat; import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResizeHandler; @@ -36,7 +36,7 @@ import com.vaadin.v7.ui.components.calendar.event.BasicEvent; */ @Theme("tests-calendar") public class CalendarShownNotCorrectlyWhenPartiallyOutOfView - extends AbstractTestUI { + extends AbstractReindeerTestUI { private static final long serialVersionUID = 1L; private Calendar calendar; diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarVisibleHours.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarVisibleHours.java index 9e8811f0db..e2bc61afeb 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarVisibleHours.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarVisibleHours.java @@ -20,7 +20,7 @@ import java.text.SimpleDateFormat; import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.ui.Calendar; import com.vaadin.v7.ui.Calendar.TimeFormat; import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResizeHandler; @@ -35,7 +35,7 @@ import com.vaadin.v7.ui.components.calendar.event.BasicEvent; * dates(week/day view) (#12521) */ @Theme("tests-calendar") -public class CalendarVisibleHours extends AbstractTestUI { +public class CalendarVisibleHours extends AbstractReindeerTestUI { private static final long serialVersionUID = 1L; private Calendar calendar; diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarWeekSelection.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarWeekSelection.java index 3ee6cf3a3a..c5b1469679 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarWeekSelection.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarWeekSelection.java @@ -5,10 +5,10 @@ import java.text.SimpleDateFormat; import java.util.Locale; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.ui.Calendar; -public class CalendarWeekSelection extends AbstractTestUI { +public class CalendarWeekSelection extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { Calendar calendar = new Calendar(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDay.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDay.java index 57bd206641..a430e434ce 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDay.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDay.java @@ -21,13 +21,13 @@ import java.util.Locale; import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.ui.Calendar; import com.vaadin.v7.ui.Calendar.TimeFormat; import com.vaadin.v7.ui.components.calendar.event.BasicEvent; @Theme("tests-calendar") -public class SetFirstVisibleHourOfDay extends AbstractTestUI { +public class SetFirstVisibleHourOfDay extends AbstractReindeerTestUI { private Calendar calendar; diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.java index cf6d48a88c..895a873e50 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.java @@ -5,12 +5,12 @@ import java.util.Locale; import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.ui.Calendar; import com.vaadin.v7.ui.components.calendar.event.CalendarEvent; @Theme("tests-calendar") -public class TestHideTimeAndSeparator extends AbstractTestUI { +public class TestHideTimeAndSeparator extends AbstractReindeerTestUI { class GenericEvent implements CalendarEvent { private final Date start; diff --git a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxImmediate.java b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxImmediate.java index fda8fcee80..7cd127f896 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxImmediate.java +++ b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxImmediate.java @@ -17,11 +17,11 @@ package com.vaadin.tests.components.checkbox; import com.vaadin.data.HasValue; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Label; -public class CheckBoxImmediate extends AbstractTestUI { +public class CheckBoxImmediate extends AbstractReindeerTestUI { private int count = 0; @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxRpcCount.java b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxRpcCount.java index d5f87a2e23..697fbdd3c2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxRpcCount.java +++ b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxRpcCount.java @@ -18,11 +18,11 @@ package com.vaadin.tests.components.checkbox; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.checkbox.CheckBoxServerRpc; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Label; -public class CheckBoxRpcCount extends AbstractTestUI { +public class CheckBoxRpcCount extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerHsvTest.java b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerHsvTest.java index 6e426578eb..d57b20829f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerHsvTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerHsvTest.java @@ -2,13 +2,13 @@ package com.vaadin.tests.components.colorpicker; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.colorpicker.Color; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.ColorPickerArea; /** * Tests the HSV tab slider values when initially opening the tab. */ -public class ColorPickerHsvTest extends AbstractTestUI { +public class ColorPickerHsvTest extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java index cc78f95585..2b9c2a38a2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java @@ -32,7 +32,7 @@ import com.vaadin.server.StreamResource; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.colorpicker.Color; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.AbstractColorPicker; import com.vaadin.ui.Alignment; import com.vaadin.ui.CheckBox; @@ -46,7 +46,7 @@ import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; @Widgetset("com.vaadin.DefaultWidgetSet") -public class ColorPickerTestUI extends AbstractTestUI { +public class ColorPickerTestUI extends AbstractReindeerTestUI { @Override public String getTestDescription() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidth.java b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidth.java index 7afa9c4d37..49fdea86c1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidth.java +++ b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidth.java @@ -17,7 +17,7 @@ package com.vaadin.tests.components.colorpicker; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.ColorPicker; @@ -28,7 +28,7 @@ import com.vaadin.ui.ColorPicker; * @author Vaadin Ltd */ @Widgetset("com.vaadin.DefaultWidgetSet") -public class DefaultCaptionWidth extends AbstractTestUI { +public class DefaultCaptionWidth extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxClickIcon.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxClickIcon.java index d4a0d4f6d4..f6de3d22ba 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxClickIcon.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxClickIcon.java @@ -18,7 +18,7 @@ package com.vaadin.tests.components.combobox; import com.vaadin.server.FontAwesome; import com.vaadin.server.VaadinRequest; import com.vaadin.server.data.DataSource; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.ComboBox; /** @@ -26,7 +26,7 @@ import com.vaadin.ui.ComboBox; * * @author Vaadin Ltd */ -public class ComboBoxClickIcon extends AbstractTestUI { +public class ComboBoxClickIcon extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCursorPositionReset.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCursorPositionReset.java index b3f5a68353..7514ee850b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCursorPositionReset.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCursorPositionReset.java @@ -16,12 +16,12 @@ package com.vaadin.tests.components.combobox; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.ComboBox; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; -public class ComboBoxCursorPositionReset extends AbstractTestUI { +public class ComboBoxCursorPositionReset extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigation.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigation.java index 3fe049f65b..8d3936aecd 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigation.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigation.java @@ -2,10 +2,10 @@ package com.vaadin.tests.components.combobox; import com.vaadin.server.VaadinRequest; import com.vaadin.server.data.DataSource; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.ComboBox; -public class ComboBoxEmptyItemsKeyboardNavigation extends AbstractTestUI { +public class ComboBoxEmptyItemsKeyboardNavigation extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { ComboBox<String> comboBox = new ComboBox<>(null, diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java index 1f0ebf2f1c..7ea7d8af54 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java @@ -1,11 +1,11 @@ package com.vaadin.tests.components.combobox; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.util.Log; import com.vaadin.ui.ComboBox; -public class ComboBoxIdenticalItems extends AbstractTestUI { +public class ComboBoxIdenticalItems extends AbstractReindeerTestUI { private Log log = new Log(5); diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInputPrompt.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInputPrompt.java index 4e17ab6072..facdfbd5d2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInputPrompt.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInputPrompt.java @@ -16,11 +16,11 @@ package com.vaadin.tests.components.combobox; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.ComboBox; -public class ComboBoxInputPrompt extends AbstractTestUI { +public class ComboBoxInputPrompt extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListener.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListener.java index c1f151bbf2..5b2c1ddcdd 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListener.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListener.java @@ -18,7 +18,7 @@ package com.vaadin.tests.components.combobox; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.v7.ui.ComboBox; @@ -28,7 +28,7 @@ import com.vaadin.v7.ui.ComboBox; * * @author Vaadin Ltd */ -public class ComboBoxItemAddingWithFocusListener extends AbstractTestUI { +public class ComboBoxItemAddingWithFocusListener extends AbstractReindeerTestUI { private ComboBox cBox; diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnter.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnter.java index d5602be096..c13dd7cd2a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnter.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnter.java @@ -19,11 +19,11 @@ import java.util.ArrayList; import java.util.List; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.ComboBox; import com.vaadin.ui.Label; -public class ComboBoxMouseSelectEnter extends AbstractTestUI { +public class ComboBoxMouseSelectEnter extends AbstractReindeerTestUI { protected ComboBox<String> comboBox; @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMousewheel.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMousewheel.java index e34615410b..8479733267 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMousewheel.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMousewheel.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.combobox; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.util.ItemDataSource; import com.vaadin.ui.ComboBox; @@ -25,7 +25,7 @@ import com.vaadin.ui.ComboBox; * * @author Vaadin Ltd */ -public class ComboBoxMousewheel extends AbstractTestUI { +public class ComboBoxMousewheel extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreen.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreen.java index 25665d85ab..c65e33d8bc 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreen.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreen.java @@ -17,7 +17,7 @@ package com.vaadin.tests.components.combobox; import com.vaadin.server.ClassResource; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.data.Item; import com.vaadin.v7.ui.ComboBox; @@ -27,7 +27,7 @@ import com.vaadin.v7.ui.ComboBox; * * @author Vaadin Ltd */ -public class ComboBoxOnSmallScreen extends AbstractTestUI { +public class ComboBoxOnSmallScreen extends AbstractReindeerTestUI { private static final String PID = "captionPID"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrolls.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrolls.java index 3a0a44e464..b42e66e531 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrolls.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrolls.java @@ -16,12 +16,12 @@ package com.vaadin.tests.components.combobox; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.util.ItemDataSource; import com.vaadin.ui.ComboBox; import com.vaadin.ui.Label; -public class ComboBoxPopupWhenBodyScrolls extends AbstractTestUI { +public class ComboBoxPopupWhenBodyScrolls extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxResetValue.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxResetValue.java index 0336be06ca..06d2d72b80 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxResetValue.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxResetValue.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.combobox; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -9,7 +9,7 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.ComboBox; -public class ComboBoxResetValue extends AbstractTestUI { +public class ComboBoxResetValue extends AbstractReindeerTestUI { protected static final String EMPTY_VALUE = "Empty value"; protected static final String WITH_SET_NULL_SELECTION_ITEM_ID = "nullSelectionAllowedWithSetNullSelectionItemId"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrows.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrows.java index 823c7c5abd..3e01ac9202 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrows.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrows.java @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.List; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.AbstractLayout; import com.vaadin.ui.ComboBox; import com.vaadin.ui.VerticalLayout; @@ -27,7 +27,7 @@ import com.vaadin.ui.VerticalLayout; /** * Test UI verifying navigating in combobox via arrow keys. */ -public class ComboBoxScrollingWithArrows extends AbstractTestUI { +public class ComboBoxScrollingWithArrows extends AbstractReindeerTestUI { final String DESCRIPTION = "When positioned on last item in the page and press downArrow key - should open new page and set focus on the first item."; /* diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelecting.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelecting.java index f5c2e62940..1a1ac3da03 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelecting.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelecting.java @@ -4,12 +4,12 @@ import java.util.ArrayList; import java.util.List; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.ComboBox; import com.vaadin.ui.Label; import com.vaadin.ui.TextField; -public class ComboBoxSelecting extends AbstractTestUI { +public class ComboBoxSelecting extends AbstractReindeerTestUI { protected ComboBox<String> comboBox; protected List<String> items = new ArrayList<>(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowed.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowed.java index 80a6a8eac7..27a50a4792 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowed.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowed.java @@ -16,13 +16,13 @@ package com.vaadin.tests.components.combobox; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; import com.vaadin.v7.data.Property; import com.vaadin.v7.data.Property.ValueChangeEvent; import com.vaadin.v7.ui.ComboBox; -public class ComboBoxSetNullWhenNewItemsAllowed extends AbstractTestUI { +public class ComboBoxSetNullWhenNewItemsAllowed extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlow.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlow.java index 8cf8cb4bfb..f78d5466e4 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlow.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlow.java @@ -1,12 +1,12 @@ package com.vaadin.tests.components.combobox; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.util.Log; import com.vaadin.v7.data.Property.ValueChangeEvent; import com.vaadin.v7.data.Property.ValueChangeListener; -public class ComboBoxSlow extends AbstractTestUI { +public class ComboBoxSlow extends AbstractReindeerTestUI { private Log log = new Log(5); diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLength.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLength.java index 8e6d4ec83a..aada5d77bd 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLength.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLength.java @@ -19,10 +19,10 @@ import java.util.Arrays; import java.util.List; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.ComboBox; -public class ComboBoxSuggestionPageLength extends AbstractTestUI { +public class ComboBoxSuggestionPageLength extends AbstractReindeerTestUI { private static List<String> items = Arrays.asList("abc", "cde", "efg", "ghi", "ijk"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupClose.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupClose.java index 19c264717a..bb4b4d7705 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupClose.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupClose.java @@ -1,10 +1,10 @@ package com.vaadin.tests.components.combobox; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.ComboBox; -public class ComboBoxSuggestionPopupClose extends AbstractTestUI { +public class ComboBoxSuggestionPopupClose extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidth.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidth.java index 4a5fef4a22..587cd69d2d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidth.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidth.java @@ -4,10 +4,10 @@ import java.util.Arrays; import java.util.List; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.ComboBox; -public class ComboBoxSuggestionPopupWidth extends AbstractTestUI { +public class ComboBoxSuggestionPopupWidth extends AbstractReindeerTestUI { private static List<String> items = Arrays.asList("abc", "cde", "efg", "ghi", "ijk", "more items 1", "more items 2", "more items 3", diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacy.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacy.java index d1a619d9f3..1a29258e3b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacy.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacy.java @@ -4,10 +4,10 @@ import java.util.Arrays; import java.util.List; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.ComboBox; -public class ComboBoxSuggestionPopupWidthLegacy extends AbstractTestUI { +public class ComboBoxSuggestionPopupWidthLegacy extends AbstractReindeerTestUI { private static List<String> items = Arrays.asList("abc", "cde", "efg", "ghi", "ijk", "more items 1", "more items 2", "more items 3", diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentage.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentage.java index c860018f0a..f15fa2da2d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentage.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentage.java @@ -4,10 +4,10 @@ import java.util.Arrays; import java.util.List; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.ComboBox; -public class ComboBoxSuggestionPopupWidthPercentage extends AbstractTestUI { +public class ComboBoxSuggestionPopupWidthPercentage extends AbstractReindeerTestUI { private static List<String> items = Arrays.asList("abc", "cde", "efg", "ghi", "ijk", "more items 1", "more items 2", "more items 3", diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixels.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixels.java index 2f749e1051..34144aba1f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixels.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixels.java @@ -4,10 +4,10 @@ import java.util.Arrays; import java.util.List; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.ComboBox; -public class ComboBoxSuggestionPopupWidthPixels extends AbstractTestUI { +public class ComboBoxSuggestionPopupWidthPixels extends AbstractReindeerTestUI { private static List<String> items = Arrays.asList("abc", "cde", "efg", "ghi", "ijk", "more items 1", "more items 2", "more items 3", diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTabWhenFilter.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTabWhenFilter.java index 0d6b9e669c..37fdbaedcc 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTabWhenFilter.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTabWhenFilter.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.combobox; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.data.Container; import com.vaadin.v7.data.util.IndexedContainer; @@ -28,7 +28,7 @@ import com.vaadin.v7.ui.TextField; * When type fast and then press tab didn't add new item. Uses SlowComboBox, * which has a delay in setVariables method */ -public class ComboBoxTabWhenFilter extends AbstractTestUI { +public class ComboBoxTabWhenFilter extends AbstractReindeerTestUI { public static final String DESCRIPTION = "Adding new item by typing fast plus then press TAB, very quickly, should add new item and change focus."; @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValoDoubleClick.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValoDoubleClick.java index 06bbe7a262..4e5b511b7f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValoDoubleClick.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValoDoubleClick.java @@ -18,12 +18,10 @@ package com.vaadin.tests.components.combobox; import java.util.ArrayList; import java.util.List; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.ComboBox; -@Theme("valo") public class ComboBoxValoDoubleClick extends AbstractTestUI { // Quite impossible to autotest reliably as there must be a click to open @@ -32,7 +30,7 @@ public class ComboBoxValoDoubleClick extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { ComboBox<String> cb = new ComboBox<>("Double-click Me"); - List<String> items = new ArrayList<String>(); + List<String> items = new ArrayList<>(); for (int i = 0; i < 100; i++) { items.add("Item-" + i); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueInput.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueInput.java index 79fd46bc5e..b2406c8774 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueInput.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueInput.java @@ -1,11 +1,11 @@ package com.vaadin.tests.components.combobox; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.shared.ui.combobox.FilteringMode; import com.vaadin.v7.ui.ComboBox; -public class ComboBoxValueInput extends AbstractTestUI { +public class ComboBoxValueInput extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPage.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPage.java index d591651fcd..881d2e0bbf 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPage.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPage.java @@ -4,13 +4,13 @@ import java.util.ArrayList; import java.util.List; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.ComboBox; import com.vaadin.ui.Label; @SuppressWarnings("serial") public class ComboSelectedValueBeyondTheFirstDropdownPage - extends AbstractTestUI { + extends AbstractReindeerTestUI { protected static final int ITEM_COUNT = 21; protected static final String ITEM_NAME_TEMPLATE = "Item %d"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopen.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopen.java index b149757635..a0793aef47 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopen.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopen.java @@ -18,7 +18,7 @@ package com.vaadin.tests.components.combobox; import com.vaadin.server.Page; import com.vaadin.server.VaadinRequest; import com.vaadin.server.data.DataSource; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.ComboBox; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.MenuBar; @@ -31,7 +31,7 @@ import com.vaadin.ui.Notification.Type; * * @author Vaadin Ltd */ -public class ComboboxMenuBarAutoopen extends AbstractTestUI { +public class ComboboxMenuBarAutoopen extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPopupScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPopupScrolling.java index 24ecc91e01..073aea4c95 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPopupScrolling.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPopupScrolling.java @@ -3,13 +3,11 @@ package com.vaadin.tests.components.combobox; import java.util.ArrayList; import java.util.List; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUIWithLog; import com.vaadin.ui.ComboBox; import com.vaadin.ui.HorizontalLayout; -@Theme("valo") public class ComboboxPopupScrolling extends AbstractTestUIWithLog { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/FilteringTurkishLocale.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/FilteringTurkishLocale.java index 4844f252ce..2d00c2469a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/FilteringTurkishLocale.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/FilteringTurkishLocale.java @@ -19,11 +19,11 @@ import java.util.Arrays; import java.util.Locale; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.ComboBox; import com.vaadin.v7.ui.NativeSelect; -public class FilteringTurkishLocale extends AbstractTestUI { +public class FilteringTurkishLocale extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibility.java b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibility.java index d227b52f9f..b7d0474929 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibility.java +++ b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibility.java @@ -16,13 +16,13 @@ package com.vaadin.tests.components.customcomponent; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -public class CustomComponentChildVisibility extends AbstractTestUI { +public class CustomComponentChildVisibility extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentHideContent.java b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentHideContent.java index 7b76da33d7..92770447b1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentHideContent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentHideContent.java @@ -17,13 +17,13 @@ package com.vaadin.tests.components.customcomponent; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Label; -public class CustomComponentHideContent extends AbstractTestUI { +public class CustomComponentHideContent extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/customfield/CustomFieldSize.java b/uitest/src/main/java/com/vaadin/tests/components/customfield/CustomFieldSize.java index f8eb65c121..762d2d6489 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/customfield/CustomFieldSize.java +++ b/uitest/src/main/java/com/vaadin/tests/components/customfield/CustomFieldSize.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.customfield; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Component; import com.vaadin.ui.CustomField; import com.vaadin.ui.TextField; @@ -27,7 +27,7 @@ import com.vaadin.ui.VerticalLayout; * @since * @author Vaadin Ltd */ -public class CustomFieldSize extends AbstractTestUI { +public class CustomFieldSize extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithNullTemplate.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithNullTemplate.java index 2e3d371e12..70c5f048a3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithNullTemplate.java +++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithNullTemplate.java @@ -16,12 +16,12 @@ package com.vaadin.tests.components.customlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.CustomLayout; import com.vaadin.ui.Label; -public class CustomLayoutWithNullTemplate extends AbstractTestUI { +public class CustomLayoutWithNullTemplate extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithoutTemplate.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithoutTemplate.java index 17d51c6d71..fcab1fb119 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithoutTemplate.java +++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithoutTemplate.java @@ -16,12 +16,12 @@ package com.vaadin.tests.components.customlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.CustomLayout; import com.vaadin.ui.Label; -public class CustomLayoutWithoutTemplate extends AbstractTestUI { +public class CustomLayoutWithoutTemplate extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/customlayout/OverflowAutoFix.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/OverflowAutoFix.java index d6d4bdb3da..03233288f2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/customlayout/OverflowAutoFix.java +++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/OverflowAutoFix.java @@ -2,12 +2,12 @@ package com.vaadin.tests.components.customlayout; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.ui.AbstractComponent; @Widgetset(TestingWidgetSet.NAME) -public class OverflowAutoFix extends AbstractTestUI { +public class OverflowAutoFix extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { addComponent(new RunOverflowFix()); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/AriaDisabled.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/AriaDisabled.java index 86418f3734..fd0591aa3b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/AriaDisabled.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/AriaDisabled.java @@ -16,12 +16,12 @@ package com.vaadin.tests.components.datefield; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.components.TestDateField; import com.vaadin.ui.AbstractDateField; import com.vaadin.ui.VerticalLayout; -public class AriaDisabled extends AbstractTestUI { +public class AriaDisabled extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormatEEE.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormatEEE.java index 45828486cf..6d40ed8ca0 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormatEEE.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormatEEE.java @@ -20,12 +20,12 @@ import java.util.Locale; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.datefield.Resolution; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.components.TestDateField; import com.vaadin.ui.AbstractDateField; import com.vaadin.ui.VerticalLayout; -public class CustomDateFormatEEE extends AbstractTestUI { +public class CustomDateFormatEEE extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldChangeResolution.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldChangeResolution.java index 3305f9e229..51a117f78f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldChangeResolution.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldChangeResolution.java @@ -17,7 +17,7 @@ package com.vaadin.tests.components.datefield; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.datefield.Resolution; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.AbstractDateField; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -26,7 +26,7 @@ import com.vaadin.ui.DateField; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; -public class DateFieldChangeResolution extends AbstractTestUI { +public class DateFieldChangeResolution extends AbstractReindeerTestUI { public static final String DATEFIELD_ID = "datefield"; // The ID of a button is BUTTON_BASE_ID + resolution, e.g. button-month diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldClose.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldClose.java index df15431d27..c7f2f1df9e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldClose.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldClose.java @@ -16,11 +16,11 @@ package com.vaadin.tests.components.datefield; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.components.TestDateField; import com.vaadin.ui.AbstractDateField; -public class DateFieldClose extends AbstractTestUI { +public class DateFieldClose extends AbstractReindeerTestUI { static final String DATEFIELD_ID = "datefield"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffset.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffset.java index 8fce5df8d3..ab8a5ab233 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffset.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffset.java @@ -5,12 +5,12 @@ import java.time.format.DateTimeFormatter; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.datefield.Resolution; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.components.TestDateField; import com.vaadin.ui.AbstractDateField; import com.vaadin.ui.Label; -public class DateFieldDayResolutionOffset extends AbstractTestUI { +public class DateFieldDayResolutionOffset extends AbstractReindeerTestUI { private final String initialDateString = "09/01/2014"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldElementUI.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldElementUI.java index 9a41acc6d5..f7f1495cf1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldElementUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldElementUI.java @@ -1,11 +1,11 @@ package com.vaadin.tests.components.datefield; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.components.TestDateField; import com.vaadin.ui.DateField; -public class DateFieldElementUI extends AbstractTestUI { +public class DateFieldElementUI extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { addComponent(new DateField()); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldFastForward.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldFastForward.java index 39ec4c26f1..a1dcccd2b8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldFastForward.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldFastForward.java @@ -16,10 +16,10 @@ package com.vaadin.tests.components.datefield; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.InlineDateField; -public class DateFieldFastForward extends AbstractTestUI { +public class DateFieldFastForward extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInput.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInput.java index b92ca393c9..7ec46b8e48 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInput.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInput.java @@ -18,11 +18,11 @@ package com.vaadin.tests.components.datefield; import java.time.LocalDate; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.DateField; import com.vaadin.ui.Label; -public class DateFieldKeyboardInput extends AbstractTestUI { +public class DateFieldKeyboardInput extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosing.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosing.java index 0ac843ef31..d44ca3fe5a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosing.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosing.java @@ -16,11 +16,11 @@ package com.vaadin.tests.components.datefield; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.components.TestDateField; import com.vaadin.ui.AbstractDateField; -public class DateFieldPopupClosing extends AbstractTestUI { +public class DateFieldPopupClosing extends AbstractReindeerTestUI { static final String DATEFIELD_ID = "datefield"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetach.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetach.java index 738bb9a9d8..382646e40e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetach.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetach.java @@ -21,11 +21,11 @@ import java.util.TimerTask; import com.vaadin.event.LayoutEvents.LayoutClickEvent; import com.vaadin.event.LayoutEvents.LayoutClickListener; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.components.TestDateField; import com.vaadin.ui.AbstractDateField; -public class DateFieldPopupClosingOnDetach extends AbstractTestUI { +public class DateFieldPopupClosingOnDetach extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupPosition.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupPosition.java index af5464f24c..fb766685b4 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupPosition.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupPosition.java @@ -17,9 +17,9 @@ package com.vaadin.tests.components.datefield; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.DateField; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.DateField; /** * Test UI for date field Popup calendar. diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRanges.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRanges.java index 7b8e547701..da75872d4a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRanges.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRanges.java @@ -8,7 +8,7 @@ import java.util.Locale; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.MarginInfo; import com.vaadin.shared.ui.datefield.Resolution; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.components.TestDateField; import com.vaadin.ui.AbstractDateField; import com.vaadin.ui.Button; @@ -23,7 +23,7 @@ import com.vaadin.v7.data.Property.ValueChangeEvent; import com.vaadin.v7.data.Property.ValueChangeListener; import com.vaadin.v7.ui.NativeSelect; -public class DateFieldRanges extends AbstractTestUI { +public class DateFieldRanges extends AbstractReindeerTestUI { @Override protected Integer getTicketNumber() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldReadOnly.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldReadOnly.java index 513bb11f9e..2f315f725d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldReadOnly.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldReadOnly.java @@ -4,14 +4,14 @@ import java.time.LocalDate; import java.util.Locale; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.components.TestDateField; import com.vaadin.ui.AbstractDateField; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -public class DateFieldReadOnly extends AbstractTestUI { +public class DateFieldReadOnly extends AbstractReindeerTestUI { @Override protected String getTestDescription() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParent.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParent.java index 0e19ed9490..9c7e36f5e3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParent.java @@ -3,7 +3,7 @@ package com.vaadin.tests.components.datefield; import java.time.LocalDate; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.components.TestDateField; import com.vaadin.ui.AbstractDateField; import com.vaadin.ui.CheckBox; @@ -11,7 +11,7 @@ import com.vaadin.ui.DateField; import com.vaadin.ui.VerticalLayout; public class DateFieldWhenChangingValueAndEnablingParent - extends AbstractTestUI { + extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledDateFieldPopup.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledDateFieldPopup.java index 06b7e4c8e0..352d905b8d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledDateFieldPopup.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledDateFieldPopup.java @@ -16,11 +16,11 @@ package com.vaadin.tests.components.datefield; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.components.TestDateField; import com.vaadin.ui.AbstractDateField; -public class DisabledDateFieldPopup extends AbstractTestUI { +public class DisabledDateFieldPopup extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledInlineDateField.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledInlineDateField.java index 855c90fa53..7de3da119b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledInlineDateField.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledInlineDateField.java @@ -18,11 +18,11 @@ package com.vaadin.tests.components.datefield; import java.time.LocalDate; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.AbstractDateField; import com.vaadin.ui.InlineDateField; -public class DisabledInlineDateField extends AbstractTestUI { +public class DisabledInlineDateField extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledParentLayout.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledParentLayout.java index ed16a747c0..e484f19f3d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledParentLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledParentLayout.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.datefield; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.components.TestDateField; import com.vaadin.ui.AbstractDateField; import com.vaadin.ui.Button; @@ -26,7 +26,7 @@ import com.vaadin.ui.VerticalLayout; * * @author Vaadin Ltd */ -public class DisabledParentLayout extends AbstractTestUI { +public class DisabledParentLayout extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.java index 18dd47c392..0f0ec4a3e3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.java @@ -4,7 +4,7 @@ import java.time.LocalDate; import java.util.Locale; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.AbstractDateField; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -16,7 +16,7 @@ import com.vaadin.ui.VerticalLayout; * Main UI class */ @SuppressWarnings("serial") -public class DynamicallyChangeDateRange extends AbstractTestUI { +public class DynamicallyChangeDateRange extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldRanges.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldRanges.java index 05a7c6aa3d..df2faec965 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldRanges.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldRanges.java @@ -6,7 +6,7 @@ import java.util.Locale; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.MarginInfo; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; @@ -21,7 +21,7 @@ import com.vaadin.v7.ui.DateField; import com.vaadin.v7.ui.InlineDateField; import com.vaadin.v7.ui.NativeSelect; -public class LegacyDateFieldRanges extends AbstractTestUI { +public class LegacyDateFieldRanges extends AbstractReindeerTestUI { @Override protected Integer getTicketNumber() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupClosingWithEsc.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupClosingWithEsc.java index 0bd2191587..54614dd7aa 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupClosingWithEsc.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupClosingWithEsc.java @@ -17,12 +17,12 @@ package com.vaadin.tests.components.datefield; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.datefield.Resolution; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.components.TestDateField; import com.vaadin.ui.AbstractDateField; import com.vaadin.ui.VerticalLayout; -public class PopupClosingWithEsc extends AbstractTestUI { +public class PopupClosingWithEsc extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java index 4a65358516..ee3bea20eb 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java @@ -6,12 +6,12 @@ import java.util.stream.Stream; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.datefield.Resolution; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.DateField; @SuppressWarnings("serial") -public class PopupDateFieldExtendedRange extends AbstractTestUI { +public class PopupDateFieldExtendedRange extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldInputPrompt.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldInputPrompt.java index 9ff366e2d0..31dd5f1c8a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldInputPrompt.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldInputPrompt.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.datefield; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.DateField; import com.vaadin.ui.TextField; @@ -26,7 +26,7 @@ import com.vaadin.ui.TextField; * * @author Vaadin Ltd */ -public class PopupDateFieldInputPrompt extends AbstractTestUI { +public class PopupDateFieldInputPrompt extends AbstractReindeerTestUI { private TextField text = new TextField("TextField"); private DateField dateField = new DateField(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldStates.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldStates.java index d094b058eb..c9a57462af 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldStates.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldStates.java @@ -3,12 +3,12 @@ package com.vaadin.tests.components.datefield; import java.time.LocalDate; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.DateField; import com.vaadin.ui.GridLayout; @SuppressWarnings("serial") -public class PopupDateFieldStates extends AbstractTestUI { +public class PopupDateFieldStates extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DefaultDateFieldPopupPosition.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/ReindeerDateFieldPopupPosition.java index d3d0a65af9..e148c83402 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DefaultDateFieldPopupPosition.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/ReindeerDateFieldPopupPosition.java @@ -15,13 +15,16 @@ */ package com.vaadin.tests.components.datefield; +import com.vaadin.annotations.Theme; + /** - * Test UI for date field Popup calendar in default theme. + * Test UI for date field Popup calendar in reindeer theme. * * All UI initialization is defined in super class. * * @author Vaadin Ltd */ -public class DefaultDateFieldPopupPosition extends DateFieldPopupPosition { +@Theme("reindeer") +public class ReindeerDateFieldPopupPosition extends DateFieldPopupPosition { } diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/ValoDateFieldPopupPosition.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/ValoDateFieldPopupPosition.java index 2fc4eb6706..10d4351980 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/ValoDateFieldPopupPosition.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/ValoDateFieldPopupPosition.java @@ -15,8 +15,6 @@ */ package com.vaadin.tests.components.datefield; -import com.vaadin.annotations.Theme; - /** * Test UI for date field Popup calendar in Valo theme. * @@ -24,7 +22,6 @@ import com.vaadin.annotations.Theme; * * @author Vaadin Ltd */ -@Theme("valo") public class ValoDateFieldPopupPosition extends DateFieldPopupPosition { } diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropBatchUpload.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropBatchUpload.java index b3285e948c..9ad1b3fc61 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropBatchUpload.java +++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropBatchUpload.java @@ -28,14 +28,14 @@ import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.server.StreamVariable; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.DragAndDropWrapper; import com.vaadin.ui.DragAndDropWrapper.WrapperTransferable; import com.vaadin.ui.Html5File; import com.vaadin.ui.Label; -public class DragAndDropBatchUpload extends AbstractTestUI { +public class DragAndDropBatchUpload extends AbstractReindeerTestUI { private int batchId = 0; private Label console = new Label("No activity detected yet", diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropDisable.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropDisable.java index 72d547597d..ee9c385b05 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropDisable.java +++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropDisable.java @@ -5,7 +5,7 @@ import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptAll; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.CheckBox; import com.vaadin.ui.CssLayout; import com.vaadin.ui.DragAndDropWrapper; @@ -15,7 +15,7 @@ import com.vaadin.ui.Panel; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Table.TableDragMode; -public class DragAndDropDisable extends AbstractTestUI { +public class DragAndDropDisable extends AbstractReindeerTestUI { @Override protected Integer getTicketNumber() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropRelativeWidth.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropRelativeWidth.java index 66bb123f1c..3d7a2b0209 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropRelativeWidth.java +++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropRelativeWidth.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.draganddropwrapper; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.CssLayout; import com.vaadin.ui.DragAndDropWrapper; import com.vaadin.ui.DragAndDropWrapper.DragStartMode; @@ -27,7 +27,7 @@ import com.vaadin.ui.Label; * * @author Vaadin Ltd */ -public class DragAndDropRelativeWidth extends AbstractTestUI { +public class DragAndDropRelativeWidth extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextArea.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextArea.java index 6ec06a4b45..7125183db8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextArea.java +++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextArea.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.draganddropwrapper; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.DragAndDropWrapper; import com.vaadin.ui.DragAndDropWrapper.DragStartMode; import com.vaadin.ui.VerticalLayout; @@ -28,7 +28,7 @@ import com.vaadin.v7.ui.TextArea; * @since 7.2 * @author Vaadin Ltd */ -public class DragAndDropTextArea extends AbstractTestUI { +public class DragAndDropTextArea extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java index fc27254539..facf45e122 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java +++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java @@ -19,7 +19,6 @@ import java.io.OutputStream; import org.apache.commons.io.output.NullOutputStream; -import com.vaadin.annotations.Theme; import com.vaadin.event.Transferable; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; @@ -36,7 +35,6 @@ import com.vaadin.ui.DragAndDropWrapper.WrapperTransferable; import com.vaadin.ui.Html5File; import com.vaadin.ui.Label; -@Theme("valo") public class SingleUseDragAndDropUpload extends AbstractTestUIWithLog { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedThemeResource.java b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedThemeResource.java index 2592d8d739..fc59147654 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedThemeResource.java +++ b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedThemeResource.java @@ -17,7 +17,7 @@ package com.vaadin.tests.components.embedded; import com.vaadin.server.ThemeResource; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Embedded; @@ -31,7 +31,7 @@ import com.vaadin.ui.themes.Reindeer; * * @author Vaadin Ltd */ -public class EmbeddedThemeResource extends AbstractTestUI { +public class EmbeddedThemeResource extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/CaptionEnableDisable.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/CaptionEnableDisable.java index c06c17afad..a8802f2990 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/CaptionEnableDisable.java +++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/CaptionEnableDisable.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.formlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; import com.vaadin.ui.ComboBox; @@ -9,7 +9,7 @@ import com.vaadin.ui.FormLayout; import com.vaadin.ui.TextField; import com.vaadin.v7.ui.NativeSelect; -public class CaptionEnableDisable extends AbstractTestUI { +public class CaptionEnableDisable extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java index 85774a8efe..a93f3814d4 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java +++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java @@ -16,11 +16,11 @@ package com.vaadin.tests.components.formlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.FormLayout; import com.vaadin.ui.DateField; -public class FormLayoutErrorHover extends AbstractTestUI { +public class FormLayoutErrorHover extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayout.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayout.java index a72ca04963..59afd5afed 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayout.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.components.formlayout; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.CssLayout; @@ -29,7 +28,6 @@ import com.vaadin.v7.ui.TextField; * * @author Vaadin Ltd */ -@Theme("valo") public class FormLayoutInVerticalLayout extends AbstractTestUI { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutResizing.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutResizing.java index 595cca7089..5f5cb84747 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutResizing.java +++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutResizing.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.formlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; @@ -26,7 +26,7 @@ import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.TextField; -public class FormLayoutResizing extends AbstractTestUI { +public class FormLayoutResizing extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java index eb1e82e440..729d3ead39 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java @@ -16,13 +16,13 @@ package com.vaadin.tests.components.formlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.FormLayout; import com.vaadin.v7.ui.TextField; -public class HtmlCaptionInFormLayout extends AbstractTestUI { +public class HtmlCaptionInFormLayout extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { final TextField asHtml = new TextField("Contains <b>HTML</b>"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/NestedFormLayouts.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/NestedFormLayouts.java index 725ac65c0b..da4d77e487 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/NestedFormLayouts.java +++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/NestedFormLayouts.java @@ -1,12 +1,12 @@ package com.vaadin.tests.components.formlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.CheckBox; import com.vaadin.ui.FormLayout; import com.vaadin.ui.Label; -public class NestedFormLayouts extends AbstractTestUI { +public class NestedFormLayouts extends AbstractReindeerTestUI { private FormLayout outer; private FormLayout inner1; diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/StylePrefix.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/StylePrefix.java index cb2cd6aa80..3062a1d227 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/StylePrefix.java +++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/StylePrefix.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.formlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.FormLayout; /** @@ -25,7 +25,7 @@ import com.vaadin.ui.FormLayout; * * @author Vaadin Ltd */ -public class StylePrefix extends AbstractTestUI { +public class StylePrefix extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java index cbc24bc021..66689dd73d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java +++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java @@ -1,12 +1,12 @@ package com.vaadin.tests.components.formlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.FormLayout; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.TextField; -public class TableInFormLayoutCausesScrolling extends AbstractTestUI { +public class TableInFormLayoutCausesScrolling extends AbstractReindeerTestUI { @Override public void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridApplyFilterWhenScrolledDown.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridApplyFilterWhenScrolledDown.java index 72a53d2f0c..0ce70b722e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridApplyFilterWhenScrolledDown.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridApplyFilterWhenScrolledDown.java @@ -4,14 +4,12 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Function; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.server.data.DataSource; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Grid; -@Theme("valo") public class GridApplyFilterWhenScrolledDown extends AbstractTestUI { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridClickableRenderers.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridClickableRenderers.java index 8a6bb5ea7c..9848a8cf48 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridClickableRenderers.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridClickableRenderers.java @@ -2,14 +2,14 @@ package com.vaadin.tests.components.grid; import com.vaadin.server.ExternalResource; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Grid; import com.vaadin.ui.Label; import com.vaadin.ui.renderers.ButtonRenderer; import com.vaadin.ui.renderers.CheckBoxRenderer; import com.vaadin.ui.renderers.ImageRenderer; -public class GridClickableRenderers extends AbstractTestUI { +public class GridClickableRenderers extends AbstractReindeerTestUI { private static class TestPOJO { String testText; diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnHiding.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnHiding.java index 0abf48baeb..120d3cc30c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnHiding.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnHiding.java @@ -3,7 +3,7 @@ package com.vaadin.tests.components.grid; import java.util.Arrays; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.data.bean.Person; import com.vaadin.ui.Button; import com.vaadin.ui.Grid; @@ -11,7 +11,7 @@ import com.vaadin.ui.Grid.Column; import com.vaadin.ui.renderers.NumberRenderer; import com.vaadin.v7.ui.Label; -public class GridColumnHiding extends AbstractTestUI { +public class GridColumnHiding extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnResizing.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnResizing.java index a07550a20a..9f35e62aa7 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnResizing.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnResizing.java @@ -4,7 +4,7 @@ import java.util.Arrays; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.data.bean.Person; import com.vaadin.ui.Grid; import com.vaadin.ui.Grid.Column; @@ -13,7 +13,7 @@ import com.vaadin.ui.TextField; import com.vaadin.ui.renderers.NumberRenderer; @Widgetset("com.vaadin.DefaultWidgetSet") -public class GridColumnResizing extends AbstractTestUI { +public class GridColumnResizing extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptRenderers.java b/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptRenderers.java index 934ae13f00..8f83139459 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptRenderers.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptRenderers.java @@ -19,10 +19,10 @@ import java.util.ArrayList; import java.util.List; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Grid; -public class JavaScriptRenderers extends AbstractTestUI { +public class JavaScriptRenderers extends AbstractReindeerTestUI { public static class ItemBean { private Integer id; diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basics/RefreshDataSource.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/RefreshDataSource.java index 2623d61e28..fec3e4aee3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/basics/RefreshDataSource.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/RefreshDataSource.java @@ -20,7 +20,7 @@ import java.util.List; import com.vaadin.server.VaadinRequest; import com.vaadin.server.data.DataSource; import com.vaadin.server.data.ListDataSource; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Grid; @@ -28,7 +28,7 @@ import com.vaadin.ui.Grid; * @author Vaadin Ltd * */ -public class RefreshDataSource extends AbstractTestUI { +public class RefreshDataSource extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/ComponentAlignments.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/ComponentAlignments.java index b84735c740..4e38ad9b80 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/ComponentAlignments.java +++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/ComponentAlignments.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.gridlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Alignment; import com.vaadin.ui.CheckBox; import com.vaadin.ui.VerticalLayout; @@ -26,7 +26,7 @@ import com.vaadin.ui.VerticalLayout; * * @author Vaadin Ltd */ -public class ComponentAlignments extends AbstractTestUI { +public class ComponentAlignments extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutAlignments.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutAlignments.java index b37e47243f..b4b3e1600e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutAlignments.java +++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutAlignments.java @@ -1,6 +1,5 @@ package com.vaadin.tests.components.gridlayout; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; @@ -10,9 +9,7 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.NativeButton; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.themes.ValoTheme; -@Theme(ValoTheme.THEME_NAME) public class GridLayoutAlignments extends UI { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignment.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignment.java index da1e03f15b..a3014c6769 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignment.java +++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignment.java @@ -16,12 +16,12 @@ package com.vaadin.tests.components.gridlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Alignment; import com.vaadin.ui.GridLayout; import com.vaadin.v7.ui.TextField; -public class GridLayoutCaptionAlignment extends AbstractTestUI { +public class GridLayoutCaptionAlignment extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUI.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUI.java index d2ca7700ad..ab20c110db 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUI.java @@ -2,14 +2,14 @@ package com.vaadin.tests.components.gridlayout; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.datefield.Resolution; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.GridLayout; import com.vaadin.ui.InlineDateField; import com.vaadin.ui.Label; @SuppressWarnings("serial") -public class GridLayoutCellSizesUI extends AbstractTestUI { +public class GridLayoutCellSizesUI extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutExpandRatio.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutExpandRatio.java index 2a533e4eda..eb95470db2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutExpandRatio.java +++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutExpandRatio.java @@ -16,14 +16,14 @@ package com.vaadin.tests.components.gridlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; -public class GridLayoutExpandRatio extends AbstractTestUI { +public class GridLayoutExpandRatio extends AbstractReindeerTestUI { HorizontalLayout layout; GridLayout gridLayout; GridLayout gridLayout2; diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacing.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacing.java index a8f25c3dc4..608850e51a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacing.java +++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacing.java @@ -16,12 +16,12 @@ package com.vaadin.tests.components.gridlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.CheckBox; import com.vaadin.ui.CssLayout; import com.vaadin.ui.GridLayout; -public class GridLayoutExtraSpacing extends AbstractTestUI { +public class GridLayoutExtraSpacing extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutFractionalSizeAndAlignment.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutFractionalSizeAndAlignment.java index 0cf2029065..bf564cfb21 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutFractionalSizeAndAlignment.java +++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutFractionalSizeAndAlignment.java @@ -17,7 +17,7 @@ package com.vaadin.tests.components.gridlayout; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUIWithLog; +import com.vaadin.tests.components.AbstractReindeerTestUIWithLog; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.tests.widgetset.server.ScrollableGridLayout; import com.vaadin.ui.Alignment; @@ -26,7 +26,7 @@ import com.vaadin.ui.GridLayout; @Widgetset(TestingWidgetSet.NAME) public class GridLayoutFractionalSizeAndAlignment - extends AbstractTestUIWithLog { + extends AbstractReindeerTestUIWithLog { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutHideMiddleCells.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutHideMiddleCells.java index 1c801333b1..d23f597df8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutHideMiddleCells.java +++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutHideMiddleCells.java @@ -18,7 +18,7 @@ package com.vaadin.tests.components.gridlayout; import java.util.Random; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.GridLayout; @@ -26,7 +26,7 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; -public class GridLayoutHideMiddleCells extends AbstractTestUI { +public class GridLayoutHideMiddleCells extends AbstractReindeerTestUI { GridLayout gridLayout; GridLayout gridLayout2; diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java index e866db5426..bb88411fcd 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java +++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.gridlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Alignment; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; @@ -26,7 +26,7 @@ import com.vaadin.v7.ui.TextField; /** * Test for grid required indicator location within slots. */ -public class GridLayoutRequiredIndicatorLocation extends AbstractTestUI { +public class GridLayoutRequiredIndicatorLocation extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutScrollPosition.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutScrollPosition.java index a27f2fe745..ef01bac0b0 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutScrollPosition.java +++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutScrollPosition.java @@ -16,13 +16,13 @@ package com.vaadin.tests.components.gridlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.CheckBox; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; -public class GridLayoutScrollPosition extends AbstractTestUI { +public class GridLayoutScrollPosition extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutWithNonIntegerWidth.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutWithNonIntegerWidth.java index b9afd3007d..69a0518540 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutWithNonIntegerWidth.java +++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutWithNonIntegerWidth.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.gridlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; @@ -12,7 +12,7 @@ import com.vaadin.ui.VerticalLayout; * Main UI class */ @SuppressWarnings("serial") -public class GridLayoutWithNonIntegerWidth extends AbstractTestUI { +public class GridLayoutWithNonIntegerWidth extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/InsertRowInMiddle.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/InsertRowInMiddle.java index 764464c838..6e2543eb01 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/InsertRowInMiddle.java +++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/InsertRowInMiddle.java @@ -17,13 +17,13 @@ package com.vaadin.tests.components.gridlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -public class InsertRowInMiddle extends AbstractTestUI { +public class InsertRowInMiddle extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.java index ea0a123ef8..477fd5ae96 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.java +++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.java @@ -18,7 +18,7 @@ package com.vaadin.tests.components.gridlayout; import com.vaadin.server.UserError; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.components.TestDateField; import com.vaadin.ui.AbstractDateField; import com.vaadin.ui.Button; @@ -27,7 +27,7 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Panel; -public class LayoutAfterHidingError extends AbstractTestUI { +public class LayoutAfterHidingError extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java index 1da2322dc9..cc850f2f86 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.gridlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.ComponentContainer; @@ -9,7 +9,7 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; -public class MoveComponentsFromGridLayoutToInnerLayout extends AbstractTestUI { +public class MoveComponentsFromGridLayoutToInnerLayout extends AbstractReindeerTestUI { protected Button testButton; private GridLayout gl; diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUI.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUI.java index b1355e8b15..996f4f15fa 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUI.java @@ -1,5 +1,6 @@ package com.vaadin.tests.components.gridlayout; +import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Alignment; import com.vaadin.ui.GridLayout; @@ -9,6 +10,7 @@ import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.TextField; @SuppressWarnings("serial") +@Theme("reindeer") public class UniformGridLayoutUI extends UI { @Override @@ -17,7 +19,7 @@ public class UniformGridLayoutUI extends UI { layout.setMargin(true); setContent(layout); layout.setSpacing(true); - boolean hide = (request.getParameter("collapse") != null); + boolean hide = request.getParameter("collapse") != null; layout.addComponent(createGridWithoutGridBuilder(1, hide)); layout.addComponent(createGridWithoutGridBuilder(2, hide)); layout.addComponent(createGridWithoutGridBuilder(3, hide)); diff --git a/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java index 0c8d2d8dd8..4078571347 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java @@ -29,7 +29,7 @@ import com.vaadin.shared.communication.ClientRpc; import com.vaadin.shared.communication.ServerRpc; import com.vaadin.shared.communication.URLReference; import com.vaadin.shared.ui.JavaScriptComponentState; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.util.Log; import com.vaadin.ui.AbstractJavaScriptComponent; import com.vaadin.ui.Button; @@ -41,7 +41,7 @@ import elemental.json.JsonArray; import elemental.json.JsonObject; import elemental.json.JsonValue; -public class BasicJavaScriptComponent extends AbstractTestUI { +public class BasicJavaScriptComponent extends AbstractReindeerTestUI { public interface TestRpc extends ServerRpc, ClientRpc { public void sendRpc(String message); diff --git a/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JSComponentLoadingIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JSComponentLoadingIndicator.java index d318b7e5b0..dd53e94cb2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JSComponentLoadingIndicator.java +++ b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JSComponentLoadingIndicator.java @@ -2,14 +2,14 @@ package com.vaadin.tests.components.javascriptcomponent; import com.vaadin.annotations.JavaScript; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.AbstractJavaScriptComponent; import com.vaadin.ui.JavaScriptFunction; import com.vaadin.ui.Label; import elemental.json.JsonArray; -public class JSComponentLoadingIndicator extends AbstractTestUI { +public class JSComponentLoadingIndicator extends AbstractReindeerTestUI { @JavaScript({ "JSComponent.js" }) public class JSComponent extends AbstractJavaScriptComponent { diff --git a/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloading.java b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloading.java index cdc9e0660e..15964748a5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloading.java +++ b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloading.java @@ -18,11 +18,11 @@ package com.vaadin.tests.components.javascriptcomponent; import com.vaadin.annotations.JavaScript; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.JavaScriptComponentState; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.util.Log; import com.vaadin.ui.AbstractJavaScriptComponent; -public class JavaScriptPreloading extends AbstractTestUI { +public class JavaScriptPreloading extends AbstractReindeerTestUI { public static class JsLabelState extends JavaScriptComponentState { public String xhtml; diff --git a/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListener.java b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListener.java index d203e13a8c..8d9f9b0c89 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListener.java +++ b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListener.java @@ -18,14 +18,14 @@ package com.vaadin.tests.components.javascriptcomponent; import com.vaadin.annotations.JavaScript; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.AbstractJavaScriptComponent; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.CssLayout; -public class JavaScriptResizeListener extends AbstractTestUI { +public class JavaScriptResizeListener extends AbstractReindeerTestUI { @JavaScript("ResizeJsConnector.js") public class ResizeJsComponent extends AbstractJavaScriptComponent { diff --git a/uitest/src/main/java/com/vaadin/tests/components/label/LabelPropertySourceValue.java b/uitest/src/main/java/com/vaadin/tests/components/label/LabelPropertySourceValue.java index c51e24ceff..57513e47fc 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/label/LabelPropertySourceValue.java +++ b/uitest/src/main/java/com/vaadin/tests/components/label/LabelPropertySourceValue.java @@ -1,14 +1,14 @@ package com.vaadin.tests.components.label; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.v7.data.util.ObjectProperty; import com.vaadin.v7.ui.Label; -public class LabelPropertySourceValue extends AbstractTestUI { +public class LabelPropertySourceValue extends AbstractReindeerTestUI { private Label label; @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/label/LabelStyles.java b/uitest/src/main/java/com/vaadin/tests/components/label/LabelStyles.java index 6044a15de0..7cfc8be714 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/label/LabelStyles.java +++ b/uitest/src/main/java/com/vaadin/tests/components/label/LabelStyles.java @@ -16,13 +16,13 @@ package com.vaadin.tests.components.label; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.themes.Reindeer; -public class LabelStyles extends AbstractTestUI { +public class LabelStyles extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/label/MarginsInLabels.java b/uitest/src/main/java/com/vaadin/tests/components/label/MarginsInLabels.java index b18b92dfc8..419d990da3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/label/MarginsInLabels.java +++ b/uitest/src/main/java/com/vaadin/tests/components/label/MarginsInLabels.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.label; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.AbstractLayout; import com.vaadin.ui.Accordion; import com.vaadin.ui.GridLayout; @@ -10,7 +10,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; -public class MarginsInLabels extends AbstractTestUI { +public class MarginsInLabels extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponent.java b/uitest/src/main/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponent.java index 270cb93ae9..161a0c471b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponent.java @@ -18,14 +18,14 @@ package com.vaadin.tests.components.layout; import com.vaadin.server.Page; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.TextArea; import com.vaadin.v7.ui.TextField; -public class EmptySpaceOnPageAfterExpandedComponent extends AbstractTestUI { +public class EmptySpaceOnPageAfterExpandedComponent extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectJump.java b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectJump.java index ae0b25c09c..697759941c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectJump.java +++ b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectJump.java @@ -5,12 +5,12 @@ import java.util.ArrayList; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.MarginInfo; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Label; import com.vaadin.ui.ListSelect; -public class ListSelectJump extends AbstractTestUI { +public class ListSelectJump extends AbstractReindeerTestUI { @Override public void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormUI.java b/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormUI.java index cdc97d01be..058d4a1cfb 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormUI.java @@ -3,7 +3,7 @@ package com.vaadin.tests.components.loginform; import java.util.Optional; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.HorizontalLayout; @@ -11,7 +11,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.LoginForm; import com.vaadin.ui.VerticalLayout; -public class LoginFormUI extends AbstractTestUI { +public class LoginFormUI extends AbstractReindeerTestUI { private HorizontalLayout loginFormLayout; protected LoginForm loginForm; diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarClickOpenedMenu.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarClickOpenedMenu.java index be07fc1705..f337cd9066 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarClickOpenedMenu.java +++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarClickOpenedMenu.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.menubar; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.MenuBar; import com.vaadin.ui.MenuBar.Command; import com.vaadin.ui.MenuBar.MenuItem; @@ -26,7 +26,7 @@ import com.vaadin.ui.MenuBar.MenuItem; * * @author Vaadin Ltd */ -public class MenuBarClickOpenedMenu extends AbstractTestUI { +public class MenuBarClickOpenedMenu extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarFocus.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarFocus.java index 947d856ee3..e8dbd2b75e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarFocus.java +++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarFocus.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.menubar; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -25,7 +25,7 @@ import com.vaadin.ui.MenuBar; import com.vaadin.ui.MenuBar.Command; import com.vaadin.ui.MenuBar.MenuItem; -public class MenuBarFocus extends AbstractTestUI { +public class MenuBarFocus extends AbstractReindeerTestUI { /* * (non-Javadoc) diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValo.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValo.java index d284b82ba4..af1d40973e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValo.java +++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValo.java @@ -1,12 +1,10 @@ package com.vaadin.tests.components.menubar; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.MenuBar; import com.vaadin.ui.MenuBar.MenuItem; -@Theme("valo") public class MenuBarSubmenusClosingValo extends AbstractTestUI { private MenuItem edit; diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdge.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdge.java index b75e02ec1c..31b9dd7a45 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdge.java +++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdge.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.menubar; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Alignment; import com.vaadin.ui.Component; import com.vaadin.ui.MenuBar; @@ -29,7 +29,7 @@ import com.vaadin.ui.VerticalLayout; * * @author Vaadin Ltd */ -public class MenuBarTooltipsNearEdge extends AbstractTestUI { +public class MenuBarTooltipsNearEdge extends AbstractReindeerTestUI { /* * (non-Javadoc) * diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarsWithNesting.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarsWithNesting.java index 80817c1b4a..1855fd149d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarsWithNesting.java +++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarsWithNesting.java @@ -19,7 +19,7 @@ import com.vaadin.server.FontAwesome; import com.vaadin.server.Resource; import com.vaadin.server.ThemeResource; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; import com.vaadin.ui.MenuBar; import com.vaadin.ui.MenuBar.MenuItem; @@ -35,7 +35,7 @@ import com.vaadin.ui.MenuBar.MenuItem; * @author Vaadin */ @SuppressWarnings("serial") -public class MenuBarsWithNesting extends AbstractTestUI { +public class MenuBarsWithNesting extends AbstractReindeerTestUI { // The label displays the last selection. private final Label label = new Label("Initial content"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuItemStyleRemoved.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuItemStyleRemoved.java index 716fef65b3..6724b59ca5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuItemStyleRemoved.java +++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuItemStyleRemoved.java @@ -3,12 +3,12 @@ package com.vaadin.tests.components.menubar; import com.vaadin.server.Page; import com.vaadin.server.VaadinRequest; import com.vaadin.server.WebBrowser; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.JavaScript; import com.vaadin.ui.MenuBar; -public class MenuItemStyleRemoved extends AbstractTestUI { +public class MenuItemStyleRemoved extends AbstractReindeerTestUI { protected static final String MENUITEM_CLASS = "v-menubar-menuitem"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuTooltip.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuTooltip.java index 680c384541..213544c900 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuTooltip.java +++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuTooltip.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.menubar; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Component; import com.vaadin.ui.MenuBar; import com.vaadin.ui.MenuBar.Command; @@ -27,7 +27,7 @@ import com.vaadin.ui.MenuBar.MenuItem; * * @author Vaadin Ltd */ -public class MenuTooltip extends AbstractTestUI { +public class MenuTooltip extends AbstractReindeerTestUI { /* * (non-Javadoc) * diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/SpaceMenuBarNavigation.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/SpaceMenuBarNavigation.java index 70c369a4d7..bc5816d1f4 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/menubar/SpaceMenuBarNavigation.java +++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/SpaceMenuBarNavigation.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.menubar; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; import com.vaadin.ui.MenuBar; import com.vaadin.ui.MenuBar.Command; @@ -27,7 +27,7 @@ import com.vaadin.ui.MenuBar.MenuItem; * @since 7.2 * @author Vaadin Ltd */ -public class SpaceMenuBarNavigation extends AbstractTestUI implements Command { +public class SpaceMenuBarNavigation extends AbstractReindeerTestUI implements Command { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonClick.java b/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonClick.java index a59402b5b6..e35d7f3105 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonClick.java +++ b/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonClick.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.nativebutton; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; @@ -30,7 +30,7 @@ import com.vaadin.ui.NativeButton; * @author Vaadin Ltd */ @SuppressWarnings("serial") -public class NativeButtonClick extends AbstractTestUI { +public class NativeButtonClick extends AbstractReindeerTestUI { /* * (non-Javadoc) diff --git a/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonIconAndText.java b/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonIconAndText.java index e2fafb5946..69cf25e736 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonIconAndText.java +++ b/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonIconAndText.java @@ -17,13 +17,13 @@ package com.vaadin.tests.components.nativebutton; import com.vaadin.server.ThemeResource; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.NativeButton; -public class NativeButtonIconAndText extends AbstractTestUI +public class NativeButtonIconAndText extends AbstractReindeerTestUI implements ClickListener { static final String UPDATED_ALTERNATE_TEXT = "Now has alternate text"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelectInit.java b/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelectInit.java index 44e7027191..28c2e2035d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelectInit.java +++ b/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelectInit.java @@ -16,14 +16,14 @@ package com.vaadin.tests.components.nativeselect; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.NativeSelect; /** * @author Vaadin Ltd * */ -public class NativeSelectInit extends AbstractTestUI { +public class NativeSelectInit extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/notification/ChromeBottomNotification.java b/uitest/src/main/java/com/vaadin/tests/components/notification/ChromeBottomNotification.java index aa68288753..3cbedceab8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/notification/ChromeBottomNotification.java +++ b/uitest/src/main/java/com/vaadin/tests/components/notification/ChromeBottomNotification.java @@ -2,11 +2,11 @@ package com.vaadin.tests.components.notification; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.Position; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Notification; -public class ChromeBottomNotification extends AbstractTestUI { +public class ChromeBottomNotification extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { addButton("Show notification", new Button.ClickListener() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/notification/MiddleNotificationPosition.java b/uitest/src/main/java/com/vaadin/tests/components/notification/MiddleNotificationPosition.java index a8a3cfaef6..d504eb81b1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/notification/MiddleNotificationPosition.java +++ b/uitest/src/main/java/com/vaadin/tests/components/notification/MiddleNotificationPosition.java @@ -17,7 +17,7 @@ package com.vaadin.tests.components.notification; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.Position; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -29,7 +29,7 @@ import com.vaadin.ui.Notification; * @since 7.2 * @author Vaadin Ltd */ -public class MiddleNotificationPosition extends AbstractTestUI { +public class MiddleNotificationPosition extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationDelay.java b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationDelay.java index 5a98c380cb..9307f62c4f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationDelay.java +++ b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationDelay.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.notification; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Notification; import com.vaadin.ui.Notification.Type; @@ -25,7 +25,7 @@ import com.vaadin.ui.Notification.Type; * * @author Vaadin Ltd */ -public class NotificationDelay extends AbstractTestUI { +public class NotificationDelay extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsWaiAria.java b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsWaiAria.java index e35304aa74..6f0bec4798 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsWaiAria.java +++ b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsWaiAria.java @@ -6,7 +6,7 @@ import com.vaadin.server.Page; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.ValueChangeMode; import com.vaadin.shared.ui.ui.NotificationRole; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -25,7 +25,7 @@ import com.vaadin.v7.ui.TextArea; * @since 7.2 * @author Vaadin Ltd */ -public class NotificationsWaiAria extends AbstractTestUI { +public class NotificationsWaiAria extends AbstractReindeerTestUI { private static final String CAPTION = "CAPTION"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.java index 2e5c2e38e1..41432213f1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.optiongroup; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.data.Property.ValueChangeEvent; import com.vaadin.v7.data.Property.ValueChangeListener; import com.vaadin.v7.ui.OptionGroup; @@ -26,7 +26,7 @@ import com.vaadin.v7.ui.OptionGroup; * * @author Vaadin Ltd */ -public class OptionGroupRetainFocusKeyboardValueChange extends AbstractTestUI { +public class OptionGroupRetainFocusKeyboardValueChange extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroup.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroup.java index 8185104ccc..b3aa364364 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroup.java +++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroup.java @@ -18,7 +18,7 @@ package com.vaadin.tests.components.optiongroup; import java.util.Collections; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.CheckBox; import com.vaadin.v7.ui.OptionGroup; @@ -27,7 +27,7 @@ import com.vaadin.v7.ui.OptionGroup; * * @author Vaadin Ltd */ -public class ReadOnlyOptionGroup extends AbstractTestUI { +public class ReadOnlyOptionGroup extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java index 416e5c8d09..8ef5608fce 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java @@ -11,7 +11,7 @@ import com.vaadin.server.ThemeResource; import com.vaadin.server.UserError; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Alignment; @@ -32,7 +32,7 @@ import com.vaadin.v7.ui.TextField; @Theme("tests-components") @PreserveOnRefresh -public class BoxLayoutTest extends AbstractTestUI { +public class BoxLayoutTest extends AbstractReindeerTestUI { protected AbstractOrderedLayout view; diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/CaptionLeak.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/CaptionLeak.java index 850b6b200a..e3ebb67cd6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/CaptionLeak.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/CaptionLeak.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.orderedlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.ComponentContainer; import com.vaadin.ui.CssLayout; @@ -17,7 +17,7 @@ import com.vaadin.v7.ui.TextField; * @since 7.1.13 * @author Vaadin Ltd */ -public class CaptionLeak extends AbstractTestUI { +public class CaptionLeak extends AbstractReindeerTestUI { /* * (non-Javadoc) diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ErrorIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ErrorIndicator.java index 826b036ba5..a73f71fbd0 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ErrorIndicator.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ErrorIndicator.java @@ -20,12 +20,12 @@ package com.vaadin.tests.components.orderedlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.TextField; -public class ErrorIndicator extends AbstractTestUI { +public class ErrorIndicator extends AbstractReindeerTestUI { /* * (non-Javadoc) diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.java index 35f2f3d34f..9287aae2b0 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.java @@ -17,14 +17,14 @@ package com.vaadin.tests.components.orderedlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.util.TestUtils; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.Table; -public class ExpandChangeReattach extends AbstractTestUI { +public class ExpandChangeReattach extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java index ae2973a5df..358a7ccc6c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.orderedlayout; import com.vaadin.server.UserError; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -11,7 +11,7 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.v7.ui.TextField; public class HorizontalLayoutFullsizeContentWithErrorMsg - extends AbstractTestUI { + extends AbstractReindeerTestUI { static final String FIELD_ID = "f"; static final String BUTTON_ID = "b"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/InsertComponentInHorizontalLayout.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/InsertComponentInHorizontalLayout.java index 5a57bedcc3..193e6327e1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/InsertComponentInHorizontalLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/InsertComponentInHorizontalLayout.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.orderedlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -25,7 +25,7 @@ import com.vaadin.ui.Component; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.VerticalLayout; -public class InsertComponentInHorizontalLayout extends AbstractTestUI { +public class InsertComponentInHorizontalLayout extends AbstractReindeerTestUI { private VerticalLayout layout; int added = 1; diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHover.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHover.java index d3fba29658..09f0547bf0 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHover.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHover.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.orderedlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.VerticalLayout; /** @@ -24,7 +24,7 @@ import com.vaadin.ui.VerticalLayout; * * @author Vaadin Ltd */ -public class NestedLayoutCaptionHover extends AbstractTestUI { +public class NestedLayoutCaptionHover extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java index 82b2102518..1410a3cfae 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java @@ -7,7 +7,7 @@ import java.util.List; import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.util.TestUtils; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Alignment; @@ -22,7 +22,7 @@ import com.vaadin.v7.data.Property.ValueChangeListener; import com.vaadin.v7.ui.NativeSelect; @Theme("tests-components") -public class OrderedLayoutCases extends AbstractTestUI { +public class OrderedLayoutCases extends AbstractReindeerTestUI { private static final String[] dimensionValues = { "-1px", "5px", "350px", "800px", "100%", "50%" }; diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/RelativeChildrenWithoutExpand.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/RelativeChildrenWithoutExpand.java index 65a091c7b6..85db5dd22d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/RelativeChildrenWithoutExpand.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/RelativeChildrenWithoutExpand.java @@ -1,14 +1,14 @@ package com.vaadin.tests.components.orderedlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; -public class RelativeChildrenWithoutExpand extends AbstractTestUI { +public class RelativeChildrenWithoutExpand extends AbstractReindeerTestUI { private final String loremIpsum = "This is a label without expand but with relative width that shouldn't get any space at all. "; diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicator.java index f00d585f1c..8eddc427e6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicator.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicator.java @@ -20,12 +20,12 @@ package com.vaadin.tests.components.orderedlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.TextField; -public class TooltipOnRequiredIndicator extends AbstractTestUI { +public class TooltipOnRequiredIndicator extends AbstractReindeerTestUI { /* * (non-Javadoc) diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java index 8e002fa52f..3d8b29a4c9 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java @@ -6,7 +6,7 @@ import com.vaadin.server.ThemeResource; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.MarginInfo; import com.vaadin.shared.ui.slider.SliderOrientation; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.ComboBox; @@ -21,7 +21,7 @@ import com.vaadin.v7.ui.NativeSelect; import com.vaadin.v7.ui.Table; @Theme("tests-components") -public class VaadinTunesLayout extends AbstractTestUI { +public class VaadinTunesLayout extends AbstractReindeerTestUI { @Override public void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChanges.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChanges.java index 0ab03acbfb..d4c2a05bad 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChanges.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChanges.java @@ -16,14 +16,14 @@ package com.vaadin.tests.components.orderedlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.data.Property.ValueChangeEvent; import com.vaadin.v7.data.Property.ValueChangeListener; import com.vaadin.v7.ui.TextField; -public class VerticalLayoutFocusWithDOMChanges extends AbstractTestUI +public class VerticalLayoutFocusWithDOMChanges extends AbstractReindeerTestUI implements ValueChangeListener { Button dummyButton = new Button("Just a button"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java index 6be6d6e497..c563673d19 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java @@ -3,7 +3,7 @@ package com.vaadin.tests.components.orderedlayout; import com.vaadin.server.Sizeable; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.MarginInfo; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; @@ -16,7 +16,7 @@ import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.TextArea; import com.vaadin.v7.ui.TextField; -public class VerticalLayoutWithEmptyLabel extends AbstractTestUI { +public class VerticalLayoutWithEmptyLabel extends AbstractReindeerTestUI { private static final float UPPER_BAR_HEIGHT = 42; diff --git a/uitest/src/main/java/com/vaadin/tests/components/page/PageTitle.java b/uitest/src/main/java/com/vaadin/tests/components/page/PageTitle.java index 75a97c220f..4a23e48203 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/page/PageTitle.java +++ b/uitest/src/main/java/com/vaadin/tests/components/page/PageTitle.java @@ -17,10 +17,10 @@ package com.vaadin.tests.components.page; import com.vaadin.annotations.Title; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; @Title("bar") -public class PageTitle extends AbstractTestUI { +public class PageTitle extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelChangeContents.java b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelChangeContents.java index 6db8bbb806..3e64358eb8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelChangeContents.java +++ b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelChangeContents.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.panel; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -25,7 +25,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; -public class PanelChangeContents extends AbstractTestUI +public class PanelChangeContents extends AbstractReindeerTestUI implements ClickListener { VerticalLayout stats = new VerticalLayout(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelRemoveShortcutListener.java b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelRemoveShortcutListener.java index 590bdb6562..11932ec609 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelRemoveShortcutListener.java +++ b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelRemoveShortcutListener.java @@ -18,7 +18,7 @@ package com.vaadin.tests.components.panel; import com.vaadin.event.ShortcutAction.KeyCode; import com.vaadin.event.ShortcutListener; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -31,7 +31,7 @@ import com.vaadin.ui.TextField; * * @author Vaadin Ltd */ -public class PanelRemoveShortcutListener extends AbstractTestUI { +public class PanelRemoveShortcutListener extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/UndefinedSizeScrollbars.java b/uitest/src/main/java/com/vaadin/tests/components/panel/UndefinedSizeScrollbars.java index 97f5251d5c..62b3dc5857 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/panel/UndefinedSizeScrollbars.java +++ b/uitest/src/main/java/com/vaadin/tests/components/panel/UndefinedSizeScrollbars.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.panel; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.CheckBox; import com.vaadin.ui.ComboBox; import com.vaadin.ui.GridLayout; @@ -24,7 +24,7 @@ import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.TextField; -public class UndefinedSizeScrollbars extends AbstractTestUI { +public class UndefinedSizeScrollbars extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/WebkitScrollbarTest.java b/uitest/src/main/java/com/vaadin/tests/components/panel/WebkitScrollbarTest.java index 2fc39647d7..1a68bf4a39 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/panel/WebkitScrollbarTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/panel/WebkitScrollbarTest.java @@ -17,14 +17,14 @@ package com.vaadin.tests.components.panel; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.ListSelect; @SuppressWarnings("serial") -public class WebkitScrollbarTest extends AbstractTestUI { +public class WebkitScrollbarTest extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/DisabledPopupView.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/DisabledPopupView.java index cc732f1c82..22ebe7578a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/popupview/DisabledPopupView.java +++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/DisabledPopupView.java @@ -1,11 +1,11 @@ package com.vaadin.tests.components.popupview; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.PopupView; -public class DisabledPopupView extends AbstractTestUI { +public class DisabledPopupView extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewAndFragment.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewAndFragment.java index 293ac7ed3d..ac05416468 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewAndFragment.java +++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewAndFragment.java @@ -16,13 +16,13 @@ package com.vaadin.tests.components.popupview; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.PopupView; -public class PopupViewAndFragment extends AbstractTestUI { +public class PopupViewAndFragment extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewCaption.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewCaption.java index 7e0a65c97f..92e430ab7e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewCaption.java +++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewCaption.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.popupview; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.FormLayout; import com.vaadin.ui.Label; import com.vaadin.ui.PopupView; @@ -25,7 +25,7 @@ import com.vaadin.ui.PopupView; * * @author Vaadin Ltd */ -public class PopupViewCaption extends AbstractTestUI { +public class PopupViewCaption extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandler.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandler.java index f947220aa7..e0e504481a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandler.java +++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandler.java @@ -18,7 +18,7 @@ package com.vaadin.tests.components.popupview; import com.vaadin.event.ShortcutAction; import com.vaadin.event.ShortcutListener; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Component; import com.vaadin.ui.Label; import com.vaadin.ui.PopupView; @@ -30,7 +30,7 @@ import com.vaadin.v7.ui.TextField; * * @author Vaadin Ltd */ -public class PopupViewShortcutActionHandler extends AbstractTestUI { +public class PopupViewShortcutActionHandler extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewWithExtension.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewWithExtension.java index b911afbbc1..a4c70f73c8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewWithExtension.java +++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewWithExtension.java @@ -17,7 +17,7 @@ package com.vaadin.tests.components.popupview; import com.vaadin.server.Responsive; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; import com.vaadin.ui.PopupView; @@ -30,7 +30,7 @@ import com.vaadin.ui.PopupView; * @since 7.2 * @author Vaadin Ltd */ -public class PopupViewWithExtension extends AbstractTestUI { +public class PopupViewWithExtension extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/ReopenPopupView.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/ReopenPopupView.java index a9427e9272..2f91d64e2c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/popupview/ReopenPopupView.java +++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/ReopenPopupView.java @@ -16,13 +16,13 @@ package com.vaadin.tests.components.popupview; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.util.Log; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.PopupView; -public class ReopenPopupView extends AbstractTestUI { +public class ReopenPopupView extends AbstractReindeerTestUI { private final Log log = new Log(5); @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeer.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeer.java index b55d489c41..0288340484 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeer.java +++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeer.java @@ -17,12 +17,12 @@ package com.vaadin.tests.components.progressindicator; import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.ProgressBar; import com.vaadin.ui.themes.Reindeer; @Theme(Reindeer.THEME_NAME) -public class ProgressBarStaticReindeer extends AbstractTestUI { +public class ProgressBarStaticReindeer extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { ProgressBar progressBar = new ProgressBar(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRuno.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRuno.java index 799780dea1..ad03a9ca7e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRuno.java +++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRuno.java @@ -17,12 +17,12 @@ package com.vaadin.tests.components.progressindicator; import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.ProgressBar; import com.vaadin.ui.themes.Runo; @Theme(Runo.THEME_NAME) -public class ProgressBarStaticRuno extends AbstractTestUI { +public class ProgressBarStaticRuno extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { ProgressBar progressBar = new ProgressBar(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarTest.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarTest.java index 568357a34a..0b14fbf6ae 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarTest.java @@ -17,7 +17,7 @@ package com.vaadin.tests.components.progressindicator; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; @@ -25,7 +25,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.ProgressBar; import com.vaadin.v7.ui.ProgressIndicator; -public class ProgressBarTest extends AbstractTestUI { +public class ProgressBarTest extends AbstractReindeerTestUI { private Label updatedFromBackround; private Thread updateThread = new Thread() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResize.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResize.java index f8f2a40020..7604ddd507 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResize.java +++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResize.java @@ -16,13 +16,13 @@ package com.vaadin.tests.components.richtextarea; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.RichTextArea; -public class RichTextAreaRelativeHeightResize extends AbstractTestUI { +public class RichTextAreaRelativeHeightResize extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java index 846579e6c3..49c5a87860 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java +++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java @@ -1,12 +1,12 @@ package com.vaadin.tests.components.richtextarea; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.shared.ui.progressindicator.ProgressIndicatorServerRpc; import com.vaadin.v7.ui.ProgressIndicator; import com.vaadin.ui.RichTextArea; -public class RichTextAreaUpdateWhileTyping extends AbstractTestUI { +public class RichTextAreaUpdateWhileTyping extends AbstractReindeerTestUI { private RichTextArea rta; diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/SelectItemCaptionRefresh.java b/uitest/src/main/java/com/vaadin/tests/components/select/SelectItemCaptionRefresh.java index a7780202b2..1dd5c7a48b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/select/SelectItemCaptionRefresh.java +++ b/uitest/src/main/java/com/vaadin/tests/components/select/SelectItemCaptionRefresh.java @@ -16,12 +16,12 @@ package com.vaadin.tests.components.select; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.v7.ui.Select; -public class SelectItemCaptionRefresh extends AbstractTestUI { +public class SelectItemCaptionRefresh extends AbstractReindeerTestUI { final Object itemId = new Object(); Select select; diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/SelectWithIntegers.java b/uitest/src/main/java/com/vaadin/tests/components/select/SelectWithIntegers.java index 1aa4e66dbf..d123698346 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/select/SelectWithIntegers.java +++ b/uitest/src/main/java/com/vaadin/tests/components/select/SelectWithIntegers.java @@ -19,12 +19,12 @@ import java.util.Arrays; import java.util.List; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.ui.AbstractSelect; import com.vaadin.v7.ui.AbstractSelect.ItemCaptionMode; import com.vaadin.v7.ui.ListSelect; -public class SelectWithIntegers extends AbstractTestUI { +public class SelectWithIntegers extends AbstractReindeerTestUI { private final List<Integer> years = Arrays.asList(2014, 2015, 2016); @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/slider/HiddenSliderHandle.java b/uitest/src/main/java/com/vaadin/tests/components/slider/HiddenSliderHandle.java index 93787c60b5..e985268885 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/slider/HiddenSliderHandle.java +++ b/uitest/src/main/java/com/vaadin/tests/components/slider/HiddenSliderHandle.java @@ -16,12 +16,12 @@ package com.vaadin.tests.components.slider; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Slider; import com.vaadin.v7.data.Item; import com.vaadin.v7.ui.Table; -public class HiddenSliderHandle extends AbstractTestUI { +public class HiddenSliderHandle extends AbstractReindeerTestUI { private static final long serialVersionUID = 1L; diff --git a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderDisable.java b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderDisable.java index 984ed6fb2c..7ea741bc83 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderDisable.java +++ b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderDisable.java @@ -16,14 +16,14 @@ package com.vaadin.tests.components.slider; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Slider; import com.vaadin.ui.VerticalLayout; -public class SliderDisable extends AbstractTestUI { +public class SliderDisable extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderFeedback.java b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderFeedback.java index 714b605044..1df8217ccf 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderFeedback.java +++ b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderFeedback.java @@ -16,10 +16,10 @@ package com.vaadin.tests.components.slider; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Slider; -public class SliderFeedback extends AbstractTestUI { +public class SliderFeedback extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderResize.java b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderResize.java index d5fe50190d..7e8ccf3fc8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderResize.java +++ b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderResize.java @@ -16,13 +16,13 @@ package com.vaadin.tests.components.slider; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Slider; import com.vaadin.ui.VerticalLayout; -public class SliderResize extends AbstractTestUI { +public class SliderResize extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderUpdateFromValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderUpdateFromValueChange.java index 67b6308573..6c6952ddb8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderUpdateFromValueChange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderUpdateFromValueChange.java @@ -20,7 +20,7 @@ package com.vaadin.tests.components.slider; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Slider; /** @@ -28,7 +28,7 @@ import com.vaadin.ui.Slider; * * @author Vaadin Ltd */ -public class SliderUpdateFromValueChange extends AbstractTestUI { +public class SliderUpdateFromValueChange extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderValueFromDataSource.java b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderValueFromDataSource.java index cb183e5e9f..e732b173fa 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderValueFromDataSource.java +++ b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderValueFromDataSource.java @@ -2,12 +2,12 @@ package com.vaadin.tests.components.slider; import com.vaadin.data.Binder; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.ProgressBar; import com.vaadin.ui.Slider; import com.vaadin.v7.data.util.BeanItem; -public class SliderValueFromDataSource extends AbstractTestUI { +public class SliderValueFromDataSource extends AbstractReindeerTestUI { public static class TestBean { diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeight.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeight.java index 5b3f6e4410..e33834a4c7 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeight.java +++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeight.java @@ -17,7 +17,7 @@ package com.vaadin.tests.components.splitpanel; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.MarginInfo; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Label; @@ -28,7 +28,7 @@ import com.vaadin.ui.VerticalSplitPanel; * * @author Vaadin Ltd */ -public class HorizontalSplitPanelHeight extends AbstractTestUI { +public class HorizontalSplitPanelHeight extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/RetainSplitterPositionWhenOutOfBounds.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/RetainSplitterPositionWhenOutOfBounds.java index f4caac67ca..e0d4a2bbf8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/RetainSplitterPositionWhenOutOfBounds.java +++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/RetainSplitterPositionWhenOutOfBounds.java @@ -18,13 +18,13 @@ package com.vaadin.tests.components.splitpanel; import com.vaadin.server.Sizeable; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalSplitPanel; -public class RetainSplitterPositionWhenOutOfBounds extends AbstractTestUI { +public class RetainSplitterPositionWhenOutOfBounds extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelMoveComponent.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelMoveComponent.java index a27ad897e1..ec5357174b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelMoveComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelMoveComponent.java @@ -16,13 +16,13 @@ package com.vaadin.tests.components.splitpanel; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.HorizontalSplitPanel; -public class SplitPanelMoveComponent extends AbstractTestUI { +public class SplitPanelMoveComponent extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelStyleLeak.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelStyleLeak.java index b827a6fc66..026bfb0862 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelStyleLeak.java +++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelStyleLeak.java @@ -16,14 +16,14 @@ package com.vaadin.tests.components.splitpanel; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.AbstractSplitPanel; import com.vaadin.ui.CssLayout; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalSplitPanel; -public class SplitPanelStyleLeak extends AbstractTestUI { +public class SplitPanelStyleLeak extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java index 6e4fd58391..255b3dafca 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java +++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.splitpanel; import com.vaadin.server.Sizeable; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.HorizontalSplitPanel; @@ -11,7 +11,7 @@ import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.VerticalSplitPanel; -public class SplitPanelWithMinimumAndMaximum extends AbstractTestUI { +public class SplitPanelWithMinimumAndMaximum extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/AddSelectionToRemovedRange.java b/uitest/src/main/java/com/vaadin/tests/components/table/AddSelectionToRemovedRange.java index 9fe387271b..65b30c6fcb 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/AddSelectionToRemovedRange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/AddSelectionToRemovedRange.java @@ -18,7 +18,7 @@ package com.vaadin.tests.components.table; import java.util.Set; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Notification; import com.vaadin.ui.Notification.Type; @@ -33,7 +33,7 @@ import com.vaadin.v7.ui.Table; * @author Vaadin Ltd */ @SuppressWarnings("serial") -public class AddSelectionToRemovedRange extends AbstractTestUI { +public class AddSelectionToRemovedRange extends AbstractReindeerTestUI { @Override @SuppressWarnings("unchecked") diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/AsyncPushUpdates.java b/uitest/src/main/java/com/vaadin/tests/components/table/AsyncPushUpdates.java index f61829469e..681cdbce66 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/AsyncPushUpdates.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/AsyncPushUpdates.java @@ -17,7 +17,7 @@ package com.vaadin.tests.components.table; import com.vaadin.annotations.Push; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.v7.data.util.IndexedContainer; @@ -29,7 +29,7 @@ import com.vaadin.v7.ui.Table; * @author Vaadin Ltd */ @Push -public class AsyncPushUpdates extends AbstractTestUI { +public class AsyncPushUpdates extends AbstractReindeerTestUI { public int clickCount = 0; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java index 3d4eaa8c6a..5d9e72ea24 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java @@ -3,7 +3,7 @@ package com.vaadin.tests.components.table; import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUIWithLog; +import com.vaadin.tests.components.AbstractReindeerTestUIWithLog; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -12,7 +12,8 @@ import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Table.ColumnCollapseEvent; import com.vaadin.v7.ui.Table.ColumnCollapseListener; -public class ColumnCollapsingAndColumnExpansion extends AbstractTestUIWithLog { +public class ColumnCollapsingAndColumnExpansion + extends AbstractReindeerTestUIWithLog { private Table table; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrder.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrder.java index b140a64cab..7abf1ae697 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrder.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrder.java @@ -4,14 +4,14 @@ import java.util.ArrayList; import java.util.List; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.data.util.BeanItemContainer; import com.vaadin.v7.ui.Table; public class ColumnWidthsAfterChangeTableColumnsCountOrOrder - extends AbstractTestUI { + extends AbstractReindeerTestUI { protected static final String BUTTON_CHANGE_ORDER_AND_WIDTH_ID = "buttonChangeOrderAndWidth"; protected static final String BUTTON_CHANGE_COLUMN_COUNT_AND_WIDTH = "buttonChangeColumnCountAndWidth"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.java b/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.java index 28a0bb0ac8..97c39a6f0b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.java @@ -21,7 +21,7 @@ import java.util.Iterator; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.v7.data.Container; @@ -29,7 +29,7 @@ import com.vaadin.v7.data.Item; import com.vaadin.v7.data.util.IndexedContainer; import com.vaadin.v7.ui.Table; -public class ContainerSizeChangeDuringTablePaint extends AbstractTestUI { +public class ContainerSizeChangeDuringTablePaint extends AbstractReindeerTestUI { /** * A test {@link Table} that simply acts a hook for when Vaadin starts diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java b/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java index 9ab631aa22..8cd7a3bd5e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java @@ -18,7 +18,7 @@ package com.vaadin.tests.components.table; import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.data.util.BeanItemContainer; import com.vaadin.v7.ui.Table; @@ -27,7 +27,7 @@ import com.vaadin.v7.ui.Table; * * @author Vaadin Ltd */ -public class ContextMenuSize extends AbstractTestUI { +public class ContextMenuSize extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/DisabledSortingTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/DisabledSortingTable.java index 3062e1ef6d..2bcc5da59d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/DisabledSortingTable.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/DisabledSortingTable.java @@ -1,11 +1,11 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.v7.ui.Table; -public class DisabledSortingTable extends AbstractTestUI { +public class DisabledSortingTable extends AbstractReindeerTestUI { @SuppressWarnings("unchecked") @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/DndEmptyTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/DndEmptyTable.java index e4b7d16ff6..fb6a89532a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/DndEmptyTable.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/DndEmptyTable.java @@ -20,7 +20,7 @@ import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptAll; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.DragAndDropWrapper; import com.vaadin.ui.DragAndDropWrapper.DragStartMode; import com.vaadin.ui.Label; @@ -33,7 +33,7 @@ import com.vaadin.v7.ui.Table; * @since * @author Vaadin Ltd */ -public class DndEmptyTable extends AbstractTestUI { +public class DndEmptyTable extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/DndTableTargetDetails.java b/uitest/src/main/java/com/vaadin/tests/components/table/DndTableTargetDetails.java index e00d042ef0..389565de6c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/DndTableTargetDetails.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/DndTableTargetDetails.java @@ -22,7 +22,7 @@ import com.vaadin.event.dd.acceptcriteria.AcceptAll; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.MouseEventDetails; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.data.util.BeanItemContainer; @@ -35,7 +35,7 @@ import com.vaadin.v7.ui.Table.TableDragMode; * * @author Vaadin Ltd */ -public class DndTableTargetDetails extends AbstractTestUI { +public class DndTableTargetDetails extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java b/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java index c2b8c1f9d9..9a17cf0bc2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java @@ -6,7 +6,7 @@ import java.util.Date; import java.util.Locale; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Component; import com.vaadin.v7.data.Container; import com.vaadin.v7.event.ItemClickEvent; @@ -15,7 +15,7 @@ import com.vaadin.v7.ui.Field; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.TableFieldFactory; -public class EditableModeChange extends AbstractTestUI { +public class EditableModeChange extends AbstractReindeerTestUI { private ItemClickEvent selectionEvent; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/EmptyTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/EmptyTable.java index d543ac8ff7..5c39f6db84 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/EmptyTable.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/EmptyTable.java @@ -16,10 +16,10 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.ui.Table; -public class EmptyTable extends AbstractTestUI { +public class EmptyTable extends AbstractReindeerTestUI { /* * (non-Javadoc) diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainerVisibleRowRaceCondition.java b/uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainerVisibleRowRaceCondition.java index bf98b8ea75..04dceee163 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainerVisibleRowRaceCondition.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainerVisibleRowRaceCondition.java @@ -2,6 +2,7 @@ package com.vaadin.tests.components.table; import java.util.Map; +import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Label; import com.vaadin.ui.UI; @@ -9,6 +10,7 @@ import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.Table; @SuppressWarnings("serial") +@Theme("reindeer") public class ExpandingContainerVisibleRowRaceCondition extends UI { static final String TABLE = "table"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/FocusOnSelectedItem.java b/uitest/src/main/java/com/vaadin/tests/components/table/FocusOnSelectedItem.java index 57aefda89d..0948833476 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/FocusOnSelectedItem.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/FocusOnSelectedItem.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.v7.ui.Table; @@ -27,7 +27,7 @@ import com.vaadin.v7.ui.Table; * * @author Vaadin Ltd */ -public class FocusOnSelectedItem extends AbstractTestUI { +public class FocusOnSelectedItem extends AbstractReindeerTestUI { /* * (non-Javadoc) diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/Footer.java b/uitest/src/main/java/com/vaadin/tests/components/table/Footer.java index 0686615664..4ba73268f4 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/Footer.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/Footer.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; @@ -13,7 +13,7 @@ import com.vaadin.v7.data.Item; import com.vaadin.v7.data.util.IndexedContainer; import com.vaadin.v7.ui.Table; -public class Footer extends AbstractTestUI { +public class Footer extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderClick.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderClick.java index 3e0a695b31..2325d09192 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderClick.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderClick.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.CheckBox; import com.vaadin.ui.TextField; import com.vaadin.v7.data.Container; @@ -10,7 +10,7 @@ import com.vaadin.v7.data.util.IndexedContainer; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Table.HeaderClickEvent; -public class HeaderClick extends AbstractTestUI { +public class HeaderClick extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderPositionWhenSorting.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderPositionWhenSorting.java index 9f060ddf85..2da88f74dd 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderPositionWhenSorting.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderPositionWhenSorting.java @@ -3,7 +3,7 @@ package com.vaadin.tests.components.table; import com.vaadin.event.Action; import com.vaadin.server.ExternalResource; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; import com.vaadin.ui.Link; @@ -13,7 +13,7 @@ import com.vaadin.v7.event.ItemClickEvent; import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.Table; -public class HeaderPositionWhenSorting extends AbstractTestUI +public class HeaderPositionWhenSorting extends AbstractReindeerTestUI implements Action.Handler, ItemClickListener { private Table table; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java index 8673a36ed6..8595a8fc8d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java @@ -3,13 +3,13 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; import com.vaadin.ui.Window; import com.vaadin.v7.data.util.BeanItemContainer; import com.vaadin.v7.ui.Table; -public class HeaderRightClickAfterDrag extends AbstractTestUI { +public class HeaderRightClickAfterDrag extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderSyncOnScroll.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderSyncOnScroll.java index 1d4a620ff3..0a5d7e7107 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderSyncOnScroll.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderSyncOnScroll.java @@ -1,14 +1,14 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.HorizontalLayout; import com.vaadin.v7.ui.Table; -public class HeaderSyncOnScroll extends AbstractTestUI { +public class HeaderSyncOnScroll extends AbstractReindeerTestUI { private Table table; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java index ba88cc93a9..b9e9c2949e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java @@ -1,12 +1,12 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.CheckBox; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Table.ColumnHeaderMode; -public class HeaderUpdateWhenNoRows extends AbstractTestUI { +public class HeaderUpdateWhenNoRows extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HiddenComponentCells.java b/uitest/src/main/java/com/vaadin/tests/components/table/HiddenComponentCells.java index b0615abb6f..8ae1e91f87 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/HiddenComponentCells.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/HiddenComponentCells.java @@ -20,7 +20,7 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; import com.vaadin.v7.data.Item; import com.vaadin.v7.ui.Table; @@ -30,7 +30,7 @@ import com.vaadin.v7.ui.Table; * @since * @author Vaadin Ltd */ -public class HiddenComponentCells extends AbstractTestUI { +public class HiddenComponentCells extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ItemClickEvents.java b/uitest/src/main/java/com/vaadin/tests/components/table/ItemClickEvents.java index 221919f9d4..5f082080d3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/ItemClickEvents.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/ItemClickEvents.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.table; import com.vaadin.server.ExternalResource; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.util.Log; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -15,7 +15,7 @@ import com.vaadin.v7.ui.AbstractSelect; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Tree; -public class ItemClickEvents extends AbstractTestUI { +public class ItemClickEvents extends AbstractReindeerTestUI { private Tree tree; private Table table; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java index a72fe7b722..7ed5ff32bf 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.table; import com.vaadin.server.ThemeResource; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Component; import com.vaadin.ui.Embedded; import com.vaadin.v7.data.Item; @@ -12,7 +12,7 @@ import com.vaadin.v7.shared.ui.label.ContentMode; import com.vaadin.v7.ui.Label; import com.vaadin.v7.ui.Table; -public class LabelEmbeddedClickThroughForTable extends AbstractTestUI { +public class LabelEmbeddedClickThroughForTable extends AbstractReindeerTestUI { @Override protected String getTestDescription() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/LeftColumnAlignment.java b/uitest/src/main/java/com/vaadin/tests/components/table/LeftColumnAlignment.java index 83958176fa..a1d073d4f4 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/LeftColumnAlignment.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/LeftColumnAlignment.java @@ -17,7 +17,7 @@ package com.vaadin.tests.components.table; import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.v7.data.util.BeanItemContainer; @@ -31,7 +31,7 @@ import com.vaadin.v7.ui.Table.Align; * @author Vaadin Ltd */ @Theme("tests-table") -public class LeftColumnAlignment extends AbstractTestUI { +public class LeftColumnAlignment extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/LongMultiselect.java b/uitest/src/main/java/com/vaadin/tests/components/table/LongMultiselect.java index de48085683..e7ee6f2ade 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/LongMultiselect.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/LongMultiselect.java @@ -3,12 +3,12 @@ package com.vaadin.tests.components.table; import java.util.Collection; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.v7.data.Property; import com.vaadin.v7.ui.Table; -public class LongMultiselect extends AbstractTestUI { +public class LongMultiselect extends AbstractReindeerTestUI { private enum ItemProperty { COLUMN1, COLUMN2 diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/MemoryLeakTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/MemoryLeakTable.java index 7c60a347b4..2a185f30a9 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/MemoryLeakTable.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/MemoryLeakTable.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -29,7 +29,7 @@ import com.vaadin.v7.ui.Table; * @since * @author Vaadin Ltd */ -public class MemoryLeakTable extends AbstractTestUI { +public class MemoryLeakTable extends AbstractReindeerTestUI { Button btnAdd = new Button("Add rows"); Button btnRemove = new Button("Remove rows"); Button btnTenTimes = new Button("Do ten times"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/PopupViewInTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/PopupViewInTable.java index ecb1bca226..2778e24201 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/PopupViewInTable.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/PopupViewInTable.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Component; import com.vaadin.ui.Label; @@ -24,7 +24,7 @@ import com.vaadin.ui.PopupView; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.Table; -public class PopupViewInTable extends AbstractTestUI { +public class PopupViewInTable extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.java b/uitest/src/main/java/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.java index 0abb70dcc4..7ef43e338f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.java @@ -17,7 +17,7 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; @@ -31,7 +31,7 @@ import com.vaadin.v7.ui.Table; * @since * @author Vaadin Ltd */ -public class RefreshRenderedCellsOnlyIfAttached extends AbstractTestUI { +public class RefreshRenderedCellsOnlyIfAttached extends AbstractReindeerTestUI { VerticalLayout layout; boolean check; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ReloadWidgets.java b/uitest/src/main/java/com/vaadin/tests/components/table/ReloadWidgets.java index 44a489d20c..2c4b2db662 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/ReloadWidgets.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/ReloadWidgets.java @@ -1,14 +1,14 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.v7.data.util.BeanItemContainer; import com.vaadin.v7.ui.Table; @SuppressWarnings("serial") -public class ReloadWidgets extends AbstractTestUI { +public class ReloadWidgets extends AbstractReindeerTestUI { int pressed = 0; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/RemoveItemOnClick.java b/uitest/src/main/java/com/vaadin/tests/components/table/RemoveItemOnClick.java index 397b46fec9..ca055ac6c5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/RemoveItemOnClick.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/RemoveItemOnClick.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.data.Container; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.Property.ValueChangeEvent; @@ -24,7 +24,7 @@ import com.vaadin.v7.data.Property.ValueChangeListener; import com.vaadin.v7.data.util.IndexedContainer; import com.vaadin.v7.ui.Table; -public class RemoveItemOnClick extends AbstractTestUI { +public class RemoveItemOnClick extends AbstractReindeerTestUI { private Table table; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllRows.java b/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllRows.java index 3818cc5c11..2df3a4cdc7 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllRows.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllRows.java @@ -18,12 +18,12 @@ package com.vaadin.tests.components.table; import java.util.Set; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Label; import com.vaadin.v7.ui.Table; -public class SelectAllRows extends AbstractTestUI { +public class SelectAllRows extends AbstractReindeerTestUI { static final String TABLE = "table"; static final String COUNT_SELECTED_BUTTON = "button"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java b/uitest/src/main/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java index 69ca7efcdf..9dac740a12 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java @@ -20,7 +20,7 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.VerticalLayout; @@ -33,7 +33,7 @@ import com.vaadin.v7.ui.Table.ColumnHeaderMode; * @since * @author Vaadin Ltd */ -public class SetCurrentPageFirstItemIndex extends AbstractTestUI { +public class SetCurrentPageFirstItemIndex extends AbstractReindeerTestUI { private int index = 5; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.java b/uitest/src/main/java/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.java index 3d0d04bd40..dcd842e06e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.java @@ -6,14 +6,14 @@ import java.util.List; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.MarginInfo; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Label; import com.vaadin.v7.data.util.BeanItemContainer; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Table.CacheUpdateException; -public class SetDataSourceWithPropertyIds extends AbstractTestUI { +public class SetDataSourceWithPropertyIds extends AbstractReindeerTestUI { @Override protected String getTestDescription() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnly.java b/uitest/src/main/java/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnly.java index 8939014077..c3dd7f2975 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnly.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnly.java @@ -19,7 +19,7 @@ import java.io.Serializable; import java.util.List; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.data.util.BeanContainer; @@ -31,7 +31,7 @@ import com.vaadin.v7.ui.Table; */ @SuppressWarnings("serial") -public class SetPageFirstItemLoadsNeededRowsOnly extends AbstractTestUI { +public class SetPageFirstItemLoadsNeededRowsOnly extends AbstractReindeerTestUI { /* * (non-Javadoc) diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ShowLastItem.java b/uitest/src/main/java/com/vaadin/tests/components/table/ShowLastItem.java index e882f39477..0f3cf952bc 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/ShowLastItem.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/ShowLastItem.java @@ -1,12 +1,12 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.v7.ui.Table; -public class ShowLastItem extends AbstractTestUI { +public class ShowLastItem extends AbstractReindeerTestUI { /* * (non-Javadoc) diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SortLabelsInTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/SortLabelsInTable.java index 3222491ab6..d3fd14d231 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/SortLabelsInTable.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/SortLabelsInTable.java @@ -16,12 +16,12 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.data.Item; import com.vaadin.v7.ui.Label; import com.vaadin.v7.ui.Table; -public class SortLabelsInTable extends AbstractTestUI { +public class SortLabelsInTable extends AbstractReindeerTestUI { @SuppressWarnings("unchecked") @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SortableHeaderStyles.java b/uitest/src/main/java/com/vaadin/tests/components/table/SortableHeaderStyles.java index dc440f0fe8..43ba7547e9 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/SortableHeaderStyles.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/SortableHeaderStyles.java @@ -18,14 +18,14 @@ package com.vaadin.tests.components.table; import java.util.Collection; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.util.PersonContainer; import com.vaadin.v7.data.Property.ValueChangeEvent; import com.vaadin.v7.data.Property.ValueChangeListener; import com.vaadin.v7.ui.OptionGroup; import com.vaadin.v7.ui.Table; -public class SortableHeaderStyles extends AbstractTestUI { +public class SortableHeaderStyles extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableAfterRemovingExpandRatios.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableAfterRemovingExpandRatios.java index 791ab08d5f..2d613a21bb 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableAfterRemovingExpandRatios.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableAfterRemovingExpandRatios.java @@ -22,14 +22,14 @@ package com.vaadin.tests.components.table; */ import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.NativeButton; import com.vaadin.v7.ui.Table; -public class TableAfterRemovingExpandRatios extends AbstractTestUI { +public class TableAfterRemovingExpandRatios extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest req) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableChildMeasurementHint.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableChildMeasurementHint.java index b6cb87616d..264acaaac4 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableChildMeasurementHint.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableChildMeasurementHint.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.components.TestDateField; import com.vaadin.ui.AbstractDateField; import com.vaadin.ui.AbstractOrderedLayout; @@ -16,7 +16,7 @@ import com.vaadin.v7.ui.ComboBox; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.TextField; -public class TableChildMeasurementHint extends AbstractTestUI { +public class TableChildMeasurementHint extends AbstractReindeerTestUI { private HorizontalLayout buttonLayout = new HorizontalLayout(); private HorizontalLayout layout; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java index 925d39f46b..130f031066 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java @@ -7,7 +7,7 @@ import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.server.Resource; import com.vaadin.server.ThemeResource; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Component; import com.vaadin.ui.Embedded; import com.vaadin.v7.data.Item; @@ -21,7 +21,7 @@ import com.vaadin.v7.ui.Table.RowHeaderMode; import com.vaadin.v7.ui.Table.TableDragMode; import com.vaadin.v7.ui.TextField; -public class TableClickAndDragOnIconAndComponents extends AbstractTestUI { +public class TableClickAndDragOnIconAndComponents extends AbstractReindeerTestUI { private static final long serialVersionUID = -2534880024131980135L; private Table table; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnAddAndResize.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnAddAndResize.java index fa1ae35b87..5280b49e4f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnAddAndResize.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnAddAndResize.java @@ -16,14 +16,14 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.Table; -public class TableColumnAddAndResize extends AbstractTestUI { +public class TableColumnAddAndResize extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java index f3afb3f4d9..3aaeaf237e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java @@ -1,14 +1,14 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Table.ColumnGenerator; import com.vaadin.v7.ui.TextField; -public class TableColumnResizeContentsWidth extends AbstractTestUI { +public class TableColumnResizeContentsWidth extends AbstractReindeerTestUI { private static final String COL1 = "COL1"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnWidthsAndSorting.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnWidthsAndSorting.java index 0af0d0fda1..82f69c3986 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnWidthsAndSorting.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnWidthsAndSorting.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.components.table; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUIWithLog; import com.vaadin.tests.fieldgroup.ComplexPerson; @@ -24,7 +23,6 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.v7.ui.Table; -@Theme("valo") public class TableColumnWidthsAndSorting extends AbstractTestUIWithLog { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuTouch.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuTouch.java index a3f86325de..d6ae35796d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuTouch.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuTouch.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.table; import com.vaadin.event.Action; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.CheckBox; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Notification; @@ -13,7 +13,7 @@ import com.vaadin.v7.ui.Table; * Differs from TableContextMenu by number of items, their numbering and * immediate/selectable/multiselect toggling */ -public class TableContextMenuTouch extends AbstractTestUI { +public class TableContextMenuTouch extends AbstractReindeerTestUI { private static final Action ACTION_MYACTION = new Action("Action!!"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableDropIndicatorValo.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableDropIndicatorValo.java index 4cc40621d8..3f6fc56e63 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableDropIndicatorValo.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableDropIndicatorValo.java @@ -1,6 +1,5 @@ package com.vaadin.tests.components.table; -import com.vaadin.annotations.Theme; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptAll; @@ -9,7 +8,6 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.v7.ui.Table; -@Theme("valo") @SuppressWarnings("serial") public class TableDropIndicatorValo extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableInTabsheet.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableInTabsheet.java index cb6509c110..97c5202be5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableInTabsheet.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableInTabsheet.java @@ -4,7 +4,7 @@ import java.net.MalformedURLException; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.AbsoluteLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; @@ -14,7 +14,7 @@ import com.vaadin.ui.themes.Reindeer; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Table.Align; -public class TableInTabsheet extends AbstractTestUI { +public class TableInTabsheet extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUI.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUI.java index 0046e59a2c..9aab0303b6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUI.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; @@ -12,7 +12,7 @@ import com.vaadin.v7.ui.AbstractSelect.ItemDescriptionGenerator; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.TextField; -public class TableItemDescriptionGeneratorUI extends AbstractTestUI { +public class TableItemDescriptionGeneratorUI extends AbstractReindeerTestUI { private final String TEXT_PROPERTY_ID = "Text"; private final String GEN_WIDGET_PROPERTY_ID = "Generated component"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableJumpUI.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableJumpUI.java index c623c00a4a..12ce6d9d73 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableJumpUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableJumpUI.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.components.table; -import com.vaadin.annotations.Theme; import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.BlurListener; import com.vaadin.event.FieldEvents.FocusEvent; @@ -24,7 +23,6 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUIWithLog; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.themes.ValoTheme; import com.vaadin.v7.data.util.BeanItemContainer; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.TextField; @@ -47,7 +45,6 @@ import com.vaadin.v7.ui.TextField; * * @author Vaadin Ltd */ -@Theme(ValoTheme.THEME_NAME) public class TableJumpUI extends AbstractTestUIWithLog { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java index 664cc39ed1..5e792e8cf5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -12,7 +12,7 @@ import com.vaadin.v7.shared.ui.label.ContentMode; import com.vaadin.v7.ui.Label; import com.vaadin.v7.ui.Table; -public class TableMatchesMouseDownMouseUpElement extends AbstractTestUI { +public class TableMatchesMouseDownMouseUpElement extends AbstractReindeerTestUI { static final String CLEAR_BUTTON_ID = "clear-button-id"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableMoveFocusWithSelection.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableMoveFocusWithSelection.java index d148dbb569..b8ad883d5d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableMoveFocusWithSelection.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableMoveFocusWithSelection.java @@ -22,14 +22,14 @@ import java.util.Set; import com.vaadin.event.LayoutEvents.LayoutClickEvent; import com.vaadin.event.LayoutEvents.LayoutClickListener; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.Table; -public class TableMoveFocusWithSelection extends AbstractTestUI { +public class TableMoveFocusWithSelection extends AbstractReindeerTestUI { /* * (non-Javadoc) diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableNavigationPageDown.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableNavigationPageDown.java index 5e81bb7bce..db69f8c007 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableNavigationPageDown.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableNavigationPageDown.java @@ -16,10 +16,10 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.ui.Table; -public class TableNavigationPageDown extends AbstractTestUI { +public class TableNavigationPageDown extends AbstractReindeerTestUI { private final static int ROW_NUMBER = 50; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java index 8850dc2072..7b5e727631 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java @@ -23,7 +23,7 @@ import com.vaadin.annotations.Push; import com.vaadin.server.ClientConnector; import com.vaadin.server.StreamVariable; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.ConnectorTracker; @@ -32,7 +32,7 @@ import com.vaadin.v7.ui.Table; import elemental.json.JsonObject; @Push -public class TableRemovedQuicklySendsInvalidRpcCalls extends AbstractTestUI { +public class TableRemovedQuicklySendsInvalidRpcCalls extends AbstractReindeerTestUI { public static final String SUCCESS_CAPTION = "Success!"; public static final String BUTTON_ID = "blinkbutton"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRows.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRows.java index 87a1d5c296..e121846c94 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRows.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRows.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import java.util.List; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickListener; import com.vaadin.v7.data.util.BeanItemContainer; @@ -18,7 +18,7 @@ import com.vaadin.v7.ui.Table; * @author Vaadin Ltd */ public class TableRepairsScrollPositionOnReAddingAllRows - extends AbstractTestUI { + extends AbstractReindeerTestUI { private static final long serialVersionUID = 1L; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRequiredIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRequiredIndicator.java index 2a99bef580..3555f300a0 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRequiredIndicator.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRequiredIndicator.java @@ -16,13 +16,13 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Notification; import com.vaadin.v7.data.Property.ValueChangeEvent; import com.vaadin.v7.data.Property.ValueChangeListener; import com.vaadin.v7.ui.Table; -public class TableRequiredIndicator extends AbstractTestUI { +public class TableRequiredIndicator extends AbstractReindeerTestUI { static final String TABLE = "table"; static final String COUNT_SELECTED_BUTTON = "button"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight2.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight2.java index 124450d4bb..5943044883 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight2.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight2.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.table; import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.themes.BaseTheme; @@ -10,7 +10,7 @@ import com.vaadin.v7.data.Item; import com.vaadin.v7.ui.Table; @Theme("tests-tickets") -public class TableRowHeight2 extends AbstractTestUI { +public class TableRowHeight2 extends AbstractReindeerTestUI { @Override protected String getTestDescription() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java index 963038661a..2c2a4035c7 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java @@ -2,12 +2,12 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Label; import com.vaadin.v7.ui.Table; -public class TableRowScrolledBottom extends AbstractTestUI { +public class TableRowScrolledBottom extends AbstractReindeerTestUI { final static String part1 = "This is a test item with long text so that there is something to see Nr. "; final static String part2 = ". This text must be long otherwise the timing issue on Firefox does not occur. This works fine in IE"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollAfterAddRow.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollAfterAddRow.java index 89fead9272..a09c5c507c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollAfterAddRow.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollAfterAddRow.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.NativeButton; @@ -46,7 +46,7 @@ import com.vaadin.v7.ui.Table; * @author Vaadin Ltd */ @SuppressWarnings("serial") -public class TableScrollAfterAddRow extends AbstractTestUI { +public class TableScrollAfterAddRow extends AbstractReindeerTestUI { /* * (non-Javadoc) diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollUpOnSelect.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollUpOnSelect.java index d97603c6bd..3654f9a084 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollUpOnSelect.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollUpOnSelect.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; import com.vaadin.v7.data.Property.ValueChangeEvent; @@ -31,7 +31,7 @@ import com.vaadin.v7.ui.TextField; * * @author Vaadin Ltd */ -public class TableScrollUpOnSelect extends AbstractTestUI { +public class TableScrollUpOnSelect extends AbstractReindeerTestUI { public TextField text = null; @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollsOnSelection.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollsOnSelection.java index f42a65b2cc..92c08992ea 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollsOnSelection.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollsOnSelection.java @@ -1,12 +1,12 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.util.IndexedContainer; import com.vaadin.v7.ui.Table; -public class TableScrollsOnSelection extends AbstractTestUI { +public class TableScrollsOnSelection extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableSetUndefinedSize.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSetUndefinedSize.java index af850774ce..2544720eee 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableSetUndefinedSize.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSetUndefinedSize.java @@ -1,12 +1,12 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; import com.vaadin.v7.ui.Table; -public class TableSetUndefinedSize extends AbstractTestUI { +public class TableSetUndefinedSize extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { getLayout().setSizeFull(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableSizeInTabsheet.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSizeInTabsheet.java index 954e481e9a..8b493ae146 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableSizeInTabsheet.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSizeInTabsheet.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Component; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Layout; @@ -25,7 +25,7 @@ import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.Table; @SuppressWarnings("serial") -public class TableSizeInTabsheet extends AbstractTestUI { +public class TableSizeInTabsheet extends AbstractReindeerTestUI { static final String TABLE = "table"; static final String TABSHEET = "tabsheet"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableSortingIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSortingIndicator.java index 8f44801437..bb883b48e2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableSortingIndicator.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSortingIndicator.java @@ -18,7 +18,7 @@ package com.vaadin.tests.components.table; import java.util.Random; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -32,7 +32,7 @@ import com.vaadin.v7.ui.Table; * * @author Vaadin Ltd */ -public class TableSortingIndicator extends AbstractTestUI { +public class TableSortingIndicator extends AbstractReindeerTestUI { /* * (non-Javadoc) diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableSortingStopsWorkingOnChrome.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSortingStopsWorkingOnChrome.java index e625608631..d39e463c9f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableSortingStopsWorkingOnChrome.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSortingStopsWorkingOnChrome.java @@ -2,7 +2,6 @@ package com.vaadin.tests.components.table; import java.io.Serializable; -import com.vaadin.annotations.Theme; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptAll; @@ -17,7 +16,6 @@ import com.vaadin.v7.ui.Table.ColumnReorderListener; import com.vaadin.v7.ui.Table.HeaderClickEvent; import com.vaadin.v7.ui.Table.HeaderClickListener; -@Theme("valo") @SuppressWarnings("serial") public class TableSortingStopsWorkingOnChrome extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableSqlContainer.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSqlContainer.java index 86c84a1814..c6bd3b39e0 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableSqlContainer.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSqlContainer.java @@ -6,7 +6,7 @@ import java.sql.Statement; import java.util.Locale; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; @@ -18,7 +18,7 @@ import com.vaadin.v7.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool; import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery; import com.vaadin.v7.ui.Table; -public class TableSqlContainer extends AbstractTestUI { +public class TableSqlContainer extends AbstractReindeerTestUI { protected Table table; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibility.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibility.java index 3424e5c659..04d058dc28 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibility.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibility.java @@ -17,7 +17,7 @@ package com.vaadin.tests.components.table; import com.vaadin.server.ClassResource; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -29,7 +29,7 @@ import com.vaadin.v7.ui.Table; * alignment */ @SuppressWarnings("serial") -public class TableToggleColumnVisibility extends AbstractTestUI { +public class TableToggleColumnVisibility extends AbstractReindeerTestUI { private final Object[][] columnSets = new Object[][] { { "Name" }, { "Name", "Last Name" }, { "Last Name", "Name" } }; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidth.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidth.java index 1c808ddfeb..603c18b6e1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidth.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidth.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -27,7 +27,7 @@ import com.vaadin.v7.ui.Table; * Test that column width is restored after restoring column visibility */ @SuppressWarnings("serial") -public class TableToggleColumnVisibilityWidth extends AbstractTestUI { +public class TableToggleColumnVisibilityWidth extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableTooManyColumns.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableTooManyColumns.java index ec3505eaef..2efd934a6e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableTooManyColumns.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableTooManyColumns.java @@ -16,11 +16,11 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Table.ColumnGenerator; -public class TableTooManyColumns extends AbstractTestUI { +public class TableTooManyColumns extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java index ad25d2b78d..3a49a3fb5a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java @@ -1,13 +1,13 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.v7.ui.Table; -public class TableVisibleColumnsUpdate extends AbstractTestUI { +public class TableVisibleColumnsUpdate extends AbstractReindeerTestUI { private String[] cols1 = new String[] { "p1", "p2", "p3" }; private String[] cols2 = new String[] { "p1", "p4", "p3" }; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWidthItemRemove.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWidthItemRemove.java index a8416e803e..68d6653f1a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWidthItemRemove.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWidthItemRemove.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.v7.ui.Table; @@ -27,7 +27,7 @@ import com.vaadin.v7.ui.Table; * * @author Vaadin Ltd */ -public class TableWidthItemRemove extends AbstractTestUI { +public class TableWidthItemRemove extends AbstractReindeerTestUI { /* * (non-Javadoc) diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java index 41c951e61b..27577ce449 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java @@ -3,7 +3,7 @@ package com.vaadin.tests.components.table; import java.util.Date; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.util.Log; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -13,7 +13,7 @@ import com.vaadin.v7.data.util.BeanContainer; import com.vaadin.v7.data.util.BeanItem; import com.vaadin.v7.ui.Table; -public class TableWithContainerRequiringEqualsForItemId extends AbstractTestUI { +public class TableWithContainerRequiringEqualsForItemId extends AbstractReindeerTestUI { private MyEntityContainer container = new MyEntityContainer(); private Log log = new Log(10); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java index 94bbe1821b..bdd8eba8db 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java @@ -18,12 +18,12 @@ package com.vaadin.tests.components.table; import java.util.Locale; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.data.util.converter.Converter; import com.vaadin.v7.data.util.converter.DefaultConverterFactory; import com.vaadin.v7.ui.Table; -public class TableWithCustomConverterFactory extends AbstractTestUI { +public class TableWithCustomConverterFactory extends AbstractReindeerTestUI { public static class MyIntegerConverter implements Converter<String, Integer> { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithPolling.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithPolling.java index fc75b813e6..d401ee4a4a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithPolling.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithPolling.java @@ -16,10 +16,10 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.ui.Table; -public class TableWithPolling extends AbstractTestUI { +public class TableWithPolling extends AbstractReindeerTestUI { @Override protected String getTestDescription() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TabletContextMenu.java b/uitest/src/main/java/com/vaadin/tests/components/table/TabletContextMenu.java index 288c417cf2..e0cf3ea8b6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TabletContextMenu.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TabletContextMenu.java @@ -19,7 +19,7 @@ import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; import com.vaadin.event.ShortcutAction; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.HorizontalLayout; import com.vaadin.v7.ui.Table; @@ -32,7 +32,7 @@ import com.vaadin.v7.ui.Table; * @since * @author Vaadin Ltd */ -public class TabletContextMenu extends AbstractTestUI { +public class TabletContextMenu extends AbstractReindeerTestUI { /* * (non-Javadoc) diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldRelativeWidth.java b/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldRelativeWidth.java index 51b4eb9fe1..fbc31c1295 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldRelativeWidth.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldRelativeWidth.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; @@ -10,7 +10,7 @@ import com.vaadin.v7.data.util.IndexedContainer; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.TextField; -public class TextFieldRelativeWidth extends AbstractTestUI { +public class TextFieldRelativeWidth extends AbstractReindeerTestUI { @Override public void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java b/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java index ff1ef2ca68..c08ec93a8e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; @@ -9,7 +9,7 @@ import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.Table; -public class TextFieldValueGoesMissing extends AbstractTestUI { +public class TextFieldValueGoesMissing extends AbstractReindeerTestUI { @SuppressWarnings("unchecked") @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZooming.java b/uitest/src/main/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZooming.java index 2905f95504..e6f5996c19 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZooming.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZooming.java @@ -16,10 +16,10 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.ui.Table; -public class UnnecessaryScrollbarWhenZooming extends AbstractTestUI { +public class UnnecessaryScrollbarWhenZooming extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocused.java b/uitest/src/main/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocused.java index b1c1f74a02..86a13ab460 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocused.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocused.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.TabSheet; @@ -10,7 +10,7 @@ import com.vaadin.v7.data.Item; import com.vaadin.v7.data.util.IndexedContainer; import com.vaadin.v7.ui.Table; -public class UpdateTableWhenUnfocused extends AbstractTestUI { +public class UpdateTableWhenUnfocused extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheet.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheet.java index ac56142a4b..8d11b33ba2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheet.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheet.java @@ -1,14 +1,14 @@ package com.vaadin.tests.components.tabsheet; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; @SuppressWarnings("serial") -public class FirstTabNotVisibleInTabsheet extends AbstractTestUI { +public class FirstTabNotVisibleInTabsheet extends AbstractReindeerTestUI { private TabSheet.Tab firstTab; diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClipped.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClipped.java index c3817083a2..c75ebba95a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClipped.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClipped.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Map; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; @@ -12,7 +12,7 @@ import com.vaadin.ui.Layout; import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; -public class FirstTabNotVisibleWhenTabsheetNotClipped extends AbstractTestUI { +public class FirstTabNotVisibleWhenTabsheetNotClipped extends AbstractReindeerTestUI { private TabSheet.Tab firstNotClippedTab; private TabSheet.Tab firstClippedTab; diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/HtmlInTabCaption.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/HtmlInTabCaption.java index 15fbc90d31..6ce2fda58d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/HtmlInTabCaption.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/HtmlInTabCaption.java @@ -16,12 +16,12 @@ package com.vaadin.tests.components.tabsheet; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Accordion; import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; -public class HtmlInTabCaption extends AbstractTestUI { +public class HtmlInTabCaption extends AbstractReindeerTestUI { /* * (non-Javadoc) diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/MoveComponentBetweenTabsheets.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/MoveComponentBetweenTabsheets.java index 624fac6e75..30b3be0c51 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/MoveComponentBetweenTabsheets.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/MoveComponentBetweenTabsheets.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.tabsheet; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; @@ -12,7 +12,7 @@ import com.vaadin.ui.TabSheet; * Main UI class */ @SuppressWarnings("serial") -public class MoveComponentBetweenTabsheets extends AbstractTestUI { +public class MoveComponentBetweenTabsheets extends AbstractReindeerTestUI { TabSheet left, right; private Label l1; diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemove.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemove.java index 949291ee6c..5d5e7a32aa 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemove.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemove.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.tabsheet; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.Tab; @@ -30,7 +30,7 @@ import com.vaadin.ui.TabSheet.Tab; * @since * @author Vaadin Ltd */ -public class NewSelectionAfterTabRemove extends AbstractTestUI { +public class NewSelectionAfterTabRemove extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabBarWidth.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabBarWidth.java index cb072a4592..b65d112183 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabBarWidth.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabBarWidth.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.tabsheet; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; @@ -29,7 +29,7 @@ import com.vaadin.ui.VerticalLayout; * * Created for ticket <a href="http://dev.vaadin.com/ticket/12805">#12805</a>. */ -public class TabBarWidth extends AbstractTestUI { +public class TabBarWidth extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java index e17ec00227..91f5a5e0c1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java @@ -7,7 +7,7 @@ import com.vaadin.event.FieldEvents.BlurListener; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.util.Log; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -29,7 +29,7 @@ import com.vaadin.v7.ui.TextField; * @since * @author Vaadin Ltd */ -public class TabKeyboardNavigation extends AbstractTestUI { +public class TabKeyboardNavigation extends AbstractReindeerTestUI { int index = 1; ArrayList<Component> tabs = new ArrayList<>(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationWaiAria.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationWaiAria.java index 09f1e7b55c..adf5667bc1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationWaiAria.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationWaiAria.java @@ -3,7 +3,7 @@ package com.vaadin.tests.components.tabsheet; import java.util.ArrayList; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -14,7 +14,7 @@ import com.vaadin.ui.TabSheet.Tab; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.TextField; -public class TabKeyboardNavigationWaiAria extends AbstractTestUI { +public class TabKeyboardNavigationWaiAria extends AbstractReindeerTestUI { int index = 1; ArrayList<Component> tabs = new ArrayList<>(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServer.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServer.java index 6ccec44113..bd81b45b38 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServer.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServer.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.tabsheet; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Component; @@ -21,7 +21,7 @@ import com.vaadin.ui.TabSheet.SelectedTabChangeListener; * @since * @author Vaadin Ltd */ -public class TabSelectionRevertedByServer extends AbstractTestUI { +public class TabSelectionRevertedByServer extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetClose.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetClose.java index fe41e2f0e9..7dd1185045 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetClose.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetClose.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.tabsheet; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.CssLayout; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.Tab; @@ -28,7 +28,7 @@ import com.vaadin.ui.TabSheet.Tab; * @since * @author Vaadin Ltd */ -public class TabSheetClose extends AbstractTestUI { +public class TabSheetClose extends AbstractReindeerTestUI { /* * (non-Javadoc) diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltip.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltip.java index 73ba46c0ba..41d61aded0 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltip.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltip.java @@ -17,12 +17,12 @@ package com.vaadin.tests.components.tabsheet; import com.vaadin.server.UserError; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.Tab; -public class TabSheetErrorTooltip extends AbstractTestUI { +public class TabSheetErrorTooltip extends AbstractReindeerTestUI { private TabSheet tabSheet = new TabSheet(); private int tabCount = 0; diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetFocusing.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetFocusing.java index ce54c5bd3f..bf2f752866 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetFocusing.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetFocusing.java @@ -16,14 +16,14 @@ package com.vaadin.tests.components.tabsheet; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.Tab; -public class TabSheetFocusing extends AbstractTestUI { +public class TabSheetFocusing extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetHotKeysWithModifiers.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetHotKeysWithModifiers.java index 79980fc14f..cfde4f92de 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetHotKeysWithModifiers.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetHotKeysWithModifiers.java @@ -20,11 +20,11 @@ package com.vaadin.tests.components.tabsheet; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; -public class TabSheetHotKeysWithModifiers extends AbstractTestUI { +public class TabSheetHotKeysWithModifiers extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetInDisabledParent.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetInDisabledParent.java index f4b10239c2..eb4da30c3f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetInDisabledParent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetInDisabledParent.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.tabsheet; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -29,7 +29,7 @@ import com.vaadin.ui.TabSheet; * * @author Vaadin Ltd */ -public class TabSheetInDisabledParent extends AbstractTestUI { +public class TabSheetInDisabledParent extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanel.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanel.java index 31408aacfe..6341e35aff 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanel.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanel.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.components.tabsheet; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; @@ -23,7 +22,6 @@ import com.vaadin.ui.UI; import com.vaadin.ui.VerticalSplitPanel; import com.vaadin.ui.themes.ValoTheme; -@Theme("valo") public class TabSheetInSplitPanel extends UI { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabClose.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabClose.java index 02842e8b66..f49996953d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabClose.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabClose.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.tabsheet; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CssLayout; @@ -32,7 +32,7 @@ import com.vaadin.ui.TabSheet.Tab; * @since * @author Vaadin Ltd */ -public class TabSheetScrollOnTabClose extends AbstractTestUI { +public class TabSheetScrollOnTabClose extends AbstractReindeerTestUI { /* * (non-Javadoc) diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithHasComponent.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithHasComponent.java index c7e6b1adfd..5c466f9c34 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithHasComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithHasComponent.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.tabsheet; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Component; import com.vaadin.ui.CustomComponent; @@ -31,7 +31,7 @@ import com.vaadin.v7.data.Item; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Table.ColumnGenerator; -public class TabSheetWithHasComponent extends AbstractTestUI { +public class TabSheetWithHasComponent extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithTabIds.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithTabIds.java index 373a0bb971..bd4c229a23 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithTabIds.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithTabIds.java @@ -20,14 +20,14 @@ package com.vaadin.tests.components.tabsheet; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.Tab; -public class TabSheetWithTabIds extends AbstractTestUI { +public class TabSheetWithTabIds extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSpaceNotScroll.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSpaceNotScroll.java index 6d3f98a797..8b9ccf5043 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSpaceNotScroll.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSpaceNotScroll.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.tabsheet; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Alignment; import com.vaadin.ui.Component; import com.vaadin.ui.Label; @@ -30,7 +30,7 @@ import com.vaadin.ui.VerticalLayout; * @since * @author Vaadin Ltd */ -public class TabSpaceNotScroll extends AbstractTestUI { +public class TabSpaceNotScroll extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetNotEnoughHorizontalSpace.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetNotEnoughHorizontalSpace.java index 4b8993ca6c..2ec4e8321a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetNotEnoughHorizontalSpace.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetNotEnoughHorizontalSpace.java @@ -17,7 +17,7 @@ package com.vaadin.tests.components.tabsheet; import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Panel; import com.vaadin.ui.TabSheet; @@ -27,7 +27,7 @@ import com.vaadin.ui.TabSheet; * @author Vaadin Ltd */ @Theme("chameleon") -public class TabsheetNotEnoughHorizontalSpace extends AbstractTestUI { +public class TabsheetNotEnoughHorizontalSpace extends AbstractReindeerTestUI { private TabSheet tabsheet = new TabSheet(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetScrollIntoView.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetScrollIntoView.java index 4b68dd61af..bfc1b5329d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetScrollIntoView.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetScrollIntoView.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.tabsheet; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -11,7 +11,7 @@ import com.vaadin.ui.Layout; import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; -public class TabsheetScrollIntoView extends AbstractTestUI { +public class TabsheetScrollIntoView extends AbstractReindeerTestUI { public static final String BTN_SELECT_LAST_TAB = "showAndSelectLastTab"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/VetoTabChange.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/VetoTabChange.java index 850bad4249..7e2ef2c22e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/VetoTabChange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/VetoTabChange.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.components.tabsheet; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Label; @@ -23,7 +22,6 @@ import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.SelectedTabChangeEvent; import com.vaadin.ui.TabSheet.SelectedTabChangeListener; -@Theme("valo") public class VetoTabChange extends AbstractTestUI { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaSizeResetted.java b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaSizeResetted.java index ca858ffaeb..4cc77c862d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaSizeResetted.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaSizeResetted.java @@ -17,7 +17,7 @@ package com.vaadin.tests.components.textarea; import com.vaadin.event.UIEvents; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -42,7 +42,7 @@ import com.vaadin.ui.TextField; * @since * @author Vaadin Ltd */ -public class TextAreaSizeResetted extends AbstractTestUI { +public class TextAreaSizeResetted extends AbstractReindeerTestUI { public static final int TEXTAREAHEIGHT = 200; public static final int TEXTAREAWIDTH = 200; diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptAndCursorPosition.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptAndCursorPosition.java index 643c96b170..6369caf964 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptAndCursorPosition.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptAndCursorPosition.java @@ -1,13 +1,13 @@ package com.vaadin.tests.components.textfield; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.TextField; -public class InputPromptAndCursorPosition extends AbstractTestUI { +public class InputPromptAndCursorPosition extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java index d5ea31f4ed..fece72ade2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java @@ -19,7 +19,7 @@ import com.vaadin.annotations.Theme; import com.vaadin.event.ShortcutAction.KeyCode; import com.vaadin.event.ShortcutListener; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; @@ -34,7 +34,7 @@ import com.vaadin.v7.ui.TextField; * @author Vaadin Ltd */ @Theme("reindeer") -public class InputPromptGetText extends AbstractTestUI { +public class InputPromptGetText extends AbstractReindeerTestUI { static final String FIELD = "field"; static final String BUTTON = "button"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyField.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyField.java index 906887d6db..76c6aa3536 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyField.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyField.java @@ -4,11 +4,11 @@ import java.math.BigDecimal; import java.util.Locale; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.v7.ui.TextField; -public class LocaleChangeOnReadOnlyField extends AbstractTestUI { +public class LocaleChangeOnReadOnlyField extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/RequiredTextField.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/RequiredTextField.java index 8595791b77..0fd95311db 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/RequiredTextField.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/RequiredTextField.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.textfield; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -27,7 +27,7 @@ import com.vaadin.v7.ui.TextField; * * @author Vaadin Ltd */ -public class RequiredTextField extends AbstractTestUI { +public class RequiredTextField extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java index 61ae5e535d..374ab40e3f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.textfield; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.AbstractTextField; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; @@ -11,7 +11,7 @@ import com.vaadin.ui.Panel; import com.vaadin.ui.TextField; import com.vaadin.v7.ui.TextArea; -public class SelectionAndCursorPosition extends AbstractTestUI { +public class SelectionAndCursorPosition extends AbstractReindeerTestUI { static final String DEFAULT_TEXT = "So we have some text to select"; static final String TEXTFIELD_ID = "tf"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEmptyingPrompt.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEmptyingPrompt.java index b322594a00..21be5201bc 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEmptyingPrompt.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEmptyingPrompt.java @@ -17,14 +17,14 @@ package com.vaadin.tests.components.textfield; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.TextField; @SuppressWarnings("serial") -public class TextFieldEmptyingPrompt extends AbstractTestUI { +public class TextFieldEmptyingPrompt extends AbstractReindeerTestUI { final TextField textField = new TextField(); final Label label = new Label(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogs.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogs.java index 1d3932a724..98900e9aaf 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogs.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogs.java @@ -18,7 +18,7 @@ package com.vaadin.tests.components.textfield; import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.FormLayout; @@ -28,7 +28,7 @@ import com.vaadin.ui.Window; @SuppressWarnings("serial") @Theme("chameleon") public class TextFieldTruncatesUnderscoresInModalDialogs - extends AbstractTestUI { + extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java index 9c5f83e323..755fb97f50 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java @@ -16,11 +16,11 @@ package com.vaadin.tests.components.textfield; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.data.util.BeanItem; import com.vaadin.v7.ui.TextField; -public class TextFieldWithDataSourceAndInputPrompt extends AbstractTestUI { +public class TextFieldWithDataSourceAndInputPrompt extends AbstractReindeerTestUI { public static class Pojo { private String string; diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/SelectItemAfterRemove.java b/uitest/src/main/java/com/vaadin/tests/components/tree/SelectItemAfterRemove.java index 28094f0b89..954529cc1f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tree/SelectItemAfterRemove.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tree/SelectItemAfterRemove.java @@ -1,11 +1,11 @@ package com.vaadin.tests.components.tree; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.event.ItemClickEvent; import com.vaadin.v7.ui.Tree; -public class SelectItemAfterRemove extends AbstractTestUI { +public class SelectItemAfterRemove extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java index ca39ce67ed..604847c867 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java @@ -16,11 +16,11 @@ package com.vaadin.tests.components.tree; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.CheckBox; import com.vaadin.v7.ui.Tree; -public class TreeHtmlContentAllowed extends AbstractTestUI { +public class TreeHtmlContentAllowed extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNone.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNone.java index 8af6fc0137..0ff9d4b444 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNone.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNone.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.tree; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.v7.ui.Tree; @@ -26,7 +26,7 @@ import com.vaadin.v7.ui.Tree; * * @author Vaadin Ltd */ -public class TreeKeyboardNavigationToNone extends AbstractTestUI { +public class TreeKeyboardNavigationToNone extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClick.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClick.java index 2c563d3a70..1d7bb5720b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClick.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClick.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.tree; import com.vaadin.event.MouseEvents; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.event.ItemClickEvent; import com.vaadin.v7.ui.Tree; @@ -11,7 +11,7 @@ import com.vaadin.v7.ui.Tree; * issues. */ @SuppressWarnings("serial") -public class TreeScrollingOnRightClick extends AbstractTestUI { +public class TreeScrollingOnRightClick extends AbstractReindeerTestUI { public static final String TREE_ID = "my-tree"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/DisappearingComponents.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/DisappearingComponents.java index 3da950c9bd..4ebf7f22b6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/DisappearingComponents.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/DisappearingComponents.java @@ -2,11 +2,11 @@ package com.vaadin.tests.components.treetable; import com.vaadin.server.ExternalResource; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Link; import com.vaadin.v7.ui.TreeTable; -public class DisappearingComponents extends AbstractTestUI { +public class DisappearingComponents extends AbstractReindeerTestUI { @Override public void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/MinimalWidthColumns.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/MinimalWidthColumns.java index 38aa338948..ccad4a1250 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/MinimalWidthColumns.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/MinimalWidthColumns.java @@ -1,11 +1,9 @@ package com.vaadin.tests.components.treetable; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.v7.ui.TreeTable; -@Theme("valo") public class MinimalWidthColumns extends AbstractTestUI { /* diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapper.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapper.java index 3e99374ae0..7ae628a710 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapper.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapper.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.treetable; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.data.util.BeanItemContainer; import com.vaadin.v7.data.util.ContainerHierarchicalWrapper; import com.vaadin.v7.ui.Tree.ExpandEvent; @@ -9,7 +9,7 @@ import com.vaadin.v7.ui.Tree.ExpandListener; import com.vaadin.v7.ui.TreeTable; @SuppressWarnings("serial") -public class TreeTableContainerHierarchicalWrapper extends AbstractTestUI { +public class TreeTableContainerHierarchicalWrapper extends AbstractReindeerTestUI { TreeTable treetable = new TreeTable(); BeanItemContainer<Bean> beanContainer = new BeanItemContainer<>( diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java index 011906dbac..74dca9a803 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java @@ -16,14 +16,14 @@ package com.vaadin.tests.components.treetable; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Notification; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.TreeTable; -public class TreeTableOutOfSync extends AbstractTestUI { +public class TreeTableOutOfSync extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java index 41c37fcd5e..2ba17bd6dd 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java @@ -1,12 +1,12 @@ package com.vaadin.tests.components.treetable; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.data.Container.Hierarchical; import com.vaadin.v7.data.util.HierarchicalContainer; import com.vaadin.v7.ui.TreeTable; -public class TreeTablePartialUpdates extends AbstractTestUI { +public class TreeTablePartialUpdates extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java index 44d29bc40a..682970cf68 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java @@ -1,12 +1,12 @@ package com.vaadin.tests.components.treetable; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.data.Container.Hierarchical; import com.vaadin.v7.data.util.HierarchicalContainer; import com.vaadin.v7.ui.TreeTable; -public class TreeTablePartialUpdatesPageLength0 extends AbstractTestUI { +public class TreeTablePartialUpdatesPageLength0 extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowGenerator.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowGenerator.java index f0be2bbc0c..98f0b62a47 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowGenerator.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowGenerator.java @@ -16,13 +16,13 @@ package com.vaadin.tests.components.treetable; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.util.HierarchicalContainer; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.TreeTable; -public class TreeTableRowGenerator extends AbstractTestUI { +public class TreeTableRowGenerator extends AbstractReindeerTestUI { public static final String COLUMN_A = "first"; public static final String COLUMN_B = "second"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowHeaderMode.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowHeaderMode.java index 9d0418b8f8..92042c2770 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowHeaderMode.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowHeaderMode.java @@ -3,7 +3,7 @@ package com.vaadin.tests.components.treetable; import com.vaadin.server.Resource; import com.vaadin.server.ThemeResource; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.ui.Table.RowHeaderMode; import com.vaadin.v7.ui.TreeTable; @@ -12,7 +12,7 @@ import com.vaadin.v7.ui.TreeTable; * * @author Vaadin Ltd */ -public class TreeTableRowHeaderMode extends AbstractTestUI { +public class TreeTableRowHeaderMode extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowIcons.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowIcons.java index 260a37a416..d8c6b1fa55 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowIcons.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowIcons.java @@ -6,11 +6,11 @@ import com.vaadin.server.FontAwesome; import com.vaadin.server.Resource; import com.vaadin.server.ThemeResource; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.HorizontalLayout; import com.vaadin.v7.ui.TreeTable; -public class TreeTableRowIcons extends AbstractTestUI { +public class TreeTableRowIcons extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpand.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpand.java index 2c4acca19e..527bb0a65e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpand.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpand.java @@ -16,10 +16,10 @@ package com.vaadin.tests.components.treetable; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.ui.TreeTable; -public class TreeTableScrollOnExpand extends AbstractTestUI { +public class TreeTableScrollOnExpand extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/ComboboxSelectedItemText.java b/uitest/src/main/java/com/vaadin/tests/components/ui/ComboboxSelectedItemText.java index 1c065450f6..a61a5f77d2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/ComboboxSelectedItemText.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/ComboboxSelectedItemText.java @@ -1,11 +1,11 @@ package com.vaadin.tests.components.ui; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUIWithLog; +import com.vaadin.tests.components.AbstractReindeerTestUIWithLog; import com.vaadin.ui.ComboBox; import com.vaadin.ui.Label; -public class ComboboxSelectedItemText extends AbstractTestUIWithLog { +public class ComboboxSelectedItemText extends AbstractReindeerTestUIWithLog { @Override protected void setup(VaadinRequest request) { getLayout().addComponent(new Label( diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/ComponentIncludedInCustomWidgetset.java b/uitest/src/main/java/com/vaadin/tests/components/ui/ComponentIncludedInCustomWidgetset.java index f674567a2d..fec7564f57 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/ComponentIncludedInCustomWidgetset.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/ComponentIncludedInCustomWidgetset.java @@ -2,11 +2,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.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent; @Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet") -public class ComponentIncludedInCustomWidgetset extends AbstractTestUI { +public class ComponentIncludedInCustomWidgetset extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { 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 bf243a53e2..bcbecdd589 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 @@ -2,11 +2,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.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent; @Widgetset("com.vaadin.DefaultWidgetSet") -public class ComponentMissingFromDefaultWidgetset extends AbstractTestUI { +public class ComponentMissingFromDefaultWidgetset extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/CustomUITest.java b/uitest/src/main/java/com/vaadin/tests/components/ui/CustomUITest.java index e9578eff74..47f981330d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/CustomUITest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/CustomUITest.java @@ -18,12 +18,12 @@ 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.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.tests.widgetset.client.CustomUIConnectorRpc; @Widgetset(TestingWidgetSet.NAME) -public class CustomUITest extends AbstractTestUI { +public class CustomUITest extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/DynamicViewport.java b/uitest/src/main/java/com/vaadin/tests/components/ui/DynamicViewport.java index ca89dbfa18..afd0d6985b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/DynamicViewport.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/DynamicViewport.java @@ -18,12 +18,12 @@ package com.vaadin.tests.components.ui; import com.vaadin.annotations.ViewportGeneratorClass; import com.vaadin.server.VaadinRequest; import com.vaadin.server.ViewportGenerator; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.components.ui.DynamicViewport.MyViewportGenerator; import com.vaadin.ui.Label; @ViewportGeneratorClass(MyViewportGenerator.class) -public class DynamicViewport extends AbstractTestUI { +public class DynamicViewport extends AbstractReindeerTestUI { public static class MyViewportGenerator implements ViewportGenerator { @Override public String getViewport(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/EmptyWindow.java b/uitest/src/main/java/com/vaadin/tests/components/ui/EmptyWindow.java index 07ce8c3ff8..213c1437bd 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/EmptyWindow.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/EmptyWindow.java @@ -1,11 +1,11 @@ package com.vaadin.tests.components.ui; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; import com.vaadin.ui.Window; -public class EmptyWindow extends AbstractTestUI { +public class EmptyWindow extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/IdOverrideTest.java b/uitest/src/main/java/com/vaadin/tests/components/ui/IdOverrideTest.java index eeadc89691..33408d31db 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/IdOverrideTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/IdOverrideTest.java @@ -4,7 +4,7 @@ import com.vaadin.annotations.Theme; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.MarginInfo; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.tests.widgetset.server.IdTestLabel; import com.vaadin.ui.Button; @@ -14,7 +14,7 @@ import com.vaadin.ui.Label; @Widgetset(TestingWidgetSet.NAME) @Theme("tests-tickets") -public class IdOverrideTest extends AbstractTestUI { +public class IdOverrideTest extends AbstractReindeerTestUI { @Override protected String getTestDescription() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/InvalidViewport.java b/uitest/src/main/java/com/vaadin/tests/components/ui/InvalidViewport.java index 4897d6a1fa..30a56d614c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/InvalidViewport.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/InvalidViewport.java @@ -18,13 +18,13 @@ package com.vaadin.tests.components.ui; import com.vaadin.annotations.Viewport; import com.vaadin.annotations.ViewportGeneratorClass; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.components.ui.DynamicViewport.MyViewportGenerator; import com.vaadin.ui.Label; @ViewportGeneratorClass(MyViewportGenerator.class) @Viewport("myViewport") -public class InvalidViewport extends AbstractTestUI { +public class InvalidViewport extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/MultipleUIUploadTest.java b/uitest/src/main/java/com/vaadin/tests/components/ui/MultipleUIUploadTest.java index db19dcbaea..fd345c3ae6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/MultipleUIUploadTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/MultipleUIUploadTest.java @@ -7,7 +7,7 @@ import java.io.OutputStream; import com.vaadin.server.StreamResource; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -15,7 +15,7 @@ import com.vaadin.ui.Notification; import com.vaadin.ui.Upload; import com.vaadin.ui.VerticalLayout; -public class MultipleUIUploadTest extends AbstractTestUI { +public class MultipleUIUploadTest extends AbstractReindeerTestUI { private MemoryBuffer buffer = new MemoryBuffer(); private Upload upload; diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/PollListening.java b/uitest/src/main/java/com/vaadin/tests/components/ui/PollListening.java index a905b5ac48..858e4efa63 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/PollListening.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/PollListening.java @@ -19,10 +19,10 @@ package com.vaadin.tests.components.ui; import com.vaadin.event.UIEvents.PollEvent; import com.vaadin.event.UIEvents.PollListener; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; -public class PollListening extends AbstractTestUI { +public class PollListening extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/StaticViewport.java b/uitest/src/main/java/com/vaadin/tests/components/ui/StaticViewport.java index 6e0c043b54..fc36ded45c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/StaticViewport.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/StaticViewport.java @@ -17,11 +17,11 @@ package com.vaadin.tests.components.ui; import com.vaadin.annotations.Viewport; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; @Viewport("myViewport") -public class StaticViewport extends AbstractTestUI { +public class StaticViewport extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/TestUITheme.java b/uitest/src/main/java/com/vaadin/tests/components/ui/TestUITheme.java index bfed424483..fe4418ebc8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/TestUITheme.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/TestUITheme.java @@ -2,11 +2,11 @@ package com.vaadin.tests.components.ui; import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; @Theme("tests-tickets") -public class TestUITheme extends AbstractTestUI { +public class TestUITheme extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivity.java b/uitest/src/main/java/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivity.java index e816a64cac..308c02dd31 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivity.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivity.java @@ -20,12 +20,12 @@ import com.vaadin.server.SystemMessages; import com.vaadin.server.SystemMessagesInfo; import com.vaadin.server.SystemMessagesProvider; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -public class TimeoutRedirectResetsOnActivity extends AbstractTestUI { +public class TimeoutRedirectResetsOnActivity extends AbstractReindeerTestUI { private int maxActiveInterval = 15; private int timeoutOverhead = 15; diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UIAutoGeneratedStyleName.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIAutoGeneratedStyleName.java index ccf5ed1b62..0b2546da69 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/UIAutoGeneratedStyleName.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIAutoGeneratedStyleName.java @@ -16,14 +16,14 @@ package com.vaadin.tests.components.ui; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; /** * Empty test ui to check auto-generated style name for UI. * * @author Vaadin Ltd */ -public class UIAutoGeneratedStyleName extends AbstractTestUI { +public class UIAutoGeneratedStyleName extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitBrowserDetails.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitBrowserDetails.java index 130d432940..d362c5e689 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitBrowserDetails.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitBrowserDetails.java @@ -7,11 +7,11 @@ package com.vaadin.tests.components.ui; import com.vaadin.server.Page; import com.vaadin.server.VaadinRequest; import com.vaadin.server.WebBrowser; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -public class UIInitBrowserDetails extends AbstractTestUI { +public class UIInitBrowserDetails extends AbstractReindeerTestUI { private GridLayout l = new GridLayout(3, 1); private VaadinRequest r; diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitException.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitException.java index d5f26ade29..22b6a8d031 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitException.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitException.java @@ -1,9 +1,9 @@ package com.vaadin.tests.components.ui; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; -public class UIInitException extends AbstractTestUI { +public class UIInitException extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitTest.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitTest.java index c495831bbe..7bb8d3380e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitTest.java @@ -17,10 +17,10 @@ package com.vaadin.tests.components.ui; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; -public class UIInitTest extends AbstractTestUI { +public class UIInitTest extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UIRefresh.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIRefresh.java index 33fd2ab8a0..a5e6012c0a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/UIRefresh.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIRefresh.java @@ -18,11 +18,11 @@ package com.vaadin.tests.components.ui; import com.vaadin.annotations.PreserveOnRefresh; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; @PreserveOnRefresh -public class UIRefresh extends AbstractTestUI { +public class UIRefresh extends AbstractReindeerTestUI { public static final String REINIT_ID = "reinit"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UISerialization.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UISerialization.java index 7f85b22fac..2fe937455d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/UISerialization.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UISerialization.java @@ -27,14 +27,14 @@ import java.util.Date; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.util.Log; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; -public class UISerialization extends AbstractTestUI { +public class UISerialization extends AbstractReindeerTestUI { private Log log = new Log(5); diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UITabIndex.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UITabIndex.java index c3bb036966..2d4d16242f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/UITabIndex.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UITabIndex.java @@ -1,11 +1,11 @@ package com.vaadin.tests.components.ui; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -public class UITabIndex extends AbstractTestUI { +public class UITabIndex extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UiDependenciesInHtml.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UiDependenciesInHtml.java index 97a43a9968..53eff1b733 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/UiDependenciesInHtml.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UiDependenciesInHtml.java @@ -19,13 +19,13 @@ import com.vaadin.annotations.JavaScript; import com.vaadin.annotations.StyleSheet; import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; @JavaScript("uiDependency.js") @StyleSheet("theme://uiDependency.css") @Theme("tests-valo") -public class UiDependenciesInHtml extends AbstractTestUI { +public class UiDependenciesInHtml extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUI.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUI.java index e630a93463..c40b16a423 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUI.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.components.ui; -import com.vaadin.annotations.Theme; import com.vaadin.server.Responsive; import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Button; @@ -31,7 +30,6 @@ import com.vaadin.ui.themes.ValoTheme; * @since * @author Vaadin Ltd */ -@Theme("valo") public class UnnecessaryPaddingInResponsiveUI extends UI { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UriFragment.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UriFragment.java index 55b93c609f..0d0fdc4b63 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/UriFragment.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UriFragment.java @@ -3,12 +3,12 @@ package com.vaadin.tests.components.ui; import com.vaadin.server.Page; import com.vaadin.server.Page.UriFragmentChangedEvent; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -public class UriFragment extends AbstractTestUI { +public class UriFragment extends AbstractReindeerTestUI { private final Label fragmentLabel = new Label(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/WindowAndUIShortcuts.java b/uitest/src/main/java/com/vaadin/tests/components/ui/WindowAndUIShortcuts.java index 1db45c7ba2..bda4cf8af5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/WindowAndUIShortcuts.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/WindowAndUIShortcuts.java @@ -1,6 +1,5 @@ package com.vaadin.tests.components.ui; -import com.vaadin.annotations.Theme; import com.vaadin.event.ShortcutAction; import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Button; @@ -10,9 +9,7 @@ import com.vaadin.ui.TextField; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -import com.vaadin.ui.themes.ValoTheme; -@Theme(ValoTheme.THEME_NAME) public class WindowAndUIShortcuts extends UI { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/WindowWithLabel.java b/uitest/src/main/java/com/vaadin/tests/components/ui/WindowWithLabel.java index 790ff00e60..91daf6adb8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/WindowWithLabel.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/WindowWithLabel.java @@ -1,11 +1,11 @@ package com.vaadin.tests.components.ui; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; import com.vaadin.ui.Window; -public class WindowWithLabel extends AbstractTestUI { +public class WindowWithLabel extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java index 1901c41720..045b91adbb 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java @@ -3,7 +3,7 @@ package com.vaadin.tests.components.uitest; import com.vaadin.server.Page.UriFragmentChangedEvent; import com.vaadin.server.Page.UriFragmentChangedListener; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; @@ -12,7 +12,7 @@ import com.vaadin.v7.data.Property.ValueChangeEvent; import com.vaadin.v7.data.Property.ValueChangeListener; import com.vaadin.v7.ui.TextField; -public class BackButtonTest extends AbstractTestUI { +public class BackButtonTest extends AbstractReindeerTestUI { private VerticalLayout layout; diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/ThemeTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/ThemeTestUI.java index 7978548c38..a865b71452 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/uitest/ThemeTestUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/ThemeTestUI.java @@ -1,13 +1,13 @@ package com.vaadin.tests.components.uitest; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; import com.vaadin.v7.ui.TextField; -public class ThemeTestUI extends AbstractTestUI { +public class ThemeTestUI extends AbstractReindeerTestUI { private TextField customStyle; private Button setStyleName; diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/UIScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/UIScrolling.java index a6f9d6e752..74d56bd04e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/uitest/UIScrolling.java +++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/UIScrolling.java @@ -1,13 +1,13 @@ package com.vaadin.tests.components.uitest; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Notification; import com.vaadin.ui.UI; -public class UIScrolling extends AbstractTestUI { +public class UIScrolling extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/upload/DisabledUploadButton.java b/uitest/src/main/java/com/vaadin/tests/components/upload/DisabledUploadButton.java index 13be9ad53d..adce9c25e5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/upload/DisabledUploadButton.java +++ b/uitest/src/main/java/com/vaadin/tests/components/upload/DisabledUploadButton.java @@ -1,11 +1,11 @@ package com.vaadin.tests.components.upload; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Upload; -public class DisabledUploadButton extends AbstractTestUI { +public class DisabledUploadButton extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidth.java b/uitest/src/main/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidth.java index 94def29c2f..ce866c37ba 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidth.java +++ b/uitest/src/main/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidth.java @@ -16,13 +16,13 @@ package com.vaadin.tests.components.upload; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Upload; import com.vaadin.ui.VerticalLayout; // We're explicitly testing only immediate uploads here because non-immediate // width issues still require planning before we can provide a fix. -public class UploadImmediateButtonWidth extends AbstractTestUI { +public class UploadImmediateButtonWidth extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/upload/UploadTitleWithTooltip.java b/uitest/src/main/java/com/vaadin/tests/components/upload/UploadTitleWithTooltip.java index 9b107b23ad..c38b307523 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/upload/UploadTitleWithTooltip.java +++ b/uitest/src/main/java/com/vaadin/tests/components/upload/UploadTitleWithTooltip.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.upload; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Upload; /** @@ -24,7 +24,7 @@ import com.vaadin.ui.Upload; * * @author Vaadin Ltd */ -public class UploadTitleWithTooltip extends AbstractTestUI { +public class UploadTitleWithTooltip extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpened.java b/uitest/src/main/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpened.java index ff911069cd..f25e4e9349 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpened.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpened.java @@ -19,7 +19,7 @@ import com.vaadin.navigator.Navigator; import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; @@ -28,7 +28,7 @@ import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -public class BackspaceKeyWithModalOpened extends AbstractTestUI { +public class BackspaceKeyWithModalOpened extends AbstractReindeerTestUI { private static final String DEFAULT_VIEW_ID = ""; private static final String SECOND_VIEW_ID = "second"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/BottomComponentScrollsUp.java b/uitest/src/main/java/com/vaadin/tests/components/window/BottomComponentScrollsUp.java index d7aaab37ca..04f3d7c502 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/BottomComponentScrollsUp.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/BottomComponentScrollsUp.java @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.List; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -40,7 +40,7 @@ import com.vaadin.ui.Window; * @author Vaadin Ltd */ @SuppressWarnings("serial") -public class BottomComponentScrollsUp extends AbstractTestUI { +public class BottomComponentScrollsUp extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/ComboboxScrollableWindow.java b/uitest/src/main/java/com/vaadin/tests/components/window/ComboboxScrollableWindow.java index 6a5a6ff30c..4bdcf4f0f7 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/ComboboxScrollableWindow.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/ComboboxScrollableWindow.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.window; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Alignment; import com.vaadin.ui.ComboBox; import com.vaadin.ui.VerticalLayout; @@ -27,7 +27,7 @@ import com.vaadin.ui.Window; * @since * @author Vaadin Ltd */ -public class ComboboxScrollableWindow extends AbstractTestUI { +public class ComboboxScrollableWindow extends AbstractReindeerTestUI { static final String WINDOW_ID = "window"; static final String COMBOBOX_ID = "combobox"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/ExtraWindowShown.java b/uitest/src/main/java/com/vaadin/tests/components/window/ExtraWindowShown.java index 925dfd28c6..e3542ae8a5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/ExtraWindowShown.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/ExtraWindowShown.java @@ -2,14 +2,14 @@ package com.vaadin.tests.components.window; import com.vaadin.server.ThemeResource; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -public class ExtraWindowShown extends AbstractTestUI { +public class ExtraWindowShown extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/ExtraWindowShownWaiAria.java b/uitest/src/main/java/com/vaadin/tests/components/window/ExtraWindowShownWaiAria.java index 828855afb6..a7fb47be9b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/ExtraWindowShownWaiAria.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/ExtraWindowShownWaiAria.java @@ -3,7 +3,7 @@ package com.vaadin.tests.components.window; import com.vaadin.server.ThemeResource; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.window.WindowRole; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; @@ -13,7 +13,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.TextField; import com.vaadin.ui.Window; -public class ExtraWindowShownWaiAria extends AbstractTestUI { +public class ExtraWindowShownWaiAria extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/MaximizeRestoreWindowWithManagedLayout.java b/uitest/src/main/java/com/vaadin/tests/components/window/MaximizeRestoreWindowWithManagedLayout.java index 15e26196e6..82e33bc920 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/MaximizeRestoreWindowWithManagedLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/MaximizeRestoreWindowWithManagedLayout.java @@ -15,14 +15,12 @@ */ package com.vaadin.tests.components.window; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.GridLayout; import com.vaadin.ui.TextField; import com.vaadin.ui.Window; -@Theme("valo") public class MaximizeRestoreWindowWithManagedLayout extends AbstractTestUI { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/MaximizedWindowOrder.java b/uitest/src/main/java/com/vaadin/tests/components/window/MaximizedWindowOrder.java index fb53eaba72..35a911878e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/MaximizedWindowOrder.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/MaximizedWindowOrder.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.window; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.window.WindowMode; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -10,7 +10,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -public class MaximizedWindowOrder extends AbstractTestUI { +public class MaximizedWindowOrder extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowFocus.java b/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowFocus.java index 9536dac7d7..85c60d3738 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowFocus.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowFocus.java @@ -16,13 +16,13 @@ package com.vaadin.tests.components.window; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Window; -public class ModalWindowFocus extends AbstractTestUI { +public class ModalWindowFocus extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest req) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowInitialLocation.java b/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowInitialLocation.java index 56805c35cc..68d7c009cf 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowInitialLocation.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowInitialLocation.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.window; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -24,7 +24,7 @@ import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; import com.vaadin.v7.ui.ListSelect; -public class ModalWindowInitialLocation extends AbstractTestUI { +public class ModalWindowInitialLocation extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/MoveToTop.java b/uitest/src/main/java/com/vaadin/tests/components/window/MoveToTop.java index 3c87f4c342..afd852f7b6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/MoveToTop.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/MoveToTop.java @@ -16,14 +16,14 @@ package com.vaadin.tests.components.window; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Window; /** * * @author Vaadin Ltd */ -public class MoveToTop extends AbstractTestUI { +public class MoveToTop extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/PageOpenTest.java b/uitest/src/main/java/com/vaadin/tests/components/window/PageOpenTest.java index 6816417208..3f0a2afe99 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/PageOpenTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/PageOpenTest.java @@ -3,12 +3,12 @@ package com.vaadin.tests.components.window; import com.vaadin.server.Page; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.TestForWindowOpen; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.JavaScript; -public class PageOpenTest extends AbstractTestUI { +public class PageOpenTest extends AbstractReindeerTestUI { final String url = "http://www.google.com"; diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/RepaintWindowContents.java b/uitest/src/main/java/com/vaadin/tests/components/window/RepaintWindowContents.java index 18fe8f2fac..1a2ac3e831 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/RepaintWindowContents.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/RepaintWindowContents.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.window; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -9,7 +9,7 @@ import com.vaadin.ui.Layout; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -public class RepaintWindowContents extends AbstractTestUI { +public class RepaintWindowContents extends AbstractReindeerTestUI { private static final long serialVersionUID = 1L; @SuppressWarnings("serial") diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpened.java b/uitest/src/main/java/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpened.java index e9b6e762c9..3229068756 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpened.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpened.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.window; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; @@ -25,7 +25,7 @@ import com.vaadin.ui.Window; * @since 7.1.9 * @author Vaadin Ltd */ -public class ScrollingBodyElementWithModalOpened extends AbstractTestUI { +public class ScrollingBodyElementWithModalOpened extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java b/uitest/src/main/java/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java index 7f15c7c12b..3071c719d7 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.window; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; @@ -12,7 +12,7 @@ import com.vaadin.ui.Window; * * @author Vaadin Ltd */ -public class TestTooSmallSubwindowSize extends AbstractTestUI { +public class TestTooSmallSubwindowSize extends AbstractReindeerTestUI { @Override protected String getTestDescription() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/ToolTipInWindow.java b/uitest/src/main/java/com/vaadin/tests/components/window/ToolTipInWindow.java index 87524f4166..32de5a7811 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/ToolTipInWindow.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/ToolTipInWindow.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.window; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; import com.vaadin.ui.Window; @@ -26,7 +26,7 @@ import com.vaadin.ui.Window; * * @author Vaadin Ltd */ -public class ToolTipInWindow extends AbstractTestUI { +public class ToolTipInWindow extends AbstractReindeerTestUI { Window window; diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/UncloseableWindowCloseShortcut.java b/uitest/src/main/java/com/vaadin/tests/components/window/UncloseableWindowCloseShortcut.java index cb007fa24b..c7c8f461b3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/UncloseableWindowCloseShortcut.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/UncloseableWindowCloseShortcut.java @@ -16,11 +16,11 @@ package com.vaadin.tests.components.window; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; import com.vaadin.ui.Window; -public class UncloseableWindowCloseShortcut extends AbstractTestUI { +public class UncloseableWindowCloseShortcut extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowCaption.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowCaption.java index 02ef3c83cb..e7f39874b1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowCaption.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowCaption.java @@ -16,14 +16,14 @@ package com.vaadin.tests.components.window; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; import com.vaadin.ui.Window; -public class WindowCaption extends AbstractTestUI { +public class WindowCaption extends AbstractReindeerTestUI { private Window htmlWindow; private Window textWindow; diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowCloseShortcuts.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowCloseShortcuts.java index f5ab65a65b..b7995e7b8a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowCloseShortcuts.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowCloseShortcuts.java @@ -25,7 +25,6 @@ import org.jsoup.nodes.Element; import org.jsoup.nodes.Node; import org.jsoup.nodes.TextNode; -import com.vaadin.annotations.Theme; import com.vaadin.event.ShortcutAction.KeyCode; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; @@ -34,14 +33,13 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; +import com.vaadin.ui.RichTextArea; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; import com.vaadin.ui.declarative.Design; import com.vaadin.ui.declarative.DesignContext; -import com.vaadin.ui.RichTextArea; -@Theme("valo") @SuppressWarnings("serial") public class WindowCloseShortcuts extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowInUiWithNoContent.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowInUiWithNoContent.java index 457e7644b8..3d631a3a95 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowInUiWithNoContent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowInUiWithNoContent.java @@ -16,7 +16,7 @@ package com.vaadin.tests.components.window; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Window; /** @@ -25,7 +25,7 @@ import com.vaadin.ui.Window; * @since 7.2 * @author Vaadin Ltd */ -public class WindowInUiWithNoContent extends AbstractTestUI { +public class WindowInUiWithNoContent extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowMaxHeight.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowMaxHeight.java index 430f99a6ac..cb42e5f505 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowMaxHeight.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowMaxHeight.java @@ -1,6 +1,5 @@ package com.vaadin.tests.components.window; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Panel; import com.vaadin.ui.UI; @@ -8,7 +7,6 @@ import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; @SuppressWarnings("serial") -@Theme("valo") public class WindowMaxHeight extends UI { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.java index ec735cfa3c..b9a1b61c71 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.java @@ -5,7 +5,7 @@ import java.util.List; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.window.WindowMode; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; import com.vaadin.ui.ComboBox; @@ -17,7 +17,7 @@ import com.vaadin.ui.Window; import com.vaadin.ui.Window.WindowModeChangeEvent; import com.vaadin.ui.Window.WindowModeChangeListener; -public class WindowMaximizeRestoreTest extends AbstractTestUI { +public class WindowMaximizeRestoreTest extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { Button addButton = new Button("Add new Window"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowMoveListener.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowMoveListener.java index acc6043d5a..b566f95f12 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowMoveListener.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowMoveListener.java @@ -1,14 +1,14 @@ package com.vaadin.tests.components.window; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Window; @SuppressWarnings("serial") -public class WindowMoveListener extends AbstractTestUI { +public class WindowMoveListener extends AbstractReindeerTestUI { /* * (non-Javadoc) diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowShadow.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowShadow.java index 28d8c3aa61..5bf5d39358 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowShadow.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowShadow.java @@ -16,12 +16,12 @@ package com.vaadin.tests.components.window; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.UI; import com.vaadin.ui.Window; //Tests that invisible divs don't overlap windows and don't block mouse events -public class WindowShadow extends AbstractTestUI { +public class WindowShadow extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java index 3eca52b468..b784cc72e5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java @@ -9,14 +9,14 @@ import com.vaadin.event.ShortcutAction; import com.vaadin.event.ShortcutAction.ModifierKey; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.MarginInfo; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.Notification; import com.vaadin.v7.ui.TextField; -public class WindowShouldRemoveActionHandler extends AbstractTestUI { +public class WindowShouldRemoveActionHandler extends AbstractReindeerTestUI { @Override protected String getTestDescription() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowThemes.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowThemes.java index ca25a86ca3..3a5a21dddc 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowThemes.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowThemes.java @@ -20,12 +20,12 @@ package com.vaadin.tests.components.window; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; import com.vaadin.ui.Window; import com.vaadin.ui.themes.Reindeer; -public class WindowThemes extends AbstractTestUI { +public class WindowThemes extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowWithIcon.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowWithIcon.java index 15ceb569b4..7c6b21eff5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowWithIcon.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowWithIcon.java @@ -2,10 +2,10 @@ package com.vaadin.tests.components.window; import com.vaadin.server.FontAwesome; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Window; -public class WindowWithIcon extends AbstractTestUI { +public class WindowWithIcon extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowWithInvalidCloseListener.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowWithInvalidCloseListener.java index 991b5626eb..ec79a8e6c3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowWithInvalidCloseListener.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowWithInvalidCloseListener.java @@ -1,12 +1,12 @@ package com.vaadin.tests.components.window; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Window; import com.vaadin.ui.Window.CloseEvent; import com.vaadin.ui.Window.CloseListener; -public class WindowWithInvalidCloseListener extends AbstractTestUI { +public class WindowWithInvalidCloseListener extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowZIndex.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowZIndex.java index 965dd470eb..7e94539c8a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowZIndex.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowZIndex.java @@ -5,14 +5,14 @@ import java.util.NoSuchElementException; import java.util.Queue; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; import com.vaadin.ui.Window; -public class WindowZIndex extends AbstractTestUI { +public class WindowZIndex extends AbstractReindeerTestUI { @Override protected String getTestDescription() { diff --git a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java index c9bbb9af3c..b11f67e1d4 100644 --- a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java +++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java @@ -5,7 +5,7 @@ import java.sql.SQLException; import java.sql.Statement; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.Property; import com.vaadin.v7.data.Property.ValueChangeEvent; @@ -17,7 +17,7 @@ import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery; import com.vaadin.v7.shared.ui.combobox.FilteringMode; import com.vaadin.v7.ui.ComboBox; -public class TableQueryWithNonUniqueFirstPrimaryKey extends AbstractTestUI { +public class TableQueryWithNonUniqueFirstPrimaryKey extends AbstractReindeerTestUI { @Override public void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/contextclick/AbstractContextClickUI.java b/uitest/src/main/java/com/vaadin/tests/contextclick/AbstractContextClickUI.java index fa3d83640b..9dd2e47df5 100644 --- a/uitest/src/main/java/com/vaadin/tests/contextclick/AbstractContextClickUI.java +++ b/uitest/src/main/java/com/vaadin/tests/contextclick/AbstractContextClickUI.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.contextclick; -import com.vaadin.annotations.Theme; import com.vaadin.event.ContextClickEvent; import com.vaadin.event.ContextClickEvent.ContextClickListener; import com.vaadin.server.VaadinRequest; @@ -25,7 +24,6 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; -@Theme("valo") public abstract class AbstractContextClickUI<T extends AbstractComponent, E extends ContextClickEvent> extends AbstractTestUIWithLog { diff --git a/uitest/src/main/java/com/vaadin/tests/contextclick/BrowserContextMenuInSubComponent.java b/uitest/src/main/java/com/vaadin/tests/contextclick/BrowserContextMenuInSubComponent.java index 8dc7547d6c..99540c3f77 100644 --- a/uitest/src/main/java/com/vaadin/tests/contextclick/BrowserContextMenuInSubComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/contextclick/BrowserContextMenuInSubComponent.java @@ -20,7 +20,7 @@ import com.vaadin.event.ContextClickEvent; import com.vaadin.event.ContextClickEvent.ContextClickListener; import com.vaadin.server.AbstractExtension; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button; @@ -31,7 +31,7 @@ import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.TextArea; @Widgetset(TestingWidgetSet.NAME) -public class BrowserContextMenuInSubComponent extends AbstractTestUI { +public class BrowserContextMenuInSubComponent extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/core/SpecialCharactersEncodingUI.java b/uitest/src/main/java/com/vaadin/tests/core/SpecialCharactersEncodingUI.java index 974d94c03b..b240b29f54 100644 --- a/uitest/src/main/java/com/vaadin/tests/core/SpecialCharactersEncodingUI.java +++ b/uitest/src/main/java/com/vaadin/tests/core/SpecialCharactersEncodingUI.java @@ -1,12 +1,12 @@ package com.vaadin.tests.core; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; import com.vaadin.ui.MenuBar; import com.vaadin.ui.TextField; -public class SpecialCharactersEncodingUI extends AbstractTestUI { +public class SpecialCharactersEncodingUI extends AbstractReindeerTestUI { public static String textWithZwnj = "\ufeffछुट्याउनेछन् क्ष क्ष क्ष"; diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDInterrupt.java b/uitest/src/main/java/com/vaadin/tests/dd/DDInterrupt.java index ef64fb44d8..a16a627763 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/DDInterrupt.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/DDInterrupt.java @@ -7,7 +7,7 @@ import com.vaadin.event.dd.TargetDetailsImpl; import com.vaadin.event.dd.acceptcriteria.AcceptAll; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -22,7 +22,7 @@ import com.vaadin.ui.Label; * @author Vaadin Ltd */ @Widgetset(TestingWidgetSet.NAME) -public class DDInterrupt extends AbstractTestUI { +public class DDInterrupt extends AbstractReindeerTestUI { private SpacebarPanner sp; diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java index c0ed19d2d9..d1153c3fb4 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java @@ -9,7 +9,7 @@ import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.event.dd.acceptcriteria.Or; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.dd.VerticalDropLocation; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.util.HierarchicalContainer; import com.vaadin.v7.event.DataBoundTransferable; @@ -21,7 +21,7 @@ import com.vaadin.v7.ui.Tree.TreeTargetDetails; /** * DD playground. Better quality example/prototype codes in {@link DDTest2}. */ -public class DDTest8 extends AbstractTestUI { +public class DDTest8 extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayouts.java b/uitest/src/main/java/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayouts.java index 409a3b5494..b3f6e29142 100644 --- a/uitest/src/main/java/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayouts.java +++ b/uitest/src/main/java/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayouts.java @@ -17,10 +17,10 @@ package com.vaadin.tests.debug; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; -public class HierarchyAfterAnalyzeLayouts extends AbstractTestUI { +public class HierarchyAfterAnalyzeLayouts extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/debug/PreserveCustomDebugSectionOpen.java b/uitest/src/main/java/com/vaadin/tests/debug/PreserveCustomDebugSectionOpen.java index 3848e7b6ff..c3d93df9cc 100644 --- a/uitest/src/main/java/com/vaadin/tests/debug/PreserveCustomDebugSectionOpen.java +++ b/uitest/src/main/java/com/vaadin/tests/debug/PreserveCustomDebugSectionOpen.java @@ -17,12 +17,12 @@ package com.vaadin.tests.debug; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.ui.Label; @Widgetset(TestingWidgetSet.NAME) -public class PreserveCustomDebugSectionOpen extends AbstractTestUI { +public class PreserveCustomDebugSectionOpen extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/debug/ProfilerZeroOverhead.java b/uitest/src/main/java/com/vaadin/tests/debug/ProfilerZeroOverhead.java index cfe5f5ce65..bb6771e1a5 100644 --- a/uitest/src/main/java/com/vaadin/tests/debug/ProfilerZeroOverhead.java +++ b/uitest/src/main/java/com/vaadin/tests/debug/ProfilerZeroOverhead.java @@ -17,13 +17,13 @@ package com.vaadin.tests.debug; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.tests.widgetset.client.ProfilerCompilationCanary; import com.vaadin.tests.widgetset.server.TestWidgetComponent; @Widgetset(TestingWidgetSet.NAME) -public class ProfilerZeroOverhead extends AbstractTestUI { +public class ProfilerZeroOverhead extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/debug/PushVersionInfo.java b/uitest/src/main/java/com/vaadin/tests/debug/PushVersionInfo.java index 99f12013e7..cc852bfceb 100644 --- a/uitest/src/main/java/com/vaadin/tests/debug/PushVersionInfo.java +++ b/uitest/src/main/java/com/vaadin/tests/debug/PushVersionInfo.java @@ -19,7 +19,7 @@ import org.atmosphere.util.Version; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.communication.PushMode; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; /** @@ -27,7 +27,7 @@ import com.vaadin.ui.Label; * * @author Vaadin Ltd */ -public class PushVersionInfo extends AbstractTestUI { +public class PushVersionInfo extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/declarative/DeclarativeEditor.java b/uitest/src/main/java/com/vaadin/tests/declarative/DeclarativeEditor.java index e0862415f0..e0c5c899b2 100644 --- a/uitest/src/main/java/com/vaadin/tests/declarative/DeclarativeEditor.java +++ b/uitest/src/main/java/com/vaadin/tests/declarative/DeclarativeEditor.java @@ -21,7 +21,6 @@ import java.io.IOException; import org.apache.commons.io.IOUtils; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Component; import com.vaadin.ui.HasComponents; @@ -37,7 +36,6 @@ import com.vaadin.v7.data.Property.ValueChangeEvent; import com.vaadin.v7.data.Property.ValueChangeListener; import com.vaadin.v7.data.Property.ValueChangeNotifier; -@Theme("valo") public class DeclarativeEditor extends UI { private VerticalLayout treeHolder; @@ -117,7 +115,7 @@ public class DeclarativeEditor extends UI { } if (component instanceof HasComponents) { - for (Component c : ((HasComponents) component)) { + for (Component c : (HasComponents) component) { addValueChangeListeners(c); } } diff --git a/uitest/src/main/java/com/vaadin/tests/declarative/PotusCrudUI.java b/uitest/src/main/java/com/vaadin/tests/declarative/PotusCrudUI.java index 84177e2822..4e38bec048 100644 --- a/uitest/src/main/java/com/vaadin/tests/declarative/PotusCrudUI.java +++ b/uitest/src/main/java/com/vaadin/tests/declarative/PotusCrudUI.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.declarative; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.ui.UI; @@ -24,7 +23,6 @@ import com.vaadin.ui.UI; * @since * @author Vaadin Ltd */ -@Theme("valo") public class PotusCrudUI extends UI { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/errorhandler/ErrorHandlers.java b/uitest/src/main/java/com/vaadin/tests/errorhandler/ErrorHandlers.java index 1d22a98ae2..15c5196abd 100644 --- a/uitest/src/main/java/com/vaadin/tests/errorhandler/ErrorHandlers.java +++ b/uitest/src/main/java/com/vaadin/tests/errorhandler/ErrorHandlers.java @@ -7,7 +7,7 @@ import com.vaadin.server.DefaultErrorHandler; import com.vaadin.server.ErrorHandler; import com.vaadin.server.ServerRpcManager.RpcInvocationException; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -17,7 +17,7 @@ import com.vaadin.ui.Notification; import com.vaadin.ui.Notification.Type; import com.vaadin.ui.VerticalLayout; -public class ErrorHandlers extends AbstractTestUI { +public class ErrorHandlers extends AbstractReindeerTestUI { public static class NotificationErrorHandler implements ErrorHandler { diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/BasicExtensionTest.java b/uitest/src/main/java/com/vaadin/tests/extensions/BasicExtensionTest.java index f21251aa2d..9234e2866a 100644 --- a/uitest/src/main/java/com/vaadin/tests/extensions/BasicExtensionTest.java +++ b/uitest/src/main/java/com/vaadin/tests/extensions/BasicExtensionTest.java @@ -18,14 +18,14 @@ package com.vaadin.tests.extensions; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; @Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet") -public class BasicExtensionTest extends AbstractTestUI { +public class BasicExtensionTest extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/BrowserPopupExtensionTest.java b/uitest/src/main/java/com/vaadin/tests/extensions/BrowserPopupExtensionTest.java index 39994eb970..45d683d44b 100644 --- a/uitest/src/main/java/com/vaadin/tests/extensions/BrowserPopupExtensionTest.java +++ b/uitest/src/main/java/com/vaadin/tests/extensions/BrowserPopupExtensionTest.java @@ -21,7 +21,7 @@ import java.util.List; import com.vaadin.server.BrowserWindowOpener; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.components.popupview.ReopenPopupView; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button; @@ -35,7 +35,7 @@ import com.vaadin.ui.Link; import com.vaadin.ui.NativeButton; import com.vaadin.ui.UI; -public class BrowserPopupExtensionTest extends AbstractTestUI { +public class BrowserPopupExtensionTest extends AbstractReindeerTestUI { public static class ShowParamsUI extends UI { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/HelloWorldExtensionTest.java b/uitest/src/main/java/com/vaadin/tests/extensions/HelloWorldExtensionTest.java index c3f4b3a587..5b91056db6 100644 --- a/uitest/src/main/java/com/vaadin/tests/extensions/HelloWorldExtensionTest.java +++ b/uitest/src/main/java/com/vaadin/tests/extensions/HelloWorldExtensionTest.java @@ -17,12 +17,12 @@ package com.vaadin.tests.extensions; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet") -public class HelloWorldExtensionTest extends AbstractTestUI { +public class HelloWorldExtensionTest extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOS.java b/uitest/src/main/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOS.java index 745904ebe2..2bc5a8cb7b 100644 --- a/uitest/src/main/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOS.java +++ b/uitest/src/main/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOS.java @@ -6,11 +6,11 @@ import java.io.InputStream; import com.vaadin.server.FileDownloader; import com.vaadin.server.StreamResource; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Label; -public class IframeIsOpenedInNonIOS extends AbstractTestUI { +public class IframeIsOpenedInNonIOS extends AbstractReindeerTestUI { public static final String FILE_CONTENT = "New text file"; public static final String FILE_NAME = "textfile.txt"; diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/JavascriptManagerTest.java b/uitest/src/main/java/com/vaadin/tests/extensions/JavascriptManagerTest.java index 2894e5b169..4ab1f1f749 100644 --- a/uitest/src/main/java/com/vaadin/tests/extensions/JavascriptManagerTest.java +++ b/uitest/src/main/java/com/vaadin/tests/extensions/JavascriptManagerTest.java @@ -17,7 +17,7 @@ package com.vaadin.tests.extensions; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.util.Log; import com.vaadin.ui.JavaScript; import com.vaadin.ui.JavaScriptFunction; @@ -25,7 +25,7 @@ import com.vaadin.ui.JavaScriptFunction; import elemental.json.JsonArray; import elemental.json.JsonNull; -public class JavascriptManagerTest extends AbstractTestUI { +public class JavascriptManagerTest extends AbstractReindeerTestUI { private Log log = new Log(5); diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveLayoutUpdate.java b/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveLayoutUpdate.java index 25df840dc8..feff3aa3ea 100644 --- a/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveLayoutUpdate.java +++ b/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveLayoutUpdate.java @@ -19,13 +19,13 @@ package com.vaadin.tests.extensions; import com.vaadin.annotations.Theme; import com.vaadin.server.Responsive; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; @Theme("tests-responsive") -public class ResponsiveLayoutUpdate extends AbstractTestUI { +public class ResponsiveLayoutUpdate extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveUI.java b/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveUI.java index a3d97e2278..3098a93fce 100644 --- a/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveUI.java +++ b/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveUI.java @@ -20,13 +20,13 @@ import com.vaadin.annotations.Theme; import com.vaadin.server.Responsive; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.CssLayout; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Label; @Theme("tests-responsive") -public class ResponsiveUI extends AbstractTestUI { +public class ResponsiveUI extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { HorizontalSplitPanel split = new HorizontalSplitPanel(); diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveWidthAndHeight.java b/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveWidthAndHeight.java index dbb57cbbd8..443ff9d9aa 100644 --- a/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveWidthAndHeight.java +++ b/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveWidthAndHeight.java @@ -19,12 +19,12 @@ package com.vaadin.tests.extensions; import com.vaadin.annotations.Theme; import com.vaadin.server.Responsive; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.CssLayout; import com.vaadin.ui.Label; @Theme("tests-responsive") -public class ResponsiveWidthAndHeight extends AbstractTestUI { +public class ResponsiveWidthAndHeight extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveWithCrossDomainStyles.java b/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveWithCrossDomainStyles.java index 8a740787eb..4dc270b747 100644 --- a/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveWithCrossDomainStyles.java +++ b/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveWithCrossDomainStyles.java @@ -17,12 +17,12 @@ package com.vaadin.tests.extensions; import com.vaadin.annotations.StyleSheet; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @StyleSheet("http://fonts.googleapis.com/css?family=Cabin+Sketch") -public class ResponsiveWithCrossDomainStyles extends AbstractTestUI { +public class ResponsiveWithCrossDomainStyles extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayout.java b/uitest/src/main/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayout.java index 9096e0b179..8dfc9f2034 100644 --- a/uitest/src/main/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayout.java @@ -17,13 +17,13 @@ package com.vaadin.tests.extensions; import com.vaadin.server.Responsive; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CssLayout; import com.vaadin.ui.Label; -public class SetThemeAndResponsiveLayout extends AbstractTestUI { +public class SetThemeAndResponsiveLayout extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java b/uitest/src/main/java/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java index 7e8547cfac..3ad86b7466 100644 --- a/uitest/src/main/java/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java +++ b/uitest/src/main/java/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java @@ -23,7 +23,7 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.shared.JavaScriptExtensionState; import com.vaadin.shared.communication.ClientRpc; import com.vaadin.shared.communication.ServerRpc; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.JavaScriptFunction; @@ -31,7 +31,7 @@ import com.vaadin.ui.Notification; import elemental.json.JsonArray; -public class SimpleJavaScriptExtensionTest extends AbstractTestUI { +public class SimpleJavaScriptExtensionTest extends AbstractReindeerTestUI { public static class SimpleJavaScriptExtensionState extends JavaScriptExtensionState { diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java index ca200cc5e8..f57d033112 100644 --- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java +++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java @@ -18,7 +18,6 @@ package com.vaadin.tests.fieldgroup; import java.util.Iterator; import java.util.Map; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.shared.util.SharedUtil; @@ -48,7 +47,6 @@ import com.vaadin.v7.ui.ComboBox; import com.vaadin.v7.ui.Field; import com.vaadin.v7.ui.TextField; -@Theme("valo") public abstract class AbstractBasicCrud extends AbstractTestUIWithLog { protected AbstractForm form; diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/MultipleValidationErrors.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/MultipleValidationErrors.java index ec715a30bb..34161782a8 100644 --- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/MultipleValidationErrors.java +++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/MultipleValidationErrors.java @@ -4,7 +4,7 @@ import org.apache.commons.lang.StringEscapeUtils; import com.vaadin.server.AbstractErrorMessage; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Label; import com.vaadin.v7.data.Validator; @@ -13,7 +13,7 @@ import com.vaadin.v7.data.util.BeanItem; import com.vaadin.v7.data.validator.BeanValidator; import com.vaadin.v7.ui.TextField; -public class MultipleValidationErrors extends AbstractTestUI { +public class MultipleValidationErrors extends AbstractReindeerTestUI { public static final String FIRST_NAME_NOT_NULL_VALIDATION_MESSAGE = "first name is null"; public static final String LAST_NAME_NOT_NULL_VALIDATION_MESSAGE = "last name is null"; diff --git a/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java b/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java index 0db298da7e..4e8c441b1e 100644 --- a/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java +++ b/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java @@ -25,7 +25,7 @@ import com.vaadin.server.ThemeResource; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.Position; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Accordion; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -57,7 +57,7 @@ import com.vaadin.v7.ui.TextArea; import com.vaadin.v7.ui.Tree; import com.vaadin.v7.ui.TwinColSelect; -public class FontIcons extends AbstractTestUI { +public class FontIcons extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/integration/ProxyTest.java b/uitest/src/main/java/com/vaadin/tests/integration/ProxyTest.java index 817ca63088..3e9885116a 100644 --- a/uitest/src/main/java/com/vaadin/tests/integration/ProxyTest.java +++ b/uitest/src/main/java/com/vaadin/tests/integration/ProxyTest.java @@ -29,14 +29,14 @@ import com.vaadin.annotations.PreserveOnRefresh; import com.vaadin.server.ExternalResource; import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinServletService; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Link; import com.vaadin.ui.VerticalLayout; @PreserveOnRefresh -public class ProxyTest extends AbstractTestUI { +public class ProxyTest extends AbstractReindeerTestUI { private Server server; diff --git a/uitest/src/main/java/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdate.java b/uitest/src/main/java/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdate.java index 9dafce8316..59acef53ba 100644 --- a/uitest/src/main/java/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdate.java +++ b/uitest/src/main/java/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdate.java @@ -17,12 +17,12 @@ package com.vaadin.tests.layoutmanager; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.tests.widgetset.server.LayoutDuringStateUpdateComponent; @Widgetset(TestingWidgetSet.NAME) -public class LayoutDuringStateUpdate extends AbstractTestUI { +public class LayoutDuringStateUpdate extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java b/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java index f0e3f300d7..77373c723e 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java @@ -6,7 +6,7 @@ import java.util.List; import com.vaadin.server.ThemeResource; import com.vaadin.server.UserError; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -26,7 +26,7 @@ import com.vaadin.v7.ui.AbstractField; import com.vaadin.v7.ui.NativeSelect; import com.vaadin.v7.ui.TextField; -public class CaptionsInLayouts extends AbstractTestUI { +public class CaptionsInLayouts extends AbstractReindeerTestUI { private static final Object CAPTION = "CAPTION"; private static final Object CLASS = "C"; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutAbsoluteUrl.java b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutAbsoluteUrl.java index df46d7dae5..7bd63d06a2 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutAbsoluteUrl.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutAbsoluteUrl.java @@ -16,12 +16,12 @@ package com.vaadin.tests.layouts; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Component; import com.vaadin.ui.CssLayout; import com.vaadin.ui.Label; -public class CssLayoutAbsoluteUrl extends AbstractTestUI { +public class CssLayoutAbsoluteUrl extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/HorizontalLayoutAndCaretPosition.java b/uitest/src/main/java/com/vaadin/tests/layouts/HorizontalLayoutAndCaretPosition.java index 93d4ab954a..ae8bdcbf66 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/HorizontalLayoutAndCaretPosition.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/HorizontalLayoutAndCaretPosition.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.layouts; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.HorizontalLayout; @@ -37,7 +36,6 @@ import com.vaadin.ui.TextField; * License for the specific language governing permissions and limitations under * the License. */ -@Theme("valo") public class HorizontalLayoutAndCaretPosition extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/HtmlInCaption.java b/uitest/src/main/java/com/vaadin/tests/layouts/HtmlInCaption.java index 63e2de75d6..2d9fd07a1c 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/HtmlInCaption.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/HtmlInCaption.java @@ -16,7 +16,7 @@ package com.vaadin.tests.layouts; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.AbsoluteLayout; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button; @@ -39,7 +39,7 @@ import com.vaadin.v7.ui.TextField; * @since * @author Vaadin Ltd */ -public class HtmlInCaption extends AbstractTestUI { +public class HtmlInCaption extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/MarginWithExpandRatio.java b/uitest/src/main/java/com/vaadin/tests/layouts/MarginWithExpandRatio.java index b349b97d77..2af07bfa7e 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/MarginWithExpandRatio.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/MarginWithExpandRatio.java @@ -17,7 +17,7 @@ package com.vaadin.tests.layouts; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.util.TestUtils; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; @@ -26,7 +26,7 @@ import com.vaadin.ui.Layout; import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; -public class MarginWithExpandRatio extends AbstractTestUI { +public class MarginWithExpandRatio extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayout.java b/uitest/src/main/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayout.java index 22cf7a3b83..d95f9bbf4c 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayout.java @@ -16,12 +16,12 @@ package com.vaadin.tests.layouts; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.CssLayout; import com.vaadin.ui.FormLayout; import com.vaadin.ui.TextField; -public class RelativeSizeInUndefinedCssLayout extends AbstractTestUI { +public class RelativeSizeInUndefinedCssLayout extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/customlayout/DefaultLocationInCustomLayout.java b/uitest/src/main/java/com/vaadin/tests/layouts/customlayout/DefaultLocationInCustomLayout.java index 88d7b31ba7..32b16fedd1 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/customlayout/DefaultLocationInCustomLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/customlayout/DefaultLocationInCustomLayout.java @@ -16,12 +16,12 @@ package com.vaadin.tests.layouts.customlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.CustomLayout; @SuppressWarnings("serial") -public class DefaultLocationInCustomLayout extends AbstractTestUI { +public class DefaultLocationInCustomLayout extends AbstractReindeerTestUI { protected static final String BUTTON_ID = "DefaultLocationInCustomLayoutTestButtonId"; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java index f2d6240d0e..f94513f137 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java @@ -1,14 +1,14 @@ package com.vaadin.tests.layouts.gridlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.v7.ui.TextField; -public class GridLayoutMoveComponent extends AbstractTestUI { +public class GridLayoutMoveComponent extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChange.java b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChange.java index 16bbdc0209..d899309921 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChange.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChange.java @@ -1,7 +1,7 @@ package com.vaadin.tests.layouts.gridlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CustomComponent; @@ -10,7 +10,7 @@ import com.vaadin.ui.NativeButton; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.TextField; -public class GridLayoutWidthChange extends AbstractTestUI { +public class GridLayoutWidthChange extends AbstractReindeerTestUI { private GridLayout generateLayout() { VerticalLayout fields1 = new VerticalLayout(); diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumns.java b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumns.java index c9cdb38662..b9db88a19c 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumns.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumns.java @@ -16,7 +16,7 @@ package com.vaadin.tests.layouts.gridlayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; @@ -25,7 +25,7 @@ import com.vaadin.ui.Label; * @since * @author Vaadin Ltd */ -public class GridSpanEmptyColumns extends AbstractTestUI { +public class GridSpanEmptyColumns extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java index 67a38cf7a2..7515ca4f9f 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java @@ -20,7 +20,7 @@ import com.vaadin.server.ThemeResource; import com.vaadin.server.UserError; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractLayout; import com.vaadin.ui.AbstractOrderedLayout; @@ -40,7 +40,7 @@ import com.vaadin.v7.ui.TextField; * * Base class for Layout tests. */ -public abstract class BaseLayoutTestUI extends AbstractTestUI { +public abstract class BaseLayoutTestUI extends AbstractReindeerTestUI { protected static final String FOLDER_16_PNG = "../icons/runo/16/folder.png"; protected static final String CALENDAR_32_PNG = "../runo/icons/16/calendar.png"; protected static final String LOCK_16_PNG = "../runo/icons/16/lock.png"; diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringColumnWidths.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringColumnWidths.java index a638222519..5e62bc1568 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringColumnWidths.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringColumnWidths.java @@ -15,13 +15,11 @@ */ package com.vaadin.tests.minitutorials.v7_4; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.ui.UI; import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.SelectionMode; -@Theme("valo") public class ConfiguringColumnWidths extends UI { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringGridHeadersAndFooters.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringGridHeadersAndFooters.java index 3ca84ecf15..9de67d902d 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringGridHeadersAndFooters.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringGridHeadersAndFooters.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.minitutorials.v7_4; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Button; import com.vaadin.ui.UI; @@ -24,7 +23,6 @@ import com.vaadin.v7.ui.Grid.FooterCell; import com.vaadin.v7.ui.Grid.HeaderCell; import com.vaadin.v7.ui.Grid.HeaderRow; -@Theme("valo") public class ConfiguringGridHeadersAndFooters extends UI { @Override protected void init(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java index ed1cccb4d3..ee3b44b38b 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java @@ -18,7 +18,6 @@ package com.vaadin.tests.minitutorials.v7_4; import java.text.NumberFormat; import java.util.Locale; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.ui.UI; import com.vaadin.v7.data.util.converter.Converter; @@ -29,7 +28,6 @@ import com.vaadin.v7.ui.Grid.CellStyleGenerator; import com.vaadin.v7.ui.renderers.HtmlRenderer; import com.vaadin.v7.ui.renderers.NumberRenderer; -@Theme("valo") public class FormattingDataInGrid extends UI { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ShowingInlineDataInGrid.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ShowingInlineDataInGrid.java index 21261875b3..d8c778e327 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ShowingInlineDataInGrid.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ShowingInlineDataInGrid.java @@ -15,13 +15,11 @@ */ package com.vaadin.tests.minitutorials.v7_4; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.ui.UI; import com.vaadin.v7.shared.ui.grid.HeightMode; import com.vaadin.v7.ui.Grid; -@Theme("valo") public class ShowingInlineDataInGrid extends UI { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java index a97cc6af2f..cd7fb0bc11 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java @@ -1,10 +1,10 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.ui.TextField; -public class CustomConverterFactoryUI extends AbstractTestUI { +public class CustomConverterFactoryUI extends AbstractReindeerTestUI { @Override public void setup(VaadinRequest request) { getSession().setConverterFactory(new MyConverterFactory()); diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java index fc3cf0b30a..a24278de3f 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java @@ -11,10 +11,10 @@ import com.vaadin.server.Resource; import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinResponse; import com.vaadin.server.VaadinSession; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Image; -public class DynamicImageUI extends AbstractTestUI { +public class DynamicImageUI extends AbstractReindeerTestUI { public static final String IMAGE_URL = "myimage.png"; private final RequestHandler requestHandler = new RequestHandler() { diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java index 7de1b8515d..6b8cd4b758 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java @@ -1,7 +1,7 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.GridLayout; import com.vaadin.v7.data.fieldgroup.FieldGroup; import com.vaadin.v7.data.fieldgroup.PropertyId; @@ -9,7 +9,7 @@ import com.vaadin.v7.data.util.BeanItem; import com.vaadin.v7.ui.TextArea; import com.vaadin.v7.ui.TextField; -public class FormUsingExistingLayout extends AbstractTestUI { +public class FormUsingExistingLayout extends AbstractReindeerTestUI { public static class Notice { String firstName; diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java index a66075e645..9791323d7b 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java @@ -4,11 +4,11 @@ import java.text.NumberFormat; import java.util.Locale; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.data.util.converter.StringToDoubleConverter; import com.vaadin.v7.ui.Table; -public class FormatTableValue extends AbstractTestUI { +public class FormatTableValue extends AbstractReindeerTestUI { private static final String PERCENT_PROPERTY = "percent"; private static final String CURRENCY_PROPERTY = "currency"; diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java index 2717034a43..6bd9f7aae7 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java @@ -1,7 +1,7 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -11,7 +11,7 @@ import com.vaadin.v7.data.Property; import com.vaadin.v7.data.util.BeanItem; import com.vaadin.v7.ui.TextField; -public class IntegerTextFieldDataSource extends AbstractTestUI { +public class IntegerTextFieldDataSource extends AbstractReindeerTestUI { public class MyBean { private int value; diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java index 2d9ecb274a..88116ab3d5 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java @@ -1,7 +1,7 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -11,7 +11,7 @@ import com.vaadin.v7.data.util.converter.Converter.ConversionException; import com.vaadin.v7.data.util.converter.StringToIntegerConverter; import com.vaadin.v7.ui.TextField; -public class IntegerTextFieldStandalone extends AbstractTestUI { +public class IntegerTextFieldStandalone extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java index 17b6101b15..fec5ee2883 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java @@ -3,7 +3,7 @@ package com.vaadin.tests.minitutorials.v7a1; import java.util.Locale; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -12,7 +12,7 @@ import com.vaadin.v7.data.util.converter.Converter; import com.vaadin.v7.data.util.converter.Converter.ConversionException; import com.vaadin.v7.ui.TextField; -public class StringMyTypeConverter extends AbstractTestUI { +public class StringMyTypeConverter extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/CapsLockWarningUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/CapsLockWarningUI.java index 48f85ff3b3..ceb5d91720 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/CapsLockWarningUI.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/CapsLockWarningUI.java @@ -18,12 +18,12 @@ package com.vaadin.tests.minitutorials.v7a3; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.ui.PasswordField; @Widgetset(TestingWidgetSet.NAME) -public class CapsLockWarningUI extends AbstractTestUI { +public class CapsLockWarningUI extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RefresherTestUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RefresherTestUI.java index ffa63975bc..e343ba1b6d 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RefresherTestUI.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RefresherTestUI.java @@ -18,7 +18,7 @@ package com.vaadin.tests.minitutorials.v7a3; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.minitutorials.v7a3.Refresher.RefreshEvent; import com.vaadin.tests.minitutorials.v7a3.Refresher.RefreshListener; import com.vaadin.tests.widgetset.TestingWidgetSet; @@ -26,7 +26,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @Widgetset(TestingWidgetSet.NAME) -public class RefresherTestUI extends AbstractTestUI { +public class RefresherTestUI extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/AxessingWebPageAndBrowserInfoUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/AxessingWebPageAndBrowserInfoUI.java index 87ef3b529b..1795373511 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/AxessingWebPageAndBrowserInfoUI.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/AxessingWebPageAndBrowserInfoUI.java @@ -22,11 +22,11 @@ import com.vaadin.server.Page.BrowserWindowResizeListener; import com.vaadin.server.Page.UriFragmentChangedEvent; import com.vaadin.server.Page.UriFragmentChangedListener; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Notification; import com.vaadin.ui.UI; -public class AxessingWebPageAndBrowserInfoUI extends AbstractTestUI { +public class AxessingWebPageAndBrowserInfoUI extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/ReducingRoundTrips.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/ReducingRoundTrips.java index 117da5eb61..22ff9a8f5f 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/ReducingRoundTrips.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/ReducingRoundTrips.java @@ -18,12 +18,12 @@ package com.vaadin.tests.minitutorials.v7b1; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.ui.PasswordField; @Widgetset(TestingWidgetSet.NAME) -public class ReducingRoundTrips extends AbstractTestUI { +public class ReducingRoundTrips extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { PasswordField passwordField = new PasswordField("Enter password"); diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/HandlingLogout.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/HandlingLogout.java index 864d4c148f..5dbfe6da48 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/HandlingLogout.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/HandlingLogout.java @@ -18,11 +18,11 @@ package com.vaadin.tests.minitutorials.v7b5; import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinServletService; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -public class HandlingLogout extends AbstractTestUI { +public class HandlingLogout extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorListenerModifiesListeners.java b/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorListenerModifiesListeners.java index 139dbaefb6..767b15b4a2 100644 --- a/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorListenerModifiesListeners.java +++ b/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorListenerModifiesListeners.java @@ -5,14 +5,14 @@ import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener; import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; -public class NavigatorListenerModifiesListeners extends AbstractTestUI { +public class NavigatorListenerModifiesListeners extends AbstractReindeerTestUI { private Navigator navigator; diff --git a/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonAction.java b/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonAction.java index 9f255fb8b3..ba02b73efd 100644 --- a/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonAction.java +++ b/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonAction.java @@ -5,7 +5,7 @@ import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener; import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -13,7 +13,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -public class NavigatorViewBlocksBackButtonAction extends AbstractTestUI { +public class NavigatorViewBlocksBackButtonAction extends AbstractReindeerTestUI { private Navigator navigator; diff --git a/uitest/src/main/java/com/vaadin/tests/overlays/OverlayTouchScrolling.java b/uitest/src/main/java/com/vaadin/tests/overlays/OverlayTouchScrolling.java index d5f7359bb0..462ac6ebba 100644 --- a/uitest/src/main/java/com/vaadin/tests/overlays/OverlayTouchScrolling.java +++ b/uitest/src/main/java/com/vaadin/tests/overlays/OverlayTouchScrolling.java @@ -5,7 +5,7 @@ package com.vaadin.tests.overlays; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; @@ -13,7 +13,7 @@ import com.vaadin.ui.CssLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Notification; -public class OverlayTouchScrolling extends AbstractTestUI { +public class OverlayTouchScrolling extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/performance/ThreadMemoryLeaksTest.java b/uitest/src/main/java/com/vaadin/tests/performance/ThreadMemoryLeaksTest.java index 5ffc7141af..735f88da26 100644 --- a/uitest/src/main/java/com/vaadin/tests/performance/ThreadMemoryLeaksTest.java +++ b/uitest/src/main/java/com/vaadin/tests/performance/ThreadMemoryLeaksTest.java @@ -5,11 +5,11 @@ import java.util.Timer; import java.util.TimerTask; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Label; -public class ThreadMemoryLeaksTest extends AbstractTestUI { +public class ThreadMemoryLeaksTest extends AbstractReindeerTestUI { public static class Worker { long value = 0; diff --git a/uitest/src/main/java/com/vaadin/tests/push/BarInUIDL.java b/uitest/src/main/java/com/vaadin/tests/push/BarInUIDL.java index b2fd91626f..738315cc7f 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/BarInUIDL.java +++ b/uitest/src/main/java/com/vaadin/tests/push/BarInUIDL.java @@ -19,13 +19,13 @@ package com.vaadin.tests.push; import com.vaadin.annotations.Push; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.ui.Transport; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; @Push(transport = Transport.STREAMING) -public class BarInUIDL extends AbstractTestUI { +public class BarInUIDL extends AbstractReindeerTestUI { /* * (non-Javadoc) diff --git a/uitest/src/main/java/com/vaadin/tests/push/BasicPush.java b/uitest/src/main/java/com/vaadin/tests/push/BasicPush.java index 6b0d0d0403..7c11c63a5a 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/BasicPush.java +++ b/uitest/src/main/java/com/vaadin/tests/push/BasicPush.java @@ -21,14 +21,14 @@ import java.util.TimerTask; import com.vaadin.annotations.Push; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; @Push -public class BasicPush extends AbstractTestUI { +public class BasicPush extends AbstractReindeerTestUI { public static final String CLIENT_COUNTER_ID = "clientCounter"; diff --git a/uitest/src/main/java/com/vaadin/tests/push/EnableDisablePush.java b/uitest/src/main/java/com/vaadin/tests/push/EnableDisablePush.java index 98b5e3e2e8..cf7c1eba80 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/EnableDisablePush.java +++ b/uitest/src/main/java/com/vaadin/tests/push/EnableDisablePush.java @@ -7,12 +7,12 @@ import java.util.concurrent.TimeUnit; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.communication.PushMode; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.util.Log; import com.vaadin.ui.Button; import com.vaadin.ui.UIDetachedException; -public class EnableDisablePush extends AbstractTestUI { +public class EnableDisablePush extends AbstractReindeerTestUI { private int c = 0; diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushConfiguration.java b/uitest/src/main/java/com/vaadin/tests/push/PushConfiguration.java index 7916081865..b400d1ef2a 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/PushConfiguration.java +++ b/uitest/src/main/java/com/vaadin/tests/push/PushConfiguration.java @@ -21,12 +21,12 @@ import java.util.TimerTask; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -public class PushConfiguration extends AbstractTestUI { +public class PushConfiguration extends AbstractReindeerTestUI { private int counter = 0; private int counter2 = 0; diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushErrorHandling.java b/uitest/src/main/java/com/vaadin/tests/push/PushErrorHandling.java index f5549e0eb6..155e24b561 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/PushErrorHandling.java +++ b/uitest/src/main/java/com/vaadin/tests/push/PushErrorHandling.java @@ -8,7 +8,7 @@ import com.vaadin.server.ErrorHandler; import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinSession; import com.vaadin.shared.communication.PushMode; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; @@ -18,7 +18,7 @@ import com.vaadin.v7.event.ItemClickEvent; import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.Table; -public class PushErrorHandling extends AbstractTestUI { +public class PushErrorHandling extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushWithPreserveOnRefresh.java b/uitest/src/main/java/com/vaadin/tests/push/PushWithPreserveOnRefresh.java index af19f8849f..f7d36980c0 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/PushWithPreserveOnRefresh.java +++ b/uitest/src/main/java/com/vaadin/tests/push/PushWithPreserveOnRefresh.java @@ -3,7 +3,7 @@ package com.vaadin.tests.push; import com.vaadin.annotations.PreserveOnRefresh; import com.vaadin.annotations.Push; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.util.Log; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -11,7 +11,7 @@ import com.vaadin.ui.Label; @PreserveOnRefresh @Push -public class PushWithPreserveOnRefresh extends AbstractTestUI { +public class PushWithPreserveOnRefresh extends AbstractReindeerTestUI { private Log log = new Log(5); private int times = 0; diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushWithRequireJS.java b/uitest/src/main/java/com/vaadin/tests/push/PushWithRequireJS.java index 346f3e3aa2..10fe4f20e5 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/PushWithRequireJS.java +++ b/uitest/src/main/java/com/vaadin/tests/push/PushWithRequireJS.java @@ -18,12 +18,12 @@ package com.vaadin.tests.push; import com.vaadin.annotations.JavaScript; import com.vaadin.annotations.Push; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; @Push // https://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.20/require.min.js @JavaScript("require.min.js") -public class PushWithRequireJS extends AbstractTestUI { +public class PushWithRequireJS extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { } diff --git a/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java b/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java index e63cfd6d87..72119a18a6 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java +++ b/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java @@ -17,7 +17,7 @@ package com.vaadin.tests.push; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.tests.widgetset.server.RoundTripTester; import com.vaadin.ui.Button; @@ -26,7 +26,7 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.v7.ui.TextField; @Widgetset(TestingWidgetSet.NAME) -public class RoundTripTest extends AbstractTestUI { +public class RoundTripTest extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/push/SendMultibyteCharacters.java b/uitest/src/main/java/com/vaadin/tests/push/SendMultibyteCharacters.java index 4e9372ad40..c88f1c16ef 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/SendMultibyteCharacters.java +++ b/uitest/src/main/java/com/vaadin/tests/push/SendMultibyteCharacters.java @@ -2,11 +2,11 @@ package com.vaadin.tests.push; import com.vaadin.annotations.Push; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.ui.TextArea; @Push -public class SendMultibyteCharacters extends AbstractTestUI { +public class SendMultibyteCharacters extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/push/StreamingReconnectWhilePushing.java b/uitest/src/main/java/com/vaadin/tests/push/StreamingReconnectWhilePushing.java index 097287af8d..6a31565788 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/StreamingReconnectWhilePushing.java +++ b/uitest/src/main/java/com/vaadin/tests/push/StreamingReconnectWhilePushing.java @@ -18,13 +18,13 @@ package com.vaadin.tests.push; import com.vaadin.annotations.Push; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.ui.Transport; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; @Push(transport = Transport.STREAMING) -public class StreamingReconnectWhilePushing extends AbstractTestUI { +public class StreamingReconnectWhilePushing extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/push/TablePushStreaming.java b/uitest/src/main/java/com/vaadin/tests/push/TablePushStreaming.java index a0874d30be..ddfbe61444 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/TablePushStreaming.java +++ b/uitest/src/main/java/com/vaadin/tests/push/TablePushStreaming.java @@ -22,7 +22,7 @@ package com.vaadin.tests.push; import com.vaadin.annotations.Push; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.ui.Transport; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.data.Container; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.util.IndexedContainer; @@ -34,7 +34,7 @@ import com.vaadin.v7.ui.Table; * @author Vaadin Ltd */ @Push(transport = Transport.STREAMING) -public class TablePushStreaming extends AbstractTestUI { +public class TablePushStreaming extends AbstractReindeerTestUI { private int iteration = 1; diff --git a/uitest/src/main/java/com/vaadin/tests/push/TogglePush.java b/uitest/src/main/java/com/vaadin/tests/push/TogglePush.java index ffaa24289f..8c2d0bb561 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/TogglePush.java +++ b/uitest/src/main/java/com/vaadin/tests/push/TogglePush.java @@ -20,13 +20,13 @@ import java.util.TimerTask; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.communication.PushMode; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Label; -public class TogglePush extends AbstractTestUI { +public class TogglePush extends AbstractReindeerTestUI { private final Label counterLabel = new Label(); private int counter = 0; diff --git a/uitest/src/main/java/com/vaadin/tests/requesthandlers/CommunicationError.java b/uitest/src/main/java/com/vaadin/tests/requesthandlers/CommunicationError.java index 8fc54c610a..9af80625cf 100644 --- a/uitest/src/main/java/com/vaadin/tests/requesthandlers/CommunicationError.java +++ b/uitest/src/main/java/com/vaadin/tests/requesthandlers/CommunicationError.java @@ -26,7 +26,7 @@ import com.vaadin.server.UIProvider; import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinService; import com.vaadin.server.VaadinServletRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; @@ -63,7 +63,7 @@ public class CommunicationError extends UIProvider { return CommunicationErrorUI.class; } - public static class CommunicationErrorUI extends AbstractTestUI { + public static class CommunicationErrorUI extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/resources/PublishedFileHandlerCaching.java b/uitest/src/main/java/com/vaadin/tests/resources/PublishedFileHandlerCaching.java index 768b556e8e..28b2b406aa 100644 --- a/uitest/src/main/java/com/vaadin/tests/resources/PublishedFileHandlerCaching.java +++ b/uitest/src/main/java/com/vaadin/tests/resources/PublishedFileHandlerCaching.java @@ -16,7 +16,7 @@ package com.vaadin.tests.resources; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; /** * This class tests the caching behavior of PublishedFileHandler. @@ -36,7 +36,7 @@ import com.vaadin.tests.components.AbstractTestUI; * @since * @author Vaadin Ltd */ -public class PublishedFileHandlerCaching extends AbstractTestUI { +public class PublishedFileHandlerCaching extends AbstractReindeerTestUI { /** * generated serialVersionUID diff --git a/uitest/src/main/java/com/vaadin/tests/serialization/ChangeStateWhenReattaching.java b/uitest/src/main/java/com/vaadin/tests/serialization/ChangeStateWhenReattaching.java index 37b5c2bb89..6d8f95bcb3 100644 --- a/uitest/src/main/java/com/vaadin/tests/serialization/ChangeStateWhenReattaching.java +++ b/uitest/src/main/java/com/vaadin/tests/serialization/ChangeStateWhenReattaching.java @@ -17,11 +17,11 @@ package com.vaadin.tests.serialization; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -public class ChangeStateWhenReattaching extends AbstractTestUI { +public class ChangeStateWhenReattaching extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/serialization/DelegateToWidgetTest.java b/uitest/src/main/java/com/vaadin/tests/serialization/DelegateToWidgetTest.java index 134432070b..309eda2da9 100644 --- a/uitest/src/main/java/com/vaadin/tests/serialization/DelegateToWidgetTest.java +++ b/uitest/src/main/java/com/vaadin/tests/serialization/DelegateToWidgetTest.java @@ -18,12 +18,12 @@ package com.vaadin.tests.serialization; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.tests.widgetset.server.DelegateToWidgetComponent; @Widgetset(TestingWidgetSet.NAME) -public class DelegateToWidgetTest extends AbstractTestUI { +public class DelegateToWidgetTest extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { addComponent(new DelegateToWidgetComponent()); diff --git a/uitest/src/main/java/com/vaadin/tests/serialization/DelegateWithoutStateClassTest.java b/uitest/src/main/java/com/vaadin/tests/serialization/DelegateWithoutStateClassTest.java index 5745765adc..cebbd6aeee 100644 --- a/uitest/src/main/java/com/vaadin/tests/serialization/DelegateWithoutStateClassTest.java +++ b/uitest/src/main/java/com/vaadin/tests/serialization/DelegateWithoutStateClassTest.java @@ -18,12 +18,12 @@ package com.vaadin.tests.serialization; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.tests.widgetset.server.DelegateWithoutStateClassComponent; @Widgetset(TestingWidgetSet.NAME) -public class DelegateWithoutStateClassTest extends AbstractTestUI { +public class DelegateWithoutStateClassTest extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/serialization/GenericWidgetHandling.java b/uitest/src/main/java/com/vaadin/tests/serialization/GenericWidgetHandling.java index 0c76b8cc16..41e2e9a0df 100644 --- a/uitest/src/main/java/com/vaadin/tests/serialization/GenericWidgetHandling.java +++ b/uitest/src/main/java/com/vaadin/tests/serialization/GenericWidgetHandling.java @@ -17,12 +17,12 @@ package com.vaadin.tests.serialization; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.tests.widgetset.server.GenericWidgetComponent; @Widgetset(TestingWidgetSet.NAME) -public class GenericWidgetHandling extends AbstractTestUI { +public class GenericWidgetHandling extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/serialization/NoLayout.java b/uitest/src/main/java/com/vaadin/tests/serialization/NoLayout.java index a8b59517ba..4aefc15665 100644 --- a/uitest/src/main/java/com/vaadin/tests/serialization/NoLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/serialization/NoLayout.java @@ -17,7 +17,7 @@ package com.vaadin.tests.serialization; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.tests.widgetset.server.LayoutDetector; import com.vaadin.ui.Button; @@ -26,7 +26,7 @@ import com.vaadin.ui.CheckBox; import com.vaadin.ui.JavaScript; @Widgetset(TestingWidgetSet.NAME) -public class NoLayout extends AbstractTestUI { +public class NoLayout extends AbstractReindeerTestUI { private final LayoutDetector layoutDetector = new LayoutDetector(); @Override diff --git a/uitest/src/main/java/com/vaadin/tests/serialization/SerializerNamespaceTest.java b/uitest/src/main/java/com/vaadin/tests/serialization/SerializerNamespaceTest.java index 0e615c03d1..9a02a5a3d3 100644 --- a/uitest/src/main/java/com/vaadin/tests/serialization/SerializerNamespaceTest.java +++ b/uitest/src/main/java/com/vaadin/tests/serialization/SerializerNamespaceTest.java @@ -18,13 +18,13 @@ package com.vaadin.tests.serialization; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.tests.widgetset.server.DummyLabel; import com.vaadin.ui.Label; @Widgetset(TestingWidgetSet.NAME) -public class SerializerNamespaceTest extends AbstractTestUI { +public class SerializerNamespaceTest extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java b/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java index 4537cf5212..5408f0a7b6 100644 --- a/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java +++ b/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java @@ -36,7 +36,7 @@ import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.Connector; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.util.Log; import com.vaadin.tests.widgetset.client.ComplexTestBean; import com.vaadin.tests.widgetset.client.SerializerTestRpc; @@ -49,7 +49,7 @@ import elemental.json.JsonString; import elemental.json.JsonValue; @Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet") -public class SerializerTest extends AbstractTestUI { +public class SerializerTest extends AbstractReindeerTestUI { private Log log = new Log(80); diff --git a/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeFavicon.java b/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeFavicon.java index f670b2a601..417081f40e 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeFavicon.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeFavicon.java @@ -18,11 +18,11 @@ package com.vaadin.tests.themes; import java.util.Arrays; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -public class ThemeChangeFavicon extends AbstractTestUI { +public class ThemeChangeFavicon extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/themes/base/DisabledMenuBarItem.java b/uitest/src/main/java/com/vaadin/tests/themes/base/DisabledMenuBarItem.java index 16a822789a..84fc16a7a9 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/base/DisabledMenuBarItem.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/base/DisabledMenuBarItem.java @@ -2,10 +2,10 @@ package com.vaadin.tests.themes.base; import com.vaadin.server.ThemeResource; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.MenuBar; -public class DisabledMenuBarItem extends AbstractTestUI { +public class DisabledMenuBarItem extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { MenuBar menubar = new MenuBar(); diff --git a/uitest/src/main/java/com/vaadin/tests/themes/chameleon/ChameleonNotification.java b/uitest/src/main/java/com/vaadin/tests/themes/chameleon/ChameleonNotification.java index fc26a7b4f4..527553e4ae 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/chameleon/ChameleonNotification.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/chameleon/ChameleonNotification.java @@ -2,13 +2,13 @@ package com.vaadin.tests.themes.chameleon; import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Notification; import com.vaadin.ui.themes.ChameleonTheme; @Theme(ChameleonTheme.THEME_NAME) -public class ChameleonNotification extends AbstractTestUI { +public class ChameleonNotification extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/AlignTopIconInButton.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/AlignTopIconInButton.java index 9e5b43e4fa..8893418707 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/AlignTopIconInButton.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/AlignTopIconInButton.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.themes.valo; -import com.vaadin.annotations.Theme; import com.vaadin.server.ThemeResource; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; @@ -27,7 +26,6 @@ import com.vaadin.ui.themes.ValoTheme; * * @author Vaadin Ltd */ -@Theme("valo") public class AlignTopIconInButton extends AbstractTestUI { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/CollapsibleTableColumn.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/CollapsibleTableColumn.java index c80d2818a9..53c7db89a6 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/CollapsibleTableColumn.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/CollapsibleTableColumn.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.themes.valo; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.v7.data.util.BeanItemContainer; @@ -26,14 +25,12 @@ import com.vaadin.v7.ui.Table; * * @author Vaadin Ltd */ -@Theme("valo") public class CollapsibleTableColumn extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { Table table = new Table(); - BeanItemContainer<Bean> container = new BeanItemContainer<>( - Bean.class); + BeanItemContainer<Bean> container = new BeanItemContainer<>(Bean.class); Bean bean = new Bean(); bean.setName("name"); bean.setId(1); diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ContrastFontColor.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ContrastFontColor.java index e02e2979d8..fe15113e20 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ContrastFontColor.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ContrastFontColor.java @@ -17,7 +17,7 @@ package com.vaadin.tests.themes.valo; import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.TextField; /** @@ -26,7 +26,7 @@ import com.vaadin.ui.TextField; * @author Vaadin Ltd */ @Theme("tests-valo-contrast") -public class ContrastFontColor extends AbstractTestUI { +public class ContrastFontColor extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/DisabledLabel.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/DisabledLabel.java index 32ea46d518..d87234ac09 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/DisabledLabel.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/DisabledLabel.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.themes.valo; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Label; @@ -25,7 +24,6 @@ import com.vaadin.ui.Label; * * @author Vaadin Ltd */ -@Theme("valo") public class DisabledLabel extends AbstractTestUI { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/FormLayoutInsideTable.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/FormLayoutInsideTable.java index 7812e78ba7..982b073c24 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/FormLayoutInsideTable.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/FormLayoutInsideTable.java @@ -1,14 +1,11 @@ package com.vaadin.tests.themes.valo; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.FormLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.themes.ValoTheme; import com.vaadin.v7.ui.Table; -@Theme(ValoTheme.THEME_NAME) public class FormLayoutInsideTable extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/GridDisabled.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/GridDisabled.java index c50c75c314..f65ff23efb 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/GridDisabled.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/GridDisabled.java @@ -1,12 +1,10 @@ package com.vaadin.tests.themes.valo; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.v7.ui.Grid; -@Theme("valo") public class GridDisabled extends AbstractTestUI { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ImmediateUpload.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ImmediateUpload.java index 40f32cce91..7c6df0e990 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ImmediateUpload.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ImmediateUpload.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.themes.valo; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Upload; @@ -25,7 +24,6 @@ import com.vaadin.ui.Upload; * @since * @author Vaadin Ltd */ -@Theme("valo") public class ImmediateUpload extends AbstractTestUI { /* diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/NonDraggableWindow.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/NonDraggableWindow.java index 9783db4413..b82daca36c 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/NonDraggableWindow.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/NonDraggableWindow.java @@ -1,13 +1,10 @@ package com.vaadin.tests.themes.valo; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Label; import com.vaadin.ui.Window; -import com.vaadin.ui.themes.ValoTheme; -@Theme(ValoTheme.THEME_NAME) public class NonDraggableWindow extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/NotificationStyle.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/NotificationStyle.java index fb92532ea8..de9da7330f 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/NotificationStyle.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/NotificationStyle.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.themes.valo; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; @@ -27,7 +26,6 @@ import com.vaadin.ui.Notification; * * @author Vaadin Ltd */ -@Theme("valo") public class NotificationStyle extends AbstractTestUI { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ResponsiveStyles.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ResponsiveStyles.java index e2a52cb622..9e65b6a6bb 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ResponsiveStyles.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ResponsiveStyles.java @@ -15,11 +15,9 @@ */ package com.vaadin.tests.themes.valo; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.ui.UI; -@Theme("valo") public class ResponsiveStyles extends UI { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/TableSortIndicator.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/TableSortIndicator.java index 95d7541d08..541560115d 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/TableSortIndicator.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/TableSortIndicator.java @@ -1,11 +1,9 @@ package com.vaadin.tests.themes.valo; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.v7.ui.Table; -@Theme("valo") public class TableSortIndicator extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/TableWithEmptyCaption.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/TableWithEmptyCaption.java index 62d9987b6c..64917c92dc 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/TableWithEmptyCaption.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/TableWithEmptyCaption.java @@ -15,14 +15,12 @@ */ package com.vaadin.tests.themes.valo; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Component; import com.vaadin.v7.ui.Table; -@Theme("valo") public class TableWithEmptyCaption extends AbstractTestUI { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidth.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidth.java index c65495a322..9dd98fbad9 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidth.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidth.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.themes.valo; -import com.vaadin.annotations.Theme; import com.vaadin.tests.components.colorpicker.DefaultCaptionWidth; /** @@ -23,7 +22,6 @@ import com.vaadin.tests.components.colorpicker.DefaultCaptionWidth; * * @author Vaadin Ltd */ -@Theme("valo") public class ValoDefaultCaptionWidth extends DefaultCaptionWidth { } diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/WindowTitleOverflow.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/WindowTitleOverflow.java index 804095419e..0f6940ee97 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/WindowTitleOverflow.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/WindowTitleOverflow.java @@ -1,13 +1,10 @@ package com.vaadin.tests.themes.valo; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Window; -import com.vaadin.ui.themes.ValoTheme; -@Theme(ValoTheme.THEME_NAME) public class WindowTitleOverflow extends AbstractTestUI { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/AdjacentElementsWithTooltips.java b/uitest/src/main/java/com/vaadin/tests/tooltip/AdjacentElementsWithTooltips.java index 6b78ef9087..b55c08b206 100644 --- a/uitest/src/main/java/com/vaadin/tests/tooltip/AdjacentElementsWithTooltips.java +++ b/uitest/src/main/java/com/vaadin/tests/tooltip/AdjacentElementsWithTooltips.java @@ -16,7 +16,7 @@ package com.vaadin.tests.tooltip; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Component; import com.vaadin.ui.HorizontalLayout; @@ -28,7 +28,7 @@ import com.vaadin.ui.TooltipConfiguration; * * @author Vaadin Ltd */ -public class AdjacentElementsWithTooltips extends AbstractTestUI { +public class AdjacentElementsWithTooltips extends AbstractReindeerTestUI { private int buttonCount = 0; diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/ButtonTooltips.java b/uitest/src/main/java/com/vaadin/tests/tooltip/ButtonTooltips.java index c341aa689b..2929019d14 100644 --- a/uitest/src/main/java/com/vaadin/tests/tooltip/ButtonTooltips.java +++ b/uitest/src/main/java/com/vaadin/tests/tooltip/ButtonTooltips.java @@ -1,12 +1,12 @@ package com.vaadin.tests.tooltip; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.VerticalLayout; -public class ButtonTooltips extends AbstractTestUI { +public class ButtonTooltips extends AbstractReindeerTestUI { public static final String shortDescription = "Another"; public static final String longDescription = "long descidescidescpription"; diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/DragAndDropWrapperTooltips.java b/uitest/src/main/java/com/vaadin/tests/tooltip/DragAndDropWrapperTooltips.java index 956d05518b..5bd44addab 100644 --- a/uitest/src/main/java/com/vaadin/tests/tooltip/DragAndDropWrapperTooltips.java +++ b/uitest/src/main/java/com/vaadin/tests/tooltip/DragAndDropWrapperTooltips.java @@ -11,7 +11,7 @@ import com.vaadin.event.dd.TargetDetails; import com.vaadin.event.dd.acceptcriteria.AcceptAll; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.util.TestUtils; import com.vaadin.ui.Component; import com.vaadin.ui.CssLayout; @@ -19,7 +19,7 @@ import com.vaadin.ui.DragAndDropWrapper; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; -public class DragAndDropWrapperTooltips extends AbstractTestUI { +public class DragAndDropWrapperTooltips extends AbstractReindeerTestUI { private final String BASE = ".v-widget.greenblock {vertical-align: middle; float:left; width:60px;height:60px;background: green !important; padding:0; margin:2px;-webkit-transition: width 0.3s ease-in-out;color: white;}"; private final String B2 = ".v-widget.b2 {background-color: red !important;}"; diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/MenuBarTooltip.java b/uitest/src/main/java/com/vaadin/tests/tooltip/MenuBarTooltip.java index 356d431efe..37fa8f95fb 100644 --- a/uitest/src/main/java/com/vaadin/tests/tooltip/MenuBarTooltip.java +++ b/uitest/src/main/java/com/vaadin/tests/tooltip/MenuBarTooltip.java @@ -1,10 +1,10 @@ package com.vaadin.tests.tooltip; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.MenuBar; -public class MenuBarTooltip extends AbstractTestUI { +public class MenuBarTooltip extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/SliderTooltip.java b/uitest/src/main/java/com/vaadin/tests/tooltip/SliderTooltip.java index 3930bde757..31a53d8f53 100644 --- a/uitest/src/main/java/com/vaadin/tests/tooltip/SliderTooltip.java +++ b/uitest/src/main/java/com/vaadin/tests/tooltip/SliderTooltip.java @@ -1,10 +1,10 @@ package com.vaadin.tests.tooltip; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Slider; -public class SliderTooltip extends AbstractTestUI { +public class SliderTooltip extends AbstractReindeerTestUI { /* * (non-Javadoc) diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/StationaryTooltip.java b/uitest/src/main/java/com/vaadin/tests/tooltip/StationaryTooltip.java index 5c7b52d96f..c1f864b24e 100644 --- a/uitest/src/main/java/com/vaadin/tests/tooltip/StationaryTooltip.java +++ b/uitest/src/main/java/com/vaadin/tests/tooltip/StationaryTooltip.java @@ -1,11 +1,11 @@ package com.vaadin.tests.tooltip; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.VerticalLayout; -public class StationaryTooltip extends AbstractTestUI { +public class StationaryTooltip extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipAndJavascript.java b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipAndJavascript.java index 83475c5ff2..f3bb717768 100644 --- a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipAndJavascript.java +++ b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipAndJavascript.java @@ -17,10 +17,10 @@ package com.vaadin.tests.tooltip; import com.vaadin.annotations.JavaScript; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; -public class TooltipAndJavascript extends AbstractTestUI { +public class TooltipAndJavascript extends AbstractReindeerTestUI { @JavaScript("tooltipandjavascript.js") public static class MyButton extends Button { diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java index 3fab24da91..cd93b93d41 100644 --- a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java +++ b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java @@ -1,14 +1,14 @@ package com.vaadin.tests.tooltip; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUIWithLog; +import com.vaadin.tests.components.AbstractReindeerTestUIWithLog; import com.vaadin.tests.util.LoremIpsum; import com.vaadin.ui.NativeButton; import com.vaadin.v7.data.Property; import com.vaadin.v7.data.Property.ValueChangeEvent; import com.vaadin.v7.ui.TextField; -public class TooltipConfiguration extends AbstractTestUIWithLog { +public class TooltipConfiguration extends AbstractReindeerTestUIWithLog { private TextField closeTimeout; private TextField quickOpenTimeout; diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipInWindow.java b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipInWindow.java index 0e0d167434..0491ba14c0 100644 --- a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipInWindow.java +++ b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipInWindow.java @@ -17,12 +17,12 @@ package com.vaadin.tests.tooltip; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; import com.vaadin.v7.ui.TextField; -public class TooltipInWindow extends AbstractTestUI { +public class TooltipInWindow extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipWidthUpdating.java b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipWidthUpdating.java index c2ab5eb06a..4541589fad 100644 --- a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipWidthUpdating.java +++ b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipWidthUpdating.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tooltip; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.util.LoremIpsum; import com.vaadin.ui.NativeButton; import com.vaadin.ui.VerticalLayout; @@ -13,7 +13,7 @@ import com.vaadin.v7.ui.TextField; * * @author Vaadin Ltd */ -public class TooltipWidthUpdating extends AbstractTestUI { +public class TooltipWidthUpdating extends AbstractReindeerTestUI { private static final long serialVersionUID = 1L; protected static final String SHORT_TOOLTIP_TEXT = "This is a short tooltip"; diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltip.java b/uitest/src/main/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltip.java index 8963f5f72f..7b164ec122 100644 --- a/uitest/src/main/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltip.java +++ b/uitest/src/main/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltip.java @@ -16,7 +16,7 @@ package com.vaadin.tests.tooltip; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.data.validator.IntegerRangeValidator; import com.vaadin.v7.ui.TextField; @@ -24,7 +24,7 @@ import com.vaadin.v7.ui.TextField; * * UI test class for Tooltip with integer range validator. */ -public class ValidatorCaptionTooltip extends AbstractTestUI { +public class ValidatorCaptionTooltip extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/urifragments/SettingNullFragment.java b/uitest/src/main/java/com/vaadin/tests/urifragments/SettingNullFragment.java index 4c3921e1a4..3b58e59fdc 100644 --- a/uitest/src/main/java/com/vaadin/tests/urifragments/SettingNullFragment.java +++ b/uitest/src/main/java/com/vaadin/tests/urifragments/SettingNullFragment.java @@ -2,12 +2,12 @@ package com.vaadin.tests.urifragments; import com.vaadin.server.Page; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @SuppressWarnings("serial") -public class SettingNullFragment extends AbstractTestUI { +public class SettingNullFragment extends AbstractReindeerTestUI { protected static final String BUTTON_FRAG_1_ID = "buttonFrag1"; protected static final String BUTTON_NULL_FRAGMENT_ID = "buttonNullFragment"; diff --git a/uitest/src/main/java/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java b/uitest/src/main/java/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java index 61176d7c50..461d70a7e0 100644 --- a/uitest/src/main/java/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java +++ b/uitest/src/main/java/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java @@ -24,12 +24,12 @@ import com.vaadin.server.BootstrapListener; import com.vaadin.server.BootstrapPageResponse; import com.vaadin.server.BootstrapResponse; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI; -public class BootstrapModifyUI extends AbstractTestUI { +public class BootstrapModifyUI extends AbstractReindeerTestUI { private static final String INSTALLED_ATRIBUTE_NAME = BootstrapModifyUI.class .getName() + ".installed"; diff --git a/uitest/src/main/java/com/vaadin/tests/validation/FieldErrorIndication.java b/uitest/src/main/java/com/vaadin/tests/validation/FieldErrorIndication.java index 10479a1779..31718c6432 100644 --- a/uitest/src/main/java/com/vaadin/tests/validation/FieldErrorIndication.java +++ b/uitest/src/main/java/com/vaadin/tests/validation/FieldErrorIndication.java @@ -19,7 +19,7 @@ import java.util.Set; import com.vaadin.server.UserError; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Component; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.VerticalLayout; @@ -36,7 +36,7 @@ import com.vaadin.v7.ui.TextArea; import com.vaadin.v7.ui.TextField; import com.vaadin.v7.ui.TwinColSelect; -public class FieldErrorIndication extends AbstractTestUI { +public class FieldErrorIndication extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java b/uitest/src/main/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java index c865d911d4..0fa98d3d86 100644 --- a/uitest/src/main/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java +++ b/uitest/src/main/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java @@ -1,7 +1,7 @@ package com.vaadin.tests.validation; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.CheckBox; import com.vaadin.v7.data.Property.ValueChangeEvent; import com.vaadin.v7.data.Property.ValueChangeListener; @@ -11,7 +11,7 @@ import com.vaadin.v7.data.validator.StringLengthValidator; import com.vaadin.v7.ui.TextField; @SuppressWarnings("deprecation") -public class ValidationOfRequiredEmptyFields extends AbstractTestUI { +public class ValidationOfRequiredEmptyFields extends AbstractReindeerTestUI { private TextField tf; private CheckBox requiredInput; diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/AssertionsEnabled.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/AssertionsEnabled.java index a844a68e23..55d6858e99 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/AssertionsEnabled.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/AssertionsEnabled.java @@ -2,12 +2,12 @@ package com.vaadin.tests.widgetset.server; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.tests.widgetset.client.AssertionFailureWidget; @Widgetset(TestingWidgetSet.NAME) -public class AssertionsEnabled extends AbstractTestUI { +public class AssertionsEnabled extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/ClientRpcClass.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ClientRpcClass.java index 0e65af82a6..ec24da31a5 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/ClientRpcClass.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ClientRpcClass.java @@ -17,11 +17,11 @@ package com.vaadin.tests.widgetset.server; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; @Widgetset(TestingWidgetSet.NAME) -public class ClientRpcClass extends AbstractTestUI { +public class ClientRpcClass extends AbstractReindeerTestUI { public static String TEST_COMPONENT_ID = "testComponent"; diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/OverriddenDecendants.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/OverriddenDecendants.java index 5fdbdd4105..dba5e0da4d 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/OverriddenDecendants.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/OverriddenDecendants.java @@ -17,7 +17,7 @@ package com.vaadin.tests.widgetset.server; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.ui.TextArea; @@ -28,7 +28,7 @@ import com.vaadin.ui.TextArea; * @author Vaadin Ltd */ @Widgetset(TestingWidgetSet.NAME) -public class OverriddenDecendants extends AbstractTestUI { +public class OverriddenDecendants extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/ReplaceComponentUI.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ReplaceComponentUI.java index 8b501fa48f..adb86f8739 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/ReplaceComponentUI.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ReplaceComponentUI.java @@ -18,11 +18,11 @@ package com.vaadin.tests.widgetset.server; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; @Widgetset(TestingWidgetSet.NAME) -public class ReplaceComponentUI extends AbstractTestUI { +public class ReplaceComponentUI extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/WidgetUtilUI.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/WidgetUtilUI.java index ca629325c2..eb67f90a99 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/WidgetUtilUI.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/WidgetUtilUI.java @@ -17,13 +17,13 @@ package com.vaadin.tests.widgetset.server; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.tests.widgetset.client.WidgetUtilTestComponentState; import com.vaadin.ui.AbstractComponent; @Widgetset(TestingWidgetSet.NAME) -public class WidgetUtilUI extends AbstractTestUI { +public class WidgetUtilUI extends AbstractReindeerTestUI { public static class WidgetUtilTestComponent extends AbstractComponent { diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUI.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUI.java index 43ee8c9834..730a102c51 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUI.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUI.java @@ -17,7 +17,7 @@ package com.vaadin.tests.widgetset.server.csrf.ui; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.tests.widgetset.server.csrf.CsrfButton; import com.vaadin.ui.Button; @@ -31,7 +31,7 @@ import com.vaadin.ui.Label; */ @SuppressWarnings("serial") @Widgetset(TestingWidgetSet.NAME) -public abstract class AbstractCsrfTokenUI extends AbstractTestUI { +public abstract class AbstractCsrfTokenUI extends AbstractReindeerTestUI { public static final String PRESS_ID = "PressMe"; diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpc.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpc.java index e9013247c1..f2a109c1cd 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpc.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpc.java @@ -17,7 +17,7 @@ package com.vaadin.tests.widgetset.server.gwtrpc; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; /** @@ -27,7 +27,7 @@ import com.vaadin.tests.widgetset.TestingWidgetSet; */ @SuppressWarnings("serial") @Widgetset(TestingWidgetSet.NAME) -public class GwtRpc extends AbstractTestUI { +public class GwtRpc extends AbstractReindeerTestUI { /** * Id of the button triggering the test case. diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/datefield/DateFieldDiscardValue.java b/uitest/src/main/java/com/vaadin/v7/tests/components/datefield/DateFieldDiscardValue.java index 2119b9f21e..2f2f936d34 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/datefield/DateFieldDiscardValue.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/datefield/DateFieldDiscardValue.java @@ -5,7 +5,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -24,7 +24,7 @@ import com.vaadin.v7.ui.DateField; * @author Vaadin Ltd * */ -public class DateFieldDiscardValue extends AbstractTestUI { +public class DateFieldDiscardValue extends AbstractReindeerTestUI { public static final String PROP_NONULL = "A field with a valid date in the data source property"; public static final String PROP_NULL_VALUE = "A field with a null value in the data source property"; diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/form/FormTooltips.java b/uitest/src/main/java/com/vaadin/v7/tests/components/form/FormTooltips.java index 75688dfdb9..78d26dd7ac 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/form/FormTooltips.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/form/FormTooltips.java @@ -19,14 +19,14 @@ import java.util.Arrays; import com.vaadin.server.UserError; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.data.bean.Person; import com.vaadin.tests.data.bean.Sex; import com.vaadin.v7.data.util.BeanItem; import com.vaadin.v7.ui.Form; import com.vaadin.v7.ui.TextField; -public class FormTooltips extends AbstractTestUI { +public class FormTooltips extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/CustomRenderer.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/CustomRenderer.java index a8e8716ba2..5c7d1deb1b 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/CustomRenderer.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/CustomRenderer.java @@ -17,7 +17,7 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.tests.widgetset.client.SimpleTestBean; import com.vaadin.ui.Label; @@ -28,7 +28,7 @@ import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.SelectionMode; @Widgetset(TestingWidgetSet.NAME) -public class CustomRenderer extends AbstractTestUI { +public class CustomRenderer extends AbstractReindeerTestUI { private static final Object INT_ARRAY_PROPERTY = "int array"; private static final Object VOID_PROPERTY = "void"; diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridAddAndRemoveDataOnInit.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridAddAndRemoveDataOnInit.java index afda4e01dc..d759bb27ad 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridAddAndRemoveDataOnInit.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridAddAndRemoveDataOnInit.java @@ -16,12 +16,12 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.data.Container.Indexed; import com.vaadin.v7.data.util.IndexedContainer; import com.vaadin.v7.ui.Grid; -public class GridAddAndRemoveDataOnInit extends AbstractTestUI { +public class GridAddAndRemoveDataOnInit extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridAddRow.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridAddRow.java index c6306a3281..3ee500d78a 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridAddRow.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridAddRow.java @@ -16,13 +16,13 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.SelectionMode; -public class GridAddRow extends AbstractTestUI { +public class GridAddRow extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridApplyFilterWhenScrolledDown.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridApplyFilterWhenScrolledDown.java index 08a621c937..f2255389c2 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridApplyFilterWhenScrolledDown.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridApplyFilterWhenScrolledDown.java @@ -1,6 +1,5 @@ package com.vaadin.v7.tests.components.grid; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.ui.UI; import com.vaadin.ui.themes.ValoTheme; @@ -13,7 +12,6 @@ import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.HeaderRow; import com.vaadin.v7.ui.TextField; -@Theme("valo") public class GridApplyFilterWhenScrolledDown extends UI { private Grid grid = new Grid(); diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridCellFocusOnResetSize.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridCellFocusOnResetSize.java index c28ba2f607..40d3ff3df1 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridCellFocusOnResetSize.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridCellFocusOnResetSize.java @@ -17,13 +17,13 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.tests.widgetset.client.v7.grid.GridCellFocusOnResetSizeWidget; import com.vaadin.tests.widgetset.server.TestWidgetComponent; @Widgetset(TestingWidgetSet.NAME) -public class GridCellFocusOnResetSize extends AbstractTestUI { +public class GridCellFocusOnResetSize extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridCheckBoxDisplay.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridCheckBoxDisplay.java index 3cd4ab4601..ef9ef3adc9 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridCheckBoxDisplay.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridCheckBoxDisplay.java @@ -18,11 +18,11 @@ package com.vaadin.v7.tests.components.grid; import java.io.Serializable; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.data.util.BeanItemContainer; import com.vaadin.v7.ui.Grid; -public class GridCheckBoxDisplay extends AbstractTestUI { +public class GridCheckBoxDisplay extends AbstractReindeerTestUI { private static final long serialVersionUID = -5575892909354637168L; private BeanItemContainer<Todo> todoContainer = new BeanItemContainer<>( diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridClientDataChangeHandler.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridClientDataChangeHandler.java index e803c857e7..b8f272f6bf 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridClientDataChangeHandler.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridClientDataChangeHandler.java @@ -17,13 +17,13 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.tests.widgetset.client.v7.grid.GridDataChangeHandlerWidget; import com.vaadin.tests.widgetset.server.TestWidgetComponent; @Widgetset(TestingWidgetSet.NAME) -public class GridClientDataChangeHandler extends AbstractTestUI { +public class GridClientDataChangeHandler extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColspans.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColspans.java index 3c0f3f81c1..dc0b84a6da 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColspans.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColspans.java @@ -16,7 +16,7 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.v7.data.Container.Indexed; @@ -28,7 +28,7 @@ import com.vaadin.v7.ui.Grid.HeaderRow; import com.vaadin.v7.ui.Grid.SelectionMode; import com.vaadin.v7.ui.renderers.NumberRenderer; -public class GridColspans extends AbstractTestUI { +public class GridColspans extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnAutoExpand.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnAutoExpand.java index b4eb2dd727..269f16eb1c 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnAutoExpand.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnAutoExpand.java @@ -16,12 +16,12 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.Column; -public class GridColumnAutoExpand extends AbstractTestUI { +public class GridColumnAutoExpand extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidth.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidth.java index 653974078a..c03aa05b47 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidth.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidth.java @@ -16,7 +16,7 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.data.Container; import com.vaadin.v7.data.util.IndexedContainer; import com.vaadin.v7.ui.Grid; @@ -24,7 +24,7 @@ import com.vaadin.v7.ui.Grid.Column; import com.vaadin.v7.ui.Grid.SelectionMode; import com.vaadin.v7.ui.renderers.HtmlRenderer; -public class GridColumnAutoWidth extends AbstractTestUI { +public class GridColumnAutoWidth extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { Grid grid = new Grid(createContainer()); diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidthClient.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidthClient.java index 28327b7b45..9991efc08f 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidthClient.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidthClient.java @@ -17,13 +17,13 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.tests.widgetset.client.v7.grid.GridColumnAutoWidthClientWidget; import com.vaadin.tests.widgetset.server.TestWidgetComponent; @Widgetset(TestingWidgetSet.NAME) -public class GridColumnAutoWidthClient extends AbstractTestUI { +public class GridColumnAutoWidthClient extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnExpand.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnExpand.java index 81bc6ed0da..bc266d8435 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnExpand.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnExpand.java @@ -17,7 +17,7 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.util.PersonContainer; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -30,7 +30,7 @@ import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.Column; @Theme(Reindeer.THEME_NAME) -public class GridColumnExpand extends AbstractTestUI { +public class GridColumnExpand extends AbstractReindeerTestUI { private Grid grid; private Label firstInfo = new Label(); private Label secondInfo = new Label(); diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnWidthRecalculation.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnWidthRecalculation.java index e50effb6a4..8045075b7c 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnWidthRecalculation.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnWidthRecalculation.java @@ -17,7 +17,6 @@ package com.vaadin.v7.tests.components.grid; import java.util.ArrayList; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; @@ -27,7 +26,6 @@ import com.vaadin.v7.data.Item; import com.vaadin.v7.data.Property; import com.vaadin.v7.ui.Grid; -@Theme("valo") public class GridColumnWidthRecalculation extends AbstractTestUI { @Override @@ -68,8 +66,7 @@ public class GridColumnWidthRecalculation extends AbstractTestUI { Indexed dataSource = grid.getContainerDataSource(); Object itemId = dataSource.getItemIds().iterator().next(); Item item = dataSource.getItem(itemId); - ArrayList<Object> pIds = new ArrayList<>( - item.getItemPropertyIds()); + ArrayList<Object> pIds = new ArrayList<>(item.getItemPropertyIds()); for (int i = 0; i < pIds.size() / 2; i++) { int j = pIds.size() - 1 - i; Object pid1 = pIds.get(i); diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnWidthsWithoutData.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnWidthsWithoutData.java index c282ee046a..011a1ec306 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnWidthsWithoutData.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnWidthsWithoutData.java @@ -18,7 +18,7 @@ package com.vaadin.v7.tests.components.grid; import java.util.EnumSet; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.VerticalLayout; @@ -28,7 +28,7 @@ import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.SelectionMode; import com.vaadin.v7.ui.NativeSelect; -public class GridColumnWidthsWithoutData extends AbstractTestUI { +public class GridColumnWidthsWithoutData extends AbstractReindeerTestUI { private SelectionMode selectionMode = SelectionMode.NONE; private Grid grid = createGrid(true); diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridCustomSelectionModel.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridCustomSelectionModel.java index 751e381752..89029a36fe 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridCustomSelectionModel.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridCustomSelectionModel.java @@ -17,12 +17,12 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.v7.ui.Grid.MultiSelectionModel; @Widgetset(TestingWidgetSet.NAME) -public class GridCustomSelectionModel extends AbstractTestUI { +public class GridCustomSelectionModel extends AbstractReindeerTestUI { public static class MySelectionModel extends MultiSelectionModel { } diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDataSourceReset.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDataSourceReset.java index 7df5fbd5d1..1c3d530b67 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDataSourceReset.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDataSourceReset.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Random; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.fieldgroup.ComplexPerson; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -28,7 +28,7 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.v7.data.util.BeanItemContainer; import com.vaadin.v7.ui.Grid; -public class GridDataSourceReset extends AbstractTestUI { +public class GridDataSourceReset extends AbstractReindeerTestUI { BeanItemContainer<ComplexPerson> container; List<ComplexPerson> persons; diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDefaultSelectionMode.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDefaultSelectionMode.java index fc7dd7e791..43ddb184d8 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDefaultSelectionMode.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDefaultSelectionMode.java @@ -18,7 +18,7 @@ package com.vaadin.v7.tests.components.grid; import java.util.ArrayList; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -26,7 +26,7 @@ import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.data.util.BeanItemContainer; import com.vaadin.v7.ui.Grid; -public class GridDefaultSelectionMode extends AbstractTestUI { +public class GridDefaultSelectionMode extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDetailsDetach.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDetailsDetach.java index 5568f6b97c..d77f493de0 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDetailsDetach.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDetailsDetach.java @@ -16,7 +16,7 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; @@ -30,7 +30,7 @@ import com.vaadin.v7.ui.Grid.DetailsGenerator; import com.vaadin.v7.ui.Grid.RowReference; import com.vaadin.v7.ui.Grid.SelectionMode; -public class GridDetailsDetach extends AbstractTestUI { +public class GridDetailsDetach extends AbstractReindeerTestUI { private Grid currentGrid; diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDetailsLayoutExpand.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDetailsLayoutExpand.java index 87b6dfaabe..21dba5b4b2 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDetailsLayoutExpand.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDetailsLayoutExpand.java @@ -16,7 +16,7 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Component; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; @@ -33,7 +33,7 @@ import com.vaadin.v7.ui.Grid.RowReference; * @author Vaadin Ltd */ @SuppressWarnings("serial") -public class GridDetailsLayoutExpand extends AbstractTestUI { +public class GridDetailsLayoutExpand extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDetailsLocation.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDetailsLocation.java index 5c00f0190c..03f96ed20b 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDetailsLocation.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDetailsLocation.java @@ -15,7 +15,6 @@ */ package com.vaadin.v7.tests.components.grid; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.util.Person; import com.vaadin.tests.util.PersonContainer; @@ -28,13 +27,11 @@ import com.vaadin.ui.Layout; import com.vaadin.ui.TextField; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.themes.ValoTheme; import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.DetailsGenerator; import com.vaadin.v7.ui.Grid.RowReference; import com.vaadin.v7.ui.Grid.SelectionMode; -@Theme(ValoTheme.THEME_NAME) public class GridDetailsLocation extends UI { private final DetailsGenerator detailsGenerator = new DetailsGenerator() { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDetailsWidth.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDetailsWidth.java index ee345773cc..8194cee0b6 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDetailsWidth.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDetailsWidth.java @@ -16,7 +16,7 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Component; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.VerticalLayout; @@ -28,7 +28,7 @@ import com.vaadin.v7.ui.Grid.DetailsGenerator; import com.vaadin.v7.ui.Grid.RowReference; import com.vaadin.v7.ui.TextArea; -public class GridDetailsWidth extends AbstractTestUI { +public class GridDetailsWidth extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDisabledMultiselect.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDisabledMultiselect.java index 7a491237e8..c58de99db7 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDisabledMultiselect.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDisabledMultiselect.java @@ -1,11 +1,11 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.v7.ui.Grid; -public class GridDisabledMultiselect extends AbstractTestUI { +public class GridDisabledMultiselect extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDragAndDrop.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDragAndDrop.java index 8260335d3f..5a29717239 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDragAndDrop.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDragAndDrop.java @@ -19,11 +19,11 @@ import java.util.Arrays; import java.util.List; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.ui.Grid; @SuppressWarnings("serial") -public class GridDragAndDrop extends AbstractTestUI { +public class GridDragAndDrop extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDragSelectionWhileScrolled.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDragSelectionWhileScrolled.java index e591eeb769..33da0feb9d 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDragSelectionWhileScrolled.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridDragSelectionWhileScrolled.java @@ -16,13 +16,13 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Layout; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.Grid.SelectionMode; -public class GridDragSelectionWhileScrolled extends AbstractTestUI { +public class GridDragSelectionWhileScrolled extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridEditingWithNoScrollBars.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridEditingWithNoScrollBars.java index 31328482a7..78523f362c 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridEditingWithNoScrollBars.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridEditingWithNoScrollBars.java @@ -16,13 +16,13 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.ui.ComboBox; import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.Column; import com.vaadin.v7.ui.Grid.SelectionMode; -public class GridEditingWithNoScrollBars extends AbstractTestUI { +public class GridEditingWithNoScrollBars extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridEditorCustomField.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridEditorCustomField.java index d356242a8b..22efd2b6c6 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridEditorCustomField.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridEditorCustomField.java @@ -18,7 +18,6 @@ package com.vaadin.v7.tests.components.grid; import java.util.HashSet; import java.util.Set; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUIWithLog; import com.vaadin.tests.fieldgroup.ComplexPerson; @@ -29,7 +28,6 @@ import com.vaadin.v7.ui.ComboBox; import com.vaadin.v7.ui.CustomField; import com.vaadin.v7.ui.Grid; -@Theme("valo") public class GridEditorCustomField extends AbstractTestUIWithLog { @Override diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridEditorMultiselect.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridEditorMultiselect.java index 5dad03339f..086aa8dd9f 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridEditorMultiselect.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridEditorMultiselect.java @@ -1,10 +1,10 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.ui.Grid; -public class GridEditorMultiselect extends AbstractTestUI { +public class GridEditorMultiselect extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridEditorUI.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridEditorUI.java index 58f00a10b2..614e5c3144 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridEditorUI.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridEditorUI.java @@ -16,13 +16,13 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.util.PersonContainer; import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.PasswordField; import com.vaadin.v7.ui.TextField; -public class GridEditorUI extends AbstractTestUI { +public class GridEditorUI extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridFastAsyncUpdate.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridFastAsyncUpdate.java index 4b5cb8fd48..155c3aafeb 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridFastAsyncUpdate.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridFastAsyncUpdate.java @@ -7,7 +7,6 @@ import java.util.concurrent.Executors; import java.util.logging.Level; import com.vaadin.annotations.Push; -import com.vaadin.annotations.Theme; import com.vaadin.event.SelectionEvent; import com.vaadin.event.SelectionEvent.SelectionListener; import com.vaadin.server.VaadinRequest; @@ -22,7 +21,6 @@ import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.SelectionMode; @Push -@Theme("valo") @SuppressWarnings("serial") public class GridFastAsyncUpdate extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridGeneratedProperties.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridGeneratedProperties.java index c5dfcc67ab..9b101b2e81 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridGeneratedProperties.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridGeneratedProperties.java @@ -19,7 +19,7 @@ import com.vaadin.data.sort.Sort; import com.vaadin.data.sort.SortOrder; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.data.sort.SortDirection; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -34,7 +34,7 @@ import com.vaadin.v7.data.util.filter.Compare; import com.vaadin.v7.data.util.filter.UnsupportedFilterException; import com.vaadin.v7.ui.Grid; -public class GridGeneratedProperties extends AbstractTestUI { +public class GridGeneratedProperties extends AbstractReindeerTestUI { private GeneratedPropertyContainer container; static double MILES_CONVERSION = 0.6214d; diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridHeaderFooterComponents.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridHeaderFooterComponents.java index cae129a906..2bc596c3aa 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridHeaderFooterComponents.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridHeaderFooterComponents.java @@ -15,7 +15,6 @@ */ package com.vaadin.v7.tests.components.grid; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUIWithLog; import com.vaadin.ui.Button; @@ -28,7 +27,6 @@ import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.FooterRow; import com.vaadin.v7.ui.Grid.HeaderRow; -@Theme("valo") public class GridHeaderFooterComponents extends AbstractTestUIWithLog { @Override diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridHeaderFormatChange.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridHeaderFormatChange.java index b67164c1c4..8e6d326e24 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridHeaderFormatChange.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridHeaderFormatChange.java @@ -18,7 +18,7 @@ package com.vaadin.v7.tests.components.grid; import java.io.Serializable; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; @@ -29,7 +29,7 @@ import com.vaadin.v7.ui.Grid.SelectionMode; import com.vaadin.v7.ui.Grid.SelectionModel; import com.vaadin.v7.ui.renderers.NumberRenderer; -public class GridHeaderFormatChange extends AbstractTestUI { +public class GridHeaderFormatChange extends AbstractReindeerTestUI { private static final long serialVersionUID = -2787771187365766027L; diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridHeaderStyleNames.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridHeaderStyleNames.java index 7e49bfd17f..9604f9f218 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridHeaderStyleNames.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridHeaderStyleNames.java @@ -15,7 +15,6 @@ */ package com.vaadin.v7.tests.components.grid; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUIWithLog; import com.vaadin.tests.components.beanitemcontainer.BeanItemContainerGenerator; @@ -29,7 +28,6 @@ import com.vaadin.v7.ui.Grid.HeaderCell; import com.vaadin.v7.ui.Grid.HeaderRow; import com.vaadin.v7.ui.Grid.SelectionMode; -@Theme("valo") public class GridHeaderStyleNames extends AbstractTestUIWithLog { private HeaderCell ageHeaderCell; diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridHeight.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridHeight.java index 13f52537e2..104059878c 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridHeight.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridHeight.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Alignment; import com.vaadin.ui.Component; import com.vaadin.ui.HorizontalLayout; @@ -42,7 +42,7 @@ import com.vaadin.v7.ui.OptionGroup; * * @author Vaadin Ltd */ -public class GridHeight extends AbstractTestUI { +public class GridHeight extends AbstractReindeerTestUI { static final String FULL = "Full"; static final String UNDEFINED = "Undefined"; diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridInGridLayout.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridInGridLayout.java index c272ef045d..c980d060de 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridInGridLayout.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridInGridLayout.java @@ -16,12 +16,12 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.CssLayout; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.Grid; -public class GridInGridLayout extends AbstractTestUI { +public class GridInGridLayout extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridInTabSheet.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridInTabSheet.java index ba17c82ed8..557596d10b 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridInTabSheet.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridInTabSheet.java @@ -16,7 +16,7 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; @@ -26,7 +26,7 @@ import com.vaadin.v7.ui.Grid.CellReference; import com.vaadin.v7.ui.Grid.CellStyleGenerator; import com.vaadin.v7.ui.Grid.SelectionMode; -public class GridInTabSheet extends AbstractTestUI { +public class GridInTabSheet extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridInWindowResize.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridInWindowResize.java index 9d4775a4b7..8c8c782866 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridInWindowResize.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridInWindowResize.java @@ -15,7 +15,6 @@ */ package com.vaadin.v7.tests.components.grid; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; @@ -27,7 +26,6 @@ import com.vaadin.v7.data.Item; import com.vaadin.v7.data.util.IndexedContainer; import com.vaadin.v7.ui.Grid; -@Theme("valo") public class GridInWindowResize extends AbstractTestUI { @Override diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridItemSetChange.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridItemSetChange.java index bb84156a55..3eb7123ce5 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridItemSetChange.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridItemSetChange.java @@ -16,7 +16,7 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.tests.util.Person; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -24,7 +24,7 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.v7.data.util.BeanItemContainer; import com.vaadin.v7.ui.Grid; -public class GridItemSetChange extends AbstractTestUI { +public class GridItemSetChange extends AbstractReindeerTestUI { public static class SneakyBeanContainer extends BeanItemContainer<Person> { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridLayoutDetailsRow.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridLayoutDetailsRow.java index ec7e465ed0..877143b502 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridLayoutDetailsRow.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridLayoutDetailsRow.java @@ -16,7 +16,7 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Component; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; @@ -31,7 +31,7 @@ import com.vaadin.v7.ui.Grid.RowReference; * * @author Vaadin Ltd */ -public class GridLayoutDetailsRow extends AbstractTestUI { +public class GridLayoutDetailsRow extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridMultiSelectionOnInit.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridMultiSelectionOnInit.java index 5aaf963c54..8f6022846d 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridMultiSelectionOnInit.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridMultiSelectionOnInit.java @@ -16,14 +16,14 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.MultiSelectionModel; import com.vaadin.v7.ui.Grid.SelectionMode; -public class GridMultiSelectionOnInit extends AbstractTestUI { +public class GridMultiSelectionOnInit extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridMultiSelectionScrollBar.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridMultiSelectionScrollBar.java index fa78d8f9aa..3d89f32831 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridMultiSelectionScrollBar.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridMultiSelectionScrollBar.java @@ -16,10 +16,10 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.ui.Grid; -public class GridMultiSelectionScrollBar extends AbstractTestUI { +public class GridMultiSelectionScrollBar extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridRendererChange.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridRendererChange.java index 18626e4106..eef549f07a 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridRendererChange.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridRendererChange.java @@ -16,7 +16,7 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; @@ -25,7 +25,7 @@ import com.vaadin.v7.ui.renderers.ButtonRenderer; import com.vaadin.v7.ui.renderers.HtmlRenderer; import com.vaadin.v7.ui.renderers.TextRenderer; -public class GridRendererChange extends AbstractTestUI { +public class GridRendererChange extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridResizeAndScroll.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridResizeAndScroll.java index 5364644721..f2a9d10e26 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridResizeAndScroll.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridResizeAndScroll.java @@ -18,14 +18,14 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.event.SelectionEvent; import com.vaadin.event.SelectionEvent.SelectionListener; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.util.IndexedContainer; import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.SelectionMode; -public class GridResizeAndScroll extends AbstractTestUI { +public class GridResizeAndScroll extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridRowHeightChange.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridRowHeightChange.java index 402b6357af..fd5b9b7665 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridRowHeightChange.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridRowHeightChange.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.List; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.data.Property; @@ -12,7 +12,7 @@ import com.vaadin.v7.shared.ui.grid.HeightMode; import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.NativeSelect; -public class GridRowHeightChange extends AbstractTestUI { +public class GridRowHeightChange extends AbstractReindeerTestUI { private final List<String> themes = Arrays.asList("valo", "reindeer", "runo", "chameleon", "base"); diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridScrollToLineWhileResizing.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridScrollToLineWhileResizing.java index 2c955bb840..5889a3d556 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridScrollToLineWhileResizing.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridScrollToLineWhileResizing.java @@ -18,14 +18,14 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.event.SelectionEvent; import com.vaadin.event.SelectionEvent.SelectionListener; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.VerticalSplitPanel; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.util.IndexedContainer; import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.SelectionMode; -public class GridScrollToLineWhileResizing extends AbstractTestUI { +public class GridScrollToLineWhileResizing extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridScrolling.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridScrolling.java index dadf881ad2..1287c74895 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridScrolling.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridScrolling.java @@ -16,7 +16,7 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -28,7 +28,7 @@ import com.vaadin.v7.shared.ui.grid.ScrollDestination; import com.vaadin.v7.ui.Grid; @SuppressWarnings("serial") -public class GridScrolling extends AbstractTestUI { +public class GridScrolling extends AbstractReindeerTestUI { private Grid grid; diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSelectAllCell.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSelectAllCell.java index 19b8622802..98913f037b 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSelectAllCell.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSelectAllCell.java @@ -1,11 +1,9 @@ package com.vaadin.v7.tests.components.grid; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.v7.ui.Grid; -@Theme("valo") public class GridSelectAllCell extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSidebarPosition.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSidebarPosition.java index 6c7fc95175..b8a3f8c58f 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSidebarPosition.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSidebarPosition.java @@ -15,14 +15,12 @@ */ package com.vaadin.v7.tests.components.grid; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Alignment; import com.vaadin.ui.HorizontalLayout; import com.vaadin.v7.ui.Grid; -@Theme("valo") public class GridSidebarPosition extends AbstractTestUI { static final String POPUP_ABOVE = "above"; diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSingleColumn.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSingleColumn.java index e6258159fc..12ba530d25 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSingleColumn.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSingleColumn.java @@ -16,14 +16,14 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.util.IndexedContainer; import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.Column; import com.vaadin.v7.ui.Grid.SelectionMode; -public class GridSingleColumn extends AbstractTestUI { +public class GridSingleColumn extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSortIndicator.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSortIndicator.java index 87adb11bb4..cc7dc5a93a 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSortIndicator.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSortIndicator.java @@ -23,14 +23,14 @@ import com.vaadin.event.SortEvent; import com.vaadin.event.SortEvent.SortListener; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.data.sort.SortDirection; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.ui.Grid; /* * Test UI for checking that sort indicators of a Grid are updated when the sort order is changed by a * SortListener. */ -public class GridSortIndicator extends AbstractTestUI { +public class GridSortIndicator extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSubPixelProblemWrapping.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSubPixelProblemWrapping.java index 9c9b49e3da..f8d917df78 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSubPixelProblemWrapping.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSubPixelProblemWrapping.java @@ -17,7 +17,6 @@ package com.vaadin.v7.tests.components.grid; import java.util.Random; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; @@ -27,7 +26,6 @@ import com.vaadin.v7.data.util.BeanItemContainer; import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.SelectionMode; -@Theme("valo") public class GridSubPixelProblemWrapping extends AbstractTestUI { Random r = new Random(); diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSwitchRenderers.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSwitchRenderers.java index b8738abf6f..d26f540038 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSwitchRenderers.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridSwitchRenderers.java @@ -3,7 +3,6 @@ package com.vaadin.v7.tests.components.grid; import java.util.List; import java.util.Random; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUIWithLog; import com.vaadin.ui.CheckBox; @@ -16,7 +15,6 @@ import com.vaadin.v7.ui.renderers.HtmlRenderer; import com.vaadin.v7.ui.renderers.TextRenderer; @SuppressWarnings("serial") -@Theme("valo") public class GridSwitchRenderers extends AbstractTestUIWithLog { private static final int MANUALLY_FORMATTED_COLUMNS = 1; private static final int COLUMNS = 3; diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridThemeChange.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridThemeChange.java index e826603edd..54882067a9 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridThemeChange.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridThemeChange.java @@ -21,11 +21,11 @@ import java.util.List; import com.vaadin.event.SelectionEvent; import com.vaadin.event.SelectionEvent.SelectionListener; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.SelectionMode; -public class GridThemeChange extends AbstractTestUI { +public class GridThemeChange extends AbstractReindeerTestUI { private final List<String> themes = Arrays.asList("valo", "reindeer", "runo", "chameleon", "base"); diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridThemeUI.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridThemeUI.java index cf31a5f3dd..e03339467b 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridThemeUI.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridThemeUI.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUIWithLog; import com.vaadin.tests.fieldgroup.ComplexPerson; @@ -37,7 +36,6 @@ import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.NativeSelect; import com.vaadin.v7.ui.renderers.DateRenderer; -@Theme("valo") public class GridThemeUI extends AbstractTestUIWithLog { private Grid grid; diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridWidthIncrease.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridWidthIncrease.java index 6c51523742..1dbd1bd970 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridWidthIncrease.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridWidthIncrease.java @@ -16,12 +16,12 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.v7.ui.Grid; -public class GridWidthIncrease extends AbstractTestUI { +public class GridWidthIncrease extends AbstractReindeerTestUI { public static int COLUMN_COUNT = 5; diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridWithLabelEditor.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridWithLabelEditor.java index 87ad5d7a2c..ec32c2a7aa 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridWithLabelEditor.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridWithLabelEditor.java @@ -18,14 +18,14 @@ package com.vaadin.v7.tests.components.grid; import java.util.Collection; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.data.Validator; import com.vaadin.v7.data.Validator.InvalidValueException; import com.vaadin.v7.ui.Field; import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Label; -public class GridWithLabelEditor extends AbstractTestUI { +public class GridWithLabelEditor extends AbstractReindeerTestUI { public class LabelEditor extends Label implements Field<String> { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridWithoutRenderer.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridWithoutRenderer.java index 96d8d503a0..942260d82d 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridWithoutRenderer.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridWithoutRenderer.java @@ -15,13 +15,11 @@ */ package com.vaadin.v7.tests.components.grid; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.tests.util.PersonContainer; import com.vaadin.v7.ui.Grid; -@Theme("valo") public class GridWithoutRenderer extends AbstractTestUI { @Override diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/InitialFrozenColumns.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/InitialFrozenColumns.java index 0c7e6161fc..07a41337f2 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/InitialFrozenColumns.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/InitialFrozenColumns.java @@ -16,11 +16,11 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.SelectionMode; -public class InitialFrozenColumns extends AbstractTestUI { +public class InitialFrozenColumns extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/JavaScriptRenderers.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/JavaScriptRenderers.java index 4df254c94e..f6ce43fbb6 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/JavaScriptRenderers.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/JavaScriptRenderers.java @@ -16,12 +16,12 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.util.IndexedContainer; import com.vaadin.v7.ui.Grid; -public class JavaScriptRenderers extends AbstractTestUI { +public class JavaScriptRenderers extends AbstractReindeerTestUI { public static class MyBean { private int integer; diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/NullRenderers.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/NullRenderers.java index 215e6f7d04..9ad42142a3 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/NullRenderers.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/NullRenderers.java @@ -20,7 +20,7 @@ import java.util.Locale; import com.vaadin.server.Resource; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.data.util.IndexedContainer; import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.SelectionMode; @@ -35,7 +35,7 @@ import com.vaadin.v7.ui.renderers.ProgressBarRenderer; import com.vaadin.v7.ui.renderers.TextRenderer; @SuppressWarnings("all") -public class NullRenderers extends AbstractTestUI { +public class NullRenderers extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/SelectDuringInit.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/SelectDuringInit.java index 6ef9b7f387..c32f52a627 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/SelectDuringInit.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/SelectDuringInit.java @@ -16,11 +16,11 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.SelectionMode; -public class SelectDuringInit extends AbstractTestUI { +public class SelectDuringInit extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/SortableHeaderStyles.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/SortableHeaderStyles.java index 0d58367856..abff7cf2fa 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/SortableHeaderStyles.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/SortableHeaderStyles.java @@ -17,7 +17,6 @@ package com.vaadin.v7.tests.components.grid; import java.util.Collection; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.tests.util.PersonContainer; @@ -27,7 +26,6 @@ import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.Column; import com.vaadin.v7.ui.OptionGroup; -@Theme("valo") public class SortableHeaderStyles extends AbstractTestUI { @Override diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/WidgetRenderers.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/WidgetRenderers.java index 390b78b875..f947f63f79 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/WidgetRenderers.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/WidgetRenderers.java @@ -18,7 +18,7 @@ package com.vaadin.v7.tests.components.grid; import com.vaadin.server.Resource; import com.vaadin.server.ThemeResource; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.NativeButton; @@ -33,7 +33,7 @@ import com.vaadin.v7.ui.renderers.ImageRenderer; import com.vaadin.v7.ui.renderers.ProgressBarRenderer; @SuppressWarnings("all") -public class WidgetRenderers extends AbstractTestUI { +public class WidgetRenderers extends AbstractReindeerTestUI { static final String PROPERTY_ID = "property id"; diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicFeatures.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicFeatures.java index 6349405f9b..e4db1afd9c 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicFeatures.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicFeatures.java @@ -28,6 +28,7 @@ import java.util.Locale; import java.util.Map; import java.util.Random; +import com.vaadin.annotations.Theme; import com.vaadin.data.sort.Sort; import com.vaadin.data.sort.SortOrder; import com.vaadin.event.SelectionEvent; @@ -87,6 +88,7 @@ import com.vaadin.v7.ui.renderers.NumberRenderer; * @since * @author Vaadin Ltd */ +@Theme("valo") public class GridBasicFeatures extends AbstractComponentTest<Grid> { public static final String ROW_STYLE_GENERATOR_ROW_NUMBERS_FOR_3_OF_4 = "Row numbers for 3/4"; @@ -115,9 +117,9 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { @Override public void select(SelectionEvent event) { Iterator<Object> iter = event.getAdded().iterator(); - Object addedRow = (iter.hasNext() ? iter.next() : "none"); + Object addedRow = iter.hasNext() ? iter.next() : "none"; iter = event.getRemoved().iterator(); - Object removedRow = (iter.hasNext() ? iter.next() : "none"); + Object removedRow = iter.hasNext() ? iter.next() : "none"; log("SelectionEvent: Added " + addedRow + ", Removed " + removedRow); } @@ -224,7 +226,7 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { @Override public Component getDetails(RowReference rowReference) { return new Label("You are watching item id " - + rowReference.getItemId() + " (" + (id++) + ")"); + + rowReference.getItemId() + " (" + id++ + ")"); } }; @@ -558,7 +560,7 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { } else { Object[] idsArray = new Object[ids.size()]; for (int i = 0; i < ids.size(); ++i) { - idsArray[i] = ids.get((ids.size() - 1) - i); + idsArray[i] = ids.get(ids.size() - 1 - i); } c.setColumnOrder(idsArray); } diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicFeaturesValo.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicFeaturesValo.java index eb2599f951..40244c1cbd 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicFeaturesValo.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicFeaturesValo.java @@ -15,14 +15,5 @@ */ package com.vaadin.v7.tests.components.grid.basicfeatures; -import com.vaadin.annotations.Theme; -import com.vaadin.ui.themes.ValoTheme; - -@Theme(ValoTheme.THEME_NAME) public class GridBasicFeaturesValo extends GridBasicFeatures { - @Override - @Deprecated - public String getTheme() { - return ValoTheme.THEME_NAME; - } } diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridClientHeightByRowOnInit.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridClientHeightByRowOnInit.java index 20fdb5fcdc..8f13ec1b13 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridClientHeightByRowOnInit.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridClientHeightByRowOnInit.java @@ -1,6 +1,5 @@ package com.vaadin.v7.tests.components.grid.basicfeatures; -import com.vaadin.annotations.Theme; import com.vaadin.annotations.Title; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; @@ -9,7 +8,6 @@ import com.vaadin.tests.widgetset.client.v7.grid.GridHeightByRowOnInitWidget; import com.vaadin.tests.widgetset.server.TestWidgetComponent; import com.vaadin.ui.UI; -@Theme("valo") @Title("Client Grid height by row on init") @Widgetset(TestingWidgetSet.NAME) public class GridClientHeightByRowOnInit extends UI { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridHeightByRowOnInit.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridHeightByRowOnInit.java index 26584823d7..bc6b983f80 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridHeightByRowOnInit.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridHeightByRowOnInit.java @@ -15,17 +15,14 @@ */ package com.vaadin.v7.tests.components.grid.basicfeatures; -import com.vaadin.annotations.Theme; import com.vaadin.annotations.Title; import com.vaadin.server.VaadinRequest; import com.vaadin.ui.UI; -import com.vaadin.ui.themes.ValoTheme; import com.vaadin.v7.data.Container; import com.vaadin.v7.shared.ui.grid.HeightMode; import com.vaadin.v7.ui.Grid; @Title("Server Grid height by row on init") -@Theme(ValoTheme.THEME_NAME) public class GridHeightByRowOnInit extends UI { private static final String PROPERTY = "Property"; diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridSortingIndicators.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridSortingIndicators.java index 3919e4c5a1..142e22e5c7 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridSortingIndicators.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridSortingIndicators.java @@ -18,7 +18,7 @@ package com.vaadin.v7.tests.components.grid.basicfeatures; import com.vaadin.data.sort.Sort; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.data.sort.SortDirection; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.v7.data.Container; @@ -26,7 +26,7 @@ import com.vaadin.v7.data.Item; import com.vaadin.v7.data.util.IndexedContainer; import com.vaadin.v7.ui.Grid; -public class GridSortingIndicators extends AbstractTestUI { +public class GridSortingIndicators extends AbstractReindeerTestUI { private static int FOO_MIN = 4; private static int BAR_MULTIPLIER = 3; diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridClearContainer.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridClearContainer.java index 7025a72d06..94e5ec10d5 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridClearContainer.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridClearContainer.java @@ -15,7 +15,6 @@ */ package com.vaadin.v7.tests.components.grid.basicfeatures.server; -import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUIWithLog; import com.vaadin.ui.Button; @@ -30,7 +29,6 @@ import com.vaadin.v7.ui.Grid; * * @author Vaadin Ltd */ -@Theme("valo") public class GridClearContainer extends AbstractTestUIWithLog { private IndexedContainer ic; diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/declarative/GridDeclarativeBasicFeatures.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/declarative/GridDeclarativeBasicFeatures.java index 32f1650364..716a058b31 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/declarative/GridDeclarativeBasicFeatures.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/declarative/GridDeclarativeBasicFeatures.java @@ -15,12 +15,10 @@ */ package com.vaadin.v7.tests.components.grid.declarative; -import com.vaadin.annotations.Theme; import com.vaadin.tests.components.DeclarativeTestUI; import com.vaadin.tests.components.DeclarativeTestUI.DeclarativeUI; @SuppressWarnings("serial") -@Theme("valo") @DeclarativeUI("GridBasicFeatures.html") public class GridDeclarativeBasicFeatures extends DeclarativeTestUI { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/declarative/GridDeclarativeMultiSelect.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/declarative/GridDeclarativeMultiSelect.java index 9c5965537a..634d825d9f 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/declarative/GridDeclarativeMultiSelect.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/declarative/GridDeclarativeMultiSelect.java @@ -15,11 +15,9 @@ */ package com.vaadin.v7.tests.components.grid.declarative; -import com.vaadin.annotations.Theme; import com.vaadin.tests.components.DeclarativeTestUI; import com.vaadin.tests.components.DeclarativeTestUI.DeclarativeUI; -@Theme("valo") @SuppressWarnings("serial") @DeclarativeUI("GridMultiSelect.html") public class GridDeclarativeMultiSelect extends DeclarativeTestUI { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/slider/SliderFeedback.java b/uitest/src/main/java/com/vaadin/v7/tests/components/slider/SliderFeedback.java index 66b4cbf509..4141e83728 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/slider/SliderFeedback.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/slider/SliderFeedback.java @@ -16,10 +16,10 @@ package com.vaadin.v7.tests.components.slider; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Slider; -public class SliderFeedback extends AbstractTestUI { +public class SliderFeedback extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/v7/tests/core/SpecialCharactersEncodingUI.java b/uitest/src/main/java/com/vaadin/v7/tests/core/SpecialCharactersEncodingUI.java index 17aa7185fb..1654001821 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/core/SpecialCharactersEncodingUI.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/core/SpecialCharactersEncodingUI.java @@ -1,12 +1,12 @@ package com.vaadin.v7.tests.core; import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.components.AbstractReindeerTestUI; import com.vaadin.ui.Label; import com.vaadin.ui.MenuBar; import com.vaadin.ui.TextField; -public class SpecialCharactersEncodingUI extends AbstractTestUI { +public class SpecialCharactersEncodingUI extends AbstractReindeerTestUI { public static String textWithZwnj = "\ufeffछुट्याउनेछन् क्ष क्ष क्ष"; diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DefaultDateFieldPopupPositionTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/ReindeerDateFieldPopupPositionTest.java index a80686ec9b..f264f99320 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DefaultDateFieldPopupPositionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/ReindeerDateFieldPopupPositionTest.java @@ -21,13 +21,13 @@ import org.openqa.selenium.WebElement; import com.vaadin.testbench.elements.DateFieldElement; /** - * Test for date field popup calendar position in default theme. + * Test for date field popup calendar position in reindeer theme. * * Test method is defined in super class. * * @author Vaadin Ltd */ -public class DefaultDateFieldPopupPositionTest +public class ReindeerDateFieldPopupPositionTest extends DateFieldPopupPositionTest { @Override |