diff options
| author | Marc Englund <marc@vaadin.com> | 2013-10-09 15:31:06 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-10-21 08:16:37 +0000 |
| commit | dd51b7f73062650cb3d5bb8550a0b088a0ea6595 (patch) | |
| tree | 83488ef5ae0443b03dc645db1955ca278567953f /uitest/src/com/vaadin/tests/push | |
| parent | ed50200e9a68c00279cdefa65ccdccd4734d6c9a (diff) | |
| download | vaadin-framework-dd51b7f73062650cb3d5bb8550a0b088a0ea6595.tar.gz vaadin-framework-dd51b7f73062650cb3d5bb8550a0b088a0ea6595.zip | |
Added more exception handling to PushHandler (#12578, #11882)
PushHandler now catches Exception and calls ErrorHandler more.
Change-Id: I7032c00f717b1dae34f4352abc035b1b398c7cfc
Diffstat (limited to 'uitest/src/com/vaadin/tests/push')
| -rw-r--r-- | uitest/src/com/vaadin/tests/push/PushErrorHandling.html | 41 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/push/PushErrorHandling.java | 93 |
2 files changed, 134 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/push/PushErrorHandling.html b/uitest/src/com/vaadin/tests/push/PushErrorHandling.html new file mode 100644 index 0000000000..afd3e70771 --- /dev/null +++ b/uitest/src/com/vaadin/tests/push/PushErrorHandling.html @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="http://localhost:8888/" /> +<title>PushErrorHandling</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">PushErrorHandling</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/PushErrorHandling?restartApplication</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runPushErrorHandling::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runPushErrorHandling::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VLabel[0]</td> + <td>An error! Unable to invoke method click in com.vaadin.shared.ui.button.ButtonServerRpc</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runPushErrorHandling::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td> + <td>26,7</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runPushErrorHandling::Root/VNotification[0]/HTML[0]/domChild[0]</td> + <td>Internal error</td> +</tr> +</tbody></table> +</body> +</html> diff --git a/uitest/src/com/vaadin/tests/push/PushErrorHandling.java b/uitest/src/com/vaadin/tests/push/PushErrorHandling.java new file mode 100644 index 0000000000..3074bd3851 --- /dev/null +++ b/uitest/src/com/vaadin/tests/push/PushErrorHandling.java @@ -0,0 +1,93 @@ +package com.vaadin.tests.push; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import com.vaadin.data.util.AbstractInMemoryContainer; +import com.vaadin.data.util.BeanContainer; +import com.vaadin.event.ItemClickEvent; +import com.vaadin.event.ItemClickEvent.ItemClickListener; +import com.vaadin.server.ErrorHandler; +import com.vaadin.server.VaadinRequest; +import com.vaadin.server.VaadinSession; +import com.vaadin.shared.communication.PushMode; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Label; +import com.vaadin.ui.Table; + +public class PushErrorHandling extends AbstractTestUI { + + @Override + protected void setup(VaadinRequest request) { + getPushConfiguration().setPushMode(PushMode.AUTOMATIC); + + VaadinSession.getCurrent().setErrorHandler(new ErrorHandler() { + + @Override + public void error(com.vaadin.server.ErrorEvent event) { + addComponent(new Label("An error! " + + event.getThrowable().getMessage())); + System.err.println("An error! " + + event.getThrowable().getMessage()); + } + }); + + final Button button = new Button("Click for NPE!", + new Button.ClickListener() { + @Override + public void buttonClick(ClickEvent event) { + ((String) null).length(); // Null-pointer exception + } + }); + addComponent(button); + + final Table view = new Table("testtable"); + view.setSelectable(true); + view.setMultiSelect(false); + view.setImmediate(true); + view.setSizeFull(); + + view.addItemClickListener(new ItemClickListener() { + + @Override + public void itemClick(ItemClickEvent event) { + BeanContainer<String, AbstractInMemoryContainer> metaContainer = new BeanContainer<String, AbstractInMemoryContainer>( + AbstractInMemoryContainer.class) { + @Override + public Collection<String> getContainerPropertyIds() { + List<String> cpropIds = new ArrayList<String>(super + .getContainerPropertyIds()); + cpropIds.add("testid"); + return cpropIds; + } + + @Override + public Class<?> getType(Object propertyId) { + ((Object) null).hashCode(); + return super.getType(propertyId); + } + }; + view.setContainerDataSource(metaContainer); + + } + }); + view.addContainerProperty("Column", String.class, "Click for NPE"); + view.addItem(new Object()); + + addComponent(view); + + } + + @Override + protected String getTestDescription() { + return "Error handling should still work w/ push enabled. (Button can be handled properly, table causes internal error)"; + } + + @Override + protected Integer getTicketNumber() { + return 11882; + } +} |