Migrate Escalator tests for 8 (#8811)

* Migrate Escalator tests for 8

Tests require reindeer / base for escalator to render correctly.

13 files changed, 64 insertions, 76 deletions

diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/EscalatorBasicClientFeatures.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/EscalatorBasicClientFeatures.java
index 8456f20e54..25ac4982b9 100644
--- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/EscalatorBasicClientFeatures.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/EscalatorBasicClientFeatures.java
@@ -14,18 +14,20 @@
  * the License.
  */
 
-package com.vaadin.v7.tests.components.grid.basicfeatures;
+package com.vaadin.tests.components.grid.basics;
 
+import com.vaadin.annotations.Theme;
 import com.vaadin.annotations.Title;
 import com.vaadin.annotations.Widgetset;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.widgetset.TestingWidgetSet;
-import com.vaadin.tests.widgetset.client.v7.grid.EscalatorBasicClientFeaturesWidget;
+import com.vaadin.tests.widgetset.client.grid.EscalatorBasicClientFeaturesWidget;
 import com.vaadin.tests.widgetset.server.TestWidgetComponent;
 import com.vaadin.ui.UI;
 
 @Widgetset(TestingWidgetSet.NAME)
 @Title("Escalator basic client features")
+@Theme("reindeer")
 public class EscalatorBasicClientFeatures extends UI {
 
     @Override
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/EscalatorUpdaterUi.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/EscalatorUpdaterUi.java
index 4023134f02..c8f59effa1 100644
--- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/basicfeatures/EscalatorUpdaterUi.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/EscalatorUpdaterUi.java
@@ -13,16 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.v7.tests.components.grid.basicfeatures;
+package com.vaadin.tests.components.grid.basics;
 
+import com.vaadin.annotations.Theme;
 import com.vaadin.annotations.Widgetset;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.widgetset.TestingWidgetSet;
-import com.vaadin.tests.widgetset.client.v7.grid.EscalatorBasicClientFeaturesWidget;
+import com.vaadin.tests.widgetset.client.grid.EscalatorBasicClientFeaturesWidget;
 import com.vaadin.tests.widgetset.server.TestWidgetComponent;
 import com.vaadin.ui.UI;
 
 @Widgetset(TestingWidgetSet.NAME)
+@Theme("reindeer")
 public class EscalatorUpdaterUi extends UI {
 
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/v7/grid/EscalatorBasicClientFeaturesWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorBasicClientFeaturesWidget.java
index 99a9ae2c8f..27f4c8f42b 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/v7/grid/EscalatorBasicClientFeaturesWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorBasicClientFeaturesWidget.java
@@ -1,4 +1,4 @@
-package com.vaadin.tests.widgetset.client.v7.grid;
+package com.vaadin.tests.widgetset.client.grid;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,15 +9,16 @@ import com.google.gwt.dom.client.TableCellElement;
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.HTML;
-import com.vaadin.v7.client.widget.escalator.EscalatorUpdater;
-import com.vaadin.v7.client.widget.escalator.FlyweightCell;
-import com.vaadin.v7.client.widget.escalator.Row;
-import com.vaadin.v7.client.widget.escalator.RowContainer;
-import com.vaadin.v7.client.widget.escalator.RowContainer.BodyRowContainer;
-import com.vaadin.v7.client.widget.escalator.Spacer;
-import com.vaadin.v7.client.widget.escalator.SpacerUpdater;
-import com.vaadin.v7.client.widgets.Escalator;
-import com.vaadin.v7.shared.ui.grid.ScrollDestination;
+import com.vaadin.client.widget.escalator.EscalatorUpdater;
+import com.vaadin.client.widget.escalator.FlyweightCell;
+import com.vaadin.client.widget.escalator.Row;
+import com.vaadin.client.widget.escalator.RowContainer;
+import com.vaadin.client.widget.escalator.RowContainer.BodyRowContainer;
+import com.vaadin.client.widget.escalator.Spacer;
+import com.vaadin.client.widget.escalator.SpacerUpdater;
+import com.vaadin.client.widgets.Escalator;
+import com.vaadin.shared.ui.grid.ScrollDestination;
+import com.vaadin.tests.widgetset.client.v7.grid.PureGWTTestApplication;
 
 public class EscalatorBasicClientFeaturesWidget
         extends PureGWTTestApplication<Escalator> {
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/v7/grid/EscalatorProxy.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java
index fc6f240eb5..a2fea1ba15 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/v7/grid/EscalatorProxy.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java
@@ -13,21 +13,21 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.widgetset.client.v7.grid;
+package com.vaadin.tests.widgetset.client.grid;
 
 import java.util.Map;
 
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.TableRowElement;
 import com.google.gwt.dom.client.TableSectionElement;
-import com.vaadin.tests.widgetset.client.v7.grid.EscalatorBasicClientFeaturesWidget.LogWidget;
-import com.vaadin.v7.client.widget.escalator.Cell;
-import com.vaadin.v7.client.widget.escalator.ColumnConfiguration;
-import com.vaadin.v7.client.widget.escalator.EscalatorUpdater;
-import com.vaadin.v7.client.widget.escalator.RowContainer;
-import com.vaadin.v7.client.widget.escalator.RowContainer.BodyRowContainer;
-import com.vaadin.v7.client.widget.escalator.SpacerUpdater;
-import com.vaadin.v7.client.widgets.Escalator;
+import com.vaadin.client.widget.escalator.Cell;
+import com.vaadin.client.widget.escalator.ColumnConfiguration;
+import com.vaadin.client.widget.escalator.EscalatorUpdater;
+import com.vaadin.client.widget.escalator.RowContainer;
+import com.vaadin.client.widget.escalator.RowContainer.BodyRowContainer;
+import com.vaadin.client.widget.escalator.SpacerUpdater;
+import com.vaadin.client.widgets.Escalator;
+import com.vaadin.tests.widgetset.client.grid.EscalatorBasicClientFeaturesWidget.LogWidget;
 
 public class EscalatorProxy extends Escalator {
     private class ColumnConfigurationProxy implements ColumnConfiguration {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/EscalatorBasicClientFeaturesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/EscalatorBasicClientFeaturesTest.java
index e37e96ebda..71e2182057 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/EscalatorBasicClientFeaturesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/EscalatorBasicClientFeaturesTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.v7.tests.components.grid.basicfeatures;
+package com.vaadin.tests.components.grid.basicfeatures;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -27,6 +27,7 @@ import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.parallel.TestCategory;
+import com.vaadin.tests.components.grid.basics.EscalatorBasicClientFeatures;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 @TestCategory("grid")
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/escalator/EscalatorBasicsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorBasicsTest.java
index 63e43f4c1a..7913c948f7 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/escalator/EscalatorBasicsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorBasicsTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.v7.tests.components.grid.basicfeatures.escalator;
+package com.vaadin.tests.components.grid.basicfeatures.escalator;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -25,7 +25,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.NotificationElement;
-import com.vaadin.v7.tests.components.grid.basicfeatures.EscalatorBasicClientFeaturesTest;
+import com.vaadin.tests.components.grid.basicfeatures.EscalatorBasicClientFeaturesTest;
 
 public class EscalatorBasicsTest extends EscalatorBasicClientFeaturesTest {
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/escalator/EscalatorColspanTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColspanTest.java
index 294c44cdbb..daef10a706 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/escalator/EscalatorColspanTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColspanTest.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.v7.tests.components.grid.basicfeatures.escalator;
+package com.vaadin.tests.components.grid.basicfeatures.escalator;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
-import com.vaadin.v7.tests.components.grid.basicfeatures.EscalatorBasicClientFeaturesTest;
+import com.vaadin.tests.components.grid.basicfeatures.EscalatorBasicClientFeaturesTest;
 
 public class EscalatorColspanTest extends EscalatorBasicClientFeaturesTest {
     private static final int NO_COLSPAN = 1;
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/escalator/EscalatorColumnFreezingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColumnFreezingTest.java
index 715464ff82..452f61ee1b 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/escalator/EscalatorColumnFreezingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColumnFreezingTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.v7.tests.components.grid.basicfeatures.escalator;
+package com.vaadin.tests.components.grid.basicfeatures.escalator;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -25,7 +25,7 @@ import java.util.regex.Pattern;
 import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
-import com.vaadin.v7.tests.components.grid.basicfeatures.EscalatorBasicClientFeaturesTest;
+import com.vaadin.tests.components.grid.basicfeatures.EscalatorBasicClientFeaturesTest;
 
 public class EscalatorColumnFreezingTest
         extends EscalatorBasicClientFeaturesTest {
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/escalator/EscalatorRemoveAndAddRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorRemoveAndAddRowsTest.java
index e8aaf823f9..bd28399385 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/escalator/EscalatorRemoveAndAddRowsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorRemoveAndAddRowsTest.java
@@ -13,16 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.v7.tests.components.grid.basicfeatures.escalator;
+package com.vaadin.tests.components.grid.basicfeatures.escalator;
 
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.openqa.selenium.By;
 
-import com.vaadin.v7.tests.components.grid.basicfeatures.EscalatorBasicClientFeaturesTest;
+import com.vaadin.tests.components.grid.basicfeatures.EscalatorBasicClientFeaturesTest;
 
 /**
  * Test class to test the escalator level issue for ticket #16832
@@ -30,9 +31,13 @@ import com.vaadin.v7.tests.components.grid.basicfeatures.EscalatorBasicClientFea
 public class EscalatorRemoveAndAddRowsTest
         extends EscalatorBasicClientFeaturesTest {
 
+    @Before
+    public void open() {
+        openTestURL("theme=reindeer");
+    }
+
     @Test
     public void testRemoveAllRowsAndAddThirtyThenScroll() throws IOException {
-        openTestURL();
 
         selectMenuPath(GENERAL, POPULATE_COLUMN_ROW);
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/escalator/EscalatorRowColumnTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorRowColumnTest.java
index 446e4f4d9a..6cd7a0ab2b 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/escalator/EscalatorRowColumnTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorRowColumnTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.v7.tests.components.grid.basicfeatures.escalator;
+package com.vaadin.tests.components.grid.basicfeatures.escalator;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
@@ -21,10 +21,11 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.openqa.selenium.By;
 
-import com.vaadin.v7.tests.components.grid.basicfeatures.EscalatorBasicClientFeaturesTest;
+import com.vaadin.tests.components.grid.basicfeatures.EscalatorBasicClientFeaturesTest;
 
 public class EscalatorRowColumnTest extends EscalatorBasicClientFeaturesTest {
 
@@ -34,9 +35,13 @@ public class EscalatorRowColumnTest extends EscalatorBasicClientFeaturesTest {
      */
     private static final int BOTTOM_SCROLL_POSITION = 1857;
 
+    @Before
+    public void open() {
+        openTestURL("theme=reindeer");
+    }
+
     @Test
     public void testInit() {
-        openTestURL();
         assertNotNull(getEscalator());
         assertNull(getHeaderRow(0));
         assertNull(getBodyRow(0));
@@ -50,8 +55,6 @@ public class EscalatorRowColumnTest extends EscalatorBasicClientFeaturesTest {
 
     @Test
     public void testInsertAColumn() {
-        openTestURL();
-
         selectMenuPath(COLUMNS_AND_ROWS, COLUMNS, ADD_ONE_COLUMN_TO_BEGINNING);
         assertNull(getHeaderRow(0));
         assertNull(getBodyRow(0));
@@ -61,8 +64,6 @@ public class EscalatorRowColumnTest extends EscalatorBasicClientFeaturesTest {
 
     @Test
     public void testInsertAHeaderRow() {
-        openTestURL();
-
         selectMenuPath(COLUMNS_AND_ROWS, HEADER_ROWS, ADD_ONE_ROW_TO_BEGINNING);
         assertNull(getHeaderCell(0, 0));
         assertNull(getBodyCell(0, 0));
@@ -72,8 +73,6 @@ public class EscalatorRowColumnTest extends EscalatorBasicClientFeaturesTest {
 
     @Test
     public void testInsertABodyRow() {
-        openTestURL();
-
         selectMenuPath(COLUMNS_AND_ROWS, BODY_ROWS, ADD_ONE_ROW_TO_BEGINNING);
         assertNull(getHeaderCell(0, 0));
         assertNull(getBodyCell(0, 0));
@@ -83,8 +82,6 @@ public class EscalatorRowColumnTest extends EscalatorBasicClientFeaturesTest {
 
     @Test
     public void testInsertAFooterRow() {
-        openTestURL();
-
         selectMenuPath(COLUMNS_AND_ROWS, FOOTER_ROWS, ADD_ONE_ROW_TO_BEGINNING);
         assertNull(getHeaderCell(0, 0));
         assertNull(getBodyCell(0, 0));
@@ -94,8 +91,6 @@ public class EscalatorRowColumnTest extends EscalatorBasicClientFeaturesTest {
 
     @Test
     public void testInsertAColumnAndAHeaderRow() {
-        openTestURL();
-
         selectMenuPath(COLUMNS_AND_ROWS, COLUMNS, ADD_ONE_COLUMN_TO_BEGINNING);
         selectMenuPath(COLUMNS_AND_ROWS, HEADER_ROWS, ADD_ONE_ROW_TO_BEGINNING);
         assertNotNull(getHeaderCell(0, 0));
@@ -107,8 +102,6 @@ public class EscalatorRowColumnTest extends EscalatorBasicClientFeaturesTest {
 
     @Test
     public void testInsertAColumnAndABodyRow() {
-        openTestURL();
-
         selectMenuPath(COLUMNS_AND_ROWS, COLUMNS, ADD_ONE_COLUMN_TO_BEGINNING);
         selectMenuPath(COLUMNS_AND_ROWS, BODY_ROWS, ADD_ONE_ROW_TO_BEGINNING);
         assertNull(getHeaderCell(0, 0));
@@ -120,8 +113,6 @@ public class EscalatorRowColumnTest extends EscalatorBasicClientFeaturesTest {
 
     @Test
     public void testInsertAColumnAndAFooterRow() {
-        openTestURL();
-
         selectMenuPath(COLUMNS_AND_ROWS, COLUMNS, ADD_ONE_COLUMN_TO_BEGINNING);
         selectMenuPath(COLUMNS_AND_ROWS, FOOTER_ROWS, ADD_ONE_ROW_TO_BEGINNING);
         assertNull(getHeaderCell(0, 0));
@@ -133,8 +124,6 @@ public class EscalatorRowColumnTest extends EscalatorBasicClientFeaturesTest {
 
     @Test
     public void testInsertAHeaderRowAndAColumn() {
-        openTestURL();
-
         selectMenuPath(COLUMNS_AND_ROWS, HEADER_ROWS, ADD_ONE_ROW_TO_BEGINNING);
         selectMenuPath(COLUMNS_AND_ROWS, COLUMNS, ADD_ONE_COLUMN_TO_BEGINNING);
         assertNotNull(getHeaderCell(0, 0));
@@ -146,8 +135,6 @@ public class EscalatorRowColumnTest extends EscalatorBasicClientFeaturesTest {
 
     @Test
     public void testInsertABodyRowAndAColumn() {
-        openTestURL();
-
         selectMenuPath(COLUMNS_AND_ROWS, BODY_ROWS, ADD_ONE_ROW_TO_BEGINNING);
         selectMenuPath(COLUMNS_AND_ROWS, COLUMNS, ADD_ONE_COLUMN_TO_BEGINNING);
         assertNull(getHeaderCell(0, 0));
@@ -159,8 +146,6 @@ public class EscalatorRowColumnTest extends EscalatorBasicClientFeaturesTest {
 
     @Test
     public void testInsertAFooterRowAndAColumn() {
-        openTestURL();
-
         selectMenuPath(COLUMNS_AND_ROWS, FOOTER_ROWS, ADD_ONE_ROW_TO_BEGINNING);
         selectMenuPath(COLUMNS_AND_ROWS, COLUMNS, ADD_ONE_COLUMN_TO_BEGINNING);
         assertNull(getHeaderCell(0, 0));
@@ -172,8 +157,6 @@ public class EscalatorRowColumnTest extends EscalatorBasicClientFeaturesTest {
 
     @Test
     public void testFillColRow() {
-        openTestURL();
-
         selectMenuPath(GENERAL, POPULATE_COLUMN_ROW);
         scrollVerticallyTo(2000); // more like 1857, but this should be enough.
 
@@ -184,8 +167,6 @@ public class EscalatorRowColumnTest extends EscalatorBasicClientFeaturesTest {
 
     @Test
     public void testFillRowCol() {
-        openTestURL();
-
         selectMenuPath(GENERAL, POPULATE_ROW_COLUMN);
         scrollVerticallyTo(2000); // more like 1857, but this should be enough.
 
@@ -196,7 +177,6 @@ public class EscalatorRowColumnTest extends EscalatorBasicClientFeaturesTest {
 
     @Test
     public void testClearColRow() {
-        openTestURL();
 
         selectMenuPath(GENERAL, POPULATE_COLUMN_ROW);
         selectMenuPath(GENERAL, CLEAR_COLUMN_ROW);
@@ -206,7 +186,6 @@ public class EscalatorRowColumnTest extends EscalatorBasicClientFeaturesTest {
 
     @Test
     public void testClearRowCol() {
-        openTestURL();
 
         selectMenuPath(GENERAL, POPULATE_COLUMN_ROW);
         selectMenuPath(GENERAL, CLEAR_ROW_COLUMN);
@@ -216,7 +195,7 @@ public class EscalatorRowColumnTest extends EscalatorBasicClientFeaturesTest {
 
     @Test
     public void testResizeColToFit() {
-        openTestURL();
+
         selectMenuPath(GENERAL, POPULATE_COLUMN_ROW);
 
         selectMenuPath(COLUMNS_AND_ROWS, COLUMNS, RESIZE_FIRST_COLUMN_TO_100PX);
@@ -234,7 +213,7 @@ public class EscalatorRowColumnTest extends EscalatorBasicClientFeaturesTest {
     @Test
     public void testRemoveMoreThanPagefulAtBottomWhileScrolledToBottom()
             throws Exception {
-        openTestURL();
+
         selectMenuPath(GENERAL, POPULATE_COLUMN_ROW);
 
         scrollVerticallyTo(BOTTOM_SCROLL_POSITION);
@@ -253,7 +232,7 @@ public class EscalatorRowColumnTest extends EscalatorBasicClientFeaturesTest {
     @Test
     public void testRemoveMoreThanPagefulAtBottomWhileScrolledAlmostToBottom()
             throws Exception {
-        openTestURL();
+
         selectMenuPath(GENERAL, POPULATE_COLUMN_ROW);
 
         // bottom minus 15 rows.
@@ -273,7 +252,6 @@ public class EscalatorRowColumnTest extends EscalatorBasicClientFeaturesTest {
     @Test
     public void testRemoveMoreThanPagefulNearBottomWhileScrolledToBottom()
             throws Exception {
-        openTestURL();
         selectMenuPath(GENERAL, POPULATE_COLUMN_ROW);
 
         scrollVerticallyTo(BOTTOM_SCROLL_POSITION);
@@ -293,7 +271,6 @@ public class EscalatorRowColumnTest extends EscalatorBasicClientFeaturesTest {
     @Test
     public void testRemoveMoreThanPagefulNearBottomWhileScrolledAlmostToBottom()
             throws Exception {
-        openTestURL();
         selectMenuPath(GENERAL, POPULATE_COLUMN_ROW);
 
         // bottom minus 15 rows.
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/escalator/EscalatorScrollTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorScrollTest.java
index b456b16406..8953b826d8 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/escalator/EscalatorScrollTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorScrollTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.v7.tests.components.grid.basicfeatures.escalator;
+package com.vaadin.tests.components.grid.basicfeatures.escalator;
 
 import static org.junit.Assert.assertEquals;
 
@@ -22,14 +22,14 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
-import com.vaadin.v7.tests.components.grid.basicfeatures.EscalatorBasicClientFeaturesTest;
+import com.vaadin.tests.components.grid.basicfeatures.EscalatorBasicClientFeaturesTest;
 
 @SuppressWarnings("all")
 public class EscalatorScrollTest extends EscalatorBasicClientFeaturesTest {
 
     @Before
     public void setUp() {
-        openTestURL();
+        openTestURL("theme=reindeer");
         populate();
     }
 
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java
index 99d8548b30..12f55b8864 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.v7.tests.components.grid.basicfeatures.escalator;
+package com.vaadin.tests.components.grid.basicfeatures.escalator;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -37,7 +37,7 @@ import com.vaadin.shared.Range;
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.testbench.parallel.BrowserUtil;
-import com.vaadin.v7.tests.components.grid.basicfeatures.EscalatorBasicClientFeaturesTest;
+import com.vaadin.tests.components.grid.basicfeatures.EscalatorBasicClientFeaturesTest;
 
 @SuppressWarnings("boxing")
 public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest {
@@ -102,7 +102,7 @@ public class EscalatorSpacerTest extends EscalatorBasicClientFeaturesTest {
     @Before
     public void before() {
         setDebug(true);
-        openTestURL();
+        openTestURL("theme=reindeer");
         selectMenuPath(COLUMNS_AND_ROWS, BODY_ROWS, "Set 20px default height");
         populate();
     }
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/escalator/EscalatorUpdaterUiTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorUpdaterUiTest.java
index 8ab3753603..3c66d62a0d 100644
--- a/uitest/src/test/java/com/vaadin/v7/tests/components/grid/basicfeatures/escalator/EscalatorUpdaterUiTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorUpdaterUiTest.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.v7.tests.components.grid.basicfeatures.escalator;
+package com.vaadin.tests.components.grid.basicfeatures.escalator;
 
 import org.junit.Test;
 
-import com.vaadin.v7.tests.components.grid.basicfeatures.EscalatorBasicClientFeaturesTest;
-import com.vaadin.v7.tests.components.grid.basicfeatures.EscalatorUpdaterUi;
+import com.vaadin.tests.components.grid.basicfeatures.EscalatorBasicClientFeaturesTest;
+import com.vaadin.tests.components.grid.basics.EscalatorUpdaterUi;
 
 public class EscalatorUpdaterUiTest extends EscalatorBasicClientFeaturesTest {
     @Override