Browse Source

Fixes more broken IE8 tests for column reorder

Change-Id: I65e88beb48fdc10999162a22f4768149b157bbe5
tags/7.5.0.beta1
Pekka Hyvönen 9 years ago
parent
commit
25bfb42686

+ 2
- 2
uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridColumnReorderTest.java View File

@@ -318,7 +318,7 @@ public class GridColumnReorderTest extends GridBasicClientFeaturesTest {
selectMenuPath("Component", "Header", "Append row");
selectMenuPath("Component", "Header", "Append row");
selectMenuPath("Component", "Header", "Row 2", "Join columns 3, 4, 5");
dragAndDropColumnHeader(0, 0, 4, 100);
dragAndDropColumnHeader(0, 0, 4, 120);
selectMenuPath("Component", "Header", "Row 3", "Join columns 1, 2");
scrollGridHorizontallyTo(0);
assertColumnHeaderOrder(1, 2, 3, 4, 5);
@@ -357,7 +357,7 @@ public class GridColumnReorderTest extends GridBasicClientFeaturesTest {
selectMenuPath("Component", "Header", "Append row");
selectMenuPath("Component", "Header", "Append row");
selectMenuPath("Component", "Header", "Row 2", "Join columns 3, 4, 5");
dragAndDropColumnHeader(0, 0, 4, 100);
dragAndDropColumnHeader(0, 0, 4, 120);
scrollGridHorizontallyTo(0);
dragAndDropColumnHeader(0, 1, 4, 100);
scrollGridHorizontallyTo(0);

+ 5
- 2
uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnReorderTest.java View File

@@ -199,6 +199,9 @@ public class GridColumnReorderTest extends GridBasicFeaturesTest {

// then
assertColumnHeaderOrder(0, 1, 2, 3);
assertTrue(getGridElement().getHeaderCell(0, 0).isFrozen());
assertTrue(getGridElement().getHeaderCell(0, 1).isFrozen());
assertFalse(getGridElement().getHeaderCell(0, 2).isFrozen());
}

@Test
@@ -296,7 +299,7 @@ public class GridColumnReorderTest extends GridBasicFeaturesTest {
assertColumnHeaderOrder(0, 1, 2, 3);

// when
dragAndDropColumnHeader(0, 0, 2, 100);
dragAndDropColumnHeader(0, 0, 2, 110);

// then
assertColumnHeaderOrder(1, 2, 0, 3);
@@ -311,7 +314,7 @@ public class GridColumnReorderTest extends GridBasicFeaturesTest {
assertColumnHeaderOrder(0, 1, 2, 3);

// when
dragAndDropColumnHeader(1, 0, 2, 100);
dragAndDropColumnHeader(1, 0, 2, 110);

// then
assertColumnHeaderOrder(1, 2, 0, 3);

Loading…
Cancel
Save