aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsergey-vaadin <sergey@vaadin.com>2018-10-17 14:32:29 +0300
committerOlli Tietäväinen <ollit@vaadin.com>2018-10-17 14:32:29 +0300
commit9a42f1cbbce9ae43fcdeaf50691ab056941e9c27 (patch)
tree09b69a0ad5f21d4041f346c73328080c7f8d2e5d
parent218d12b5b2bdc36444cf0d6a491526d36cfca20c (diff)
downloadvaadin-framework-9a42f1cbbce9ae43fcdeaf50691ab056941e9c27.tar.gz
vaadin-framework-9a42f1cbbce9ae43fcdeaf50691ab056941e9c27.zip
Tests (wrong screenshots and JRE version, delay) (#11255)
* wrong screenshots and JRE version * delay for submenu
-rwxr-xr-xuitest/reference-screenshots/CriticalNotificationsTest-sessionExpired_ANY_Chrome__runo_systemnotification.pngbin6444 -> 6397 bytes
-rw-r--r--uitest/reference-screenshots/CriticalNotificationsTest-sessionExpired_ANY_Chrome__valo_systemnotification.pngbin9159 -> 9116 bytes
-rw-r--r--uitest/src/test/java/com/vaadin/tests/VerifyJreVersionTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarIconsTest.java5
4 files changed, 4 insertions, 3 deletions
diff --git a/uitest/reference-screenshots/CriticalNotificationsTest-sessionExpired_ANY_Chrome__runo_systemnotification.png b/uitest/reference-screenshots/CriticalNotificationsTest-sessionExpired_ANY_Chrome__runo_systemnotification.png
index 32c80110c8..00b1d3a3f4 100755
--- a/uitest/reference-screenshots/CriticalNotificationsTest-sessionExpired_ANY_Chrome__runo_systemnotification.png
+++ b/uitest/reference-screenshots/CriticalNotificationsTest-sessionExpired_ANY_Chrome__runo_systemnotification.png
Binary files differ
diff --git a/uitest/reference-screenshots/CriticalNotificationsTest-sessionExpired_ANY_Chrome__valo_systemnotification.png b/uitest/reference-screenshots/CriticalNotificationsTest-sessionExpired_ANY_Chrome__valo_systemnotification.png
index e77057e37f..2cc1983671 100644
--- a/uitest/reference-screenshots/CriticalNotificationsTest-sessionExpired_ANY_Chrome__valo_systemnotification.png
+++ b/uitest/reference-screenshots/CriticalNotificationsTest-sessionExpired_ANY_Chrome__valo_systemnotification.png
Binary files differ
diff --git a/uitest/src/test/java/com/vaadin/tests/VerifyJreVersionTest.java b/uitest/src/test/java/com/vaadin/tests/VerifyJreVersionTest.java
index 15e2367c93..0355d08219 100644
--- a/uitest/src/test/java/com/vaadin/tests/VerifyJreVersionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/VerifyJreVersionTest.java
@@ -17,7 +17,7 @@ public class VerifyJreVersionTest extends SingleBrowserTest {
WebElement jreVersionLabel = vaadinElementById("jreVersionLabel");
assertThat(jreVersionLabel.getText(),
- is("Using Java 1.6.0_45 by Sun Microsystems Inc."));
+ is("Using Java 1.8.0_181 by Oracle Corporation"));
}
}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarIconsTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarIconsTest.java
index 7213d2d466..8ea71c3855 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarIconsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarIconsTest.java
@@ -41,7 +41,7 @@ public class MenuBarIconsTest extends SingleBrowserTest {
}
@Test
- public void imageIconsRendered() {
+ public void imageIconsRendered() throws Exception {
openTestURL();
MenuBarElement menu = $(MenuBarElement.class).id("image");
WebElement moreItem = menu
@@ -58,7 +58,8 @@ public class MenuBarIconsTest extends SingleBrowserTest {
assertImage(image, hasSubElement.findElement(By.vaadin("#Sub item")));
// Close sub menu
hasSubElement.click();
-
+
+ sleep(500);
assertImage(image, moreItem);
moreItem.click();