From a71305cdc61c45c4e2799da5398cb531c6579d98 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sauli=20T=C3=A4hk=C3=A4p=C3=A4=C3=A4?= Date: Tue, 1 Apr 2014 14:07:25 +0300 Subject: [PATCH] Removed unnecessary tooltips from LayoutTesterApplication. Added longer delay to avoid table resize problems. Change-Id: I9929a23711932223991706bde2d7f06c551f0ec2 --- .../tests/layouts/layouttester/HorizontalLayoutTests.java | 3 +-- .../layouts/layouttester/LayoutTesterApplicationTest.java | 3 +-- .../vaadin/tests/layouts/layouttester/VerticalLayoutTests.java | 3 +-- 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); -- 2.39.5