From b92df6d587eaa879f2ec31c1f5bba23d5698bae1 Mon Sep 17 00:00:00 2001 From: Sun Zhe <31067185+ZheSun88@users.noreply.github.com> Date: Mon, 29 Apr 2019 13:00:28 +0300 Subject: Code format (#11548) * Code format * Merge branch 'master' into code-format --- .../main/java/com/vaadin/tests/components/panel/PanelHTMLCaption.java | 2 +- .../components/combobox/ComboBoxSelectingNewItemValueChangeTest.java | 3 ++- .../java/com/vaadin/tests/components/panel/PanelHTMLCaptionTest.java | 1 - .../com/vaadin/tests/components/slider/SliderHandleBaseClickTest.java | 2 +- .../components/window/WindowHeaderButtonKeyboardActionsTest.java | 3 +-- .../basicfeatures/server/GridIndexedContainerInsertSelectTest.java | 4 ++-- 6 files changed, 7 insertions(+), 8 deletions(-) (limited to 'uitest') diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelHTMLCaption.java b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelHTMLCaption.java index bdae0b58c4..155e947b14 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelHTMLCaption.java +++ b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelHTMLCaption.java @@ -28,4 +28,4 @@ public class PanelHTMLCaption extends AbstractTestUI { changeCaptionFormat.setId("buttonId"); addComponent(changeCaptionFormat); } -} \ No newline at end of file +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingNewItemValueChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingNewItemValueChangeTest.java index 6f6d45cd2a..5088a76b86 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingNewItemValueChangeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingNewItemValueChangeTest.java @@ -139,7 +139,8 @@ public class ComboBoxSelectingNewItemValueChangeTest extends MultiBrowserTest { SelectionType selectionType) { // clear() would cause an additional value change in chrome 70+ // since it always makes blur after clear() - comboBoxElement.sendKeys(Keys.BACK_SPACE, Keys.BACK_SPACE, Keys.BACK_SPACE); + comboBoxElement.sendKeys(Keys.BACK_SPACE, Keys.BACK_SPACE, + Keys.BACK_SPACE); sendKeysToInput(input); switch (selectionType) { case ENTER: diff --git a/uitest/src/test/java/com/vaadin/tests/components/panel/PanelHTMLCaptionTest.java b/uitest/src/test/java/com/vaadin/tests/components/panel/PanelHTMLCaptionTest.java index e360bfa00a..519ed0f549 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/panel/PanelHTMLCaptionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/panel/PanelHTMLCaptionTest.java @@ -4,7 +4,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest; import org.junit.Test; import org.openqa.selenium.By; - public class PanelHTMLCaptionTest extends MultiBrowserTest { @Test public void testCaptionDisplayedAsText() { diff --git a/uitest/src/test/java/com/vaadin/tests/components/slider/SliderHandleBaseClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/slider/SliderHandleBaseClickTest.java index 8de82a590f..da262cf9e0 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/slider/SliderHandleBaseClickTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/slider/SliderHandleBaseClickTest.java @@ -52,7 +52,7 @@ public class SliderHandleBaseClickTest extends MultiBrowserTest { sleep(100); assertEquals(String.format( "Slider value should not have changed. Expected 3.0 , but was %f", - getSliderValue()), 3.0,getSliderValue(), 0.0); + getSliderValue()), 3.0, getSliderValue(), 0.0); // Enable click event handling findElement(By.id("toggleHandling")).click(); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/WindowHeaderButtonKeyboardActionsTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowHeaderButtonKeyboardActionsTest.java index 278d0994c0..9d7245bde5 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/WindowHeaderButtonKeyboardActionsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowHeaderButtonKeyboardActionsTest.java @@ -167,8 +167,7 @@ public class WindowHeaderButtonKeyboardActionsTest extends MultiBrowserTest { closeButton.equals(driver.switchTo().activeElement())); pressKeyAndWait(Keys.ENTER); - assertTrue( - "Window is not closed when focus is shifted back-and-forth", + assertTrue("Window is not closed when focus is shifted back-and-forth", findElements(By.className("v-window")).size() == 0); } diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridIndexedContainerInsertSelectTest.java b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridIndexedContainerInsertSelectTest.java index e09fa5f560..c5c8ea7f10 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridIndexedContainerInsertSelectTest.java +++ b/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/server/GridIndexedContainerInsertSelectTest.java @@ -20,8 +20,8 @@ public class GridIndexedContainerInsertSelectTest extends SingleBrowserTest { } /** - * Test asserting that issue https://github.com/vaadin/framework/issues/11477 - * is fixed. + * Test asserting that issue + * https://github.com/vaadin/framework/issues/11477 is fixed. */ @Test public void test_insertRowAfterSelected_newRowIsSelected() { -- cgit v1.2.3