summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2009-09-25 11:34:09 +0000
committerArtur Signell <artur.signell@itmill.com>2009-09-25 11:34:09 +0000
commitd88377625ceed26676f3323a7eac9cf85b4af71d (patch)
tree7f35a1bf8023709ff8d51e21d2a302b5f8b75f4b
parent24f61fc3044ffba08ad83e3fe5ef9e832526b324 (diff)
downloadvaadin-framework-d88377625ceed26676f3323a7eac9cf85b4af71d.tar.gz
vaadin-framework-d88377625ceed26676f3323a7eac9cf85b4af71d.zip
Updated test to be more suitable for automated tests
svn changeset:8924/svn branch:6.1
-rw-r--r--WebContent/VAADIN/themes/tests-tickets/icons/640ok.pngbin186618 -> 0 bytes
-rw-r--r--WebContent/VAADIN/themes/tests-tickets/icons/EmbeddedInSubWindow-image.pngbin0 -> 58492 bytes
-rw-r--r--src/com/vaadin/tests/components/window/EmbeddedInSubWindow.java7
3 files changed, 3 insertions, 4 deletions
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
--- a/WebContent/VAADIN/themes/tests-tickets/icons/640ok.png
+++ /dev/null
Binary files 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
--- /dev/null
+++ b/WebContent/VAADIN/themes/tests-tickets/icons/EmbeddedInSubWindow-image.png
Binary files 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();