aboutsummaryrefslogtreecommitdiffstats
path: root/uitest/src/test
diff options
context:
space:
mode:
authorAnna Koskinen <Ansku@users.noreply.github.com>2021-03-29 15:52:45 +0300
committerGitHub <noreply@github.com>2021-03-29 15:52:45 +0300
commitfe37cc443d2268d813aadfa09d0f2f881d5c464c (patch)
treeb893ca52e3158287d898186dc4eb5de8d3fc2f06 /uitest/src/test
parent8570d58f959de2baf438295b204da0576bed3402 (diff)
downloadvaadin-framework-fe37cc443d2268d813aadfa09d0f2f881d5c464c.tar.gz
vaadin-framework-fe37cc443d2268d813aadfa09d0f2f881d5c464c.zip
Add ErrorHandler to AbstractTestUI (#12256)
* Add ErrorHandler to AbstractTestUI
Diffstat (limited to 'uitest/src/test')
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/ui/UIAccessTest.java6
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/upload/UploadChangeListenerTest.java7
2 files changed, 9 insertions, 4 deletions
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/UIAccessTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UIAccessTest.java
index f1ac5a5841..3202d95e64 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/UIAccessTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UIAccessTest.java
@@ -60,9 +60,11 @@ public class UIAccessTest extends MultiBrowserTest {
$(ButtonElement.class).get(2).click();
assertTrue(logContainsText("0. Throwing exception in access"));
- assertTrue(logContainsText("1. firstFuture is done? true"));
assertTrue(logContainsText(
- "2. Got exception from firstFuture: java.lang.RuntimeException: Catch me if you can"));
+ "1. Exception occurred, java.lang.RuntimeException: Catch me if you can"));
+ assertTrue(logContainsText("2. firstFuture is done? true"));
+ assertTrue(logContainsText(
+ "3. Got exception from firstFuture: java.lang.RuntimeException: Catch me if you can"));
}
@Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadChangeListenerTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadChangeListenerTest.java
index a7e8a4e3ce..a55029c249 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadChangeListenerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadChangeListenerTest.java
@@ -30,12 +30,15 @@ public class UploadChangeListenerTest extends MultiBrowserTest {
upload.click();
- assertEquals("2. finished", getLogRow(0));
+ assertEquals("2. finished", getLogRow(1));
+ assertEquals(
+ "3. Exception occurred, com.vaadin.server.UploadException: Upload failed",
+ getLogRow(0));
tempFile = createTempFile();
fillPathToUploadInput(tempFile.getPath());
- assertEquals("3. change", getLogRow(0));
+ assertEquals("4. change", getLogRow(0));
}
/**