Merge branch 'master' into layoutgraph

37 files changed, 83 insertions, 83 deletions

diff --git a/tests/testbench/com/vaadin/tests/OrderedLayoutSwapComponents.java b/tests/testbench/com/vaadin/tests/OrderedLayoutSwapComponents.java
index 25831c8f06..f47078ba8c 100644
--- a/tests/testbench/com/vaadin/tests/OrderedLayoutSwapComponents.java
+++ b/tests/testbench/com/vaadin/tests/OrderedLayoutSwapComponents.java
@@ -68,7 +68,7 @@ public class OrderedLayoutSwapComponents extends CustomComponent {
 
         MyComponent(String name) {
             HorizontalLayout ol = new HorizontalLayout();
-            ol.setDebugId(name.replaceAll(" ", ""));
+            ol.setId(name.replaceAll(" ", ""));
             ol.addComponent(new Label(name));
             up = new Button("up");
             up.addListener(new Button.ClickListener() {
diff --git a/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java b/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java
index 2e6c188331..d7e9155ded 100644
--- a/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java
+++ b/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java
@@ -38,11 +38,11 @@ public class ErrorInUnloadEvent extends AbstractTestCase {
 
         FormLayout formLayout = new FormLayout();
         final TextField userField = new TextField("Username");
-        userField.setDebugId("user");
+        userField.setId("user");
         final PasswordField passwordField = new PasswordField("Password");
-        passwordField.setDebugId("pwd");
+        passwordField.setId("pwd");
         Button login = new Button("login");
-        login.setDebugId("loginButton");
+        login.setId("loginButton");
         login.setClickShortcut(KeyCode.ENTER);
         formLayout.addComponent(userField);
         formLayout.addComponent(passwordField);
diff --git a/tests/testbench/com/vaadin/tests/components/AbstractComponentTest.java b/tests/testbench/com/vaadin/tests/components/AbstractComponentTest.java
index 38bba7721c..cece73a14d 100644
--- a/tests/testbench/com/vaadin/tests/components/AbstractComponentTest.java
+++ b/tests/testbench/com/vaadin/tests/components/AbstractComponentTest.java
@@ -98,7 +98,7 @@ public abstract class AbstractComponentTest<T extends AbstractComponent>
 
     private MenuBar createMainMenu() {
         menu = new MenuBar();
-        menu.setDebugId("menu");
+        menu.setId("menu");
         mainMenu = menu.addItem("Component", null);
         settingsMenu = menu.addItem("Settings", null);
         populateSettingsMenu(settingsMenu);
@@ -189,7 +189,7 @@ public abstract class AbstractComponentTest<T extends AbstractComponent>
     @Override
     protected void initializeComponents() {
         component = constructComponent();
-        component.setDebugId("testComponent");
+        component.setId("testComponent");
         addTestComponent(component);
     }
 
diff --git a/tests/testbench/com/vaadin/tests/components/ComponentTestCase.java b/tests/testbench/com/vaadin/tests/components/ComponentTestCase.java
index e949d62f71..9bb01cd56f 100644
--- a/tests/testbench/com/vaadin/tests/components/ComponentTestCase.java
+++ b/tests/testbench/com/vaadin/tests/components/ComponentTestCase.java
@@ -124,7 +124,7 @@ public abstract class ComponentTestCase<T extends AbstractComponent> extends
         checkBox.setValue(initialState);
         checkBox.setImmediate(true);
 
-        checkBox.setDebugId("checkboxaction-" + caption);
+        checkBox.setId("checkboxaction-" + caption);
         // Set default value for all components
         doCommand(command, initialState);
 
@@ -146,7 +146,7 @@ public abstract class ComponentTestCase<T extends AbstractComponent> extends
             }
         });
 
-        button.setDebugId("buttonaction-" + caption);
+        button.setId("buttonaction-" + caption);
         button.setImmediate(true);
 
         return button;
@@ -187,7 +187,7 @@ public abstract class ComponentTestCase<T extends AbstractComponent> extends
 
         }
 
-        select.setDebugId("selectaction-" + caption);
+        select.setId("selectaction-" + caption);
 
         select.setImmediate(true);
 
diff --git a/tests/testbench/com/vaadin/tests/components/MultipleDebugIds.java b/tests/testbench/com/vaadin/tests/components/MultipleDebugIds.java
index ebfa29b9e9..4633b4f1cd 100644
--- a/tests/testbench/com/vaadin/tests/components/MultipleDebugIds.java
+++ b/tests/testbench/com/vaadin/tests/components/MultipleDebugIds.java
@@ -21,10 +21,10 @@ public class MultipleDebugIds extends TestBase {
         TextField textField2 = new TextField();
         Button button = new Button();
         Button button2 = new Button();
-        textField.setDebugId("textfield");
-        button.setDebugId("button");
-        textField2.setDebugId("textfield2");
-        button2.setDebugId("textfield");
+        textField.setId("textfield");
+        button.setId("button");
+        textField2.setId("textfield2");
+        button2.setId("textfield");
 
         addComponent(textField);
         addComponent(textField2);
diff --git a/tests/testbench/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java b/tests/testbench/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
index 34655be91d..5deec3b4f5 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
+++ b/tests/testbench/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
@@ -34,7 +34,7 @@ public class AllComponentTooltipTest extends AbstractTestUI {
                     continue;
                 }
 
-                c.setDebugId(cls.getName());
+                c.setId(cls.getName());
                 c.setCaption(cls.getName());
                 c.setDescription(cls.getName());
                 c.setWidth("100px");
diff --git a/tests/testbench/com/vaadin/tests/components/abstractcomponent/TooltipTests.java b/tests/testbench/com/vaadin/tests/components/abstractcomponent/TooltipTests.java
index 300abe1851..01c7ab83ae 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractcomponent/TooltipTests.java
+++ b/tests/testbench/com/vaadin/tests/components/abstractcomponent/TooltipTests.java
@@ -41,17 +41,17 @@ public class TooltipTests extends TestBase {
 
         panel = new Panel();
         panel.setCaption("Panel caption");
-        panel.setDebugId("panel");
+        panel.setId("panel");
         addComponent(panel);
 
         layout = new VerticalLayout();
-        layout.setDebugId("layout");
+        layout.setId("layout");
         layout.setMargin(true);
         layout.setSpacing(true);
         panel.setContent(layout);
 
         label = new Label("Hover me!");
-        label.setDebugId("label");
+        label.setId("label");
         layout.addComponent(label);
     }
 
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.java b/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.java
index e24f4753ff..1553594867 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.java
@@ -53,7 +53,7 @@ public class CommitInvalid extends TestBase {
         dateField = new DateField("Year", dateProperty);
         dateField.setLocale(new Locale("fi", "FI"));
         dateField.setResolution(DateField.RESOLUTION_DAY);
-        dateField.setDebugId("_DF");
+        dateField.setId("_DF");
         form.addField("date", dateField);
 
         /*
@@ -63,14 +63,14 @@ public class CommitInvalid extends TestBase {
          */
         integerProperty = new ObjectProperty<Integer>(42);
         integerField = new TextField("Another Field", integerProperty);
-        integerField.setDebugId("_IF");
+        integerField.setId("_IF");
         form.addField("text", integerField);
 
         /*
          * Action buttons.
          */
         Button validate = new Button("Validate");
-        validate.setDebugId("_validate");
+        validate.setId("_validate");
         validate.addListener(new Button.ClickListener() {
             @Override
             public void buttonClick(ClickEvent event) {
@@ -87,7 +87,7 @@ public class CommitInvalid extends TestBase {
         form.getFooter().addComponent(validate);
 
         Button commit = new Button("Commit");
-        commit.setDebugId("_commit");
+        commit.setId("_commit");
         commit.addListener(new Button.ClickListener() {
             @Override
             public void buttonClick(ClickEvent event) {
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.java b/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.java
index acca47ee5e..247478256f 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.java
@@ -149,7 +149,7 @@ public class CustomDateFormats extends TestBase {
         while (usedDebugIds.contains(debugId)) {
             debugId = debugId + "-";
         }
-        df.setDebugId(debugId);
+        df.setId(debugId);
         usedDebugIds.add(debugId);
 
         df.setData(new Data(serversideValueLabel, pattern));
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
index 5098a4e459..8bc9887b82 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
@@ -41,7 +41,7 @@ public class DateFieldEmptyValid extends TestBase {
         log = new Log(8);
         addComponent(log);
         df = new MyDateField();
-        df.setDebugId("DateField");
+        df.setId("DateField");
         df.setRequired(true);
         df.setLocale(new Locale("fi", "FI"));
         df.setValue(new Date(100000000000L));
@@ -57,7 +57,7 @@ public class DateFieldEmptyValid extends TestBase {
         addComponent(df);
         checkEmpty();
         Button b = new Button("Clear date");
-        b.setDebugId("clear");
+        b.setId("clear");
         b.addListener(new ClickListener() {
 
             @Override
@@ -69,7 +69,7 @@ public class DateFieldEmptyValid extends TestBase {
         addComponent(b);
 
         b = new Button("Set date to 4.5.1990");
-        b.setDebugId("set4.5.1990");
+        b.setId("set4.5.1990");
         b.addListener(new ClickListener() {
 
             @Override
@@ -93,12 +93,12 @@ public class DateFieldEmptyValid extends TestBase {
                 df.setPropertyDataSource(dfProp);
             }
         });
-        b.setDebugId("set-by-ds");
+        b.setId("set-by-ds");
         addComponent(b);
 
         b = new Button(
                 "Set date to 27.8.2005 by changing a new property data source from null, ds attached before value setting.");
-        b.setDebugId("set-via-ds");
+        b.setId("set-via-ds");
         b.addListener(new ClickListener() {
 
             @Override
@@ -114,7 +114,7 @@ public class DateFieldEmptyValid extends TestBase {
         addComponent(b);
 
         b = new Button("Check value");
-        b.setDebugId("check-value");
+        b.setId("check-value");
         b.addListener(new ClickListener() {
             @Override
             public void buttonClick(ClickEvent event) {
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFields.java b/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFields.java
index c642db1bc0..ea384d5634 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFields.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFields.java
@@ -33,14 +33,14 @@ public class InlineDateFields extends ComponentTestCase<InlineDateField> {
 
         InlineDateField pd = createInlineDateField("Undefined width", "-1",
                 locale);
-        pd.setDebugId("Locale-" + locale.toString() + "-undefined-wide");
+        pd.setId("Locale-" + locale.toString() + "-undefined-wide");
         addTestComponent(pd);
         pd = createInlineDateField("300px width", "300px", locale);
-        pd.setDebugId("Locale-" + locale.toString() + "-300px-wide");
+        pd.setId("Locale-" + locale.toString() + "-300px-wide");
         addTestComponent(pd);
         pd = createInlineDateField("Initially empty", "", locale);
         pd.setValue(null);
-        pd.setDebugId("Locale-" + locale.toString() + "-initially-empty");
+        pd.setId("Locale-" + locale.toString() + "-initially-empty");
         addTestComponent(pd);
 
     }
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFields.java b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFields.java
index bf2a679c63..e69de5de12 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFields.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFields.java
@@ -28,14 +28,14 @@ public class PopupDateFields extends ComponentTestCase<PopupDateField> {
         for (Locale locale : LOCALES) {
             PopupDateField pd = createPopupDateField("Undefined width", "-1",
                     locale);
-            pd.setDebugId("Locale-" + locale.toString() + "-undefined-wide");
+            pd.setId("Locale-" + locale.toString() + "-undefined-wide");
             addTestComponent(pd);
             pd = createPopupDateField("500px width", "500px", locale);
-            pd.setDebugId("Locale-" + locale.toString() + "-500px-wide");
+            pd.setId("Locale-" + locale.toString() + "-500px-wide");
             addTestComponent(pd);
             pd = createPopupDateField("Initially empty", "", locale);
             pd.setValue(null);
-            pd.setDebugId("Locale-" + locale.toString() + "-initially-empty");
+            pd.setId("Locale-" + locale.toString() + "-initially-empty");
             addTestComponent(pd);
         }
 
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java b/tests/testbench/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java
index a89459d37a..bd47622394 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java
+++ b/tests/testbench/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java
@@ -58,7 +58,7 @@ public class RequiredInvalidDateField extends TestBase {
         DateField dateField1 = new DateField("Not required", dateProperty1);
         dateField1.setLocale(new Locale("fi", "FI"));
         dateField1.setResolution(DateField.RESOLUTION_DAY);
-        dateField1.setDebugId("_DF1");
+        dateField1.setId("_DF1");
         dateField1.setImmediate(true);
         dateField1.addValidator(dateValidator);
         addComponent(dateField1);
@@ -68,7 +68,7 @@ public class RequiredInvalidDateField extends TestBase {
         DateField dateField2 = new DateField("Required", dateProperty2);
         dateField2.setLocale(new Locale("fi", "FI"));
         dateField2.setResolution(DateField.RESOLUTION_DAY);
-        dateField2.setDebugId("_DF2");
+        dateField2.setId("_DF2");
         dateField2.setRequired(true);
         dateField2.setImmediate(true);
         dateField2.addValidator(dateValidator);
diff --git a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.java b/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.java
index aeb0864707..22ed5e5a4a 100644
--- a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.java
+++ b/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.java
@@ -45,7 +45,7 @@ public class DragAndDropWrapperTooltips extends TestBase {
 
         for (int i = 1; i <= 4; i++) {
             WrappedLabel wl = new WrappedLabel("Block");
-            wl.setDebugId("wrapper" + i);
+            wl.setId("wrapper" + i);
             wl.addStyleName("b" + i);
             cssLayout.addComponent(wl);
         }
diff --git a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java b/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java
index d23c502a45..b143ddf2dc 100644
--- a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java
+++ b/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java
@@ -25,7 +25,7 @@ public class DragStartModes extends TestBase {
 
     private Component makeWrapper(DragStartMode mode) {
         Label label = new Label("Drag start mode: " + mode);
-        label.setDebugId("label" + mode);
+        label.setId("label" + mode);
         DragAndDropWrapper wrapper = new DragAndDropWrapper(label);
         wrapper.setHTML5DataFlavor("Text", "HTML5!");
         wrapper.setDragStartMode(mode);
diff --git a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.java b/tests/testbench/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.java
index 0735b3e622..93f559f4e7 100644
--- a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.java
+++ b/tests/testbench/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.java
@@ -15,7 +15,7 @@ public class TooltipHandlingWhenNotDefined extends TestBase {
         wrapperLayout.setWidth("100%");
 
         Label label = new Label("Can I has the tooltip?", Label.CONTENT_XHTML);
-        label.setDebugId("tooltipLabel");
+        label.setId("tooltipLabel");
         label.setDescription("Good! Tooltip works!");
         label.setSizeUndefined();
         wrapperLayout.addComponent(label);
diff --git a/tests/testbench/com/vaadin/tests/components/table/FooterClick.java b/tests/testbench/com/vaadin/tests/components/table/FooterClick.java
index 08dc47908a..992b521b60 100644
--- a/tests/testbench/com/vaadin/tests/components/table/FooterClick.java
+++ b/tests/testbench/com/vaadin/tests/components/table/FooterClick.java
@@ -24,7 +24,7 @@ public class FooterClick extends TestBase {
     @Override
     protected void setup() {
         final Table table = new Table();
-        table.setDebugId("table");
+        table.setId("table");
         table.setContainerDataSource(createContainer());
         table.setWidth("400px");
         table.setHeight("400px");
@@ -38,7 +38,7 @@ public class FooterClick extends TestBase {
 
         final TextField columnField = new TextField(
                 "ProperyId of clicked column");
-        columnField.setDebugId("ClickedColumn");
+        columnField.setId("ClickedColumn");
 
         // Add a footer click listener
         table.addListener(new Table.FooterClickListener() {
diff --git a/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.java b/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.java
index 4bdb20adea..4fca8c1742 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.java
+++ b/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.java
@@ -23,7 +23,7 @@ public class ItemClickEvents extends TestBase {
 
     @Override
     public void setup() {
-        log.setDebugId("log");
+        log.setId("log");
 
         HorizontalLayout ol = createHorizontalLayout(tree);
         Button b = new Button("icon", new Button.ClickListener() {
@@ -61,7 +61,7 @@ public class ItemClickEvents extends TestBase {
                 logEvent(event, "tree");
             }
         });
-        tree.setDebugId("tree");
+        tree.setId("tree");
 
         HorizontalLayout ol2 = createHorizontalLayout(table);
         table.setWidth("150px");
@@ -80,7 +80,7 @@ public class ItemClickEvents extends TestBase {
                 logEvent(event, "table");
             }
         });
-        table.setDebugId("table");
+        table.setId("table");
 
         addComponent(log);
         addComponent(new Button("Clear log", new Button.ClickListener() {
diff --git a/tests/testbench/com/vaadin/tests/components/table/PropertyValueChange.java b/tests/testbench/com/vaadin/tests/components/table/PropertyValueChange.java
index 1bc9cf525d..e85bfc55a7 100644
--- a/tests/testbench/com/vaadin/tests/components/table/PropertyValueChange.java
+++ b/tests/testbench/com/vaadin/tests/components/table/PropertyValueChange.java
@@ -91,7 +91,7 @@ public class PropertyValueChange extends TestBase {
         t1.addGeneratedColumn("integer x 3", multiplier);
         t1.setTableFieldFactory(ff);
         t1.setEditable(true);
-        t1.setDebugId("editortable");
+        t1.setId("editortable");
 
         Table t2 = new Table(
                 "A clone of table1, but disabled. Properties are in components.");
@@ -104,7 +104,7 @@ public class PropertyValueChange extends TestBase {
         t2.setContainerDataSource(container);
         t2.addGeneratedColumn("integer x 3", multiplier);
         t2.setPageLength(0);
-        t2.setDebugId("disabled table");
+        t2.setId("disabled table");
 
         Table reader = new Table("Reader table");
         reader.setDescription("This table should be redrawn on container changes as container data is "
@@ -112,7 +112,7 @@ public class PropertyValueChange extends TestBase {
         reader.setContainerDataSource(container);
         reader.addGeneratedColumn("integer x 3", multiplier);
         reader.setPageLength(0);
-        reader.setDebugId("reader table");
+        reader.setId("reader table");
 
         getLayout().addComponent(t1);
         getLayout().addComponent(t2);
diff --git a/tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java b/tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java
index 5cc77f23d9..9423968ecf 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java
+++ b/tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java
@@ -33,8 +33,8 @@ public class ScrollDetachSynchronization extends TestBase {
         buttonBar.setSizeUndefined();
         Button first = new Button("First layout");
         Button second = new Button("Second layout");
-        first.setDebugId("FirstButton");
-        second.setDebugId("SecondButton");
+        first.setId("FirstButton");
+        second.setId("SecondButton");
         buttonBar.addComponent(first);
         buttonBar.addComponent(second);
         mainLayout.addComponent(buttonBar);
@@ -73,7 +73,7 @@ public class ScrollDetachSynchronization extends TestBase {
 
         HorizontalLayout hl = new HorizontalLayout();
         hl.setSizeFull();
-        hl.setDebugId(which + "Layout");
+        hl.setId(which + "Layout");
 
         Table t = new Table();
         t.addContainerProperty("name", String.class, null);
@@ -81,7 +81,7 @@ public class ScrollDetachSynchronization extends TestBase {
             String id = which + " " + i;
             t.addItem(new String[] { id }, id);
         }
-        t.setDebugId(which + "Table");
+        t.setId(which + "Table");
         t.setItemCaptionPropertyId("name");
         t.setSizeFull();
 
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java b/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
index 1a8fc37634..38b3a751e2 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
@@ -33,7 +33,7 @@ public class TableClickAndDragOnIconAndComponents extends TestBase {
         table.setSelectable(true);
         table.setRowHeaderMode(Table.ROW_HEADER_MODE_ICON_ONLY);
         table.setItemIconPropertyId("icon");
-        table.setDebugId("testable-table");
+        table.setId("testable-table");
         addComponent(table);
         for (int i = 0; i < 5; i++) {
             addItemAfter(i + "foo", null);
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java b/tests/testbench/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java
index 0d5d6802d7..e7176add0a 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java
@@ -18,7 +18,7 @@ public class TableItemDescriptionGeneratorTest extends TestBase {
     @Override
     protected void setup() {
         final Table table = new Table();
-        table.setDebugId("table");
+        table.setId("table");
         table.setContainerDataSource(createContainer());
         addComponent(table);
 
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple.java b/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple.java
index 88d20b9eb0..56fb7c1c7d 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple.java
@@ -17,7 +17,7 @@ public class TableMultiSelectSimple extends TestBase {
 
     @Override
     protected void setup() {
-        log.setDebugId("eventlog");
+        log.setId("eventlog");
 
         Table t = new Table();
 
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.java b/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.java
index 827593cd91..92a1491c56 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.java
+++ b/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.java
@@ -13,7 +13,7 @@ public class TableSingleSelect extends TestBase {
 
     @Override
     protected void setup() {
-        log.setDebugId("eventlog");
+        log.setId("eventlog");
 
         Table t = new Table();
 
diff --git a/tests/testbench/com/vaadin/tests/components/upload/TestFileUpload.java b/tests/testbench/com/vaadin/tests/components/upload/TestFileUpload.java
index 529a977ede..ad86d0f593 100644
--- a/tests/testbench/com/vaadin/tests/components/upload/TestFileUpload.java
+++ b/tests/testbench/com/vaadin/tests/components/upload/TestFileUpload.java
@@ -26,7 +26,7 @@ public class TestFileUpload extends TestBase implements Receiver {
                 return baos;
             }
         });
-        u.setDebugId("UPL");
+        u.setId("UPL");
         u.addListener(new Upload.FinishedListener() {
 
             @Override
diff --git a/tests/testbench/com/vaadin/tests/components/window/CloseSubWindow.java b/tests/testbench/com/vaadin/tests/components/window/CloseSubWindow.java
index e618cd38b5..8060ec9955 100644
--- a/tests/testbench/com/vaadin/tests/components/window/CloseSubWindow.java
+++ b/tests/testbench/com/vaadin/tests/components/window/CloseSubWindow.java
@@ -16,7 +16,7 @@ public class CloseSubWindow extends TestBase {
     @Override
     protected void setup() {
         Button openWindowButton = new Button("Open sub-window");
-        openWindowButton.setDebugId("opensub");
+        openWindowButton.setId("opensub");
         openWindowButton.addListener(new ClickListener() {
             @Override
             public void buttonClick(ClickEvent event) {
diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest1.java b/tests/testbench/com/vaadin/tests/dd/DDTest1.java
index 2067d559d7..3f0689cdc1 100644
--- a/tests/testbench/com/vaadin/tests/dd/DDTest1.java
+++ b/tests/testbench/com/vaadin/tests/dd/DDTest1.java
@@ -92,7 +92,7 @@ public class DDTest1 extends TestBase {
 
         pane2.setAcceptCriterion(crit);
 
-        pane2.setDebugId("pane2");
+        pane2.setId("pane2");
         pane2.setSizeFull();
 
         DragDropPane pane3 = new DragDropPane();
@@ -104,7 +104,7 @@ public class DDTest1 extends TestBase {
 
         final HierarchicalContainer idx = new HierarchicalContainer();
         t.setContainerDataSource(idx);
-        t.setDebugId("perseys");
+        t.setId("perseys");
         t.addItem("Foo");
         t.addItem("Bar");
         t.addItem("Bar1");
diff --git a/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java b/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java
index 0621fd5d92..87ce80d4f7 100644
--- a/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java
+++ b/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java
@@ -33,7 +33,7 @@ public class MovingComponentsWhileOldParentInvisible extends TestBase {
                 pageLength = 0;
             }
         };
-        componentContainerSelect.setDebugId("componentContainerSelect");
+        componentContainerSelect.setId("componentContainerSelect");
         componentContainerSelect.setWidth("300px");
         componentContainerSelect.setImmediate(true);
         componentContainerSelect.setNullSelectionAllowed(false);
diff --git a/tests/testbench/com/vaadin/tests/layouts/TestAbsoluteLayout.java b/tests/testbench/com/vaadin/tests/layouts/TestAbsoluteLayout.java
index 33fa0558e7..177471e3c8 100644
--- a/tests/testbench/com/vaadin/tests/layouts/TestAbsoluteLayout.java
+++ b/tests/testbench/com/vaadin/tests/layouts/TestAbsoluteLayout.java
@@ -153,7 +153,7 @@ public class TestAbsoluteLayout extends TestBase {
                         String caption = next.getClass().getSimpleName();
 
                         caption += "; cap: " + next.getCaption() + "; debugid"
-                                + getDebugId();
+                                + getId();
 
                         if (next instanceof Property) {
                             caption += " value:"
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java
index 4392c0762a..27c3d4a8a7 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java
@@ -47,7 +47,7 @@ public class Ticket1973_2 extends Application.LegacyApplication {
             int randInt = i;
             Item item = container.addItem(new Integer(i));
             VerticalLayout layout = new VerticalLayout();
-            layout.setDebugId("lo" + i);
+            layout.setId("lo" + i);
             layout.addComponent(new Button("Test " + randInt));
             item.getItemProperty("layout").setValue(layout);
         }
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java
index d86646b865..4d6549bfbf 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java
@@ -49,7 +49,7 @@ public class Ticket2061 extends Application.LegacyApplication {
         private VerticalLayout layout = new VerticalLayout();
 
         public MyTable(int columnNumber, String id) {
-            setDebugId(id);
+            setId(id);
             setCompositionRoot(layout);
             setSizeFull();
             columns = initializeColumns(columnNumber);
@@ -108,7 +108,7 @@ public class Ticket2061 extends Application.LegacyApplication {
             this.setWidth("100%");
             this.setHeight("100%");
             for (int i = 0; i < components.length; i++) {
-                this.addTab(components[i], components[i].getDebugId(), null);
+                this.addTab(components[i], components[i].getId(), null);
             }
 
         }
@@ -119,9 +119,9 @@ public class Ticket2061 extends Application.LegacyApplication {
         public MyAccordion(Component[] components, String id) {
             this.setWidth("100%");
             this.setHeight("100%");
-            setDebugId(id);
+            setId(id);
             for (int i = 0; i < components.length; i++) {
-                this.addTab(components[i], components[i].getDebugId(), null);
+                this.addTab(components[i], components[i].getId(), null);
             }
         }
     }
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java
index 420d2b7086..186522db15 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java
@@ -102,7 +102,7 @@ public class Ticket2061b extends Application.LegacyApplication implements
         private VerticalLayout layout = new VerticalLayout();
 
         public MyTable(int columnNumber, String id) {
-            setDebugId(id);
+            setId(id);
             setCompositionRoot(layout);
             setSizeFull();
             columns = initializeColumns(columnNumber);
@@ -161,7 +161,7 @@ public class Ticket2061b extends Application.LegacyApplication implements
             this.setWidth("100%");
             this.setHeight("100%");
             for (int i = 0; i < components.length; i++) {
-                this.addTab(components[i], components[i].getDebugId(), null);
+                this.addTab(components[i], components[i].getId(), null);
             }
 
         }
@@ -174,7 +174,7 @@ public class Ticket2061b extends Application.LegacyApplication implements
             this.setWidth("100%");
             this.setHeight("100%");
             for (int i = 0; i < components.length; i++) {
-                this.addTab(components[i], components[i].getDebugId(), null);
+                this.addTab(components[i], components[i].getId(), null);
             }
 
         }
@@ -186,9 +186,9 @@ public class Ticket2061b extends Application.LegacyApplication implements
         public MyAccordion(Component[] components, String id) {
             this.setWidth("100%");
             this.setHeight("100%");
-            setDebugId(id);
+            setId(id);
             for (int i = 0; i < components.length; i++) {
-                this.addTab(components[i], components[i].getDebugId(), null);
+                this.addTab(components[i], components[i].getId(), null);
             }
         }
     }
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java
index b0897600d3..5cb041788b 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java
@@ -65,7 +65,7 @@ public class Ticket2061c extends Application.LegacyApplication implements
         private VerticalLayout layout = new VerticalLayout();
 
         public MyTable(int columnNumber, String id) {
-            setDebugId(id);
+            setId(id);
             setCompositionRoot(layout);
             setSizeFull();
             columns = initializeColumns(columnNumber);
@@ -124,7 +124,7 @@ public class Ticket2061c extends Application.LegacyApplication implements
             this.setWidth("100%");
             // this.setHeight("100%");
             for (int i = 0; i < components.length; i++) {
-                this.addTab(components[i], components[i].getDebugId(), null);
+                this.addTab(components[i], components[i].getId(), null);
             }
         }
     }
@@ -134,9 +134,9 @@ public class Ticket2061c extends Application.LegacyApplication implements
         public MyAccordion(Component[] components, String id) {
             this.setWidth("100%");
             this.setHeight("100%");
-            setDebugId(id);
+            setId(id);
             for (int i = 0; i < components.length; i++) {
-                this.addTab(components[i], components[i].getDebugId(), null);
+                this.addTab(components[i], components[i].getId(), null);
             }
         }
     }
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2095.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2095.java
index 258fad05c9..aabafadb13 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2095.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2095.java
@@ -19,7 +19,7 @@ public class Ticket2095 extends Application.LegacyApplication {
         Embedded em = new Embedded();
         em.setType(Embedded.TYPE_BROWSER);
         em.setSource(new ExternalResource("../statictestfiles/ticket2095.html"));
-        em.setDebugId("MYIFRAME");
+        em.setId("MYIFRAME");
 
         em.setSizeFull();
 
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2103.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2103.java
index 9017f66158..576fe03d87 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2103.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2103.java
@@ -37,9 +37,9 @@ public class Ticket2103 extends Application.LegacyApplication {
         public MyAccordion(Component[] components, String id) {
             this.setWidth("100%");
             this.setHeight("100%");
-            setDebugId(id);
+            setId(id);
             for (int i = 0; i < components.length; i++) {
-                this.addTab(components[i], components[i].getDebugId(), null);
+                this.addTab(components[i], components[i].getId(), null);
             }
         }
     }
@@ -51,7 +51,7 @@ public class Ticket2103 extends Application.LegacyApplication {
         private VerticalLayout layout = new VerticalLayout();
 
         public MyTable(int columnNumber, String id) {
-            setDebugId(id);
+            setId(id);
             setSizeFull();
             columns = initializeColumns(columnNumber);
             table.setWidth("100%");
diff --git a/tests/testbench/com/vaadin/tests/util/Log.java b/tests/testbench/com/vaadin/tests/util/Log.java
index 9111ff3968..7a58a4c80c 100644
--- a/tests/testbench/com/vaadin/tests/util/Log.java
+++ b/tests/testbench/com/vaadin/tests/util/Log.java
@@ -15,11 +15,11 @@ public class Log extends VerticalLayout {
     public Log(int nr) {
         for (int i = 0; i < nr; i++) {
             Label l = createEventLabel();
-            l.setDebugId("Log_row_" + i);
+            l.setId("Log_row_" + i);
             eventLabels.add(l);
             addComponent(l);
         }
-        setDebugId("Log");
+        setId("Log");
         setCaption("Events:");
     }
 
diff --git a/tests/testbench/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java b/tests/testbench/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java
index d6627a7d94..379ab2cfcd 100644
--- a/tests/testbench/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java
+++ b/tests/testbench/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java
@@ -33,12 +33,12 @@ public class EmptyFieldErrorIndicators extends TestBase {
 
         ComponentContainer part1 = createPart(
                 "Empty required fields validation", true, false);
-        part1.setDebugId("emptyFieldPart");
+        part1.setId("emptyFieldPart");
         hl.addComponent(part1);
 
         ComponentContainer part2 = createPart(
                 "Empty required fields with failing validator", true, true);
-        part1.setDebugId("validatedFieldPart");
+        part1.setId("validatedFieldPart");
         hl.addComponent(part2);
 
         Panel panel = new Panel();