summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorSauli Tähkäpää <sauli@vaadin.com>2014-04-01 14:07:25 +0300
committerSauli Tähkäpää <sauli@vaadin.com>2014-04-01 11:08:37 +0000
commita71305cdc61c45c4e2799da5398cb531c6579d98 (patch)
treeea12af8a114f83d21670bfa45d656257c6a92e4a /uitest
parent1571143b96271b6c41a4f54dab7421cf3e7e085c (diff)
downloadvaadin-framework-a71305cdc61c45c4e2799da5398cb531c6579d98.tar.gz
vaadin-framework-a71305cdc61c45c4e2799da5398cb531c6579d98.zip
Removed unnecessary tooltips from LayoutTesterApplication.
Added longer delay to avoid table resize problems. Change-Id: I9929a23711932223991706bde2d7f06c551f0ec2
Diffstat (limited to 'uitest')
-rw-r--r--uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java3
-rw-r--r--uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplicationTest.java3
-rw-r--r--uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java3
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);