Updated test to be more suitable for automated tests

svn changeset:8924/svn branch:6.1

diff --git a/WebContent/VAADIN/themes/tests-tickets/icons/640ok.png b/WebContent/VAADIN/themes/tests-tickets/icons/640ok.png
deleted file mode 100644 (file)
index cfafb13..0000000
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 (file)
index 0000000..fb96534
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 0c6f375645825661944b08ae6847bfa7f8fcd3f9..f1ef0069c979c41fed883492b39096be5a80ccf7 100644 (file)
--- 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();