diff options
| author | Teemu Suo-Anttila <tsuoanttila@users.noreply.github.com> | 2017-01-13 09:32:41 +0200 |
|---|---|---|
| committer | Pekka Hyvönen <pekka@vaadin.com> | 2017-01-13 09:32:41 +0200 |
| commit | 253a61c1957941759deff87518989a71c30fc301 (patch) | |
| tree | 90f26a96533daade29e536137efe5433144ac2cd | |
| parent | fd8696de945b8a3f3fa954ed56b4a48e3060d50a (diff) | |
| download | vaadin-framework-253a61c1957941759deff87518989a71c30fc301.tar.gz vaadin-framework-253a61c1957941759deff87518989a71c30fc301.zip | |
Fix TestBench API imports (#8112)
* Fix TestBench API imports, move functionality from custom elements
* Fixes to TestBench APIs and JavaDocs
* Merge remote-tracking branch 'origin/master' into 578_tbapi_cleanup
* Fix method name in CheckBoxGroupTest
* Remove unused custom element classes
* Implement getOptions using getOptionElements
* Replace setValue with setSelection in CheckBoxGroupElement
* Rename CheckBoxGroupElement getSelection to getValue
* Fix one last method
289 files changed, 483 insertions, 918 deletions
diff --git a/testbench-api/src/main/java/com/vaadin/testbench/elements/CheckBoxGroupElement.java b/testbench-api/src/main/java/com/vaadin/testbench/elements/CheckBoxGroupElement.java index ae6e65a62d..b24f5f69f8 100644 --- a/testbench-api/src/main/java/com/vaadin/testbench/elements/CheckBoxGroupElement.java +++ b/testbench-api/src/main/java/com/vaadin/testbench/elements/CheckBoxGroupElement.java @@ -16,7 +16,9 @@ package com.vaadin.testbench.elements; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; import org.openqa.selenium.WebElement; @@ -33,12 +35,18 @@ public class CheckBoxGroupElement extends AbstractSelectElement { private static org.openqa.selenium.By byRadioInput = By.tagName("input"); public List<String> getOptions() { - List<String> optionTexts = new ArrayList<String>(); - List<WebElement> options = findElements(bySelectOption); - for (WebElement option : options) { - optionTexts.add(option.findElement(byLabel).getText()); - } - return optionTexts; + return getOptionElements().stream() + .map(option -> option.findElement(byLabel).getText()) + .collect(Collectors.toList()); + } + + /** + * Gets the list of option elements for this check box group. + * + * @return list of option elements + */ + public List<WebElement> getOptionElements() { + return findElements(bySelectOption); } public void selectByText(String text) throws ReadOnlyException { @@ -55,11 +63,11 @@ public class CheckBoxGroupElement extends AbstractSelectElement { } /** - * Return list of the selected options in the checkbox group + * Return list of the selected options in the checkbox group. * * @return list of the selected options in the checkbox group */ - public List<String> getSelection() { + public List<String> getValue() { List<String> values = new ArrayList<>(); List<WebElement> options = findElements(bySelectOption); for (WebElement option : options) { @@ -75,13 +83,35 @@ public class CheckBoxGroupElement extends AbstractSelectElement { } /** - * Select option in the option group with the specified value. + * Sets the selected options for this checkbox group. + * + * @param options + * the options to select + * + * @see #getValue() + * @see #setValue(List) + */ + public void setValue(String... options) { + setValue(Arrays.asList(options)); + } + + /** + * Sets the selected options for this checkbox group. + * + * @param options + * the list of options to select * - * @param chars - * value of the option in the option group which will be selected + * @see #getValue() + * @see #setValue(String...) */ - public void setValue(CharSequence chars) throws ReadOnlyException { - selectByText((String) chars); + public void setValue(List<String> options) { + // Deselect everything that is not going to be selected again. + getValue().stream().filter(option -> !options.contains(option)) + .forEach(this::selectByText); + // Select everything that still needs selecting. + List<String> selection = getValue(); + options.stream().filter(option -> !selection.contains(option)) + .forEach(this::selectByText); } /** diff --git a/testbench-api/src/main/java/com/vaadin/testbench/elements/ComboBoxElement.java b/testbench-api/src/main/java/com/vaadin/testbench/elements/ComboBoxElement.java index dcd6725363..dd538cecc1 100644 --- a/testbench-api/src/main/java/com/vaadin/testbench/elements/ComboBoxElement.java +++ b/testbench-api/src/main/java/com/vaadin/testbench/elements/ComboBoxElement.java @@ -226,7 +226,7 @@ public class ComboBoxElement extends AbstractSelectElement { * @return the input field element */ public WebElement getInputField() { - return findElement(By.xpath("input")); + return findElement(By.vaadin("#textbox")); } private void ensurePopupOpen() { @@ -234,4 +234,41 @@ public class ComboBoxElement extends AbstractSelectElement { openPopup(); } } + + @Override + public String getText() { + return getInputField().getAttribute("value"); + } + + @Override + public void clear() { + getInputField().clear(); + } + + @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) { + } + } + } } diff --git a/testbench-api/src/main/java/com/vaadin/testbench/elements/MenuBarElement.java b/testbench-api/src/main/java/com/vaadin/testbench/elements/MenuBarElement.java index 18b4240578..8c54b0584c 100644 --- a/testbench-api/src/main/java/com/vaadin/testbench/elements/MenuBarElement.java +++ b/testbench-api/src/main/java/com/vaadin/testbench/elements/MenuBarElement.java @@ -37,7 +37,7 @@ public class MenuBarElement extends AbstractComponentElement { * If the item is another submenu, that submenu is opened.<br> * If the item is not a submenu, it will be clicked and trigger any actions * associated to it. - * + * * @param item * name of the item to click * @throws NullPointerException diff --git a/testbench-api/src/main/java/com/vaadin/testbench/elements/TableElement.java b/testbench-api/src/main/java/com/vaadin/testbench/elements/TableElement.java index 68a42533b1..da167805e8 100644 --- a/testbench-api/src/main/java/com/vaadin/testbench/elements/TableElement.java +++ b/testbench-api/src/main/java/com/vaadin/testbench/elements/TableElement.java @@ -147,4 +147,32 @@ public class TableElement extends AbstractSelectElement { } } + /** + * Opens the collapse menu of this table and returns the element for it. + * + * @return collapse menu element + */ + public CollapseMenuElement openCollapseMenu() { + getCollapseMenuToggle().click(); + WebElement cm = getDriver() + .findElement(By.xpath("//*[@id='PID_VAADIN_CM']")); + return wrapElement(cm, getCommandExecutor()) + .wrap(CollapseMenuElement.class); + } + + /** + * Element representing a collapse menu of a Table. + */ + public static class CollapseMenuElement extends ContextMenuElement { + } + + /** + * Gets the button that shows or hides the collapse menu. + * + * @return button for opening collapse menu + */ + public WebElement getCollapseMenuToggle() { + return findElement(By.className("v-table-column-selector")); + } + } diff --git a/testbench-api/src/main/java/com/vaadin/testbench/elements/WindowElement.java b/testbench-api/src/main/java/com/vaadin/testbench/elements/WindowElement.java index 08c1a2f28d..39b5bfa830 100644 --- a/testbench-api/src/main/java/com/vaadin/testbench/elements/WindowElement.java +++ b/testbench-api/src/main/java/com/vaadin/testbench/elements/WindowElement.java @@ -17,6 +17,7 @@ package com.vaadin.testbench.elements; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; +import org.openqa.selenium.interactions.Actions; import com.vaadin.testbench.elementsbase.ServerClass; @@ -91,4 +92,22 @@ public class WindowElement extends PanelElement { return findElement(By.className(HEADER_CLASS)).getText(); } + /** + * Moves the window by given offset. + * + * @param xOffset + * x offset + * @param yOffset + * y offset + */ + public void move(int xOffset, int yOffset) { + Actions action = new Actions(getDriver()); + action.moveToElement( + findElement(org.openqa.selenium.By.className("v-window-wrap")), + 5, 5); + action.clickAndHold(); + action.moveByOffset(xOffset, yOffset); + action.release(); + action.build().perform(); + } } 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 deleted file mode 100644 index 627e579ef7..0000000000 --- a/uitest-common/src/main/java/com/vaadin/testbench/customelements/CalendarElement.java +++ /dev/null @@ -1,57 +0,0 @@ -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 { - @Override - public List<WebElement> getWeekNumbers() { - return findElements(By.className("v-calendar-week-number")); - } - - @Override - public boolean hasMonthView() { - return isElementPresent(By.className("v-calendar-week-numbers")); - } - - @Override - public boolean hasWeekView() { - return isElementPresent(By.className("v-calendar-header-week")); - } - - @Override - public List<WebElement> getDayNumbers() { - return findElements(By.className("v-calendar-day-number")); - } - - @Override - public List<WebElement> getMonthDays() { - return findElements(By.className("v-calendar-month-day")); - } - - @Override - public boolean hasDayView() { - return getDayHeaders().size() == 1; - } - - @Override - public List<WebElement> getDayHeaders() { - return findElements(By.className("v-calendar-header-day")); - } - - @Override - public void back() { - findElement(By.className("v-calendar-back")).click(); - } - - @Override - public void next() { - findElement(By.className("v-calendar-next")).click(); - } -} diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/CheckBoxGroupElement.java b/uitest-common/src/main/java/com/vaadin/testbench/customelements/CheckBoxGroupElement.java deleted file mode 100644 index e8a05cb194..0000000000 --- a/uitest-common/src/main/java/com/vaadin/testbench/customelements/CheckBoxGroupElement.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright 2000-2014 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.testbench.customelements; - -import java.util.ArrayList; -import java.util.List; - -import org.openqa.selenium.WebElement; - -import com.vaadin.testbench.By; - -/** - * TestBench element supporting CheckBoxGroup - * - * @author Vaadin Ltd - */ -public class CheckBoxGroupElement - extends com.vaadin.testbench.elements.CheckBoxGroupElement { - private static org.openqa.selenium.By byButtonSpan = By - .className("v-select-option"); - private static org.openqa.selenium.By byLabel = By.tagName("label"); - private static org.openqa.selenium.By byInput = By.tagName("input"); - - public List<String> getOptionsCssClasses() { - List<String> optionTexts = new ArrayList<>(); - List<WebElement> options = findElements(byButtonSpan); - for (WebElement option : options) { - optionTexts.add(option.getAttribute("class")); - } - return optionTexts; - } - - public List<String> getOptionsIconUrls() { - List<String> icons = new ArrayList<>(); - List<WebElement> options = findElements(byButtonSpan); - for (WebElement option : options) { - List<WebElement> images = option.findElements(By.tagName("img")); - if (images != null && images.size() > 0) { - icons.add(images.get(0).getAttribute("src")); - } else { - icons.add(null); - } - - } - return icons; - } - - /** - * Return list of the selected options in the checkbox group - * - * @return list of the selected options in the checkbox group - */ - public List<String> getSelection() { - List<String> values = new ArrayList<>(); - List<WebElement> options = findElements(byButtonSpan); - for (WebElement option : options) { - WebElement checkedItem; - checkedItem = option.findElement(By.tagName("input")); - String checked = checkedItem.getAttribute("checked"); - if (checked != null - && checkedItem.getAttribute("checked").equals("true")) { - values.add(option.findElement(By.tagName("label")).getText()); - } - } - return values; - } - - /** - * Select option in the checkbox group with the specified value - * - * @param chars - * value of the option in the checkbox group which will be - * selected - */ - public void selectOption(CharSequence chars) throws ReadOnlyException { - selectByText((String) chars); - } - - @Override - public void clear() { - throw new UnsupportedOperationException( - "Clear operation is not supported for CheckBoxGroup." - + " This operation has no effect on the element."); - } - -} diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/ComboBoxElement.java b/uitest-common/src/main/java/com/vaadin/testbench/customelements/ComboBoxElement.java deleted file mode 100644 index 89bddf309f..0000000000 --- a/uitest-common/src/main/java/com/vaadin/testbench/customelements/ComboBoxElement.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.vaadin.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.ui.ComboBox") -public class ComboBoxElement - extends com.vaadin.testbench.elements.ComboBoxElement { - - private static org.openqa.selenium.By bySuggestionPopup = By - .vaadin("#popup"); - - @Override - public WebElement getInputField() { - return findElement(By.vaadin("#textbox")); - } - - @Override - public String getText() { - return getInputField().getAttribute("value"); - } - - @Override - public void clear() { - getInputField().clear(); - } - - @Override - 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/testbench/customelements/FixedNotificationElement.java b/uitest-common/src/main/java/com/vaadin/testbench/customelements/FixedNotificationElement.java deleted file mode 100644 index 696cbeb95c..0000000000 --- a/uitest-common/src/main/java/com/vaadin/testbench/customelements/FixedNotificationElement.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.vaadin.testbench.customelements; - -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.ui.ExpectedConditions; -import org.openqa.selenium.support.ui.WebDriverWait; - -import com.vaadin.testbench.By; -import com.vaadin.testbench.elements.NotificationElement; -import com.vaadin.testbench.elementsbase.ServerClass; - -@ServerClass("com.vaadin.ui.Notification") -public class FixedNotificationElement extends NotificationElement { - @Override - public String getCaption() { - WebElement popup = findElement(By.className("popupContent")); - WebElement caption = popup.findElement(By.tagName("h1")); - return caption.getText(); - } - - @Override - public void close() { - click(5, 5); - WebDriverWait wait = new WebDriverWait(getDriver(), 10); - wait.until(ExpectedConditions - .not(ExpectedConditions.presenceOfAllElementsLocatedBy( - By.className("v-Notification")))); - } -} diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/GridElement.java b/uitest-common/src/main/java/com/vaadin/testbench/customelements/GridElement.java deleted file mode 100644 index f0ba310023..0000000000 --- a/uitest-common/src/main/java/com/vaadin/testbench/customelements/GridElement.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.vaadin.testbench.customelements; - -import org.openqa.selenium.NoSuchElementException; - -import com.vaadin.testbench.By; -import com.vaadin.testbench.TestBenchElement; -import com.vaadin.testbench.elementsbase.ServerClass; - -@ServerClass("com.vaadin.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 - */ - @Override - 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/testbench/customelements/MenuBarElement.java b/uitest-common/src/main/java/com/vaadin/testbench/customelements/MenuBarElement.java deleted file mode 100644 index 55a0785e3d..0000000000 --- a/uitest-common/src/main/java/com/vaadin/testbench/customelements/MenuBarElement.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.vaadin.testbench.customelements; - -import com.vaadin.testbench.By; -import com.vaadin.testbench.elementsbase.ServerClass; - -@ServerClass("com.vaadin.ui.MenuBar") -public class MenuBarElement - extends com.vaadin.testbench.elements.MenuBarElement { - - public void openMenuPath(String... captions) { - for (String c : captions) { - findElement(By.vaadin("#" + c)).click(); - } - } -} diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/NativeSelectElement.java b/uitest-common/src/main/java/com/vaadin/testbench/customelements/NativeSelectElement.java deleted file mode 100644 index a183951a29..0000000000 --- a/uitest-common/src/main/java/com/vaadin/testbench/customelements/NativeSelectElement.java +++ /dev/null @@ -1,76 +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.testbench.customelements; - -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; - -@ServerClass("com.vaadin.ui.NativeSelect") -public class NativeSelectElement extends AbstractSelectElement { - private Select selectElement; - - @Override - protected void init() { - super.init(); - selectElement = new Select(findElement(By.tagName("select"))); - } - - public List<TestBenchElement> getOptions() { - return wrapElements(selectElement.getOptions(), getCommandExecutor()); - } - - public void selectByText(String text) throws ReadOnlyException { - if (isReadOnly()) { - throw new ReadOnlyException(); - } - selectElement.selectByVisibleText(text); - waitForVaadin(); - } - - /** - * Clear operation is not supported for Native Select. This operation has no - * effect on Native Select element. - */ - @Override - public void clear() { - super.clear(); - } - - /** - * Return value of the selected item in the native select element - * - * @return value of the selected item in the native select element - */ - public String getValue() { - return selectElement.getFirstSelectedOption().getText(); - } - - /** - * Select item of the native select element with the specified value - * - * @param chars - * value of the native select item will be selected - */ - public void setValue(CharSequence chars) throws ReadOnlyException { - selectByText((String) chars); - } -} diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/ProgressBarElement.java b/uitest-common/src/main/java/com/vaadin/testbench/customelements/ProgressBarElement.java deleted file mode 100644 index 78b6ffb4c4..0000000000 --- a/uitest-common/src/main/java/com/vaadin/testbench/customelements/ProgressBarElement.java +++ /dev/null @@ -1,39 +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.testbench.customelements; - -import org.openqa.selenium.By; -import org.openqa.selenium.WebElement; - -import com.vaadin.testbench.elementsbase.ServerClass; - -@ServerClass("com.vaadin.ui.ProgressBar") -public class ProgressBarElement - extends com.vaadin.testbench.elements.ProgressBarElement { - - @Override - public double getValue() { - WebElement indicator = findElement( - By.className("v-progressbar-indicator")); - String width = getStyleAttribute(indicator, "width"); - if (!width.endsWith("%")) { - return 0; - } - - return Double.parseDouble(width.replace("%", "")) / 100.0; - } - -} diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/RadioButtonGroupElement.java b/uitest-common/src/main/java/com/vaadin/testbench/customelements/RadioButtonGroupElement.java deleted file mode 100644 index ce62ddd4be..0000000000 --- a/uitest-common/src/main/java/com/vaadin/testbench/customelements/RadioButtonGroupElement.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright 2000-2014 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.testbench.customelements; - -import java.util.ArrayList; -import java.util.List; - -import org.openqa.selenium.WebElement; - -import com.vaadin.testbench.By; - -/** - * TestBench element supporting RadioButtonGroup - * - * @author Vaadin Ltd - */ - -public class RadioButtonGroupElement - extends com.vaadin.testbench.elements.RadioButtonGroupElement { - private static org.openqa.selenium.By byButtonSpan = By - .className("v-select-option"); - - /** - * Return list of the selected options in the radiobutton group - * - * @return list of the selected options in the radiobutton group - */ - public List<String> getSelection() { - List<String> values = new ArrayList<>(); - List<WebElement> options = findElements(byButtonSpan); - for (WebElement option : options) { - WebElement checkedItem; - checkedItem = option.findElement(By.tagName("input")); - String checked = checkedItem.getAttribute("checked"); - if (checked != null - && checkedItem.getAttribute("checked").equals("true")) { - values.add(option.findElement(By.tagName("label")).getText()); - } - } - return values; - } - - /** - * Select option in the radiobutton group with the specified value - * - * @param chars - * value of the option in the radiobutton group which will be - * selected - */ - public void selectOption(CharSequence chars) throws ReadOnlyException { - selectByText((String) chars); - } - - @Override - public void clear() { - throw new UnsupportedOperationException( - "Clear operation is not supported for RadioButtonGroup." - + " This operation has no effect on the element."); - } -} 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 deleted file mode 100644 index 28432fade9..0000000000 --- a/uitest-common/src/main/java/com/vaadin/testbench/customelements/TableElement.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.vaadin.testbench.customelements; - -import org.openqa.selenium.By; -import org.openqa.selenium.WebElement; - -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")); - } - -} diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/WindowElement.java b/uitest-common/src/main/java/com/vaadin/testbench/customelements/WindowElement.java deleted file mode 100644 index eae6019b96..0000000000 --- a/uitest-common/src/main/java/com/vaadin/testbench/customelements/WindowElement.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.vaadin.testbench.customelements; - -import org.openqa.selenium.WebElement; -import org.openqa.selenium.interactions.Actions; - -import com.vaadin.testbench.By; -import com.vaadin.testbench.elementsbase.ServerClass; - -/* - Suggestions for new elemental api for Window - */ -@ServerClass("com.vaadin.ui.Window") -public class WindowElement extends com.vaadin.testbench.elements.WindowElement { - - private final String restoreBoxClass = "v-window-restorebox"; - private final String maximizeBoxClass = "v-window-maximizebox"; - private final String closeBoxClass = "v-window-closebox"; - - @Override - public void restore() { - if (isMaximized()) { - getRestoreButton().click(); - } else { - throw new AssertionError( - "Window is not maximized, cannot be restored."); - } - } - - private WebElement getRestoreButton() { - return findElement(By.className("v-window-restorebox")); - } - - @Override - public void maximize() { - if (!isMaximized()) { - getMaximizeButton().click(); - } else { - throw new AssertionError( - "Window is already maximized, cannot maximize."); - } - } - - private WebElement getMaximizeButton() { - return findElement(By.className(maximizeBoxClass)); - } - - public void move(int xOffset, int yOffset) { - Actions action = new Actions(getDriver()); - action.moveToElement( - findElement(org.openqa.selenium.By.className("v-window-wrap")), - 5, 5); - action.clickAndHold(); - action.moveByOffset(xOffset, yOffset); - action.release(); - action.build().perform(); - } - - /** - * @return the caption of the window - */ - @Override - public String getCaption() { - return findElement(By.className("v-window-header")).getText(); - } - - private WebElement getCloseButton() { - return findElement(By.className(closeBoxClass)); - } - - @Override - public void close() { - getCloseButton().click(); - - } -} diff --git a/uitest/src/main/java/com/vaadin/tests/elements/checkboxgroup/CheckBoxGroupSetValue.java b/uitest/src/main/java/com/vaadin/tests/elements/checkboxgroup/CheckBoxGroupSetSelection.java index acc86d16ef..7576b29f74 100644 --- a/uitest/src/main/java/com/vaadin/tests/elements/checkboxgroup/CheckBoxGroupSetValue.java +++ b/uitest/src/main/java/com/vaadin/tests/elements/checkboxgroup/CheckBoxGroupSetSelection.java @@ -7,7 +7,7 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.CheckBoxGroup; -public class CheckBoxGroupSetValue extends AbstractTestUI { +public class CheckBoxGroupSetSelection extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/test/java/com/vaadin/tests/application/TerminalErrorNotificationTest.java b/uitest/src/test/java/com/vaadin/tests/application/TerminalErrorNotificationTest.java index 499f3296dc..8d55ee74d7 100644 --- a/uitest/src/test/java/com/vaadin/tests/application/TerminalErrorNotificationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/application/TerminalErrorNotificationTest.java @@ -3,7 +3,6 @@ package com.vaadin.tests.application; import org.junit.Assert; import org.junit.Test; -import com.vaadin.testbench.customelements.FixedNotificationElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.NotificationElement; import com.vaadin.tests.tb3.MultiBrowserTest; @@ -15,6 +14,6 @@ public class TerminalErrorNotificationTest extends MultiBrowserTest { $(ButtonElement.class).first().click(); Assert.assertTrue(isElementPresent(NotificationElement.class)); Assert.assertEquals("Got an exception: You asked for it", - $(FixedNotificationElement.class).first().getCaption()); + $(NotificationElement.class).first().getCaption()); } } diff --git a/uitest/src/test/java/com/vaadin/tests/application/VaadinSessionAttributeTest.java b/uitest/src/test/java/com/vaadin/tests/application/VaadinSessionAttributeTest.java index c3bfb832f8..9eea10a528 100644 --- a/uitest/src/test/java/com/vaadin/tests/application/VaadinSessionAttributeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/application/VaadinSessionAttributeTest.java @@ -19,8 +19,8 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.vaadin.testbench.customelements.FixedNotificationElement; import com.vaadin.testbench.elements.ButtonElement; +import com.vaadin.testbench.elements.NotificationElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class VaadinSessionAttributeTest extends MultiBrowserTest { @@ -30,7 +30,7 @@ public class VaadinSessionAttributeTest extends MultiBrowserTest { openTestURL(); $(ButtonElement.class).first().click(); assertEquals("notification does not contain suitable text", "42 & 84", - $(FixedNotificationElement.class).first().getCaption()); + $(NotificationElement.class).first().getCaption()); } } diff --git a/uitest/src/test/java/com/vaadin/tests/applicationcontext/CloseSessionTest.java b/uitest/src/test/java/com/vaadin/tests/applicationcontext/CloseSessionTest.java index 7375bb21ab..84f6085bb8 100644 --- a/uitest/src/test/java/com/vaadin/tests/applicationcontext/CloseSessionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/applicationcontext/CloseSessionTest.java @@ -4,8 +4,8 @@ import org.junit.Assert; import org.junit.Test; import com.vaadin.testbench.By; -import com.vaadin.testbench.customelements.FixedNotificationElement; import com.vaadin.testbench.elements.ButtonElement; +import com.vaadin.testbench.elements.NotificationElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class CloseSessionTest extends MultiBrowserTest { @@ -93,7 +93,7 @@ public class CloseSessionTest extends MultiBrowserTest { private void assertSessionExpired() { String expected = "Session Expired"; - String actual = $(FixedNotificationElement.class).first().getCaption(); + String actual = $(NotificationElement.class).first().getCaption(); Assert.assertEquals("Unexpected notification,", actual, expected); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayoutTest.java index c2ec77fee3..cd8b6f86d0 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayoutTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayoutTest.java @@ -19,7 +19,7 @@ import org.junit.Test; import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.ui.ExpectedCondition; -import com.vaadin.testbench.customelements.ProgressBarElement; +import com.vaadin.testbench.elements.ProgressBarElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.SingleBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/TooltipPositionTest.java b/uitest/src/test/java/com/vaadin/tests/components/TooltipPositionTest.java index c366fb11ea..734da84932 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/TooltipPositionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/TooltipPositionTest.java @@ -170,4 +170,4 @@ public class TooltipPositionTest extends MultiBrowserTest { || yTop >= windowSize.getHeight()); return !(overlapHorizontally && overlapVertically); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupFocusBlurTest.java b/uitest/src/test/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupFocusBlurTest.java index 734a80eb2a..e512d92493 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupFocusBlurTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupFocusBlurTest.java @@ -24,7 +24,7 @@ import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; -import com.vaadin.testbench.customelements.CheckBoxGroupElement; +import com.vaadin.testbench.elements.CheckBoxGroupElement; import com.vaadin.testbench.elements.LabelElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupTest.java b/uitest/src/test/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupTest.java index db630511f1..ea2bf8f875 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupTest.java @@ -21,8 +21,10 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; import org.junit.Assert; import org.junit.Before; @@ -31,7 +33,7 @@ import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import com.vaadin.server.FontAwesome; -import com.vaadin.testbench.customelements.CheckBoxGroupElement; +import com.vaadin.testbench.elements.CheckBoxGroupElement; import com.vaadin.tests.components.checkbox.CheckBoxGroupTestUI; import com.vaadin.tests.tb3.MultiBrowserTest; @@ -194,7 +196,7 @@ public class CheckBoxGroupTest extends MultiBrowserTest { private void assertSelected(String... expectedSelection) { Assert.assertEquals(Arrays.asList(expectedSelection), - getSelect().getSelection()); + getSelect().getValue()); } @Override @@ -230,7 +232,9 @@ public class CheckBoxGroupTest extends MultiBrowserTest { @Test public void testDisabled() { - List<String> optionsCssClasses = getSelect().getOptionsCssClasses(); + List<String> optionsCssClasses = getSelect().getOptionElements() + .stream().map(e -> e.getAttribute("class")) + .collect(Collectors.toList()); for (int i = 0; i < optionsCssClasses.size(); i++) { String cssClassList = optionsCssClasses.get(i); if (i == 10) { @@ -245,7 +249,15 @@ public class CheckBoxGroupTest extends MultiBrowserTest { @Test public void testIconUrl() { - List<String> optionsIcons = getSelect().getOptionsIconUrls(); + List<String> optionsIcons = new ArrayList<>(); + for (WebElement option : getSelect().getOptionElements()) { + List<WebElement> images = option.findElements(By.tagName("img")); + if (images.size() > 0) { + optionsIcons.add(images.get(0).getAttribute("src")); + } else { + optionsIcons.add(null); + } + } for (int i = 0; i < optionsIcons.size(); i++) { String icon = optionsIcons.get(i); if (i == 2) { diff --git a/uitest/src/test/java/com/vaadin/tests/components/checkboxgroup/DisabledCheckBoxGroupTest.java b/uitest/src/test/java/com/vaadin/tests/components/checkboxgroup/DisabledCheckBoxGroupTest.java index 00d6d81cca..f8fcbdda0f 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/checkboxgroup/DisabledCheckBoxGroupTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/checkboxgroup/DisabledCheckBoxGroupTest.java @@ -20,7 +20,7 @@ import java.util.List; import org.junit.Assert; import org.junit.Test; -import com.vaadin.testbench.customelements.CheckBoxGroupElement; +import com.vaadin.testbench.elements.CheckBoxGroupElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxAutoresetValueTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxAutoresetValueTest.java index b3a34b7edb..42d28165a7 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxAutoresetValueTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxAutoresetValueTest.java @@ -18,7 +18,7 @@ package com.vaadin.tests.components.combobox; import org.junit.Assert; import org.junit.Test; -import com.vaadin.testbench.customelements.ComboBoxElement; +import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.tests.tb3.SingleBrowserTest; public class ComboBoxAutoresetValueTest extends SingleBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxBorderTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxBorderTest.java index 50a20b33ef..bba0e3d651 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxBorderTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxBorderTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.openqa.selenium.Keys; import org.openqa.selenium.interactions.Actions; -import com.vaadin.testbench.customelements.ComboBoxElement; +import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.testbench.elements.LabelElement; import com.vaadin.tests.tb3.MultiBrowserTest; @@ -36,4 +36,4 @@ public class ComboBoxBorderTest extends MultiBrowserTest { actions.moveToElement($(LabelElement.class).first()).perform(); compareScreen("arrow"); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClickIconTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClickIconTest.java index 969af8eca2..f60e3b5f67 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClickIconTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClickIconTest.java @@ -19,7 +19,7 @@ import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.By; -import com.vaadin.testbench.customelements.ComboBoxElement; +import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java index 27ef1e247c..606f406db0 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java @@ -21,7 +21,7 @@ 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.ComboBoxElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class ComboBoxClosePopupRetainTextTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java index 0b582d48c4..bff1b9843d 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java @@ -19,7 +19,7 @@ import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.Keys; -import com.vaadin.testbench.customelements.ComboBoxElement; +import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class ComboBoxCombinedWithEnterShortcutTest extends MultiBrowserTest { @@ -34,4 +34,4 @@ public class ComboBoxCombinedWithEnterShortcutTest extends MultiBrowserTest { Assert.assertEquals("1. Button clicked. ComboBox value: Berlin", getLogRow(0)); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigationTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigationTest.java index 5c0d08a994..c41de54aea 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigationTest.java @@ -10,7 +10,7 @@ import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; import com.vaadin.testbench.By; -import com.vaadin.testbench.customelements.ComboBoxElement; +import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2; public class ComboBoxEmptyItemsKeyboardNavigationTest @@ -67,4 +67,4 @@ public class ComboBoxEmptyItemsKeyboardNavigationTest combobox.findElements(bySuggestionPopup).isEmpty()); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItemsTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItemsTest.java index 5eb1c372c8..c26e51e89c 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItemsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItemsTest.java @@ -21,7 +21,7 @@ import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.ui.ExpectedCondition; import com.vaadin.testbench.By; -import com.vaadin.testbench.customelements.ComboBoxElement; +import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.testbench.parallel.BrowserUtil; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java index 3ddea898b4..3216d8595d 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import com.vaadin.testbench.customelements.ComboBoxElement; +import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java index ed2765ff3a..134ea05fac 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java @@ -21,7 +21,7 @@ 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.ComboBoxElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java index 39e23a4ec7..ed6da0317a 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.combobox; import org.junit.Test; -import com.vaadin.testbench.customelements.ComboBoxElement; +import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class ComboBoxItemIconTest extends MultiBrowserTest { @@ -29,4 +29,4 @@ public class ComboBoxItemIconTest extends MultiBrowserTest { compareScreen("fi-au-selected"); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java index 8e498d091c..bb839eb591 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import com.vaadin.testbench.customelements.ComboBoxElement; +import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.tests.tb3.SingleBrowserTest; public class ComboBoxItemStyleGeneratorTest extends SingleBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java index a6f4fb72fd..e2dcd8ca10 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java @@ -5,7 +5,7 @@ import org.openqa.selenium.Keys; import org.openqa.selenium.interactions.Actions; import com.vaadin.testbench.By; -import com.vaadin.testbench.customelements.ComboBoxElement; +import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.testbench.elements.NativeSelectElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnterTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnterTest.java index 1200b778a1..aa335057a5 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnterTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnterTest.java @@ -28,7 +28,7 @@ import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.support.ui.ExpectedCondition; import com.vaadin.testbench.By; -import com.vaadin.testbench.customelements.ComboBoxElement; +import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.testbench.elements.LabelElement; import com.vaadin.testbench.parallel.BrowserUtil; import com.vaadin.tests.tb3.MultiBrowserTest; @@ -102,4 +102,4 @@ public class ComboBoxMouseSelectEnterTest extends MultiBrowserTest { }); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxNoTextInputTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxNoTextInputTest.java index 054b24525a..0f7d858e63 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxNoTextInputTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxNoTextInputTest.java @@ -21,7 +21,7 @@ import org.openqa.selenium.WebElement; import com.vaadin.testbench.By; import com.vaadin.testbench.commands.TestBenchElementCommands; -import com.vaadin.testbench.customelements.ComboBoxElement; +import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.testbench.elements.CheckBoxElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java index 9cba77ed72..313a769b46 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java @@ -24,7 +24,7 @@ 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.testbench.elements.ComboBoxElement; import com.vaadin.tests.tb3.MultiBrowserTest; import com.vaadin.v7.client.ui.VFilterSelect; diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrollsTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrollsTest.java index d34380b5bd..9ff02b6f2d 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrollsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrollsTest.java @@ -19,7 +19,7 @@ import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.WebElement; -import com.vaadin.testbench.customelements.ComboBoxElement; +import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class ComboBoxPopupWhenBodyScrollsTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java index 9dba2ee435..93aa5c1d8a 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java @@ -21,7 +21,7 @@ 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.ComboBoxElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabledTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabledTest.java index 858a5630c9..f308ddadcb 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabledTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabledTest.java @@ -17,7 +17,7 @@ package com.vaadin.tests.components.combobox; import org.junit.Test; -import com.vaadin.testbench.customelements.ComboBoxElement; +import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.testbench.elements.LabelElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java index fc199b9a38..2e40d16abe 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java @@ -27,7 +27,7 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.ui.ExpectedCondition; import com.vaadin.testbench.By; -import com.vaadin.testbench.customelements.ComboBoxElement; +import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingTest.java index 4ae2a4e8c5..cf3450a14f 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingTest.java @@ -9,7 +9,7 @@ import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.ui.ExpectedCondition; import com.vaadin.testbench.By; -import com.vaadin.testbench.customelements.ComboBoxElement; +import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.testbench.elements.LabelElement; import com.vaadin.testbench.parallel.BrowserUtil; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowedTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowedTest.java index b568ecf912..0765c2781a 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowedTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowedTest.java @@ -24,7 +24,7 @@ import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.ui.ExpectedCondition; import com.vaadin.testbench.By; -import com.vaadin.testbench.customelements.ComboBoxElement; +import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.testbench.elements.LabelElement; import com.vaadin.testbench.parallel.BrowserUtil; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java index d650ef8146..6dcbac3f40 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java @@ -24,7 +24,7 @@ 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.elements.ComboBoxElement; import com.vaadin.testbench.parallel.BrowserUtil; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java index 29dfee3cb7..96e1b7c167 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java @@ -25,7 +25,7 @@ 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.ComboBoxElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class ComboBoxSuggestionPageLengthTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupCloseTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupCloseTest.java index 0eeae42508..8c9e526955 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupCloseTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupCloseTest.java @@ -24,7 +24,7 @@ import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; import com.vaadin.testbench.By; -import com.vaadin.testbench.customelements.ComboBoxElement; +import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacyTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacyTest.java index 671e54fca5..f9036f573b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacyTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacyTest.java @@ -19,7 +19,7 @@ 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.ComboBoxElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentageTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentageTest.java index b96e7af3aa..32b9c8e4f0 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentageTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentageTest.java @@ -21,7 +21,7 @@ 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.ComboBoxElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixelsTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixelsTest.java index d37c0e8fb6..5bb68e8063 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixelsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixelsTest.java @@ -21,7 +21,7 @@ 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.ComboBoxElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthTest.java index 485bc107bb..16ad59bd4f 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthTest.java @@ -21,7 +21,7 @@ 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.ComboBoxElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java index e16c321d8a..d25eee2ef5 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java @@ -25,7 +25,7 @@ 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.ComboBoxElement; import com.vaadin.testbench.elements.VerticalLayoutElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java index 0d8bc8b7b0..48ba71fe60 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java @@ -20,7 +20,7 @@ import static org.hamcrest.Matchers.is; import org.junit.Test; -import com.vaadin.testbench.customelements.ComboBoxElement; +import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.testbench.elements.LabelElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java index 5965353541..1d2aa64237 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java @@ -21,7 +21,7 @@ import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; -import com.vaadin.testbench.customelements.ComboBoxElement; +import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.testbench.elements.MenuBarElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPopupScrollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPopupScrollingTest.java index 9739316f4d..8e15030231 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPopupScrollingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPopupScrollingTest.java @@ -19,7 +19,7 @@ import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import com.vaadin.testbench.customelements.ComboBoxElement; +import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class ComboboxPopupScrollingTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidthTest.java index bea1ee770f..560bb6c03a 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidthTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidthTest.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.vaadin.testbench.customelements.ComboBoxElement; +import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java index 7ddcbf7173..c95894112d 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java @@ -21,8 +21,8 @@ import org.junit.Assert; import org.junit.Test; import com.vaadin.testbench.By; -import com.vaadin.testbench.customelements.ComboBoxElement; -import com.vaadin.testbench.customelements.NativeSelectElement; +import com.vaadin.testbench.elements.ComboBoxElement; +import com.vaadin.testbench.elements.NativeSelectElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class FilteringTurkishLocaleTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibilityTest.java b/uitest/src/test/java/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibilityTest.java index 48e681c8c5..44c39b5c5f 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibilityTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibilityTest.java @@ -26,4 +26,4 @@ public class CustomComponentChildVisibilityTest extends MultiBrowserTest { return $(LabelElement.class).all().size() > 1; } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffsetTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffsetTest.java index 62ba7b293e..9817ec4394 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffsetTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffsetTest.java @@ -41,4 +41,4 @@ public class DateFieldDayResolutionOffsetTest extends MultiBrowserTest { dateField.findElement(By.tagName("button")).click(); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldElementTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldElementTest.java index ce87676cc2..cc572c0957 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldElementTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldElementTest.java @@ -23,4 +23,4 @@ public class DateFieldElementTest extends SingleBrowserTest { protected Class<?> getUIClass() { return DateFieldElementUI.class; } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInputTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInputTest.java index dd8b2585e6..d92657b5c6 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInputTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInputTest.java @@ -40,4 +40,4 @@ public class DateFieldKeyboardInputTest extends MultiBrowserTest { assertTrue("Changing the date failed.", numLabelsAfterUpdate == numLabelsBeforeUpdate + 1); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingTest.java index 09267cfa65..4e3119a3cf 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingTest.java @@ -79,4 +79,4 @@ public class DateFieldPopupClosingTest extends MultiBrowserTest { getToggleButton().click(); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java b/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java index 3b9d69601d..9b800fa524 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java @@ -22,7 +22,7 @@ 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.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.FormLayoutElement; import com.vaadin.testbench.parallel.BrowserUtil; diff --git a/uitest/src/test/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java index 3897c8a14a..763d1937cb 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java @@ -7,7 +7,7 @@ import org.junit.Test; import org.openqa.selenium.Keys; import org.openqa.selenium.interactions.Actions; -import com.vaadin.testbench.customelements.TableElement; +import com.vaadin.testbench.elements.TableElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class TableInFormLayoutCausesScrollingTest extends MultiBrowserTest { @@ -27,4 +27,4 @@ public class TableInFormLayoutCausesScrollingTest extends MultiBrowserTest { compareScreen("scrolledDown"); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/CustomRendererTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/CustomRendererTest.java index 4e79de561e..d6a20be6ea 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/CustomRendererTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/CustomRendererTest.java @@ -21,7 +21,7 @@ import java.util.List; import org.junit.Test; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.LabelElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridApplyFilterWhenScrolledDownTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridApplyFilterWhenScrolledDownTest.java index 8e18aeedd1..7f667eea1d 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridApplyFilterWhenScrolledDownTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridApplyFilterWhenScrolledDownTest.java @@ -41,4 +41,4 @@ public class GridApplyFilterWhenScrolledDownTest extends MultiBrowserTest { + ", should be smaller than grid height: " + gridHeight, scrollerHeight < gridHeight); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSizeTest.java index e58d940a3d..a8f8df4ec7 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSizeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSizeTest.java @@ -22,7 +22,7 @@ import java.io.IOException; import org.junit.Test; import org.openqa.selenium.By; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elementsbase.ServerClass; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCheckBoxDisplayTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCheckBoxDisplayTest.java index 57229c9a4d..0a667ffcb6 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCheckBoxDisplayTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCheckBoxDisplayTest.java @@ -19,7 +19,7 @@ import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.By; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.CheckBoxElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.SingleBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColspansTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColspansTest.java index bd1cf1a27b..2d0a12187d 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColspansTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColspansTest.java @@ -22,7 +22,7 @@ import org.junit.Before; import org.junit.Test; import org.openqa.selenium.By; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.parallel.TestCategory; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java index be8f122c99..e60418cfc0 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java @@ -22,7 +22,7 @@ import java.util.List; import org.junit.Test; import org.openqa.selenium.remote.DesiredCapabilities; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnHidingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnHidingTest.java index 57ef8fbc42..a8a1d8f229 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnHidingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnHidingTest.java @@ -26,7 +26,7 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; import com.vaadin.testbench.By; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.elements.LabelElement; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutDataTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutDataTest.java index 6797353728..b85e6cb4d8 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutDataTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutDataTest.java @@ -20,7 +20,7 @@ import java.util.List; import org.junit.Assert; import org.junit.Test; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.elements.NativeSelectElement; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCustomSelectionModelTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCustomSelectionModelTest.java index d6a4c0b33c..32d03d594c 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCustomSelectionModelTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCustomSelectionModelTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.Keys; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDataSourceResetTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDataSourceResetTest.java index 4e3ce3e4c8..eff5edb63a 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDataSourceResetTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDataSourceResetTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.SingleBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java index 1d313899a2..b8b12c3e51 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsDetachTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsDetachTest.java index 5ede362f29..2967d210ab 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsDetachTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsDetachTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java index c1f4ee7e5e..71b1124d19 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java @@ -24,7 +24,7 @@ import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.remote.DesiredCapabilities; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.LabelElement; import com.vaadin.testbench.parallel.Browser; import com.vaadin.testbench.parallel.TestCategory; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsWidthTest.java index 7c4ebb536c..b82ad3b363 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsWidthTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsWidthTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.SingleBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolledTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolledTest.java index 5690263336..78e1f77071 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolledTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolledTest.java @@ -24,7 +24,7 @@ import org.junit.Test; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.interactions.Actions; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class GridDragSelectionWhileScrolledTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBarsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBarsTest.java index c0db4f0d35..833dd72588 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBarsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBarsTest.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorCustomFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorCustomFieldTest.java index 77d54dd93b..a53a822a97 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorCustomFieldTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorCustomFieldTest.java @@ -20,8 +20,8 @@ import org.junit.Test; import org.openqa.selenium.Keys; import com.vaadin.testbench.TestBenchElement; -import com.vaadin.testbench.customelements.ComboBoxElement; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.ComboBoxElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.GridElement.GridEditorElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUITest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUITest.java index e2a932f452..9d5d283722 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUITest.java @@ -24,7 +24,7 @@ import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java index 1034012311..95581505ee 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java @@ -7,7 +7,7 @@ import org.junit.Test; import org.openqa.selenium.WebElement; import com.vaadin.testbench.By; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInitTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInitTest.java index 09be45414b..b5b78af560 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInitTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInitTest.java @@ -27,7 +27,7 @@ import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java index 0dc00e3c5b..93935f7524 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java @@ -21,7 +21,7 @@ import java.io.IOException; import org.junit.Test; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class GridMultiSelectionScrollBarTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridNoSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridNoSelectionTest.java index d0e36dec6d..2525344703 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridNoSelectionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridNoSelectionTest.java @@ -9,7 +9,7 @@ import org.openqa.selenium.By; import org.openqa.selenium.Keys; import org.openqa.selenium.interactions.Actions; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.tests.components.grid.basics.GridBasicsTest; public class GridNoSelectionTest extends GridBasicsTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectionTest.java index 97dbf07d1f..912a1eb996 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectionTest.java @@ -11,7 +11,7 @@ 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; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.elements.GridElement.GridRowElement; import com.vaadin.tests.components.grid.basics.GridBasicsTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/InitiallyDisabledGridTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/InitiallyDisabledGridTest.java index 8e15183435..b1f3cba508 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/InitiallyDisabledGridTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/InitiallyDisabledGridTest.java @@ -7,7 +7,7 @@ import org.junit.Test; import org.openqa.selenium.WebElement; import com.vaadin.testbench.By; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.tests.tb3.SingleBrowserTest; @@ -35,4 +35,4 @@ public class InitiallyDisabledGridTest extends SingleBrowserTest { GridCellElement col0 = grid.getCell(80, 0); Assert.assertEquals("First 80", col0.getText()); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java index ca5ded736e..2cfb65d7ad 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java @@ -18,7 +18,7 @@ package com.vaadin.tests.components.grid; import org.junit.Assert; import org.junit.Test; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridColumnResizeModeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridColumnResizeModeTest.java index f92366cdb4..908c8c3cec 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridColumnResizeModeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridColumnResizeModeTest.java @@ -24,7 +24,7 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; import com.vaadin.testbench.By; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.components.grid.basics.GridBasicsTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridBasicsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridBasicsTest.java index 5a88be9690..caec06b3f5 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridBasicsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridBasicsTest.java @@ -14,7 +14,7 @@ import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.remote.DesiredCapabilities; import com.vaadin.testbench.TestBenchElement; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.elements.GridElement.GridEditorElement; import com.vaadin.testbench.parallel.Browser; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridEditorUnbufferedTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridEditorUnbufferedTest.java index aac69d90f5..1d32e91d43 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridEditorUnbufferedTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridEditorUnbufferedTest.java @@ -243,4 +243,4 @@ public class GridEditorUnbufferedTest extends GridEditorTest { assertEquals("Edited value was not saved.", "Foo", getGridElement().getCell(5, 0).getText()); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutFocusOrderAfterShowChildTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutFocusOrderAfterShowChildTest.java index f36e46d73c..c8bce3a7aa 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutFocusOrderAfterShowChildTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutFocusOrderAfterShowChildTest.java @@ -85,4 +85,4 @@ public class GridLayoutFocusOrderAfterShowChildTest extends MultiBrowserTest { Assert.assertEquals("t5", driver.switchTo().activeElement().getAttribute("id")); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java index dd76651415..4c1db430f6 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java @@ -18,4 +18,4 @@ public class MoveComponentsFromGridLayoutToInnerLayoutTest compareScreen("buttonClicked"); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JSComponentLoadingIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JSComponentLoadingIndicatorTest.java index 4532b22937..c88ea234f6 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JSComponentLoadingIndicatorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JSComponentLoadingIndicatorTest.java @@ -26,4 +26,4 @@ public class JSComponentLoadingIndicatorTest extends SingleBrowserTest { Assert.assertEquals(2, findElements(By.className("pong")).size()); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java index 35982dda9f..98651b2759 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java @@ -3,7 +3,7 @@ package com.vaadin.tests.components.menubar; import org.junit.Assert; import org.junit.Test; -import com.vaadin.testbench.customelements.MenuBarElement; +import com.vaadin.testbench.elements.MenuBarElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class MenuBarNavigationMouseTest extends MultiBrowserTest { @@ -17,14 +17,14 @@ public class MenuBarNavigationMouseTest extends MultiBrowserTest { public void testMenuBarMouseNavigation() throws Exception { openTestURL(); MenuBarElement menuBar = $(MenuBarElement.class).first(); - menuBar.openMenuPath("File", "Export..", "As PDF..."); + menuBar.clickItem("File", "Export..", "As PDF..."); Assert.assertEquals("1. MenuItem File/Export../As PDF... selected", getLogRow(0)); - menuBar.openMenuPath("Edit", "Copy"); + menuBar.clickItem("Edit", "Copy"); Assert.assertEquals("2. MenuItem Edit/Copy selected", getLogRow(0)); - menuBar.openMenuPath("Help"); + menuBar.clickItem("Help"); Assert.assertEquals("3. MenuItem Help selected", getLogRow(0)); - menuBar.openMenuPath("File", "Exit"); + menuBar.clickItem("File", "Exit"); Assert.assertEquals("4. MenuItem File/Exit selected", getLogRow(0)); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarsWithNestingTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarsWithNestingTest.java index 12a5c1a77c..85d76b0f29 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarsWithNestingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarsWithNestingTest.java @@ -80,4 +80,4 @@ public class MenuBarsWithNestingTest extends MultiBrowserTest { label.getWrappedElement(), itemName)); } } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectCaptionGenerationTest.java b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectCaptionGenerationTest.java index 445c11e889..8eecbc4563 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectCaptionGenerationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectCaptionGenerationTest.java @@ -6,7 +6,7 @@ import org.junit.Assert; import org.junit.Test; import com.vaadin.testbench.TestBenchElement; -import com.vaadin.testbench.customelements.NativeSelectElement; +import com.vaadin.testbench.elements.NativeSelectElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.SingleBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectFocusBlurTest.java b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectFocusBlurTest.java index 8e3c0e197f..f6bb38c6f4 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectFocusBlurTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectFocusBlurTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.openqa.selenium.Keys; import com.vaadin.testbench.TestBenchElement; -import com.vaadin.testbench.customelements.NativeSelectElement; +import com.vaadin.testbench.elements.NativeSelectElement; import com.vaadin.testbench.elements.LabelElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectInitTest.java b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectInitTest.java index 6bbda95e1e..8fefd2af5d 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectInitTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectInitTest.java @@ -18,7 +18,7 @@ package com.vaadin.tests.components.nativeselect; import org.junit.Assert; import org.junit.Test; -import com.vaadin.testbench.customelements.NativeSelectElement; +import com.vaadin.testbench.elements.NativeSelectElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** diff --git a/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectTest.java b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectTest.java index abb7acb428..23b248c672 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectTest.java @@ -21,7 +21,7 @@ import org.junit.Before; import org.junit.Test; import com.vaadin.testbench.TestBenchElement; -import com.vaadin.testbench.customelements.NativeSelectElement; +import com.vaadin.testbench.elements.NativeSelectElement; import com.vaadin.testbench.elements.AbstractComponentElement.ReadOnlyException; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicatorTest.java index e826385adb..7d080bd862 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicatorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicatorTest.java @@ -50,4 +50,4 @@ public class TooltipOnRequiredIndicatorTest extends TooltipTest { By.className("v-required-field-indicator")), "Horizontal layout tooltip"); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/popupview/DisabledPopupViewTest.java b/uitest/src/test/java/com/vaadin/tests/components/popupview/DisabledPopupViewTest.java index be33fc3067..e647a41082 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/popupview/DisabledPopupViewTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/popupview/DisabledPopupViewTest.java @@ -18,4 +18,4 @@ public class DisabledPopupViewTest extends MultiBrowserTest { assertFalse($(ButtonElement.class).exists()); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/radiobuttongroup/DisabledRadioButtonGroupTest.java b/uitest/src/test/java/com/vaadin/tests/components/radiobuttongroup/DisabledRadioButtonGroupTest.java index b54737dd72..67867eff11 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/radiobuttongroup/DisabledRadioButtonGroupTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/radiobuttongroup/DisabledRadioButtonGroupTest.java @@ -20,7 +20,7 @@ import java.util.List; import org.junit.Assert; import org.junit.Test; -import com.vaadin.testbench.customelements.RadioButtonGroupElement; +import com.vaadin.testbench.elements.RadioButtonGroupElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** diff --git a/uitest/src/test/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupFocusBlurTest.java b/uitest/src/test/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupFocusBlurTest.java index 16889cfbf0..7b8ef04341 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupFocusBlurTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupFocusBlurTest.java @@ -24,7 +24,7 @@ import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; -import com.vaadin.testbench.customelements.RadioButtonGroupElement; +import com.vaadin.testbench.elements.RadioButtonGroupElement; import com.vaadin.testbench.elements.LabelElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupTest.java b/uitest/src/test/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupTest.java index c0e0b9cd63..20f207acc9 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/radiobuttongroup/RadioButtonGroupTest.java @@ -18,7 +18,6 @@ package com.vaadin.tests.components.radiobuttongroup; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import java.util.Arrays; import java.util.List; import org.junit.Assert; @@ -28,7 +27,7 @@ import org.openqa.selenium.WebElement; import com.vaadin.server.FontAwesome; import com.vaadin.testbench.By; -import com.vaadin.testbench.customelements.RadioButtonGroupElement; +import com.vaadin.testbench.elements.RadioButtonGroupElement; import com.vaadin.tests.components.radiobutton.RadioButtonGroupTestUI; import com.vaadin.tests.tb3.MultiBrowserTest; @@ -190,9 +189,8 @@ public class RadioButtonGroupTest extends MultiBrowserTest { assertSelected("Item 5"); } - private void assertSelected(String... expectedSelection) { - Assert.assertEquals(Arrays.asList(expectedSelection), - getSelect().getSelection()); + private void assertSelected(String expectedSelection) { + Assert.assertEquals(expectedSelection, getSelect().getValue()); } @Override diff --git a/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java b/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java index be72a67f5f..0e64b0c9f9 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java @@ -22,8 +22,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.testbench.elements.ComboBoxElement; +import com.vaadin.testbench.elements.NativeSelectElement; import com.vaadin.tests.tb3.SingleBrowserTest; public class EnumSelectTest extends SingleBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximumTest.java b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximumTest.java index 2eae66b898..ea112669f4 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximumTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximumTest.java @@ -257,4 +257,4 @@ public class SplitPanelWithMinimumAndMaximumTest extends MultiBrowserTest { splitter.getCssValue("bottom").replace("px", "")); } } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java index 56da15f6e6..38beca87aa 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java @@ -20,7 +20,7 @@ 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.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java index 7f0947fc2d..d7d0b1c201 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java @@ -23,7 +23,7 @@ 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.elements.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.TableElement.ContextMenuElement; import com.vaadin.testbench.parallel.BrowserUtil; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java index 9fdf5413cf..98b10b9ce0 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java @@ -9,7 +9,7 @@ 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.TableElement; import com.vaadin.testbench.elements.TableHeaderElement; import com.vaadin.tests.tb3.MultiBrowserTest; @@ -35,4 +35,4 @@ public class ColumnReorderingWithManyColumnsTest extends MultiBrowserTest { actions.moveToElement(target, 10, 10); actions.perform(); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java index accb428992..0f8050d804 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java @@ -10,7 +10,7 @@ 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.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java index fbd7501f75..64f324d6f7 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java @@ -8,7 +8,7 @@ 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.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java index 1a8152f61a..3596920db6 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java @@ -26,7 +26,7 @@ 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.testbench.elements.TableElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java index a0fd3e7a21..c0588eb932 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java @@ -20,7 +20,7 @@ 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.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/FooterClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/FooterClickTest.java index f3ff1623f8..e7eeea3156 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/FooterClickTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/FooterClickTest.java @@ -24,7 +24,7 @@ import java.util.Arrays; import org.junit.Test; import com.vaadin.testbench.TestBenchElement; -import com.vaadin.testbench.customelements.TableElement; +import com.vaadin.testbench.elements.TableElement; import com.vaadin.testbench.elements.CheckBoxElement; import com.vaadin.testbench.elements.TextFieldElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java index 13b5a49509..abb6f0b634 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java @@ -25,7 +25,7 @@ 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.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.CheckBoxElement; import com.vaadin.testbench.elements.TextFieldElement; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderClickTest.java index 4071b6a5df..38bd4dca8e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderClickTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderClickTest.java @@ -22,7 +22,7 @@ import java.io.IOException; import org.junit.Test; import com.vaadin.testbench.TestBenchElement; -import com.vaadin.testbench.customelements.TableElement; +import com.vaadin.testbench.elements.TableElement; import com.vaadin.testbench.elements.CheckBoxElement; import com.vaadin.testbench.elements.TextFieldElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java index 7a04c72c08..33ca73aee6 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java @@ -23,7 +23,7 @@ import java.util.Arrays; import org.junit.Test; import org.openqa.selenium.By; -import com.vaadin.testbench.customelements.TableElement; +import com.vaadin.testbench.elements.TableElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java index 0b388bcd22..59407f3c74 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java @@ -20,7 +20,7 @@ import java.io.IOException; import org.junit.Test; import com.vaadin.testbench.TestBenchElement; -import com.vaadin.testbench.customelements.TableElement; +import com.vaadin.testbench.elements.TableElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java index 78ceadc34a..8188b0dfdb 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java @@ -22,7 +22,7 @@ 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.TableElement; import com.vaadin.testbench.elements.WindowElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java index 3b6cf0ffaa..67d7dbcf0d 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java @@ -19,7 +19,7 @@ import java.io.IOException; import org.junit.Test; -import com.vaadin.testbench.customelements.TableElement; +import com.vaadin.testbench.elements.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java index 95e948f957..10d16b67a3 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java @@ -20,7 +20,7 @@ import java.io.IOException; import org.junit.Test; import com.vaadin.testbench.TestBenchElement; -import com.vaadin.testbench.customelements.TableElement; +import com.vaadin.testbench.elements.TableElement; import com.vaadin.testbench.elements.CheckBoxElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTest.java index e482bbac47..ada20c141b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTest.java @@ -22,7 +22,7 @@ import org.junit.Before; import org.junit.Test; import com.vaadin.testbench.TestBenchElement; -import com.vaadin.testbench.customelements.TableElement; +import com.vaadin.testbench.elements.TableElement; import com.vaadin.testbench.elements.CheckBoxElement; import com.vaadin.testbench.elements.LabelElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java b/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java index 0391547353..f36a29fda1 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java @@ -26,7 +26,7 @@ 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.TableElement; import com.vaadin.testbench.elements.CheckBoxElement; import com.vaadin.testbench.elements.LabelElement; import com.vaadin.testbench.parallel.Browser; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java index 186edc714a..5a3e421bda 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java @@ -23,7 +23,7 @@ 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.TableElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java index 3272db77f0..01c83d6d98 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java @@ -10,7 +10,7 @@ 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.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.MultiBrowserTest; @@ -62,4 +62,4 @@ public class LongMultiselectTest extends MultiBrowserTest { scrollTable(getTable(), ROWCOUNT, LASTSELECTEDROW); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java index 8e004c26a7..acf8e5359c 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java @@ -24,7 +24,7 @@ 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.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java b/uitest/src/test/java/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java index 54be135ff8..f87ee0102e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java @@ -18,7 +18,7 @@ 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.TableElement; import com.vaadin.tests.tb3.SingleBrowserTest; import com.vaadin.v7.shared.ui.table.CollapseMenuContent; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java index fcf7a020ad..e201b2ad96 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java @@ -9,7 +9,7 @@ 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.TableElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class ReloadWidgetsTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java index 054d467151..bd83dd6ec4 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java @@ -26,7 +26,7 @@ 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.TableElement; import com.vaadin.testbench.elements.CheckBoxElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsTest.java index 46a8f79b51..8342cfa0fa 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsTest.java @@ -30,7 +30,7 @@ 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.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.LabelElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SelectableEditableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SelectableEditableTest.java index 57da274fbd..8b5b54cfaa 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/SelectableEditableTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/SelectableEditableTest.java @@ -3,7 +3,7 @@ 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.TableElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class SelectableEditableTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java index bf381a982b..4926c653fa 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java @@ -23,7 +23,7 @@ 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.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SortLabelsInTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SortLabelsInTableTest.java index 0045fd9bf7..e2bc775c06 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/SortLabelsInTableTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/SortLabelsInTableTest.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.vaadin.testbench.customelements.TableElement; +import com.vaadin.testbench.elements.TableElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SortableHeaderStylesTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SortableHeaderStylesTest.java index 6756feb705..53d4cfb849 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/SortableHeaderStylesTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/SortableHeaderStylesTest.java @@ -18,7 +18,7 @@ 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.TableElement; import com.vaadin.testbench.elements.OptionGroupElement; import com.vaadin.tests.tb3.SingleBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableBlurFocusTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableBlurFocusTest.java index 9fa2a62390..0920c24c57 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableBlurFocusTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableBlurFocusTest.java @@ -23,7 +23,7 @@ import java.util.Arrays; import org.junit.Test; import org.openqa.selenium.By; -import com.vaadin.testbench.customelements.TableElement; +import com.vaadin.testbench.elements.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java index 923546c13d..0f2bb1579d 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java @@ -25,7 +25,7 @@ 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.TableElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java index 25f8abbc1f..ffd0ee919c 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertFalse; import org.junit.Test; -import com.vaadin.testbench.customelements.TableElement; +import com.vaadin.testbench.elements.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.NotificationElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java index 736fb5a701..c4d60de804 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java @@ -26,7 +26,7 @@ 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.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java index 89a545bf1b..ceff8c1d82 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java @@ -18,7 +18,7 @@ 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.TableElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class TableColumnWidthsAndSortingTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java index 75fb500564..1eab7f22e4 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java @@ -7,7 +7,7 @@ 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.testbench.elements.TableElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class TableContextMenuAndIconsTest extends MultiBrowserTest { @@ -61,4 +61,4 @@ public class TableContextMenuAndIconsTest extends MultiBrowserTest { new Actions(driver).contextClick(cell).perform(); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java index 00cf5bfda4..fe061ae3e0 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java @@ -21,7 +21,7 @@ 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.TableElement; import com.vaadin.testbench.elements.TableHeaderElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java index 7d10cfae2a..e793b835e6 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java @@ -23,7 +23,7 @@ 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.TableElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** @@ -78,4 +78,4 @@ public class TableDropIndicatorValoTest extends MultiBrowserTest { new Actions(getDriver()).moveToElement(cellContents.get(1)) .clickAndHold().moveByOffset(0, oneAndAHalfRow).perform(); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java index ff6b5f7285..5febb3609b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java @@ -24,7 +24,7 @@ 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.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java index 632053af6d..083dd0bfc4 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java @@ -24,7 +24,7 @@ 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.TableElement; import com.vaadin.testbench.elements.CheckBoxElement; import com.vaadin.tests.tb3.TooltipTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java index 8c684becea..2f0ebda0b1 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java @@ -25,7 +25,7 @@ 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.TableElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java index 9df559502d..f7429d5e59 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java @@ -29,7 +29,7 @@ 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.TableElement; import com.vaadin.testbench.parallel.Browser; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java index 85a5fbf42f..3468060fa5 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java @@ -18,7 +18,7 @@ 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.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.TableRowElement; import com.vaadin.tests.tb3.SingleBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java index 50f4b0d21f..8a99bb4043 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java @@ -21,7 +21,7 @@ import static org.hamcrest.number.IsCloseTo.closeTo; import org.junit.Before; import org.junit.Test; -import com.vaadin.testbench.customelements.TableElement; +import com.vaadin.testbench.elements.TableElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableRowHeight2Test.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowHeight2Test.java index 4856c9348d..1bb35b14e5 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableRowHeight2Test.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowHeight2Test.java @@ -22,7 +22,7 @@ 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.TableElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java index cb5f4ea2c6..a377ba2377 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java @@ -24,7 +24,7 @@ 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.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java index 34ded9056f..5c5d2b1719 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java @@ -22,7 +22,7 @@ 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.TableElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java index 28977eb69b..d8951a0497 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java @@ -4,7 +4,7 @@ import java.io.IOException; import org.junit.Test; -import com.vaadin.testbench.customelements.TableElement; +import com.vaadin.testbench.elements.TableElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class TableScrollsOnSelectionTest extends MultiBrowserTest { @@ -21,4 +21,4 @@ public class TableScrollsOnSelectionTest extends MultiBrowserTest { compareScreen("scrolled-down"); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableSetUndefinedSizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableSetUndefinedSizeTest.java index 9272d5d486..ab30297a3e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableSetUndefinedSizeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableSetUndefinedSizeTest.java @@ -4,7 +4,7 @@ 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.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableSortingIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableSortingIndicatorTest.java index c45ac018ac..b3ab909d47 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableSortingIndicatorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableSortingIndicatorTest.java @@ -18,7 +18,7 @@ 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.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java index cf32afbf3d..8c02ce11b3 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java @@ -19,7 +19,7 @@ import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.By; -import com.vaadin.testbench.customelements.TableElement; +import com.vaadin.testbench.elements.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.TableHeaderElement; import com.vaadin.tests.tb3.MultiBrowserTest; @@ -77,4 +77,4 @@ public class TableToggleColumnVisibilityTest extends MultiBrowserTest { "v-table-caption-container-align-right")) .size() > 0); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java index fdda329a8d..d26e9816e9 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java @@ -23,7 +23,7 @@ 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.TableElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java index 2594db28ea..091c9866ae 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java @@ -21,7 +21,7 @@ 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.TableElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class TableWithPollingTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java index 0ac3901594..619f92597b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java @@ -23,7 +23,7 @@ import java.io.IOException; import org.junit.Test; import com.vaadin.testbench.TestBenchElement; -import com.vaadin.testbench.customelements.TableElement; +import com.vaadin.testbench.elements.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetCloseTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetCloseTest.java index 121fa914a8..2bcfe4b434 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetCloseTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetCloseTest.java @@ -55,4 +55,4 @@ public class TabSheetCloseTest extends MultiBrowserTest { findElements(By.xpath(TAB_CLOSE)).get(1).click(); assertTrue(findElement(By.xpath(FIRST_TAB)).isDisplayed()); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabCloseTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabCloseTest.java index 52aa138bf2..ca23e55e9d 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabCloseTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabCloseTest.java @@ -168,4 +168,4 @@ public class TabSheetScrollOnTabCloseTest extends MultiBrowserTest { } }; } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/textarea/TextAreaSizeResettedTest.java b/uitest/src/test/java/com/vaadin/tests/components/textarea/TextAreaSizeResettedTest.java index 2850b3cf26..a3530f69af 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/textarea/TextAreaSizeResettedTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/textarea/TextAreaSizeResettedTest.java @@ -125,4 +125,4 @@ public class TextAreaSizeResettedTest extends MultiBrowserTest { private TextAreaElement getTextArea() { return $(TextAreaElement.class).first(); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyFieldTest.java index c6a52be38a..159c754138 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyFieldTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyFieldTest.java @@ -22,4 +22,4 @@ public class LocaleChangeOnReadOnlyFieldTest extends MultiBrowserTest { assertThat(textField.getValue(), is("1.024.000")); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/textfield/Selection.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/Selection.java index 7988339344..6003a37b24 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/textfield/Selection.java +++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/Selection.java @@ -51,4 +51,4 @@ public class Selection { return "Selection [start=" + start + ", length=" + length + "]"; } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/SelectItemAfterRemoveTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/SelectItemAfterRemoveTest.java index b048e185ea..bb42cb0ad7 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tree/SelectItemAfterRemoveTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tree/SelectItemAfterRemoveTest.java @@ -46,4 +46,4 @@ public class SelectItemAfterRemoveTest extends MultiBrowserTest { private List<WebElement> getSpans() { return findElements(By.tagName("span")); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java index c5d8661d80..602432b9fb 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java @@ -43,4 +43,4 @@ public class TreeTableScrollOnExpandTest extends MultiBrowserTest { .findElement(By.className("v-table-focus")); assertEquals("Item 21", focusedRow.getText()); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java index 4d4f81adb6..41632ea080 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java @@ -114,4 +114,4 @@ public class ComboboxSelectedItemTextTest extends MultiBrowserTest { }, 10); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java b/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java index 53be4910dd..ce4c9da090 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java @@ -9,12 +9,12 @@ import org.openqa.selenium.interactions.Actions; import com.vaadin.testbench.By; import com.vaadin.testbench.customelements.AbstractDateFieldElement; -import com.vaadin.testbench.customelements.ComboBoxElement; -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.ComboBoxElement; +import com.vaadin.testbench.elements.NotificationElement; import com.vaadin.testbench.elements.TabSheetElement; +import com.vaadin.testbench.elements.TableElement; +import com.vaadin.testbench.elements.WindowElement; import com.vaadin.testbench.parallel.BrowserUtil; import com.vaadin.tests.tb3.MultiBrowserTest; @@ -130,7 +130,7 @@ public abstract class ThemeTest extends MultiBrowserTest { throws IOException { $(ButtonElement.class).id("notifButt" + id).click(); compareScreen(identifier); - $(FixedNotificationElement.class).first().close(); + $(NotificationElement.class).first().close(); } protected void testWindows() throws IOException { diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/DisabledUploadButtonTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/DisabledUploadButtonTest.java index cbc6423893..3e8b434857 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/upload/DisabledUploadButtonTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/upload/DisabledUploadButtonTest.java @@ -43,4 +43,4 @@ public class DisabledUploadButtonTest extends MultiBrowserTest { assertThat(getUploadButtonClass(), containsString("v-disabled")); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java index 4257a5975a..41f624ac3f 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java @@ -34,4 +34,4 @@ public class UploadImmediateButtonWidthReindeerTest public void immediateButtonWithUndefinedWidth() { assertThat(getButtonWidth("upload3"), closeTo(67, 8)); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java index 83a39b3344..dd11409e79 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java @@ -23,8 +23,8 @@ import org.openqa.selenium.WebElement; import com.vaadin.testbench.By; import com.vaadin.testbench.commands.TestBenchElementCommands; -import com.vaadin.testbench.customelements.ComboBoxElement; -import com.vaadin.testbench.customelements.WindowElement; +import com.vaadin.testbench.elements.ComboBoxElement; +import com.vaadin.testbench.elements.WindowElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/GridInWindowTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/GridInWindowTest.java index eda1d213ae..caac58d2e0 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/GridInWindowTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/GridInWindowTest.java @@ -17,7 +17,7 @@ package com.vaadin.tests.components.window; import org.junit.Test; -import com.vaadin.testbench.customelements.WindowElement; +import com.vaadin.testbench.elements.WindowElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.SingleBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/MaximizeRestoreWindowWithManagedLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/MaximizeRestoreWindowWithManagedLayoutTest.java index b671222411..a3a43b218b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/MaximizeRestoreWindowWithManagedLayoutTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/MaximizeRestoreWindowWithManagedLayoutTest.java @@ -19,7 +19,7 @@ import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.Dimension; -import com.vaadin.testbench.customelements.WindowElement; +import com.vaadin.testbench.elements.WindowElement; import com.vaadin.testbench.elements.TextFieldElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/MaximizedWindowOrderTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/MaximizedWindowOrderTest.java index 46f9773454..05d8594962 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/MaximizedWindowOrderTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/MaximizedWindowOrderTest.java @@ -6,7 +6,7 @@ import static org.junit.Assert.assertThat; import org.junit.Test; -import com.vaadin.testbench.customelements.WindowElement; +import com.vaadin.testbench.elements.WindowElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.MultiBrowserTest; @@ -67,4 +67,4 @@ public class MaximizedWindowOrderTest extends MultiBrowserTest { assertThat(maximizedWindow.getCssValue("z-index"), is(greaterThan(anotherWindow.getCssValue("z-index")))); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/WindowCaptionTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowCaptionTest.java index 473bf5c1b3..9807790330 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/WindowCaptionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowCaptionTest.java @@ -21,7 +21,7 @@ import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.ui.ExpectedCondition; -import com.vaadin.testbench.customelements.WindowElement; +import com.vaadin.testbench.elements.WindowElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.SingleBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/WindowShadowTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowShadowTest.java index bff4280589..283bfa0397 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/WindowShadowTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowShadowTest.java @@ -54,4 +54,4 @@ public class WindowShadowTest extends MultiBrowserTest { org.junit.Assert.assertNotEquals(startLoc, endLoc); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/GridContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/GridContextClickTest.java index e26060f3ae..024633b499 100644 --- a/uitest/src/test/java/com/vaadin/tests/contextclick/GridContextClickTest.java +++ b/uitest/src/test/java/com/vaadin/tests/contextclick/GridContextClickTest.java @@ -21,7 +21,7 @@ import org.junit.Ignore; import org.junit.Test; import org.openqa.selenium.WebElement; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.ButtonElement; public class GridContextClickTest extends AbstractContextClickTest { diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTest.java index a7cd84e9aa..cd8db24aae 100644 --- a/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTest.java +++ b/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTest.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.vaadin.testbench.customelements.TableElement; +import com.vaadin.testbench.elements.TableElement; import com.vaadin.testbench.elements.ButtonElement; public class TableContextClickTest extends TableContextClickTestBase { diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTestBase.java b/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTestBase.java index 74e9c017f1..1fcf1663ad 100644 --- a/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTestBase.java +++ b/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTestBase.java @@ -17,7 +17,7 @@ package com.vaadin.tests.contextclick; import static org.junit.Assert.assertEquals; -import com.vaadin.testbench.customelements.TableElement; +import com.vaadin.testbench.elements.TableElement; public abstract class TableContextClickTestBase extends AbstractContextClickTest { diff --git a/uitest/src/test/java/com/vaadin/tests/core/SpecialCharactersEncodingUITest.java b/uitest/src/test/java/com/vaadin/tests/core/SpecialCharactersEncodingUITest.java index 03a441623b..12cfb45d07 100644 --- a/uitest/src/test/java/com/vaadin/tests/core/SpecialCharactersEncodingUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/core/SpecialCharactersEncodingUITest.java @@ -34,4 +34,4 @@ public class SpecialCharactersEncodingUITest extends SingleBrowserTest { private String getHtml(WebElement element) { return element.getAttribute("innerHTML"); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/elements/ComponentElementGetValueTest.java b/uitest/src/test/java/com/vaadin/tests/elements/ComponentElementGetValueTest.java index 26c4296157..2878d1ba21 100644 --- a/uitest/src/test/java/com/vaadin/tests/elements/ComponentElementGetValueTest.java +++ b/uitest/src/test/java/com/vaadin/tests/elements/ComponentElementGetValueTest.java @@ -74,7 +74,7 @@ public class ComponentElementGetValueTest extends MultiBrowserTest { CheckBoxGroupElement elem = $(CheckBoxGroupElement.class).get(0); List<String> expected = Collections .singletonList(ComponentElementGetValue.TEST_STRING_VALUE); - List<String> actual = elem.getSelection(); + List<String> actual = elem.getValue(); Assert.assertEquals(expected, actual); } diff --git a/uitest/src/test/java/com/vaadin/tests/elements/checkboxgroup/CheckBoxGroupSetValueTest.java b/uitest/src/test/java/com/vaadin/tests/elements/checkboxgroup/CheckBoxGroupSetSelectionTest.java index c18e8a10a6..cb244873d8 100644 --- a/uitest/src/test/java/com/vaadin/tests/elements/checkboxgroup/CheckBoxGroupSetValueTest.java +++ b/uitest/src/test/java/com/vaadin/tests/elements/checkboxgroup/CheckBoxGroupSetSelectionTest.java @@ -1,6 +1,8 @@ package com.vaadin.tests.elements.checkboxgroup; +import java.util.Arrays; import java.util.Collections; +import java.util.List; import org.junit.Assert; import org.junit.Before; @@ -9,7 +11,7 @@ import org.junit.Test; import com.vaadin.testbench.elements.CheckBoxGroupElement; import com.vaadin.tests.tb3.MultiBrowserTest; -public class CheckBoxGroupSetValueTest extends MultiBrowserTest { +public class CheckBoxGroupSetSelectionTest extends MultiBrowserTest { private static final String NEW_VALUE = "item2"; @@ -23,17 +25,38 @@ public class CheckBoxGroupSetValueTest extends MultiBrowserTest { } @Test - public void testSetValue() { + public void testSetSelection() { group.setValue(NEW_VALUE); Assert.assertEquals(Collections.singletonList(NEW_VALUE), - group.getSelection()); + group.getValue()); } @Test public void testSelectByText() { group.selectByText(NEW_VALUE); Assert.assertEquals(Collections.singletonList(NEW_VALUE), - group.getSelection()); + group.getValue()); + } + + @Test + public void testSelectAll() { + List<String> value = Arrays.asList("item1", "item2", "item3"); + group.setValue(value); + Assert.assertEquals(value, group.getValue()); + } + + @Test + public void testSelectNone() { + testSelectByText(); + + group.setValue(); + Assert.assertEquals(Collections.emptyList(), group.getValue()); + } + + @Test + public void testDeselect() { + testSelectAll(); + testSetSelection(); } } diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java index 3af6b0bf7e..8a0d63ecd4 100644 --- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java +++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java @@ -25,7 +25,7 @@ import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.CheckBoxElement; import com.vaadin.testbench.elements.DateFieldElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java index 33651ac7b8..6b737c8278 100644 --- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java +++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java @@ -21,7 +21,7 @@ import org.junit.Assert; import org.junit.Test; import com.vaadin.testbench.AbstractHasTestBenchCommandExecutor; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.AbstractComponentElement; import com.vaadin.testbench.elements.TextFieldElement; import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2; diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java index 0ee93caef4..3ca03717a1 100644 --- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java +++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java @@ -21,7 +21,7 @@ import org.junit.Assert; import org.junit.Test; import com.vaadin.testbench.AbstractHasTestBenchCommandExecutor; -import com.vaadin.testbench.customelements.TableElement; +import com.vaadin.testbench.elements.TableElement; import com.vaadin.testbench.elements.AbstractComponentElement; import com.vaadin.testbench.elements.TextFieldElement; import com.vaadin.tests.tb3.SingleBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java index 3020eaa4d4..ddf97d8727 100644 --- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java +++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java @@ -18,8 +18,8 @@ package com.vaadin.tests.fieldgroup; 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.NotificationElement; +import com.vaadin.testbench.elements.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.CheckBoxElement; import com.vaadin.testbench.elements.TableRowElement; @@ -82,7 +82,7 @@ public abstract class BasicPersonFormTest extends MultiBrowserTest { } protected void closeNotification() { - $(FixedNotificationElement.class).first().close(); + $(NotificationElement.class).first().close(); } protected CheckBoxElement getPostCommitFailsCheckBox() { diff --git a/uitest/src/test/java/com/vaadin/tests/focusable/GridFocusableTest.java b/uitest/src/test/java/com/vaadin/tests/focusable/GridFocusableTest.java index 85aa8bea11..7079352912 100644 --- a/uitest/src/test/java/com/vaadin/tests/focusable/GridFocusableTest.java +++ b/uitest/src/test/java/com/vaadin/tests/focusable/GridFocusableTest.java @@ -4,7 +4,7 @@ import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; import com.vaadin.testbench.By; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.tests.components.grid.basics.GridBasics; diff --git a/uitest/src/test/java/com/vaadin/tests/fonticon/FontIconsTest.java b/uitest/src/test/java/com/vaadin/tests/fonticon/FontIconsTest.java index 321367189f..82e9ea7f79 100644 --- a/uitest/src/test/java/com/vaadin/tests/fonticon/FontIconsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/fonticon/FontIconsTest.java @@ -22,7 +22,7 @@ import java.io.IOException; import org.junit.Test; import org.openqa.selenium.Keys; -import com.vaadin.testbench.customelements.ComboBoxElement; +import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class FontIconsTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java b/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java index 747b0fb486..a8f291d79d 100644 --- a/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java @@ -24,7 +24,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized.Parameters; -import com.vaadin.testbench.customelements.TableElement; +import com.vaadin.testbench.elements.TableElement; import com.vaadin.tests.tb3.ParameterizedTB3Runner; /** diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponentTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponentTest.java index e43cfbf0fa..3846f9f23a 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponentTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponentTest.java @@ -29,4 +29,4 @@ public class GridLayoutMoveComponentTest extends MultiBrowserTest { $(ButtonElement.class).caption(caption).first().click(); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java index db206aa191..66347b57a1 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java @@ -20,4 +20,4 @@ public class GridLayoutWidthChangeTest extends MultiBrowserTest { compareScreen("buttonMoved"); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumnsTest.java index 8e9234980a..db25419cc7 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumnsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumnsTest.java @@ -47,4 +47,4 @@ public class GridSpanEmptyColumnsTest extends MultiBrowserTest { } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMoveTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMoveTest.java index bb9efea723..826605427e 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMoveTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMoveTest.java @@ -41,4 +41,4 @@ public abstract class BaseAddReplaceMoveTest extends MultiBrowserTest { index++; } } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseAlignmentTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseAlignmentTest.java index f5f7ed5907..446d8d5ec2 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseAlignmentTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseAlignmentTest.java @@ -33,4 +33,4 @@ public abstract class BaseAlignmentTest extends MultiBrowserTest { openTestURL(); compareScreen("alignment"); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseCaptionTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseCaptionTest.java index 3148251028..86f6382978 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseCaptionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseCaptionTest.java @@ -32,4 +32,4 @@ public abstract class BaseCaptionTest extends MultiBrowserTest { openTestURL(); compareScreen("caption"); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseComponentSizingTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseComponentSizingTest.java index beae830027..3e8b978781 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseComponentSizingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseComponentSizingTest.java @@ -42,4 +42,4 @@ public abstract class BaseComponentSizingTest extends MultiBrowserTest { } } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseIconTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseIconTest.java index 4325676518..1d166f1b26 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseIconTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseIconTest.java @@ -34,4 +34,4 @@ public abstract class BaseIconTest extends MultiBrowserTest { compareScreen("icon"); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutExpandTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutExpandTest.java index e9738bb56c..9078cbe3b4 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutExpandTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutExpandTest.java @@ -42,4 +42,4 @@ public abstract class BaseLayoutExpandTest extends MultiBrowserTest { index++; } } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutMarginSpacingTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutMarginSpacingTest.java index 1ac5c136fd..343642b2b9 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutMarginSpacingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutMarginSpacingTest.java @@ -39,4 +39,4 @@ public abstract class BaseLayoutMarginSpacingTest extends MultiBrowserTest { sleep(1000); compareScreen(states[1]); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutRegErrorTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutRegErrorTest.java index 1cc4f028e0..d6d8c7f83f 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutRegErrorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutRegErrorTest.java @@ -34,4 +34,4 @@ public abstract class BaseLayoutRegErrorTest extends MultiBrowserTest { compareScreen("RegError"); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutSizingTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutSizingTest.java index 998fcfc4e9..ea91425e35 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutSizingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutSizingTest.java @@ -47,4 +47,4 @@ public abstract class BaseLayoutSizingTest extends MultiBrowserTest { } } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridComponentSizingTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridComponentSizingTest.java index de84aead5d..b72bb6a8be 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridComponentSizingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridComponentSizingTest.java @@ -19,4 +19,4 @@ import com.vaadin.tests.layouts.layouttester.BaseComponentSizingTest; public class GridComponentSizingTest extends BaseComponentSizingTest { -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIconTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIconTest.java index e027723977..7046c2cdfc 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIconTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIconTest.java @@ -24,4 +24,4 @@ import com.vaadin.tests.layouts.layouttester.BaseIconTest; */ public class GridIconTest extends BaseIconTest { -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpandTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpandTest.java index c435a73719..0bde68aeb1 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpandTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpandTest.java @@ -23,4 +23,4 @@ import com.vaadin.tests.layouts.layouttester.BaseLayoutExpandTest; * @author Vaadin Ltd */ public class GridLayoutExpandTest extends BaseLayoutExpandTest { -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacingTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacingTest.java index 086b758e57..a2a260dfe2 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacingTest.java @@ -24,4 +24,4 @@ import com.vaadin.tests.layouts.layouttester.BaseLayoutMarginSpacingTest; */ public class GridLayoutMarginSpacingTest extends BaseLayoutMarginSpacingTest { -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegErrorTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegErrorTest.java index 041e4de5e1..ed74af144e 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegErrorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegErrorTest.java @@ -24,4 +24,4 @@ import com.vaadin.tests.layouts.layouttester.BaseLayoutRegErrorTest; */ public class GridLayoutRegErrorTest extends BaseLayoutRegErrorTest { -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizingTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizingTest.java index 653a609349..d5f68dcade 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizingTest.java @@ -24,4 +24,4 @@ import com.vaadin.tests.layouts.layouttester.BaseLayoutSizingTest; */ public class GridLayoutSizingTest extends BaseLayoutSizingTest { -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java b/uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java index 44390e1288..7b3798f050 100644 --- a/uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java @@ -7,7 +7,7 @@ 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.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.TableRowElement; import com.vaadin.testbench.elements.TextFieldElement; diff --git a/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersTest.java b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersTest.java index 95c03d9959..03e824aa19 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersTest.java @@ -40,4 +40,4 @@ public abstract class SendMultibyteCharactersTest extends MultiBrowserTest { waitForDebugMessage("Handling message from server", 10); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/smoke/CalendarSmokeTest.java b/uitest/src/test/java/com/vaadin/tests/smoke/CalendarSmokeTest.java index 8228419db1..7865dd24ef 100644 --- a/uitest/src/test/java/com/vaadin/tests/smoke/CalendarSmokeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/smoke/CalendarSmokeTest.java @@ -11,7 +11,7 @@ import org.junit.Test; import org.openqa.selenium.WebElement; import com.vaadin.testbench.By; -import com.vaadin.testbench.customelements.CalendarElement; +import com.vaadin.testbench.elements.CalendarElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class CalendarSmokeTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/smoke/GridSmokeTest.java b/uitest/src/test/java/com/vaadin/tests/smoke/GridSmokeTest.java index 495919f00b..5546faf53b 100644 --- a/uitest/src/test/java/com/vaadin/tests/smoke/GridSmokeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/smoke/GridSmokeTest.java @@ -18,7 +18,7 @@ package com.vaadin.tests.smoke; import org.junit.Assert; import org.junit.Test; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/AffectedTB3TestLocator.java b/uitest/src/test/java/com/vaadin/tests/tb3/AffectedTB3TestLocator.java index 391618bf43..9f8a79859d 100644 --- a/uitest/src/test/java/com/vaadin/tests/tb3/AffectedTB3TestLocator.java +++ b/uitest/src/test/java/com/vaadin/tests/tb3/AffectedTB3TestLocator.java @@ -89,4 +89,4 @@ public class AffectedTB3TestLocator extends TB3TestLocator { return affectedFilePaths; } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java index 7117090d5f..b90e7f41b2 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java @@ -23,8 +23,8 @@ 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.ComboBoxElement; +import com.vaadin.testbench.elements.TableElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.EmbeddedElement; import com.vaadin.testbench.elements.MenuBarElement; diff --git a/uitest/src/test/java/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java b/uitest/src/test/java/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java index a69b49fc6e..0abd906f59 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java @@ -24,4 +24,4 @@ public class DisabledMenuBarItemTest extends MultiBrowserTest { compareScreen("transparent"); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/themes/chameleon/ChameleonNotificationTest.java b/uitest/src/test/java/com/vaadin/tests/themes/chameleon/ChameleonNotificationTest.java index 7e2ccc574b..a8654eb6bb 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/chameleon/ChameleonNotificationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/chameleon/ChameleonNotificationTest.java @@ -23,4 +23,4 @@ public class ChameleonNotificationTest extends MultiBrowserTest { assertThat(notificationElement.getCssValue("background-image"), containsString("chameleon/img/grad")); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java index 41b1ace31d..92bff1da9b 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java @@ -22,7 +22,7 @@ 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.TableElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/FormLayoutInsideTableTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/FormLayoutInsideTableTest.java index a129550298..14e4aaaf9a 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/FormLayoutInsideTableTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/FormLayoutInsideTableTest.java @@ -24,4 +24,4 @@ public class FormLayoutInsideTableTest extends MultiBrowserTest { assertThat(td.getCssValue("border-top-width"), is("1px")); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/GridDisabledTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/GridDisabledTest.java index a800d9cdd9..e4590dff24 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/GridDisabledTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/GridDisabledTest.java @@ -17,4 +17,4 @@ public class GridDisabledTest extends MultiBrowserTest { compareScreen("disabled"); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/ModalWindowTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ModalWindowTest.java index 29e7f30d0a..1d734ffd7a 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/ModalWindowTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ModalWindowTest.java @@ -34,4 +34,4 @@ public class ModalWindowTest extends SingleBrowserTest { private void openModalWindow() { $(ButtonElement.class).get(1).click(); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/NonDraggableWindowTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/NonDraggableWindowTest.java index f5a1bd903e..8c1450e2a8 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/NonDraggableWindowTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/NonDraggableWindowTest.java @@ -19,4 +19,4 @@ public class NonDraggableWindowTest extends MultiBrowserTest { assertThat(header.getCssValue("cursor"), is("default")); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/TableSortIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/TableSortIndicatorTest.java index 4d63a0bd19..0efb4933b0 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/TableSortIndicatorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/TableSortIndicatorTest.java @@ -44,4 +44,4 @@ public class TableSortIndicatorTest extends MultiBrowserTest { private WebElement findElementByClass(String className) { return driver.findElement(By.className(className)); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/WindowTitleOverflowTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/WindowTitleOverflowTest.java index 825d26f86d..2c7c5523c8 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/WindowTitleOverflowTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/WindowTitleOverflowTest.java @@ -57,4 +57,4 @@ public class WindowTitleOverflowTest extends MultiBrowserTest { assertThat(getWindowHeaderMarginRight(), is("12px")); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/tooltip/MenuBarTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/MenuBarTooltipTest.java index 3cf2ef6aa7..e28db240e2 100644 --- a/uitest/src/test/java/com/vaadin/tests/tooltip/MenuBarTooltipTest.java +++ b/uitest/src/test/java/com/vaadin/tests/tooltip/MenuBarTooltipTest.java @@ -41,4 +41,4 @@ public class MenuBarTooltipTest extends MultiBrowserTest { findElement(By.className(className)).getCssValue("z-index")); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/tooltip/StationaryTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/StationaryTooltipTest.java index b4ce5ff903..b35a1e4bce 100644 --- a/uitest/src/test/java/com/vaadin/tests/tooltip/StationaryTooltipTest.java +++ b/uitest/src/test/java/com/vaadin/tests/tooltip/StationaryTooltipTest.java @@ -71,4 +71,4 @@ public class StationaryTooltipTest extends MultiBrowserTest { return getTooltipElement().getLocation().getX(); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipConfigurationTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipConfigurationTest.java index b69ee48b39..59cf8dd248 100644 --- a/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipConfigurationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipConfigurationTest.java @@ -70,4 +70,4 @@ public class TooltipConfigurationTest extends TooltipTest { // remove text "null" element.sendKeys(value + Keys.ENTER); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipWidthUpdatingTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipWidthUpdatingTest.java index 26ea7fd338..7ac314ffc6 100644 --- a/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipWidthUpdatingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipWidthUpdatingTest.java @@ -44,4 +44,4 @@ public class TooltipWidthUpdatingTest extends TooltipTest { lessThan(TooltipWidthUpdating.MAX_WIDTH)); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridClientRenderers.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridClientRenderers.java index 2a7e4cc9d1..ba8970d167 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridClientRenderers.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridClientRenderers.java @@ -28,7 +28,7 @@ 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; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.elements.LabelElement; import com.vaadin.testbench.elements.NativeButtonElement; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsLocationTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsLocationTest.java index 3a2f97560c..3f97a248eb 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsLocationTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridDetailsLocationTest.java @@ -30,7 +30,7 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.ui.ExpectedCondition; import com.vaadin.testbench.TestBenchElement; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.CheckBoxElement; import com.vaadin.testbench.elements.GridElement.GridRowElement; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorUITest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorUITest.java index c87159988a..dfaf5222a6 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorUITest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridEditorUITest.java @@ -26,7 +26,7 @@ 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; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.elements.NotificationElement; import com.vaadin.testbench.elements.PasswordFieldElement; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridExtensionCommunicationTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridExtensionCommunicationTest.java index eaeeca686c..deec323b22 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridExtensionCommunicationTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridExtensionCommunicationTest.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.SingleBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridGeneratedPropertiesTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridGeneratedPropertiesTest.java index f758aa912d..6238a04467 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridGeneratedPropertiesTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridGeneratedPropertiesTest.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.elements.NotificationElement; import com.vaadin.testbench.parallel.TestCategory; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFooterComponentsTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFooterComponentsTest.java index 3e6cfe51e8..b8afd17c49 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFooterComponentsTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFooterComponentsTest.java @@ -22,7 +22,7 @@ import org.junit.Before; import org.junit.Test; import com.vaadin.testbench.By; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.elements.TextFieldElement; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFormatChangeTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFormatChangeTest.java index 949430d744..5018a2433e 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFormatChangeTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderFormatChangeTest.java @@ -19,7 +19,7 @@ import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.By; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderStyleNamesTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderStyleNamesTest.java index 512a82f5cd..07bf047546 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderStyleNamesTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeaderStyleNamesTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.parallel.TestCategory; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeightTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeightTest.java index a8a6980d3a..7c99f2e836 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeightTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridHeightTest.java @@ -27,7 +27,7 @@ import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.By; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.OptionGroupElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInTabSheetTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInTabSheetTest.java index 158ba6ca86..d84de08f78 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInTabSheetTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInTabSheetTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertFalse; import org.junit.Test; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.NotificationElement; import com.vaadin.testbench.elements.TabSheetElement; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInWindowResizeTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInWindowResizeTest.java index a42d49ca79..57c77df8de 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInWindowResizeTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInWindowResizeTest.java @@ -22,7 +22,7 @@ import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.remote.DesiredCapabilities; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.parallel.Browser; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInitiallyHiddenColumnsTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInitiallyHiddenColumnsTest.java index d4412b6473..857c29dab5 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInitiallyHiddenColumnsTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridInitiallyHiddenColumnsTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.SingleBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridItemSetChangeTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridItemSetChangeTest.java index 561deec7ae..e07381403c 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridItemSetChangeTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridItemSetChangeTest.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.SingleBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridLayoutDetailsRowTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridLayoutDetailsRowTest.java index 6839cfda64..6c9b5a7907 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridLayoutDetailsRowTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridLayoutDetailsRowTest.java @@ -21,7 +21,7 @@ import static org.hamcrest.number.IsCloseTo.closeTo; import org.junit.Test; import org.openqa.selenium.By; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.GridLayoutElement; import com.vaadin.testbench.elements.LabelElement; import com.vaadin.testbench.parallel.TestCategory; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridRendererChangeTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridRendererChangeTest.java index c969653a38..a8c3f97c86 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridRendererChangeTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridRendererChangeTest.java @@ -24,7 +24,7 @@ import java.util.List; import org.junit.Test; import org.openqa.selenium.By; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridReplaceContainerTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridReplaceContainerTest.java index 510867146a..2184d8ce2f 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridReplaceContainerTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridReplaceContainerTest.java @@ -18,7 +18,7 @@ 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.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.SingleBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeAndScrollTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeAndScrollTest.java index 2785103e1a..fc854b9b96 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeAndScrollTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeAndScrollTest.java @@ -18,7 +18,7 @@ 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.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeHiddenColumnTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeHiddenColumnTest.java index 28321238b7..c300fdfdf2 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeHiddenColumnTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridResizeHiddenColumnTest.java @@ -25,7 +25,7 @@ import org.openqa.selenium.Dimension; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.parallel.BrowserUtil; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridRowHeightChangeTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridRowHeightChangeTest.java index 7e30829cef..043151705e 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridRowHeightChangeTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridRowHeightChangeTest.java @@ -8,7 +8,7 @@ import java.util.List; import org.junit.Test; import com.vaadin.testbench.By; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.NativeSelectElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridScrollToLineWhileResizingTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridScrollToLineWhileResizingTest.java index b14b584bf1..f410a2b260 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridScrollToLineWhileResizingTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridScrollToLineWhileResizingTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSidebarPositionTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSidebarPositionTest.java index 5db1a93c5e..6fc42609f8 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSidebarPositionTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSidebarPositionTest.java @@ -24,7 +24,7 @@ import org.openqa.selenium.Dimension; import org.openqa.selenium.Point; import org.openqa.selenium.WebElement; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class GridSidebarPositionTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSingleColumnTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSingleColumnTest.java index f5a7a7a9f5..7938aab220 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSingleColumnTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSingleColumnTest.java @@ -18,7 +18,7 @@ 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.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.elements.NotificationElement; import com.vaadin.testbench.parallel.TestCategory; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSortIndicatorTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSortIndicatorTest.java index afcb33dca6..be419828cf 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSortIndicatorTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSortIndicatorTest.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSpacerDecoClipTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSpacerDecoClipTest.java index cb4151b597..73046aea28 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSpacerDecoClipTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSpacerDecoClipTest.java @@ -21,7 +21,7 @@ import org.openqa.selenium.By; import org.openqa.selenium.SearchContext; import com.vaadin.testbench.TestBenchElement; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.minitutorials.v7_5.ShowingExtraDataForRows; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSubPixelProblemWrappingTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSubPixelProblemWrappingTest.java index cec7e13ec7..3a86c86ecb 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSubPixelProblemWrappingTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSubPixelProblemWrappingTest.java @@ -18,7 +18,7 @@ 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.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.GridElement.GridRowElement; import com.vaadin.testbench.parallel.TestCategory; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSwitchRenderersTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSwitchRenderersTest.java index 214f69f0d9..41277df684 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSwitchRenderersTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridSwitchRenderersTest.java @@ -18,7 +18,7 @@ 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.GridElement; import com.vaadin.testbench.elements.CheckBoxElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeChangeTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeChangeTest.java index d9f5a8d188..f96f75a664 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeChangeTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeChangeTest.java @@ -21,7 +21,7 @@ import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.remote.DesiredCapabilities; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeUITest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeUITest.java index a8adc83b40..c8f6c8b92f 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeUITest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridThemeUITest.java @@ -21,8 +21,8 @@ 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.DateFieldElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.elements.GridElement.GridEditorElement; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWidthIncreaseTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWidthIncreaseTest.java index 288dbedffe..13294005d9 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWidthIncreaseTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWidthIncreaseTest.java @@ -22,7 +22,7 @@ import java.io.IOException; import org.junit.Test; import org.openqa.selenium.remote.DesiredCapabilities; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.parallel.BrowserUtil; import com.vaadin.testbench.parallel.TestCategory; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithBrokenRendererTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithBrokenRendererTest.java index 8313182de2..90619254f2 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithBrokenRendererTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithBrokenRendererTest.java @@ -18,7 +18,7 @@ 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.GridElement; import com.vaadin.tests.tb3.SingleBrowserTest; public class GridWithBrokenRendererTest extends SingleBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithLabelEditorTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithLabelEditorTest.java index b5a914e63d..4512b96d85 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithLabelEditorTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/GridWithLabelEditorTest.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.tests.tb3.SingleBrowserTest; public class GridWithLabelEditorTest extends SingleBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/InitialFrozenColumnsTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/InitialFrozenColumnsTest.java index 3e7fdd1acd..fec0087168 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/InitialFrozenColumnsTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/InitialFrozenColumnsTest.java @@ -21,7 +21,7 @@ import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.WebElement; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.NotificationElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/InitiallyDisabledGridTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/InitiallyDisabledGridTest.java index 8f012eed25..cf23a7f379 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/InitiallyDisabledGridTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/InitiallyDisabledGridTest.java @@ -31,4 +31,4 @@ public class InitiallyDisabledGridTest extends SingleBrowserTest { GridCellElement col0 = grid.getCell(80, 0); Assert.assertEquals("First 80", col0.getText()); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/JavaScriptRenderersTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/JavaScriptRenderersTest.java index 086440d47d..687c02b068 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/JavaScriptRenderersTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/JavaScriptRenderersTest.java @@ -18,7 +18,7 @@ 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.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullHeadersTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullHeadersTest.java index c99739da85..9e438b6d07 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullHeadersTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullHeadersTest.java @@ -18,7 +18,7 @@ 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.GridElement; import com.vaadin.tests.tb3.SingleBrowserTest; public class NullHeadersTest extends SingleBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullRenderersTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullRenderersTest.java index 036e56ea4d..6d26bef184 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullRenderersTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/NullRenderersTest.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/ProgrammaticEditorControlTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/ProgrammaticEditorControlTest.java index cdd2e4159d..17ec4d393e 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/ProgrammaticEditorControlTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/ProgrammaticEditorControlTest.java @@ -18,7 +18,7 @@ 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.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.TextFieldElement; import com.vaadin.testbench.parallel.TestCategory; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/SortableHeaderStylesTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/SortableHeaderStylesTest.java index bef04bda7f..1c419d41bb 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/SortableHeaderStylesTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/SortableHeaderStylesTest.java @@ -18,7 +18,7 @@ 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.GridElement; import com.vaadin.testbench.elements.OptionGroupElement; import com.vaadin.tests.tb3.SingleBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/WidgetRenderersTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/WidgetRenderersTest.java index 0ac1cb772f..c9b858c193 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/WidgetRenderersTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/WidgetRenderersTest.java @@ -26,7 +26,7 @@ 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; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.elements.NotificationElement; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java index 2eb8e3c598..1c0a3b5791 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java @@ -21,7 +21,7 @@ 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; /** * GridBasicClientFeatures. diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java index ae6ef31cd5..04bb29c5c8 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java @@ -28,7 +28,7 @@ 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; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridColumnResizeModeTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridColumnResizeModeTest.java index f287a2aaa2..db10556069 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridColumnResizeModeTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridColumnResizeModeTest.java @@ -24,7 +24,7 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; import com.vaadin.testbench.By; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.parallel.TestCategory; @TestCategory("grid") @@ -78,4 +78,4 @@ public class GridColumnResizeModeTest extends GridBasicFeaturesTest { } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java index 090ed06690..bfcf948dcb 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java @@ -23,7 +23,7 @@ import org.junit.Before; import org.junit.Test; import com.vaadin.testbench.By; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.NotificationElement; import com.vaadin.testbench.elementsbase.ServerClass; import com.vaadin.testbench.parallel.TestCategory; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java index a8094f01a2..4780b1b358 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java @@ -2,7 +2,7 @@ package com.vaadin.v7.tests.components.grid.basicfeatures; import org.junit.Test; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/DisabledGridClientTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/DisabledGridClientTest.java index a9b0a03737..402143c144 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/DisabledGridClientTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/DisabledGridClientTest.java @@ -56,4 +56,4 @@ public class DisabledGridClientTest extends GridBasicClientFeaturesTest { new Actions(getDriver()).sendKeys(Keys.ENTER).perform(); assertNull("Editor should not open", getEditor()); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java index 2d90e654be..4dd11ab073 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java @@ -24,7 +24,7 @@ import java.util.List; import org.junit.Test; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.elements.NotificationElement; import com.vaadin.tests.widgetset.client.v7.grid.GridBasicClientFeaturesWidget; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java index 77ddafcedd..d96fd18567 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java @@ -34,7 +34,7 @@ import com.vaadin.shared.Range; import com.vaadin.testbench.By; import com.vaadin.testbench.ElementQuery; import com.vaadin.testbench.TestBenchElement; -import com.vaadin.testbench.customelements.FixedNotificationElement; +import com.vaadin.testbench.elements.NotificationElement; import com.vaadin.v7.shared.ui.grid.ScrollDestination; import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicClientFeaturesTest; @@ -106,13 +106,13 @@ public class GridDetailsClientTest extends GridBasicClientFeaturesTest { @Test public void errorUpdaterShowsErrorNotification() { assertFalse("No notifications should've been at the start", - $(FixedNotificationElement.class).exists()); + $(NotificationElement.class).exists()); selectMenuPath(SET_FAULTY_GENERATOR); toggleDetailsFor(1); - ElementQuery<FixedNotificationElement> notification = $( - FixedNotificationElement.class); + ElementQuery<NotificationElement> notification = $( + NotificationElement.class); assertTrue("Was expecting an error notification here", notification.exists()); notification.first().close(); @@ -135,7 +135,7 @@ public class GridDetailsClientTest extends GridBasicClientFeaturesTest { public void settingNewGeneratorStillWorksAfterError() { selectMenuPath(SET_FAULTY_GENERATOR); toggleDetailsFor(1); - $(FixedNotificationElement.class).first().close(); + $(NotificationElement.class).first().close(); toggleDetailsFor(1); selectMenuPath(SET_GENERATOR); diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java index d7549bf5ff..1d4ef1f171 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicClientFeaturesTest; public class GridSidebarContentTest extends GridBasicClientFeaturesTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java index 1400349164..aa65d05d87 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.openqa.selenium.Keys; import org.openqa.selenium.interactions.Actions; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeaturesTest; public class GridCellFocusAdjustmentTest extends GridBasicFeaturesTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridClearContainerTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridClearContainerTest.java index c9b1adbded..49f7321cf3 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridClearContainerTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridClearContainerTest.java @@ -18,7 +18,7 @@ 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.GridElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridColumnMaxWidthTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridColumnMaxWidthTest.java index 57acfec7b8..a868088743 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridColumnMaxWidthTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridColumnMaxWidthTest.java @@ -34,4 +34,4 @@ public class GridColumnMaxWidthTest extends GridBasicFeaturesTest { assertEquals("Column 0 did not obey max width of 30px.", 30, getGridElement().getCell(0, 0).getSize().getWidth()); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridEditorUnbufferedTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridEditorUnbufferedTest.java index 00ec50aaf8..312c0a3e63 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridEditorUnbufferedTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridEditorUnbufferedTest.java @@ -279,4 +279,4 @@ public class GridEditorUnbufferedTest extends GridEditorTest { assertEquals("Edited value was not saved.", "Foo", getGridElement().getCell(5, 2).getText()); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java index f71ae9f615..6878a36bd5 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java @@ -24,7 +24,7 @@ import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeatures; import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeaturesTest; @@ -229,4 +229,4 @@ public class GridKeyboardNavigationTest extends GridBasicFeaturesTest { column == focusedColumn && Math.abs(row - focusedRow) <= rowTolerance); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridScrollTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridScrollTest.java index 49b44a01a7..183c5ee794 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridScrollTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridScrollTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeaturesTest; public class GridScrollTest extends GridBasicFeaturesTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSortingTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSortingTest.java index 969f975cdd..1cab9d61b7 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSortingTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridSortingTest.java @@ -31,7 +31,7 @@ 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; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeatures; import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeaturesTest; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridStructureTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridStructureTest.java index da06dde016..c23ec16232 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridStructureTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridStructureTest.java @@ -31,7 +31,7 @@ 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; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.elements.NotificationElement; import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeatures; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java index 1b25aa22f4..93aaa8a86a 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java @@ -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.testbench.customelements.GridElement; +import com.vaadin.testbench.elements.GridElement; import com.vaadin.v7.tests.components.grid.basicfeatures.GridBasicFeaturesTest; public class LoadingIndicatorTest extends GridBasicFeaturesTest { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/textfield/TextChangeEventsTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/textfield/TextChangeEventsTest.java index c6880fc700..3efb8b8369 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/textfield/TextChangeEventsTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/textfield/TextChangeEventsTest.java @@ -55,4 +55,4 @@ public class TextChangeEventsTest extends SingleBrowserTest { getLogRow(0)); } -}
\ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/window/UndefinedHeightSubWindowAndContentTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/window/UndefinedHeightSubWindowAndContentTest.java index 09489d4566..2e371c2c13 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/window/UndefinedHeightSubWindowAndContentTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/window/UndefinedHeightSubWindowAndContentTest.java @@ -4,7 +4,7 @@ import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.Keys; -import com.vaadin.testbench.customelements.WindowElement; +import com.vaadin.testbench.elements.WindowElement; import com.vaadin.testbench.elements.TextFieldElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/v7/tests/core/SpecialCharactersEncodingUITest.java b/uitest/src/test/java/com/vaadin/v7/tests/core/SpecialCharactersEncodingUITest.java index 02cad362eb..59d09c8423 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/core/SpecialCharactersEncodingUITest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/core/SpecialCharactersEncodingUITest.java @@ -34,4 +34,4 @@ public class SpecialCharactersEncodingUITest extends SingleBrowserTest { private String getHtml(WebElement element) { return element.getAttribute("innerHTML"); } -}
\ No newline at end of file +} |