From d88377625ceed26676f3323a7eac9cf85b4af71d Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Fri, 25 Sep 2009 11:34:09 +0000 Subject: Updated test to be more suitable for automated tests svn changeset:8924/svn branch:6.1 --- WebContent/VAADIN/themes/tests-tickets/icons/640ok.png | Bin 186618 -> 0 bytes .../tests-tickets/icons/EmbeddedInSubWindow-image.png | Bin 0 -> 58492 bytes .../tests/components/window/EmbeddedInSubWindow.java | 7 +++---- 3 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 WebContent/VAADIN/themes/tests-tickets/icons/640ok.png create mode 100644 WebContent/VAADIN/themes/tests-tickets/icons/EmbeddedInSubWindow-image.png diff --git a/WebContent/VAADIN/themes/tests-tickets/icons/640ok.png b/WebContent/VAADIN/themes/tests-tickets/icons/640ok.png deleted file mode 100644 index cfafb13881..0000000000 Binary files a/WebContent/VAADIN/themes/tests-tickets/icons/640ok.png and /dev/null differ diff --git a/WebContent/VAADIN/themes/tests-tickets/icons/EmbeddedInSubWindow-image.png b/WebContent/VAADIN/themes/tests-tickets/icons/EmbeddedInSubWindow-image.png new file mode 100644 index 0000000000..fb965345bb Binary files /dev/null and b/WebContent/VAADIN/themes/tests-tickets/icons/EmbeddedInSubWindow-image.png differ diff --git a/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.java b/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.java index 0c6f375645..f1ef0069c9 100644 --- a/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.java +++ b/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.java @@ -9,12 +9,11 @@ public class EmbeddedInSubWindow extends TestBase { @Override protected String getDescription() { - return ""; + return "The sub window contains a large icon and should be sized according to the icon. The icon contains a blue border of 10px at the outer edges. The layout in the sub window has margins enabled."; } @Override protected Integer getTicketNumber() { - // TODO Auto-generated method stub return null; } @@ -23,9 +22,9 @@ public class EmbeddedInSubWindow extends TestBase { setTheme("tests-tickets"); Window zoom = new Window("Image Preview"); zoom.setSizeUndefined(); - zoom.getLayout().setSizeUndefined(); + zoom.getContent().setSizeUndefined(); - String res = "icons/640ok.png"; + String res = "icons/EmbeddedInSubWindow-image.png"; Embedded imagePreview = new Embedded("", new ThemeResource(res)); imagePreview.setSizeUndefined(); -- cgit v1.2.3