1 files changed, 48 insertions, 126 deletions

diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java
index bdb1ff3f83..c52e332b94 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java
@@ -9,12 +9,13 @@ import com.vaadin.data.HasRequired;
 import com.vaadin.server.Resource;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.server.UserError;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Layout.SpacingHandler;
 import com.vaadin.v7.ui.Field;
 
 public abstract class AbstractComponentTestCase<T extends AbstractComponent>
-        extends TestBase {
+        extends AbstractTestUI {
 
     protected static final ThemeResource ICON_16_HELP_PNG_CACHEABLE = cacheableThemeResource(
             "../runo/icons/16/help.png");
@@ -52,7 +53,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent>
     abstract protected void initializeComponents();
 
     @Override
-    protected void setup() {
+    protected void setup(VaadinRequest request) {
         ((SpacingHandler) getLayout()).setSpacing(true);
 
         // Create Components
@@ -77,136 +78,66 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent>
         public void execute(T c, VALUETYPE value, Object data);
     }
 
-    /* COMMANDS */
-
-    protected Command<T, String> widthCommand = new Command<T, String>() {
-
-        @Override
-        public void execute(T t, String value, Object data) {
-            t.setWidth(value);
-        }
-    };
-    protected Command<T, String> heightCommand = new Command<T, String>() {
-
-        @Override
-        public void execute(T t, String value, Object data) {
-            t.setHeight(value);
-        }
-    };
-
-    protected Command<T, Boolean> enabledCommand = new Command<T, Boolean>() {
-
-        @Override
-        public void execute(T c, Boolean enabled, Object data) {
-            c.setEnabled(enabled);
-        }
-    };
-
-    protected Command<T, Boolean> immediateCommand = new Command<T, Boolean>() {
-
-        @Override
-        public void execute(T c, Boolean immediate, Object data) {
-            c.setImmediate(immediate);
-        }
-    };
-
-    protected Command<T, Boolean> errorIndicatorCommand = new Command<T, Boolean>() {
-
-        @Override
-        public void execute(T c, Boolean enabled, Object data) {
-            if (enabled) {
-                c.setComponentError(new UserError(errorMessage));
-            } else {
-                c.setComponentError(null);
-
-            }
-        }
-    };
     private String errorMessage = null;
 
-    protected Command<T, String> errorMessageCommand = new Command<T, String>() {
-
-        @Override
-        public void execute(T c, String value, Object data) {
-            errorMessage = value;
-            if (c.getComponentError() != null) {
-                errorIndicatorCommand.execute(c, true, null);
-            }
-
-        }
-
-    };
+    /* COMMANDS */
 
-    // TODO Move to AbstractFieldTestCase
-    protected Command<T, Boolean> requiredCommand = new Command<T, Boolean>() {
-
-        @Override
-        public void execute(T c, Boolean enabled, Object data) {
-            if (c instanceof HasRequired) {
-                ((HasRequired) c).setRequired(enabled);
-            } else {
-                throw new IllegalArgumentException(c.getClass().getName()
-                        + " is not a field and cannot be set to required");
-            }
-        }
-    };
-    protected Command<T, String> requiredErrorMessageCommand = new Command<T, String>() {
+    protected Command<T, String> widthCommand = (t, value, data) -> t.setWidth(
+            value);
+    protected Command<T, String> heightCommand = (t, value, data) -> t
+            .setHeight(value);
 
-        @Override
-        public void execute(T c, String value, Object data) {
-            ((Field<?>) c).setRequiredError(value);
-        }
+    protected Command<T, Boolean> enabledCommand = (c, enabled, data) -> c
+            .setEnabled(enabled);
 
-    };
+    protected Command<T, Boolean> immediateCommand = (c, immediate, data) -> c
+            .setImmediate(immediate);
 
-    protected Command<T, String> descriptionCommand = new Command<T, String>() {
-        @Override
-        public void execute(T c, String value, Object data) {
-            c.setDescription(value);
+    protected Command<T, Boolean> errorIndicatorCommand = (c, enabled,
+            data) -> {
+        if (enabled) {
+            c.setComponentError(new UserError(errorMessage));
+        } else {
+            c.setComponentError(null);
         }
     };
 
-    protected Command<T, Boolean> readonlyCommand = new Command<T, Boolean>() {
-
-        @Override
-        public void execute(T c, Boolean enabled, Object data) {
-            c.setReadOnly(enabled);
+    protected Command<T, String> errorMessageCommand = (c, value, data) -> {
+        errorMessage = value;
+        if (c.getComponentError() != null) {
+            errorIndicatorCommand.execute(c, true, null);
         }
-    };
-
-    protected Command<T, Boolean> visibleCommand = new Command<T, Boolean>() {
 
-        @Override
-        public void execute(T c, Boolean enabled, Object data) {
-            c.setVisible(enabled);
-        }
     };
 
-    protected Command<T, Resource> iconCommand = new Command<T, Resource>() {
-
-        @Override
-        public void execute(T c, Resource value, Object data) {
-            c.setIcon(value);
+    // TODO Move to AbstractFieldTestCase
+    protected Command<T, Boolean> requiredCommand = (c, enabled, data) -> {
+        if (c instanceof HasRequired) {
+            ((HasRequired) c).setRequired(enabled);
+        } else {
+            throw new IllegalArgumentException(c.getClass().getName()
+                    + " is not a field and cannot be set to required");
         }
-
     };
-    protected Command<T, String> captionCommand = new Command<T, String>() {
+    protected Command<T, String> requiredErrorMessageCommand = (c, value,
+            data) -> ((Field<?>) c).setRequiredError(value);
 
-        @Override
-        public void execute(T c, String value, Object data) {
-            c.setCaption(value);
-        }
+    protected Command<T, String> descriptionCommand = (c, value, data) -> c
+            .setDescription(value);
 
-    };
+    protected Command<T, Boolean> readonlyCommand = (c, enabled, data) -> c
+            .setReadOnly(enabled);
 
-    protected Command<T, Locale> localeCommand = new Command<T, Locale>() {
+    protected Command<T, Boolean> visibleCommand = (c, enabled, data) -> c
+            .setVisible(enabled);
 
-        @Override
-        public void execute(T c, Locale value, Object data) {
-            c.setLocale(value);
-        }
+    protected Command<T, Resource> iconCommand = (c, value, data) -> c.setIcon(
+            value);
+    protected Command<T, String> captionCommand = (c, value, data) -> c
+            .setCaption(value);
 
-    };
+    protected Command<T, Locale> localeCommand = (c, value, data) -> c
+            .setLocale(value);
 
     protected <VALUET> void doCommand(Command<T, VALUET> command,
             VALUET value) {
@@ -230,23 +161,14 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent>
         doCommand(command, value, data);
     }
 
-    protected Command<T, String> styleNameCommand = new Command<T, String>() {
-        @Override
-        public void execute(T c, String value, Object data) {
-            c.setStyleName(value);
-        }
-    };
+    protected Command<T, String> styleNameCommand = (c, value, data) -> c
+            .setStyleName(value);
 
-    protected Command<T, String> primaryStyleNameCommand = new Command<T, String>() {
-        @Override
-        public void execute(T c, String value, Object data) {
-            c.setPrimaryStyleName(value);
-        }
-    };
+    protected Command<T, String> primaryStyleNameCommand = (c, value, data) -> c
+            .setPrimaryStyleName(value);
 
     @Override
-    protected String getDescription() {
+    protected String getTestDescription() {
         return "Generic test case for " + getTestClass().getSimpleName();
     }
-
 }