Merge branch '6.8'

Conflicts:
	src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapper.java
	src/com/vaadin/terminal/gwt/client/ui/form/VForm.java
	src/com/vaadin/terminal/gwt/client/ui/window/VWindow.java
	tests/server-side/com/vaadin/tests/VaadinClasses.java

Removed Java5-incompatible @Override annotations

17 files changed, 361 insertions, 21 deletions

diff --git a/tests/server-side/com/vaadin/tests/VaadinClasses.java b/tests/server-side/com/vaadin/tests/VaadinClasses.java
index b74af660e4..0ee193e8f1 100644
--- a/tests/server-side/com/vaadin/tests/VaadinClasses.java
+++ b/tests/server-side/com/vaadin/tests/VaadinClasses.java
@@ -15,8 +15,6 @@ import java.util.Enumeration;
 import java.util.List;
 import java.util.jar.JarEntry;
 
-import org.junit.Test;
-
 import com.vaadin.Application;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.ComponentContainer;
@@ -29,6 +27,9 @@ import com.vaadin.ui.PopupView;
 import com.vaadin.ui.Root;
 import com.vaadin.ui.VerticalSplitPanel;
 import com.vaadin.ui.Window;
+import com.vaadin.ui.themes.BaseTheme;
+
+import org.junit.Test;
 
 @SuppressWarnings("deprecation")
 public class VaadinClasses {
@@ -71,6 +72,15 @@ public class VaadinClasses {
         }
     }
 
