]> source.dussan.org Git - vaadin-framework.git/commitdiff
Support finding components in v7 packages with ComponentLocator
authorTeemu Suo-Anttila <teemusa@vaadin.com>
Mon, 12 Sep 2016 09:43:01 +0000 (12:43 +0300)
committerVaadin Code Review <review@vaadin.com>
Mon, 12 Sep 2016 12:04:00 +0000 (12:04 +0000)
Change-Id: I60eabf3b1c6363be505a2d21f7ed439c5357f61f

228 files changed:
client/src/main/java/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java
uitest-common/src/main/java/com/vaadin/testbench/customelements/CalendarElement.java [new file with mode: 0644]
uitest-common/src/main/java/com/vaadin/testbench/customelements/NativeSelectElement.java
uitest-common/src/main/java/com/vaadin/testbench/customelements/TableElement.java [new file with mode: 0644]
uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/CalendarElement.java [deleted file]
uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/CheckBoxElement.java [deleted file]
uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ColorPickerAreaElement.java [deleted file]
uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ColorPickerElement.java [deleted file]
uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ComboBoxElement.java [deleted file]
uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/DateFieldElement.java [deleted file]
uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/GridElement.java [deleted file]
uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/InlineDateFieldElement.java [deleted file]
uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ListSelectElement.java [deleted file]
uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/NativeSelectElement.java [deleted file]
uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/OptionGroupElement.java [deleted file]
uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/PasswordFieldElement.java [deleted file]
uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/PopupDateFieldElement.java [deleted file]
uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/RichTextAreaElement.java [deleted file]
uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/SelectElement.java [deleted file]
uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TableElement.java [deleted file]
uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TextAreaElement.java [deleted file]
uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TextFieldElement.java [deleted file]
uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TreeElement.java [deleted file]
uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TreeTableElement.java [deleted file]
uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TwinColSelectElement.java [deleted file]
uitest/src/main/java/com/vaadin/tests/componentlocator/ComponentLocatorOldClasses.java [new file with mode: 0644]
uitest/src/test/java/com/vaadin/tests/applicationservlet/SystemMessagesTest.java
uitest/src/test/java/com/vaadin/tests/componentlocator/ComponentLocatorOldClassesTest.java [new file with mode: 0644]
uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarDisabledTest.java
uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java
uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarReadOnlyTest.java
uitest/src/test/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidthTest.java
uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java
uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java
uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java
uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java
uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java
uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java
uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java
uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java
uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java
uitest/src/test/java/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java
uitest/src/test/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValidTest.java
uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEventsTest.java
uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java
uitest/src/test/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java
uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItemsTest.java
uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectNoDomRebuildTest.java
uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChangesTest.java
uitest/src/test/java/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java
uitest/src/test/java/com/vaadin/tests/components/orderedlayout/ErrorIndicatorTest.java
uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java
uitest/src/test/java/com/vaadin/tests/components/select/SelectWithIntegersTest.java
uitest/src/test/java/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java
uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java
uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java
uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java
uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java
uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java
uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java
uitest/src/test/java/com/vaadin/tests/components/table/FooterClickTest.java
uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java
uitest/src/test/java/com/vaadin/tests/components/table/HeaderClickTest.java
uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java
uitest/src/test/java/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java
uitest/src/test/java/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java
uitest/src/test/java/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java
uitest/src/test/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java
uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTest.java
uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java
uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java
uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java
uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java
uitest/src/test/java/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java
uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java
uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java
uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsTest.java
uitest/src/test/java/com/vaadin/tests/components/table/SelectableEditableTest.java
uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java
uitest/src/test/java/com/vaadin/tests/components/table/SortLabelsInTableTest.java
uitest/src/test/java/com/vaadin/tests/components/table/SortableHeaderStylesTest.java
uitest/src/test/java/com/vaadin/tests/components/table/TableBlurFocusTest.java
uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java
uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java
uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java
uitest/src/test/java/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java
uitest/src/test/java/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java
uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java
uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java
uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java
uitest/src/test/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java
uitest/src/test/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java
uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java
uitest/src/test/java/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java
uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java
uitest/src/test/java/com/vaadin/tests/components/table/TableRowHeight2Test.java
uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java
uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java
uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java
uitest/src/test/java/com/vaadin/tests/components/table/TableSetUndefinedSizeTest.java
uitest/src/test/java/com/vaadin/tests/components/table/TableSortingIndicatorTest.java
uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java
uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java
uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java
uitest/src/test/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java
uitest/src/test/java/com/vaadin/tests/components/textfield/EnumTextFieldTest.java
uitest/src/test/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyFieldTest.java
uitest/src/test/java/com/vaadin/tests/components/textfield/RequiredTextFieldTest.java
uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java
uitest/src/test/java/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java
uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java
uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUITest.java
uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java
uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java
uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java
uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java
uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java
uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationTest.java
uitest/src/test/java/com/vaadin/tests/components/ui/UIPollingTest.java
uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java
uitest/src/test/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java
uitest/src/test/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java
uitest/src/test/java/com/vaadin/tests/contextclick/GridContextClickTest.java
uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTest.java
uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTestBase.java
uitest/src/test/java/com/vaadin/tests/contextclick/TreeContextClickTest.java
uitest/src/test/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormatTest.java
uitest/src/test/java/com/vaadin/tests/dd/DnDOnSubtreeTest.java
uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java
uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java
uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java
uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java
uitest/src/test/java/com/vaadin/tests/fieldgroup/DateFormTest.java
uitest/src/test/java/com/vaadin/tests/fieldgroup/MultipleValidationErrorsTest.java
uitest/src/test/java/com/vaadin/tests/fonticon/FontIconsTest.java
uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java
uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java
uitest/src/test/java/com/vaadin/tests/push/PushConfigurationTest.java
uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersTest.java
uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java
uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java
uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java
uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java
uitest/src/test/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltipTest.java
uitest/src/test/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFieldsTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/CustomRendererTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridAddAndRemoveDataOnInitTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridAddRowTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridCellFocusOnResetSizeTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridCheckBoxDisplayTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridClientRenderers.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColspansTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoExpandTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidthClientTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnAutoWidthServerTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnWidthRecalculationTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridColumnWidthsWithoutDataTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridCustomSelectionModelTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDataSourceResetTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDefaultSelectionModeTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsDetachTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsLayoutExpandTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsLocationTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsWidthTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDisabledMultiselectTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDisabledSideBarTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDragSelectionWhileScrolledTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditingWithNoScrollBarsTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorConverterNotFoundTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorCustomFieldTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorFrozenColumnsUITest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorMultiselectTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorUITest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridExtensionCommunicationTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridGeneratedPropertiesTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFooterComponentsTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFormatChangeTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderStyleNamesTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeightTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInTabSheetTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInWindowResizeTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInitiallyHiddenColumnsTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridItemSetChangeTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridLayoutDetailsRowTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridMultiSelectionOnInitTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridMultiSelectionScrollBarTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridRendererChangeTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridReplaceContainerTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeAndScrollTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeHiddenColumnTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridRowHeightChangeTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridScrollToLineWhileResizingTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSelectAllCellTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSidebarPositionTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSingleColumnTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSortIndicatorTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSpacerDecoClipTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSubPixelProblemWrappingTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSwitchRenderersTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeChangeTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeUITest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWidthIncreaseTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithBrokenRendererTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithLabelEditorTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/InitialFrozenColumnsTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/JavaScriptRenderersTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullHeadersTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullRenderersTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/ProgrammaticEditorControlTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/SelectDuringInitTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/SortableHeaderStylesTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/WidgetRenderersTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridClearContainerTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridScrollTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSelectionTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSortingTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridStructureTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/nativeselect/NativeSelectNullTest.java
uitest/src/test/java/com/vaadin/v7/tests/components/nativeselect/NativeSelectsFocusAndBlurListenerTests.java

