Fix broken tests because of default theme change (Valo).

Change-Id: I628220101ab74a22599e00c2ab2dfd83802c40cf

3 files changed, 13 insertions, 16 deletions

diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java
index 28c8a987b7..5962e4833d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java
@@ -14,7 +14,7 @@ import com.vaadin.annotations.Widgetset;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.Registration;
 import com.vaadin.shared.ui.grid.HeightMode;
-import com.vaadin.tests.components.AbstractTestUIWithLog;
+import com.vaadin.tests.components.AbstractReindeerTestUIWithLog;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Grid;
@@ -35,7 +35,7 @@ import com.vaadin.ui.renderers.NumberRenderer;
 import com.vaadin.ui.renderers.ProgressBarRenderer;
 
 @Widgetset("com.vaadin.DefaultWidgetSet")
-public class GridBasics extends AbstractTestUIWithLog {
+public class GridBasics extends AbstractReindeerTestUIWithLog {
 
     public static final String ROW_STYLE_GENERATOR_ROW_NUMBERS_FOR_3_OF_4 = "Row numbers for 3/4";
     public static final String ROW_STYLE_GENERATOR_NONE = "None";
@@ -60,7 +60,7 @@ public class GridBasics extends AbstractTestUIWithLog {
             removeRegistration();
             if (selectedItem.isChecked()) {
                 registration = grid.addColumnReorderListener(event -> {
-                    List<String> columnCaptions = new ArrayList<String>();
+                    List<String> columnCaptions = new ArrayList<>();
                     for (Column<DataObject, ?> column : grid.getColumns()) {
                         columnCaptions.add(column.getCaption());
                     }
@@ -275,15 +275,12 @@ public class GridBasics extends AbstractTestUIWithLog {
                         : null))
                 .setCheckable(true);
         stateMenu
-                .addItem("Cell description generator",
-                        item -> grid.getColumns().stream().findFirst()
-                                .ifPresent(
-                                        c -> c.setDescriptionGenerator(
-                                                item.isChecked()
-                                                        ? t -> "Cell tooltip for row "
-                                                                + t.getRowNumber()
-                                                                + ", Column 0"
-                                                        : null)))
+                .addItem("Cell description generator", item -> grid.getColumns()
+                        .stream().findFirst()
+                        .ifPresent(c -> c.setDescriptionGenerator(
+                                item.isChecked() ? t -> "Cell tooltip for row "
+                                        + t.getRowNumber() + ", Column 0"
+                                        : null)))
                 .setCheckable(true);
         stateMenu.addItem("Item click listener", new Command() {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableBlurFocus.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableBlurFocus.java
index a7adb0c803..50516e7b9e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableBlurFocus.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableBlurFocus.java
@@ -22,7 +22,7 @@ import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
 import com.vaadin.server.VaadinRequest;
-import com.vaadin.tests.components.AbstractTestUIWithLog;
+import com.vaadin.tests.components.AbstractReindeerTestUIWithLog;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
@@ -36,7 +36,7 @@ import com.vaadin.v7.ui.Table;
  *
  * @author Vaadin Ltd
  */
-public class TableBlurFocus extends AbstractTestUIWithLog {
+public class TableBlurFocus extends AbstractReindeerTestUIWithLog {
 
     enum Columns {
         COLUMN1, COLUMN2, COLUMN3, COLUMN4, COLUMN5
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutClickListeners.java b/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutClickListeners.java
index 39d1ec9dd7..c237d572bb 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutClickListeners.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutClickListeners.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.layouts;
 import com.vaadin.event.LayoutEvents.LayoutClickEvent;
 import com.vaadin.event.LayoutEvents.LayoutClickListener;
 import com.vaadin.server.VaadinRequest;
-import com.vaadin.tests.components.AbstractTestUIWithLog;
+import com.vaadin.tests.components.AbstractReindeerTestUIWithLog;
 import com.vaadin.ui.AbsoluteLayout;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Component;
@@ -16,7 +16,7 @@ import com.vaadin.ui.TextField;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.ui.TextArea;
 
-public class TestLayoutClickListeners extends AbstractTestUIWithLog {
+public class TestLayoutClickListeners extends AbstractReindeerTestUIWithLog {
 
     @Override
     protected void setup(VaadinRequest request) {