diff options
| author | Leif Åstrand <leif@vaadin.com> | 2013-06-12 15:14:09 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2013-06-12 15:49:29 +0300 |
| commit | eb64fda3eb8e04e9dd5ac014981d6e7cc9683b44 (patch) | |
| tree | 3a0cdf74e31470127edc81b989d45b7c0285f32b /uitest | |
| parent | 0f107f3ee36cd7be1fb0edda02e40e67e2cae09d (diff) | |
| download | vaadin-framework-eb64fda3eb8e04e9dd5ac014981d6e7cc9683b44.tar.gz vaadin-framework-eb64fda3eb8e04e9dd5ac014981d6e7cc9683b44.zip | |
Add support for rem units (#11279)
Change-Id: Id6b6402b22956cd96b86cef86f11088e959dc05d
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.html | 32 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.java | 52 |
2 files changed, 84 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.html b/uitest/src/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.html new file mode 100644 index 0000000000..0bdde03ec7 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.html @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>New Test</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">New Test</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.components.abstractcomponent.RemSizeUnitTest?restartApplication&debug</td> + <td></td> +</tr> +<tr> + <td>assertElementHeight</td> + <td>vaadin=runcomvaadintestscomponentsabstractcomponentRemSizeUnitTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VLabel[0]</td> + <td>80</td> +</tr> +<tr> + <td>assertElementWidth</td> + <td>vaadin=runcomvaadintestscomponentsabstractcomponentRemSizeUnitTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VLabel[0]</td> + <td>168</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.java b/uitest/src/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.java new file mode 100644 index 0000000000..98c0538cd8 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.java @@ -0,0 +1,52 @@ +/* + * Copyright 2000-2013 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.abstractcomponent; + +import com.vaadin.server.VaadinRequest; +import com.vaadin.server.WebBrowser; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.Label; + +public class RemSizeUnitTest extends AbstractTestUI { + + @Override + protected void setup(VaadinRequest request) { + Label label = new Label("My height is 10.5 x 5 rem"); + label.setHeight("5rem"); + label.setWidth(10.5f, Unit.REM); + + // Rem not supported in ie8, fake using pixels + WebBrowser webBrowser = getPage().getWebBrowser(); + if (webBrowser.isIE() && webBrowser.getBrowserMajorVersion() == 8) { + label.setHeight("80px"); + label.setWidth("168px"); + } + + addComponent(label); + } + + @Override + protected String getTestDescription() { + return "Tests that REM units are properly applied to the DOM"; + } + + @Override + protected Integer getTicketNumber() { + return Integer.valueOf(11279); + } + +} |