summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnna Koskinen <anna@vaadin.com>2014-09-22 16:18:51 +0300
committerSauli Tähkäpää <sauli@vaadin.com>2014-11-10 11:50:16 +0200
commit1331113586f3f462fd7c3cf4e6b7c2719f405ac8 (patch)
treef599f92eee1c7c1b62fbf210413d377714789fbf
parent46878a5f5e39bf70e37f83df2563a4c23f38b7ac (diff)
downloadvaadin-framework-1331113586f3f462fd7c3cf4e6b7c2719f405ac8.tar.gz
vaadin-framework-1331113586f3f462fd7c3cf4e6b7c2719f405ac8.zip
Allowed one pixel's worth of mismatch in
TableRepairsScrollPositionOnReAddingAllRowsTest. Change-Id: I04f17bf0acbb445343e2f9b18f6a55ce4f764afa
-rw-r--r--uitest/src/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/uitest/src/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java b/uitest/src/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java
index 807a80d182..2fbdd8b581 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java
@@ -15,8 +15,8 @@
*/
package com.vaadin.tests.components.table;
-import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.number.IsCloseTo.closeTo;
import org.junit.Test;
import org.openqa.selenium.By;
@@ -58,9 +58,10 @@ public class TableRepairsScrollPositionOnReAddingAllRowsTest extends
row = $(TableElement.class).first().getCell(49, 0);
int newRowLocation = row.getLocation().getY();
+ // ranged check because IE9 consistently misses the mark by 1 pixel
assertThat(
"Scroll position should be the same as before Re-Adding all rows",
- rowLocation == newRowLocation, is(true));
+ (double) newRowLocation, closeTo(rowLocation, 1));
}
private void scrollUp() {