From 224d2f5fe7af5ec235047357129eb99bdaa17bd5 Mon Sep 17 00:00:00 2001 From: Patrik Lindström Date: Wed, 3 Sep 2014 14:50:47 +0300 Subject: Fix and unify multi-column sorting behavior (#13334) Change-Id: Idc5b66395eb132a3a0a177593f5d91a165a925de --- .../components/grid/basicfeatures/server/GridSortingTest.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'uitest/src') diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridSortingTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridSortingTest.java index 74a5c6ed95..acc5bfe51a 100644 --- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridSortingTest.java +++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridSortingTest.java @@ -208,7 +208,7 @@ public class GridSortingTest extends GridBasicFeaturesTest { } @Test - public void testKeyboardMultiColumnSorting() throws InterruptedException { + public void testKeyboardSorting() { openTestURL(); // @@ -254,10 +254,17 @@ public class GridSortingTest extends GridBasicFeaturesTest { // Move back to the third column sendKeys(Keys.RIGHT); - // Reset sorting to third column, ASCENDING + // Set sorting to third column, ASCENDING sendKeys(Keys.ENTER); assertLog("10. Sort order: [Column 2 ASCENDING] by USER"); + // Move to the fourth column + sendKeys(Keys.RIGHT); + + // Make sure that single-column sorting also works as expected + sendKeys(Keys.ENTER); + assertLog("12. Sort order: [Column 3 ASCENDING] by USER"); + } private void sortBy(String column) { -- cgit v1.2.3