Fix and unify multi-column sorting behavior (#13334)

Change-Id: Idc5b66395eb132a3a0a177593f5d91a165a925de

1 files changed, 9 insertions, 2 deletions

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) {