diff options
Diffstat (limited to 'uitest/src/com/vaadin/tests/components/panel')
3 files changed, 143 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/panel/PanelChangeContentsTest.java b/uitest/src/com/vaadin/tests/components/panel/PanelChangeContentsTest.java new file mode 100644 index 0000000000..5bc505dbc8 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/panel/PanelChangeContentsTest.java @@ -0,0 +1,53 @@ +/* + * 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.panel; + +import org.junit.Assert; +import org.junit.Test; + +import com.vaadin.tests.tb3.MultiBrowserTest; + +public class PanelChangeContentsTest extends MultiBrowserTest { + + @Test + public void testReattachComponentUsingPush() { + setPush(true); + openTestURL(); + + Assert.assertEquals( + "stats", + vaadinElement( + "/VVerticalLayout[0]/Slot[1]/VPanel[0]/VVerticalLayout[0]/Slot[0]/VLabel[0]") + .getText()); + vaadinElement( + "/VVerticalLayout[0]/Slot[0]/VHorizontalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]") + .click(); + Assert.assertEquals( + "companies", + vaadinElement( + "/VVerticalLayout[0]/Slot[1]/VPanel[0]/VVerticalLayout[0]/Slot[0]/VLabel[0]") + .getText()); + vaadinElement( + "/VVerticalLayout[0]/Slot[0]/VHorizontalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]") + .click(); + Assert.assertEquals( + "stats", + vaadinElement( + "/VVerticalLayout[0]/Slot[1]/VPanel[0]/VVerticalLayout[0]/Slot[0]/VLabel[0]") + .getText()); + + } +} diff --git a/uitest/src/com/vaadin/tests/components/panel/WebkitScrollbarTest.html b/uitest/src/com/vaadin/tests/components/panel/WebkitScrollbarTest.html new file mode 100644 index 0000000000..ee33ee2bf0 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/panel/WebkitScrollbarTest.html @@ -0,0 +1,27 @@ +<?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.panel.WebkitScrollbarTest?restartApplication</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>panelShouldNotHaveScrollbars</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/uitest/src/com/vaadin/tests/components/panel/WebkitScrollbarTest.java b/uitest/src/com/vaadin/tests/components/panel/WebkitScrollbarTest.java new file mode 100644 index 0000000000..8981f52f12 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/panel/WebkitScrollbarTest.java @@ -0,0 +1,63 @@ +/* + * 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.panel; + +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.GridLayout; +import com.vaadin.ui.ListSelect; +import com.vaadin.ui.Panel; +import com.vaadin.ui.VerticalLayout; + +@SuppressWarnings("serial") +public class WebkitScrollbarTest extends AbstractTestUI { + + @Override + protected void setup(VaadinRequest request) { + Panel panel = new Panel(); + + VerticalLayout content = new VerticalLayout(); + panel.setContent(content); + + GridLayout gridLayout = new GridLayout(); + gridLayout.setHeight(null); + gridLayout.setWidth(100, Unit.PERCENTAGE); + content.addComponent(gridLayout); + + ListSelect listSelect = new ListSelect(); + + listSelect.setWidth(100, Unit.PERCENTAGE); + listSelect.setHeight(300, Unit.PIXELS); + + gridLayout.addComponent(listSelect); + + gridLayout.setMargin(true); + + setContent(panel); + } + + @Override + protected String getTestDescription() { + return "When opening the window, it should NOT contain a horizontal"; + } + + @Override + protected Integer getTicketNumber() { + return 12727; + } + +} |