diff options
| author | Artur Signell <artur@vaadin.com> | 2012-09-24 08:54:50 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-09-24 12:06:20 +0300 |
| commit | 45332b5744d886e36bb999a48f0de26161458066 (patch) | |
| tree | 2ed18ecabfc86b37b872ed25b1aa2c565d5f39e2 /uitest | |
| parent | b6f3d703051ec6bc471eac1f77c78e22cbb71393 (diff) | |
| download | vaadin-framework-45332b5744d886e36bb999a48f0de26161458066.tar.gz vaadin-framework-45332b5744d886e36bb999a48f0de26161458066.zip | |
Fixed serialization issues (#9640)
ConnectorTracker diff state is now transient and thus not serialized. This could be improved in the future (#9717)
Diffstat (limited to 'uitest')
3 files changed, 160 insertions, 1 deletions
diff --git a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java index 5a2e9c30a9..b121ae7992 100644 --- a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java +++ b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java @@ -53,7 +53,7 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { */ private LinkedHashSet<String> defaultPackages = new LinkedHashSet<String>(); - private final ThreadLocal<HttpServletRequest> request = new ThreadLocal<HttpServletRequest>(); + private transient final ThreadLocal<HttpServletRequest> request = new ThreadLocal<HttpServletRequest>(); @Override public void init(ServletConfig servletConfig) throws ServletException { diff --git a/uitest/src/com/vaadin/tests/components/ui/UISerialization.html b/uitest/src/com/vaadin/tests/components/ui/UISerialization.html new file mode 100644 index 0000000000..2e62166cb8 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/ui/UISerialization.html @@ -0,0 +1,32 @@ +<?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>New Test</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">New Test</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.components.ui.UISerialization?debug</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runcomvaadintestscomponentsuiUISerialization::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[3]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentsuiUISerialization::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VLabel[0]</td> + <td>1. Serialized UI in *ms into * bytes</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/uitest/src/com/vaadin/tests/components/ui/UISerialization.java b/uitest/src/com/vaadin/tests/components/ui/UISerialization.java new file mode 100644 index 0000000000..ebb3ff6333 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/ui/UISerialization.java @@ -0,0 +1,127 @@ +/* + * Copyright 2011 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.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectOutputStream; +import java.io.Serializable; +import java.util.Date; + +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.VaadinClasses; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.tests.util.Log; +import com.vaadin.ui.AbstractComponent; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.Component; + +public class UISerialization extends AbstractTestUI { + + private Log log = new Log(5); + + @Override + protected void setup(VaadinRequest request) { + addComponent(log); + for (Class<? extends Component> cls : VaadinClasses.getComponents()) { + try { + AbstractComponent c = (AbstractComponent) cls.newInstance(); + if (c instanceof LegacyWindow) { + continue; + } + if (!(c instanceof Button)) { + continue; + } + + c.setId(cls.getName()); + c.setCaption(cls.getName()); + c.setDescription(cls.getName()); + c.setWidth("100px"); + c.setHeight("100px"); + addComponent(c); + System.out.println("Added " + cls.getName()); + } catch (Exception e) { + System.err.println("Could not instatiate " + cls.getName()); + } + } + + addComponent(new Button("Serialize UI", new ClickListener() { + + @Override + public void buttonClick(ClickEvent event) { + Date d = new Date(); + byte[] result = serialize(UISerialization.this); + long elapsed = new Date().getTime() - d.getTime(); + log.log("Serialized UI in " + elapsed + "ms into " + + result.length + " bytes"); + + } + })); + addComponent(new Button( + "Instantiate and serialize server classes with no-arg constructors", + new ClickListener() { + + @Override + public void buttonClick(ClickEvent event) { + for (Class<?> cls : VaadinClasses + .getAllServerSideClasses()) { + try { + serializeInstance(cls); + } catch (InstantiationException e) { + // No no-arg constructor probably, ignore + } catch (Throwable t) { + log.log("Failed to create and serialize instance of " + + cls.getName()); + } + } + log.log("Serialization done"); + + } + })); + } + + protected void serializeInstance(Class<?> cls) + throws InstantiationException, IllegalAccessException { + serialize((Serializable) cls.newInstance()); + } + + protected byte[] serialize(Serializable serializable) { + ByteArrayOutputStream os = new ByteArrayOutputStream(); + ObjectOutputStream oos; + try { + oos = new ObjectOutputStream(os); + oos.writeObject(serializable); + return os.toByteArray(); + } catch (IOException e) { + throw new RuntimeException("Serialization failed", e); + } + } + + @Override + protected String getTestDescription() { + // TODO Auto-generated method stub + return null; + } + + @Override + protected Integer getTicketNumber() { + // TODO Auto-generated method stub + return null; + } + +} |