diff options
Diffstat (limited to 'uitest/src/com/vaadin')
22 files changed, 42 insertions, 36 deletions
diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java b/uitest/src/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java index ce99c4a3d5..8500fbe18d 100644 --- a/uitest/src/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java +++ b/uitest/src/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java @@ -43,7 +43,8 @@ public class PrimaryStyleTest extends MultiBrowserTest { $(ButtonElement.class).id("update-button").click(); // Verify that the class names where updated as expected. - List<WebElement> updatedElements = driver.findElements(By.className("updated-correctly")); + List<WebElement> updatedElements = driver.findElements(By + .className("updated-correctly")); assertThat(updatedElements, hasSize(initialElements.size())); } diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonToggleIcons.java b/uitest/src/com/vaadin/tests/components/button/ButtonToggleIcons.java index 25dd469903..cee71fdf4e 100644 --- a/uitest/src/com/vaadin/tests/components/button/ButtonToggleIcons.java +++ b/uitest/src/com/vaadin/tests/components/button/ButtonToggleIcons.java @@ -35,4 +35,4 @@ public class ButtonToggleIcons extends UI { layout.addComponent(new Button("Toggle icon", iconToggleListener));
layout.addComponent(new NativeButton("Toggle icon", iconToggleListener));
}
-} +}
diff --git a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxRpcCountTest.java b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxRpcCountTest.java index 9d6640eb6d..69a919497b 100644 --- a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxRpcCountTest.java +++ b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxRpcCountTest.java @@ -40,7 +40,7 @@ public class CheckBoxRpcCountTest extends MultiBrowserTest { // Click on the actual checkbox. inputElem.click(); - //Have to use waitUntil to make this test more stable. + // Have to use waitUntil to make this test more stable. waitUntilLabelIsUpdated(countElem, "1 RPC call(s) made."); // Click on the checkbox label. @@ -52,7 +52,8 @@ public class CheckBoxRpcCountTest extends MultiBrowserTest { waitUntilLabelIsUpdated(countElem, "3 RPC call(s) made."); } - private void waitUntilLabelIsUpdated(final WebElement countElem, final String expectedText) { + private void waitUntilLabelIsUpdated(final WebElement countElem, + final String expectedText) { waitUntil(new ExpectedCondition<Boolean>() { @Override public Boolean apply(WebDriver input) { diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java index 96151022ff..cbd83c5734 100644 --- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java +++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java @@ -40,13 +40,16 @@ public class ComboBoxInputPromptTest extends MultiBrowserTest { ComboBoxElement disabledComboBox = getComboBoxWithCaption("Disabled"); ComboBoxElement readOnlyComboBox = getComboBoxWithCaption("Read-only"); - assertThat(getInputPromptValue(normalComboBox), is("Normal input prompt")); + assertThat(getInputPromptValue(normalComboBox), + is("Normal input prompt")); assertThat(getInputPromptValue(disabledComboBox), isEmptyString()); assertThat(getInputPromptValue(readOnlyComboBox), isEmptyString()); toggleDisabledAndReadonly(); - assertThat(getInputPromptValue(disabledComboBox), is("Disabled input prompt")); - assertThat(getInputPromptValue(readOnlyComboBox), is("Read-only input prompt")); + assertThat(getInputPromptValue(disabledComboBox), + is("Disabled input prompt")); + assertThat(getInputPromptValue(readOnlyComboBox), + is("Read-only input prompt")); toggleDisabledAndReadonly(); assertThat(getInputPromptValue(disabledComboBox), isEmptyString()); diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java index fa6f5a3a93..bc1fe39fe5 100644 --- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java +++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java @@ -52,8 +52,7 @@ public class ComboBoxScrollingWithArrowsTest extends MultiBrowserTest { // provide any way to access the popup and send keys to it. // Ticket #13756 - return driver.findElement(By - .className("v-filterselect-input")); + return driver.findElement(By.className("v-filterselect-input")); } private void openPopup() { @@ -70,7 +69,7 @@ public class ComboBoxScrollingWithArrowsTest extends MultiBrowserTest { dropDownComboBox.sendKeys(Keys.DOWN); } - assertThat(getSelectedItemText(), is("item " + PAGESIZE)); //item 10 + assertThat(getSelectedItemText(), is("item " + PAGESIZE)); // item 10 } private String getSelectedItemText() { @@ -92,7 +91,8 @@ public class ComboBoxScrollingWithArrowsTest extends MultiBrowserTest { waitUntilNextPageIsVisible(); dropDownComboBox.sendKeys(Keys.UP); - assertThat(getSelectedItemText(), is("item " + (PAGESIZE - 1))); //item 9 + assertThat(getSelectedItemText(), is("item " + (PAGESIZE - 1))); // item + // 9 } private void waitUntilNextPageIsVisible() { diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldReadOnlyTest.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldReadOnlyTest.java index 289a5988ee..cfab13e205 100644 --- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldReadOnlyTest.java +++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldReadOnlyTest.java @@ -1,6 +1,5 @@ package com.vaadin.tests.components.datefield; - import com.vaadin.testbench.By; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.DateFieldElement; @@ -14,7 +13,8 @@ import java.io.IOException; public class DateFieldReadOnlyTest extends MultiBrowserTest { @Test - public void readOnlyDateFieldPopupShouldNotOpen() throws IOException, InterruptedException { + public void readOnlyDateFieldPopupShouldNotOpen() throws IOException, + InterruptedException { openTestURL(); compareScreen("initial"); @@ -29,12 +29,15 @@ public class DateFieldReadOnlyTest extends MultiBrowserTest { } private void closePopup() { - findElement(By.className("v-datefield-calendarpanel")).sendKeys(Keys.RETURN); + findElement(By.className("v-datefield-calendarpanel")).sendKeys( + Keys.RETURN); } private void openPopup() { - //waiting for openPopup() in TB4 beta1: http://dev.vaadin.com/ticket/13766 - $(DateFieldElement.class).first().findElement(By.tagName("button")).click(); + // waiting for openPopup() in TB4 beta1: + // http://dev.vaadin.com/ticket/13766 + $(DateFieldElement.class).first().findElement(By.tagName("button")) + .click(); } private void toggleReadOnly() { diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java b/uitest/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java index eb4888ea1a..95152e1416 100644 --- a/uitest/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java +++ b/uitest/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java @@ -9,7 +9,8 @@ import java.io.IOException; import static org.junit.Assert.*; -public class MoveComponentsFromGridLayoutToInnerLayoutTest extends MultiBrowserTest { +public class MoveComponentsFromGridLayoutToInnerLayoutTest extends + MultiBrowserTest { @Test public void buttonIsMovedInsideInnerLayout() throws IOException { diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuTooltipTest.java b/uitest/src/com/vaadin/tests/components/menubar/MenuTooltipTest.java index bb8f87daaa..24025b9f39 100644 --- a/uitest/src/com/vaadin/tests/components/menubar/MenuTooltipTest.java +++ b/uitest/src/com/vaadin/tests/components/menubar/MenuTooltipTest.java @@ -47,7 +47,8 @@ public class MenuTooltipTest extends MultiBrowserTest { public void testToolTipDelay() throws InterruptedException { openTestURL(); - Coordinates elementCoordinates = getCoordinates($(MenuBarElement.class).first()); + Coordinates elementCoordinates = getCoordinates($(MenuBarElement.class) + .first()); Mouse mouse = ((HasInputDevices) getDriver()).getMouse(); diff --git a/uitest/src/com/vaadin/tests/components/notification/NotificationsWaiAria.java b/uitest/src/com/vaadin/tests/components/notification/NotificationsWaiAria.java index ecf704835f..7a12168af4 100644 --- a/uitest/src/com/vaadin/tests/components/notification/NotificationsWaiAria.java +++ b/uitest/src/com/vaadin/tests/components/notification/NotificationsWaiAria.java @@ -102,8 +102,8 @@ public class NotificationsWaiAria extends TestBase { .getNotificationConfiguration(); notificationConf.setAssistivePrefix(typeValue, prefix.getValue()); notificationConf.setAssistivePostfix(typeValue, postfix.getValue()); - notificationConf - .setAssistiveRole(typeValue, (NotificationRole) role.getValue()); + notificationConf.setAssistiveRole(typeValue, + (NotificationRole) role.getValue()); n.show(Page.getCurrent()); } diff --git a/uitest/src/com/vaadin/tests/components/window/WindowMoveListenerTest.java b/uitest/src/com/vaadin/tests/components/window/WindowMoveListenerTest.java index e067ada818..8d74e3a259 100644 --- a/uitest/src/com/vaadin/tests/components/window/WindowMoveListenerTest.java +++ b/uitest/src/com/vaadin/tests/components/window/WindowMoveListenerTest.java @@ -43,12 +43,13 @@ public class WindowMoveListenerTest extends MultiBrowserTest { waitUntilWindowHasReseted(window, winPos); } - private void waitUntilWindowHasReseted(final WebElement window, final Point winPos) { + private void waitUntilWindowHasReseted(final WebElement window, + final Point winPos) { waitUntil(new ExpectedCondition<Boolean>() { @Override public Boolean apply(WebDriver input) { - return winPos.x == window.getLocation().x && - winPos.y == window.getLocation().y; + return winPos.x == window.getLocation().x + && winPos.y == window.getLocation().y; } }, 5); } diff --git a/uitest/src/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java b/uitest/src/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java index 52ea5f4f8e..ba3d0f06f1 100644 --- a/uitest/src/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java +++ b/uitest/src/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java @@ -17,7 +17,8 @@ public class GridLayoutWidthChangeTest extends MultiBrowserTest { compareScreen("initial"); - $(ButtonElement.class).caption("Reduce GridLayout parent width").first().click(); + $(ButtonElement.class).caption("Reduce GridLayout parent width") + .first().click(); compareScreen("buttonMoved"); } diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java index 2771af01c6..84254b4935 100644 --- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java +++ b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java @@ -36,7 +36,7 @@ public class GridAddReplaceMove extends GridBaseLayoutTestUI { /* * (non-Javadoc) - * + * * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server. * VaadinRequest) */ diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMove.java b/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMove.java index 1c0e992a86..c4787045fc 100644 --- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMove.java +++ b/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMove.java @@ -19,7 +19,6 @@ import com.vaadin.annotations.Theme; import com.vaadin.tests.layouts.layouttester.BaseAddReplaceMove; import com.vaadin.ui.HorizontalLayout; - public class HAddReplaceMove extends BaseAddReplaceMove { /** diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HCaption.java b/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HCaption.java index bb974a8c68..3088a00c39 100644 --- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HCaption.java +++ b/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HCaption.java @@ -19,7 +19,6 @@ import com.vaadin.annotations.Theme; import com.vaadin.tests.layouts.layouttester.BaseCaption; import com.vaadin.ui.HorizontalLayout; - public class HCaption extends BaseCaption { /** diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpandTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpandTest.java index 57bb134be7..152e3f0b86 100644 --- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpandTest.java +++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpandTest.java @@ -17,7 +17,6 @@ package com.vaadin.tests.layouts.layouttester.VLayout; import com.vaadin.tests.layouts.layouttester.BaseLayoutExpandTest; - /** * * @since diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegErrorTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegErrorTest.java index e3e5914e3a..7f803781fb 100644 --- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegErrorTest.java +++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegErrorTest.java @@ -17,7 +17,6 @@ package com.vaadin.tests.layouts.layouttester.VLayout; import com.vaadin.tests.layouts.layouttester.BaseLayoutRegErrorTest; - /** * * @since diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizingTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizingTest.java index 372eb9cba4..519f8113f8 100644 --- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizingTest.java +++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizingTest.java @@ -17,7 +17,6 @@ package com.vaadin.tests.layouts.layouttester.VLayout; import com.vaadin.tests.layouts.layouttester.BaseLayoutSizingTest; - /** * * @since diff --git a/uitest/src/com/vaadin/tests/push/PushConfigurationLongPollingTest.java b/uitest/src/com/vaadin/tests/push/PushConfigurationLongPollingTest.java index f2207ccba7..a04d569e05 100644 --- a/uitest/src/com/vaadin/tests/push/PushConfigurationLongPollingTest.java +++ b/uitest/src/com/vaadin/tests/push/PushConfigurationLongPollingTest.java @@ -37,7 +37,8 @@ public class PushConfigurationLongPollingTest extends PushConfigurationTest { clearDebugMessages(); new Select(getPushModeSelect()).selectByVisibleText("AUTOMATIC"); - waitForDebugMessage("Push connection established using long-polling", 10); + waitForDebugMessage("Push connection established using long-polling", + 10); waitForServerCounterToUpdate(); } diff --git a/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java b/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java index 8a4593d70d..28ef30a04a 100644 --- a/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java +++ b/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.push; - public class ReconnectLongPollingTest extends ReconnectTest { @Override diff --git a/uitest/src/com/vaadin/tests/push/ReconnectStreamingTest.java b/uitest/src/com/vaadin/tests/push/ReconnectStreamingTest.java index fe63764e78..0a0275c4d0 100755 --- a/uitest/src/com/vaadin/tests/push/ReconnectStreamingTest.java +++ b/uitest/src/com/vaadin/tests/push/ReconnectStreamingTest.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.push; - public class ReconnectStreamingTest extends ReconnectTest { @Override diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java index 8dd10216d2..c4573fb9b8 100644 --- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java +++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java @@ -166,7 +166,8 @@ public abstract class AbstractTB3Test extends TestBenchTestCase { } protected WebElement getTooltipElement() { - return getDriver().findElement(com.vaadin.testbench.By.className("v-tooltip-text")); + return getDriver().findElement( + com.vaadin.testbench.By.className("v-tooltip-text")); } protected Coordinates getCoordinates(TestBenchElement element) { diff --git a/uitest/src/com/vaadin/tests/tooltip/AdjacentElementsWithTooltipsTest.java b/uitest/src/com/vaadin/tests/tooltip/AdjacentElementsWithTooltipsTest.java index b9fc788008..af7a303629 100644 --- a/uitest/src/com/vaadin/tests/tooltip/AdjacentElementsWithTooltipsTest.java +++ b/uitest/src/com/vaadin/tests/tooltip/AdjacentElementsWithTooltipsTest.java @@ -69,7 +69,6 @@ public class AdjacentElementsWithTooltipsTest extends MultiBrowserTest { } private ButtonElement getButton(String caption) { - return $(ButtonElement.class) - .caption(caption).first(); + return $(ButtonElement.class).caption(caption).first(); } } |