diff options
author | Leif Åstrand <leif@vaadin.com> | 2013-09-05 10:11:07 +0300 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2013-09-05 13:34:10 +0000 |
commit | dcf9c61cc0b29e9d437798d78d3ca167ec9cf87a (patch) | |
tree | fa4d61ec02ff99c4d687315ef42126a48f712245 /uitest | |
parent | 1e73ca85b36850d620d7aa55d354747ee4f0b014 (diff) | |
download | vaadin-framework-dcf9c61cc0b29e9d437798d78d3ca167ec9cf87a.tar.gz vaadin-framework-dcf9c61cc0b29e9d437798d78d3ca167ec9cf87a.zip |
Protect CurrentInstance instances from garbage collection (#12509)
Change-Id: I9ec103a1a42d8888d6f680f477393807223740cf
Diffstat (limited to 'uitest')
-rw-r--r-- | uitest/src/com/vaadin/tests/components/ui/CurrentUiRetained.html | 52 | ||||
-rw-r--r-- | uitest/src/com/vaadin/tests/components/ui/CurrentUiRetained.java | 93 |
2 files changed, 145 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/ui/CurrentUiRetained.html b/uitest/src/com/vaadin/tests/components/ui/CurrentUiRetained.html new file mode 100644 index 0000000000..fe030f2ea7 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/ui/CurrentUiRetained.html @@ -0,0 +1,52 @@ +<?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="" /> +<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.CurrentUiRetained?restartApplication</td> + <td></td> +</tr> +<tr> + <td>pause</td> + <td>2000</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runcomvaadintestscomponentsuiCurrentUiRetained::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentsuiCurrentUiRetained::PID_SLog_row_3</td> + <td>1. Correct UI.getCurrent before GC: true</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentsuiCurrentUiRetained::PID_SLog_row_2</td> + <td>2. Correct UI.getCurrent after GC: true</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentsuiCurrentUiRetained::PID_SLog_row_1</td> + <td>3. GC probe available before GC: true</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentsuiCurrentUiRetained::PID_SLog_row_0</td> + <td>4. GC probe available after GC: false</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/uitest/src/com/vaadin/tests/components/ui/CurrentUiRetained.java b/uitest/src/com/vaadin/tests/components/ui/CurrentUiRetained.java new file mode 100644 index 0000000000..b0127e3a75 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/ui/CurrentUiRetained.java @@ -0,0 +1,93 @@ +/* + * 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.ArrayList; + +import com.vaadin.server.VaadinRequest; +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 CurrentUiRetained extends AbstractTestUIWithLog { + public static class GcProbe { + + } + + @Override + protected void setup(VaadinRequest request) { + final ArrayList<UI> uiLog = new ArrayList<UI>(); + final ArrayList<Boolean> probeLog = new ArrayList<Boolean>(); + + final Thread thread = new Thread(new Runnable() { + @Override + public void run() { + try { + uiLog.add(UI.getCurrent()); + + GcProbe gcProbe = new GcProbe(); + CurrentInstance.set(GcProbe.class, gcProbe); + probeLog.add(CurrentInstance.get(GcProbe.class) != null); + gcProbe = null; + + Thread.sleep(500l); + System.gc(); + Thread.sleep(500l); + + probeLog.add(CurrentInstance.get(GcProbe.class) != null); + uiLog.add(UI.getCurrent()); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + }); + thread.start(); + + addComponent(new Button("Show result", new Button.ClickListener() { + @Override + public void buttonClick(ClickEvent event) { + try { + thread.join(); + + log("Correct UI.getCurrent before GC: " + + (uiLog.get(0) == CurrentUiRetained.this)); + log("Correct UI.getCurrent after GC: " + + (uiLog.get(1) == CurrentUiRetained.this)); + + log("GC probe available before GC: " + probeLog.get(0)); + log("GC probe available after GC: " + probeLog.get(1)); + + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + } + })); + } + + @Override + protected String getTestDescription() { + return "Tests that garbage collection removes stale CurrentInstance values while retaining values not collected."; + } + + @Override + protected Integer getTicketNumber() { + return Integer.valueOf(12509); + } + +} |