diff options
Diffstat (limited to 'uitest')
4 files changed, 68 insertions, 45 deletions
diff --git a/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.html b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.html index 1acdded4cb..b20e7295f7 100644 --- a/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.html +++ b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.html @@ -292,7 +292,7 @@ </tr> <tr> <td>assertValue</td> - <td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Syyyy'年'M'月'd'日'/domChild[0]</td> + <td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_Syyyy'X'M'X'd'X'/domChild[0]</td> <td>2010年2月1日</td> </tr> <tr> @@ -363,12 +363,12 @@ </tr> <tr> <td>assertValue</td> - <td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_SMMMM d, yyyy/domChild[0]</td> + <td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_SMMMM dX yyyy/domChild[0]</td> <td>February 1, 2010</td> </tr> <tr> <td>assertValue</td> - <td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_SMMM d, yyyy/domChild[0]</td> + <td>vaadin=runcomvaadintestscomponentsdatefieldCustomDateFormats::PID_SMMM dX yyyy/domChild[0]</td> <td>Feb 1, 2010</td> </tr> <tr> diff --git a/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.java b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.java index 015a974b3e..77637fb339 100644 --- a/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.java +++ b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.java @@ -147,6 +147,8 @@ public class CustomDateFormats extends TestBase { df.setDateFormat(pattern); df.setImmediate(true); String debugId = pattern.replace('/', 'X'); + // only certain characters are allowed in debug IDs + debugId = debugId.replaceAll("[^-a-zA-Z .'_]", "X"); while (usedDebugIds.contains(debugId)) { debugId = debugId + "-"; } diff --git a/uitest/src/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayouts.html b/uitest/src/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayouts.html deleted file mode 100644 index f5b7e0a1df..0000000000 --- a/uitest/src/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayouts.html +++ /dev/null @@ -1,42 +0,0 @@ -<?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.debug.HierarchyAfterAnalyzeLayouts?restartApplication&debug</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>vaadin=runcomvaadintestsdebugHierarchyAfterAnalyzeLayouts::Root/VDebugWindow[0]/FlowPanel[0]/FlowPanel[0]/FlowPanel[0]/DebugButton[2]</td> - <td>18,9</td> -</tr> -<tr> - <td>click</td> - <td>vaadin=runcomvaadintestsdebugHierarchyAfterAnalyzeLayouts::Root/VDebugWindow[0]/FlowPanel[0]/FlowPanel[0]/FlowPanel[2]/FlowPanel[0]/domChild[2]</td> - <td>18,9</td> -</tr> -<tr> - <td>assertText</td> - <td>vaadin=runcomvaadintestsdebugHierarchyAfterAnalyzeLayouts::Root/VDebugWindow[0]/FlowPanel[0]/SimplePanel[0]/FlowPanel[0]/domChild[0]</td> - <td>Layouts analyzed, no top level problems</td> -</tr> -<tr> - <td>assertElementPresent</td> - <td>vaadin=runcomvaadintestsdebugHierarchyAfterAnalyzeLayouts::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VLabel[0]</td> - <td></td> -</tr> - -</tbody></table> -</body> -</html> diff --git a/uitest/src/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayoutsTest.java b/uitest/src/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayoutsTest.java new file mode 100644 index 0000000000..43c9737963 --- /dev/null +++ b/uitest/src/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayoutsTest.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.debug; + +import java.io.IOException; + +import org.junit.Test; +import org.openqa.selenium.By; +import org.openqa.selenium.WebElement; + +import com.vaadin.tests.tb3.MultiBrowserTest; + +/** + * Check that analyze layouts does not find problems for a trivial application. + * + * @since 7.2 + * @author Vaadin Ltd + */ +public class HierarchyAfterAnalyzeLayoutsTest extends MultiBrowserTest { + + @Test + public void checkNoLayoutProblemsFound() throws IOException { + setDebug(true); + openTestURL(); + + // select tab + pressDebugWindowButton(findByXpath("//button[@title = 'Examine component hierarchy']")); + + // click "analyze layouts" + pressDebugWindowButton(findByXpath("//button[@title = 'Check layouts for potential problems']")); + + // check that no problems found + findByXpath("//div[text() = 'Layouts analyzed, no top level problems']"); + + // check that original label still there + findByXpath("//div[text() = 'This is a label']"); + } + + private void pressDebugWindowButton(WebElement element) { + element.click(); + // This is for IE8, which otherwise just focuses the button. + // This may result in duplicate events on other browsers, but they + // should not break the test. + element.sendKeys(" "); + } + + private WebElement findByXpath(String path) { + return getDriver().findElement(By.xpath(path)); + } +} |