diff options
| author | Build Agent <build@vaadin.com> | 2014-04-02 09:28:32 +0300 |
|---|---|---|
| committer | Build Agent <build@vaadin.com> | 2014-04-02 09:28:33 +0300 |
| commit | e1a987f88d624e6099e2ceae4c463506f1a4b52c (patch) | |
| tree | de3bdf837e6cc97fa52d5119b0df05a1de67b213 /uitest/src/com/vaadin/tests/layouts | |
| parent | 92ad3c291e4371995d6757c0fcf50a24c02444b5 (diff) | |
| parent | 7c569ca30267f1f506d6f8870c9c254c922f6568 (diff) | |
| download | vaadin-framework-e1a987f88d624e6099e2ceae4c463506f1a4b52c.tar.gz vaadin-framework-e1a987f88d624e6099e2ceae4c463506f1a4b52c.zip | |
Merge changes from origin/7.1
a71305c Removed unnecessary tooltips from LayoutTesterApplication.
7c569ca Replaced flaky TB2 test with stable TB3 test
Change-Id: I490aea06d1a9045ff071b64da1bfdc0f1b4937e6
Diffstat (limited to 'uitest/src/com/vaadin/tests/layouts')
3 files changed, 3 insertions, 6 deletions
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java b/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java index 971205ccbb..afa53c012e 100644 --- a/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java +++ b/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java @@ -97,8 +97,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { for (int i = 0; i < captions.length; i++) { component = getTestTabsheet(); component.setCaption(captions[i]); - component.setComponentError(new UserError( - "component error, user error")); + component.setComponentError(new UserError("")); vlo.addComponent(component); } baseLayout.addComponent(vlo); diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplicationTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplicationTest.java index 6ba5109ce7..0544be326a 100644 --- a/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplicationTest.java +++ b/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplicationTest.java @@ -25,7 +25,6 @@ import org.openqa.selenium.By; import org.openqa.selenium.remote.DesiredCapabilities; import org.openqa.selenium.support.ui.Select; -import com.thoughtworks.selenium.webdriven.WebDriverBackedSelenium; import com.vaadin.tests.tb3.MultiBrowserTest; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; @@ -117,7 +116,7 @@ public class LayoutTesterApplicationTest extends MultiBrowserTest { // Table does some extra layout phase and TestBench does not always // take this into account, grabbing screenshots before the layout // phase is done (see #12866). - sleep(350); + sleep(500); } compareScreen(screenshotPrefix + "-" + sanitize(driver.findElement(By.id(buttonId)).getText())); diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java index 04cee2d68d..df9be8ffd0 100644 --- a/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java +++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java @@ -96,8 +96,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { for (int i = 0; i < captions.length; i++) { component = getTestTabsheet(); component.setCaption(captions[i]); - component.setComponentError(new UserError( - "component error, user error")); + component.setComponentError(new UserError("")); vlo.addComponent(component); } baseLayout.addComponent(vlo); |