diff options
Diffstat (limited to 'uitest')
3 files changed, 63 insertions, 0 deletions
diff --git a/uitest/integration_tests.xml b/uitest/integration_tests.xml index 1c9c2b1f8f..73aac2405c 100644 --- a/uitest/integration_tests.xml +++ b/uitest/integration_tests.xml @@ -204,6 +204,13 @@ </antcall> </target> + <target name="integration-test-jboss-eap6"> + <antcall target="run-generic-integration-test"> + <param name="startDelay" value="10" /> + <param name="target-server" value="jbosseap6" /> + </antcall> + </target> + <target name="integration-test-glassfish2"> <antcall target="run-generic-integration-test"> <param name="startDelay" value="10" /> @@ -395,6 +402,7 @@ <antcall target="integration-test-jboss5" /> <antcall target="integration-test-jboss6" /> <antcall target="integration-test-jboss7" /> + <antcall target="integration-test-jboss-eap6" /> <antcall target="integration-test-jetty5" /> <antcall target="integration-test-jetty6" /> <antcall target="integration-test-jetty7" /> diff --git a/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbars.java b/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbars.java new file mode 100644 index 0000000000..5151ad5dd3 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbars.java @@ -0,0 +1,40 @@ +package com.vaadin.tests.components.browserframe; + +import com.vaadin.server.ExternalResource; +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.BrowserFrame; +import com.vaadin.ui.TabSheet; + +public class BrowserFrameDoubleScrollbars extends AbstractTestUI { + + @Override + protected Integer getTicketNumber() { + return 11780; + } + + @Override + protected void setup(VaadinRequest request) { + + getLayout().setHeight("100%"); + getLayout().setSizeFull(); + getLayout().getParent().setSizeFull(); + + TabSheet tabs = new TabSheet(); + tabs.setSizeFull(); + getLayout().addComponent(tabs); + + BrowserFrame help = new BrowserFrame(); + help.setSizeFull(); + help.setSource(new ExternalResource("/statictestfiles/long-html.htm")); + + tabs.addComponent(help); + + } + + @Override + protected String getTestDescription() { + return "Embedded browser causes second scrollbar"; + } + +} diff --git a/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbarsTest.java b/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbarsTest.java new file mode 100644 index 0000000000..ade43735a7 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbarsTest.java @@ -0,0 +1,15 @@ +package com.vaadin.tests.components.browserframe; + +import org.junit.Test; + +import com.vaadin.tests.tb3.MultiBrowserTest; + +public class BrowserFrameDoubleScrollbarsTest extends MultiBrowserTest { + + @Test + public void testWindowRepositioning() throws Exception { + openTestURL(); + + compareScreen("BrowserFrameDoubleScrollbars"); + } +} |