From 02da730068fc3f828a162b272a532f33a46d4c1e Mon Sep 17 00:00:00 2001 From: John Ahlroos Date: Wed, 5 Jun 2013 14:01:00 +0300 Subject: [PATCH] Merged testbench test for #7110 from 6.8 (fix not needed for 7.0) Change-Id: I14e02a02d77420e601ec5f98d70453fa85f1a473 svn: http://dev.vaadin.com/changeset/0000025944/svn --- .../PopupViewInEmbeddedApplication.html | 60 +++++++++++++++++++ .../PopupViewInEmbeddedApplication.html | 32 ++++++++++ .../PopupViewInEmbeddedApplication.java | 30 ++++++++++ 3 files changed, 122 insertions(+) create mode 100644 WebContent/statictestfiles/PopupViewInEmbeddedApplication.html create mode 100644 uitest/src/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.html create mode 100644 uitest/src/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.java diff --git a/WebContent/statictestfiles/PopupViewInEmbeddedApplication.html b/WebContent/statictestfiles/PopupViewInEmbeddedApplication.html new file mode 100644 index 0000000000..613bb2cd41 --- /dev/null +++ b/WebContent/statictestfiles/PopupViewInEmbeddedApplication.html @@ -0,0 +1,60 @@ + + + + + + + This is my Embedding Page + + + + + + + + + +

This is a static web page that contains an embedded Vaadin + application. The embedded application div has been taken out of the normal element flow by applying 'float:left' causing the application + to float to the left.

+ +
+ +
+ +
+ + + + + \ No newline at end of file diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.html b/uitest/src/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.html new file mode 100644 index 0000000000..d2ca843cf5 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.html @@ -0,0 +1,32 @@ + + + + + + +New Test + + + + + + + + + + + + + + + + + + + + + + +
New Test
open/statictestfiles/PopupViewInEmbeddedApplication.html
mouseClickvaadin=helloworld::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VPopupView[0]28,16
screenCapturepopup-on-link
+ + diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.java b/uitest/src/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.java new file mode 100644 index 0000000000..d19f98124e --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.java @@ -0,0 +1,30 @@ +package com.vaadin.tests.components.popupview; + +import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.Label; +import com.vaadin.ui.PopupView; + +/* + * Used by PopupViewInEmbedded.html + */ +public class PopupViewInEmbeddedApplication extends TestBase { + + @Override + protected void setup() { + PopupView pop = new PopupView("Click me!", new Label( + "I popped up, woohoo!")); + addComponent(pop); + } + + @Override + protected String getDescription() { + return "Clicking on the popup link should pop up the popup on top of the link," + + " even though the application has been embedded inside a div."; + } + + @Override + protected Integer getTicketNumber() { + return 7110; + } + +} -- 2.39.5