diff options
| author | Henrik Paul <henrik@vaadin.com> | 2015-03-03 16:49:19 +0200 |
|---|---|---|
| committer | Henrik Paul <henrik@vaadin.com> | 2015-03-03 16:49:19 +0200 |
| commit | b4a5adca6c2d69bb521ae71fd584bef7a320e7d0 (patch) | |
| tree | 26b2159b15ea522092ba507023499fc0618eb692 /uitest | |
| parent | b973c65eaff99ab2575854f12bb046e968baa3ff (diff) | |
| download | vaadin-framework-b4a5adca6c2d69bb521ae71fd584bef7a320e7d0.tar.gz vaadin-framework-b4a5adca6c2d69bb521ae71fd584bef7a320e7d0.zip | |
Adds support for -1 row index Escalator spacers (#16644)
Change-Id: Iced2f089785983ce2ef1d2225517156cec4a7db4
Diffstat (limited to 'uitest')
3 files changed, 21 insertions, 1 deletions
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/EscalatorBasicClientFeaturesTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/EscalatorBasicClientFeaturesTest.java index 25c4c1ff67..853489746f 100644 --- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/EscalatorBasicClientFeaturesTest.java +++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/EscalatorBasicClientFeaturesTest.java @@ -69,6 +69,7 @@ public abstract class EscalatorBasicClientFeaturesTest extends MultiBrowserTest protected static final String COLSPAN_NORMAL = "Apply normal colspan"; protected static final String COLSPAN_NONE = "Apply no colspan"; protected static final String SPACERS = "Spacers"; + protected static final String ROW_MINUS1 = "Row -1"; protected static final String ROW_1 = "Row 1"; protected static final String ROW_99 = "Row 99"; protected static final String SET_100PX = "Set 100px"; diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java index 5e56d9433a..da3472aebf 100644 --- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java +++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java @@ -223,7 +223,7 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest { } - @Test + @Test public void spacersAreFixedInViewport_firstFreezeThenScroll() { selectMenuPath(FEATURES, FROZEN_COLUMNS, FREEZE_1_COLUMN); selectMenuPath(FEATURES, SPACERS, ROW_1, SET_100PX); @@ -249,6 +249,24 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest { getElementLeft(getSpacer(1)), WidgetUtil.PIXEL_EPSILON); } + @Test + public void addingMinusOneSpacerDoesNotScrollWhenScrolledAtTop() { + scrollVerticallyTo(5); + selectMenuPath(FEATURES, SPACERS, ROW_MINUS1, SET_100PX); + assertEquals( + "No scroll adjustment should've happened when adding the -1 spacer", + 5, getScrollTop()); + } + + @Test + public void removingMinusOneSpacerScrolls() { + scrollVerticallyTo(5); + selectMenuPath(FEATURES, SPACERS, ROW_MINUS1, SET_100PX); + selectMenuPath(FEATURES, SPACERS, ROW_MINUS1, REMOVE); + assertEquals("Scroll adjustment should've happened when removing the " + + "-1 spacer", 0, getScrollTop()); + } + private static double[] getElementDimensions(WebElement element) { /* * we need to parse the style attribute, since using getCssValue gets a diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/EscalatorBasicClientFeaturesWidget.java b/uitest/src/com/vaadin/tests/widgetset/client/grid/EscalatorBasicClientFeaturesWidget.java index 538f7a21a1..dc86b89167 100644 --- a/uitest/src/com/vaadin/tests/widgetset/client/grid/EscalatorBasicClientFeaturesWidget.java +++ b/uitest/src/com/vaadin/tests/widgetset/client/grid/EscalatorBasicClientFeaturesWidget.java @@ -645,6 +645,7 @@ public class EscalatorBasicClientFeaturesWidget extends } }, menupath); + createSpacersMenuForRow(-1, menupath); createSpacersMenuForRow(1, menupath); createSpacersMenuForRow(50, menupath); createSpacersMenuForRow(99, menupath); |