diff options
Diffstat (limited to 'uitest/src')
17 files changed, 54 insertions, 46 deletions
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basics/DataObject.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/DataObject.java index 54dc8d74b2..800a808485 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/basics/DataObject.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/DataObject.java @@ -86,8 +86,8 @@ public class DataObject { obj.setSmallRandom(rand.nextInt(5)); obj.setDate(new Date(timestamp)); - timestamp += 91250000; // a bit over a day, just to get - // variation + // a bit over a day, just to get variation + timestamp += 91250000; data.add(obj); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java index 2599ed55ff..452161d336 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java @@ -298,9 +298,8 @@ public class VaadinTunesLayout extends AbstractReindeerTestUI { top.setHeight("75px"); // Same as the background image height playback.setStyleName("playback"); - playback.setMargin(new MarginInfo(false, true, false, false)); // Add - // right-side - // margin + // Add right-side margin + playback.setMargin(new MarginInfo(false, true, false, false)); play.setStyleName("play"); next.setStyleName("next"); prev.setStyleName("prev"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/AddItemToEmptyTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/AddItemToEmptyTable.java index 02789e9319..23122f90c3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/AddItemToEmptyTable.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/AddItemToEmptyTable.java @@ -44,8 +44,8 @@ public class AddItemToEmptyTable extends TestBase { rightTable.setSelectable(true); rightTable.setMultiSelect(true); - rightTable.setImmediate(true); // react at once when something is - // selected + // react at once when something is selected + rightTable.setImmediate(true); rightTable.addContainerProperty("name", String.class, null); // rightTable.setColumnWidth("name", 150); diff --git a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaSizeResetted.java b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaSizeResetted.java index 4cc77c862d..d96e5b9b56 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaSizeResetted.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaSizeResetted.java @@ -60,8 +60,9 @@ public class TextAreaSizeResetted extends AbstractReindeerTestUI { @Override protected void setup(VaadinRequest request) { - setPollInterval(500); // Short polling like 100ms jams up the TestBench - // waitForVaadin -functionality. + // Short polling like 100ms jams up the TestBench + // waitForVaadin -functionality. + setPollInterval(500); final Label pollIndicator = new Label(); pollIndicator.setId("pollIndicator"); diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java b/uitest/src/main/java/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java index 8d07ac9bae..f641befb3c 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java @@ -27,8 +27,9 @@ import com.vaadin.ui.VerticalSplitPanel; public class MovingComponentsWhileOldParentInvisible extends TestBase { - private HasComponents cc = new AbsoluteLayout(); // initial dummy - // contents + // initial dummy contents + private HasComponents cc = new AbsoluteLayout(); + private Label lab; @Override diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/v7/grid/GridBasicClientFeaturesWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/v7/grid/GridBasicClientFeaturesWidget.java index 0fb967610c..fb9d58bd17 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/v7/grid/GridBasicClientFeaturesWidget.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/v7/grid/GridBasicClientFeaturesWidget.java @@ -237,8 +237,8 @@ public class GridBasicClientFeaturesWidget d = datarow.get(col++); d.value = new Date(timestamp); - timestamp += 91250000; // a bit over a day, just to get - // variation + // a bit over a day, just to get variation + timestamp += 91250000; d = datarow.get(col++); d.value = "<b>" + row + "</b>"; diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicFeatures.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicFeatures.java index 853b40fe69..700a79d14a 100644 --- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicFeatures.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/GridBasicFeatures.java @@ -304,8 +304,8 @@ public class GridBasicFeatures extends AbstractComponentTest<Grid> { .setValue(Integer.valueOf(row)); item.getItemProperty(getColumnProperty(col++)) .setValue(new Date(timestamp)); - timestamp += 91250000; // a bit over a day, just to get - // variation + // a bit over a day, just to get variation + timestamp += 91250000; item.getItemProperty(getColumnProperty(col++)) .setValue("<b>" + row + "</b>"); 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 2e40d16abe..c79120afd2 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 @@ -90,8 +90,8 @@ public class ComboBoxScrollingWithArrowsTest extends MultiBrowserTest { waitUntilNextPageIsVisible(); dropDownComboBox.sendKeys(Keys.UP); - assertThat(getSelectedItemText(), is("item " + (PAGESIZE - 1))); // item - // 9 + // item 9 + assertThat(getSelectedItemText(), is("item " + (PAGESIZE - 1))); } private void waitUntilNextPageIsVisible() { diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateTimeFieldChangeResolutionTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateTimeFieldChangeResolutionTest.java index cd0b6212c7..ac0f14be8b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateTimeFieldChangeResolutionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateTimeFieldChangeResolutionTest.java @@ -55,8 +55,8 @@ public class DateTimeFieldChangeResolutionTest extends MultiBrowserTest { @Test public void changeResolutionToDayThenMonth() throws Exception { initialize(); - checkHeaderAndBody(DateTimeResolution.YEAR, true); // check the initial - // state + // check the initial state + checkHeaderAndBody(DateTimeResolution.YEAR, true); click(resolutionDay); checkHeaderAndBody(DateTimeResolution.DAY, true); click(resolutionMonth); diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java index 47c62b57c4..af1ac8508e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java @@ -67,8 +67,9 @@ public class DisabledParentLayoutTest extends MultiBrowserTest { textField.getAttribute("value")); dataFieldButton.click(); - dataFieldButton.click();// Requires two clicks because of error message. - // TODO fix + // Requires two clicks because of error message. + // TODO fix + dataFieldButton.click(); assertFalse("Unexpected disabled element found", isElementPresent(By.className("v-disabled"))); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeHiddenColumnTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeHiddenColumnTest.java index c5a5b8834e..435d1f7370 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeHiddenColumnTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeHiddenColumnTest.java @@ -74,8 +74,8 @@ public class GridResizeHiddenColumnTest extends MultiBrowserTest { By.className("v-grid-sidebar-popup")); WebElement visibilityToggle = findElementByText("Last Name", sidebarPopup.findElements(By.className("gwt-MenuItem"))); - action.click(visibilityToggle).perform(); // Click on "Last Name" - // menu item + // Click on "Last Name" menu item + action.click(visibilityToggle).perform(); // Check if column "Last Name" is visible headerCells = grid.getHeaderCells(0); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllTest.java index 1900ea2447..3f4e72e7d9 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllTest.java @@ -135,8 +135,9 @@ public class GridSelectAllTest extends GridBasicsTest { getGridElement().getCell(5, 0).click(); - verifyAllSelected(false); // EXPECTED since multiselection model can't - // verify that all have been selected + // EXPECTED since multiselection model can't + // verify that all have been selected + verifyAllSelected(false); } @Test @@ -155,8 +156,9 @@ public class GridSelectAllTest extends GridBasicsTest { toggleFirstRowSelection(); - verifyAllSelected(false); // EXPECTED since multiselection model can't - // verify that all have been selected + // EXPECTED since multiselection model can't + // verify that all have been selected + verifyAllSelected(false); } @Test @@ -171,8 +173,9 @@ public class GridSelectAllTest extends GridBasicsTest { getGridElement().getCell(5, 0).click(); - verifyAllSelected(false); // EXPECTED since multiselection model can't - // verify that all have been selected + // EXPECTED since multiselection model can't + // verify that all have been selected + verifyAllSelected(false); } @Test @@ -187,8 +190,9 @@ public class GridSelectAllTest extends GridBasicsTest { toggleFirstRowSelection(); - verifyAllSelected(false); // EXPECTED since multiselection model can't - // verify that all have been selected + // EXPECTED since multiselection model can't + // verify that all have been selected + verifyAllSelected(false); } @Test diff --git a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/ComponentAlignmentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/ComponentAlignmentsTest.java index a4f91e516f..68134f46ec 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/ComponentAlignmentsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/ComponentAlignmentsTest.java @@ -49,8 +49,8 @@ public class ComponentAlignmentsTest extends MultiBrowserTest { rightSpaceSize > 0); int diff = Math.abs(rightSpaceSize - leftSpaceSize); - assertTrue("Element is not in the center, diff:" + diff, diff <= 2); // IE11 - // 2pixels + // IE11 2pixels + assertTrue("Element is not in the center, diff:" + diff, diff <= 2); } @Test diff --git a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectTest.java b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectTest.java index af6abf5a24..9172e079e7 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectTest.java @@ -58,14 +58,14 @@ public class ListSelectTest extends SingleBrowserTestPhantomJS2 { addItemsToSelection("Item 4"); assertEquals("4. Selected: [Item 2, Item 4]", getLogRow(0)); - addItemsToSelection("Item 10", "Item 0", "Item 9"); // will cause 3 - // events + // will cause 3 events + addItemsToSelection("Item 10", "Item 0", "Item 9"); assertEquals("7. Selected: [Item 2, Item 4, Item 10, Item 0, Item 9]", getLogRow(0)); - removeItemsFromSelection("Item 0", "Item 2", "Item 9"); // will cause 3 - // events + // will cause 3 events + removeItemsFromSelection("Item 0", "Item 2", "Item 9"); assertEquals("10. Selected: [Item 4, Item 10]", getLogRow(0)); } 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 adaf019719..488342264f 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 @@ -55,10 +55,9 @@ public class TableToggleColumnVisibilityTest extends MultiBrowserTest { findElements(By.className("v-table-header-cell")).size(), 2); checkHeaderAttributes(1); - changeOrderButton.click(); // change column order, column #1 now becomes - // column #0 + // change column order, column #1 now becomes column #0 + changeOrderButton.click(); checkHeaderAttributes(0); - } /* diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/UriFragmentTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UriFragmentTest.java index 1556355149..4b5c664350 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/ui/UriFragmentTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UriFragmentTest.java @@ -38,8 +38,9 @@ public class UriFragmentTest extends MultiBrowserTest { assertEquals("Current URI fragment:", getFragmentLabelValue()); navigateToTest(); assertFragment("test"); - navigateToNull(); // Setting to null when there is a fragment actually - // sets it to # + // Setting to null when there is a fragment actually + // sets it to # + navigateToNull(); assertEquals("Current URI fragment:", getFragmentLabelValue()); // ensure IE works with new popstate based implementation, see 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 f2ad86a4e7..c2f81295bc 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 @@ -77,11 +77,13 @@ public class GridSpacerDecoClipTest extends MultiBrowserTest { GridElement.GridRowElement nearToBottomRow = gridElement.getRow(993); - nearToBottomRow.doubleClick(); // Open upper Row Details, lower Row - // Details goes out of visible range + // Open upper Row Details, lower Row + // Details goes out of visible range + nearToBottomRow.doubleClick(); Thread.sleep(500); - nearToBottomRow.doubleClick(); // Close upper Row Details, lower Row - // Details goes back to visible range + // Close upper Row Details, lower Row + // Details goes back to visible range + nearToBottomRow.doubleClick(); deco = getSpacerDeco(0); String clip = deco.getCssValue("clip"); |