diff options
author | Artur Signell <artur@vaadin.com> | 2016-04-15 08:59:01 +0300 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2016-04-28 15:18:36 +0000 |
commit | 9006dbdf5a2d6d34d6322a8affc743087b5b46f5 (patch) | |
tree | 5baee41f6f106482350148320f84f005a518ee78 /uitest | |
parent | c9b1df6d5e9847ef4d5a6e810df22612ecbddca6 (diff) | |
download | vaadin-framework-9006dbdf5a2d6d34d6322a8affc743087b5b46f5.tar.gz vaadin-framework-9006dbdf5a2d6d34d6322a8affc743087b5b46f5.zip |
Use the correct window height when comparing to browser window height (#19590)
Change-Id: I7fdecab93fa6730e63e3ba7f0df3a67f3020c19c
Diffstat (limited to 'uitest')
-rw-r--r-- | uitest/src/main/java/com/vaadin/tests/components/window/WindowMaxHeight.java | 46 | ||||
-rw-r--r-- | uitest/src/test/java/com/vaadin/tests/components/window/WindowMaxHeightTest.java | 36 |
2 files changed, 82 insertions, 0 deletions
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowMaxHeight.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowMaxHeight.java new file mode 100644 index 0000000000..430f99a6ac --- /dev/null +++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowMaxHeight.java @@ -0,0 +1,46 @@ +package com.vaadin.tests.components.window; + +import com.vaadin.annotations.Theme; +import com.vaadin.server.VaadinRequest; +import com.vaadin.ui.Panel; +import com.vaadin.ui.UI; +import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.Window; + +@SuppressWarnings("serial") +@Theme("valo") +public class WindowMaxHeight extends UI { + + @Override + protected void init(VaadinRequest request) { + WindowNotFullHeight window = new WindowNotFullHeight(); + addWindow(window); + window.focus(); + } + + class WindowNotFullHeight extends Window { + + public WindowNotFullHeight() { + setCaption("Should be 200px high"); + setWidth(200, Unit.PIXELS); + + VerticalLayout layoutRoot = new VerticalLayout(); + + Panel container = new Panel(); + container.setHeight(200, Unit.PIXELS); + + VerticalLayout containerContent = new VerticalLayout(); + for (int i = 0; i < 300; i++) { + Panel hello = new Panel("hello"); + containerContent.addComponent(hello); + } + + container.setContent(containerContent); + layoutRoot.addComponent(container); + setContent(layoutRoot); + + } + + } + +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/WindowMaxHeightTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowMaxHeightTest.java new file mode 100644 index 0000000000..dabc070d77 --- /dev/null +++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowMaxHeightTest.java @@ -0,0 +1,36 @@ +/* + * Copyright 2000-2014 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.components.window; + +import org.junit.Assert; +import org.junit.Test; +import org.openqa.selenium.Dimension; + +import com.vaadin.testbench.elements.WindowElement; +import com.vaadin.tests.tb3.SingleBrowserTest; + +public class WindowMaxHeightTest extends SingleBrowserTest { + + @Test + public void ensureWindowNotFullHeight() { + openTestURL(); + WindowElement window = $(WindowElement.class).first(); + Dimension size = window.getSize(); + Assert.assertTrue( + "Window should be 200-250px high, was " + size.getHeight(), + size.getHeight() < 250); + } +} |