summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsergey-vaadin <sergey@vaadin.com>2018-10-10 15:39:31 +0300
committerOlli Tietäväinen <ollit@vaadin.com>2018-10-10 15:39:31 +0300
commitbb89cec91a9b1f125d79468a69c960333aab00d8 (patch)
tree01845831eac38bb72ed52faea09112e9a0117c9e
parent65419f2babba04bfb2cb879d34800153d1ced583 (diff)
downloadvaadin-framework-bb89cec91a9b1f125d79468a69c960333aab00d8.tar.gz
vaadin-framework-bb89cec91a9b1f125d79468a69c960333aab00d8.zip
potential fixes for the tests (#11226)
* potential fixes for the tests
-rw-r--r--uitest/src/main/java/com/vaadin/tests/themes/LegacyComponentThemeChange.java3
-rw-r--r--uitest/src/test/java/com/vaadin/tests/application/CriticalNotificationsTest.java2
2 files changed, 4 insertions, 1 deletions
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/LegacyComponentThemeChange.java b/uitest/src/main/java/com/vaadin/tests/themes/LegacyComponentThemeChange.java
index 9579888e6d..0a41e327b1 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/LegacyComponentThemeChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/LegacyComponentThemeChange.java
@@ -28,6 +28,7 @@ import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Embedded;
import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
import com.vaadin.ui.MenuBar;
import com.vaadin.ui.MenuBar.MenuItem;
import com.vaadin.ui.Table;
@@ -39,6 +40,7 @@ public class LegacyComponentThemeChange extends AbstractTestUIWithLog {
@Override
protected void setup(VaadinRequest request) {
VerticalLayout vl = new VerticalLayout();
+ vl.setSpacing(true);
vl.setCaption("Change theme by clicking a button");
HorizontalLayout hl = new HorizontalLayout();
for (final String theme : new String[] { "reindeer", "runo" }) {
@@ -67,6 +69,7 @@ public class LegacyComponentThemeChange extends AbstractTestUIWithLog {
sub.addItem("selectedtheme", varyingIcon, null);
vl.addComponent(bar);
+ vl.addComponent(new Label("gap"));
ComboBox cb = new ComboBox("ComboBox");
cb.addItem("No icon");
diff --git a/uitest/src/test/java/com/vaadin/tests/application/CriticalNotificationsTest.java b/uitest/src/test/java/com/vaadin/tests/application/CriticalNotificationsTest.java
index aa590f2728..0f43a4e189 100644
--- a/uitest/src/test/java/com/vaadin/tests/application/CriticalNotificationsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/CriticalNotificationsTest.java
@@ -64,7 +64,7 @@ public class CriticalNotificationsTest extends MultiBrowserThemeTest {
testBench().disableWaitForVaadin();
// Give the notification some time to animate
- sleep(1000);
+ sleep(2000);
compareScreen($(NotificationElement.class).first(),
"systemnotification");
}