Merge remote-tracking branch 'origin/7.1' into testbench4

Change-Id: I58fe3b4126b61ec342ee06c18ce49a7fa7d4fd3d

4 files changed, 204 insertions, 568 deletions

diff --git a/uitest/src/com/vaadin/tests/components/ui/UIAccessTest.java b/uitest/src/com/vaadin/tests/components/ui/UIAccessTest.java
new file mode 100644
index 0000000000..9db2c2f0d3
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/ui/UIAccessTest.java
@@ -0,0 +1,204 @@
+/*
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+
+import com.vaadin.testbench.By;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class UIAccessTest extends MultiBrowserTest {
+    @Test
+    public void testThreadLocals() {
+        setPush(true);
+        openTestURL();
+        getCurrentInstanceWhenPushingButton().click();
+        waitUntil(ExpectedConditions.textToBePresentInElement(
+                vaadinLocatorById("Log_row_0"), "1."));
+        Assert.assertEquals("0. Current UI matches in beforeResponse? true",
+                vaadinElementById("Log_row_1").getText());
+        Assert.assertEquals(
+                "1. Current session matches in beforeResponse? true",
+                vaadinElementById("Log_row_0").getText());
+
+    }
+
+    @Test
+    public void testAccessMethod() throws Exception {
+        openTestURL();
+
+        vaadinElement(
+                "/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]")
+                .click();
+        driver.findElement(
+                By.vaadin("runcomvaadintestscomponentsuiUIAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]"))
+                .click();
+        assertTrue(driver
+                .findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_2"))
+                .getText()
+                .matches(
+                        "^0\\. Access from UI thread future is done[\\s\\S] false$"));
+        assertEquals(
+                "1. Access from UI thread is run",
+                driver.findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_1"))
+                        .getText());
+        assertTrue(driver
+                .findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_0"))
+                .getText()
+                .matches(
+                        "^2\\. beforeClientResponse future is done[\\s\\S] true$"));
+        driver.findElement(
+                By.vaadin("runcomvaadintestscomponentsuiUIAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]"))
+                .click();
+        assertEquals(
+                "0. Initial background message",
+                driver.findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_1"))
+                        .getText());
+        assertTrue(driver
+                .findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_0"))
+                .getText()
+                .matches("^1\\. Thread has current response[\\s\\S] false$"));
+        for (int second = 0;; second++) {
+            if (second >= 30) {
+                fail("timeout");
+            }
+            try {
+                if ("0. Initial background message"
+                        .equals(driver
+                                .findElement(
+                                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_2"))
+                                .getText())) {
+                    break;
+                }
+            } catch (Exception e) {
+            }
+            Thread.sleep(1000);
+        }
+
+        assertTrue(driver
+                .findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_0"))
+                .getText()
+                .matches(
+                        "^2\\. Thread got lock, inital future done[\\s\\S] true$"));
+        driver.findElement(
+                By.vaadin("runcomvaadintestscomponentsuiUIAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]"))
+                .click();
+        assertEquals(
+                "0. Throwing exception in access",
+                driver.findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_2"))
+                        .getText());
+        assertTrue(driver
+                .findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_1"))
+                .getText().matches("^1\\. firstFuture is done[\\s\\S] true$"));
+        assertEquals(
+                "2. Got exception from firstFuture: java.lang.RuntimeException: Catch me if you can",
+                driver.findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_0"))
+                        .getText());
+        driver.findElement(
+                By.vaadin("runcomvaadintestscomponentsuiUIAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]"))
+                .click();
+        assertEquals(
+                "0. future was cancled, should not start",
+                driver.findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_0"))
+                        .getText());
+        driver.findElement(
+                By.vaadin("runcomvaadintestscomponentsuiUIAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[4]/VButton[0]/domChild[0]/domChild[0]"))
+                .click();
+        assertEquals(
+                "0. Waiting for thread to start",
+                driver.findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_2"))
+                        .getText());
+        assertEquals(
+                "1. Thread started, waiting for interruption",
+                driver.findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_1"))
+                        .getText());
+        assertEquals(
+                "2. I was interrupted",
+                driver.findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_0"))
+                        .getText());
+        driver.findElement(
+                By.vaadin("runcomvaadintestscomponentsuiUIAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[5]/VButton[0]/domChild[0]/domChild[0]"))
+                .click();
+        assertTrue(driver
+                .findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_3"))
+                .getText()
+                .matches("^0\\. accessSynchronously has request[\\s\\S] true$"));
+        assertEquals(
+                "1. Test value in accessSynchronously: Set before accessSynchronosly",
+                driver.findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_2"))
+                        .getText());
+        assertTrue(driver
+                .findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_1"))
+                .getText()
+                .matches(
+                        "^2\\. has request after accessSynchronously[\\s\\S] true$"));
+        assertEquals(
+                "3. Test value after accessSynchornously: Set in accessSynchronosly",
+                driver.findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_0"))
+                        .getText());
+        driver.findElement(
+                By.vaadin("runcomvaadintestscomponentsuiUIAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[6]/VButton[0]/domChild[0]/domChild[0]"))
+                .click();
+        assertTrue(driver
+                .findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_3"))
+                .getText().matches("^0\\. access has request[\\s\\S] false$"));
+        assertEquals(
+                "1. Test value in access: Set before access",
+                driver.findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_2"))
+                        .getText());
+        assertTrue(driver
+                .findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_1"))
+                .getText()
+                .matches("^2\\. has request after access[\\s\\S] true$"));
+        assertEquals(
+                "3. Test value after access: Set before run pending",
+                driver.findElement(
+                        By.vaadin("runcomvaadintestscomponentsuiUIAccess::PID_SLog_row_0"))
+                        .getText());
+
+    }
+
+    private WebElement getCurrentInstanceWhenPushingButton() {
+        return vaadinElement("/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[7]/VButton[0]");
+    }
+}
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/components/ui/UiAccess.html b/uitest/src/com/vaadin/tests/components/ui/UiAccess.html
deleted file mode 100644
index 613691623c..0000000000
--- a/uitest/src/com/vaadin/tests/components/ui/UiAccess.html
+++ /dev/null
@@ -1,166 +0,0 @@
-<?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.UiAccess?restartApplication</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_2</td>
-	<td>exact:0. Access from UI thread future is done? false</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_1</td>
-	<td>1. Access from UI thread is run</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_0</td>
-	<td>exact:2. beforeClientResponse future is done? true</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_1</td>
-	<td>0. Initial background message</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_0</td>
-	<td>exact:1. Thread has current response? false</td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_2</td>
-	<td>0. Initial background message</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_0</td>
-	<td>exact:2. Thread got lock, inital future done? true</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_2</td>
-	<td>0. Throwing exception in access</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_1</td>
-	<td>exact:1. firstFuture is done? true</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_0</td>
-	<td>2. Got exception from firstFuture: java.lang.RuntimeException: Catch me if you can</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_0</td>
-	<td>0. future was cancled, should not start</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[4]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_2</td>
-	<td>0. Waiting for thread to start</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_1</td>
-	<td>1. Thread started, waiting for interruption</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_0</td>
-	<td>2. I was interrupted</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[5]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_3</td>
-	<td>0. accessSynchronously has request? true</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_2</td>
-	<td>1. Test value in accessSynchronously: Set before accessSynchronosly</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_1</td>
-	<td>2. has request after accessSynchronously? true</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_0</td>
-	<td>3. Test value after accessSynchornously: Set in accessSynchronosly</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[6]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_3</td>
-	<td>0. access has request? false</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_2</td>
-	<td>1. Test value in access: Set before access</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_1</td>
-	<td>2. has request after access? true</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_0</td>
-	<td>3. Test value after access: Set before run pending</td>
-</tr>
-</tbody></table>
-</body>
-</html>
diff --git a/uitest/src/com/vaadin/tests/components/ui/UiAccess.java b/uitest/src/com/vaadin/tests/components/ui/UiAccess.java
deleted file mode 100644
index 09f2fd8816..0000000000
--- a/uitest/src/com/vaadin/tests/components/ui/UiAccess.java
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- * 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.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.locks.ReentrantLock;
-
-import com.vaadin.server.VaadinRequest;
-import com.vaadin.server.VaadinService;
-import com.vaadin.server.VaadinSession;
-import com.vaadin.shared.communication.PushMode;
-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 UiAccess extends AbstractTestUIWithLog {
-
-    private volatile boolean checkCurrentInstancesBeforeResponse = false;
-
-    private Future<Void> checkFromBeforeClientResponse;
-
-    private class CurrentInstanceTestType {
-        private String value;
-
-        public CurrentInstanceTestType(String value) {
-            this.value = value;
-        }
-
-        @Override
-        public String toString() {
-            return value;
-        }
-    }
-
-    @Override
-    protected void setup(VaadinRequest request) {
-        addComponent(new Button("Access from UI thread",
-                new Button.ClickListener() {
-
-                    @Override
-                    public void buttonClick(ClickEvent event) {
-                        log.clear();
-                        // Ensure beforeClientResponse is invoked
-                        markAsDirty();
-                        checkFromBeforeClientResponse = access(new Runnable() {
-                            @Override
-                            public void run() {
-                                log("Access from UI thread is run");
-                            }
-                        });
-                        log("Access from UI thread future is done? "
-                                + checkFromBeforeClientResponse.isDone());
-                    }
-                }));
-        addComponent(new Button("Access from background thread",
-                new Button.ClickListener() {
-                    @Override
-                    public void buttonClick(ClickEvent event) {
-                        log.clear();
-                        final CountDownLatch latch = new CountDownLatch(1);
-
-                        new Thread() {
-                            @Override
-                            public void run() {
-                                final boolean threadHasCurrentResponse = VaadinService
-                                        .getCurrentResponse() != null;
-                                // session is locked by request thread at this
-                                // point
-                                final Future<Void> initialFuture = access(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        log("Initial background message");
-                                        log("Thread has current response? "
-                                                + threadHasCurrentResponse);
-                                    }
-                                });
-
-                                // Let request thread continue
-                                latch.countDown();
-
-                                // Wait until thread can be locked
-                                while (!getSession().getLockInstance()
-                                        .tryLock()) {
-                                    try {
-                                        Thread.sleep(100);
-                                    } catch (InterruptedException e) {
-                                        throw new RuntimeException(e);
-                                    }
-                                }
-                                try {
-                                    log("Thread got lock, inital future done? "
-                                            + initialFuture.isDone());
-                                    setPollInterval(-1);
-                                } finally {
-                                    getSession().unlock();
-                                }
-                            }
-                        }.start();
-
-                        // Wait for thread to do initialize before continuing
-                        try {
-                            latch.await();
-                        } catch (InterruptedException e) {
-                            throw new RuntimeException(e);
-                        }
-
-                        setPollInterval(3000);
-                    }
-                }));
-        addComponent(new Button("Access throwing exception",
-                new Button.ClickListener() {
-                    @Override
-                    public void buttonClick(ClickEvent event) {
-                        log.clear();
-                        final Future<Void> firstFuture = access(new Runnable() {
-                            @Override
-                            public void run() {
-                                log("Throwing exception in access");
-                                throw new RuntimeException(
-                                        "Catch me if you can");
-                            }
-                        });
-                        access(new Runnable() {
-                            @Override
-                            public void run() {
-                                log("firstFuture is done? "
-                                        + firstFuture.isDone());
-                                try {
-                                    firstFuture.get();
-                                    log("Should not get here");
-                                } catch (InterruptedException e) {
-                                    throw new RuntimeException(e);
-                                } catch (ExecutionException e) {
-                                    log("Got exception from firstFuture: "
-                                            + e.getMessage());
-                                }
-                            }
-                        });
-                    }
-                }));
-        addComponent(new Button("Cancel future before started",
-                new Button.ClickListener() {
-                    @Override
-                    public void buttonClick(ClickEvent event) {
-                        log.clear();
-                        Future<Void> future = access(new Runnable() {
-                            @Override
-                            public void run() {
-                                log("Should not get here");
-                            }
-                        });
-                        future.cancel(false);
-                        log("future was cancled, should not start");
-                    }
-                }));
-        addComponent(new Button("Cancel running future",
-                new Button.ClickListener() {
-                    @Override
-                    public void buttonClick(ClickEvent event) {
-                        log.clear();
-                        final ReentrantLock interruptLock = new ReentrantLock();
-
-                        final Future<Void> future = access(new Runnable() {
-                            @Override
-                            public void run() {
-                                log("Waiting for thread to start");
-                                while (!interruptLock.isLocked()) {
-                                    try {
-                                        Thread.sleep(100);
-                                    } catch (InterruptedException e) {
-                                        log("Premature interruption");
-                                        throw new RuntimeException(e);
-                                    }
-                                }
-
-                                log("Thread started, waiting for interruption");
-                                try {
-                                    interruptLock.lockInterruptibly();
-                                } catch (InterruptedException e) {
-                                    log("I was interrupted");
-                                }
-                            }
-                        });
-
-                        new Thread() {
-                            @Override
-                            public void run() {
-                                interruptLock.lock();
-                                // Wait until UI thread has started waiting for
-                                // the lock
-                                while (!interruptLock.hasQueuedThreads()) {
-                                    try {
-                                        Thread.sleep(100);
-                                    } catch (InterruptedException e) {
-                                        throw new RuntimeException(e);
-                                    }
-                                }
-
-                                future.cancel(true);
-                            }
-                        }.start();
-                    }
-                }));
-        addComponent(new Button("CurrentInstance accessSynchronously values",
-                new Button.ClickListener() {
-                    @Override
-                    public void buttonClick(ClickEvent event) {
-                        log.clear();
-                        // accessSynchronously should maintain values
-                        CurrentInstance.set(CurrentInstanceTestType.class,
-                                new CurrentInstanceTestType(
-                                        "Set before accessSynchronosly"));
-                        accessSynchronously(new Runnable() {
-                            @Override
-                            public void run() {
-                                log.log("accessSynchronously has request? "
-                                        + (VaadinService.getCurrentRequest() != null));
-                                log.log("Test value in accessSynchronously: "
-                                        + CurrentInstance
-                                                .get(CurrentInstanceTestType.class));
-                                CurrentInstance.set(
-                                        CurrentInstanceTestType.class,
-                                        new CurrentInstanceTestType(
-                                                "Set in accessSynchronosly"));
-                            }
-                        });
-                        log.log("has request after accessSynchronously? "
-                                + (VaadinService.getCurrentRequest() != null));
-                        log("Test value after accessSynchornously: "
-                                + CurrentInstance
-                                        .get(CurrentInstanceTestType.class));
-                    }
-                }));
-        addComponent(new Button("CurrentInstance access values",
-                new Button.ClickListener() {
-                    @Override
-                    public void buttonClick(ClickEvent event) {
-                        log.clear();
-                        // accessSynchronously should maintain values
-                        CurrentInstance
-                                .setInheritable(CurrentInstanceTestType.class,
-                                        new CurrentInstanceTestType(
-                                                "Set before access"));
-                        access(new Runnable() {
-                            @Override
-                            public void run() {
-                                log.log("access has request? "
-                                        + (VaadinService.getCurrentRequest() != null));
-                                log.log("Test value in access: "
-                                        + CurrentInstance
-                                                .get(CurrentInstanceTestType.class));
-                                CurrentInstance.setInheritable(
-                                        CurrentInstanceTestType.class,
-                                        new CurrentInstanceTestType(
-                                                "Set in access"));
-                            }
-                        });
-                        CurrentInstance.setInheritable(
-                                CurrentInstanceTestType.class,
-                                new CurrentInstanceTestType(
-                                        "Set before run pending"));
-
-                        getSession().getService().runPendingAccessTasks(
-                                getSession());
-
-                        log.log("has request after access? "
-                                + (VaadinService.getCurrentRequest() != null));
-                        log("Test value after access: "
-                                + CurrentInstance
-                                        .get(CurrentInstanceTestType.class));
-                    }
-                }));
-
-        addComponent(new Button("CurrentInstance when pushing",
-                new Button.ClickListener() {
-                    @Override
-                    public void buttonClick(ClickEvent event) {
-                        log.clear();
-                        if (getPushConfiguration().getPushMode() != PushMode.AUTOMATIC) {
-                            log("Can only test with automatic push enabled");
-                            return;
-                        }
-
-                        final VaadinSession session = getSession();
-                        new Thread() {
-                            @Override
-                            public void run() {
-                                // Pretend this isn't a Vaadin thread
-                                CurrentInstance.clearAll();
-
-                                /*
-                                 * Get explicit lock to ensure the (implicit)
-                                 * push does not happen during normal request
-                                 * handling.
-                                 */
-                                session.lock();
-                                try {
-                                    access(new Runnable() {
-                                        @Override
-                                        public void run() {
-                                            checkCurrentInstancesBeforeResponse = true;
-                                            // Trigger beforeClientResponse
-                                            markAsDirty();
-                                        }
-                                    });
-                                } finally {
-                                    session.unlock();
-                                }
-                            }
-                        }.start();
-                    }
-                }));
-    }
-
-    @Override
-    public void beforeClientResponse(boolean initial) {
-        if (checkFromBeforeClientResponse != null) {
-            log("beforeClientResponse future is done? "
-                    + checkFromBeforeClientResponse.isDone());
-            checkFromBeforeClientResponse = null;
-        }
-        if (checkCurrentInstancesBeforeResponse) {
-            UI currentUI = UI.getCurrent();
-            VaadinSession currentSession = VaadinSession.getCurrent();
-
-            log("Current UI matches in beforeResponse? " + (currentUI == this));
-            log("Current session matches in beforeResponse? "
-                    + (currentSession == getSession()));
-            checkCurrentInstancesBeforeResponse = false;
-        }
-    }
-
-    @Override
-    protected String getTestDescription() {
-        return "Test for various ways of using UI.access";
-    }
-
-    @Override
-    protected Integer getTicketNumber() {
-        return Integer.valueOf(11897);
-    }
-
-}
diff --git a/uitest/src/com/vaadin/tests/components/ui/UiAccessPush.html b/uitest/src/com/vaadin/tests/components/ui/UiAccessPush.html
deleted file mode 100644
index bc29534ee4..0000000000
--- a/uitest/src/com/vaadin/tests/components/ui/UiAccessPush.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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.UiAccess?restartApplication&amp;transport=websocket</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[7]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForNotText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_0</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_0</td>
-	<td>exact:1. Current session matches in beforeResponse? true</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestscomponentsuiUiAccess::PID_SLog_row_1</td>
-	<td>exact:0. Current UI matches in beforeResponse? true</td>
-</tr>
-</tbody></table>
-</body>
-</html>