From d461fb438f62b38d2082b41b0a3c7a1189927c3d Mon Sep 17 00:00:00 2001 From: Felype Santiago Ferreira Date: Tue, 8 Oct 2013 16:04:32 +0300 Subject: Fixed swallower access. Now error handler logs exceptions. (#12703) Change-Id: If8fe00e10c7ec56cbd8753ff88d4816613a340f2 --- .../components/ui/UIAccessExceptionHandling.html | 67 +++++++++ .../components/ui/UIAccessExceptionHandling.java | 157 +++++++++++++++++++++ 2 files changed, 224 insertions(+) create mode 100644 uitest/src/com/vaadin/tests/components/ui/UIAccessExceptionHandling.html create mode 100644 uitest/src/com/vaadin/tests/components/ui/UIAccessExceptionHandling.java (limited to 'uitest/src/com/vaadin/tests/components/ui') diff --git a/uitest/src/com/vaadin/tests/components/ui/UIAccessExceptionHandling.html b/uitest/src/com/vaadin/tests/components/ui/UIAccessExceptionHandling.html new file mode 100644 index 0000000000..94d8aa2777 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/ui/UIAccessExceptionHandling.html @@ -0,0 +1,67 @@ + + + + + + +New Test + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
New Test
open/run/com.vaadin.tests.components.ui.UIAccessExceptionHandling?restartApplication
clickvaadin=runcomvaadintestscomponentsuiUIAccessExceptionHandling::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]
verifyTextvaadin=runcomvaadintestscomponentsuiUIAccessExceptionHandling::PID_SLog_row_01. Exception catched on get: java.util.concurrent.ExecutionException
verifyTextvaadin=runcomvaadintestscomponentsuiUIAccessExceptionHandling::PID_SLog_row_10. Exception catched on execution with ConnectorErrorEvent : java.util.concurrent.ExecutionException
clickvaadin=runcomvaadintestscomponentsuiUIAccessExceptionHandling::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]
verifyTextvaadin=runcomvaadintestscomponentsuiUIAccessExceptionHandling::PID_SLog_row_01. Exception catched on get: java.util.concurrent.ExecutionException
verifyTextvaadin=runcomvaadintestscomponentsuiUIAccessExceptionHandling::PID_SLog_row_10. Exception catched on execution with ErrorEvent : java.util.concurrent.ExecutionException
clickvaadin=runcomvaadintestscomponentsuiUIAccessExceptionHandling::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]
verifyTextvaadin=runcomvaadintestscomponentsuiUIAccessExceptionHandling::PID_SLog_row_01. Exception catched on get: java.util.concurrent.ExecutionException
verifyTextvaadin=runcomvaadintestscomponentsuiUIAccessExceptionHandling::PID_SLog_row_10. Exception catched on execution with ConnectorErrorEvent : java.util.concurrent.ExecutionException
+ + diff --git a/uitest/src/com/vaadin/tests/components/ui/UIAccessExceptionHandling.java b/uitest/src/com/vaadin/tests/components/ui/UIAccessExceptionHandling.java new file mode 100644 index 0000000000..1cd4be576b --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/ui/UIAccessExceptionHandling.java @@ -0,0 +1,157 @@ +/* + * Copyright 2000-2013 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package com.vaadin.tests.components.ui; + +import java.util.Map; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; + +import com.vaadin.server.DefaultErrorHandler; +import com.vaadin.server.ErrorHandler; +import com.vaadin.server.VaadinRequest; +import com.vaadin.server.VaadinService; +import com.vaadin.tests.components.AbstractTestUIWithLog; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.UI; +import com.vaadin.util.CurrentInstance; + +public class UIAccessExceptionHandling extends AbstractTestUIWithLog implements + ErrorHandler { + + private Future future; + + @Override + protected void setup(VaadinRequest request) { + getSession().setErrorHandler(this); + + addComponent(new Button("Throw RuntimeException on UI.access", + new Button.ClickListener() { + + @Override + public void buttonClick(ClickEvent event) { + log.clear(); + + // Ensure beforeClientResponse is invoked + markAsDirty(); + + future = access(new Runnable() { + @Override + public void run() { + throw new RuntimeException(); + } + }); + } + })); + + addComponent(new Button("Throw RuntimeException on Session.access", + new Button.ClickListener() { + + @Override + public void buttonClick(ClickEvent event) { + log.clear(); + + // Ensure beforeClientResponse is invoked + markAsDirty(); + + VaadinService service = VaadinService.getCurrent(); + + future = service.accessSession(getSession(), + new Runnable() { + + @Override + public void run() { + throw new RuntimeException(); + } + }); + } + })); + + addComponent(new Button( + "Throw RuntimeException after removing instances", + new Button.ClickListener() { + + @Override + public void buttonClick(ClickEvent event) { + log.clear(); + + // Ensure beforeClientResponse is invoked + markAsDirty(); + + assert UI.getCurrent() == UIAccessExceptionHandling.this; + + Map, CurrentInstance> instances = CurrentInstance + .getInstances(false); + CurrentInstance.clearAll(); + + assert UI.getCurrent() == null; + + future = access(new Runnable() { + @Override + public void run() { + throw new RuntimeException(); + } + }); + + CurrentInstance.restoreInstances(instances); + } + })); + + addComponent(new Button("Clear", new Button.ClickListener() { + + @Override + public void buttonClick(ClickEvent event) { + log.clear(); + } + })); + } + + @Override + public void beforeClientResponse(boolean initial) { + if (future != null) { + try { + future.get(); + } catch (InterruptedException e) { + e.printStackTrace(); + } catch (ExecutionException e) { + log("Exception catched on get: " + e.getClass().getName()); + } finally { + future = null; + } + } + } + + @Override + protected String getTestDescription() { + return "Test for handling exceptions in UI.access and Session.access"; + } + + @Override + protected Integer getTicketNumber() { + return Integer.valueOf(12703); + } + + @Override + public void error(com.vaadin.server.ErrorEvent event) { + log("Exception catched on execution with " + + event.getClass().getSimpleName() + " : " + + event.getThrowable().getClass().getName()); + + DefaultErrorHandler.doDefault(event); + } + +} -- cgit v1.2.3