+    public static List<Class<? extends BaseTheme>> getThemeClasses() {
+        try {
+            return findClasses(BaseTheme.class, "com.vaadin.ui.themes");
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
     public static List<Class<? extends Object>> getAllServerSideClasses() {
         try {
             return findClassesNoTests(Object.class, "com.vaadin", new String[] {
diff --git a/tests/server-side/com/vaadin/tests/server/TestThemeNames.java b/tests/server-side/com/vaadin/tests/server/TestThemeNames.java
new file mode 100644
index 0000000000..22fe315730
--- /dev/null
+++ b/tests/server-side/com/vaadin/tests/server/TestThemeNames.java
@@ -0,0 +1,38 @@
+package com.vaadin.tests.server;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import com.vaadin.tests.VaadinClasses;
+import com.vaadin.ui.themes.BaseTheme;
+
+public class TestThemeNames extends TestCase {
+    public void testThemeNames() {
+        File baseDir = new File(SourceFileChecker.getBaseDir()
+                + "WebContent/VAADIN/themes/");
+
+        List<Class<? extends BaseTheme>> themeClasses = VaadinClasses
+                .getThemeClasses();
+        for (Class<? extends BaseTheme> themeClass : themeClasses) {
+            try {
+                Field field = themeClass.getField("THEME_NAME");
+                String themeName = (String) field.get(null);
+
+                File themeDir = new File(baseDir, themeName);
+                File styleFile = new File(themeDir, "styles.css");
+
+                assertTrue("Can't find " + styleFile + " for theme "
+                        + themeClass.getName(), styleFile.exists());
+
+                // Test that casing matches
+                assertEquals(themeDir.getCanonicalFile().getName(), themeName);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+}
diff --git a/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java b/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java
index b0f401598b..7520b30416 100644
--- a/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java
+++ b/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java
@@ -15,7 +15,7 @@ public class TerminalErrorNotification extends TestBase {
     protected void setup() {
         Button button = new Button("Throw exception",
                 new Button.ClickListener() {
-                    @Override
+
                     public void buttonClick(ClickEvent event) {
                         throw new RuntimeException("You asked for it");
                     }
diff --git a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragStartModes.html b/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragStartModes.html
new file mode 100644
index 0000000000..3e7a7cb0a7
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragStartModes.html
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>DragStartModes</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">DragStartModes</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.draganddropwrapper.DragStartModes?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>drag</td>
+	<td>vaadin=runcomvaadintestscomponentsdraganddropwrapperDragStartModes::PID_SlabelCOMPONENT</td>
+	<td>50,10</td>
+</tr>
+<tr>
+	<td>mouseMoveAt</td>
+	<td>vaadin=runcomvaadintestscomponentsdraganddropwrapperDragStartModes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VLabel[0]</td>
+	<td>50,10</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>drag-mode-component</td>
+</tr>
+<tr>
+	<td>drop</td>
+	<td>vaadin=runcomvaadintestscomponentsdraganddropwrapperDragStartModes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VLabel[0]</td>
+	<td>50,10</td>
+</tr>
+<tr>
+	<td>drag</td>
+	<td>vaadin=runcomvaadintestscomponentsdraganddropwrapperDragStartModes::PID_SlabelWRAPPER</td>
+	<td>50,10</td>
+</tr>
+<tr>
+	<td>mouseMoveAt</td>
+	<td>vaadin=runcomvaadintestscomponentsdraganddropwrapperDragStartModes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VLabel[0]</td>
+	<td>50,10</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>drag-mode-wrapper</td>
+</tr>
+<tr>
+	<td>drop</td>
+	<td>vaadin=runcomvaadintestscomponentsdraganddropwrapperDragStartModes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VLabel[0]</td>
+	<td>50,10</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java b/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java
new file mode 100644
index 0000000000..d23c502a45
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java
@@ -0,0 +1,46 @@
+package com.vaadin.tests.components.draganddropwrapper;
+
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.tests.util.TestUtils;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.DragAndDropWrapper;
+import com.vaadin.ui.DragAndDropWrapper.DragStartMode;
+import com.vaadin.ui.Label;
+
+public class DragStartModes extends TestBase {
+
+    @Override
+    protected void setup() {
+
+        TestUtils.injectCSS(getMainWindow(),
+                ".v-ddwrapper { background: #ACF; }");
+
+        addComponent(makeWrapper(DragStartMode.NONE));
+        addComponent(makeWrapper(DragStartMode.COMPONENT));
+        addComponent(makeWrapper(DragStartMode.WRAPPER));
+        addComponent(makeWrapper(DragStartMode.HTML5));
+
+        addComponent(new Label("Drop here"));
+    }
+
+    private Component makeWrapper(DragStartMode mode) {
+        Label label = new Label("Drag start mode: " + mode);
+        label.setDebugId("label" + mode);
+        DragAndDropWrapper wrapper = new DragAndDropWrapper(label);
+        wrapper.setHTML5DataFlavor("Text", "HTML5!");
+        wrapper.setDragStartMode(mode);
+        wrapper.setWidth("200px");
+        return wrapper;
+    }
+
+    @Override
+    protected String getDescription() {
+        return "Different drag start modes should show correct drag images";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 8949;
+    }
+
+}
diff --git a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.html b/tests/testbench/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.html
new file mode 100644
index 0000000000..08dc608787
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.html
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>TooltipHandlingWhenNotDefined</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">TooltipHandlingWhenNotDefined</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.draganddropwrapper.TooltipHandlingWhenNotDefined?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseOver</td>
+	<td>vaadin=runcomvaadintestscomponentsdraganddropwrapperTooltipHandlingWhenNotDefined::PID_StooltipLabel</td>
+	<td></td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td></td>
+	<td>3000</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>tooltip-shown</td>
+</tr>
+</tbody>
+</table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.java b/tests/testbench/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.java
new file mode 100644
index 0000000000..0735b3e622
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.java
@@ -0,0 +1,41 @@
+package com.vaadin.tests.components.draganddropwrapper;
+
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.CssLayout;
+import com.vaadin.ui.DragAndDropWrapper;
+import com.vaadin.ui.DragAndDropWrapper.DragStartMode;
+import com.vaadin.ui.Label;
+
+public class TooltipHandlingWhenNotDefined extends TestBase {
+
+    @Override
+    protected void setup() {
+
+        CssLayout wrapperLayout = new CssLayout();
+        wrapperLayout.setWidth("100%");
+
+        Label label = new Label("Can I has the tooltip?", Label.CONTENT_XHTML);
+        label.setDebugId("tooltipLabel");
+        label.setDescription("Good! Tooltip works!");
+        label.setSizeUndefined();
+        wrapperLayout.addComponent(label);
+
+        DragAndDropWrapper wrapper = new DragAndDropWrapper(wrapperLayout);
+        wrapper.setWidth("100%");
+        wrapper.setDragStartMode(DragStartMode.WRAPPER);
+
+        addComponent(wrapper);
+
+    }
+
+    @Override
+    protected String getDescription() {
+        return "Wrapper most not prevent child from showing tooltip";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 7766;
+    }
+
+}
diff --git a/tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java b/tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java
index 9c8b43ac53..547ef3077b 100644
--- a/tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java
+++ b/tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java
@@ -17,15 +17,11 @@ public class NotificationsAndModalWindow extends TestBase {
 
         Button b = new Button("Button");
         b.addListener(new Button.ClickListener() {
-
-            @Override
             public void buttonClick(ClickEvent event) {
-
                 Window w = new Window("This is a window");
                 w.setModal(true);
                 getMainWindow().addWindow(w);
             }
-
         });
         addComponent(b);
     }
diff --git a/tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java b/tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java
index c3ce0cd762..44367d0fe1 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java
+++ b/tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java
@@ -46,7 +46,7 @@ public class ScrollDetachSynchronization extends TestBase {
         mainLayout.setExpandRatio(firstLayout, 1);
 
         first.addListener(new Button.ClickListener() {
-            @Override
+
             public void buttonClick(ClickEvent event) {
                 if (mainLayout.getComponent(1).equals(secondLayout)) {
                     mainLayout.replaceComponent(secondLayout, firstLayout);
@@ -55,7 +55,7 @@ public class ScrollDetachSynchronization extends TestBase {
             }
         });
         second.addListener(new Button.ClickListener() {
-            @Override
+
             public void buttonClick(ClickEvent event) {
                 if (mainLayout.getComponent(1).equals(firstLayout)) {
                     mainLayout.replaceComponent(firstLayout, secondLayout);
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java b/tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
index e028f3073f..79a7eca852 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
@@ -60,7 +60,7 @@ public class TableClickValueChangeInteraction extends TestBase {
         table.setHeight("100px");
         if (listenClicks) {
             table.addListener(new ItemClickListener() {
-                @Override
+
                 public void itemClick(ItemClickEvent event) {
                     table.requestRepaint();
                     clickLabel.setValue("Click " + event.getItemId());
@@ -69,7 +69,7 @@ public class TableClickValueChangeInteraction extends TestBase {
         }
         if (listenValueChanges) {
             table.addListener(new ValueChangeListener() {
-                @Override
+
                 public void valueChange(ValueChangeEvent event) {
                     valueChangeLabel.setValue("Value "
                             + event.getProperty().getValue());
diff --git a/tests/testbench/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.html b/tests/testbench/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.html
new file mode 100644
index 0000000000..a3b56cd12a
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.html
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>UndefinedHeightSubWindowAndContent</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">UndefinedHeightSubWindowAndContent</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.window.UndefinedHeightSubWindowAndContent?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentswindowUndefinedHeightSubWindowAndContent::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
+	<td>52,11</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentswindowUndefinedHeightSubWindowAndContent::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
+	<td>invalid</td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentswindowUndefinedHeightSubWindowAndContent::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
+	<td>enter</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>form_full_width_1_error</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentswindowUndefinedHeightSubWindowAndContent::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
+	<td>valid</td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentswindowUndefinedHeightSubWindowAndContent::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
+	<td>enter</td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>form_full_width_2_valid</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java b/tests/testbench/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java
new file mode 100644
index 0000000000..ed259b2f4c
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java
@@ -0,0 +1,58 @@
+package com.vaadin.tests.components.window;
+
+import com.vaadin.data.Validator;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+
+public class UndefinedHeightSubWindowAndContent extends TestBase {
+
+    @Override
+    protected void setup() {
+        Window subWindow = new Window("No scrollbars!");
+        subWindow.setWidth("300px");
+        subWindow.center();
+        subWindow.setModal(true);
+        VerticalLayout layout = new VerticalLayout();
+        layout.setWidth("100%");
+        subWindow.setContent(layout);
+
+        final Form form = new Form();
+        form.setImmediate(true);
+        form.setValidationVisible(true);
+        form.setCaption("This is a form");
+        form.setDescription("How do you do?");
+        final TextField field1 = new TextField("Write here");
+        field1.setImmediate(true);
+        field1.addValidator(new Validator() {
+
+            public void validate(Object value) throws InvalidValueException {
+                if (!isValid(value)) {
+                    throw new InvalidValueException("FAIL!");
+                }
+            }
+
+            public boolean isValid(Object value) {
+                return field1.getValue().equals("valid");
+            }
+        });
+        form.addField("Field 1", field1);
+        layout.addComponent(form);
+
+        getMainWindow().addWindow(subWindow);
+        subWindow.bringToFront();
+    }
+
+    @Override
+    protected String getDescription() {
+        return "When both window and its content have undefined height, window must not reserve space for a scroll bar when it is not needed.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 8852;
+    }
+
+}
diff --git a/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java b/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java
index 0b62cd94d5..1b6d384e70 100644
--- a/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java
+++ b/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java
@@ -22,8 +22,6 @@ public class EmbedSizeTest extends TestBase {
 
         CheckBox lazyCheckBox = new CheckBox("Lazy resize");
         lazyCheckBox.addListener(new ValueChangeListener() {
-
-            @Override
             public void valueChange(ValueChangeEvent event) {
                 CheckBox cb = (CheckBox) event.getProperty();
                 Boolean resizeLazy = cb.getValue();
@@ -37,7 +35,6 @@ public class EmbedSizeTest extends TestBase {
 
         addComponent(log);
         mainWindow.addListener(new Page.BrowserWindowResizeListener() {
-            @Override
             public void browserWindowResized(BrowserWindowResizeEvent event) {
                 log.log("Resize event: " + event.getWidth() + " x "
                         + event.getHeight());
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java
index bed39d48ae..9ad9adb43a 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java
+++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java
@@ -28,7 +28,7 @@ public class GridLayoutCaptions extends TestBase {
         private CssLayout wrapper2 = new CssLayout();
 
         private FormFieldFactory fff = new FormFieldFactory() {
-            @Override
+
             public Field<?> createField(Item item, Object propertyId,
                     Component uiContext) {
 
@@ -194,7 +194,7 @@ public class GridLayoutCaptions extends TestBase {
         mainWindow.addComponent(aFormWithGl);
 
         Button b = new Button("Give me an error!", new Button.ClickListener() {
-            @Override
+
             public void buttonClick(ClickEvent event) {
                 aFormWithGl.createErrors();
 
@@ -204,7 +204,7 @@ public class GridLayoutCaptions extends TestBase {
 
         Button b2 = new Button("Get rid of an error!",
                 new Button.ClickListener() {
-                    @Override
+
                     public void buttonClick(ClickEvent event) {
                         aFormWithGl.clearErrors();
 
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
index 84f27e5f03..314a8d7b03 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
+++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
@@ -59,7 +59,6 @@ public class GridLayoutExpandRatioModification extends TestBase implements
         vl2.setSizeFull();
     }
 
-    @Override
     public void buttonClick(ClickEvent event) {
         if (isVisible) {
             mainLayout.setRowExpandRatio(2, 0);
diff --git a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java b/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
index 916a82bb85..44a1e27cb8 100644
--- a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
+++ b/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
@@ -55,7 +55,6 @@ public class VerticalLayoutExpandRatioModification extends TestBase implements
         vl2.setSizeFull();
     }
 
-    @Override
     public void buttonClick(ClickEvent event) {
         if (isVisible) {
             mainLayout.setExpandRatio(vl2, 0);
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java b/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java
index d720d45463..c68dc9d534 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java
@@ -31,7 +31,7 @@ public class Ticket6002 extends TestBase {
         final TextField tf1 = new TextField(
                 "Changing this field modifies only the textfield", property1);
         tf1.addListener(new Property.ValueChangeListener() {
-            @Override
+
             public void valueChange(ValueChangeEvent event) {
                 // This value change event is called twice if the new
                 // input value is an integer. The second time is during
@@ -56,7 +56,7 @@ public class Ticket6002 extends TestBase {
                 "Changing this field modifies the layout - do it twice",
                 property2);
         tf2.addListener(new Property.ValueChangeListener() {
-            @Override
+
             public void valueChange(ValueChangeEvent event) {
                 // This value change event is called twice if the new
                 // input value is an integer. The second time is during