index 3ba6284cf220a674fc93eb6fedf8fb5797dee0ac..3f46a0a81213d804014f71fc38a80c90f358b86c 100644 (file)
@@ -609,12 +609,11 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy {
 
         List<String> ids = getIDsForConnector(connector);
 
-        Integer[] widgetTags = client.getConfiguration()
-                .getTagsForServerSideClassName(getFullClassName(widgetName));
-        if (widgetTags.length == 0) {
-            widgetTags = client.getConfiguration()
-                    .getTagsForServerSideClassName(
-                            getFullClassName("com.vaadin.ui." + widgetName));
+        List<Integer> widgetTags = new ArrayList<>();
+        widgetTags.addAll(getTags(widgetName));
+
+        if (widgetTags.size() == 0) {
+            widgetTags.addAll(getTags("com.vaadin.ui" + widgetName));
         }
 
         for (int i = 0, l = ids.size(); i < l; ++i) {
@@ -627,7 +626,7 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy {
             final String simpleName = getSimpleClassName(name);
             final String fullName = getFullClassName(name);
 
-            if (widgetTags.length > 0) {
+            if (widgetTags.size() > 0) {
                 Integer[] foundTags = client.getConfiguration()
                         .getTagsForServerSideClassName(fullName);
                 for (int tag : foundTags) {
@@ -655,6 +654,28 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy {
 
     }
 
+    /**
+     * Gets the tags for server side class name. Also includes tags for older
+     * components in v7 package.
+     *
+     * @param widgetName
+     *            the server side class name for widget
+     * @return list of tags
+     */
+    private List<Integer> getTags(String widgetName) {
+        List<Integer> widgetTags = new ArrayList<>();
+        Arrays.stream(client.getConfiguration()
+                .getTagsForServerSideClassName(getFullClassName(widgetName)))
+                .forEach(widgetTags::add);
+        if (widgetName.startsWith("com.vaadin.ui")) {
+            Arrays.stream(client.getConfiguration()
+                    .getTagsForServerSideClassName(getFullClassName(widgetName
+                            .replace("com.vaadin.ui", "com.vaadin.v7.ui"))))
+                    .forEach(widgetTags::add);
+        }
+        return widgetTags;
+    }
+
     /**
      * Extracts the name of the widget class from a path fragment
      *
@@ -738,9 +759,9 @@ public class VaadinFinderLocatorStrategy implements LocatorStrategy {
         return list;
     }
 
-    private boolean tagsMatch(Integer[] targets, Integer tag) {
-        for (int i = 0; i < targets.length; ++i) {
-            if (targets[i].equals(tag)) {
+    private boolean tagsMatch(List<Integer> targets, Integer tag) {
+        for (int i = 0; i < targets.size(); ++i) {
+            if (targets.get(i).equals(tag)) {
                 return true;
             }
         }
diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/CalendarElement.java b/uitest-common/src/main/java/com/vaadin/testbench/customelements/CalendarElement.java
new file mode 100644 (file)
index 0000000..3ba2cbb
--- /dev/null
@@ -0,0 +1,48 @@
+package com.vaadin.testbench.customelements;
+
+import java.util.List;
+
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.testbench.By;
+import com.vaadin.testbench.elementsbase.ServerClass;
+
+@ServerClass("com.vaadin.ui.Calendar")
+public class CalendarElement
+        extends com.vaadin.testbench.elements.CalendarElement {
+    public List<WebElement> getWeekNumbers() {
+        return findElements(By.className("v-calendar-week-number"));
+    }
+
+    public boolean hasMonthView() {
+        return isElementPresent(By.className("v-calendar-week-numbers"));
+    }
+
+    public boolean hasWeekView() {
+        return isElementPresent(By.className("v-calendar-header-week"));
+    }
+
+    public List<WebElement> getDayNumbers() {
+        return findElements(By.className("v-calendar-day-number"));
+    }
+
+    public List<WebElement> getMonthDays() {
+        return findElements(By.className("v-calendar-month-day"));
+    }
+
+    public boolean hasDayView() {
+        return getDayHeaders().size() == 1;
+    }
+
+    public List<WebElement> getDayHeaders() {
+        return findElements(By.className("v-calendar-header-day"));
+    }
+
+    public void back() {
+        findElement(By.className("v-calendar-back")).click();
+    }
+
+    public void next() {
+        findElement(By.className("v-calendar-next")).click();
+    }
+}
index e5d572eaa956d512397ac1bc4e0ab33b47e72e3e..289162ee275b39ced779019514fbee18508c4910 100644 (file)
@@ -1,12 +1,12 @@
 /*
  * 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
@@ -19,6 +19,7 @@ import java.util.List;
 
 import org.openqa.selenium.support.ui.Select;
 
+import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.elements.AbstractSelectElement;
 import com.vaadin.testbench.elementsbase.ServerClass;
@@ -30,7 +31,12 @@ public class NativeSelectElement extends AbstractSelectElement {
     @Override
     protected void init() {
         super.init();
-        selectElement = new Select(this);
+        // FIXME: Newer NativeSelect has different DOM structure.
+        if (getTagName().equals("select")) {
+            selectElement = new Select(this);
+        } else {
+            selectElement = new Select(findElement(By.tagName("select")));
+        }
     }
 
     public List<TestBenchElement> getOptions() {
diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/TableElement.java b/uitest-common/src/main/java/com/vaadin/testbench/customelements/TableElement.java
new file mode 100644 (file)
index 0000000..b84b67a
--- /dev/null
@@ -0,0 +1,40 @@
+package com.vaadin.testbench.customelements;
+
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.testbench.elementsbase.AbstractElement;
+import com.vaadin.testbench.elementsbase.ServerClass;
+
+@ServerClass("com.vaadin.ui.Table")
+public class TableElement extends com.vaadin.testbench.elements.TableElement {
+    public CollapseMenu openCollapseMenu() {
+        getCollapseMenuToggle().click();
+        WebElement cm = getDriver()
+                .findElement(By.xpath("//*[@id='PID_VAADIN_CM']"));
+        return wrapElement(cm, getCommandExecutor()).wrap(CollapseMenu.class);
+    }
+
+    public static class CollapseMenu extends ContextMenuElement {
+    }
+
+    public WebElement getCollapseMenuToggle() {
+        return findElement(By.className("v-table-column-selector"));
+    }
+
+    public static class ContextMenuElement extends AbstractElement {
+
+        public WebElement getItem(int index) {
+            return findElement(
+                    By.xpath(".//table//tr[" + (index + 1) + "]//td/*"));
+        }
+
+    }
+
+    public ContextMenuElement getContextMenu() {
+        WebElement cm = getDriver().findElement(By.className("v-contextmenu"));
+        return wrapElement(cm, getCommandExecutor())
+                .wrap(ContextMenuElement.class);
+    }
+
+}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/CalendarElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/CalendarElement.java
deleted file mode 100644 (file)
index c43ebd8..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import java.util.List;
-
-import org.openqa.selenium.WebElement;
-
-import com.vaadin.testbench.By;
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.Calendar")
-public class CalendarElement
-        extends com.vaadin.testbench.elements.CalendarElement {
-    public List<WebElement> getWeekNumbers() {
-        return findElements(By.className("v-calendar-week-number"));
-    }
-
-    public boolean hasMonthView() {
-        return isElementPresent(By.className("v-calendar-week-numbers"));
-    }
-
-    public boolean hasWeekView() {
-        return isElementPresent(By.className("v-calendar-header-week"));
-    }
-
-    public List<WebElement> getDayNumbers() {
-        return findElements(By.className("v-calendar-day-number"));
-    }
-
-    public List<WebElement> getMonthDays() {
-        return findElements(By.className("v-calendar-month-day"));
-    }
-
-    public boolean hasDayView() {
-        return getDayHeaders().size() == 1;
-    }
-
-    public List<WebElement> getDayHeaders() {
-        return findElements(By.className("v-calendar-header-day"));
-    }
-
-    public void back() {
-        findElement(By.className("v-calendar-back")).click();
-    }
-
-    public void next() {
-        findElement(By.className("v-calendar-next")).click();
-    }
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/CheckBoxElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/CheckBoxElement.java
deleted file mode 100644 (file)
index 9ab5cea..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.CheckBox")
-public class CheckBoxElement
-        extends com.vaadin.testbench.elements.CheckBoxElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ColorPickerAreaElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ColorPickerAreaElement.java
deleted file mode 100644 (file)
index 151dee9..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.ColorPickerArea")
-public class ColorPickerAreaElement
-        extends com.vaadin.testbench.elements.ColorPickerAreaElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ColorPickerElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ColorPickerElement.java
deleted file mode 100644 (file)
index 749a54f..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.ColorPicker")
-public class ColorPickerElement
-        extends com.vaadin.testbench.elements.ColorPickerElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ComboBoxElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ComboBoxElement.java
deleted file mode 100644 (file)
index d5208e6..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import org.junit.Assert;
-import org.openqa.selenium.WebElement;
-
-import com.vaadin.testbench.By;
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.ComboBox")
-public class ComboBoxElement
-        extends com.vaadin.testbench.elements.ComboBoxElement {
-
-    private static org.openqa.selenium.By bySuggestionPopup = By
-            .vaadin("#popup");
-
-    public WebElement getInputField() {
-        return findElement(By.vaadin("#textbox"));
-    }
-
-    @Override
-    public String getText() {
-        return getInputField().getAttribute("value");
-    }
-
-    @Override
-    public void clear() {
-        getInputField().clear();
-    }
-
-    public WebElement getSuggestionPopup() {
-        return findElement(bySuggestionPopup);
-    }
-
-    @Override
-    public void sendKeys(CharSequence... keysToSend) {
-        sendKeys(50, keysToSend);
-    }
-
-    /**
-     * Use this method to simulate typing into an element, which may set its
-     * value.
-     *
-     * @param delay
-     *            delay after sending each individual key (mainly needed for
-     *            PhantomJS)
-     * @param keysToSend
-     *            keys to type into the element
-     */
-    public void sendKeys(int delay, CharSequence... keysToSend) {
-        WebElement input = getInputField();
-
-        for (CharSequence key : keysToSend) {
-            input.sendKeys(key);
-            try {
-                Thread.sleep(delay);
-            } catch (InterruptedException e) {
-                Assert.fail(e.getMessage());
-            }
-        }
-    }
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/DateFieldElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/DateFieldElement.java
deleted file mode 100644 (file)
index c69c2ad..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.DateField")
-public class DateFieldElement
-        extends com.vaadin.testbench.elements.DateFieldElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/GridElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/GridElement.java
deleted file mode 100644 (file)
index b3c24c5..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (C) 2012 Vaadin Ltd
- *
- * This program is available under Commercial Vaadin Add-On License 3.0
- * (CVALv3).
- *
- * See the file licensing.txt distributed with this software for more
- * information about licensing.
- *
- * You should have received a copy of the license along with this program.
- * If not, see <http://vaadin.com/license/cval-3>.
- */
-package com.vaadin.v7.testbench.customelements;
-
-import org.openqa.selenium.NoSuchElementException;
-
-import com.vaadin.testbench.By;
-import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-/**
- * TestBench Element API for Grid
- *
- * @since 8.0
- * @author Vaadin Ltd
- */
-@ServerClass("com.vaadin.v7.ui.Grid")
-public class GridElement extends com.vaadin.testbench.elements.GridElement {
-
-    /**
-     * Gets the element that contains the details of a row.
-     *
-     * @since 8.0
-     * @param rowIndex
-     *            the index of the row for the details
-     * @return the element that contains the details of a row. <code>null</code>
-     *         if no widget is defined for the detials row
-     * @throws NoSuchElementException
-     *             if the given details row is currently not open
-     */
-    public TestBenchElement getDetails(int rowIndex)
-            throws NoSuchElementException {
-        return getSubPart("#details[" + rowIndex + "]");
-    }
-
-    private TestBenchElement getSubPart(String subPartSelector) {
-        return (TestBenchElement) findElement(By.vaadin(subPartSelector));
-    }
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/InlineDateFieldElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/InlineDateFieldElement.java
deleted file mode 100644 (file)
index 22618d7..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-/**
- * @author Vaadin Ltd
- *
- */
-@ServerClass("com.vaadin.v7.ui.InlineDateField")
-public class InlineDateFieldElement
-        extends com.vaadin.testbench.elements.InlineDateFieldElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ListSelectElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ListSelectElement.java
deleted file mode 100644 (file)
index ac59fd6..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.ListSelect")
-public class ListSelectElement
-        extends com.vaadin.testbench.elements.ListSelectElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/NativeSelectElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/NativeSelectElement.java
deleted file mode 100644 (file)
index ffb116a..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.NativeSelect")
-public class NativeSelectElement
-        extends com.vaadin.testbench.elements.NativeSelectElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/OptionGroupElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/OptionGroupElement.java
deleted file mode 100644 (file)
index fed5533..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.OptionGroup")
-public class OptionGroupElement
-        extends com.vaadin.testbench.elements.OptionGroupElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/PasswordFieldElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/PasswordFieldElement.java
deleted file mode 100644 (file)
index dccf143..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.PasswordField")
-public class PasswordFieldElement
-        extends com.vaadin.testbench.elements.PasswordFieldElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/PopupDateFieldElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/PopupDateFieldElement.java
deleted file mode 100644 (file)
index 777e55a..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-/**
- * @author Vaadin Ltd
- *
- */
-@ServerClass("com.vaadin.v7.ui.PopupDateField")
-public class PopupDateFieldElement
-        extends com.vaadin.testbench.elements.PopupDateFieldElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/RichTextAreaElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/RichTextAreaElement.java
deleted file mode 100644 (file)
index f83d833..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.RichTextArea")
-public class RichTextAreaElement
-        extends com.vaadin.testbench.elements.RichTextAreaElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/SelectElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/SelectElement.java
deleted file mode 100644 (file)
index 607bfeb..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.Select")
-public class SelectElement extends com.vaadin.testbench.elements.SelectElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TableElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TableElement.java
deleted file mode 100644 (file)
index 3737fa0..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebElement;
-
-import com.vaadin.testbench.elementsbase.AbstractElement;
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.Table")
-public class TableElement extends com.vaadin.testbench.elements.TableElement {
-    public CollapseMenu openCollapseMenu() {
-        getCollapseMenuToggle().click();
-        WebElement cm = getDriver()
-                .findElement(By.xpath("//*[@id='PID_VAADIN_CM']"));
-        return wrapElement(cm, getCommandExecutor()).wrap(CollapseMenu.class);
-    }
-
-    public static class CollapseMenu extends ContextMenuElement {
-    }
-
-    public WebElement getCollapseMenuToggle() {
-        return findElement(By.className("v-table-column-selector"));
-    }
-
-    public static class ContextMenuElement extends AbstractElement {
-
-        public WebElement getItem(int index) {
-            return findElement(
-                    By.xpath(".//table//tr[" + (index + 1) + "]//td/*"));
-        }
-
-    }
-
-    public ContextMenuElement getContextMenu() {
-        WebElement cm = getDriver().findElement(By.className("v-contextmenu"));
-        return wrapElement(cm, getCommandExecutor())
-                .wrap(ContextMenuElement.class);
-    }
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TextAreaElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TextAreaElement.java
deleted file mode 100644 (file)
index f409998..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.TextArea")
-public class TextAreaElement
-        extends com.vaadin.testbench.elements.TextAreaElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TextFieldElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TextFieldElement.java
deleted file mode 100644 (file)
index 3329eed..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.TextField")
-public class TextFieldElement
-        extends com.vaadin.testbench.elements.TextFieldElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TreeElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TreeElement.java
deleted file mode 100644 (file)
index ab9811d..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.Tree")
-public class TreeElement extends com.vaadin.testbench.elements.TreeElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TreeTableElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TreeTableElement.java
deleted file mode 100644 (file)
index f236fc8..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.TreeTable")
-public class TreeTableElement
-        extends com.vaadin.testbench.elements.TreeTableElement {
-
-}
diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TwinColSelectElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TwinColSelectElement.java
deleted file mode 100644 (file)
index 663ebc0..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.testbench.customelements;
-
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.TwinColSelect")
-public class TwinColSelectElement
-        extends com.vaadin.testbench.elements.TwinColSelectElement {
-
-}
diff --git a/uitest/src/main/java/com/vaadin/tests/componentlocator/ComponentLocatorOldClasses.java b/uitest/src/main/java/com/vaadin/tests/componentlocator/ComponentLocatorOldClasses.java
new file mode 100644 (file)
index 0000000..fc1471d
--- /dev/null
@@ -0,0 +1,22 @@
+package com.vaadin.tests.componentlocator;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+
+public class ComponentLocatorOldClasses extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        com.vaadin.ui.TextField newTF = new com.vaadin.ui.TextField();
+        newTF.setId("new");
+        addComponent(newTF);
+        com.vaadin.v7.ui.TextField oldTF = new com.vaadin.v7.ui.TextField();
+        oldTF.setId("old");
+        addComponent(oldTF);
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Component locator should find both text fields";
+    }
+}
index 6710e96b475d91c227b5d2f1804b983598b7f78d..dd5248ce7631bb6ae45d404aac64c4be264c58c7 100644 (file)
@@ -4,9 +4,9 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.NativeSelectElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 public class SystemMessagesTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/componentlocator/ComponentLocatorOldClassesTest.java b/uitest/src/test/java/com/vaadin/tests/componentlocator/ComponentLocatorOldClassesTest.java
new file mode 100644 (file)
index 0000000..eb465f2
--- /dev/null
@@ -0,0 +1,19 @@
+package com.vaadin.tests.componentlocator;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.testbench.elements.TextFieldElement;
+import com.vaadin.tests.tb3.SingleBrowserTest;
+
+public class ComponentLocatorOldClassesTest extends SingleBrowserTest {
+
+    @Test
+    public void testTestBenchFindsBothTextFields() {
+        openTestURL();
+        Assert.assertEquals(
+                "ComponentLocator did not find elements as expected.", 2,
+                $(TextFieldElement.class).all().size());
+    }
+
+}
index 2b5524831f55cf64176fe6f9a0f118d02ee7839c..dc1be0767668da89b874c4cb1e9c54db6dff02b0 100644 (file)
@@ -4,8 +4,8 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.CalendarElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.CalendarElement;
 
 public class CalendarDisabledTest extends MultiBrowserTest {
 
index a05b7102e3011feb4354580fa32c1621859f7d49..b51a75c027e57561e2a600f5b1ff567ea5a7506c 100644 (file)
@@ -20,10 +20,10 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.customelements.CalendarElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
+import com.vaadin.testbench.elements.NativeSelectElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.CalendarElement;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 public class CalendarHtmlInEventsTest extends SingleBrowserTest {
 
index 90367ffa5db9fdff6efbe856ddb2ecf2b35b84d5..da8dec927b565eb28face63f7e3b5f60261e396b 100644 (file)
@@ -11,8 +11,8 @@ import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.CalendarElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.CalendarElement;
 
 public class CalendarReadOnlyTest extends MultiBrowserTest {
 
index a2abbc930f0f3c7d336a3fc6d645f51de106c767..1cce6b1827a44527f52f7c456db5b0c6deb8d12d 100644 (file)
@@ -20,8 +20,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.openqa.selenium.By;
 
+import com.vaadin.testbench.elements.ColorPickerElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.ColorPickerElement;
 
 /**
  * Test for default caption behavior in color picker.
index 44c0d44e481915081ade12d5a6ce6e808724a15a..27ef1e247cd4bf76693b9368eec907236d3424df 100644 (file)
@@ -21,8 +21,8 @@ import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.ComboBoxElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 public class ComboBoxClosePopupRetainTextTest extends MultiBrowserTest {
     @Override
index d895046a7547fded5fa971ef7b6531b05ad955c8..0b582d48c48472d03ce5324a0422080b93d91deb 100644 (file)
@@ -19,8 +19,8 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.Keys;
 
+import com.vaadin.testbench.customelements.ComboBoxElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 public class ComboBoxCombinedWithEnterShortcutTest extends MultiBrowserTest {
     @Test
index 13f44141153c72a26a49bcb80c5f25e0598954bf..ed2765ff3af324feac18c221574a5aff82c352b5 100644 (file)
@@ -21,9 +21,9 @@ import org.junit.Test;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.ComboBoxElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 public class ComboBoxItemAddingWithFocusListenerTest extends MultiBrowserTest {
 
index 22335c953a93de845af814b3780f0c56b4ebeed1..8e498d091c8b05efeb9cb574083134c6c69878b4 100644 (file)
@@ -22,8 +22,8 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.customelements.ComboBoxElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 public class ComboBoxItemStyleGeneratorTest extends SingleBrowserTest {
     @Test
index 88f4e74a2ea0db4445b513d180520743742827bc..a6f4fb72fd4b8dab03fc75cd1ba19d20fb4c6a03 100644 (file)
@@ -6,8 +6,8 @@ import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.customelements.ComboBoxElement;
+import com.vaadin.testbench.elements.NativeSelectElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 public class ComboBoxLargeIconsTest extends MultiBrowserTest {
     @Override
index 00787cca8e6ee8b8864ed7233038a4c7da43c1c4..9cba77ed72a26aa2ec62524aacc4fccee22fac30 100644 (file)
@@ -24,9 +24,9 @@ import org.openqa.selenium.Dimension;
 import org.openqa.selenium.WebDriver.Window;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.customelements.ComboBoxElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.v7.client.ui.VFilterSelect;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 /**
  * ComboBox suggestion popup should not obscure the text input box.
index 955c49899629f9759bc71f5d8e2281afab1c05e2..9dba2ee4352f468bb6d9f800736d91860cbaaa24 100644 (file)
@@ -21,9 +21,9 @@ import static org.junit.Assert.assertThat;
 import org.junit.Test;
 import org.openqa.selenium.Keys;
 
+import com.vaadin.testbench.customelements.ComboBoxElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 public class ComboBoxResetValueTest extends MultiBrowserTest {
 
index 7de663f1e45e58aad58f8d2f14df8879aa08e25a..d650ef8146466ba3eb7078d1439cf989ed7891c1 100644 (file)
@@ -24,9 +24,9 @@ import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.commands.TestBenchElementCommands;
+import com.vaadin.testbench.customelements.ComboBoxElement;
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 /**
  * ComboBox should clear its value when setting to null with new items.
index 0d1c9284eb5a2565a4beab200e4cf7dfbe03e1f3..e16c321d8ac47738c233dba9ba6297d96a6f43be 100644 (file)
@@ -25,9 +25,9 @@ import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.ComboBoxElement;
 import com.vaadin.testbench.elements.VerticalLayoutElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 /**
  * Tests ComboBox inputs and selections.
index b4ff27338d7a50f40293be0cb04b883058024260..7ddcbf7173c5256afa456dfd9636d5d0bd5a336a 100644 (file)
@@ -22,8 +22,8 @@ import org.junit.Test;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.customelements.ComboBoxElement;
+import com.vaadin.testbench.customelements.NativeSelectElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 public class FilteringTurkishLocaleTest extends MultiBrowserTest {
 
index 1c34d57c6a7daf2c775b376e34b24f56b5059b2c..19f77ea5da225a89453cdfb29ec2dd05c6160932 100644 (file)
@@ -21,9 +21,9 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.DateFieldElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.DateFieldElement;
 
 /**
  * @author Vaadin Ltd
index 3431a0e374347b6f7ba6dbbb930a106b3cb753ba..c29b6de36d222015d52cf68fea1082e05f61c2c1 100644 (file)
@@ -25,8 +25,8 @@ import org.openqa.selenium.support.ui.Select;
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.elements.DateFieldElement;
 import com.vaadin.testbench.elements.LabelElement;
+import com.vaadin.testbench.elements.NativeSelectElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 public class PopupDateFieldValueChangeEventsTest extends MultiBrowserTest {
 
index 7f9614fd9f2fdd7071fea5f96ae370fbb39a98b3..3b9d69601d8892da10dd1fc26e05b502a5bf1bb1 100644 (file)
@@ -22,11 +22,11 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.FormLayoutElement;
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserThemeTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class FormLayoutResizingTest extends MultiBrowserThemeTest {
     @Test
index bc6b42b511bcee5bf4ae79bf1a3e7ac324881a65..3897c8a14a419cc647607c5d99bf318384f816ab 100644 (file)
@@ -7,8 +7,8 @@ import org.junit.Test;
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.interactions.Actions;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableInFormLayoutCausesScrollingTest extends MultiBrowserTest {
 
index bd279a43676b5e8a8ffc96503da58501df0a667c..ed1cbbea716ba48b8c93f0c8ac6cac4cb78fa7d3 100644 (file)
@@ -21,8 +21,8 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.ListSelectElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.ListSelectElement;
 
 public class ListSelectAddRemoveItemsTest extends SingleBrowserTest {
     @Test
index 28cc52133cffb5e2100c4897ab2b54549553ed6f..e63f10f987fcf4ac833cac2e2b342ddd2ba12ff0 100644 (file)
@@ -24,8 +24,8 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
+import com.vaadin.testbench.elements.ListSelectElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.ListSelectElement;
 
 public class ListSelectNoDomRebuildTest extends SingleBrowserTest {
     @Override
index 3679794c0c4bbe7da063747dd7485e87e73cc83b..44cc4b86b8b82718fa28039c5549a83af67e61e1 100644 (file)
@@ -24,9 +24,9 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.Select;
 
 import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.ListSelectElement;
+import com.vaadin.testbench.elements.OptionGroupElement;
 import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2;
-import com.vaadin.v7.testbench.customelements.ListSelectElement;
-import com.vaadin.v7.testbench.customelements.OptionGroupElement;
 
 public class ListSelectPushSelectionChangesTest
         extends SingleBrowserTestPhantomJS2 {
index e9c3bc799ca80e38220bf0b0b2468720fa25c79a..7e7a267d637601cffb135dc4f175c67c6d74b704 100644 (file)
@@ -22,11 +22,11 @@ import org.openqa.selenium.WebElement;
 import com.vaadin.shared.ui.ui.NotificationRole;
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.NativeSelectElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.v7.data.util.converter.StringToEnumConverter;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 /**
  * Unit test class for Notification ARIA (Accessible Rich Internet Applications)
index 89a0412336576dce62f98f4e3b28b6c5e2ee0b1e..bdf0e55f0485b10756588fcb43068675f9fe5f31 100644 (file)
@@ -25,8 +25,8 @@ import org.openqa.selenium.interactions.Mouse;
 import org.openqa.selenium.interactions.internal.Coordinates;
 import org.openqa.selenium.internal.Locatable;
 
+import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TextFieldElement;
 
 public class ErrorIndicatorTest extends MultiBrowserTest {
 
index b7a88f85fbcf6efd7043921771a66f5d7a9a78ea..be72a67f5f72b88e6195cc0e5da91e38ebe5ddb9 100644 (file)
@@ -23,8 +23,8 @@ import org.junit.Test;
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.customelements.ComboBoxElement;
+import com.vaadin.testbench.customelements.NativeSelectElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 public class EnumSelectTest extends SingleBrowserTest {
 
index 998f166b7f7458fac929b29fd7932fdbbe133aff..b2b9a3e15334589c2379bd619031fd84a0077fb8 100644 (file)
@@ -18,8 +18,8 @@ package com.vaadin.tests.components.select;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.testbench.elements.ListSelectElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.ListSelectElement;
 
 public class SelectWithIntegersTest extends SingleBrowserTest {
     @Test
index 1b128de75e7c2d8337f5fbd860e2ca7daadde43c..56da15f6e6fa18038074d679be6cdd53c6e87a7f 100644 (file)
@@ -20,9 +20,9 @@ import org.junit.Test;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Test to see if VScrollTable handles Push updates correctly.
index 3813db636c928f82008888543a362911127b5002..5b120e52b54bb84f08e3cd81b8905dee2a34b275 100644 (file)
@@ -23,10 +23,10 @@ import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
+import com.vaadin.testbench.customelements.TableElement.ContextMenuElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
-import com.vaadin.v7.testbench.customelements.TableElement.ContextMenuElement;
 
 public class ColumnCollapsingAndColumnExpansionTest extends MultiBrowserTest {
 
index 4700d43d3afa2e0b49ff8848ab58431b8c493781..9fdf5413cf3845673aef4e522a8ff3a316e2041a 100644 (file)
@@ -9,9 +9,9 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.TableHeaderElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class ColumnReorderingWithManyColumnsTest extends MultiBrowserTest {
     @Test
index b2906feb7af7b7c9253c4535a51d85d74f893908..accb4289924a4f58d263306eac28d0b6850e866c 100644 (file)
@@ -10,9 +10,9 @@ import org.junit.Test;
 import org.openqa.selenium.NoSuchElementException;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class ContainerSizeChangeTest extends MultiBrowserTest {
 
index ef1ea807d51d85095182e6676ff9e4940f1b293c..b35dbf7a6e5bb68ccd4dca29e3b99cff9f489aea 100644 (file)
@@ -8,9 +8,9 @@ import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class DisabledSortingTableTest extends MultiBrowserTest {
 
index 9b37f361065c1ea82f13cad6554e3471c574a737..1a8152f61ad48c27e50de40786bc14b14abf6112 100644 (file)
@@ -26,8 +26,8 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests that editing and selecting work correctly.
index 1f61c0be7da22caa3b2cf578641dc24906dc62b4..a0fd3e7a21022e186850927116aa39bd4e002b3f 100644 (file)
@@ -20,9 +20,9 @@ import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Test to see if the correct row gets the focus when the row is selected from
index 6a3309bf17cdfe5a7db97c0a14e904a5769815e2..f3ff1623f8fdc82210f797a1cbf19872a8aedc65 100644 (file)
@@ -24,10 +24,10 @@ import java.util.Arrays;
 import org.junit.Test;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests Table Footer ClickListener
index 9768aa239bbdad68715c88183b987a3771c5de82..13b5a49509576ff21f8e8fc2d4db42a5084acbf9 100644 (file)
@@ -25,11 +25,11 @@ import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests Table Footer
index 46f0d8c135c73f286a03574931ba6b939847a501..4071b6a5df3bfe4b91cbcc2301c969d81f7367ce 100644 (file)
@@ -22,10 +22,10 @@ import java.io.IOException;
 import org.junit.Test;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests Table Footer ClickListener
index f12d68f226f914c85664f7aadd79ceb905cbb9a4..7a04c72c083473ed138d229d0452a1826428b352 100644 (file)
@@ -23,8 +23,8 @@ import java.util.Arrays;
 import org.junit.Test;
 import org.openqa.selenium.By;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests Table Footer ClickListener
index 3f8498034a9ab810710bdae01806c3c761da0052..0b388bcd22f0616e605b93e0e7a181c818735111 100644 (file)
@@ -20,8 +20,8 @@ import java.io.IOException;
 import org.junit.Test;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests Table Footer ClickListener
index c70d6075e69ff2d18151800bb076bc6ead20fe7d..78ceadc34aa1d59d6cd055dc5e9f60958e0873d1 100644 (file)
@@ -22,9 +22,9 @@ import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.WindowElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests whether right-click on a column header works after the column is
index 9e60fd865abbdb0c1487b1e2886966e069654819..3b6cf0ffaad98b0e69f3b052956410bf4a6927f9 100644 (file)
@@ -19,9 +19,9 @@ import java.io.IOException;
 
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests Table Footer ClickListener
index d78c08678fd2e6a7fb8dda78eb5e510ace769869..95e948f957c90ae567db6df2d25e7c63eef6e7ac 100644 (file)
@@ -20,9 +20,9 @@ import java.io.IOException;
 import org.junit.Test;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests Table Footer ClickListener
index 1037794e30178c318e738b0e300e667b530eb184..e482bbac47f141bac6f32414986efc11c2593534 100644 (file)
@@ -22,10 +22,10 @@ import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class ItemClickEventsTest extends MultiBrowserTest {
 
index b0c053e55b563be091db28a880d553ba1695c533..0391547353cdd1350b3bc08f11a0de6edd59397d 100644 (file)
@@ -26,11 +26,11 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class ItemClickEventsTestWithShiftOrCtrl extends MultiBrowserTest {
 
index f22bcd459df2461f19330a4c6890f837052340de..186edc714a10101b663faa891cbf6574143fe478 100644 (file)
@@ -23,8 +23,8 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests clicks on different types of Table contents.
index c7806e1694b8fa528eaba21dff5252ca1b364461..3272db77f0e664ca07feb1272efe9c9383e16d94 100644 (file)
@@ -10,9 +10,9 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class LongMultiselectTest extends MultiBrowserTest {
 
index 386549b098794c50e741de6358ab1cc7856e3b26..f950319e71b3aaad8fcc5aecbf529473aecddab4 100644 (file)
@@ -24,9 +24,9 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Test case creating and deleting table component in a loop, testing memory
index 7cca83be628fc78bb4ac309003422b6d6cfa9c2b..54be135ff8345e97819f45fdaf1b6ebf68b6cce0 100644 (file)
@@ -18,9 +18,9 @@ package com.vaadin.tests.components.table;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
 import com.vaadin.v7.shared.ui.table.CollapseMenuContent;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class OnlyCollapsibleInMenu extends SingleBrowserTest {
 
index 1ae9adebbfa69a8c84676e14fd1730642b5c7930..fcf7a020ade14d628e9e643c34e9557b1a7b99e9 100644 (file)
@@ -9,8 +9,8 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class ReloadWidgetsTest extends MultiBrowserTest {
 
index 219c6b1c49ba5dd42f800a69eaa5a567440dd392..054d4671516d075036449beb5d3b3269c5d8b869 100644 (file)
@@ -26,9 +26,9 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class SelectAllConstantViewportTest extends MultiBrowserTest {
 
index f77403c9572263b5e4b5a8eb66e856484c9c4a8c..46a8f79b512845449362c5743fc20a1c227ea9ee 100644 (file)
@@ -30,10 +30,10 @@ import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Test to see if all items of the table can be selected by selecting first row,
index 90ed3da93eb93a9b1886f427c8bcec39dedd986d..57da274fbdd51b0ae1148d15b83ca15aea86d098 100644 (file)
@@ -3,8 +3,8 @@ package com.vaadin.tests.components.table;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class SelectableEditableTest extends MultiBrowserTest {
     @Test
index 4803e86e39539a3600379813bdc45b3db04c059d..bf381a982b081d1bcb63297bb0d60b2ef9a77b41 100644 (file)
@@ -23,9 +23,9 @@ import org.junit.Test;
 import org.openqa.selenium.NoSuchElementException;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 import junit.framework.Assert;
 
index df61c13630d3a78d8be9e3a63ddcdd97aa10f48c..0045fd9bf737799b0e9dc06e25567686fc061d9c 100644 (file)
@@ -19,8 +19,8 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests sorting labels in table.
index f85d1c870b2097919fdf2249c29a8ef8775267ef..6756feb7053caf4e60afbaf3a403ec17fa2693cf 100644 (file)
@@ -18,9 +18,9 @@ package com.vaadin.tests.components.table;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.TableElement;
+import com.vaadin.testbench.elements.OptionGroupElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.OptionGroupElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class SortableHeaderStylesTest extends SingleBrowserTest {
     @Test
index 7ff937aad7cd199e1ca1cf8a277b6c6e06e1a6d9..9fa2a62390ce380f6d6cf319aaab3e984ceb58ca 100644 (file)
@@ -23,9 +23,9 @@ import java.util.Arrays;
 import org.junit.Test;
 import org.openqa.selenium.By;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableBlurFocusTest extends MultiBrowserTest {
 
index aa4e748edc6decc2fcb19a02b380fc447b326b16..923546c13df67bf80b09c24d384bad166faf0195 100644 (file)
@@ -25,8 +25,8 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests that clicking on active fields doesn't change Table selection, nor does
index ac3f109f1f20a1fd53e38b87619b3f39c80eaa3c..25f8abbc1f4c51fea0a29910e0d7bbb4a106f069 100644 (file)
@@ -20,10 +20,10 @@ import static org.junit.Assert.assertFalse;
 
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableColumnAddAndResizeTest extends MultiBrowserTest {
 
index e0fd37df0d0d0915ca4c68ae5e204a63888f4816..736fb5a7018d7d9aa2c992df3684393f145db3b4 100644 (file)
@@ -26,9 +26,9 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests that components within table cells get resized when their column gets
index 5913e088686c18865844f61ed1ddb2767864f75a..89a545bf1b493ffff4ee3387e944da7aa5be4797 100644 (file)
@@ -18,8 +18,8 @@ package com.vaadin.tests.components.table;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableColumnWidthsAndSortingTest extends MultiBrowserTest {
 
index 7def9cbe4345973e73d9ee3e01760f0d9ebb2fa3..75fb500564b6062d57fca1a9d50ef93cb099c24c 100644 (file)
@@ -7,8 +7,8 @@ import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableContextMenuAndIconsTest extends MultiBrowserTest {
     @Override
index a642b496815b2ec16c575f6559eeb30608fda379..00cf5bfda475badb26bf240db5ff0ab8268087f8 100644 (file)
@@ -21,9 +21,9 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.TableHeaderElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableDragColumnTest extends MultiBrowserTest {
 
index 87b4e2d69f6c0de8720da89c0cd6d4f8413679ca..7a0241de54b39bc11935d9384773b0558d3a2fec 100644 (file)
@@ -23,8 +23,8 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests that clicking on active fields doesn't change Table selection, nor does
index 46f24bdc2ca975db1377d8b6062b69e9284a409e..ff6b5f72858b80feee49c193df817a84d6894e82 100644 (file)
@@ -24,9 +24,9 @@ import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * For testing that UI scroll does not jump back to up when: 1. UI is in iframe
index 17726f69219f6ef1a1963baf770b139ac612ef5c..632053af6d7590a468257acaec14ac8670d063dd 100644 (file)
@@ -24,9 +24,9 @@ import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.tests.tb3.TooltipTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests Table tooltips with various settings.
index 379dbcad377ff02321457f0753d3d7c6d0ba5d8b..8c684becea7c612220b5d73dcdfe0baa535ccb84 100644 (file)
@@ -25,8 +25,8 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Regular click cases already covered by @LabelEmbeddedClickThroughForTableTest
index 77c63f153fa395d7346c3f458bbe7f3adbdd504c..9df559502d238f47dc83013388178aa81813201a 100644 (file)
@@ -29,9 +29,9 @@ import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests that navigation with PageDown/PageUp/Home/End in Table works
index 91872a9439803efe41d3305cdea8140e5d9fd94c..85a5fbf42f48484aec6588e137322d50ad8902df 100644 (file)
@@ -18,10 +18,10 @@ package com.vaadin.tests.components.table;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.TableRowElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableParentEnabledStateChangeTest extends SingleBrowserTest {
 
index 57666944c4d4c92a5c6e10680eb6b66f544bbd78..50f4b0d21f4566a68a286d7cfdeec71eae74bc1f 100644 (file)
@@ -21,8 +21,8 @@ import static org.hamcrest.number.IsCloseTo.closeTo;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Scroll position should be restored when removing and re-adding all rows in
index 956dbee1cf0072ab5fb48e279551744c5b9a92cb..4856c9348d0580369eca31c4afb4a57cbbb08860 100644 (file)
@@ -22,8 +22,8 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests that rows are completely visible and clicking buttons doesn't change
index 2a0842dd75345cd257089d359b0ed338018b5934..cb5f4ea2c647ccf678ca47d809aaa799100a868e 100644 (file)
@@ -24,9 +24,9 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests that adding long labels to a Table and scrolling to the bottom works as
index ed1ac464ed965cbc1c41698326966033a5ede43b..34ded9056fb6c452a206a879b90d26ec2fd9e6ca 100644 (file)
@@ -22,8 +22,8 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Test to see if Table appears to scroll up under an obscure set of conditions
index 04e7751519d1f7fe9155b71b72032aa0652b080c..28977eb69b8117e129325c92706d55f1d119cec7 100644 (file)
@@ -4,8 +4,8 @@ import java.io.IOException;
 
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableScrollsOnSelectionTest extends MultiBrowserTest {
 
index ad630eb3a7ea5ee06ad06bf62492dfc013fc4685..9272d5d4867f8a6ebcee278341d42b51c627441f 100644 (file)
@@ -4,9 +4,9 @@ import org.junit.Test;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableSetUndefinedSizeTest extends MultiBrowserTest {
     @Test
index 6328820c5e3a1887579b408d9645615ce8652f1e..c45ac018ac104c8162fb4ce601bb31efde5d9050 100644 (file)
@@ -18,9 +18,9 @@ package com.vaadin.tests.components.table;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests if the sort indicator is visible after the table has been sorted from
index fca736e13e07dcc81784685a7920901569402f3c..cf32afbf3d44fd7ead00c8ead1274d08e30b56f9 100644 (file)
@@ -19,10 +19,10 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.By;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.TableHeaderElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests that column keeps its header, icon, alignment after toggling visibility
index 4d7081847298ace8e3affc44c5b3b9d69a21f8ad..fdda329a8d182e53e6a20663c4db4e56402f0249 100644 (file)
@@ -23,8 +23,8 @@ import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Test for a Table with a customised BeanItemContainer.
index 2d64ab435c04292b684a7f4a2aa45aa43812daac..2594db28ea9471a0361d560bd2e5443dc82ca64b 100644 (file)
@@ -21,8 +21,8 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableWithPollingTest extends MultiBrowserTest {
 
index 4ce1a2a63020738b1d6b9f8932e95e697421af31..0ac39015944a101dd9c0acccf7e74a76b316622c 100644 (file)
@@ -23,9 +23,9 @@ import java.io.IOException;
 import org.junit.Test;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class UpdateTableWhenUnfocusedTest extends MultiBrowserTest {
 
index cb9b07f2e1b0e55a302f9d281979a09dfddaacf1..b810de2e5f181bf246e5fe2e38fda7c95c42997e 100644 (file)
@@ -19,8 +19,8 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.Keys;
 
+import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.TextFieldElement;
 
 public class EnumTextFieldTest extends SingleBrowserTest {
     @Test
index 72af8d2243e0054d33ca1a0578f1a46d3be49aff..c6a52be38a8a4bcca059966a528af012e4e4f800 100644 (file)
@@ -6,8 +6,8 @@ import static org.hamcrest.core.Is.is;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TextFieldElement;
 
 public class LocaleChangeOnReadOnlyFieldTest extends MultiBrowserTest {
 
index a7b4dcc69ed13e7f06936f8db90fb9ae63c0b45a..cfef5a97d45edc7b041c952cf2852c56976b1f90 100644 (file)
@@ -19,8 +19,8 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TextFieldElement;
 
 /**
  * Test for .v-required style
index fc11db02846255f1e18bb4eec34df74ebf954fd2..e784f990f307d6957b6be2085be679172bf8173b 100644 (file)
@@ -23,8 +23,8 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.elements.CheckBoxElement;
+import com.vaadin.testbench.elements.TreeElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.TreeElement;
 
 public class TreeHtmlContentAllowedTest extends SingleBrowserTest {
 
index 7f1162ee84c96eb4ccb873db5c72d508139876bd..684b41e33304594bda156d06d6a9e3ce1c7b7b7b 100644 (file)
@@ -21,8 +21,8 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.elements.TreeTableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TreeTableElement;
 
 /**
  * Tests that expanded cells with component contents aren't empty.
index 9ab67bade897da642c9ce3ad1eac7a69b7bacce9..e8676fcedfffeaa665ee48cb8c5164f4763bd461 100644 (file)
@@ -22,8 +22,8 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.elements.TreeTableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TreeTableElement;
 
 /**
  * Tests that TreeTable with ContainerHierarchicalWrapper is updated correctly
index 9f90dd5fc3b68696bfa6be9a05a977a69915f713..66513098a2967f7bbdaa21297b4b1b88044a8ade 100644 (file)
@@ -24,8 +24,8 @@ import org.junit.Test;
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
+import com.vaadin.testbench.elements.TreeTableElement;
 import com.vaadin.tests.tb3.TooltipTest;
-import com.vaadin.v7.testbench.customelements.TreeTableElement;
 
 /**
  * Tests TreeTable tooltips with various settings.
index ce64913289e2f26bb6e9350abdd43d124a73c5fa..469b94f518eb2200c357e80e8c2bb11a1b4a2dcf 100644 (file)
@@ -23,8 +23,8 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.elements.TreeTableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TreeTableElement;
 
 /**
  * Tests that opening the root node and clicking a generated component doesn't
index fbf8947ba97b7a7c23841ffee125b01f7513f8a2..217184454f520c0e597233aa88bf3690f488e556 100644 (file)
@@ -24,8 +24,8 @@ import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.elements.TreeTableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TreeTableElement;
 
 /**
  * Tests expanding TreeTable rows when page length is zero.
index 4b2694607d4c646a74780cc17b53addca7bdfdba..9620c013952371d4b83fafc326eba0a4d93e354b 100644 (file)
@@ -27,8 +27,8 @@ import org.openqa.selenium.support.ui.ExpectedConditions;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.commands.TestBenchElementCommands;
+import com.vaadin.testbench.elements.TreeTableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TreeTableElement;
 
 /**
  * Tests partial updates of a TreeTable.
index e9b974a92066556c0b9215fd2fb8de178dc93564..c5d8661d80dc04f3b24bb7760743e29ce67613d5 100644 (file)
@@ -23,8 +23,8 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.elements.TreeTableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TreeTableElement;
 
 public class TreeTableScrollOnExpandTest extends MultiBrowserTest {
 
index 61ea600b918836205e52b738859eeef729f0b03f..2786e52849115928a5efe918c4c5266a66b097c3 100644 (file)
@@ -24,9 +24,9 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
+import com.vaadin.testbench.elements.TextAreaElement;
 import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TextAreaElement;
 
 public class TextAreaEventPropagationModifierKeysTest extends MultiBrowserTest {
     @Test
index e7496a8ce6e50ee8f4c90d9f88dd0c0941d4cd31..8ee6c85f193cca5e431b10e1b666e73b86ff48f0 100644 (file)
@@ -22,9 +22,9 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
+import com.vaadin.testbench.elements.TextAreaElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TextAreaElement;
 
 /**
  * Tests that the TextArea widget correctly stops ENTER events from propagating.
index c0eabbe7e351475f89c849f08cefb2af9cfb76c0..bfc856d1b108352dcf430b11d4739116ce745cbf 100644 (file)
@@ -3,8 +3,8 @@ package com.vaadin.tests.components.ui;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TextFieldElement;
 
 public class UIPollingTest extends MultiBrowserTest {
 
index b8baaff10256809d316ed158594fe589c3eee104..387d0d6723e88c57cb679e52b4ee497bf6512e0d 100644 (file)
@@ -8,15 +8,15 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.ComboBoxElement;
 import com.vaadin.testbench.customelements.DateFieldElement;
 import com.vaadin.testbench.customelements.FixedNotificationElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.customelements.WindowElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.TabSheetElement;
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public abstract class ThemeTest extends MultiBrowserTest {
 
index 4c14a370e259dc3b1ba4d643f33c1e003d8dffea..cebb4ba181c06e87aec357e9e9ffebaa23b25edf 100644 (file)
@@ -20,8 +20,8 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.TextAreaElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TextAreaElement;
 
 public class OpenModalWindowAndFocusFieldTest extends MultiBrowserTest {
 
index b48f252d2741773f145d599804ddb5dc46cd69fb..30182c70b149c2d325d832b0a7d70b34ff8b3a34 100644 (file)
@@ -9,8 +9,8 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.ComboBoxElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 public class TableQueryWithNonUniqueFirstPrimaryKeyTest
         extends MultiBrowserTest {
index 6bdbfe718ec0755e266c375edb2c1053acd2c176..fa5d6d7e2b0a2c5f08317a4e8d0ef52945cb0675 100644 (file)
@@ -20,8 +20,8 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.GridElement;
 
 public class GridContextClickTest extends AbstractContextClickTest {
 
index 9da14c13314c9f7b3d8b16512a0932e5cc6872d4..a7cd84e9aa3c3f48b633f7afa7f12c1bd061def6 100644 (file)
@@ -19,8 +19,8 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableContextClickTest extends TableContextClickTestBase {
 
index 84cf12a4dd814396c155fb04a7ee317da64c535d..74e9c017f18ca39948b56af7afc4baa1db8ea905 100644 (file)
@@ -17,7 +17,7 @@ package com.vaadin.tests.contextclick;
 
 import static org.junit.Assert.assertEquals;
 
-import com.vaadin.v7.testbench.customelements.TableElement;
+import com.vaadin.testbench.customelements.TableElement;
 
 public abstract class TableContextClickTestBase
         extends AbstractContextClickTest {
index f91b579d3512c3008277f2279b1ee769390d100c..99cb97885960ce0cd5d9d6ebcbcf2221b31f5e6d 100644 (file)
@@ -24,7 +24,7 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.By;
-import com.vaadin.v7.testbench.customelements.TreeElement;
+import com.vaadin.testbench.elements.TreeElement;
 
 public class TreeContextClickTest extends AbstractContextClickTest {
 
index fe3207c248454646956473a97cfe94d9c766647d..97c400c347117bf436c02f35431c1002e96fec74 100644 (file)
@@ -5,8 +5,8 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
+import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TextFieldElement;
 
 public class ConverterThatEnforcesAFormatTest extends MultiBrowserTest {
 
index ca19fdfa42f58567242ee35e0deb6a2fabb2b085..2bceb905c4dd220c4fea44657d739c10e6441896 100644 (file)
@@ -8,8 +8,8 @@ import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.elements.TreeElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TreeElement;
 
 public class DnDOnSubtreeTest extends MultiBrowserTest {
 
index ff430d29de461e4e420ff9d3a28fff7497c18d95..0fd537055c9f275101e47f9fa146282a7843b2c7 100644 (file)
@@ -25,13 +25,13 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
+import com.vaadin.testbench.customelements.DateFieldElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.GridElement.GridEditorElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.DateFieldElement;
-import com.vaadin.v7.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class BasicCrudGridEditorRowTest extends MultiBrowserTest {
index cab06c5c4ea68712fac07b62c1db721275071aef..33651ac7b88f2f64153b01676125d54b0165832d 100644 (file)
@@ -21,10 +21,10 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.testbench.AbstractHasTestBenchCommandExecutor;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.AbstractComponentElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2;
-import com.vaadin.v7.testbench.customelements.GridElement;
 
 public class BasicCrudGridTest extends SingleBrowserTestPhantomJS2 {
 
index b06331f7810872e95d762cccd969e779d827a135..0ee93caef43fa72647235d613301d599afa48d07 100644 (file)
@@ -21,10 +21,10 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.testbench.AbstractHasTestBenchCommandExecutor;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.AbstractComponentElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class BasicCrudTableTest extends SingleBrowserTest {
 
index c00fda6f9135f57ee2ea07a53e2f4db19f8ab4b8..3020eaa4d4aebc9db1e4a896a386085b214394ec 100644 (file)
@@ -19,14 +19,14 @@ import org.junit.Assert;
 
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.customelements.FixedNotificationElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.elements.TableRowElement;
+import com.vaadin.testbench.elements.TextAreaElement;
+import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.data.bean.Sex;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
-import com.vaadin.v7.testbench.customelements.TextAreaElement;
-import com.vaadin.v7.testbench.customelements.TextFieldElement;
 
 public abstract class BasicPersonFormTest extends MultiBrowserTest {
 
index ec11ea22f5135a9d8c5e082051e40d6ca139fcee..0e7e87294785c24306ce35247ca70febab503587 100644 (file)
@@ -5,11 +5,11 @@ import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.DateFieldElement;
+import com.vaadin.testbench.elements.InlineDateFieldElement;
+import com.vaadin.testbench.elements.PopupDateFieldElement;
+import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.DateFieldElement;
-import com.vaadin.v7.testbench.customelements.InlineDateFieldElement;
-import com.vaadin.v7.testbench.customelements.PopupDateFieldElement;
-import com.vaadin.v7.testbench.customelements.TextFieldElement;
 
 public class DateFormTest extends MultiBrowserTest {
 
index d0472bf5fb78594f73520e6c5d17646b88341349..17168ab0685f16987b91d5c8ef6d12ca5f400c49 100644 (file)
@@ -7,8 +7,8 @@ import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.LabelElement;
+import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TextFieldElement;
 
 public class MultipleValidationErrorsTest extends MultiBrowserTest {
 
index d832bbfb2d623dd90962e160d616a59b88065e2d..3f6dcb01acbd2281fbca864730f7407ab334af13 100644 (file)
@@ -22,8 +22,8 @@ import java.io.IOException;
 import org.junit.Test;
 import org.openqa.selenium.Keys;
 
+import com.vaadin.testbench.customelements.ComboBoxElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 public class FontIconsTest extends MultiBrowserTest {
 
index b17febee04eaa127b9c10e759c22655350cbf876..6a1d77317d9447eada4b6a19edae1644e27e0790 100644 (file)
@@ -24,8 +24,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized.Parameters;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.ParameterizedTB3Runner;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Base class for servlet integration tests. Automatically prepends "/demo" to
index e55cc36e3ea9d5c47b1b0711ba35a14dbdfc6299..44390e12886549ad77a621d810c589e8ff44f6dc 100644 (file)
@@ -7,11 +7,11 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.TableRowElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class NavigationTest extends SingleBrowserTest {
 
index 2ba0389f55a2429f9313c58e13dab6862991fa2a..255b69947e5db34cafcde4d1fc1c080040ebbfab 100644 (file)
@@ -21,9 +21,9 @@ import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
+import com.vaadin.testbench.elements.NativeSelectElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 @TestCategory("push")
 abstract class PushConfigurationTest extends MultiBrowserTest {
index 3026aa25a092dd433a740046408a12a7a7d44636..95c03d99597f6bfbd29afd32fa9bc44f21063a57 100644 (file)
@@ -3,9 +3,9 @@ package com.vaadin.tests.push;
 import org.junit.Test;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.elements.TextAreaElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TextAreaElement;
 
 @TestCategory("push")
 public abstract class SendMultibyteCharactersTest extends MultiBrowserTest {
index f54cf722ea7cf9685004da356bb246f274722204..7117090d5fe084e76fabee976d8d119dfc12a650 100644 (file)
@@ -23,14 +23,14 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
+import com.vaadin.testbench.customelements.ComboBoxElement;
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.EmbeddedElement;
 import com.vaadin.testbench.elements.MenuBarElement;
 import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class LegacyComponentThemeChangeTest extends MultiBrowserTest {
 
index eaae1acfd884a3a5c2ba600d4b2b81d18fa7b048..41b1ace31d66a6f2dc12bdfb8541318b107c79ba 100644 (file)
@@ -22,8 +22,8 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Test for non-collapsible column opacity for item in column configuration
index 1c654b81083fb40734bf516490aec872a7707fa3..4bdd9fc0f115c8c6aca99bfb377205b2dc7adf0f 100644 (file)
@@ -22,8 +22,8 @@ import static org.junit.Assert.assertThat;
 
 import org.junit.Test;
 
+import com.vaadin.testbench.elements.ColorPickerElement;
 import com.vaadin.tests.components.colorpicker.DefaultCaptionWidthTest;
-import com.vaadin.v7.testbench.customelements.ColorPickerElement;
 
 /**
  * Test for default caption behavior in color picker using Valo theme.
index 0156f99e51366ac9552538d8dad7464cebe080d0..9c55a029abdd1c4f5ebe14f778420a81def943b8 100644 (file)
@@ -26,9 +26,9 @@ import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.elements.CssLayoutElement;
 import com.vaadin.testbench.elements.LabelElement;
+import com.vaadin.testbench.elements.TreeElement;
 import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TreeElement;
 
 public class ValoThemeUITest extends MultiBrowserTest {
 
index 77cd2b669f664dcf7f1fd504d926318c52b9b031..4cb358f5c23e6fffc95044c14ea34977f704d801 100644 (file)
@@ -17,8 +17,8 @@ package com.vaadin.tests.tooltip;
 
 import org.junit.Test;
 
+import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.TooltipTest;
-import com.vaadin.v7.testbench.customelements.TextFieldElement;
 
 /**
  * Test to see if validators create error tooltips correctly.
index 3e88bf62dba8cd30dffc9af9ef5534995386bfeb..f8c1025975d1f3859fa653dac6ffa7f8e27d6f1d 100644 (file)
@@ -11,9 +11,9 @@ import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.elements.CheckBoxElement;
+import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.testbench.elements.VerticalLayoutElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.TextFieldElement;
 
 public class ValidationOfRequiredEmptyFieldsTest extends MultiBrowserTest {
 
index be3c4660b05877841f45bce91fdf4c858639f035..393be40f78bc575b90bc460bbcf4a7263b8a1237 100644 (file)
@@ -24,7 +24,7 @@ import org.junit.Test;
 import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.CustomRenderer;
 
 @TestCategory("grid")
index 7e0fca9043cefc938170e46b594af141b522f2f2..0e315fc280e118c3624a0b4e6ef78d2eb0b1a211 100644 (file)
@@ -21,7 +21,7 @@ import org.junit.Test;
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridAddAndRemoveDataOnInitTest extends MultiBrowserTest {
index 50acaf6ff78ab79f6fcdd64aab736eb45f563511..aa5e13a236d6654865c6f2bc2adfdff162d1be1c 100644 (file)
@@ -21,7 +21,7 @@ import org.junit.Test;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridAddRowTest extends MultiBrowserTest {
index b64a78c2dca8c701baaab64ac226f82f04320ad4..98d5b250fcc15a0c2f95b509d7fdede3214bf14d 100644 (file)
@@ -22,10 +22,10 @@ import java.io.IOException;
 import org.junit.Test;
 import org.openqa.selenium.By;
 
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elementsbase.ServerClass;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridCellFocusOnResetSizeTest extends MultiBrowserTest {
index 70d96f832b26a9b399d63d832deb5dbab8e85086..87c7a7cf721c1d73a7269883eede9d16d7654704 100644 (file)
@@ -19,10 +19,10 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.By;
 
+import com.vaadin.testbench.customelements.GridElement;
+import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.CheckBoxElement;
-import com.vaadin.v7.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridCheckBoxDisplayTest extends SingleBrowserTest {
index 980dafe35561b861ab8c96feff66530916ad5802..2a7e4cc9d1f0dd0b2f91dc7716969fbc200f9fc9 100644 (file)
@@ -28,16 +28,16 @@ import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.testbench.elements.NativeButtonElement;
+import com.vaadin.testbench.elements.NativeSelectElement;
 import com.vaadin.testbench.elementsbase.ServerClass;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.tests.widgetset.client.v7.grid.GridClientColumnRendererConnector.Renderers;
 import com.vaadin.tests.widgetset.server.v7.grid.GridClientColumnRenderers;
-import com.vaadin.v7.testbench.customelements.GridElement;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 /**
  * Tests Grid client side renderers
index c05e7675cace842340973bd12c3aaf0bfbf789dc..d57fd5a62f66ad06b44b2bc39482faa969842cc1 100644 (file)
@@ -26,7 +26,7 @@ import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridColspansTest extends MultiBrowserTest {
index a5370d5ba3017b8ba98eae204019f1f2f46cea32..99dc40ef1261cd7364372406667da9acf57d487d 100644 (file)
@@ -21,7 +21,7 @@ import org.junit.Test;
 
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridColumnAutoExpandTest extends MultiBrowserTest {
 
index 38bc158065b454b8713377295b687bdb6a9d89fe..9a1ca896d4de872d3cfda48c7fb515e00dbb7cb6 100644 (file)
@@ -25,4 +25,4 @@ public class GridColumnAutoWidthClientTest
     protected Class<?> getUIClass() {
         return GridColumnAutoWidthClient.class;
     }
-}
\ No newline at end of file
+}
index 8235d876965717065144ac71567dd8a661c68e79..44647c50fa7a7f8f8436e57b5753941aad785fea 100644 (file)
@@ -25,4 +25,4 @@ public class GridColumnAutoWidthServerTest
     protected Class<?> getUIClass() {
         return GridColumnAutoWidth.class;
     }
-}
\ No newline at end of file
+}
index 40e57fffd96d88536b3c5ec93144ccad8ab91c2c..de15148c14a5df54fcf23a9665fc5b75c3928c18 100644 (file)
@@ -24,7 +24,7 @@ import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridColumnWidthRecalculationTest extends SingleBrowserTest {
index c6c93526562be6ed5ae902923c66cbdecfbae610..81f0a83ea2cab52c821ec40944c14b53d4907d9e 100644 (file)
@@ -20,13 +20,13 @@ import java.util.List;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
+import com.vaadin.testbench.elements.NativeSelectElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 @TestCategory("grid")
 public class GridColumnWidthsWithoutDataTest extends SingleBrowserTest {
index 76b0d40ebdb905fd0c457f76213d876a7bb700f6..31c90c401dd2ac7ce52427b319c715da00663d95 100644 (file)
@@ -25,7 +25,7 @@ import org.openqa.selenium.Keys;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridCustomSelectionModelTest extends MultiBrowserTest {
index 7c1214dc4d3078a3de5edd0a0806784686f2514a..cc3d2ce5640f4912ed32deedb88ff17e2d8eee94 100644 (file)
@@ -22,7 +22,7 @@ import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridDataSourceResetTest extends SingleBrowserTest {
 
index 4534c13192430288099eb951b4705ac358062e5b..01d8e890f346df4e854cc593b2fe7f5e5e0a1edb 100644 (file)
@@ -23,7 +23,7 @@ import org.junit.Test;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridDefaultSelectionModeTest extends MultiBrowserTest {
 
index 3047d5dd2fc849ed3ca72958aa6a8f6798647380..bd29b3fabd2bd6b7d28486d8974acc093773e483 100644 (file)
@@ -25,7 +25,7 @@ import org.openqa.selenium.WebElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridDetailsDetachTest extends MultiBrowserTest {
index a3a507fca23c3b7622485f1b67260c9b6d8b1e22..f014b129f6cc910e1379722e516ff5e615808628 100644 (file)
@@ -28,7 +28,7 @@ import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 /**
  * Tests the layouting of Grid's details row when it contains a HorizontalLayout
index de8e4ea9c4984e7e6b795a7040d598bd487eb061..eabd38a461bf41ffa210f52da7330bf3346bad12 100644 (file)
@@ -36,7 +36,7 @@ import com.vaadin.testbench.elements.GridElement.GridRowElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridDetailsLocationTest extends MultiBrowserTest {
@@ -316,4 +316,4 @@ public class GridDetailsLocationTest extends MultiBrowserTest {
                 .findElement(By.className("v-grid-scroller-horizontal"));
         return scrollBar;
     }
-}
\ No newline at end of file
+}
index 458a0eeeb14619b3718b7c8e1440fab63aa3e390..d46743715181605d789a346b8771b6e36087ed1d 100644 (file)
@@ -25,7 +25,7 @@ import org.openqa.selenium.WebElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridDetailsWidthTest extends SingleBrowserTest {
index 44f3aab1aaba392c97f0e75bd6166ea9179de6e1..d822051992c824a3539b9476c1cb31c2791ba42e 100644 (file)
@@ -77,4 +77,4 @@ public class GridDisabledMultiselectTest extends MultiBrowserTest {
 
         assertThat(getFirstSelectCheckBox().isSelected(), is(false));
     }
-}
\ No newline at end of file
+}
index 0471fd77d5c770e8675bb7a30c43ec53bdf96bb2..390b4a801b4f9dd576cf2a201a68634a8ac82c7b 100644 (file)
@@ -85,4 +85,4 @@ public class GridDisabledSideBarTest extends GridBasicClientFeaturesTest {
 
         assertSideBarContainsClass("closed");
     }
-}
\ No newline at end of file
+}
index 9e3f8a49cc9a219c193ff5dbbd73a96223fddc7e..af5d77adcefdb302cfe2063ee07d85aef87875bd 100644 (file)
@@ -26,7 +26,7 @@ import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridDragSelectionWhileScrolledTest extends MultiBrowserTest {
index 32225283b715222a07e00143e0d4e7fc2ccb8627..453a9e8b1ff6b1c3309021bb3ce717068e3be068 100644 (file)
@@ -21,7 +21,7 @@ import org.junit.Test;
 
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridEditingWithNoScrollBarsTest extends MultiBrowserTest {
index 4f330c6af2865cd7f27235cbb84bb04d6dbb4e8d..e83329bce68b98362882a1ac1e7809f2ce663d94 100644 (file)
@@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.GridEditorConverterNotFound;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
 
index e330b4e16f06e2ab77ef5968d1eb9161bf2e8341..f7b56f53d6dc60274b40f5bb5a6197e0a81d1321 100644 (file)
@@ -19,11 +19,11 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.ComboBoxElement;
 import com.vaadin.testbench.elements.GridElement.GridEditorElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridEditorCustomFieldTest extends MultiBrowserTest {
index 4675a8e89facb8bfb91a9a9492569bcde3282d8a..37834756ad157e77e528e255477a77bc61e7c133 100644 (file)
@@ -27,7 +27,7 @@ import org.openqa.selenium.interactions.Actions;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridEditorFrozenColumnsUITest extends MultiBrowserTest {
index f1446152278c6c6d18412e3cc9d1ec944fb3ca23..dc3d39354532e86bf11474b56144311c71ffdf13 100644 (file)
@@ -9,7 +9,7 @@ import org.openqa.selenium.WebElement;
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridEditorMultiselectTest extends MultiBrowserTest {
index e51b5fd20c128266555a1e72061d56b32096cc25..c87159988ae6fccd5240826a555c298c5fdb5831 100644 (file)
@@ -26,12 +26,12 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.NotificationElement;
+import com.vaadin.testbench.elements.PasswordFieldElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
-import com.vaadin.v7.testbench.customelements.PasswordFieldElement;
 
 @TestCategory("grid")
 public class GridEditorUITest extends MultiBrowserTest {
index 2991cc5c19bdf70b8f90dfda838417da0c3cf730..c35263a63434b263d9a89ab12b3436c75bcf80ac 100644 (file)
@@ -22,7 +22,7 @@ import org.junit.Test;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridExtensionCommunicationTest extends SingleBrowserTest {
index 57ebb512391f55a88b03135868a5e277f8158abf..fa755484ebb96ddd83c25957bd559ea0daa3c8a9 100644 (file)
@@ -25,7 +25,7 @@ import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridGeneratedPropertiesTest extends MultiBrowserTest {
index bc11ab3411efc50270d7aa0097898d6137bd02b7..ae4d8e568fd4451bedc9fb5ef228125097d3b786 100644 (file)
@@ -26,7 +26,7 @@ import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridHeaderFooterComponentsTest extends SingleBrowserTest {
 
index 39dd75ef88865ab9464e21f88bd8e29947d33fe3..0d64db42759e8ec0be72b67724dd9f1a749ac8d0 100644 (file)
@@ -22,7 +22,7 @@ import org.openqa.selenium.By;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridHeaderFormatChangeTest extends MultiBrowserTest {
index ba7eca515c770fb884c83c267c6646a30831b9c7..11aea58da224bcf63435a4c10fd51f0e300de759 100644 (file)
@@ -25,7 +25,7 @@ import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridHeaderStyleNamesTest extends SingleBrowserTest {
index 15c8498676998a72a26f08ae37d5b523766a9527..a8a6980d3a043bd7c4550b0b0122075136df3731 100644 (file)
@@ -27,11 +27,10 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.By;
 
+import com.vaadin.testbench.customelements.GridElement;
+import com.vaadin.testbench.elements.OptionGroupElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
-import com.vaadin.v7.testbench.customelements.OptionGroupElement;
-import com.vaadin.v7.tests.components.grid.GridHeight;
 
 /**
  * Tests that Grid gets correct height based on height mode, and resizes
index 775d79397c1a0f3a4656ca3a21963f522941e247..1ebe898b24bf55c36c020d8ad55cb20f5af49de1 100644 (file)
@@ -25,7 +25,7 @@ import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.testbench.elements.TabSheetElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridInTabSheetTest extends MultiBrowserTest {
index 6f859a015e597feb80f748d21531049b8b9d62e2..0a94c108b52ed994120a0ff4e2115480fd59f598 100644 (file)
@@ -25,7 +25,7 @@ import org.openqa.selenium.remote.DesiredCapabilities;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridInWindowResizeTest extends MultiBrowserTest {
     @Override
index 509ef262db0a152ac5f96ee2896007a7e21071ae..e86d21b5d9e7b95529753f8e69d593bff04811fd 100644 (file)
@@ -24,7 +24,7 @@ import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridInitiallyHiddenColumnsTest extends SingleBrowserTest {
index e43e5a22a66bd1893240facf613d4857c2477ba0..63b5eec44037d34be1b9d0f9be3650d8a865582b 100644 (file)
@@ -21,7 +21,7 @@ import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridItemSetChangeTest extends SingleBrowserTest {
 
index 72de2efdf27f77fcbd2b92dba8dbd7ce901aa8be..cd744ea51efa64a67562534884a7650b31405d86 100644 (file)
@@ -25,7 +25,7 @@ import com.vaadin.testbench.elements.GridLayoutElement;
 import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 /**
  * Tests that details row displays GridLayout contents properly.
index d976b586fbc8cca22dca7c80602001cbaea12b06..79f6aecb028e5fa5fb7173e2b17e76f9aca5e788 100644 (file)
@@ -24,7 +24,7 @@ import org.openqa.selenium.By;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridMultiSelectionOnInitTest extends MultiBrowserTest {
index 757e577d78c64523f2567c6f763da0a6319e4e3e..eff1a69b3ca51677c38a3fdd8ef8f990da7501c5 100644 (file)
@@ -22,7 +22,7 @@ import java.io.IOException;
 import org.junit.Test;
 
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridMultiSelectionScrollBarTest extends MultiBrowserTest {
 
index 0b078b3b7d48b79159a234e4fc64ad676e0b2081..a96cad5e2041818596f64c3720ac06e86b2da5c8 100644 (file)
@@ -27,7 +27,7 @@ import org.openqa.selenium.By;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridRendererChangeTest extends MultiBrowserTest {
 
@@ -56,4 +56,4 @@ public class GridRendererChangeTest extends MultiBrowserTest {
                 cell.isElementPresent(By.tagName("button")));
     }
 
-}
\ No newline at end of file
+}
index 8e0071018b8692864b75b18348d4e523056eaacf..660722173ea6f16bd88a28cabce9309c355e1ca3 100644 (file)
@@ -20,7 +20,7 @@ import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridReplaceContainerTest extends SingleBrowserTest {
 
index 5e6d99e6d446ca5664cdb439428ebee515cb03e8..f2f76eeb31ed369d737fac6516d18d526bdd523a 100644 (file)
@@ -20,7 +20,7 @@ import org.junit.Test;
 
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridResizeAndScrollTest extends MultiBrowserTest {
 
index af8b8fe3edbced377d9645a54e1c2ce82fbf9e0b..e3e06c1da2de2f29c4138be170dc09a68a68899f 100644 (file)
@@ -28,7 +28,7 @@ import org.openqa.selenium.interactions.Actions;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridResizeHiddenColumnTest extends MultiBrowserTest {
 
index 0962ef5118a26187d244cb015a619471f548c382..7e30829cef24e3cd93cd4fb2d1053b0c570a67a8 100644 (file)
@@ -8,9 +8,9 @@ import java.util.List;
 import org.junit.Test;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.GridElement;
+import com.vaadin.testbench.elements.NativeSelectElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 public class GridRowHeightChangeTest extends MultiBrowserTest {
 
index bcb23a759c88feaa234841edae87f313b0b56506..66532e1f2496cc7078c6dc3e3d3cff2be77e659c 100644 (file)
@@ -25,7 +25,7 @@ import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridScrollToLineWhileResizingTest extends MultiBrowserTest {
@@ -46,4 +46,4 @@ public class GridScrollToLineWhileResizingTest extends MultiBrowserTest {
 
         assertTrue(foundCell21);
     }
-}
\ No newline at end of file
+}
index 56f6a01047a9d5758b45e512a13abec825d5163f..6b1feed7c15eedc5023fdcdb2ae6a17a60e83e5d 100644 (file)
@@ -11,7 +11,7 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridSelectAllCellTest extends MultiBrowserTest {
 
@@ -34,4 +34,4 @@ public class GridSelectAllCellTest extends MultiBrowserTest {
                 .findElement(By.cssSelector("input"));
         assertThat(selectAllCheckbox.isSelected(), is(true));
     }
-}
\ No newline at end of file
+}
index 0c8451d9ac50f616ac4a6810e5715fdc45b665e7..1bfe232379994b6f9b05cb93c4d4ad7a51ee414a 100644 (file)
@@ -25,7 +25,7 @@ import org.openqa.selenium.Point;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.GridSidebarPosition;
 
 public class GridSidebarPositionTest extends MultiBrowserTest {
index 23903f74ad2f91102bae155cdedf22840955f72b..a0d79ccc73a7fa194ed686f625b6f24e3bef6d5c 100644 (file)
@@ -22,7 +22,7 @@ import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridSingleColumnTest extends MultiBrowserTest {
index 5f35acc5077330a176c80928c89713428eded75d..61762301c2c8f8d900a05e9238f4742ff21f6316 100644 (file)
@@ -21,7 +21,7 @@ import org.junit.Test;
 
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridSortIndicatorTest extends MultiBrowserTest {
@@ -50,4 +50,4 @@ public class GridSortIndicatorTest extends MultiBrowserTest {
         assertTrue(grid.getHeaderCell(0, 1).getAttribute("class")
                 .contains("sort-desc"));
     }
-}
\ No newline at end of file
+}
index ed392d848ff27ef751870a7d2f4733f6a66e0cf3..03b9b780c539b4cef2c77986bf49922e6270dc6f 100644 (file)
@@ -24,7 +24,7 @@ import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.minitutorials.v7_5.ShowingExtraDataForRows;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 /**
  * Test for "Grid detail row outline overflows" (#17826)
index f47f2f2c05b35ccecb8c220761b4068a0dd1de70..989d9f60528eb98e42c0b93c08749698836e4b0c 100644 (file)
@@ -22,7 +22,7 @@ import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.GridElement.GridRowElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridSubPixelProblemWrappingTest extends MultiBrowserTest {
index 79c2e45a2853bfb7e3b457661208441f99fe512e..9ad5a73c9432dd9a3aa860d264e3a0b26a85835d 100644 (file)
@@ -21,7 +21,7 @@ import org.junit.Test;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridSwitchRenderersTest extends MultiBrowserTest {
index 175dd1e11a3dff5a44b4ebacbdea65d1211a1e3a..98ffec45701be8febd796c786096699dc6d17882 100644 (file)
@@ -23,7 +23,7 @@ import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class GridThemeChangeTest extends MultiBrowserTest {
index 7b2f8ae356353d608bc1374b2384285377bb3788..a8adc83b408763eb59de881a44a4f2d19b3c45b1 100644 (file)
@@ -21,15 +21,15 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
+import com.vaadin.testbench.customelements.DateFieldElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.GridElement.GridEditorElement;
+import com.vaadin.testbench.elements.NativeSelectElement;
+import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserThemeTest;
-import com.vaadin.v7.testbench.customelements.DateFieldElement;
-import com.vaadin.v7.testbench.customelements.GridElement;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
-import com.vaadin.v7.testbench.customelements.TextFieldElement;
 
 @TestCategory("grid")
 public class GridThemeUITest extends MultiBrowserThemeTest {
index fda1984ccf410406b919aea3c0d416b27f1601b5..f3ce36ee5a88c4fc7e86e49e6c5fdeb628923997 100644 (file)
@@ -26,7 +26,7 @@ import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.GridWidthIncrease;
 
 @TestCategory("grid")
index a6efe88e320d84f6ebeee933c2a1312e7f0ac596..c9bbe591d343e34bbb11ef76461df494ffb93c67 100644 (file)
@@ -19,7 +19,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridWithBrokenRendererTest extends SingleBrowserTest {
 
index 6524ee261dfb81df812c1e2d25ab413b53eaebba..e81fca56143c543bde640702cb701b79a8957bc8 100644 (file)
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class GridWithLabelEditorTest extends SingleBrowserTest {
 
index f5c6bf988925f40ad03651b3e35ecb308b773eba..522e6802c16897276822d2f0e483ed2f6656a41f 100644 (file)
@@ -24,7 +24,7 @@ import org.openqa.selenium.WebElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class InitialFrozenColumnsTest extends MultiBrowserTest {
index 206d597cc1e9c96af9129af0df769bcfe27df9e3..4d248a71292804c5faa142b6e0ce86e667b35383 100644 (file)
@@ -21,7 +21,7 @@ import org.junit.Test;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class JavaScriptRenderersTest extends MultiBrowserTest {
index fa1a9a7318d369956df14635259bb9c52befc234..013f29c678d9e1f4a483ec5bfde2a6ff747bdbe8 100644 (file)
@@ -19,7 +19,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 public class NullHeadersTest extends SingleBrowserTest {
 
index a8114467d7fe8f6990c83589754b9119486e757a..7ab958ecfdac0006257feb1db64269312386f308 100644 (file)
@@ -22,7 +22,7 @@ import org.junit.Test;
 import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.CustomRenderer;
 
 @TestCategory("grid")
index aae82d11886166e67be977436a3ce5e66607e208..911c9a986bbcd9adb99e4b41b6b67ab20ee904e5 100644 (file)
@@ -22,7 +22,7 @@ import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class ProgrammaticEditorControlTest extends SingleBrowserTest {
@@ -61,4 +61,4 @@ public class ProgrammaticEditorControlTest extends SingleBrowserTest {
         }
     }
 
-}
\ No newline at end of file
+}
index 7d9d62b45c6242df34fb8728a137168741fd76dc..052aae5a60a1b2fbfab36e6567ccc3af13dad03f 100644 (file)
@@ -20,7 +20,7 @@ import org.junit.Test;
 
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 
 @TestCategory("grid")
 public class SelectDuringInitTest extends SingleBrowserTest {
index 3d731e12855544fd59d7fbf2f3760ad2cf7cab1f..bef04bda7f7307a1981f55a689e69d47ed3292de 100644 (file)
@@ -18,9 +18,9 @@ package com.vaadin.v7.tests.components.grid;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.GridElement;
+import com.vaadin.testbench.elements.OptionGroupElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
-import com.vaadin.v7.testbench.customelements.OptionGroupElement;
 
 public class SortableHeaderStylesTest extends SingleBrowserTest {
     @Test
index e3e6c5ba98282e9edcba973436962f267708f4c1..3786c818d3433f58536962178c52128dad7ee332 100644 (file)
@@ -31,7 +31,7 @@ import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.WidgetRenderers;
 
 /**
index f4bd915ccee6cf29e2c626dc7f0217ac702d79fb..2eb8e3c59876c70fa618bd64e7b95dcb0ee65060 100644 (file)
@@ -21,8 +21,7 @@ import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.v7.testbench.customelements.GridElement;
-import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicClientFeatures;
+import com.vaadin.testbench.customelements.GridElement;
 
 /**
  * GridBasicClientFeatures.
index 5787c2faccd5ad36968d29e9dd531c3404cbee4a..ae6ef31cd535540883ded9236f5a0702ee1fb052 100644 (file)
@@ -28,11 +28,10 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
-import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeatures;
 
 @TestCategory("grid")
 public abstract class GridBasicFeaturesTest extends MultiBrowserTest {
index 4766a29018c08dc0589bf29a629c289c5ea74363..7969e55f66f1b4fcc3990d3aa1223b10c14b505e 100644 (file)
@@ -23,10 +23,10 @@ import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.GridCellFocusOnResetSizeTest.MyGridElement;
 
 @TestCategory("grid")
index de510535350f71e8cd942f6bab23b18b2c3715d0..a8094f01a225e470122591f05ebbcda3ef540d98 100644 (file)
@@ -2,9 +2,9 @@ package com.vaadin.v7.tests.components.grid.basicfeatures;
 
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
 
 @SuppressWarnings("all")
 @TestCategory("grid")
index a0ca71482426652598791202d761020d0b718782..2d90e654be6e1ded1e3c1bc5a1eb293124521c8d 100644 (file)
@@ -24,10 +24,10 @@ import java.util.List;
 
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
-import com.vaadin.tests.widgetset.client.v7.grid.GridBasicClientFeaturesWidget;
 import com.vaadin.testbench.elements.NotificationElement;
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.tests.widgetset.client.v7.grid.GridBasicClientFeaturesWidget;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicClientFeaturesTest;
 
 public class GridClientColumnPropertiesTest
index 5adae48d625cf7b4fd9785310b2fde3de93f7608..d7549bf5ffe191cd4a4cb5256c57e942da0a09e3 100644 (file)
@@ -22,7 +22,7 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicClientFeaturesTest;
 
 public class GridSidebarContentTest extends GridBasicClientFeaturesTest {
index 515c7dbdbffc04ccd4a8730bec51fae9c87f9ea1..1400349164621587ba9b6d85b81dfe8ce7962c1c 100644 (file)
@@ -21,7 +21,7 @@ import org.junit.Test;
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.interactions.Actions;
 
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
 
 public class GridCellFocusAdjustmentTest extends GridBasicFeaturesTest {
index 12636c7817e7d70868201bd09be4646bdb28d3b0..c9b1adbdedf0abec4da9b12967134dcff11777e3 100644 (file)
@@ -18,10 +18,10 @@ package com.vaadin.v7.tests.components.grid.basicfeatures.server;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.GridElement;
 
 /**
  * Tests that removing and adding rows doesn't cause an infinite loop in the
index 34fcea09fb0157ebdc08de973741165a97dfd595..f71ae9f6151735ad5a9744fcb9bf45906db5947f 100644 (file)
@@ -24,7 +24,7 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeatures;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
 
index d3fefddeeac1f28ba5ea0acd9d03a3abeb13f96a..4f10c5b72a9a8eead540bff30b65ccfff5b20598 100644 (file)
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
 
 public class GridScrollTest extends GridBasicFeaturesTest {
index 319848fec3d444cbfc579bd0331fa5fe530401ce..1bb989be1de7b8df6ce27c214f1670e32d168183 100644 (file)
@@ -26,9 +26,9 @@ import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.GridElement.GridRowElement;
-import com.vaadin.v7.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeatures;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
 
index 5cb6f59021758b6d56437e8fd04e2ee7ad2b62e6..969f975cddb54067a20f6a9acb5515b53d962bcf 100644 (file)
@@ -31,8 +31,8 @@ import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.shared.data.sort.SortDirection;
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
-import com.vaadin.v7.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeatures;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
 
index ed84b9d0561131500dd2e5742e6e61f6634c4afc..aa38f610830fd2a6409ec7fe032c8d04552fe210 100644 (file)
@@ -31,9 +31,9 @@ import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.NotificationElement;
-import com.vaadin.v7.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeatures;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
 
index 7d7e88f8c1913e26f32657085e3189303a7feeed..1b25aa22f40aaa0781926364037e5e8314257c23 100644 (file)
@@ -22,7 +22,7 @@ import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 
-import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.testbench.customelements.GridElement;
 import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
 
 public class LoadingIndicatorTest extends GridBasicFeaturesTest {
index cb33b9e93fa41531d5c7bf704f91a8e6feda836b..2ddb68988e0b47072f9abc71b95cdbddfb5ccfe2 100644 (file)
@@ -3,8 +3,8 @@ package com.vaadin.v7.tests.components.nativeselect;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.testbench.elements.NativeSelectElement;
 import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 public class NativeSelectNullTest extends SingleBrowserTestPhantomJS2 {
     @Test
index d0d9bcbe3da4c2303db79df23b8a2fc290619d4a..a9e7d1b624aaf8a2136b62214723284442250d9d 100644 (file)
@@ -20,10 +20,10 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.interactions.Actions;
 
+import com.vaadin.testbench.elements.NativeSelectElement;
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.components.nativeselect.NativeSelects;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 public class NativeSelectsFocusAndBlurListenerTests extends MultiBrowserTest {