diff options
Diffstat (limited to 'tests')
4 files changed, 16 insertions, 13 deletions
diff --git a/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java b/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java index 93e38bac5b..b0f401598b 100644 --- a/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java +++ b/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java @@ -6,8 +6,8 @@ package com.vaadin.tests.application; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Window; -import com.vaadin.ui.Window.Notification; +import com.vaadin.ui.Notification; +import com.vaadin.ui.Root; public class TerminalErrorNotification extends TestBase { @@ -15,6 +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"); } @@ -27,7 +28,7 @@ public class TerminalErrorNotification extends TestBase { public void terminalError(com.vaadin.terminal.Terminal.ErrorEvent event) { event.getThrowable().printStackTrace(); - Window mainWindow = getMainWindow(); + Root mainWindow = getMainWindow(); if (mainWindow != null) { Throwable throwable = event.getThrowable(); diff --git a/tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java b/tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java index 562e8095f2..9c8b43ac53 100644 --- a/tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java +++ b/tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java @@ -3,8 +3,8 @@ package com.vaadin.tests.components.notification; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Notification; import com.vaadin.ui.Window; -import com.vaadin.ui.Window.Notification; public class NotificationsAndModalWindow extends TestBase { @@ -18,6 +18,7 @@ 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"); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableFirstRowFlicker.java b/tests/testbench/com/vaadin/tests/components/table/TableFirstRowFlicker.java index 776e7956bf..3101615cfd 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableFirstRowFlicker.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableFirstRowFlicker.java @@ -1,23 +1,23 @@ package com.vaadin.tests.components.table; -import com.vaadin.Application; +import com.vaadin.Application.LegacyApplication; import com.vaadin.data.Container; import com.vaadin.data.util.IndexedContainer; import com.vaadin.ui.Label; import com.vaadin.ui.ProgressIndicator; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; -public class TableFirstRowFlicker extends Application { +public class TableFirstRowFlicker extends LegacyApplication { Table t; @Override public void init() { - Window mainWindow = new Window("Table Row Flicker"); - mainWindow.getContent().setSizeFull(); + LegacyWindow mainWindow = new LegacyWindow(getClass().getName()); setMainWindow(mainWindow); + mainWindow.getContent().setSizeFull(); t = new Table(); t.setSizeFull(); diff --git a/tests/testbench/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java b/tests/testbench/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java index 1687bd588a..20967203bc 100644 --- a/tests/testbench/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java +++ b/tests/testbench/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java @@ -1,9 +1,9 @@ package com.vaadin.tests.integration; -import com.vaadin.Application; +import com.vaadin.Application.LegacyApplication; import com.vaadin.ui.Label; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; /** * On Liferay in a freeform layout, this application should get its height from @@ -11,10 +11,11 @@ import com.vaadin.ui.Window; * * See ticket #5521. */ -public class PortletSizeInLiferayFreeformLayoutApplication extends Application { +public class PortletSizeInLiferayFreeformLayoutApplication extends + LegacyApplication { @Override public void init() { - Window mainWindow = new Window("Portlet5521 Application"); + LegacyWindow mainWindow = new LegacyWindow("Portlet5521 Application"); ((VerticalLayout) mainWindow.getContent()).setMargin(false); ((VerticalLayout) mainWindow.getContent()).setSizeFull(); // ((VerticalLayout) mainWindow.getContent()).setHeight("200px"); |