From 1de438915468e92ad0657ac4f22dc3e1b1580e63 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 4 Sep 2013 15:58:26 +0300
Subject: Use JUnit 4.11 in all modules (#12572)

Change-Id: I244f4afdebe956166a9158d85dc69fd7746c5a47
---
 uitest/ivy.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'uitest')

diff --git a/uitest/ivy.xml b/uitest/ivy.xml
index 7ff83324ae..e737165288 100644
--- a/uitest/ivy.xml
+++ b/uitest/ivy.xml
@@ -61,7 +61,7 @@
         <dependency org="org.mortbay.jetty" name="jetty-runner"
             rev="7.5.0.v20110901" conf="jetty-run->default" />
 
-        <dependency org="junit" name="junit" rev="4.5"
+        <dependency org="junit" name="junit" rev="4.11"
             conf="build,ide -> default" />
 
         <dependency org="commons-codec" name="commons-codec"
-- 
cgit v1.2.3


From d6954f86e401566456a64418ae80e2f8853a5e43 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 10 Jun 2013 21:32:57 +0300
Subject: Include TestBench 3.1.1 in the project (#12572)

* Jetty is updated to 8.1.9.v20130131 to avoid conflicts with TestBench dependencies
* The new jetty dependens on servlet 3.0

Change-Id: Ibbbc8f5838feb4c132ee2b6f7d7f3f630e95dd68
---
 ivysettings.xml                                    |  4 +++
 uitest/ivy.xml                                     | 38 ++++++++++++++--------
 .../vaadin/launcher/DevelopmentServerLauncher.java |  8 +++--
 3 files changed, 35 insertions(+), 15 deletions(-)

(limited to 'uitest')

diff --git a/ivysettings.xml b/ivysettings.xml
index fa08f3d0bb..e18b2233d1 100644
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -11,6 +11,8 @@
     <settings defaultResolver="public" />
     <resolvers>
         <ibiblio name="public" m2compatible="true" />
+        <ibiblio name="vaadin-addons" usepoms="true"
+            m2compatible="true" root="http://maven.vaadin.com/vaadin-addons" />
         <filesystem name="local-maven" m2compatible="true">
             <artifact
                 pattern="${user.home}/.m2/repository/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]" />
@@ -23,6 +25,8 @@
         </filesystem>
     </resolvers>
     <modules>
+        <module organisation="com.vaadin" name="vaadin-testbench"
+            resolver="vaadin-addons" />
         <module organisation="com.vaadin" name="vaadin-buildhelpers"
             resolver="build-temp" />
         <module organisation="com.vaadin" name="vaadin-shared"
diff --git a/uitest/ivy.xml b/uitest/ivy.xml
index e737165288..d75a591f94 100644
--- a/uitest/ivy.xml
+++ b/uitest/ivy.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE ivy-module [
+    <!ENTITY jetty.version "8.1.9.v20130131">
+]>
 <ivy-module version="2.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
@@ -11,7 +14,7 @@
         <conf name="build" />
         <conf name="build-provided" visibility="private" />
         <conf name="ide" visibility="private" />
-        <conf name="jetty-run" extends="build" visibility="private" />
+        <conf name="jetty-run" visibility="private" />
     </configurations>
     <publications>
         <artifact type="war" ext="war" />
@@ -23,9 +26,6 @@
 
         <dependency org="javax.validation" name="validation-api"
             rev="1.0.0.GA" conf="build,ide -> default,sources" />
-        <!-- Servlet API -->
-        <dependency org="javax.servlet" name="servlet-api"
-            rev="2.4" conf="build-provided,ide -> default" />
         <!-- Google App Engine -->
         <dependency org="com.google.appengine" name="appengine-api-1.0-sdk"
             rev="1.2.1" conf="build-provided,ide -> default" />
@@ -33,7 +33,9 @@
         <!-- LIBRARY DEPENDENCIES (compile time) -->
         <!-- Project modules -->
         <dependency org="com.vaadin" name="vaadin-server"
-            rev="${vaadin.version}" conf="build->build"></dependency>
+            rev="${vaadin.version}" conf="build->build">
+            <exclude org="javax.servlet"></exclude>
+        </dependency>
         <dependency org="com.vaadin" name="vaadin-client"
             rev="${vaadin.version}" conf="build->build"></dependency>
         <dependency org="com.vaadin" name="vaadin-client-compiled"
@@ -41,25 +43,33 @@
         <dependency org="com.vaadin" name="vaadin-themes"
             rev="${vaadin.version}" conf="build->build"></dependency>
         <dependency org="com.vaadin" name="vaadin-push" rev="${vaadin.version}"
-            conf="build->build"></dependency>
+            conf="build->build">
+            <exclude org="javax.servlet"></exclude>
+        </dependency>
 
         <!-- For compiling TestingWidgetSet -->
         <dependency org="com.vaadin" name="vaadin-client-compiler"
             rev="${vaadin.version}" conf="build-provided-> build"></dependency>
 
-        <!-- Newest Jetty does not work with Ivy currently (orbit -> jar 
-            mapping problem) -->
+        <!-- Servlet 3.0 API -->
+        <dependency org="javax.servlet" name="javax.servlet-api"
+            rev="3.0.1" conf="build-provided,ide -> default" />
+
         <dependency org="org.eclipse.jetty" name="jetty-server"
-            rev="7.5.0.v20110901" conf="ide, build-provided, jetty-run->default" />
+            rev="&jetty.version;" conf="ide, build-provided, jetty-run->default">
+            <exclude org="org.eclipse.jetty.orbit"></exclude>
+        </dependency>
         <!-- jetty-servlets needed by ProxyTest, but not by jetty-runner -->
         <dependency org="org.eclipse.jetty" name="jetty-servlets"
-            rev="7.5.0.v20110901" conf="ide, build-provided, jetty-run->default" />
+            rev="&jetty.version;" conf="ide, build-provided, jetty-run->default" />
         <dependency org="org.eclipse.jetty" name="jetty-websocket"
-            rev="7.5.0.v20110901" conf="ide, jetty-run->default" />
+            rev="&jetty.version;" conf="ide, jetty-run->default" />
         <dependency org="org.eclipse.jetty" name="jetty-webapp"
-            rev="7.5.0.v20110901" conf="ide, build-provided, jetty-run->default" />
+            rev="&jetty.version;" conf="ide, build-provided, jetty-run->default" />
         <dependency org="org.mortbay.jetty" name="jetty-runner"
-            rev="7.5.0.v20110901" conf="jetty-run->default" />
+            rev="&jetty.version;" conf="ide, jetty-run->default">
+            <exclude org="org.eclipse.jetty.orbit"></exclude>
+        </dependency>
 
         <dependency org="junit" name="junit" rev="4.11"
             conf="build,ide -> default" />
@@ -71,6 +81,8 @@
         <!-- Mainly for SQLContainer tests -->
         <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6"
             conf="build,ide -> default" />
+        <dependency org="com.vaadin" name="vaadin-testbench"
+            rev="3.1.1" conf="build-provided,ide -> default" />
     </dependencies>
 
 </ivy-module>
diff --git a/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java b/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
index 5ab2134cdb..a8d639cbc8 100644
--- a/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
+++ b/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
@@ -24,10 +24,12 @@ import java.net.ServerSocket;
 import java.net.Socket;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import javax.servlet.DispatcherType;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
@@ -181,7 +183,8 @@ public class DevelopmentServerLauncher {
             String[] paths = serverArgs.get("slowdown").split(",");
             for (String p : paths) {
                 System.out.println("Slowing down: " + p);
-                webappcontext.addFilter(SlowFilter.class, p, 1);
+                webappcontext.addFilter(SlowFilter.class, p,
+                        EnumSet.of(DispatcherType.REQUEST));
             }
         }
         // --cache=/run/APP/PUBLISHED/*,/other/path/asd.jpg
@@ -190,7 +193,8 @@ public class DevelopmentServerLauncher {
             String[] paths = serverArgs.get("cache").split(",");
             for (String p : paths) {
                 System.out.println("Enabling cache for: " + p);
-                webappcontext.addFilter(CacheFilter.class, p, 1);
+                webappcontext.addFilter(CacheFilter.class, p,
+                        EnumSet.of(DispatcherType.REQUEST));
             }
         }
 
-- 
cgit v1.2.3


From c7aaa0413f63d938791e760b23fb3f609f285aa0 Mon Sep 17 00:00:00 2001
From: Jonatan Kronqvist <jonatan@vaadin.com>
Date: Fri, 20 Sep 2013 15:32:12 +0300
Subject: Don't try to cast a connector to Widget. Fixes #12619

Change-Id: I0fe98ca90ed3969f1af1be60668b4c1c561675eb
---
 .../com/vaadin/client/ui/dd/VTargetInSubtree.java  |  4 +-
 uitest/src/com/vaadin/tests/dd/DnDOnSubtree.html   | 51 ++++++++++++++++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 uitest/src/com/vaadin/tests/dd/DnDOnSubtree.html

(limited to 'uitest')

diff --git a/client/src/com/vaadin/client/ui/dd/VTargetInSubtree.java b/client/src/com/vaadin/client/ui/dd/VTargetInSubtree.java
index e9061114aa..c3f56b410d 100644
--- a/client/src/com/vaadin/client/ui/dd/VTargetInSubtree.java
+++ b/client/src/com/vaadin/client/ui/dd/VTargetInSubtree.java
@@ -32,7 +32,7 @@ final public class VTargetInSubtree extends VAcceptCriterion {
     protected boolean accept(VDragEvent drag, UIDL configuration) {
 
         VTree tree = (VTree) VDragAndDropManager.get().getCurrentDropHandler()
-                .getConnector();
+                .getConnector().getWidget();
         TreeNode treeNode = tree.getNodeByKey((String) drag.getDropDetails()
                 .get("itemIdOver"));
         if (treeNode != null) {
@@ -53,4 +53,4 @@ final public class VTargetInSubtree extends VAcceptCriterion {
 
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/uitest/src/com/vaadin/tests/dd/DnDOnSubtree.html b/uitest/src/com/vaadin/tests/dd/DnDOnSubtree.html
new file mode 100644
index 0000000000..844636cb02
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/dd/DnDOnSubtree.html
@@ -0,0 +1,51 @@
+<?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>DnDOnSubtree</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.dd.DDTest8?restartApplication</td>
+        <td></td>
+    </tr>
+    <tr>
+        <td>drag</td>
+        <td>vaadin=runcomvaadintestsddDDTest8::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VTree[0]#n[3]</td>
+        <td>11,8</td>
+    </tr>
+    <!-- Drop on Bar5, which is a subtree target -->
+    <tr>
+        <td>drop</td>
+        <td>vaadin=runcomvaadintestsddDDTest8::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VTree[0]#n[6]</td>
+        <td>34,9</td>
+    </tr>
+    <tr>
+        <td>mouseClick</td>
+        <td>
+            vaadin=runcomvaadintestsddDDTest8::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VTree[0]#n[5]/expand
+        </td>
+        <td>10,8</td>
+    </tr>
+    <!-- Assert that the dragged & dropped node is now a child of Bar5 -->
+    <tr>
+        <td>assertElementPresent</td>
+        <td>
+            vaadin=runcomvaadintestsddDDTest8::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VTree[0]#n[5]/n[0]
+        </td>
+        <td></td>
+    </tr>
+    </tbody>
+</table>
+</body>
+</html>
-- 
cgit v1.2.3


From 7f7dc316e3593bc4823f2cbc8e6f4814f233ce03 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 16 Sep 2013 08:50:16 +0300
Subject: Base files for TB3 tests (#12572)

* Converted LabelModes to TB3 for validation

Change-Id: Ic9e69d46623a16986961bdc8cc050b375622a91d
---
 uitest/eclipse-run-selected-test.properties        |  26 +-
 .../vaadin/tests/components/label/LabelModes.html  |  27 --
 .../vaadin/tests/components/label/LabelModes.java  |   9 +
 .../src/com/vaadin/tests/tb3/AbstractTB3Test.java  | 516 +++++++++++++++++++++
 .../src/com/vaadin/tests/tb3/MultiBrowserTest.java |  81 ++++
 .../com/vaadin/tests/tb3/ParallelScheduler.java    |  60 +++
 .../vaadin/tests/tb3/PrivateTB3Configuration.java  | 123 +++++
 .../com/vaadin/tests/tb3/ScreenshotTB3Test.java    | 392 ++++++++++++++++
 .../vaadin/tests/tb3/SimpleMultiBrowserTest.java   |  49 ++
 uitest/src/com/vaadin/tests/tb3/TB3Runner.java     | 167 +++++++
 10 files changed, 1415 insertions(+), 35 deletions(-)
 delete mode 100644 uitest/src/com/vaadin/tests/components/label/LabelModes.html
 create mode 100644 uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
 create mode 100644 uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
 create mode 100644 uitest/src/com/vaadin/tests/tb3/ParallelScheduler.java
 create mode 100644 uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
 create mode 100644 uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
 create mode 100644 uitest/src/com/vaadin/tests/tb3/SimpleMultiBrowserTest.java
 create mode 100644 uitest/src/com/vaadin/tests/tb3/TB3Runner.java

(limited to 'uitest')

diff --git a/uitest/eclipse-run-selected-test.properties b/uitest/eclipse-run-selected-test.properties
index f6cb2551e9..cbd1ab1cef 100644
--- a/uitest/eclipse-run-selected-test.properties
+++ b/uitest/eclipse-run-selected-test.properties
@@ -1,14 +1,23 @@
-; Location where vaadin-testbench jar can be found
-com.vaadin.testbench.lib.dir=<enter location of testbench here>
-
-; Deployment url to use for testing. Context path must be /  
-com.vaadin.testbench.deployment.url=http://<enter your ip here>:8888/
+;
+; For both TestBench 2 and 3
+;
 
 ; Location of the screenshot directory. 
 ; This is the directory that contains the "references" directory
 com.vaadin.testbench.screenshot.directory=<enter the full path to the screenshots directory, parent of "references" directory>
 
-; Run the whole test even if 
+
+;
+; For only TestBench 2
+;
+
+; Location where TestBench 2 jar can be found
+com.vaadin.testbench.lib.dir=<enter location of testbench here>
+
+; Deployment url to use for testing. Context path must be /  
+com.vaadin.testbench.deployment.url=http://<enter your ip here>:8888/
+
+; Run the whole test even if a screenshot comparison fails
 com.vaadin.testbench.screenshot.softfail=true
 
 ; Screen capture at the end if the test fails
@@ -23,7 +32,8 @@ com.vaadin.testbench.screenshot.cursor=true
 ; Uncomment to limit to certain browsers or override in launch configuration
 ; browsers=winxp-opera10
 
-; Claim that the server has started succesfully. Needed for the tests to run
+; Claim that the server has started succesfully. Needed for TB2 tests to be executed
 server.start.succeeded=1
 
-test-output-dir=../build/test-output
\ No newline at end of file
+; Directory where temporary Java classes are created
+test-output-dir=../build/test-output
diff --git a/uitest/src/com/vaadin/tests/components/label/LabelModes.html b/uitest/src/com/vaadin/tests/components/label/LabelModes.html
deleted file mode 100644
index 356688b456..0000000000
--- a/uitest/src/com/vaadin/tests/components/label/LabelModes.html
+++ /dev/null
@@ -1,27 +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.label.LabelModes?restartApplication</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>labelmodes</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/uitest/src/com/vaadin/tests/components/label/LabelModes.java b/uitest/src/com/vaadin/tests/components/label/LabelModes.java
index e5bc539f36..1959447a4b 100644
--- a/uitest/src/com/vaadin/tests/components/label/LabelModes.java
+++ b/uitest/src/com/vaadin/tests/components/label/LabelModes.java
@@ -2,10 +2,19 @@ package com.vaadin.tests.components.label;
 
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.ComponentTestCase;
+import com.vaadin.tests.tb3.SimpleMultiBrowserTest;
 import com.vaadin.ui.Label;
 
 public class LabelModes extends ComponentTestCase<Label> {
 
+    public static class LabelModesTest extends SimpleMultiBrowserTest {
+        @Override
+        public void test() throws Exception {
+            compareScreen("labelmodes");
+        }
+
+    }
+
     @Override
     protected Class<Label> getTestClass() {
         return Label.class;
diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
new file mode 100644
index 0000000000..f27fff5873
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -0,0 +1,516 @@
+/*
+ * 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.tb3;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.junit.After;
+import org.junit.Before;
+import org.openqa.selenium.Platform;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.remote.BrowserType;
+import org.openqa.selenium.remote.DesiredCapabilities;
+import org.openqa.selenium.remote.RemoteWebDriver;
+
+import com.vaadin.server.LegacyApplication;
+import com.vaadin.testbench.By;
+import com.vaadin.testbench.TestBench;
+import com.vaadin.testbench.TestBenchTestCase;
+import com.vaadin.ui.UI;
+
+/**
+ * Base class for TestBench 3+ tests. All TB3+ tests in the project should
+ * extend this class.
+ * 
+ * Provides:
+ * <ul>
+ * <li>Helpers for browser selection</li>
+ * <li>Hub connection setup and teardown</li>
+ * <li>Automatic opening of a given test on the development server using
+ * {@link #getUIClass()} or by automatically finding an enclosing UI class</li>
+ * <li>Generic helpers for creating TB3+ tests</li>
+ * <li>Automatic URL generation based on needed features, e.g.
+ * {@link #isDebug()}, {@link #isPushEnabled()}</li>
+ * </ul>
+ * 
+ * @author Vaadin Ltd
+ */
+public abstract class AbstractTB3Test extends TestBenchTestCase {
+    /**
+     * Height of the screenshots we want to capture
+     */
+    private static final int SCREENSHOT_HEIGHT = 850;
+
+    /**
+     * Width of the screenshots we want to capture
+     */
+    private static final int SCREENSHOT_WIDTH = 1500;
+
+    private DesiredCapabilities desiredCapabilities;
+    {
+        // Default browser to run on unless setDesiredCapabilities is called
+        desiredCapabilities = BrowserUtil.firefox(24);
+    }
+
+    /**
+     * Connect to the hub using a remote web driver, set the canvas size and
+     * opens the initial URL as specified by {@link #getTestUrl()}
+     * 
+     * @throws MalformedURLException
+     */
+    @Before
+    public void setup() throws MalformedURLException {
+        DesiredCapabilities capabilities = getDesiredCapabilities();
+        driver = TestBench.createDriver(new RemoteWebDriver(
+                new URL(getHubURL()), capabilities));
+        int w = SCREENSHOT_WIDTH;
+        int h = SCREENSHOT_HEIGHT;
+
+        if (BrowserUtil.isIE8(capabilities)) {
+            // IE8 gets size wrong, who would have guessed...
+            w += 4;
+            h += 4;
+        }
+        try {
+            testBench().resizeViewPortTo(w, h);
+        } catch (UnsupportedOperationException e) {
+            // Opera does not support this...
+        }
+
+        String testUrl = getTestUrl();
+        if (testUrl != null) {
+            driver.get(testUrl);
+        }
+    }
+
+    /**
+     * Returns the full URL to be opened when the test starts.
+     * 
+     * @return the full URL to open or null to not open any URL automatically
+     */
+    protected String getTestUrl() {
+        String baseUrl = getBaseURL();
+        if (baseUrl.endsWith("/")) {
+            baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
+        }
+
+        return baseUrl + getDeploymentPath();
+    }
+
+    /**
+     * 
+     * @return the location (URL) of the TB hub
+     */
+    protected String getHubURL() {
+        return "http://" + getHubHostname() + ":4444/wd/hub";
+    }
+
+    /**
+     * Used for building the hub URL to use for the test
+     * 
+     * @return the host name of the TestBench hub
+     */
+    protected abstract String getHubHostname();
+
+    /**
+     * Used to determine what URL to initially open for the test
+     * 
+     * @return the host name of development server
+     */
+    protected abstract String getDeploymentHostname();
+
+    /**
+     * Used to determine which capabilities should be used when setting up a
+     * {@link WebDriver} for this test. Typically set by a test runner or left
+     * at its default (Firefox 24). If you want to run a test on a single
+     * browser other than Firefox 24 you can override this method.
+     * 
+     * @return the requested browser capabilities
+     */
+    protected DesiredCapabilities getDesiredCapabilities() {
+        return desiredCapabilities;
+    }
+
+    /**
+     * Sets the requested browser capabilities (typically browser name and
+     * version)
+     * 
+     * @param desiredCapabilities
+     */
+    public void setDesiredCapabilities(DesiredCapabilities desiredCapabilities) {
+        this.desiredCapabilities = desiredCapabilities;
+    }
+
+    /**
+     * Shuts down the driver after the test has been completed
+     * 
+     * @throws Exception
+     */
+    @After
+    public void tearDown() throws Exception {
+        if (driver != null) {
+            driver.quit();
+        }
+        driver = null;
+    }
+
+    /**
+     * Finds a Vaadin element based on the part of a TB3 style locator following
+     * the :: (e.g.
+     * vaadin=runLabelModes::PID_Scheckboxaction-Enabled/domChild[0] ->
+     * PID_Scheckboxaction-Enabled/domChild[0]).
+     * 
+     * @param vaadinLocator
+     *            The part following :: of the vaadin locator string
+     * @return
+     */
+    protected WebElement vaadinElement(String vaadinLocator) {
+        String base = getApplicationId(getDeploymentPath());
+
+        base += "::";
+
+        return driver.findElement(By.vaadin(base + vaadinLocator));
+    }
+
+    /**
+     * Find a Vaadin element based on its id given using Component.setId
+     * 
+     * @param id
+     *            The id to locate
+     * @return
+     */
+    public WebElement vaadinElementById(String id) {
+        return vaadinElement("PID_S" + id);
+    }
+
+    /**
+     * Returns the path that should be used for the test. The path contains the
+     * full path (appended to hostname+port) and must start with a slash.
+     * 
+     * @return The path to open automatically when the test starts
+     */
+    protected String getDeploymentPath() {
+        Class<?> uiClass = getUIClass();
+        if (uiClass != null) {
+            return getDeploymentPath(uiClass);
+        }
+        throw new IllegalArgumentException("Unable to determine path for "
+                + getClass().getCanonicalName());
+
+    }
+
+    /**
+     * Returns the UI class the current test is connected to. Uses the enclosing
+     * class if the test class is a static inner class to a UI class.
+     * 
+     * Test which are not enclosed by a UI class must implement this method and
+     * return the UI class they want to test.
+     * 
+     * Note that this method will update the test name to the enclosing class to
+     * be compatible with TB2 screenshot naming
+     * 
+     * @return the UI class the current test is connected to
+     */
+    protected Class<?> getUIClass() {
+        Class<?> enclosingClass = getClass().getEnclosingClass();
+        if (enclosingClass != null) {
+            return enclosingClass;
+        }
+        return null;
+    }
+
+    /**
+     * Determines whether to run the test in debug mode (with the debug console
+     * open) or not
+     * 
+     * @return true to run with the debug window open, false by default
+     */
+    protected boolean isDebug() {
+        return false;
+    }
+
+    /**
+     * Determines whether to run the test with push enabled (using /run-push) or
+     * not. Note that push tests can and should typically be created using @Push
+     * on the UI instead of overriding this method
+     * 
+     * @return true to use push in the test, false to use whatever UI specifies
+     */
+    protected boolean isPushEnabled() {
+        return false;
+    }
+
+    /**
+     * Returns the path for the given UI class when deployed on the test server.
+     * The path contains the full path (appended to hostname+port) and must
+     * start with a slash.
+     * 
+     * This method takes into account {@link #isPushEnabled()} and
+     * {@link #isDebug()} when the path is generated.
+     * 
+     * @param uiClass
+     * @return The path to the given UI class
+     */
+    private String getDeploymentPath(Class<?> uiClass) {
+        String runPath = "/run";
+        if (isPushEnabled()) {
+            runPath = "/run-push";
+        }
+
+        if (UI.class.isAssignableFrom(uiClass)) {
+            return runPath + "/" + uiClass.getCanonicalName()
+                    + (isDebug() ? "?debug" : "");
+        } else if (LegacyApplication.class.isAssignableFrom(uiClass)) {
+            return runPath + "/" + uiClass.getCanonicalName()
+                    + "?restartApplication" + (isDebug() ? "&debug" : "");
+        } else {
+            throw new IllegalArgumentException(
+                    "Unable to determine path for enclosing class "
+                            + uiClass.getCanonicalName());
+        }
+    }
+
+    /**
+     * Used to determine what URL to initially open for the test
+     * 
+     * @return The base URL for the test. Does not include a trailing slash.
+     */
+    protected String getBaseURL() {
+        return "http://" + getDeploymentHostname() + ":8888";
+    }
+
+    /**
+     * Generates the application id based on the URL in a way compatible with
+     * VaadinServletService.
+     * 
+     * @param pathWithQueryParameters
+     *            The path part of the URL, possibly still containing query
+     *            parameters
+     * @return The application ID string used in Vaadin locators
+     */
+    private String getApplicationId(String pathWithQueryParameters) {
+        // Remove any possible URL parameters
+        String pathWithoutQueryParameters = pathWithQueryParameters.replaceAll(
+                "\\?.*", "");
+        if ("".equals(pathWithoutQueryParameters)) {
+            return "ROOT";
+        }
+
+        // Retain only a-z and numbers
+        return pathWithoutQueryParameters.replaceAll("[^a-zA-Z0-9]", "");
+    }
+
+    /**
+     * Helper method for sleeping X ms in a test. Catches and ignores
+     * InterruptedExceptions
+     * 
+     * @param timeoutMillis
+     *            Number of ms to wait
+     */
+    protected void sleep(int timeoutMillis) {
+        try {
+            Thread.sleep(timeoutMillis);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Provides helper method for selecting the browser to run on
+     * 
+     * @author Vaadin Ltd
+     */
+    public static class BrowserUtil {
+        /**
+         * Gets the capabilities for Safari of the given version
+         * 
+         * @param version
+         *            the major version
+         * @return an object describing the capabilities required for running a
+         *         test on the given Safari version
+         */
+        protected static DesiredCapabilities safari(int version) {
+            DesiredCapabilities c = DesiredCapabilities.safari();
+            c.setVersion("" + version);
+            return c;
+        }
+
+        /**
+         * Gets the capabilities for Chrome of the given version
+         * 
+         * @param version
+         *            the major version
+         * @return an object describing the capabilities required for running a
+         *         test on the given Chrome version
+         */
+        protected static DesiredCapabilities chrome(int version) {
+            DesiredCapabilities c = DesiredCapabilities.chrome();
+            c.setVersion("" + version);
+            c.setPlatform(Platform.XP);
+            return c;
+        }
+
+        /**
+         * Gets the capabilities for Opera of the given version
+         * 
+         * @param version
+         *            the major version
+         * @return an object describing the capabilities required for running a
+         *         test on the given Opera version
+         */
+        protected static DesiredCapabilities opera(int version) {
+            DesiredCapabilities c = DesiredCapabilities.opera();
+            c.setVersion("" + version);
+            c.setPlatform(Platform.XP);
+            return c;
+        }
+
+        /**
+         * Gets the capabilities for Firefox of the given version
+         * 
+         * @param version
+         *            the major version
+         * @return an object describing the capabilities required for running a
+         *         test on the given Firefox version
+         */
+        protected static DesiredCapabilities firefox(int version) {
+            DesiredCapabilities c = DesiredCapabilities.firefox();
+            c.setVersion("" + version);
+            c.setPlatform(Platform.XP);
+            return c;
+        }
+
+        /**
+         * Gets the capabilities for Internet Explorer of the given version
+         * 
+         * @param version
+         *            the major version
+         * @return an object describing the capabilities required for running a
+         *         test on the given Internet Explorer version
+         */
+        protected static DesiredCapabilities ie(int version) {
+            DesiredCapabilities c = DesiredCapabilities.internetExplorer();
+            c.setVersion("" + version);
+            return c;
+        }
+
+        /**
+         * Checks if the given capabilities refer to Internet Explorer 8
+         * 
+         * @param capabilities
+         * @return true if the capabilities refer to IE8, false otherwise
+         */
+        public static boolean isIE8(DesiredCapabilities capabilities) {
+            return BrowserType.IE.equals(capabilities.getBrowserName())
+                    && "8".equals(capabilities.getVersion());
+        }
+
+        /**
+         * Returns a human readable identifier of the given browser. Used for
+         * test naming and screenshots
+         * 
+         * @param capabilities
+         * @return a human readable string describing the capabilities
+         */
+        public static String getBrowserIdentifier(
+                DesiredCapabilities capabilities) {
+            String browserName = capabilities.getBrowserName();
+
+            if (BrowserType.IE.equals(browserName)) {
+                return "InternetExplorer";
+            } else if (BrowserType.FIREFOX.equals(browserName)) {
+                return "Firefox";
+            } else if (BrowserType.CHROME.equals(browserName)) {
+                return "Chrome";
+            } else if (BrowserType.SAFARI.equals(browserName)) {
+                return "Safari";
+            } else if (BrowserType.OPERA.equals(browserName)) {
+                return "Opera";
+            }
+
+            return browserName;
+        }
+
+        /**
+         * Returns a human readable identifier of the platform described by the
+         * given capabilities. Used mainly for screenshots
+         * 
+         * @param capabilities
+         * @return a human readable string describing the platform
+         */
+        public static String getPlatform(DesiredCapabilities capabilities) {
+            if (capabilities.getPlatform() == Platform.WIN8
+                    || capabilities.getPlatform() == Platform.WINDOWS
+                    || capabilities.getPlatform() == Platform.VISTA
+                    || capabilities.getPlatform() == Platform.XP) {
+                return "Windows";
+            } else if (capabilities.getPlatform() == Platform.MAC) {
+                return "Mac";
+            }
+            return capabilities.getPlatform().toString();
+        }
+
+        /**
+         * Returns a string which uniquely (enough) identifies this browser.
+         * Used mainly in screenshot names.
+         * 
+         * @param capabilities
+         * 
+         * @return a unique string for each browser
+         */
+        public static String getUniqueIdentifier(
+                DesiredCapabilities capabilities) {
+            return getUniqueIdentifier(getPlatform(capabilities),
+                    getBrowserIdentifier(capabilities),
+                    capabilities.getVersion());
+        }
+
+        /**
+         * Returns a string which uniquely (enough) identifies this browser.
+         * Used mainly in screenshot names.
+         * 
+         * @param capabilities
+         * 
+         * @return a unique string for each browser
+         */
+        public static String getUniqueIdentifier(
+                DesiredCapabilities capabilities, String versionOverride) {
+            return getUniqueIdentifier(getPlatform(capabilities),
+                    getBrowserIdentifier(capabilities), versionOverride);
+        }
+
+        private static String getUniqueIdentifier(String platform,
+                String browser, String version) {
+            return platform + "_" + browser + "_" + version;
+        }
+
+    }
+
+    /**
+     * Called by the test runner whenever there is an exception in the test that
+     * will cause termination of the test
+     * 
+     * @param t
+     *            the throwable which caused the termination
+     */
+    public void onUncaughtException(Throwable t) {
+        // Do nothing by default
+
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
new file mode 100644
index 0000000000..5a1d07c0c0
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
@@ -0,0 +1,81 @@
+/*
+ * 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.tb3;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized.Parameters;
+import org.openqa.selenium.remote.DesiredCapabilities;
+
+/**
+ * Base class for tests which should be run on all supported browsers. The test
+ * is automatically launched for multiple browsers in parallel by the test
+ * runner.
+ * 
+ * Sub classes can, but typically should not, restrict the browsers used by
+ * implementing a
+ * 
+ * <pre>
+ * &#064;Parameters
+ * public static Collection&lt;DesiredCapabilities&gt; getBrowsersForTest() {
+ * }
+ * </pre>
+ * 
+ * @author Vaadin Ltd
+ */
+@RunWith(value = TB3Runner.class)
+public abstract class MultiBrowserTest extends PrivateTB3Configuration {
+
+    private static List<DesiredCapabilities> allBrowsers = new ArrayList<DesiredCapabilities>();
+    private static List<DesiredCapabilities> websocketBrowsers = new ArrayList<DesiredCapabilities>();
+    static {
+        allBrowsers.add(BrowserUtil.ie(8));
+        allBrowsers.add(BrowserUtil.ie(9));
+        allBrowsers.add(BrowserUtil.ie(10));
+        allBrowsers.add(BrowserUtil.firefox(17));
+        // Uncomment once we have the capability to run on Safari 6
+        // allBrowsers.add(safari(6));
+        allBrowsers.add(BrowserUtil.chrome(29));
+        allBrowsers.add(BrowserUtil.opera(12));
+
+        websocketBrowsers.addAll(allBrowsers);
+        websocketBrowsers.remove(BrowserUtil.ie(8));
+        websocketBrowsers.remove(BrowserUtil.ie(9));
+    }
+
+    @Parameters
+    public static Collection<DesiredCapabilities> getBrowsersForTest() {
+        return getAllBrowsers();
+    }
+
+    public static Collection<DesiredCapabilities> getAllBrowsers() {
+        return Collections.unmodifiableCollection(allBrowsers);
+    }
+
+    /**
+     * @return A subset of {@link #getAllBrowsers()} including only those which
+     *         support websockets
+     */
+    public static Collection<DesiredCapabilities> getWebsocketBrowsers() {
+        return Collections.unmodifiableCollection(websocketBrowsers);
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/tb3/ParallelScheduler.java b/uitest/src/com/vaadin/tests/tb3/ParallelScheduler.java
new file mode 100644
index 0000000000..f8013169fa
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/tb3/ParallelScheduler.java
@@ -0,0 +1,60 @@
+/*
+ * 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.tb3;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import org.junit.runners.model.RunnerScheduler;
+
+/**
+ * JUnit scheduler capable of running multiple tets in parallel. Each test is
+ * run in its own thread. Uses an {@link ExecutorService} to manage the threads.
+ * 
+ * @author Vaadin Ltd
+ */
+public class ParallelScheduler implements RunnerScheduler {
+    private final List<Future<Object>> fResults = new ArrayList<Future<Object>>();
+
+    private final ExecutorService fService = Executors.newCachedThreadPool();
+
+    @Override
+    public void schedule(final Runnable childStatement) {
+        fResults.add(fService.submit(new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
+                childStatement.run();
+                return null;
+            }
+        }));
+    }
+
+    @Override
+    public void finished() {
+        for (Future<Object> each : fResults) {
+            try {
+                each.get();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java b/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
new file mode 100644
index 0000000000..3d7dead928
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2000-2013 Vaadind 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.tb3;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.Enumeration;
+import java.util.Properties;
+
+/**
+ * Provides values for parameters which depend on where the test is run.
+ * Parameters should be configured in work/eclipse-run-selected-test.properties.
+ * A template is available in uitest/.
+ * 
+ * @author Vaadin Ltd
+ */
+public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
+    private static final String HOSTNAME_PROPERTY = "com.vaadin.testbench.deployment.hostname";
+    private final Properties properties = new Properties();
+
+    public PrivateTB3Configuration() {
+        File file = new File("work", "eclipse-run-selected-test.properties");
+        if (file.exists()) {
+            try {
+                properties.load(new FileInputStream(file));
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    private String getProperty(String name) {
+        String property = properties.getProperty(name);
+        if (property == null) {
+            property = System.getProperty(name);
+        }
+
+        return property;
+    }
+
+    @Override
+    protected String getScreenshotDirectory() {
+        String screenshotDirectory = getProperty("com.vaadin.testbench.screenshot.directory");
+        if (screenshotDirectory == null) {
+            throw new RuntimeException(
+                    "No screenshot directory defined. Use -Dcom.vaadin.testbench.screenshot.directory=<path>");
+        }
+        return screenshotDirectory;
+    }
+
+    @Override
+    protected String getHubHostname() {
+        return "tb3-hub.intra.itmill.com";
+    }
+
+    @Override
+    protected String getDeploymentHostname() {
+        String hostName = getProperty(HOSTNAME_PROPERTY);
+
+        if (hostName == null || "".equals(hostName)) {
+            hostName = findAutoHostname();
+        }
+
+        return hostName;
+    }
+
+    /**
+     * Tries to automatically determine the IP address of the machine the test
+     * is running on.
+     * 
+     * @return An IP address of one of the network interfaces in the machine.
+     * @throws RuntimeException
+     *             if there was an error or no IP was found
+     */
+    private String findAutoHostname() {
+        try {
+            Enumeration<NetworkInterface> interfaces = NetworkInterface
+                    .getNetworkInterfaces();
+            while (interfaces.hasMoreElements()) {
+                NetworkInterface current = interfaces.nextElement();
+                if (!current.isUp() || current.isLoopback()
+                        || current.isVirtual()) {
+                    continue;
+                }
+                Enumeration<InetAddress> addresses = current.getInetAddresses();
+                while (addresses.hasMoreElements()) {
+                    InetAddress current_addr = addresses.nextElement();
+                    if (current_addr.isLoopbackAddress()) {
+                        continue;
+                    }
+                    String hostAddress = current_addr.getHostAddress();
+                    if (hostAddress.startsWith("192.168.")) {
+                        return hostAddress;
+                    }
+                }
+            }
+        } catch (SocketException e) {
+            throw new RuntimeException("Could not enumerate ");
+        }
+
+        throw new RuntimeException(
+                "No compatible (192.168.*) ip address found.");
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java b/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
new file mode 100644
index 0000000000..645d9cd0cb
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
@@ -0,0 +1,392 @@
+/*
+ * 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.tb3;
+
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.imageio.ImageIO;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.rules.TestRule;
+import org.junit.rules.TestWatcher;
+import org.openqa.selenium.OutputType;
+import org.openqa.selenium.TakesScreenshot;
+import org.openqa.selenium.remote.DesiredCapabilities;
+
+import com.vaadin.testbench.Parameters;
+import com.vaadin.testbench.commands.TestBenchCommands;
+
+/**
+ * Base class which provides functionality for tests which use the automatic
+ * screenshot comparison function.
+ * 
+ * @author Vaadin Ltd
+ */
+public abstract class ScreenshotTB3Test extends AbstractTB3Test {
+
+    private String screenshotBaseName;
+
+    @Rule
+    public TestRule watcher = new TestWatcher() {
+
+        @Override
+        protected void starting(org.junit.runner.Description description) {
+            Class<?> testClass = description.getTestClass();
+            // Runner adds [BrowserName] which we do not want to use in the
+            // screenshot name
+            String testMethod = description.getMethodName();
+            testMethod = testMethod.replaceAll("\\[.*\\]", "");
+
+            String className = testClass.getSimpleName();
+            if (testClass.getEnclosingClass() != null) {
+                className = testClass.getEnclosingClass().getSimpleName();
+            }
+
+            screenshotBaseName = className + "-" + testMethod;
+        };
+    };
+
+    /**
+     * Contains a list of screenshot identifiers for which
+     * {@link #compareScreen(String)} has failed during the test
+     */
+    private List<String> screenshotFailures = new ArrayList<String>();
+
+    /**
+     * Defines TestBench screen comparison parameters before each test run
+     */
+    @Before
+    public void setupScreenComparisonParameters() {
+        Parameters.setScreenshotErrorDirectory(getScreenshotErrorDirectory());
+        Parameters
+                .setScreenshotReferenceDirectory(getScreenshotReferenceDirectory());
+    }
+
+    /**
+     * Grabs a screenshot and compares with the reference image with the given
+     * identifier. Supports alternative references and will succeed if the
+     * screenshot matches at least one of the references.
+     * 
+     * In case of a failed comparison this method stores the grabbed screenshots
+     * in the error directory as defined by
+     * {@link #getScreenshotErrorDirectory()}. It will also generate a html file
+     * in the same directory, comparing the screenshot with the first found
+     * reference.
+     * 
+     * @param identifier
+     * @throws IOException
+     */
+    protected void compareScreen(String identifier) throws IOException {
+        if (identifier == null || identifier.isEmpty()) {
+            throw new IllegalArgumentException("Empty identifier not supported");
+        }
+
+        File mainReference = getScreenshotReferenceFile(identifier);
+
+        List<File> alternativeFiles = findReferenceAlternatives(mainReference);
+        List<File> failedReferenceAlternatives = new ArrayList<File>();
+
+        for (File file : alternativeFiles) {
+            if (testBench(driver).compareScreen(file)) {
+                break;
+            } else {
+                failedReferenceAlternatives.add(file);
+            }
+        }
+
+        File referenceToKeep = null;
+        if (failedReferenceAlternatives.size() != alternativeFiles.size()) {
+            // Matched one comparison but not all, remove all error images +
+            // HTML files
+        } else {
+            // All comparisons failed, keep the main error image + HTML
+            screenshotFailures.add(mainReference.getName());
+            referenceToKeep = mainReference;
+        }
+
+        // Remove all PNG/HTML files we no longer need (failed alternative
+        // references or all error files (PNG/HTML) if comparison succeeded)
+        for (File failedAlternative : failedReferenceAlternatives) {
+            File failurePng = getErrorFileFromReference(failedAlternative);
+            if (failedAlternative != referenceToKeep) {
+                // Delete png + HTML
+                String htmlFileName = failurePng.getName().replace(".png",
+                        ".html");
+                File failureHtml = new File(failurePng.getParentFile(),
+                        htmlFileName);
+
+                failurePng.delete();
+                failureHtml.delete();
+            }
+        }
+    }
+
+    /**
+     * 
+     * @param referenceFile
+     *            The reference image file (in the directory defined by
+     *            {@link #getScreenshotReferenceDirectory()})
+     * @return the file name of the file generated in the directory defined by
+     *         {@link #getScreenshotErrorDirectory()} if comparison with the
+     *         given reference image fails.
+     */
+    private File getErrorFileFromReference(File referenceFile) {
+        return new File(referenceFile.getAbsolutePath().replace(
+                getScreenshotReferenceDirectory(),
+                getScreenshotErrorDirectory()));
+    }
+
+    /**
+     * Finds alternative references for the given files
+     * 
+     * @param reference
+     * @return all references which should be considered when comparing with the
+     *         given files, including the given reference
+     */
+    private List<File> findReferenceAlternatives(File reference) {
+        List<File> files = new ArrayList<File>();
+        files.add(reference);
+
+        File screenshotDir = reference.getParentFile();
+        String name = reference.getName();
+        // Remove ".png"
+        String nameBase = name.substring(0, name.length() - 4);
+        for (int i = 1;; i++) {
+            File file = new File(screenshotDir, nameBase + "_" + i + ".png");
+            if (file.exists()) {
+                files.add(file);
+            } else {
+                break;
+            }
+        }
+
+        return files;
+    }
+
+    /**
+     * @param testName
+     * @return the reference file name to use for the given browser, as
+     *         described by {@literal capabilities}, and identifier
+     */
+    private File getScreenshotReferenceFile(String identifier) {
+        DesiredCapabilities capabilities = getDesiredCapabilities();
+
+        String originalName = getScreenshotReferenceName(identifier);
+        File exactVersionFile = new File(originalName);
+        if (exactVersionFile.exists()) {
+            return exactVersionFile;
+        }
+
+        String browserVersion = capabilities.getVersion();
+
+        if (browserVersion.matches("\\d+")) {
+            for (int version = Integer.parseInt(browserVersion); version > 0; version--) {
+                String fileName = getScreenshotReferenceName(identifier,
+                        version);
+                File oldVersionFile = new File(fileName);
+                if (oldVersionFile.exists()) {
+                    return oldVersionFile;
+                }
+            }
+        }
+
+        return exactVersionFile;
+    }
+
+    /**
+     * @return the base directory of 'reference' and 'errors' screenshots
+     */
+    protected abstract String getScreenshotDirectory();
+
+    /**
+     * @return the directory where reference images are stored (the 'reference'
+     *         folder inside the screenshot directory)
+     */
+    private String getScreenshotReferenceDirectory() {
+        return getScreenshotDirectory() + "/reference";
+    }
+
+    /**
+     * @return the directory where comparison error images should be created
+     *         (the 'errors' folder inside the screenshot directory)
+     */
+    private String getScreenshotErrorDirectory() {
+        return getScreenshotDirectory() + "/errors";
+    }
+
+    /**
+     * Checks if any screenshot comparisons failures occurred during the test
+     * and combines all comparison errors into one exception
+     * 
+     * @throws IOException
+     *             If there were failures during the test
+     */
+    @After
+    public void checkCompareFailures() throws IOException {
+        if (!screenshotFailures.isEmpty()) {
+            throw new IOException(
+                    "The following screenshots did not match the reference: "
+                            + screenshotFailures.toString());
+        }
+
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * com.vaadin.tests.tb3.AbstractTB3Test#onUncaughtException(java.lang.Throwable
+     * )
+     */
+    @Override
+    public void onUncaughtException(Throwable cause) {
+        super.onUncaughtException(cause);
+        // Grab a "failure" screenshot and store in the errors folder for later
+        // analysis
+        try {
+            TestBenchCommands testBench = testBench();
+            if (testBench != null) {
+                testBench.disableWaitForVaadin();
+            }
+        } catch (Throwable t) {
+            t.printStackTrace();
+        }
+        try {
+            if (driver != null) {
+                BufferedImage screenshotImage = ImageIO
+                        .read(new ByteArrayInputStream(
+                                ((TakesScreenshot) driver)
+                                        .getScreenshotAs(OutputType.BYTES)));
+                ImageIO.write(screenshotImage, "png", new File(
+                        getScreenshotFailureName()));
+            }
+        } catch (Throwable t) {
+            t.printStackTrace();
+        }
+
+    }
+
+    /**
+     * @return the name of a "failure" image which is stored in the folder
+     *         defined by {@link #getScreenshotErrorDirectory()} when the test
+     *         fails
+     */
+    private String getScreenshotFailureName() {
+        return getScreenshotErrorBaseName() + "-failure.png";
+    }
+
+    /**
+     * @return the base name used for screenshots. This is the first part of the
+     *         screenshot file name, typically created as "testclass-testmethod"
+     */
+    public String getScreenshotBaseName() {
+        return screenshotBaseName;
+    }
+
+    /**
+     * Returns the name of the reference file based on the given parameters.
+     * 
+     * @param testName
+     * @param capabilities
+     * @param identifier
+     * @return the full path of the reference
+     */
+    private String getScreenshotReferenceName(String identifier) {
+        return getScreenshotReferenceName(identifier, null);
+    }
+
+    /**
+     * Returns the name of the reference file based on the given parameters. The
+     * version given in {@literal capabilities} is used unless it is overridden
+     * by the {@literal versionOverride} parameter.
+     * 
+     * @param testName
+     * @param capabilities
+     * @param identifier
+     * @return the full path of the reference
+     */
+    private String getScreenshotReferenceName(String identifier,
+            Integer versionOverride) {
+        String uniqueBrowserIdentifier;
+        if (versionOverride == null) {
+            uniqueBrowserIdentifier = BrowserUtil
+                    .getUniqueIdentifier(getDesiredCapabilities());
+        } else {
+            uniqueBrowserIdentifier = BrowserUtil.getUniqueIdentifier(
+                    getDesiredCapabilities(), "" + versionOverride);
+        }
+
+        // WindowMaximizeRestoreTest_Windows_InternetExplorer_8_window-1-moved-maximized-restored.png
+        return getScreenshotReferenceDirectory() + "/"
+                + getScreenshotBaseName() + "_" + uniqueBrowserIdentifier + "_"
+                + identifier + ".png";
+    }
+
+    /**
+     * Returns the base name of the screenshot in the error directory. This is a
+     * name so that all files matching {@link #getScreenshotErrorBaseName()}*
+     * are owned by this test instance (taking into account
+     * {@link #getDesiredCapabilities()}) and can safely be removed before
+     * running this test.
+     */
+    private String getScreenshotErrorBaseName() {
+        return getScreenshotReferenceName("dummy", null).replace(
+                getScreenshotReferenceDirectory(),
+                getScreenshotErrorDirectory()).replace("_dummy.png", "");
+    }
+
+    /**
+     * Removes any old screenshots related to this test from the errors
+     * directory before running the test
+     */
+    @Before
+    public void cleanErrorDirectory() {
+        // Remove any screenshots for this test from the error directory
+        // before running it. Leave unrelated files as-is
+        File errorDirectory = new File(getScreenshotErrorDirectory());
+
+        // Create errors directory if it does not exist
+        if (!errorDirectory.exists()) {
+            errorDirectory.mkdirs();
+        }
+
+        final String errorBase = getScreenshotErrorBaseName()
+                .replace("\\", "/");
+        File[] files = errorDirectory.listFiles(new FileFilter() {
+
+            @Override
+            public boolean accept(File pathname) {
+                String thisFile = pathname.getAbsolutePath().replace("\\", "/");
+                if (thisFile.startsWith(errorBase)) {
+                    return true;
+                }
+                return false;
+            }
+        });
+        for (File f : files) {
+            f.delete();
+        }
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/tb3/SimpleMultiBrowserTest.java b/uitest/src/com/vaadin/tests/tb3/SimpleMultiBrowserTest.java
new file mode 100644
index 0000000000..a7ade3f9f7
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/tb3/SimpleMultiBrowserTest.java
@@ -0,0 +1,49 @@
+/*
+ * 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.tb3;
+
+import org.junit.Test;
+
+/**
+ * A simple version of {@link MultiBrowserTest} which allows only one test
+ * method ({@link #test()}). Uses only the enclosing class name as test
+ * identifier (i.e. excludes "-test").
+ * 
+ * This class is only provided as a helper for converting existing TB2 tests
+ * without renaming all screenshots. All new TB3+ tests should extend
+ * {@link MultiBrowserTest} directly instead of this.
+ * 
+ * @author Vaadin Ltd
+ */
+public abstract class SimpleMultiBrowserTest extends MultiBrowserTest {
+
+    @Test
+    public abstract void test() throws Exception;
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.tb3.ScreenshotTB3Test#getScreenshotBaseName()
+     */
+    @Override
+    public String getScreenshotBaseName() {
+        return super.getScreenshotBaseName().replaceFirst("-test$", "");
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/tb3/TB3Runner.java b/uitest/src/com/vaadin/tests/tb3/TB3Runner.java
new file mode 100644
index 0000000000..510d200ffa
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/tb3/TB3Runner.java
@@ -0,0 +1,167 @@
+/*
+ * 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.tb3;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.InitializationError;
+import org.junit.runners.model.Statement;
+import org.openqa.selenium.remote.DesiredCapabilities;
+
+import com.vaadin.tests.tb3.AbstractTB3Test.BrowserUtil;
+
+/**
+ * This runner is loosely based on FactoryTestRunner by Ted Young
+ * (http://tedyoung.me/2011/01/23/junit-runtime-tests-custom-runners/). The
+ * generated test names give information about the parameters used (unlike
+ * {@link Parameterized}).
+ * 
+ * @since 7.1
+ */
+public class TB3Runner extends BlockJUnit4ClassRunner {
+
+    public TB3Runner(Class<?> klass) throws InitializationError {
+        super(klass);
+        setScheduler(new ParallelScheduler());
+    }
+
+    @Override
+    protected List<FrameworkMethod> computeTestMethods() {
+        List<FrameworkMethod> tests = new LinkedList<FrameworkMethod>();
+
+        // Find all methods in our test class marked with @Parameters.
+        for (FrameworkMethod method : getTestClass().getAnnotatedMethods(
+                Parameters.class)) {
+            // Make sure the Parameters method is static
+            if (!Modifier.isStatic(method.getMethod().getModifiers())) {
+                throw new IllegalArgumentException("@Parameters " + method
+                        + " must be static.");
+            }
+
+            // Execute the method (statically)
+            Object params;
+            try {
+                params = method.getMethod().invoke(
+                        getTestClass().getJavaClass());
+            } catch (Throwable t) {
+                throw new RuntimeException("Could not run test factory method "
+                        + method.getName(), t);
+            }
+
+            // Did the factory return an array? If so, make it a list.
+            if (params.getClass().isArray()) {
+                params = Arrays.asList((Object[]) params);
+            }
+
+            // Did the factory return a scalar object? If so, put it in a list.
+            if (!(params instanceof Iterable<?>)) {
+                params = Collections.singletonList(params);
+            }
+
+            // For each object returned by the factory.
+            for (Object param : (Iterable<?>) params) {
+                if (!(param instanceof DesiredCapabilities)) {
+                    throw new RuntimeException("Unexpected parameter type "
+                            + param.getClass().getName()
+                            + " when expecting DesiredCapabilities");
+                }
+                DesiredCapabilities capabilities = (DesiredCapabilities) param;
+                // Find any methods marked with @Test.
+                for (FrameworkMethod m : getTestClass().getAnnotatedMethods(
+                        Test.class)) {
+                    tests.add(new TB3Method(m.getMethod(), capabilities));
+                }
+            }
+        }
+
+        return tests;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * org.junit.runners.BlockJUnit4ClassRunner#withBefores(org.junit.runners
+     * .model.FrameworkMethod, java.lang.Object,
+     * org.junit.runners.model.Statement)
+     */
+    @Override
+    protected Statement withBefores(final FrameworkMethod method,
+            final Object target, Statement statement) {
+        if (!(method instanceof TB3Method)) {
+            throw new RuntimeException("Unexpected method type "
+                    + method.getClass().getName() + ", expected TB3Method");
+        }
+        final TB3Method tb3method = (TB3Method) method;
+
+        // setDesiredCapabilities before running the real @Befores (which use
+        // capabilities)
+
+        final Statement realBefores = super.withBefores(method, target,
+                statement);
+        return new Statement() {
+
+            @Override
+            public void evaluate() throws Throwable {
+                ((AbstractTB3Test) target)
+                        .setDesiredCapabilities(tb3method.capabilities);
+                try {
+                    realBefores.evaluate();
+                } catch (Throwable t) {
+                    // Give the test a chance to e.g. produce an error
+                    // screenshot before failing the test by re-throwing the
+                    // exception
+                    ((AbstractTB3Test) target).onUncaughtException(t);
+                    throw t;
+                }
+            }
+        };
+    }
+
+    private static class TB3Method extends FrameworkMethod {
+        private DesiredCapabilities capabilities;
+
+        public TB3Method(Method method, DesiredCapabilities capabilities) {
+            super(method);
+            this.capabilities = capabilities;
+        }
+
+        @Override
+        public Object invokeExplosively(final Object target, Object... params)
+                throws Throwable {
+            // Executes the test method with the supplied parameters
+            return super.invokeExplosively(target);
+        }
+
+        @Override
+        public String getName() {
+            return String.format("%s[%s]", getMethod().getName(),
+                    BrowserUtil.getUniqueIdentifier(capabilities));
+        }
+
+    }
+}
-- 
cgit v1.2.3


From 6b17abed4cbf3aff19efd58c5f3ca6195972f39e Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 23 Sep 2013 15:46:20 +0300
Subject: Make it possible to override web driver in tests (#12572)

Change-Id: If696c8a57fc370d2851592d745ab8a2698631ed5
---
 .../src/com/vaadin/tests/tb3/AbstractTB3Test.java  | 35 +++++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
index f27fff5873..966be1a692 100644
--- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -72,13 +72,36 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
      * Connect to the hub using a remote web driver, set the canvas size and
      * opens the initial URL as specified by {@link #getTestUrl()}
      * 
-     * @throws MalformedURLException
+     * @throws Exception
      */
     @Before
-    public void setup() throws MalformedURLException {
+    public void setup() throws Exception {
+        setupDriver();
+
+        String testUrl = getTestUrl();
+        if (testUrl != null) {
+            driver.get(testUrl);
+        }
+    }
+
+    /**
+     * Creates and configure the web driver to be used for the test. By default
+     * creates a remote web driver which connects to {@link #getHubURL()} and
+     * selects a browser based on {@link #getDesiredCapabilities()}.
+     * 
+     * This method MUST call {@link #setDriver(WebDriver)} with the newly
+     * generated driver.
+     * 
+     * @throws Exception
+     *             If something goes wrong
+     */
+    protected void setupDriver() throws Exception {
         DesiredCapabilities capabilities = getDesiredCapabilities();
-        driver = TestBench.createDriver(new RemoteWebDriver(
-                new URL(getHubURL()), capabilities));
+
+        WebDriver dr = TestBench.createDriver(new RemoteWebDriver(new URL(
+                getHubURL()), capabilities));
+        setDriver(dr);
+
         int w = SCREENSHOT_WIDTH;
         int h = SCREENSHOT_HEIGHT;
 
@@ -93,10 +116,6 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
             // Opera does not support this...
         }
 
-        String testUrl = getTestUrl();
-        if (testUrl != null) {
-            driver.get(testUrl);
-        }
     }
 
     /**
-- 
cgit v1.2.3


From a682e3b5341e5cf21e84c1dbbb2bc98743674392 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 16 Sep 2013 14:31:37 +0300
Subject: Refactored build scripts to support TB2, TB3 + integration tests
 (#12572)

* Main build configuration triggers unit tests for all modules and uitest/build.xml testbench tests in parallel
* uitest/build.xml triggers Jetty startup and integration (server) tests in parallel. After the server has started, TB2 and TB3 tests are run in parallel.
* Server integration tests for servlet containers are run using TB3 and the com.vaadin.tests.tb3.ServletIntegrationTests test suite.
* Portlet integration tests are still run using TB2 test scripts

Change-Id: Ie6bffd4e68b4889074e9c470faa3c65f923e55c4
---
 build.xml                                         |  15 +-
 uitest/build.xml                                  |  55 ++++++
 uitest/integration_tests.xml                      |  91 ++++-----
 uitest/src/com/vaadin/tests/tb3/AllTB3Tests.java  |  42 ++++
 uitest/src/com/vaadin/tests/tb3/TB3TestSuite.java | 223 ++++++++++++++++++++++
 uitest/tb3test.xml                                |  33 ++++
 uitest/test.xml                                   |  21 +-
 7 files changed, 411 insertions(+), 69 deletions(-)
 create mode 100644 uitest/src/com/vaadin/tests/tb3/AllTB3Tests.java
 create mode 100644 uitest/src/com/vaadin/tests/tb3/TB3TestSuite.java
 create mode 100644 uitest/tb3test.xml

(limited to 'uitest')

diff --git a/build.xml b/build.xml
index 5f748d8f40..bef7f7a2f3 100644
--- a/build.xml
+++ b/build.xml
@@ -43,19 +43,16 @@
     <target name="test" depends="buildorder">
         <subant buildpathref="build-path" target="test" />
     </target>
+
     <target name="test-all" depends="buildorder">
         <property name="war.file" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" />
+
         <parallel>
-            <sequential>
-                <!-- Sleep before running integration tests so testbench 
-                    tests have time to compile and start -->
-                <sleep minutes="4" />
-                <ant antfile="uitest/integration_tests.xml" target="integration-test-all" inheritall="false" inheritrefs="false">
-                    <property name="demo.war" value="${war.file}" />
-                </ant>
-            </sequential>
+            <!-- JUnit tests, can be run without a server -->
             <subant buildpathref="build-path" target="test" />
-            <ant antfile="uitest/test.xml" target="test-package">
+
+            <!-- Server deployment + TestBench tests  -->
+            <ant antfile="uitest/build.xml" target="test-testbench">
                 <property name="war.file" location="${war.file}" />
             </ant>
         </parallel>
diff --git a/uitest/build.xml b/uitest/build.xml
index bd0f49ae1e..76b75e9203 100644
--- a/uitest/build.xml
+++ b/uitest/build.xml
@@ -9,6 +9,7 @@
 
     <!-- global properties -->
     <property name="module.name" value="vaadin-uitest" />
+    <property name="uitest.dir" location="${vaadin.basedir}/uitest" />
     <property name="result.dir" value="result" />
     <property name="result.war" location="${result.dir}/lib/${module.name}-${vaadin.version}.war" />
 
@@ -107,6 +108,11 @@
             <path refid="classpath.runtime.dependencies" />
         </copy>
 
+        <delete>
+            <!-- Avoid including some potentially conflicting jars in the war -->
+            <fileset dir="${deps.dir}" includes="jetty-*.jar" />
+            <fileset dir="${deps.dir}" includes="servlet-api-*.jar" />
+        </delete>
 
         <!-- Ensure filtered webcontent files are available -->
         <antcall target="common.filter.webcontent" />
@@ -148,4 +154,53 @@
         <echo>WHAT? No JUnit tests for ${module.name}!</echo>
     </target>
 
+    <target name="test-testbench" depends="clean-testbench-errors" description="Run all TestBench based tests, including server tests">
+        <parallel>
+            <daemons>
+                <!-- Start server -->
+                <ant antfile="${uitest.dir}/vaadin-server.xml" inheritall="true" inheritrefs="true" target="deploy-and-start" />
+            </daemons>
+            <sequential>
+                <!-- Server tests -->
+
+                <!-- Sleep before running integration tests so testbench 2 
+                        tests have time to compile and start -->
+                <sleep minutes="4" />
+                <ant antfile="${uitest.dir}/integration_tests.xml" target="integration-test-all" inheritall="false" inheritrefs="false">
+                    <property name="demo.war" value="${war.file}" />
+                </ant>
+            </sequential>
+            <sequential>
+                <!-- Wait for server to start -->
+                <ant antfile="${uitest.dir}/vaadin-server.xml" target="wait-for-startup" />
+
+                <!-- Run all different kinds of TestBench tests in parallel -->
+                <parallel>
+
+                    <!-- Legacy TestBench 2 tests -->
+                    <sequential>
+                        <ant antfile="${uitest.dir}/test.xml" target="tb2-tests" />
+                        <echo message="TestBench 2 tests complete" />
+                    </sequential>
+
+                    <!-- TestBench 3 tests -->
+                    <sequential>
+                        <ant antfile="${uitest.dir}/tb3test.xml" target="run-all-tb3-tests" inheritall="true" />
+                        <echo message="TestBench 3 tests complete" />
+                    </sequential>
+                </parallel>
+            </sequential>
+        </parallel>
+    </target>
+
+    <target name="clean-testbench-errors">
+        <fail unless="com.vaadin.testbench.screenshot.directory" message="Define screenshot directory using -Dcom.vaadin.testbench.screenshot.directory" />
+        <mkdir dir="${com.vaadin.testbench.screenshot.directory}/errors" />
+        <delete>
+            <fileset dir="${com.vaadin.testbench.screenshot.directory}/errors">
+                <include name="*" />
+            </fileset>
+        </delete>
+    </target>
+
 </project>
diff --git a/uitest/integration_tests.xml b/uitest/integration_tests.xml
index 78e053991e..f1b2070bc8 100644
--- a/uitest/integration_tests.xml
+++ b/uitest/integration_tests.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<project xmlns:antcontrib="antlib:net.sf.antcontrib" name="Vaadin Integration Tests" basedir="." default="integration-test-all">
+<project xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:ivy="antlib:org.apache.ivy.ant" name="Vaadin Integration Tests" basedir="." default="integration-test-all">
 
     <!-- Import common targets -->
     <import file="../common.xml" />
@@ -32,33 +32,22 @@
     <property name="user" value="${test.integration.user}" />
     <property name="passphrase" value="" />
 
+    <ivy:resolve file="ivy.xml" conf="build, build-provided" />
+    <ivy:cachepath pathid="classpath.tb3.lib" conf="build, build-provided" />
+    <path id="classpath.tb3">
+        <path refid="classpath.tb3.lib" />
+        <path location="result/classes" />
+    </path>
+
     <!-- Upload war to deploy to ssh host -->
     <target name="integration-test-upload-demo">
         <scp file="${demo.war}" todir="${user}@${test.integration.server}:integration-tests/servers/demo.war" keyfile="${sshkey.file}" passphrase="${passphrase}" />
     </target>
 
     <!-- Run basic integration test test -->
-    <target name="integration-test-servlet">
-        <fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-servlet.html" />
-        <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
-        <subant target="run-tests" failonerror="false" antfile="test.xml">
-            <property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />
-            <property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />
-            <property name="com.vaadin.testbench.deployment.url" value="${deployment.url}" />
-            <property name="server.start.succeeded" value="1" />
-            <property name="browsers" value="${test_browsers}" />
-            <property name="testfiles" value="${testfiles}" />
-            <property name="test-output-dir" value="${integration_test.dir}/result/integration-test-output/${server-name}" />
-            <property name="retries" value="0" />
-
-            <fileset dir="." includes="test.xml" />
-        </subant>
-    </target>
-
-    <target name="integration-test-push-servlet">
-        <fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-push-servlet.html" />
-        <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
-        <subant target="run-tests" failonerror="false" antfile="test.xml">
+    <target name="legacy-integration-test">
+        <fail unless="testfiles" message="You need to specify the files to run using the 'testfiles' property" />
+        <subant target="run-tb2-tests" failonerror="false" antfile="test.xml">
             <property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />
             <property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />
             <property name="com.vaadin.testbench.deployment.url" value="${deployment.url}" />
@@ -73,7 +62,7 @@
     </target>
 
     <target name="integration-test-theme">
-        <subant target="run-tests" failonerror="false" antfile="test.xml">
+        <subant target="run-tb2-tests" failonerror="false" antfile="test.xml">
             <property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />
             <property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />
             <property name="com.vaadin.testbench.deployment.url" value="${deployment.url}" />
@@ -90,7 +79,7 @@
         <fileset dir="integration-testscripts" id="html-test-files" includes="GoogleAppEngine/integration-test-GAE.html" />
         <pathconvert pathsep=" " property="test-GAE" refid="html-test-files" />
 
-        <subant target="run-tests" failonerror="false" antfile="test.xml">
+        <subant target="run-tb2-tests" failonerror="false" antfile="test.xml">
             <property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />
             <property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />
             <property name="com.vaadin.testbench.deployment.url" value="http://vaadin-integration-test.appspot.com/" />
@@ -107,6 +96,27 @@
         <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} deploy-to-GAE" />
     </target>
 
+    <target name="run-tb3-servlet-test">
+        <antcall target="run-tb3-test" inheritall="true">
+            <param name="junit.test.suite" value="com.vaadin.tests.tb3.ServletIntegrationTests" />
+        </antcall>
+    </target>
+    <target name="run-tb3-test">
+        <fail unless="server-name" message="Server name must be defined in server-name" />
+        <fail unless="deployment.url" message="Deplyoment url must be defined in deployment.url" />
+        <fail unless="com.vaadin.testbench.screenshot.directory" message="Screenshot directory must be defined in com.vaadin.testbench.screenshot.directory" />
+
+        <junit printsummary="withOutAndErr" fork="yes">
+            <formatter usefile="false" type="plain" />
+            <classpath refid="classpath.tb3" />
+
+            <jvmarg value="-Dcom.vaadin.testbench.screenshot.directory=${com.vaadin.testbench.screenshot.directory}" />
+            <jvmarg value="-Ddeployment.url=${deployment.url}" />
+            <jvmarg value="-Dserver-name=${server-name}" />
+            <jvmarg value="-Djava.awt.headless=true" />
+            <test name="${junit.test.suite}" />
+        </junit>
+    </target>
 
     <target name="integration-test-tomcat7">
         <antcall target="run-generic-integration-test">
@@ -333,7 +343,7 @@
 
     <!-- Upload demo, clean error screenshots and test deployment on all 
         servers -->
-    <target name="integration-test-all">
+    <target name="integration-test-all" unless="tests.integration.skip">
         <property name="passphrase" value="${passphrase}" />
         <fail unless="sshkey.file" message="You must define an ssh.keyfile parameter" />
         <fail unless="com.vaadin.testbench.screenshot.directory" message="You must define a com.vaadin.testbench.screenshot.directory parameter" />
@@ -341,7 +351,8 @@
             <antcontrib:trycatch property="tried">
                 <try>
                     <!-- Still running GAE test from the old server which 
-                        requires its own lock -->
+                    requires its own lock -->
+
                     <echo message="Getting lock" />
                     <antcall target="integration-test-get-lock" />
                     <echo message="Got lock" />
@@ -387,7 +398,6 @@
             <antcall target="integration-test-tomcat6" />
             <antcall target="integration-test-tomcat7" />
             <antcall target="integration-test-websphere8" />
-
         </parallel>
 
     </target>
@@ -446,31 +456,24 @@
                     </condition>
                 </fail>
 
-                <copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-${target-server}-servlet.html" overwrite="true" />
-                <antcall target="integration-test-servlet">
-                    <param name="server-name" value="${target-server}" />
-                    <param name="deployment.url" value="http://${target-host}:${target-port}" />
-                </antcall>
-
-                <!-- Run theme tests in all browsers if there's a property 
-                    with the test files -->
                 <antcontrib:if>
-                    <isset property="testfiles-theme" />
+                    <isset property="testfiles" />
                     <antcontrib:then>
-                        <antcall target="integration-test-theme">
+                        <echo>Starting legacy (TB2) test for ${target-server}</echo>
+                        <antcall target="legacy-integration-test">
                             <param name="server-name" value="${target-server}" />
                             <param name="deployment.url" value="http://${target-host}:${target-port}" />
                         </antcall>
                     </antcontrib:then>
+                    <antcontrib:else>
+                        <echo>Starting TB3 test for ${target-server}</echo>
+                        <antcall target="run-tb3-servlet-test">
+                            <param name="server-name" value="${target-server}" />
+                            <param name="deployment.url" value="http://${target-host}:${target-port}" />
+                        </antcall>
+                    </antcontrib:else>
                 </antcontrib:if>
 
-                <!-- Run integration tests with push -->
-                <copy file="integration-testscripts/common/integration_push_test.tpl" tofile="integration-testscripts/integration-test-${target-server}-push-servlet.html" overwrite="true" />
-                <antcall target="integration-test-push-servlet">
-                    <param name="server-name" value="${target-server}" />
-                    <param name="deployment.url" value="http://${target-host}:${target-port}" />
-                </antcall>
-
                 <!-- Run theme tests in all browsers if there's a property 
                     with the test files -->
                 <antcontrib:if>
diff --git a/uitest/src/com/vaadin/tests/tb3/AllTB3Tests.java b/uitest/src/com/vaadin/tests/tb3/AllTB3Tests.java
new file mode 100644
index 0000000000..bd9027bec2
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/tb3/AllTB3Tests.java
@@ -0,0 +1,42 @@
+/*
+ * 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.tb3;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.model.InitializationError;
+
+import com.vaadin.tests.tb3.AllTB3Tests.AllTB3TestsSuite;
+
+/**
+ * Test consisting of all TB3 tests except integration tests (classes extending
+ * AbstractTB3Test, excludes package com.vaadin.test.integration).
+ * 
+ * @author Vaadin Ltd
+ */
+@RunWith(AllTB3TestsSuite.class)
+public class AllTB3Tests {
+
+    public static class AllTB3TestsSuite extends TB3TestSuite {
+
+        public AllTB3TestsSuite(Class<?> klass) throws InitializationError {
+            super(klass, AbstractTB3Test.class, "com.vaadin.tests",
+                    new String[] { "com.vaadin.tests.integration" });
+        }
+
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/tb3/TB3TestSuite.java b/uitest/src/com/vaadin/tests/tb3/TB3TestSuite.java
new file mode 100644
index 0000000000..dc187000d2
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/tb3/TB3TestSuite.java
@@ -0,0 +1,223 @@
+/*
+ * 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.tb3;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Modifier;
+import java.net.JarURLConnection;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.jar.JarEntry;
+
+import org.junit.runners.Suite;
+import org.junit.runners.model.InitializationError;
+
+/**
+ * Test suite which consists of all the TB3 tests passed in the constructor.
+ * Runs the tests in parallel using a {@link ParallelScheduler}
+ * 
+ * @author Vaadin Ltd
+ */
+public class TB3TestSuite extends Suite {
+
+    public TB3TestSuite(Class<?> klass,
+            Class<? extends AbstractTB3Test> baseClass, String basePackage,
+            String[] ignorePackages) throws InitializationError {
+        super(klass, findTests(baseClass, basePackage, ignorePackages));
+        setScheduler(new ParallelScheduler());
+    }
+
+    /**
+     * Traverses the directory on the classpath (inside or outside a Jar file)
+     * specified by 'basePackage'. Collects all classes inside the location
+     * which can be assigned to 'baseClass' except for classes inside packages
+     * listed in 'ignoredPackages'.
+     * 
+     * @param baseClass
+     * @param basePackage
+     * @param ignorePackages
+     * @return
+     */
+    private static Class<?>[] findTests(
+            Class<? extends AbstractTB3Test> baseClass, String basePackage,
+            String[] ignorePackages) {
+        try {
+            List<?> l = findClasses(baseClass, basePackage, ignorePackages);
+            return l.toArray(new Class[] {});
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * Traverses the directory on the classpath (inside or outside a Jar file)
+     * specified by 'basePackage'. Collects all classes inside the location
+     * which can be assigned to 'baseClass' except for classes inside packages
+     * listed in 'ignoredPackages'.
+     * 
+     * @param baseClass
+     * @param basePackage
+     * @param ignoredPackages
+     * @return
+     * @throws IOException
+     */
+    private static <T> List<Class<? extends T>> findClasses(Class<T> baseClass,
+            String basePackage, String[] ignoredPackages) throws IOException {
+        List<Class<? extends T>> classes = new ArrayList<Class<? extends T>>();
+        String basePackageDirName = "/" + basePackage.replace('.', '/');
+        URL location = baseClass.getResource(basePackageDirName);
+        if (location.getProtocol().equals("file")) {
+            try {
+                File f = new File(location.toURI());
+                if (!f.exists()) {
+                    throw new IOException("Directory " + f.toString()
+                            + " does not exist");
+                }
+                findPackages(f, basePackage, baseClass, classes,
+                        ignoredPackages);
+            } catch (URISyntaxException e) {
+                throw new IOException(e.getMessage());
+            }
+        } else if (location.getProtocol().equals("jar")) {
+            JarURLConnection juc = (JarURLConnection) location.openConnection();
+            findClassesInJar(juc, basePackage, baseClass, classes);
+        }
+
+        Collections.sort(classes, new Comparator<Class<? extends T>>() {
+
+            @Override
+            public int compare(Class<? extends T> o1, Class<? extends T> o2) {
+                return o1.getName().compareTo(o2.getName());
+            }
+
+        });
+        return classes;
+    }
+
+    /**
+     * Traverses the given directory and collects all classes which are inside
+     * the given 'javaPackage' and can be assigned to the given 'baseClass'. The
+     * found classes are added to 'result'.
+     * 
+     * @param parent
+     *            The directory to traverse
+     * @param javaPackage
+     *            The java package which 'parent' contains
+     * @param baseClass
+     *            The class which the target classes extend
+     * @param result
+     *            The collection to which found classes are added
+     * @param ignoredPackages
+     *            A collection of packages (including sub packages) to ignore
+     */
+    private static <T> void findPackages(File parent, String javaPackage,
+            Class<T> baseClass, Collection<Class<? extends T>> result,
+            String[] ignoredPackages) {
+        for (String ignoredPackage : ignoredPackages) {
+            if (javaPackage.equals(ignoredPackage)) {
+                return;
+            }
+        }
+
+        for (File file : parent.listFiles()) {
+            if (file.isDirectory()) {
+                findPackages(file, javaPackage + "." + file.getName(),
+                        baseClass, result, ignoredPackages);
+            } else if (file.getName().endsWith(".class")) {
+                String fullyQualifiedClassName = javaPackage + "."
+                        + file.getName().replace(".class", "");
+                addClassIfMatches(result, fullyQualifiedClassName, baseClass);
+            }
+        }
+
+    }
+
+    /**
+     * Traverses a Jar file using the given connection and collects all classes
+     * which are inside the given 'javaPackage' and can be assigned to the given
+     * 'baseClass'. The found classes are added to 'result'.
+     * 
+     * @param javaPackage
+     *            The java package containing the classes (classes may be in a
+     *            sub package)
+     * @param baseClass
+     *            The class which the target classes extend
+     * @param result
+     *            The collection to which found classes are added
+     * @throws IOException
+     */
+    private static <T> void findClassesInJar(JarURLConnection juc,
+            String javaPackage, Class<T> baseClass,
+            Collection<Class<? extends T>> result) throws IOException {
+        String javaPackageDir = javaPackage.replace('.', '/');
+        Enumeration<JarEntry> ent = juc.getJarFile().entries();
+        while (ent.hasMoreElements()) {
+            JarEntry e = ent.nextElement();
+            if (e.getName().endsWith(".class")
+                    && e.getName().startsWith(javaPackageDir)) {
+                String fullyQualifiedClassName = e.getName().replace('/', '.')
+                        .replace(".class", "");
+                addClassIfMatches(result, fullyQualifiedClassName, baseClass);
+            }
+        }
+    }
+
+    /**
+     * Verifies that the class represented by 'fullyQualifiedClassName' can be
+     * loaded, assigned to 'baseClass' and is not an abstract or anonymous
+     * class.
+     * 
+     * @param result
+     *            The collection to add to
+     * @param fullyQualifiedClassName
+     *            The candidate class
+     * @param baseClass
+     *            The class 'fullyQualifiedClassName' should be assignable to
+     */
+    @SuppressWarnings("unchecked")
+    private static <T> void addClassIfMatches(
+            Collection<Class<? extends T>> result,
+            String fullyQualifiedClassName, Class<T> baseClass) {
+        try {
+            // Try to load the class
+
+            Class<?> c = Class.forName(fullyQualifiedClassName);
+            if (!baseClass.isAssignableFrom(c)) {
+                return;
+            }
+            if (!Modifier.isAbstract(c.getModifiers()) && !c.isAnonymousClass()) {
+                result.add((Class<? extends T>) c);
+            }
+        } catch (Exception e) {
+            // Could ignore that class cannot be loaded
+            e.printStackTrace();
+        } catch (LinkageError e) {
+            // Ignore. Client side classes will at least throw LinkageErrors
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/uitest/tb3test.xml b/uitest/tb3test.xml
new file mode 100644
index 0000000000..92008ff9f3
--- /dev/null
+++ b/uitest/tb3test.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<project name="tb3test" xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:ivy="antlib:org.apache.ivy.ant" basedir=".">
+
+    <dirname property="tb3test.dir" file="${ant.file.tb3test}" />
+
+    <ivy:resolve file="${tb3test.dir}/ivy.xml" conf="build, build-provided" />
+    <ivy:cachepath pathid="classpath.tb3.lib" conf="build, build-provided" />
+    <path id="classpath.tb3">
+        <path refid="classpath.tb3.lib" />
+        <path location="${tb3test.dir}/result/classes" />
+    </path>
+
+    <target name="run-all-tb3-tests" description="Run all the TB3 tests (except server tests) in the project">
+        <antcall target="run-tb3-suite">
+            <param name="junit.test.suite" value="com.vaadin.tests.tb3.AllTB3Tests" />
+        </antcall>
+    </target>
+
+    <target name="run-tb3-suite">
+        <fail unless="junit.test.suite" message="Define suite to run using junit.test.suite" />
+        <fail unless="com.vaadin.testbench.screenshot.directory" message="Define screenshot directory using -Dcom.vaadin.testbench.screenshot.directory" />
+        <junit printsummary="withOutAndErr" fork="yes">
+            <formatter usefile="false" type="plain" />
+            <classpath refid="classpath.tb3" />
+
+            <jvmarg value="-Dcom.vaadin.testbench.screenshot.directory=${com.vaadin.testbench.screenshot.directory}" />
+            <jvmarg value="-Djava.awt.headless=true" />
+            <test name="${junit.test.suite}" />
+        </junit>
+
+    </target>
+
+</project>
diff --git a/uitest/test.xml b/uitest/test.xml
index 3baccb4117..dd6964e59c 100644
--- a/uitest/test.xml
+++ b/uitest/test.xml
@@ -83,7 +83,7 @@
         <fail unless="com.vaadin.testbench.deployment.url" message="The 'com.vaadin.testbench.deployment.url' property must be defined." />
     </target>
 
-    <target name="run-tests" depends="compile-tests">
+    <target name="run-tb2-tests" depends="check-parameters,compile-tests">
         <fileset dir="${test-output-dir}" id="tests-fileset">
             <include name="**/**.java" />
         </fileset>
@@ -161,12 +161,10 @@
     <!-- ================================================================== -->
 
     <!-- The default target. -->
-    <target name="run-and-clean-up" depends="check-parameters,remove-error-screens,run-tests" />
+    <target name="run-and-clean-up" depends="check-parameters,remove-error-screens,run-tb2-tests" />
 
-
-    <!-- Starts the server and runs all TestBench tests -->
-    <target name="test-package">
-        <fail unless="war.file" message="No 'war.file' parameter given." />
+    <!-- Runs all TestBench 2 tests -->
+    <target name="tb2-tests">
         <property name="test-output-dir" location="${test.xml.dir}/result/testbench-junit-classes" />
         <property name="retries" value="2" />
 
@@ -177,15 +175,6 @@
         <property name="com.vaadin.testbench.screenshot.block.error" value="0.025" />
         <property name="com.vaadin.testbench.debug" value="false" />
 
-        <parallel>
-            <daemons>
-                <ant antfile="${test.xml.dir}/vaadin-server.xml" inheritall="true" inheritrefs="true" target="deploy-and-start" />
-            </daemons>
-            <sequential>
-                <ant antfile="${test.xml.dir}/vaadin-server.xml" target="wait-for-startup" />
-                <antcall inheritall="true" inheritrefs="true" target="run-and-clean-up" />
-                <echo message="All TestBench tests have been run" />
-            </sequential>
-        </parallel>
+        <antcall inheritall="true" inheritrefs="true" target="run-tb2-tests" />
     </target>
 </project>
-- 
cgit v1.2.3


From e5566429bf0dfb7e9a85148a152cee0445bd40f9 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 16 Sep 2013 14:37:20 +0300
Subject: Converted servlet integration tests to TB3 (#12573)

Change-Id: I964be2ef805875f36a2f0f8139feaa353c9aaee0
---
 .../integration/AbstractIntegrationTestTB3.java    | 53 ++++++++++++++++++
 .../tests/integration/IntegrationTestRunner.java   | 54 +++++++++++++++++++
 .../integration/IntegrationTestStreaming.java      | 35 ++++++++++++
 .../tests/integration/IntegrationTestUI.java       |  5 ++
 .../integration/IntegrationTestWebsocket.java      | 49 +++++++++++++++++
 .../integration/ServletIntegrationTestTB3.java     | 62 ++++++++++++++++++++++
 .../src/com/vaadin/tests/tb3/AbstractTB3Test.java  | 10 ++--
 .../vaadin/tests/tb3/ServletIntegrationTests.java  | 35 ++++++++++++
 8 files changed, 298 insertions(+), 5 deletions(-)
 create mode 100644 uitest/src/com/vaadin/tests/integration/AbstractIntegrationTestTB3.java
 create mode 100644 uitest/src/com/vaadin/tests/integration/IntegrationTestRunner.java
 create mode 100644 uitest/src/com/vaadin/tests/integration/IntegrationTestStreaming.java
 create mode 100644 uitest/src/com/vaadin/tests/integration/IntegrationTestWebsocket.java
 create mode 100644 uitest/src/com/vaadin/tests/integration/ServletIntegrationTestTB3.java
 create mode 100644 uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTestTB3.java b/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTestTB3.java
new file mode 100644
index 0000000000..e170450619
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTestTB3.java
@@ -0,0 +1,53 @@
+/*
+ * 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.integration;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized.Parameters;
+import org.openqa.selenium.remote.DesiredCapabilities;
+
+import com.vaadin.tests.tb3.PrivateTB3Configuration;
+
+/**
+ * Base class for integration tests. Integration tests use the
+ * {@literal deployment.url} parameter to determine the base deployment url
+ * (http://hostname:123)
+ * 
+ * @author Vaadin Ltd
+ */
+@RunWith(IntegrationTestRunner.class)
+public abstract class AbstractIntegrationTestTB3 extends
+        PrivateTB3Configuration {
+    @Override
+    protected String getBaseURL() {
+        String deploymentUrl = System.getProperty("deployment.url");
+        if (deploymentUrl == null || deploymentUrl.equals("")) {
+            throw new RuntimeException(
+                    "Deployment url must be given as deployment.url");
+        }
+
+        return deploymentUrl;
+    }
+
+    @Parameters
+    public static Collection<DesiredCapabilities> getBrowsersForTest() {
+        return Collections.singleton(BrowserUtil.firefox(17));
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/integration/IntegrationTestRunner.java b/uitest/src/com/vaadin/tests/integration/IntegrationTestRunner.java
new file mode 100644
index 0000000000..29ee4e6023
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/integration/IntegrationTestRunner.java
@@ -0,0 +1,54 @@
+/*
+ * 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.integration;
+
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.InitializationError;
+
+import com.vaadin.tests.tb3.TB3Runner;
+
+/**
+ * JUnit runner for integration tests. Replaces the actual method name with the
+ * server-name property when generating the test name.
+ * 
+ * @author Vaadin Ltd
+ */
+public class IntegrationTestRunner extends TB3Runner {
+
+    private Class<?> testClass;
+
+    public IntegrationTestRunner(Class<?> klass) throws InitializationError {
+        super(klass);
+        testClass = klass;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * org.junit.runners.BlockJUnit4ClassRunner#testName(org.junit.runners.model
+     * .FrameworkMethod)
+     */
+    @Override
+    protected String testName(FrameworkMethod method) {
+        if (AbstractIntegrationTestTB3.class.isAssignableFrom(testClass)) {
+            return System.getProperty("server-name");
+        } else {
+            return super.testName(method);
+        }
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/integration/IntegrationTestStreaming.java b/uitest/src/com/vaadin/tests/integration/IntegrationTestStreaming.java
new file mode 100644
index 0000000000..20ddac9dd1
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/integration/IntegrationTestStreaming.java
@@ -0,0 +1,35 @@
+/*
+ * 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.integration;
+
+import com.vaadin.annotations.Push;
+import com.vaadin.shared.ui.ui.Transport;
+
+/**
+ * Server test which uses streaming
+ * 
+ * @since 7.1
+ * @author Vaadin Ltd
+ */
+@Push(transport = Transport.STREAMING)
+public class IntegrationTestStreaming extends IntegrationTestUI {
+
+    public static class IntegrationTestStreamingTB3 extends
+            ServletIntegrationTestTB3 {
+        // Uses the test method declared in the super class
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/integration/IntegrationTestUI.java b/uitest/src/com/vaadin/tests/integration/IntegrationTestUI.java
index 0e6cb19b30..3d0a338bba 100755
--- a/uitest/src/com/vaadin/tests/integration/IntegrationTestUI.java
+++ b/uitest/src/com/vaadin/tests/integration/IntegrationTestUI.java
@@ -12,6 +12,11 @@ import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
 
 public class IntegrationTestUI extends UI {
+
+    public class IntegrationTestXhrTB3 extends ServletIntegrationTestTB3 {
+        // Uses the test method declared in the super class
+    }
+
     @Override
     protected void init(VaadinRequest request) {
         VerticalLayout layout = new VerticalLayout();
diff --git a/uitest/src/com/vaadin/tests/integration/IntegrationTestWebsocket.java b/uitest/src/com/vaadin/tests/integration/IntegrationTestWebsocket.java
new file mode 100644
index 0000000000..eaa23de3cf
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/integration/IntegrationTestWebsocket.java
@@ -0,0 +1,49 @@
+/*
+ * 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.integration;
+
+import com.vaadin.annotations.Push;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.ui.Transport;
+
+/**
+ * Server test which uses websockets
+ * 
+ * @since 7.1
+ * @author Vaadin Ltd
+ */
+@Push(transport = Transport.WEBSOCKET)
+public class IntegrationTestWebsocket extends IntegrationTestUI {
+
+    public class IntegrationTestWebsocketTB3 extends ServletIntegrationTestTB3 {
+        // Uses the test method declared in the super class
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * com.vaadin.tests.integration.IntegrationTestUI#init(com.vaadin.server
+     * .VaadinRequest)
+     */
+    @Override
+    protected void init(VaadinRequest request) {
+        super.init(request);
+        // Ensure no fallback is used
+        getPushConfiguration().setFallbackTransport(Transport.WEBSOCKET);
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationTestTB3.java b/uitest/src/com/vaadin/tests/integration/ServletIntegrationTestTB3.java
new file mode 100644
index 0000000000..ae83083d85
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/integration/ServletIntegrationTestTB3.java
@@ -0,0 +1,62 @@
+/*
+ * 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.integration;
+
+import java.io.IOException;
+
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+
+/**
+ * Base class for servlet integration tests. Automatically prepends "/demo" to
+ * the deployment path
+ * 
+ * @author Vaadin Ltd
+ */
+public abstract class ServletIntegrationTestTB3 extends
+        AbstractIntegrationTestTB3 {
+
+    @Test
+    public void runTest() throws IOException, AssertionError {
+        compareScreen("initial");
+
+        WebElement cell = vaadinElement(getTableCell(getTable(), 0, 1));
+        testBenchElement(cell).click(51, 13);
+
+        compareScreen("finland");
+    }
+
+    private String getTableCell(String tableLocator, int row, int col) {
+        return tableLocator
+                + "/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild["
+                + row + "]/domChild[" + col + "]/domChild[0]";
+    }
+
+    protected String getTable() {
+        return "/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]";
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.tb3.AbstractTB3Test#getDeploymentPath()
+     */
+    @Override
+    protected String getDeploymentPath() {
+        return "/demo" + super.getDeploymentPath();
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
index 966be1a692..b3520e5326 100644
--- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -364,7 +364,7 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
          * @return an object describing the capabilities required for running a
          *         test on the given Safari version
          */
-        protected static DesiredCapabilities safari(int version) {
+        public static DesiredCapabilities safari(int version) {
             DesiredCapabilities c = DesiredCapabilities.safari();
             c.setVersion("" + version);
             return c;
@@ -378,7 +378,7 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
          * @return an object describing the capabilities required for running a
          *         test on the given Chrome version
          */
-        protected static DesiredCapabilities chrome(int version) {
+        public static DesiredCapabilities chrome(int version) {
             DesiredCapabilities c = DesiredCapabilities.chrome();
             c.setVersion("" + version);
             c.setPlatform(Platform.XP);
@@ -393,7 +393,7 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
          * @return an object describing the capabilities required for running a
          *         test on the given Opera version
          */
-        protected static DesiredCapabilities opera(int version) {
+        public static DesiredCapabilities opera(int version) {
             DesiredCapabilities c = DesiredCapabilities.opera();
             c.setVersion("" + version);
             c.setPlatform(Platform.XP);
@@ -408,7 +408,7 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
          * @return an object describing the capabilities required for running a
          *         test on the given Firefox version
          */
-        protected static DesiredCapabilities firefox(int version) {
+        public static DesiredCapabilities firefox(int version) {
             DesiredCapabilities c = DesiredCapabilities.firefox();
             c.setVersion("" + version);
             c.setPlatform(Platform.XP);
@@ -423,7 +423,7 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
          * @return an object describing the capabilities required for running a
          *         test on the given Internet Explorer version
          */
-        protected static DesiredCapabilities ie(int version) {
+        public static DesiredCapabilities ie(int version) {
             DesiredCapabilities c = DesiredCapabilities.internetExplorer();
             c.setVersion("" + version);
             return c;
diff --git a/uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java b/uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java
new file mode 100644
index 0000000000..d2aa413749
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java
@@ -0,0 +1,35 @@
+/*
+ * 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.tb3;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.model.InitializationError;
+
+import com.vaadin.tests.integration.ServletIntegrationTestTB3;
+import com.vaadin.tests.tb3.ServletIntegrationTests.ServletIntegrationTestSuite;
+
+@RunWith(ServletIntegrationTestSuite.class)
+public class ServletIntegrationTests {
+
+    public static class ServletIntegrationTestSuite extends TB3TestSuite {
+        public ServletIntegrationTestSuite(Class<?> klass)
+                throws InitializationError {
+            super(klass, ServletIntegrationTestTB3.class,
+                    "com.vaadin.tests.integration", new String[] {});
+        }
+    }
+}
-- 
cgit v1.2.3


From 21af0c343180acf008b3a04b8997ff67292e9d9f Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 23 Sep 2013 20:15:54 +0300
Subject: Updated TB3 tests to use Firefox 24 (#12604)

Change-Id: I738e5e3aca7b5332ced2179593f304c6d375b0f1
---
 uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
index 5a1d07c0c0..b278ef2c40 100644
--- a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
+++ b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
@@ -50,7 +50,7 @@ public abstract class MultiBrowserTest extends PrivateTB3Configuration {
         allBrowsers.add(BrowserUtil.ie(8));
         allBrowsers.add(BrowserUtil.ie(9));
         allBrowsers.add(BrowserUtil.ie(10));
-        allBrowsers.add(BrowserUtil.firefox(17));
+        allBrowsers.add(BrowserUtil.firefox(24));
         // Uncomment once we have the capability to run on Safari 6
         // allBrowsers.add(safari(6));
         allBrowsers.add(BrowserUtil.chrome(29));
-- 
cgit v1.2.3


From a7583c616e3365d698da99ef1cd66de34e2954b2 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 23 Sep 2013 19:57:08 +0300
Subject: TB3 test for browsers (#12572)

Change-Id: I1011aed7b3a7f4a339199be4e598b02b27500307
---
 .../src/com/vaadin/tests/VerifyBrowserVersion.java | 54 ++++++++++++++++++++--
 .../src/com/vaadin/tests/tb3/AbstractTB3Test.java  |  1 -
 2 files changed, 51 insertions(+), 4 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java b/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java
index 022a343196..59663a78d6 100644
--- a/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java
+++ b/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java
@@ -1,17 +1,65 @@
 package com.vaadin.tests;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.remote.DesiredCapabilities;
+
 import com.vaadin.server.WebBrowser;
 import com.vaadin.tests.components.TestBase;
+import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.ui.Label;
 
 public class VerifyBrowserVersion extends TestBase {
 
+    public static class BrowserVersionTest extends MultiBrowserTest {
+
+        private Map<DesiredCapabilities, String> expectedUserAgent = new HashMap<DesiredCapabilities, String>();
+
+        {
+            expectedUserAgent
+                    .put(BrowserUtil.firefox(24),
+                            "Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Firefox/24.0");
+            expectedUserAgent
+                    .put(BrowserUtil.ie(8),
+                            "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; .NET CLR 2.0.50727; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)");
+            expectedUserAgent
+                    .put(BrowserUtil.ie(9),
+                            "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)");
+            expectedUserAgent
+                    .put(BrowserUtil.ie(10),
+                            "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)");
+            expectedUserAgent
+                    .put(BrowserUtil.chrome(29),
+                            "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.76 Safari/537.36");
+            expectedUserAgent
+                    .put(BrowserUtil.opera(12),
+                            "Opera/9.80 (Windows NT 5.1) Presto/2.12.388 Version/12.15");
+
+        }
+
+        @Test
+        public void verifyUserAgent() {
+            Assert.assertEquals(
+                    expectedUserAgent.get(getDesiredCapabilities()),
+                    vaadinElementById("userAgent").getText());
+            Assert.assertEquals("Touch device? No",
+                    vaadinElementById("touchDevice").getText());
+        }
+    }
+
     @Override
     protected void setup() {
         WebBrowser browser = getBrowser();
-        addComponent(new Label(browser.getBrowserApplication()));
-        addComponent(new Label("Touch device? "
-                + (browser.isTouchDevice() ? "YES" : "No")));
+        Label userAgent = new Label(browser.getBrowserApplication());
+        userAgent.setId("userAgent");
+        addComponent(userAgent);
+        Label touchDevice = new Label("Touch device? "
+                + (browser.isTouchDevice() ? "YES" : "No"));
+        touchDevice.setId("touchDevice");
+        addComponent(touchDevice);
     }
 
     @Override
diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
index b3520e5326..63819e5f07 100644
--- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -16,7 +16,6 @@
 
 package com.vaadin.tests.tb3;
 
-import java.net.MalformedURLException;
 import java.net.URL;
 
 import org.junit.After;
-- 
cgit v1.2.3


From 3940d851365ce4d18c599893aed7dfa4b5e0f46f Mon Sep 17 00:00:00 2001
From: Leif Åstrand <leif@vaadin.com>
Date: Mon, 23 Sep 2013 16:06:17 +0300
Subject: Use explicit button for reading asynchronously created messages
 (#10338)

Change-Id: Icde7e1f612ed60867b3d3d58aedbe36d16ad61a5
---
 .../com/vaadin/tests/application/DetachOldUIOnReload.html | 15 +++++++++++++++
 .../com/vaadin/tests/application/DetachOldUIOnReload.java | 13 +++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/application/DetachOldUIOnReload.html b/uitest/src/com/vaadin/tests/application/DetachOldUIOnReload.html
index 038283324d..33fc46f060 100644
--- a/uitest/src/com/vaadin/tests/application/DetachOldUIOnReload.html
+++ b/uitest/src/com/vaadin/tests/application/DetachOldUIOnReload.html
@@ -26,6 +26,11 @@
 	<td>/run/com.vaadin.tests.application.DetachOldUIOnReload</td>
 	<td></td>
 </tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestsapplicationDetachOldUIOnReload::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestsapplicationDetachOldUIOnReload::PID_SLog_row_0</td>
@@ -41,6 +46,11 @@
 	<td>vaadin=runcomvaadintestsapplicationDetachOldUIOnReload::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestsapplicationDetachOldUIOnReload::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestsapplicationDetachOldUIOnReload::PID_SLog_row_0</td>
@@ -61,6 +71,11 @@
 	<td>/run/com.vaadin.tests.application.DetachOldUIOnReload</td>
 	<td></td>
 </tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestsapplicationDetachOldUIOnReload::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestsapplicationDetachOldUIOnReload::PID_SLog_row_0</td>
diff --git a/uitest/src/com/vaadin/tests/application/DetachOldUIOnReload.java b/uitest/src/com/vaadin/tests/application/DetachOldUIOnReload.java
index 7104146203..154c84b4f5 100644
--- a/uitest/src/com/vaadin/tests/application/DetachOldUIOnReload.java
+++ b/uitest/src/com/vaadin/tests/application/DetachOldUIOnReload.java
@@ -31,10 +31,6 @@ public class DetachOldUIOnReload extends AbstractTestUIWithLog {
 
     @Override
     protected void setup(VaadinRequest request) {
-        for (String message : getSessionMessages(false)) {
-            log(message);
-        }
-
         addComponent(new Label("This is UI " + getUIId()));
         addComponent(new Button("Reload page", new Button.ClickListener() {
             @Override
@@ -42,6 +38,15 @@ public class DetachOldUIOnReload extends AbstractTestUIWithLog {
                 getPage().reload();
             }
         }));
+        addComponent(new Button("Read log messages from session",
+                new Button.ClickListener() {
+                    @Override
+                    public void buttonClick(ClickEvent event) {
+                        for (String message : getSessionMessages(false)) {
+                            log(message);
+                        }
+                    }
+                }));
     }
 
     private List<String> getSessionMessages(boolean storeIfNeeded) {
-- 
cgit v1.2.3


From 1df28c314141d7531591ff9c5ee1ab3521f29e8c Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 25 Sep 2013 12:57:48 +0300
Subject: Run TB3 tests also on IE11 (#12631)

Change-Id: I1ae0f8618e69ba61bb946cde18c2936b751f3a5f
---
 uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
index b278ef2c40..e24218eeb4 100644
--- a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
+++ b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
@@ -50,6 +50,7 @@ public abstract class MultiBrowserTest extends PrivateTB3Configuration {
         allBrowsers.add(BrowserUtil.ie(8));
         allBrowsers.add(BrowserUtil.ie(9));
         allBrowsers.add(BrowserUtil.ie(10));
+        allBrowsers.add(BrowserUtil.ie(11));
         allBrowsers.add(BrowserUtil.firefox(24));
         // Uncomment once we have the capability to run on Safari 6
         // allBrowsers.add(safari(6));
-- 
cgit v1.2.3


From a2daf65958c602dd02099bf4415e7e432b706dc7 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 16 Sep 2013 14:44:43 +0300
Subject: Converted TB2 push tests to TB3 (#12580)

Change-Id: Ifd6286aee75946eb47c39886c08473a5a0c10545
---
 .../com/vaadin/tests/components/ui/UIAccess.java   | 392 +++++++++++++++++++++
 .../com/vaadin/tests/components/ui/UiAccess.java   | 361 -------------------
 .../vaadin/tests/components/ui/UiAccessPush.html   |  41 ---
 uitest/src/com/vaadin/tests/push/BarInUIDL.html    |  42 ---
 uitest/src/com/vaadin/tests/push/BarInUIDL.java    |  30 ++
 uitest/src/com/vaadin/tests/push/BasicPush.html    |  88 -----
 uitest/src/com/vaadin/tests/push/BasicPush.java    | 136 ++++++-
 .../com/vaadin/tests/push/BasicPushStreaming.java  |  34 +-
 .../com/vaadin/tests/push/BasicPushWebsocket.java  |  36 ++
 .../com/vaadin/tests/push/PushConfiguration.html   | 130 -------
 .../vaadin/tests/push/PushConfigurationTest.java   | 113 ++++++
 uitest/src/com/vaadin/tests/push/PushFromInit.html |  32 --
 uitest/src/com/vaadin/tests/push/PushFromInit.java |  46 +++
 .../vaadin/tests/push/PushReattachedComponent.html |  47 ---
 .../vaadin/tests/push/PushReattachedComponent.java |  65 ++++
 .../vaadin/tests/push/PushTransportAnnotation.html |  46 ---
 .../src/com/vaadin/tests/push/StreamingPush.html   |  88 -----
 uitest/src/com/vaadin/tests/push/TogglePush.html   |  91 -----
 uitest/src/com/vaadin/tests/push/TogglePush.java   | 154 ++++++++
 .../com/vaadin/tests/push/TogglePushInInit.html    |  69 ----
 .../tests/push/TrackMessageSizeUnitTests.html      |  26 --
 .../tests/push/TrackMessageSizeUnitTests.java      |  11 +
 .../src/com/vaadin/tests/tb3/AbstractTB3Test.java  |  91 ++++-
 .../src/com/vaadin/tests/tb3/MultiBrowserTest.java |  31 +-
 uitest/src/com/vaadin/tests/tb3/TB3Runner.java     |  51 +--
 uitest/src/com/vaadin/tests/tb3/WebsocketTest.java |  60 ++++
 26 files changed, 1159 insertions(+), 1152 deletions(-)
 create mode 100644 uitest/src/com/vaadin/tests/components/ui/UIAccess.java
 delete mode 100644 uitest/src/com/vaadin/tests/components/ui/UiAccess.java
 delete mode 100644 uitest/src/com/vaadin/tests/components/ui/UiAccessPush.html
 delete mode 100644 uitest/src/com/vaadin/tests/push/BarInUIDL.html
 delete mode 100644 uitest/src/com/vaadin/tests/push/BasicPush.html
 delete mode 100644 uitest/src/com/vaadin/tests/push/PushConfiguration.html
 delete mode 100644 uitest/src/com/vaadin/tests/push/PushFromInit.html
 delete mode 100644 uitest/src/com/vaadin/tests/push/PushReattachedComponent.html
 create mode 100644 uitest/src/com/vaadin/tests/push/PushReattachedComponent.java
 delete mode 100644 uitest/src/com/vaadin/tests/push/PushTransportAnnotation.html
 delete mode 100644 uitest/src/com/vaadin/tests/push/StreamingPush.html
 delete mode 100644 uitest/src/com/vaadin/tests/push/TogglePush.html
 delete mode 100644 uitest/src/com/vaadin/tests/push/TogglePushInInit.html
 delete mode 100644 uitest/src/com/vaadin/tests/push/TrackMessageSizeUnitTests.html
 create mode 100644 uitest/src/com/vaadin/tests/tb3/WebsocketTest.java

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/components/ui/UIAccess.java b/uitest/src/com/vaadin/tests/components/ui/UIAccess.java
new file mode 100644
index 0000000000..057dcaa917
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/ui/UIAccess.java
@@ -0,0 +1,392 @@
+/*
+ * 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 org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+
+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.tests.tb3.MultiBrowserTest;
+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 {
+
+    public static class UIAccessTest extends MultiBrowserTest {
+        @Override
+        protected boolean isPushEnabled() {
+            return true;
+        }
+
+        @Test
+        public void testThreadLocals() {
+            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());
+
+        }
+
+        private WebElement getCurrentInstanceWhenPushingButton() {
+            return vaadinElement("/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[7]/VButton[0]");
+        }
+    }
+
+    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/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>
diff --git a/uitest/src/com/vaadin/tests/push/BarInUIDL.html b/uitest/src/com/vaadin/tests/push/BarInUIDL.html
deleted file mode 100644
index 66f03158b6..0000000000
--- a/uitest/src/com/vaadin/tests/push/BarInUIDL.html
+++ /dev/null
@@ -1,42 +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="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-push/com.vaadin.tests.push.BarInUIDL?restartApplication</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runpushcomvaadintestspushBarInUIDL::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VButton[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runpushcomvaadintestspushBarInUIDL::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VLabel[0]</td>
-	<td>Thank you for clicking | bar</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runpushcomvaadintestspushBarInUIDL::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VButton[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runpushcomvaadintestspushBarInUIDL::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VLabel[0]</td>
-	<td>Thank you for clicking | bar</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/uitest/src/com/vaadin/tests/push/BarInUIDL.java b/uitest/src/com/vaadin/tests/push/BarInUIDL.java
index 7e414cc89d..ef2568bebe 100644
--- a/uitest/src/com/vaadin/tests/push/BarInUIDL.java
+++ b/uitest/src/com/vaadin/tests/push/BarInUIDL.java
@@ -16,14 +16,44 @@
 
 package com.vaadin.tests.push;
 
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.annotations.Push;
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.ui.Transport;
 import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;
 
+@Push(transport = Transport.STREAMING)
 public class BarInUIDL extends AbstractTestUI {
 
+    public static class BarInUIDLTest extends MultiBrowserTest {
+        @Test
+        public void sendBarInUIDL() {
+            getButton().click();
+            Assert.assertEquals(
+                    "Thank you for clicking | bar",
+                    vaadinElement(
+                            "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VLabel[0]")
+                            .getText());
+            getButton().click();
+            Assert.assertEquals(
+                    "Thank you for clicking | bar",
+                    vaadinElement(
+                            "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VLabel[0]")
+                            .getText());
+        }
+
+        private WebElement getButton() {
+            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VButton[0]");
+        }
+    }
+
     /*
      * (non-Javadoc)
      * 
diff --git a/uitest/src/com/vaadin/tests/push/BasicPush.html b/uitest/src/com/vaadin/tests/push/BasicPush.html
deleted file mode 100644
index 173ec90674..0000000000
--- a/uitest/src/com/vaadin/tests/push/BasicPush.html
+++ /dev/null
@@ -1,88 +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="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-push/com.vaadin.tests.push.BasicPush?restartApplication&amp;debug</td>
-	<td></td>
-</tr>
-<!--Test client initiated push -->
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VLabel[0]</td>
-	<td>0</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VLabel[0]</td>
-	<td>1</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VLabel[0]</td>
-	<td>4</td>
-</tr>
-<!--Test server initiated push-->
-<tr>
-	<td>click</td>
-	<td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[5]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VLabel[0]</td>
-	<td>0</td>
-</tr>
-<tr>
-	<td>pause</td>
-	<td>3000</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VLabel[0]</td>
-	<td>1</td>
-</tr>
-<tr>
-	<td>pause</td>
-	<td>3000</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VLabel[0]</td>
-	<td>2</td>
-</tr>
-</tbody></table>
-</body>
-</html>
diff --git a/uitest/src/com/vaadin/tests/push/BasicPush.java b/uitest/src/com/vaadin/tests/push/BasicPush.java
index b80d287a1d..1f184863f7 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPush.java
+++ b/uitest/src/com/vaadin/tests/push/BasicPush.java
@@ -1,40 +1,115 @@
+/*
+ * 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.push;
 
-import java.util.Date;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import com.vaadin.annotations.Widgetset;
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.annotations.Push;
 import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.tests.widgetset.TestingWidgetSet;
+import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;
 
-@Widgetset(TestingWidgetSet.NAME)
+@Push
 public class BasicPush extends AbstractTestUI {
 
+    public static abstract class BasicPushTest extends MultiBrowserTest {
+
+        @Test
+        public void testPush() {
+            // Test client initiated push
+            Assert.assertEquals(0, getClientCounter());
+            getIncrementButton().click();
+            Assert.assertEquals(
+                    "Client counter not incremented by button click", 1,
+                    getClientCounter());
+            getIncrementButton().click();
+            getIncrementButton().click();
+            getIncrementButton().click();
+            Assert.assertEquals(
+                    "Four clicks should have incremented counter to 4", 4,
+                    getClientCounter());
+
+            // Test server initiated push
+            getServerCounterStartButton().click();
+            try {
+                Assert.assertEquals(0, getServerCounter());
+                sleep(3000);
+                int serverCounter = getServerCounter();
+                if (serverCounter < 1) {
+                    // No push has happened
+                    Assert.fail("No push has occured within 3s");
+                }
+                sleep(3000);
+                if (getServerCounter() <= serverCounter) {
+                    // No push has happened
+                    Assert.fail("Only one push took place within 6s");
+
+                }
+            } finally {
+                // Avoid triggering push assertions
+                getServerCounterStopButton().click();
+            }
+        }
+
+        private int getServerCounter() {
+            return Integer.parseInt(getServerCounterElement().getText());
+        }
+
+        private int getClientCounter() {
+            return Integer.parseInt(getClientCounterElement().getText());
+        }
+
+        private WebElement getServerCounterElement() {
+            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VLabel[0]");
+        }
+
+        private WebElement getServerCounterStartButton() {
+            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[5]/VButton[0]/domChild[0]/domChild[0]");
+        }
+
+        private WebElement getServerCounterStopButton() {
+            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[6]/VButton[0]/domChild[0]/domChild[0]");
+        }
+
+        private WebElement getIncrementButton() {
+            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]");
+        }
+
+        private WebElement getClientCounterElement() {
+            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VLabel[0]");
+        }
+    }
+
     private ObjectProperty<Integer> counter = new ObjectProperty<Integer>(0);
 
     private ObjectProperty<Integer> counter2 = new ObjectProperty<Integer>(0);
 
     private final Timer timer = new Timer(true);
 
-    private final TimerTask task = new TimerTask() {
-
-        @Override
-        public void run() {
-            access(new Runnable() {
-                @Override
-                public void run() {
-                    counter2.setValue(counter2.getValue() + 1);
-                }
-            });
-        }
-    };
+    private TimerTask task;
 
     @Override
     protected void setup(VaadinRequest request) {
@@ -65,11 +140,37 @@ public class BasicPush extends AbstractTestUI {
         lbl.setCaption("Server counter (updates each 3s by server thread) :");
         addComponent(lbl);
 
-        addComponent(new Button("Reset", new Button.ClickListener() {
+        addComponent(new Button("Start timer", new Button.ClickListener() {
 
             @Override
             public void buttonClick(ClickEvent event) {
                 counter2.setValue(0);
+                if (task != null) {
+                    task.cancel();
+                }
+                task = new TimerTask() {
+
+                    @Override
+                    public void run() {
+                        access(new Runnable() {
+                            @Override
+                            public void run() {
+                                counter2.setValue(counter2.getValue() + 1);
+                            }
+                        });
+                    }
+                };
+                timer.scheduleAtFixedRate(task, 3000, 3000);
+            }
+        }));
+
+        addComponent(new Button("Stop timer", new Button.ClickListener() {
+            @Override
+            public void buttonClick(ClickEvent event) {
+                if (task != null) {
+                    task.cancel();
+                    task = null;
+                }
             }
         }));
     }
@@ -94,7 +195,6 @@ public class BasicPush extends AbstractTestUI {
     @Override
     public void attach() {
         super.attach();
-        timer.scheduleAtFixedRate(task, new Date(), 3000);
     }
 
     @Override
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushStreaming.java b/uitest/src/com/vaadin/tests/push/BasicPushStreaming.java
index 37a8afd819..29534e1f5c 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushStreaming.java
+++ b/uitest/src/com/vaadin/tests/push/BasicPushStreaming.java
@@ -1,12 +1,42 @@
+/*
+ * 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.push;
 
+import org.junit.Test;
+
 import com.vaadin.annotations.Push;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.ui.Transport;
 
 @Push(transport = Transport.STREAMING)
 public class BasicPushStreaming extends BasicPush {
     @Override
-    protected void setup(com.vaadin.server.VaadinRequest request) {
-        addComponent(new PushConfigurator(this));
+    public void init(VaadinRequest request) {
+        super.init(request);
+        // Don't use fallback so we can easier detect if streaming fails
+        getPushConfiguration().setFallbackTransport(Transport.STREAMING);
+
     }
+
+    public static class BasicPushStreamingTest extends BasicPushTest {
+        @Override
+        @Test
+        public void testPush() {
+            super.testPush();
+        }
+    }
+
 }
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java b/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java
index 6fc27e8974..4765183fca 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java
+++ b/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java
@@ -1,8 +1,44 @@
+/*
+ * 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.push;
 
+import java.util.Collection;
+
+import org.openqa.selenium.remote.DesiredCapabilities;
+
 import com.vaadin.annotations.Push;
+import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.ui.Transport;
+import com.vaadin.tests.tb3.WebsocketTest;
 
 @Push(transport = Transport.WEBSOCKET)
 public class BasicPushWebsocket extends BasicPush {
+
+    @Override
+    public void init(VaadinRequest request) {
+        super.init(request);
+        // Don't use fallback so we can easier detect if websocket fails
+        getPushConfiguration().setFallbackTransport(Transport.WEBSOCKET);
+    }
+
+    public static class BasicPushWebsocketTest extends BasicPushTest {
+        @Override
+        public Collection<DesiredCapabilities> getBrowsersToTest() {
+            return WebsocketTest.getWebsocketBrowsers();
+        }
+    }
+
 }
diff --git a/uitest/src/com/vaadin/tests/push/PushConfiguration.html b/uitest/src/com/vaadin/tests/push/PushConfiguration.html
deleted file mode 100644
index c3786b1cc1..0000000000
--- a/uitest/src/com/vaadin/tests/push/PushConfiguration.html
+++ /dev/null
@@ -1,130 +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="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>
-<!--Websocket-->
-<tr>
-	<td>open</td>
-	<td>/run/com.vaadin.tests.push.PushConfigurationTest?debug&amp;restartApplication</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertNotText</td>
-	<td>vaadin=runcomvaadintestspushPushConfigurationTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[5]/VLabel[0]</td>
-	<td>4</td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>vaadin=runcomvaadintestspushPushConfigurationTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[1]/VNativeSelect[0]/domChild[0]</td>
-	<td>label=WEBSOCKET</td>
-</tr>
-<tr>
-	<td>assertNotText</td>
-	<td>vaadin=runcomvaadintestspushPushConfigurationTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[5]/VLabel[0]</td>
-	<td>4</td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>vaadin=runcomvaadintestspushPushConfigurationTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VNativeSelect[0]/domChild[0]</td>
-	<td>label=AUTOMATIC</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestspushPushConfigurationTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[5]/VLabel[0]/domChild[0]</td>
-	<td>*fallbackTransport: streaming*transport: websocket*</td>
-</tr>
-<tr>
-	<td>assertNotText</td>
-	<td>vaadin=runcomvaadintestspushPushConfigurationTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[5]/VLabel[0]</td>
-	<td>4</td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>vaadin=runcomvaadintestspushPushConfigurationTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[5]/VLabel[0]</td>
-	<td>4</td>
-</tr>
-<!--Use debug console to verify we used the correct transport type-->
-<tr>
-	<td>assertTextPresent</td>
-	<td>Push connection established using websocket</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextNotPresent</td>
-	<td>Push connection established using streaming</td>
-	<td>Push connection established using streaming</td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>vaadin=runcomvaadintestspushPushConfigurationTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VNativeSelect[0]/domChild[0]</td>
-	<td>label=DISABLED</td>
-</tr>
-<!--Streaming-->
-<tr>
-	<td>open</td>
-	<td>/run/com.vaadin.tests.push.PushConfigurationTest?debug&amp;restartApplication</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertNotText</td>
-	<td>vaadin=runcomvaadintestspushPushConfigurationTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[5]/VLabel[0]</td>
-	<td>4</td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>vaadin=runcomvaadintestspushPushConfigurationTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[1]/VNativeSelect[0]/domChild[0]</td>
-	<td>label=STREAMING</td>
-</tr>
-<tr>
-	<td>assertNotText</td>
-	<td>vaadin=runcomvaadintestspushPushConfigurationTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[5]/VLabel[0]</td>
-	<td>4</td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>vaadin=runcomvaadintestspushPushConfigurationTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VNativeSelect[0]/domChild[0]</td>
-	<td>label=AUTOMATIC</td>
-</tr>
-<tr>
-	<td>assertNotText</td>
-	<td>vaadin=runcomvaadintestspushPushConfigurationTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[5]/VLabel[0]</td>
-	<td>4</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestspushPushConfigurationTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[5]/VLabel[0]/domChild[0]</td>
-	<td>*fallbackTransport: streaming*transport: streaming*</td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>vaadin=runcomvaadintestspushPushConfigurationTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[5]/VLabel[0]</td>
-	<td>4</td>
-</tr>
-<!--Use debug console to verify we used the correct transport type-->
-<tr>
-	<td>assertTextNotPresent</td>
-	<td>Push connection established using websocket</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextPresent</td>
-	<td>Push connection established using streaming</td>
-	<td></td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>vaadin=runcomvaadintestspushPushConfigurationTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VNativeSelect[0]/domChild[0]</td>
-	<td>label=DISABLED</td>
-</tr>
-</tbody></table>
-</body>
-</html>
diff --git a/uitest/src/com/vaadin/tests/push/PushConfigurationTest.java b/uitest/src/com/vaadin/tests/push/PushConfigurationTest.java
index b57e9732cc..f4a537392d 100644
--- a/uitest/src/com/vaadin/tests/push/PushConfigurationTest.java
+++ b/uitest/src/com/vaadin/tests/push/PushConfigurationTest.java
@@ -1,19 +1,132 @@
+/*
+ * 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.push;
 
 import java.util.Date;
 import java.util.Timer;
 import java.util.TimerTask;
 
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.ui.Select;
+
 import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.tests.tb3.WebsocketTest;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;
 
 public class PushConfigurationTest extends AbstractTestUI {
 
+    public static class PushConfigurationWebsocket extends WebsocketTest {
+
+        @Override
+        protected boolean isDebug() {
+            return true;
+        }
+
+        @Test
+        public void testWebsocketAndStreaming() {
+            // Websocket
+            Assert.assertEquals(1, getServerCounter());
+            new Select(getTransportSelect()).selectByVisibleText("WEBSOCKET");
+            new Select(getPushModeSelect()).selectByVisibleText("AUTOMATIC");
+            Assert.assertTrue(vaadinElement(
+                    "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[5]/VLabel[0]/domChild[0]")
+                    .getText()
+                    .matches(
+                            "^[\\s\\S]*fallbackTransport: streaming[\\s\\S]*transport: websocket[\\s\\S]*$"));
+            int counter = getServerCounter();
+
+            for (int second = 0;; second++) {
+                if (second >= 5) {
+                    Assert.fail("timeout");
+                }
+                if (getServerCounter() >= (counter + 2)) {
+                    break;
+                }
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                }
+            }
+
+            // Use debug console to verify we used the correct transport type
+            Assert.assertTrue(driver.getPageSource().contains(
+                    "Push connection established using websocket"));
+            Assert.assertFalse(driver.getPageSource().contains(
+                    "Push connection established using streaming"));
+
+            new Select(getPushModeSelect()).selectByVisibleText("DISABLED");
+
+            // Streaming
+            driver.get(getTestUrl());
+            Assert.assertEquals(1, getServerCounter());
+
+            new Select(getTransportSelect()).selectByVisibleText("STREAMING");
+            new Select(getPushModeSelect()).selectByVisibleText("AUTOMATIC");
+            Assert.assertTrue(vaadinElement(
+                    "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[5]/VLabel[0]/domChild[0]")
+                    .getText()
+                    .matches(
+                            "^[\\s\\S]*fallbackTransport: streaming[\\s\\S]*transport: streaming[\\s\\S]*$"));
+
+            counter = getServerCounter();
+            for (int second = 0;; second++) {
+                if (second >= 5) {
+                    Assert.fail("timeout");
+                }
+                if (getServerCounter() >= (counter + 2)) {
+                    break;
+                }
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                }
+            }
+
+            // Use debug console to verify we used the correct transport type
+            Assert.assertFalse(driver.getPageSource().contains(
+                    "Push connection established using websocket"));
+            Assert.assertTrue(driver.getPageSource().contains(
+                    "Push connection established using streaming"));
+
+        }
+
+        private WebElement getPushModeSelect() {
+            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VNativeSelect[0]/domChild[0]");
+        }
+
+        private WebElement getTransportSelect() {
+            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[1]/VNativeSelect[0]/domChild[0]");
+        }
+
+        private int getServerCounter() {
+            return Integer.parseInt(getServerCounterElement().getText());
+        }
+
+        private WebElement getServerCounterElement() {
+            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[5]/VLabel[0]");
+        }
+    }
+
     private ObjectProperty<Integer> counter = new ObjectProperty<Integer>(0);
 
     private ObjectProperty<Integer> counter2 = new ObjectProperty<Integer>(0);
diff --git a/uitest/src/com/vaadin/tests/push/PushFromInit.html b/uitest/src/com/vaadin/tests/push/PushFromInit.html
deleted file mode 100644
index d009eb3baf..0000000000
--- a/uitest/src/com/vaadin/tests/push/PushFromInit.html
+++ /dev/null
@@ -1,32 +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-push/com.vaadin.tests.push.PushFromInit?debug&amp;restartApplication</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>vaadin=runpushcomvaadintestspushPushFromInit::PID_SLog_row_1</td>
-	<td>1. Logged in init</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runpushcomvaadintestspushPushFromInit::PID_SLog_row_0</td>
-	<td>2. Logged from background thread started in init</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/uitest/src/com/vaadin/tests/push/PushFromInit.java b/uitest/src/com/vaadin/tests/push/PushFromInit.java
index 4b442de499..000d5c0bce 100644
--- a/uitest/src/com/vaadin/tests/push/PushFromInit.java
+++ b/uitest/src/com/vaadin/tests/push/PushFromInit.java
@@ -1,11 +1,57 @@
+/*
+ * 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.push;
 
+import org.junit.Assert;
+import org.junit.Test;
+
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
+import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.ui.Button;
 
 public class PushFromInit extends AbstractTestUIWithLog {
 
+    public static class PushFromInitTB3 extends MultiBrowserTest {
+        @Test
+        public void testPushFromInit() {
+            for (int second = 0;; second++) {
+                if (second >= 30) {
+                    Assert.fail("timeout");
+                }
+                try {
+                    if ("1. Logged in init".equals(vaadinElementById(
+                            "Log_row_1").getText())) {
+                        break;
+                    }
+                } catch (Exception e) {
+                }
+                try {
+                    Thread.sleep(200);
+                } catch (InterruptedException e) {
+                }
+            }
+
+            Assert.assertEquals(
+                    "2. Logged from background thread started in init",
+                    vaadinElementById("Log_row_0").getText());
+
+        }
+    }
+
     @Override
     protected void setup(VaadinRequest request) {
         new Thread() {
diff --git a/uitest/src/com/vaadin/tests/push/PushReattachedComponent.html b/uitest/src/com/vaadin/tests/push/PushReattachedComponent.html
deleted file mode 100644
index e1f6a5f048..0000000000
--- a/uitest/src/com/vaadin/tests/push/PushReattachedComponent.html
+++ /dev/null
@@ -1,47 +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="http://192.168.2.162: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-push/com.vaadin.tests.components.panel.PanelChangeContents?restartApplication</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runpushcomvaadintestscomponentspanelPanelChangeContents::/VVerticalLayout[0]/Slot[1]/VPanel[0]/VVerticalLayout[0]/Slot[0]/VLabel[0]</td>
-	<td>stats</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runpushcomvaadintestscomponentspanelPanelChangeContents::/VVerticalLayout[0]/Slot[0]/VHorizontalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runpushcomvaadintestscomponentspanelPanelChangeContents::/VVerticalLayout[0]/Slot[1]/VPanel[0]/VVerticalLayout[0]/Slot[0]/VLabel[0]</td>
-	<td>companies</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runpushcomvaadintestscomponentspanelPanelChangeContents::/VVerticalLayout[0]/Slot[0]/VHorizontalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runpushcomvaadintestscomponentspanelPanelChangeContents::/VVerticalLayout[0]/Slot[1]/VPanel[0]/VVerticalLayout[0]/Slot[0]/VLabel[0]</td>
-	<td>stats</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/uitest/src/com/vaadin/tests/push/PushReattachedComponent.java b/uitest/src/com/vaadin/tests/push/PushReattachedComponent.java
new file mode 100644
index 0000000000..35934273a4
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/PushReattachedComponent.java
@@ -0,0 +1,65 @@
+/*
+ * 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.push;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.tests.components.panel.PanelChangeContents;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class PushReattachedComponent extends MultiBrowserTest {
+
+    @Override
+    protected boolean isPushEnabled() {
+        return true;
+    }
+
+    @Override
+    protected Class<?> getUIClass() {
+        return PanelChangeContents.class;
+    }
+
+    @Test
+    public void testReattachComponentUsingPush() {
+        Assert.assertEquals(
+                "stats",
+                vaadinElement(
+                        "/VVerticalLayout[0]/Slot[1]/VPanel[0]/VVerticalLayout[0]/Slot[0]/VLabel[0]")
+                        .getText());
+        vaadinElement(
+                "/VVerticalLayout[0]/Slot[0]/VHorizontalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]")
+                .click();
+        Assert.assertEquals(
+                "companies",
+                vaadinElement(
+                        "/VVerticalLayout[0]/Slot[1]/VPanel[0]/VVerticalLayout[0]/Slot[0]/VLabel[0]")
+                        .getText());
+        vaadinElement(
+                "/VVerticalLayout[0]/Slot[0]/VHorizontalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]")
+                .click();
+        Assert.assertEquals(
+                "stats",
+                vaadinElement(
+                        "/VVerticalLayout[0]/Slot[1]/VPanel[0]/VVerticalLayout[0]/Slot[0]/VLabel[0]")
+                        .getText());
+
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/push/PushTransportAnnotation.html b/uitest/src/com/vaadin/tests/push/PushTransportAnnotation.html
deleted file mode 100644
index 854dd458bb..0000000000
--- a/uitest/src/com/vaadin/tests/push/PushTransportAnnotation.html
+++ /dev/null
@@ -1,46 +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="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.push.BasicPushStreaming?debug&amp;restartApplication</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForTextPresent</td>
-	<td>Push connection established using streaming</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextNotPresent</td>
-	<td>Push connection established using websocket</td>
-	<td></td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/run/com.vaadin.tests.push.BasicPushWebsocket?debug&amp;restartApplication</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTextNotPresent</td>
-	<td>Push connection established using streaming</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForTextPresent</td>
-	<td>Push connection established using websocket</td>
-	<td></td>
-</tr>
-</tbody></table>
-</body>
-</html>
diff --git a/uitest/src/com/vaadin/tests/push/StreamingPush.html b/uitest/src/com/vaadin/tests/push/StreamingPush.html
deleted file mode 100644
index cf94a09c63..0000000000
--- a/uitest/src/com/vaadin/tests/push/StreamingPush.html
+++ /dev/null
@@ -1,88 +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="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-push/com.vaadin.tests.push.BasicPush?restartApplication&amp;debug&amp;transport=streaming</td>
-	<td></td>
-</tr>
-<!--Test client initiated push -->
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VLabel[0]</td>
-	<td>0</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VLabel[0]</td>
-	<td>1</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VLabel[0]</td>
-	<td>4</td>
-</tr>
-<!--Test server initiated push-->
-<tr>
-	<td>click</td>
-	<td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[5]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VLabel[0]</td>
-	<td>0</td>
-</tr>
-<tr>
-	<td>pause</td>
-	<td>3000</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VLabel[0]</td>
-	<td>1</td>
-</tr>
-<tr>
-	<td>pause</td>
-	<td>3000</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runpushcomvaadintestspushBasicPush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VLabel[0]</td>
-	<td>2</td>
-</tr>
-</tbody></table>
-</body>
-</html>
diff --git a/uitest/src/com/vaadin/tests/push/TogglePush.html b/uitest/src/com/vaadin/tests/push/TogglePush.html
deleted file mode 100644
index b752d2120c..0000000000
--- a/uitest/src/com/vaadin/tests/push/TogglePush.html
+++ /dev/null
@@ -1,91 +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-push/com.vaadin.tests.push.TogglePush?restartApplication</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runpushcomvaadintestspushTogglePush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>pause</td>
-	<td>2000</td>
-	<td></td>
-</tr>
-<!--Push is enabled, so text gets updated-->
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runpushcomvaadintestspushTogglePush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VLabel[0]</td>
-	<td>Counter has been updated 1 times</td>
-</tr>
-<tr>
-	<td>mouseClick</td>
-	<td>vaadin=runpushcomvaadintestspushTogglePush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VCheckBox[0]/domChild[0]</td>
-	<td>61,6</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runpushcomvaadintestspushTogglePush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>pause</td>
-	<td>2000</td>
-	<td></td>
-</tr>
-<!--Push is disabled, so text is not updated-->
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runpushcomvaadintestspushTogglePush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VLabel[0]</td>
-	<td>Counter has been updated 1 times</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runpushcomvaadintestspushTogglePush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<!--Direct update is visible, and includes previous update-->
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runpushcomvaadintestspushTogglePush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VLabel[0]</td>
-	<td>Counter has been updated 3 times</td>
-</tr>
-<tr>
-	<td>mouseClick</td>
-	<td>vaadin=runpushcomvaadintestspushTogglePush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VCheckBox[0]/domChild[0]</td>
-	<td>61,3</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runpushcomvaadintestspushTogglePush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>pause</td>
-	<td>2000</td>
-	<td></td>
-</tr>
-<!--Push is enabled again, so text gets updated-->
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runpushcomvaadintestspushTogglePush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VLabel[0]</td>
-	<td>Counter has been updated 4 times</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/uitest/src/com/vaadin/tests/push/TogglePush.java b/uitest/src/com/vaadin/tests/push/TogglePush.java
index c0bdc54ee0..f59ef83fe7 100644
--- a/uitest/src/com/vaadin/tests/push/TogglePush.java
+++ b/uitest/src/com/vaadin/tests/push/TogglePush.java
@@ -1,19 +1,173 @@
+/*
+ * 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.push;
 
 import java.util.Timer;
 import java.util.TimerTask;
 
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.communication.PushMode;
 import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Label;
 
 public class TogglePush extends AbstractTestUI {
+    public static class TogglePushInInitTB3 extends MultiBrowserTest {
+        @Override
+        protected boolean isPushEnabled() {
+            return true;
+        }
+
+        /*
+         * (non-Javadoc)
+         * 
+         * @see com.vaadin.tests.tb3.AbstractTB3Test#getTestUrl()
+         */
+        @Override
+        protected String getTestUrl() {
+            return null;
+        }
+
+        @Test
+        public void togglePushInInit() {
+            String baseUrl = getBaseURL();
+            if (baseUrl.endsWith("/")) {
+                baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
+            }
+
+            String url = baseUrl + getDeploymentPath();
+
+            // Open with push disabled
+            driver.get(addParameter(url, "push=disabled"));
+
+            Assert.assertFalse(getPushToggle().isSelected());
+
+            getDelayedCounterUpdateButton().click();
+            sleep(2000);
+            Assert.assertEquals("Counter has been updated 0 times",
+                    getCounterText());
+
+            // Open with push enabled
+            driver.get(addParameter(url, "push=enabled"));
+            Assert.assertTrue(getPushToggle().isSelected());
+
+            getDelayedCounterUpdateButton().click();
+            sleep(2000);
+            Assert.assertEquals("Counter has been updated 1 times",
+                    getCounterText());
+
+        }
+
+        /**
+         * @since
+         * @param url
+         * @param string
+         * @return
+         */
+        private String addParameter(String url, String queryParameter) {
+            if (url.contains("?")) {
+                return url + "&" + queryParameter;
+            } else {
+                return url + "?" + queryParameter;
+            }
+        }
+
+        private String getCounterText() {
+            return vaadinElement(
+                    "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VLabel[0]")
+                    .getText();
+        }
+
+        private WebElement getPushToggle() {
+            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VCheckBox[0]/domChild[0]");
+        }
+
+        private WebElement getDelayedCounterUpdateButton() {
+            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]");
+        }
+
+    }
+
+    public static class TogglePushTB3 extends MultiBrowserTest {
+
+        @Override
+        protected boolean isPushEnabled() {
+            return true;
+        }
+
+        @Test
+        public void togglePush() {
+            getDelayedCounterUpdateButton().click();
+            sleep(2000);
+
+            // Push is enabled, so text gets updated
+            Assert.assertEquals("Counter has been updated 1 times",
+                    getCounterText());
+
+            // Disable push
+            getPushToggle().click();
+            getDelayedCounterUpdateButton().click();
+            sleep(2000);
+            // Push is disabled, so text is not updated
+            Assert.assertEquals("Counter has been updated 1 times",
+                    getCounterText());
+
+            getDirectCounterUpdateButton().click();
+            // Direct update is visible, and includes previous update
+            Assert.assertEquals("Counter has been updated 3 times",
+                    getCounterText());
+
+            // Re-enable push
+            getPushToggle().click();
+            getDelayedCounterUpdateButton().click();
+            sleep(2000);
+
+            // Push is enabled again, so text gets updated
+            Assert.assertEquals("Counter has been updated 4 times",
+                    getCounterText());
+        }
+
+        private WebElement getDirectCounterUpdateButton() {
+            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]");
+        }
+
+        private WebElement getPushToggle() {
+            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VCheckBox[0]/domChild[0]");
+        }
+
+        private String getCounterText() {
+            return vaadinElement(
+                    "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VLabel[0]")
+                    .getText();
+        }
+
+        private WebElement getDelayedCounterUpdateButton() {
+            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]");
+        }
+    }
+
     private final Label counterLabel = new Label();
     private int counter = 0;
 
diff --git a/uitest/src/com/vaadin/tests/push/TogglePushInInit.html b/uitest/src/com/vaadin/tests/push/TogglePushInInit.html
deleted file mode 100644
index c735f225e1..0000000000
--- a/uitest/src/com/vaadin/tests/push/TogglePushInInit.html
+++ /dev/null
@@ -1,69 +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="http://localhost:8071/" />
-<title>TogglePushInInit</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">TogglePushInInit</td></tr>
-</thead><tbody>
-<!--Open with push disabled-->
-<tr>
-	<td>open</td>
-	<td>/run-push/com.vaadin.tests.push.TogglePush?restartApplication&push=disabled</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertValue</td>
-	<td>vaadin=runpushcomvaadintestspushTogglePush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VCheckBox[0]/domChild[0]</td>
-	<td>off</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runpushcomvaadintestspushTogglePush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>pause</td>
-	<td>2000</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runpushcomvaadintestspushTogglePush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VLabel[0]</td>
-	<td>Counter has been updated 0 times</td>
-</tr>
-<!--Open with push enabled-->
-<tr>
-	<td>open</td>
-	<td>/run-push/com.vaadin.tests.push.TogglePush?restartApplication&amp;push=enabled</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertValue</td>
-	<td>vaadin=runpushcomvaadintestspushTogglePush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VCheckBox[0]/domChild[0]</td>
-	<td>on</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runpushcomvaadintestspushTogglePush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>pause</td>
-	<td>2000</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runpushcomvaadintestspushTogglePush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VLabel[0]</td>
-	<td>Counter has been updated 1 times</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUnitTests.html b/uitest/src/com/vaadin/tests/push/TrackMessageSizeUnitTests.html
deleted file mode 100644
index 89dd7d4e78..0000000000
--- a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUnitTests.html
+++ /dev/null
@@ -1,26 +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="http://192.168.2.162: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.push.TrackMessageSizeUnitTests?restartApplication</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runcomvaadintestspushTrackMessageSizeUnitTests::PID_SLog_row_0</td>
-	<td>1. All tests run</td>
-</tr>
-</tbody></table>
-</body>
-</html>
diff --git a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUnitTests.java b/uitest/src/com/vaadin/tests/push/TrackMessageSizeUnitTests.java
index 062698edf5..d7459f83ab 100644
--- a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUnitTests.java
+++ b/uitest/src/com/vaadin/tests/push/TrackMessageSizeUnitTests.java
@@ -25,18 +25,29 @@ import javax.servlet.ServletContext;
 import org.apache.commons.io.IOUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
+import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.annotations.JavaScript;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinService;
 import com.vaadin.server.VaadinServletService;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
+import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.ui.JavaScriptFunction;
 
 // Load vaadinPush.js so that jQueryVaadin is defined 
 @JavaScript("vaadin://vaadinPush.js")
 public class TrackMessageSizeUnitTests extends AbstractTestUIWithLog {
 
+    public static class TrackMessageSizeUnitTestsTB3 extends MultiBrowserTest {
+        @Test
+        public void runTests() {
+            Assert.assertEquals("1. All tests run",
+                    vaadinElementById("Log_row_0").getText());
+        }
+    }
+
     private String testMethod = "function testSequence(expected, data) {\n"
             + "    var request = {trackMessageLength: true, messageDelimiter: '|'};\n"
             + "    var response = {partialMessage: ''};\n"
diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
index 63819e5f07..1897728366 100644
--- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -17,18 +17,24 @@
 package com.vaadin.tests.tb3;
 
 import java.net.URL;
+import java.util.Collection;
+import java.util.Collections;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.openqa.selenium.By;
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.remote.BrowserType;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.RemoteWebDriver;
+import org.openqa.selenium.support.ui.ExpectedCondition;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+import org.openqa.selenium.support.ui.WebDriverWait;
 
 import com.vaadin.server.LegacyApplication;
-import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBench;
 import com.vaadin.testbench.TestBenchTestCase;
 import com.vaadin.ui.UI;
@@ -50,6 +56,7 @@ import com.vaadin.ui.UI;
  * 
  * @author Vaadin Ltd
  */
+@RunWith(value = TB3Runner.class)
 public abstract class AbstractTB3Test extends TestBenchTestCase {
     /**
      * Height of the screenshots we want to capture
@@ -153,6 +160,24 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
      */
     protected abstract String getDeploymentHostname();
 
+    /**
+     * Produces a collection of browsers to run the test on. This method is
+     * executed by the test runner when determining how many test methods to
+     * invoke and with what parameters. For each returned value a test method is
+     * ran and before running that,
+     * {@link #setDesiredCapabilities(DesiredCapabilities)} is invoked with the
+     * value returned by this method.
+     * 
+     * This method is not static to allow overriding it in sub classes. By
+     * default runs the test only on Firefox
+     * 
+     * @return The browsers to run the test on
+     */
+    public Collection<DesiredCapabilities> getBrowsersToTest() {
+        return Collections.singleton(BrowserUtil.firefox(17));
+
+    }
+
     /**
      * Used to determine which capabilities should be used when setting up a
      * {@link WebDriver} for this test. Typically set by a test runner or left
@@ -189,9 +214,8 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
     }
 
     /**
-     * Finds a Vaadin element based on the part of a TB3 style locator following
-     * the :: (e.g.
-     * vaadin=runLabelModes::PID_Scheckboxaction-Enabled/domChild[0] ->
+     * Finds an element based on the part of a TB2 style locator following the
+     * :: (e.g. vaadin=runLabelModes::PID_Scheckboxaction-Enabled/domChild[0] ->
      * PID_Scheckboxaction-Enabled/domChild[0]).
      * 
      * @param vaadinLocator
@@ -199,11 +223,7 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
      * @return
      */
     protected WebElement vaadinElement(String vaadinLocator) {
-        String base = getApplicationId(getDeploymentPath());
-
-        base += "::";
-
-        return driver.findElement(By.vaadin(base + vaadinLocator));
+        return driver.findElement(vaadinLocator(vaadinLocator));
     }
 
     /**
@@ -214,7 +234,58 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
      * @return
      */
     public WebElement vaadinElementById(String id) {
-        return vaadinElement("PID_S" + id);
+        return driver.findElement(vaadinLocatorById(id));
+    }
+
+    /**
+     * Finds a {@link By} locator based on the part of a TB2 style locator
+     * following the :: (e.g.
+     * vaadin=runLabelModes::PID_Scheckboxaction-Enabled/domChild[0] ->
+     * PID_Scheckboxaction-Enabled/domChild[0]).
+     * 
+     * @param vaadinLocator
+     *            The part following :: of the vaadin locator string
+     * @return
+     */
+    public org.openqa.selenium.By vaadinLocator(String vaadinLocator) {
+        String base = getApplicationId(getDeploymentPath());
+
+        base += "::";
+        return com.vaadin.testbench.By.vaadin(base + vaadinLocator);
+    }
+
+    /**
+     * Constructs a {@link By} locator for the id given using Component.setId
+     * 
+     * @param id
+     *            The id to locate
+     * @return a locator for the given id
+     */
+    public By vaadinLocatorById(String id) {
+        return vaadinLocator("PID_S" + id);
+    }
+
+    /**
+     * Waits a short while for the given condition to become true. Use e.g. as
+     * {@link #waitUntil(ExpectedConditions.textToBePresentInElement(by, text))}
+     * 
+     * @param condition
+     *            the condition to wait for to become true
+     */
+    protected void waitUntil(ExpectedCondition<Boolean> condition) {
+        new WebDriverWait(driver, 10).until(condition);
+    }
+
+    /**
+     * Waits a short while for the given condition to become false. Use e.g. as
+     * {@link #waitUntilNot(ExpectedConditions.textToBePresentInElement(by,
+     * text))}
+     * 
+     * @param condition
+     *            the condition to wait for to become false
+     */
+    protected void waitUntilNot(ExpectedCondition<Boolean> condition) {
+        new WebDriverWait(driver, 10).until(ExpectedConditions.not(condition));
     }
 
     /**
diff --git a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
index e24218eeb4..3553954ec0 100644
--- a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
+++ b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
@@ -18,11 +18,8 @@ package com.vaadin.tests.tb3;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 /**
@@ -41,11 +38,9 @@ import org.openqa.selenium.remote.DesiredCapabilities;
  * 
  * @author Vaadin Ltd
  */
-@RunWith(value = TB3Runner.class)
 public abstract class MultiBrowserTest extends PrivateTB3Configuration {
 
-    private static List<DesiredCapabilities> allBrowsers = new ArrayList<DesiredCapabilities>();
-    private static List<DesiredCapabilities> websocketBrowsers = new ArrayList<DesiredCapabilities>();
+    static List<DesiredCapabilities> allBrowsers = new ArrayList<DesiredCapabilities>();
     static {
         allBrowsers.add(BrowserUtil.ie(8));
         allBrowsers.add(BrowserUtil.ie(9));
@@ -57,26 +52,18 @@ public abstract class MultiBrowserTest extends PrivateTB3Configuration {
         allBrowsers.add(BrowserUtil.chrome(29));
         allBrowsers.add(BrowserUtil.opera(12));
 
-        websocketBrowsers.addAll(allBrowsers);
-        websocketBrowsers.remove(BrowserUtil.ie(8));
-        websocketBrowsers.remove(BrowserUtil.ie(9));
-    }
-
-    @Parameters
-    public static Collection<DesiredCapabilities> getBrowsersForTest() {
-        return getAllBrowsers();
-    }
-
-    public static Collection<DesiredCapabilities> getAllBrowsers() {
-        return Collections.unmodifiableCollection(allBrowsers);
     }
 
     /**
-     * @return A subset of {@link #getAllBrowsers()} including only those which
-     *         support websockets
+     * @return all supported browsers which are actively tested
      */
-    public static Collection<DesiredCapabilities> getWebsocketBrowsers() {
-        return Collections.unmodifiableCollection(websocketBrowsers);
+    public static List<DesiredCapabilities> getAllBrowsers() {
+        return allBrowsers;
+    }
+
+    @Override
+    public Collection<DesiredCapabilities> getBrowsersToTest() {
+        return allBrowsers;
     }
 
 }
diff --git a/uitest/src/com/vaadin/tests/tb3/TB3Runner.java b/uitest/src/com/vaadin/tests/tb3/TB3Runner.java
index 510d200ffa..5860ac42c0 100644
--- a/uitest/src/com/vaadin/tests/tb3/TB3Runner.java
+++ b/uitest/src/com/vaadin/tests/tb3/TB3Runner.java
@@ -17,16 +17,12 @@
 package com.vaadin.tests.tb3;
 
 import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
 import org.junit.Test;
 import org.junit.runners.BlockJUnit4ClassRunner;
 import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.InitializationError;
 import org.junit.runners.model.Statement;
@@ -53,49 +49,26 @@ public class TB3Runner extends BlockJUnit4ClassRunner {
     protected List<FrameworkMethod> computeTestMethods() {
         List<FrameworkMethod> tests = new LinkedList<FrameworkMethod>();
 
-        // Find all methods in our test class marked with @Parameters.
-        for (FrameworkMethod method : getTestClass().getAnnotatedMethods(
-                Parameters.class)) {
-            // Make sure the Parameters method is static
-            if (!Modifier.isStatic(method.getMethod().getModifiers())) {
-                throw new IllegalArgumentException("@Parameters " + method
-                        + " must be static.");
-            }
-
-            // Execute the method (statically)
-            Object params;
-            try {
-                params = method.getMethod().invoke(
-                        getTestClass().getJavaClass());
-            } catch (Throwable t) {
-                throw new RuntimeException("Could not run test factory method "
-                        + method.getName(), t);
-            }
-
-            // Did the factory return an array? If so, make it a list.
-            if (params.getClass().isArray()) {
-                params = Arrays.asList((Object[]) params);
-            }
+        if (!AbstractTB3Test.class.isAssignableFrom(getTestClass()
+                .getJavaClass())) {
+            throw new RuntimeException(getClass().getName() + " only supports "
+                    + AbstractTB3Test.class.getName());
+        }
 
-            // Did the factory return a scalar object? If so, put it in a list.
-            if (!(params instanceof Iterable<?>)) {
-                params = Collections.singletonList(params);
-            }
+        try {
+            AbstractTB3Test testClassInstance = (AbstractTB3Test) getTestClass()
+                    .getOnlyConstructor().newInstance();
+            for (DesiredCapabilities capabilities : testClassInstance
+                    .getBrowsersToTest()) {
 
-            // For each object returned by the factory.
-            for (Object param : (Iterable<?>) params) {
-                if (!(param instanceof DesiredCapabilities)) {
-                    throw new RuntimeException("Unexpected parameter type "
-                            + param.getClass().getName()
-                            + " when expecting DesiredCapabilities");
-                }
-                DesiredCapabilities capabilities = (DesiredCapabilities) param;
                 // Find any methods marked with @Test.
                 for (FrameworkMethod m : getTestClass().getAnnotatedMethods(
                         Test.class)) {
                     tests.add(new TB3Method(m.getMethod(), capabilities));
                 }
             }
+        } catch (Exception e) {
+            throw new RuntimeException("Error retrieving browsers to run on", e);
         }
 
         return tests;
diff --git a/uitest/src/com/vaadin/tests/tb3/WebsocketTest.java b/uitest/src/com/vaadin/tests/tb3/WebsocketTest.java
new file mode 100644
index 0000000000..5c6ea329f5
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/tb3/WebsocketTest.java
@@ -0,0 +1,60 @@
+/*
+ * 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.tb3;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.openqa.selenium.remote.DesiredCapabilities;
+
+/**
+ * A {@link MultiBrowserTest} which restricts the tests to the browsers which
+ * support websocket
+ * 
+ * @author Vaadin Ltd
+ */
+public abstract class WebsocketTest extends PrivateTB3Configuration {
+    private static List<DesiredCapabilities> websocketBrowsers = new ArrayList<DesiredCapabilities>();
+    static {
+        websocketBrowsers.addAll(MultiBrowserTest.getAllBrowsers());
+        websocketBrowsers.remove(BrowserUtil.ie(8));
+        websocketBrowsers.remove(BrowserUtil.ie(9));
+    }
+
+    /**
+     * @return All supported browsers which are actively tested and support
+     *         websockets
+     */
+    public static Collection<DesiredCapabilities> getWebsocketBrowsers() {
+        return Collections.unmodifiableCollection(websocketBrowsers);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.tb3.AbstractTB3Test#getBrowserToRunOn()
+     */
+    @Override
+    public Collection<DesiredCapabilities> getBrowsersToTest() {
+        return getWebsocketBrowsers();
+    }
+}
-- 
cgit v1.2.3


From d3261d77a45a24edcb4e77370e12c8e88c119d35 Mon Sep 17 00:00:00 2001
From: John Ahlroos <john@vaadin.com>
Date: Thu, 19 Sep 2013 16:42:50 +0300
Subject: Fixes issue with Table not scrolling completely to the end #12651

Made the Table notice if the user is trying to scroll to an item on the
last "page" and in those cases actually scroll to that item, not just to
the page's first item as it did before.

Change-Id: I47df33c75aa9b7e4f9a5f4bd5daeb301028517e8
---
 client/src/com/vaadin/client/ui/VScrollTable.java  | 27 +++++----
 server/src/com/vaadin/ui/Table.java                | 32 +++++++++--
 .../tests/components/table/ShowLastItem.html       | 36 ++++++++++++
 .../tests/components/table/ShowLastItem.java       | 66 ++++++++++++++++++++++
 4 files changed, 143 insertions(+), 18 deletions(-)
 create mode 100644 uitest/src/com/vaadin/tests/components/table/ShowLastItem.html
 create mode 100644 uitest/src/com/vaadin/tests/components/table/ShowLastItem.java

(limited to 'uitest')

diff --git a/client/src/com/vaadin/client/ui/VScrollTable.java b/client/src/com/vaadin/client/ui/VScrollTable.java
index 3733ee204a..492730259a 100644
--- a/client/src/com/vaadin/client/ui/VScrollTable.java
+++ b/client/src/com/vaadin/client/ui/VScrollTable.java
@@ -176,6 +176,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
     private int firstRowInViewPort = 0;
     private int pageLength = 15;
     private int lastRequestedFirstvisible = 0; // to detect "serverside scroll"
+    private int firstvisibleOnLastPage = -1; // To detect if the first visible
+                                             // is on the last page
 
     /** For internal use only. May be removed or replaced in the future. */
     public boolean showRowHeaders = false;
@@ -1111,8 +1113,14 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
     private ScheduledCommand lazyScroller = new ScheduledCommand() {
         @Override
         public void execute() {
-            int offsetTop = measureRowHeightOffset(firstvisible);
-            scrollBodyPanel.setScrollPosition(offsetTop);
+            if (firstvisibleOnLastPage > -1) {
+                scrollBodyPanel
+                        .setScrollPosition(measureRowHeightOffset(firstvisibleOnLastPage));
+            } else {
+                scrollBodyPanel
+                        .setScrollPosition(measureRowHeightOffset(firstvisible));
+            }
+            firstRowInViewPort = firstvisible;
         }
     };
 
@@ -1120,6 +1128,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
     public void updateFirstVisibleAndScrollIfNeeded(UIDL uidl) {
         firstvisible = uidl.hasVariable("firstvisible") ? uidl
                 .getIntVariable("firstvisible") : 0;
+        firstvisibleOnLastPage = uidl.hasVariable("firstvisibleonlastpage") ? uidl
+                .getIntVariable("firstvisibleonlastpage") : -1;
         if (firstvisible != lastRequestedFirstvisible && scrollBody != null) {
             // received 'surprising' firstvisible from server: scroll there
             firstRowInViewPort = firstvisible;
@@ -2150,18 +2160,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
 
         isNewBody = false;
 
-        if (firstvisible > 0) {
-            // Deferred due to some Firefox oddities
-            Scheduler.get().scheduleDeferred(new Command() {
-
-                @Override
-                public void execute() {
-                    scrollBodyPanel
-                            .setScrollPosition(measureRowHeightOffset(firstvisible));
-                    firstRowInViewPort = firstvisible;
-                }
-            });
-        }
+        Scheduler.get().scheduleFinally(lazyScroller);
 
         if (enabled) {
             // Do we need cache rows
diff --git a/server/src/com/vaadin/ui/Table.java b/server/src/com/vaadin/ui/Table.java
index bd2b7828de..32ed738697 100644
--- a/server/src/com/vaadin/ui/Table.java
+++ b/server/src/com/vaadin/ui/Table.java
@@ -426,6 +426,12 @@ public class Table extends AbstractSelect implements Action.Container,
      */
     private int currentPageFirstItemIndex = 0;
 
+    /**
+     * Index of the "first" item on the last page if a user has used
+     * setCurrentPageFirstItemIndex to scroll down. -1 if not set.
+     */
+    private int currentPageFirstItemIndexOnLastPage = -1;
+
     /**
      * Holds value of property selectable.
      */
@@ -1477,12 +1483,14 @@ public class Table extends AbstractSelect implements Action.Container,
         }
 
         /*
-         * FIXME #7607 Take somehow into account the case where we want to
-         * scroll to the bottom so that the last row is completely visible even
-         * if (table height) / (row height) is not an integer. Reverted the
-         * original fix because of #8662 regression.
+         * If the new index is on the last page we set the index to be the first
+         * item on that last page and make a note of the real index for the
+         * client side to be able to move the scroll position to the correct
+         * position.
          */
+        int indexOnLastPage = -1;
         if (newIndex > maxIndex) {
+            indexOnLastPage = newIndex;
             newIndex = maxIndex;
         }
 
@@ -1494,6 +1502,20 @@ public class Table extends AbstractSelect implements Action.Container,
                 currentPageFirstItemId = null;
             }
             currentPageFirstItemIndex = newIndex;
+
+            if (needsPageBufferReset) {
+                /*
+                 * The flag currentPageFirstItemIndexOnLastPage denotes a user
+                 * set scrolling position on the last page via
+                 * setCurrentPageFirstItemIndex() and shouldn't be changed by
+                 * the table component internally changing the firstvisible item
+                 * on lazy row fetching. Doing so would make the scrolling
+                 * position not be updated correctly when the lazy rows are
+                 * finally rendered.
+                 */
+                currentPageFirstItemIndexOnLastPage = indexOnLastPage;
+            }
+
         } else {
 
             // For containers not supporting indexes, we must iterate the
@@ -3447,6 +3469,8 @@ public class Table extends AbstractSelect implements Action.Container,
         if (getCurrentPageFirstItemIndex() != 0 || getPageLength() > 0) {
             target.addVariable(this, "firstvisible",
                     getCurrentPageFirstItemIndex());
+            target.addVariable(this, "firstvisibleonlastpage",
+                    currentPageFirstItemIndexOnLastPage);
         }
     }
 
diff --git a/uitest/src/com/vaadin/tests/components/table/ShowLastItem.html b/uitest/src/com/vaadin/tests/components/table/ShowLastItem.html
new file mode 100644
index 0000000000..c9c93198fa
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/table/ShowLastItem.html
@@ -0,0 +1,36 @@
+<?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" />
+<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.table.ShowLastItem?restartApplication</td>
+    <td></td>
+</tr>
+<tr>
+    <td>click</td>
+    <td>vaadin=runcomvaadintestscomponentstableShowLastItem::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+    <td></td>
+</tr>
+<tr>
+    <td>pause</td>
+    <td>1000</td>
+    <td></td>
+</tr>
+<tr>
+    <td>screenCapture</td>
+    <td></td>
+    <td>row-20-fully-visible</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/uitest/src/com/vaadin/tests/components/table/ShowLastItem.java b/uitest/src/com/vaadin/tests/components/table/ShowLastItem.java
new file mode 100644
index 0000000000..6d6f744918
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/table/ShowLastItem.java
@@ -0,0 +1,66 @@
+package com.vaadin.tests.components.table;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Table;
+
+public class ShowLastItem extends AbstractTestUI {
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
+     * VaadinRequest)
+     */
+    @Override
+    protected void setup(VaadinRequest request) {
+        final Table table = new Table();
+        table.setHeight("210px");
+
+        table.addContainerProperty("Col", String.class, "");
+
+        for (int i = 0; i < 20; i++) {
+            table.addItem(i).getItemProperty("Col")
+                    .setValue("row " + String.valueOf(i));
+        }
+
+        Button addItemBtn = new Button("Add item", new Button.ClickListener() {
+
+            @Override
+            public void buttonClick(ClickEvent event) {
+                Object itemId = "row " + table.getItemIds().size();
+
+                table.addItem(itemId).getItemProperty("Col")
+                        .setValue(String.valueOf(itemId));
+
+                table.setCurrentPageFirstItemIndex(table.getItemIds().size() - 1);
+            }
+        });
+
+        addComponent(table);
+        addComponent(addItemBtn);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
+     */
+    @Override
+    protected String getTestDescription() {
+        return "Show last item in Table by using setCurrentPageFirstItemId";
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
+     */
+    @Override
+    protected Integer getTicketNumber() {
+        return 12407;
+    }
+
+}
-- 
cgit v1.2.3


From bd0ae0581f265be57374b236cfe1b71043ab69aa Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Tue, 24 Sep 2013 18:19:45 +0300
Subject: Limit the number of tests run concurrently (#12572)

Change-Id: I015e92ccc9be963543032c14dd9d051bcba58e53
---
 uitest/src/com/vaadin/tests/tb3/ParallelScheduler.java | 13 +++++++++++--
 uitest/src/com/vaadin/tests/tb3/TB3Runner.java         | 16 +++++++++++++++-
 uitest/src/com/vaadin/tests/tb3/TB3TestSuite.java      | 17 ++++++++++++++++-
 3 files changed, 42 insertions(+), 4 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/tb3/ParallelScheduler.java b/uitest/src/com/vaadin/tests/tb3/ParallelScheduler.java
index f8013169fa..912d7d010e 100644
--- a/uitest/src/com/vaadin/tests/tb3/ParallelScheduler.java
+++ b/uitest/src/com/vaadin/tests/tb3/ParallelScheduler.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
 import org.junit.runners.model.RunnerScheduler;
@@ -33,8 +32,18 @@ import org.junit.runners.model.RunnerScheduler;
  */
 public class ParallelScheduler implements RunnerScheduler {
     private final List<Future<Object>> fResults = new ArrayList<Future<Object>>();
+    private ExecutorService fService;
 
-    private final ExecutorService fService = Executors.newCachedThreadPool();
+    /**
+     * Creates a parallel scheduler which will use the given executor service
+     * when submitting test jobs.
+     * 
+     * @param service
+     *            The service to use for tests
+     */
+    public ParallelScheduler(ExecutorService service) {
+        fService = service;
+    }
 
     @Override
     public void schedule(final Runnable childStatement) {
diff --git a/uitest/src/com/vaadin/tests/tb3/TB3Runner.java b/uitest/src/com/vaadin/tests/tb3/TB3Runner.java
index 5860ac42c0..b612b17caa 100644
--- a/uitest/src/com/vaadin/tests/tb3/TB3Runner.java
+++ b/uitest/src/com/vaadin/tests/tb3/TB3Runner.java
@@ -19,6 +19,8 @@ package com.vaadin.tests.tb3;
 import java.lang.reflect.Method;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import org.junit.Test;
 import org.junit.runners.BlockJUnit4ClassRunner;
@@ -40,9 +42,21 @@ import com.vaadin.tests.tb3.AbstractTB3Test.BrowserUtil;
  */
 public class TB3Runner extends BlockJUnit4ClassRunner {
 
+    /**
+     * This is the total limit of actual JUnit test instances run in parallel
+     */
+    private static final int MAX_CONCURRENT_TESTS = 50;
+
+    /**
+     * This is static so it is shared by all tests running concurrently on the
+     * same machine and thus can limit the number of threads in use.
+     */
+    private static final ExecutorService service = Executors
+            .newFixedThreadPool(MAX_CONCURRENT_TESTS);
+
     public TB3Runner(Class<?> klass) throws InitializationError {
         super(klass);
-        setScheduler(new ParallelScheduler());
+        setScheduler(new ParallelScheduler(service));
     }
 
     @Override
diff --git a/uitest/src/com/vaadin/tests/tb3/TB3TestSuite.java b/uitest/src/com/vaadin/tests/tb3/TB3TestSuite.java
index dc187000d2..e1c8edfd60 100644
--- a/uitest/src/com/vaadin/tests/tb3/TB3TestSuite.java
+++ b/uitest/src/com/vaadin/tests/tb3/TB3TestSuite.java
@@ -28,6 +28,8 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.Enumeration;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.jar.JarEntry;
 
 import org.junit.runners.Suite;
@@ -41,11 +43,24 @@ import org.junit.runners.model.InitializationError;
  */
 public class TB3TestSuite extends Suite {
 
+    /**
+     * This only restricts the number of test suites running concurrently. The
+     * number of tests to run concurrently are configured in {@link TB3Runner}.
+     */
+    private static final int MAX_CONCURRENT_TEST_SUITES = 20;
+
+    /**
+     * This is static so it is shared by all test suites running concurrently on
+     * the same machine and thus can limit the number of threads in use.
+     */
+    private final ExecutorService service = Executors
+            .newFixedThreadPool(MAX_CONCURRENT_TEST_SUITES);
+
     public TB3TestSuite(Class<?> klass,
             Class<? extends AbstractTB3Test> baseClass, String basePackage,
             String[] ignorePackages) throws InitializationError {
         super(klass, findTests(baseClass, basePackage, ignorePackages));
-        setScheduler(new ParallelScheduler());
+        setScheduler(new ParallelScheduler(service));
     }
 
     /**
-- 
cgit v1.2.3


From 5fb1da2da04ccca2305af31a9105b848e42b1ed6 Mon Sep 17 00:00:00 2001
From: John Ahlroos <john@vaadin.com>
Date: Wed, 25 Sep 2013 13:51:23 +0300
Subject: Publish error artifacts immediatly in TeamCity

Change-Id: I69cb2208b7f6b3263ddb25fa26eebebcc6f9a7c3
---
 uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java | 12 +++++++++++-
 uitest/test.xml                                        |  4 ++++
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java b/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
index 645d9cd0cb..565d04fdb9 100644
--- a/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
@@ -31,6 +31,7 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.rules.TestRule;
 import org.junit.rules.TestWatcher;
+import org.junit.runner.Description;
 import org.openqa.selenium.OutputType;
 import org.openqa.selenium.TakesScreenshot;
 import org.openqa.selenium.remote.DesiredCapabilities;
@@ -65,7 +66,16 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
             }
 
             screenshotBaseName = className + "-" + testMethod;
-        };
+        }
+
+        @Override
+        protected void failed(Throwable e, Description description) {
+
+            // Notify Teamcity of failed test
+            System.out.print("##teamcity[publishArtifacts '");
+            System.out.println(getScreenshotErrorDirectory() + "/"
+                    + getScreenshotBaseName() + "* => screenshot-errors']");
+        }
     };
 
     /**
diff --git a/uitest/test.xml b/uitest/test.xml
index dd6964e59c..88b5238c09 100644
--- a/uitest/test.xml
+++ b/uitest/test.xml
@@ -134,6 +134,10 @@
             </batchtest>
         </junit>
 
+        <!-- Have teamcity publish each test error artifact immediatly if there are any -->
+        <basename property="basename" file="${target}" suffix="java" />
+        <echo>##teamcity[publishArtifacts '${com.vaadin.testbench.screenshot.directory}/errors/${basename}* => screenshot-errors']</echo>
+
     </target>
 
     <!-- Remove temporary source and compiled java files -->
-- 
cgit v1.2.3


From 649735f755c51e5c11d5ebe984e7a308fe97552a Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 27 Sep 2013 13:12:35 +0300
Subject: Added user agent for IE 11 (#12631)

Change-Id: I1ba1791c04a3d1685e1bc482d2b04a748e19f012
---
 uitest/src/com/vaadin/tests/VerifyBrowserVersion.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java b/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java
index 59663a78d6..ae6f0afa4d 100644
--- a/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java
+++ b/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java
@@ -31,6 +31,9 @@ public class VerifyBrowserVersion extends TestBase {
             expectedUserAgent
                     .put(BrowserUtil.ie(10),
                             "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)");
+            expectedUserAgent
+                    .put(BrowserUtil.ie(11),
+                            "Mozilla/5.0 (Windows NT 6.1; Trident/7.0; rv:11.0) like Gecko");
             expectedUserAgent
                     .put(BrowserUtil.chrome(29),
                             "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.76 Safari/537.36");
-- 
cgit v1.2.3


From b235d9c4e166197f3369694feec8d8f12a93c49d Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 27 Sep 2013 13:14:36 +0300
Subject: Refactor how TB3 tests are written (#12572)

* openTestUrl() must be called in the beginning of each test. Before that setPush and setDebug can be used to determine whether /run-push or ?debug should be used in the URL

Change-Id: Ie70996fcbdb2769fcd4ec56cb878e20198e02bf6
---
 .../src/com/vaadin/tests/VerifyBrowserVersion.java |  1 +
 .../vaadin/tests/components/label/LabelModes.java  |  1 +
 .../com/vaadin/tests/components/ui/UIAccess.java   |  7 +-
 uitest/src/com/vaadin/tests/push/BarInUIDL.java    |  1 +
 uitest/src/com/vaadin/tests/push/BasicPush.java    |  2 +
 .../com/vaadin/tests/push/BasicPushStreaming.java  |  8 --
 .../vaadin/tests/push/PushConfigurationTest.java   |  7 +-
 uitest/src/com/vaadin/tests/push/PushFromInit.java |  2 +
 .../vaadin/tests/push/PushReattachedComponent.java |  8 +-
 uitest/src/com/vaadin/tests/push/TogglePush.java   | 62 +++-------------
 .../tests/push/TrackMessageSizeUnitTests.java      |  1 +
 .../src/com/vaadin/tests/tb3/AbstractTB3Test.java  | 85 ++++++++++++++++------
 12 files changed, 87 insertions(+), 98 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java b/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java
index ae6f0afa4d..47c09bdfd7 100644
--- a/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java
+++ b/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java
@@ -45,6 +45,7 @@ public class VerifyBrowserVersion extends TestBase {
 
         @Test
         public void verifyUserAgent() {
+            openTestURL();
             Assert.assertEquals(
                     expectedUserAgent.get(getDesiredCapabilities()),
                     vaadinElementById("userAgent").getText());
diff --git a/uitest/src/com/vaadin/tests/components/label/LabelModes.java b/uitest/src/com/vaadin/tests/components/label/LabelModes.java
index 1959447a4b..9e51978743 100644
--- a/uitest/src/com/vaadin/tests/components/label/LabelModes.java
+++ b/uitest/src/com/vaadin/tests/components/label/LabelModes.java
@@ -10,6 +10,7 @@ public class LabelModes extends ComponentTestCase<Label> {
     public static class LabelModesTest extends SimpleMultiBrowserTest {
         @Override
         public void test() throws Exception {
+            openTestURL();
             compareScreen("labelmodes");
         }
 
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIAccess.java b/uitest/src/com/vaadin/tests/components/ui/UIAccess.java
index 057dcaa917..7515b3ede8 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIAccess.java
+++ b/uitest/src/com/vaadin/tests/components/ui/UIAccess.java
@@ -40,13 +40,10 @@ import com.vaadin.util.CurrentInstance;
 public class UIAccess extends AbstractTestUIWithLog {
 
     public static class UIAccessTest extends MultiBrowserTest {
-        @Override
-        protected boolean isPushEnabled() {
-            return true;
-        }
-
         @Test
         public void testThreadLocals() {
+            setPush(true);
+            openTestURL();
             getCurrentInstanceWhenPushingButton().click();
             waitUntil(ExpectedConditions.textToBePresentInElement(
                     vaadinLocatorById("Log_row_0"), "1."));
diff --git a/uitest/src/com/vaadin/tests/push/BarInUIDL.java b/uitest/src/com/vaadin/tests/push/BarInUIDL.java
index ef2568bebe..ebf349683d 100644
--- a/uitest/src/com/vaadin/tests/push/BarInUIDL.java
+++ b/uitest/src/com/vaadin/tests/push/BarInUIDL.java
@@ -35,6 +35,7 @@ public class BarInUIDL extends AbstractTestUI {
     public static class BarInUIDLTest extends MultiBrowserTest {
         @Test
         public void sendBarInUIDL() {
+            openTestURL();
             getButton().click();
             Assert.assertEquals(
                     "Thank you for clicking | bar",
diff --git a/uitest/src/com/vaadin/tests/push/BasicPush.java b/uitest/src/com/vaadin/tests/push/BasicPush.java
index 1f184863f7..d1a9fb575f 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPush.java
+++ b/uitest/src/com/vaadin/tests/push/BasicPush.java
@@ -39,6 +39,8 @@ public class BasicPush extends AbstractTestUI {
 
         @Test
         public void testPush() {
+            openTestURL();
+
             // Test client initiated push
             Assert.assertEquals(0, getClientCounter());
             getIncrementButton().click();
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushStreaming.java b/uitest/src/com/vaadin/tests/push/BasicPushStreaming.java
index 29534e1f5c..b63f782cc9 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushStreaming.java
+++ b/uitest/src/com/vaadin/tests/push/BasicPushStreaming.java
@@ -15,8 +15,6 @@
  */
 package com.vaadin.tests.push;
 
-import org.junit.Test;
-
 import com.vaadin.annotations.Push;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.ui.Transport;
@@ -32,11 +30,5 @@ public class BasicPushStreaming extends BasicPush {
     }
 
     public static class BasicPushStreamingTest extends BasicPushTest {
-        @Override
-        @Test
-        public void testPush() {
-            super.testPush();
-        }
     }
-
 }
diff --git a/uitest/src/com/vaadin/tests/push/PushConfigurationTest.java b/uitest/src/com/vaadin/tests/push/PushConfigurationTest.java
index f4a537392d..5100e8a4ea 100644
--- a/uitest/src/com/vaadin/tests/push/PushConfigurationTest.java
+++ b/uitest/src/com/vaadin/tests/push/PushConfigurationTest.java
@@ -37,13 +37,10 @@ public class PushConfigurationTest extends AbstractTestUI {
 
     public static class PushConfigurationWebsocket extends WebsocketTest {
 
-        @Override
-        protected boolean isDebug() {
-            return true;
-        }
-
         @Test
         public void testWebsocketAndStreaming() {
+            setDebug(true);
+            openTestURL();
             // Websocket
             Assert.assertEquals(1, getServerCounter());
             new Select(getTransportSelect()).selectByVisibleText("WEBSOCKET");
diff --git a/uitest/src/com/vaadin/tests/push/PushFromInit.java b/uitest/src/com/vaadin/tests/push/PushFromInit.java
index 000d5c0bce..de3334f707 100644
--- a/uitest/src/com/vaadin/tests/push/PushFromInit.java
+++ b/uitest/src/com/vaadin/tests/push/PushFromInit.java
@@ -28,6 +28,8 @@ public class PushFromInit extends AbstractTestUIWithLog {
     public static class PushFromInitTB3 extends MultiBrowserTest {
         @Test
         public void testPushFromInit() {
+            openTestURL();
+
             for (int second = 0;; second++) {
                 if (second >= 30) {
                     Assert.fail("timeout");
diff --git a/uitest/src/com/vaadin/tests/push/PushReattachedComponent.java b/uitest/src/com/vaadin/tests/push/PushReattachedComponent.java
index 35934273a4..0bc796e0ee 100644
--- a/uitest/src/com/vaadin/tests/push/PushReattachedComponent.java
+++ b/uitest/src/com/vaadin/tests/push/PushReattachedComponent.java
@@ -27,11 +27,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 
 public class PushReattachedComponent extends MultiBrowserTest {
 
-    @Override
-    protected boolean isPushEnabled() {
-        return true;
-    }
-
     @Override
     protected Class<?> getUIClass() {
         return PanelChangeContents.class;
@@ -39,6 +34,9 @@ public class PushReattachedComponent extends MultiBrowserTest {
 
     @Test
     public void testReattachComponentUsingPush() {
+        setPush(true);
+        openTestURL();
+
         Assert.assertEquals(
                 "stats",
                 vaadinElement(
diff --git a/uitest/src/com/vaadin/tests/push/TogglePush.java b/uitest/src/com/vaadin/tests/push/TogglePush.java
index f59ef83fe7..3ef369b408 100644
--- a/uitest/src/com/vaadin/tests/push/TogglePush.java
+++ b/uitest/src/com/vaadin/tests/push/TogglePush.java
@@ -34,30 +34,12 @@ import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Label;
 
 public class TogglePush extends AbstractTestUI {
-    public static class TogglePushInInitTB3 extends MultiBrowserTest {
-        @Override
-        protected boolean isPushEnabled() {
-            return true;
-        }
-
-        /*
-         * (non-Javadoc)
-         * 
-         * @see com.vaadin.tests.tb3.AbstractTB3Test#getTestUrl()
-         */
-        @Override
-        protected String getTestUrl() {
-            return null;
-        }
+    public static class TogglePushTB3 extends MultiBrowserTest {
 
         @Test
         public void togglePushInInit() {
-            String baseUrl = getBaseURL();
-            if (baseUrl.endsWith("/")) {
-                baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
-            }
-
-            String url = baseUrl + getDeploymentPath();
+            setPush(true);
+            String url = getTestUrl();
 
             // Open with push disabled
             driver.get(addParameter(url, "push=disabled"));
@@ -80,12 +62,6 @@ public class TogglePush extends AbstractTestUI {
 
         }
 
-        /**
-         * @since
-         * @param url
-         * @param string
-         * @return
-         */
         private String addParameter(String url, String queryParameter) {
             if (url.contains("?")) {
                 return url + "&" + queryParameter;
@@ -94,31 +70,10 @@ public class TogglePush extends AbstractTestUI {
             }
         }
 
-        private String getCounterText() {
-            return vaadinElement(
-                    "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VLabel[0]")
-                    .getText();
-        }
-
-        private WebElement getPushToggle() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VCheckBox[0]/domChild[0]");
-        }
-
-        private WebElement getDelayedCounterUpdateButton() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]");
-        }
-
-    }
-
-    public static class TogglePushTB3 extends MultiBrowserTest {
-
-        @Override
-        protected boolean isPushEnabled() {
-            return true;
-        }
-
         @Test
         public void togglePush() {
+            setPush(true);
+            openTestURL();
             getDelayedCounterUpdateButton().click();
             sleep(2000);
 
@@ -157,15 +112,16 @@ public class TogglePush extends AbstractTestUI {
             return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VCheckBox[0]/domChild[0]");
         }
 
+        private WebElement getDelayedCounterUpdateButton() {
+            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]");
+        }
+
         private String getCounterText() {
             return vaadinElement(
                     "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VLabel[0]")
                     .getText();
         }
 
-        private WebElement getDelayedCounterUpdateButton() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]");
-        }
     }
 
     private final Label counterLabel = new Label();
diff --git a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUnitTests.java b/uitest/src/com/vaadin/tests/push/TrackMessageSizeUnitTests.java
index d7459f83ab..cb3033aa58 100644
--- a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUnitTests.java
+++ b/uitest/src/com/vaadin/tests/push/TrackMessageSizeUnitTests.java
@@ -43,6 +43,7 @@ public class TrackMessageSizeUnitTests extends AbstractTestUIWithLog {
     public static class TrackMessageSizeUnitTestsTB3 extends MultiBrowserTest {
         @Test
         public void runTests() {
+            openTestURL();
             Assert.assertEquals("1. All tests run",
                     vaadinElementById("Log_row_0").getText());
         }
diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
index 1897728366..054492444d 100644
--- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -47,11 +47,10 @@ import com.vaadin.ui.UI;
  * <ul>
  * <li>Helpers for browser selection</li>
  * <li>Hub connection setup and teardown</li>
- * <li>Automatic opening of a given test on the development server using
- * {@link #getUIClass()} or by automatically finding an enclosing UI class</li>
+ * <li>Automatic generation of URL for a given test on the development server
+ * using {@link #getUIClass()} or by automatically finding an enclosing UI class
+ * and based on requested features, e.g. {@link #isDebug()}, {@link #isPush()}</li>
  * <li>Generic helpers for creating TB3+ tests</li>
- * <li>Automatic URL generation based on needed features, e.g.
- * {@link #isDebug()}, {@link #isPushEnabled()}</li>
  * </ul>
  * 
  * @author Vaadin Ltd
@@ -69,6 +68,10 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
     private static final int SCREENSHOT_WIDTH = 1500;
 
     private DesiredCapabilities desiredCapabilities;
+
+    private boolean debug = false;
+
+    private boolean push = false;
     {
         // Default browser to run on unless setDesiredCapabilities is called
         desiredCapabilities = BrowserUtil.firefox(24);
@@ -83,11 +86,6 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
     @Before
     public void setup() throws Exception {
         setupDriver();
-
-        String testUrl = getTestUrl();
-        if (testUrl != null) {
-            driver.get(testUrl);
-        }
     }
 
     /**
@@ -125,9 +123,20 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
     }
 
     /**
-     * Returns the full URL to be opened when the test starts.
+     * Opens the given test (defined by {@link #getTestUrl(boolean, boolean)},
+     * optionally with debug window and/or push
+     * 
+     * @param debug
+     * @param push
+     */
+    protected void openTestURL() {
+        driver.get(getTestUrl());
+    }
+
+    /**
+     * Returns the full URL to be used for the test
      * 
-     * @return the full URL to open or null to not open any URL automatically
+     * @return the full URL for the test
      */
     protected String getTestUrl() {
         String baseUrl = getBaseURL();
@@ -292,7 +301,12 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
      * Returns the path that should be used for the test. The path contains the
      * full path (appended to hostname+port) and must start with a slash.
      * 
-     * @return The path to open automatically when the test starts
+     * @param push
+     *            true if "?debug" should be added
+     * @param debug
+     *            true if /run-push should be used instead of /run
+     * 
+     * @return The URL path to the UI class to test
      */
     protected String getDeploymentPath() {
         Class<?> uiClass = getUIClass();
@@ -325,24 +339,47 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
     }
 
     /**
-     * Determines whether to run the test in debug mode (with the debug console
+     * Returns whether to run the test in debug mode (with the debug console
      * open) or not
      * 
      * @return true to run with the debug window open, false by default
      */
-    protected boolean isDebug() {
-        return false;
+    protected final boolean isDebug() {
+        return debug;
     }
 
     /**
-     * Determines whether to run the test with push enabled (using /run-push) or
+     * Sets whether to run the test in debug mode (with the debug console open)
+     * or not.
+     * 
+     * @param debug
+     *            true to open debug window, false otherwise
+     */
+    protected final void setDebug(boolean debug) {
+        this.debug = debug;
+    }
+
+    /**
+     * Returns whether to run the test with push enabled (using /run-push) or
      * not. Note that push tests can and should typically be created using @Push
      * on the UI instead of overriding this method
      * 
-     * @return true to use push in the test, false to use whatever UI specifies
+     * @return true if /run-push is used, false otherwise
+     */
+    protected final boolean isPush() {
+        return push;
+    }
+
+    /**
+     * Sets whether to run the test with push enabled (using /run-push) or not.
+     * Note that push tests can and should typically be created using @Push on
+     * the UI instead of overriding this method
+     * 
+     * @param push
+     *            true to use /run-push in the test, false otherwise
      */
-    protected boolean isPushEnabled() {
-        return false;
+    protected final void setPush(boolean push) {
+        this.push = push;
     }
 
     /**
@@ -350,15 +387,19 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
      * The path contains the full path (appended to hostname+port) and must
      * start with a slash.
      * 
-     * This method takes into account {@link #isPushEnabled()} and
-     * {@link #isDebug()} when the path is generated.
+     * This method takes into account {@link #isPush()} and {@link #isDebug()}
+     * when the path is generated.
      * 
      * @param uiClass
+     * @param push
+     *            true if "?debug" should be added
+     * @param debug
+     *            true if /run-push should be used instead of /run
      * @return The path to the given UI class
      */
     private String getDeploymentPath(Class<?> uiClass) {
         String runPath = "/run";
-        if (isPushEnabled()) {
+        if (isPush()) {
             runPath = "/run-push";
         }
 
-- 
cgit v1.2.3


From 2bbb36705385f7c1bafce7eb527d5e66875b689c Mon Sep 17 00:00:00 2001
From: Henrik Paul <henrik@vaadin.com>
Date: Tue, 1 Oct 2013 10:27:12 +0300
Subject: Moved test class to appropriate source folder (#12337)

Change-Id: I01b25109a487bd0b9ff6a7903564ee5c867d6a33
---
 .../TableRemovedQuicklySendsInvalidRpcCalls.java   | 107 ---------------------
 .../TableRemovedQuicklySendsInvalidRpcCalls.java   | 107 +++++++++++++++++++++
 2 files changed, 107 insertions(+), 107 deletions(-)
 delete mode 100644 server/tests/src/com/vaadin/tests/server/component/table/TableRemovedQuicklySendsInvalidRpcCalls.java
 create mode 100644 uitest/src/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java

(limited to 'uitest')

diff --git a/server/tests/src/com/vaadin/tests/server/component/table/TableRemovedQuicklySendsInvalidRpcCalls.java b/server/tests/src/com/vaadin/tests/server/component/table/TableRemovedQuicklySendsInvalidRpcCalls.java
deleted file mode 100644
index b539e42efe..0000000000
--- a/server/tests/src/com/vaadin/tests/server/component/table/TableRemovedQuicklySendsInvalidRpcCalls.java
+++ /dev/null
@@ -1,107 +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.server.component.table;
-
-import com.vaadin.annotations.Push;
-import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.ItemClickEvent.ItemClickListener;
-import com.vaadin.server.VaadinRequest;
-import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Table;
-
-@Push
-public class TableRemovedQuicklySendsInvalidRpcCalls extends AbstractTestUI {
-
-    @Override
-    protected void setup(VaadinRequest request) {
-        addComponent(new Button("Blink a table", new Button.ClickListener() {
-            @Override
-            public void buttonClick(ClickEvent event) {
-                blinkTable();
-            }
-        }));
-    }
-
-    private void blinkTable() {
-        final Table table = new Table();
-        table.setPageLength(5);
-        table.addContainerProperty(new Object(), String.class, null);
-
-        for (int i = 0; i < 50; i++) {
-            table.addItem(new Object[] { "Row" }, new Object());
-        }
-
-        table.addItemClickListener(new ItemClickListener() {
-            private int i;
-
-            @Override
-            public void itemClick(ItemClickEvent event) {
-                /*
-                 * Ignore implementation. This is only an easy way to make the
-                 * client-side update table's variables (by furiously clicking
-                 * on the table row.
-                 * 
-                 * This way, we get variable changes queued. The push call will
-                 * then remove the Table, while the variable changes being still
-                 * in the queue, leading to the issue as described in the
-                 * ticket.
-                 */
-                System.out.println("clicky " + (++i));
-            }
-        });
-
-        System.out.println("adding component");
-        addComponent(table);
-
-        new Thread() {
-            @Override
-            public void run() {
-                getSession().lock();
-                try {
-                    Thread.sleep(500);
-                    access(new Runnable() {
-                        @Override
-                        public void run() {
-                            System.out.println("removing component");
-                            removeComponent(table);
-                        }
-                    });
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                } finally {
-                    getSession().unlock();
-                }
-            };
-        }.start();
-    }
-
-    @Override
-    protected String getTestDescription() {
-        return "Adding and subsequently quickly removing a table "
-                + "should not leave any pending RPC calls waiting "
-                + "in a Timer. Issue can be reproduced by "
-                + "1) pressing the button 2) clicking furiously "
-                + "on a row in the table.";
-    }
-
-    @Override
-    protected Integer getTicketNumber() {
-        return 12337;
-    }
-}
diff --git a/uitest/src/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java b/uitest/src/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java
new file mode 100644
index 0000000000..6e4b62e4f7
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java
@@ -0,0 +1,107 @@
+/*
+ * 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.table;
+
+import com.vaadin.annotations.Push;
+import com.vaadin.event.ItemClickEvent;
+import com.vaadin.event.ItemClickEvent.ItemClickListener;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Table;
+
+@Push
+public class TableRemovedQuicklySendsInvalidRpcCalls extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        addComponent(new Button("Blink a table", new Button.ClickListener() {
+            @Override
+            public void buttonClick(ClickEvent event) {
+                blinkTable();
+            }
+        }));
+    }
+
+    private void blinkTable() {
+        final Table table = new Table();
+        table.setPageLength(5);
+        table.addContainerProperty(new Object(), String.class, null);
+
+        for (int i = 0; i < 50; i++) {
+            table.addItem(new Object[] { "Row" }, new Object());
+        }
+
+        table.addItemClickListener(new ItemClickListener() {
+            private int i;
+
+            @Override
+            public void itemClick(ItemClickEvent event) {
+                /*
+                 * Ignore implementation. This is only an easy way to make the
+                 * client-side update table's variables (by furiously clicking
+                 * on the table row.
+                 * 
+                 * This way, we get variable changes queued. The push call will
+                 * then remove the Table, while the variable changes being still
+                 * in the queue, leading to the issue as described in the
+                 * ticket.
+                 */
+                System.out.println("clicky " + (++i));
+            }
+        });
+
+        System.out.println("adding component");
+        addComponent(table);
+
+        new Thread() {
+            @Override
+            public void run() {
+                getSession().lock();
+                try {
+                    Thread.sleep(500);
+                    access(new Runnable() {
+                        @Override
+                        public void run() {
+                            System.out.println("removing component");
+                            removeComponent(table);
+                        }
+                    });
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                } finally {
+                    getSession().unlock();
+                }
+            };
+        }.start();
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Adding and subsequently quickly removing a table "
+                + "should not leave any pending RPC calls waiting "
+                + "in a Timer. Issue can be reproduced by "
+                + "1) pressing the button 2) clicking furiously "
+                + "on a row in the table.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 12337;
+    }
+}
-- 
cgit v1.2.3


From 478acb8e9aa7505cc6eacf219e87202191810a39 Mon Sep 17 00:00:00 2001
From: Juho Nurminen <juho@vaadin.com>
Date: Mon, 23 Sep 2013 13:17:41 +0300
Subject: Check modifiers when handling TabSheet hot keys. Fixes #12178

Change-Id: I685dbf2c22e3b160632b811652bf3ab52d3ef6dc
---
 client/src/com/vaadin/client/ui/VTabsheet.java     | 18 ++++----
 .../tabsheet/TabSheetHotKeysWithModifiers.java     | 50 ++++++++++++++++++++++
 2 files changed, 60 insertions(+), 8 deletions(-)
 create mode 100644 uitest/src/com/vaadin/tests/components/tabsheet/TabSheetHotKeysWithModifiers.java

(limited to 'uitest')

diff --git a/client/src/com/vaadin/client/ui/VTabsheet.java b/client/src/com/vaadin/client/ui/VTabsheet.java
index fe29e2ebc0..7dec62bde0 100644
--- a/client/src/com/vaadin/client/ui/VTabsheet.java
+++ b/client/src/com/vaadin/client/ui/VTabsheet.java
@@ -1115,14 +1115,16 @@ public class VTabsheet extends VTabsheetBase implements Focusable,
         if (event.getSource() instanceof Tab) {
             int keycode = event.getNativeEvent().getKeyCode();
 
-            if (keycode == getPreviousTabKey()) {
-                selectPreviousTab();
-            } else if (keycode == getNextTabKey()) {
-                selectNextTab();
-            } else if (keycode == getCloseTabKey()) {
-                Tab tab = tb.getTab(activeTabIndex);
-                if (tab.isClosable()) {
-                    tab.onClose();
+            if (!event.isAnyModifierKeyDown()) {
+                if (keycode == getPreviousTabKey()) {
+                    selectPreviousTab();
+                } else if (keycode == getNextTabKey()) {
+                    selectNextTab();
+                } else if (keycode == getCloseTabKey()) {
+                    Tab tab = tb.getTab(activeTabIndex);
+                    if (tab.isClosable()) {
+                        tab.onClose();
+                    }
                 }
             }
         }
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetHotKeysWithModifiers.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetHotKeysWithModifiers.java
new file mode 100644
index 0000000000..c0b30ff68d
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetHotKeysWithModifiers.java
@@ -0,0 +1,50 @@
+/*
+ * 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.tabsheet;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TabSheet;
+
+public class TabSheetHotKeysWithModifiers extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        TabSheet tabSheet = new TabSheet();
+        tabSheet.setWidth("500px");
+        tabSheet.setHeight("500px");
+        tabSheet.addTab(new Label("Tab 1"), "Tab 1").setClosable(true);
+        tabSheet.addTab(new Label("Tab 2"), "Tab 2").setClosable(true);
+        tabSheet.addTab(new Label("Tab 3"), "Tab 3").setClosable(true);
+        setContent(tabSheet);
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Hot keys (left and right arrow keys and the delete key) should be ignored when they are pressed simultaneously with modifier keys";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 12178;
+    }
+
+}
-- 
cgit v1.2.3


From ffb33be8a15f3e82ca095901ca4fd2713eb229e6 Mon Sep 17 00:00:00 2001
From: Juho Nurminen <juho@vaadin.com>
Date: Tue, 1 Oct 2013 15:14:28 +0300
Subject: Update slider client-side state object on value change (#12676)

Change-Id: Ief93d845e5498388072e05a0faff7ef2d29f1c77
---
 .../vaadin/client/ui/slider/SliderConnector.java   |  1 +
 .../tests/components/slider/SliderDisable.java     | 81 ++++++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 uitest/src/com/vaadin/tests/components/slider/SliderDisable.java

(limited to 'uitest')

diff --git a/client/src/com/vaadin/client/ui/slider/SliderConnector.java b/client/src/com/vaadin/client/ui/slider/SliderConnector.java
index e6e3e0467d..71462d69f0 100644
--- a/client/src/com/vaadin/client/ui/slider/SliderConnector.java
+++ b/client/src/com/vaadin/client/ui/slider/SliderConnector.java
@@ -52,6 +52,7 @@ public class SliderConnector extends AbstractFieldConnector implements
 
     @Override
     public void onValueChange(ValueChangeEvent<Double> event) {
+        getState().value = event.getValue();
         rpc.valueChanged(event.getValue());
     }
 
diff --git a/uitest/src/com/vaadin/tests/components/slider/SliderDisable.java b/uitest/src/com/vaadin/tests/components/slider/SliderDisable.java
new file mode 100644
index 0000000000..ea29a1657c
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/slider/SliderDisable.java
@@ -0,0 +1,81 @@
+/*
+ * 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.slider;
+
+import java.io.IOException;
+
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.interactions.Actions;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.Slider;
+import com.vaadin.ui.VerticalLayout;
+
+public class SliderDisable extends AbstractTestUI {
+
+    public static class SliderDisableTest extends MultiBrowserTest {
+        @Test
+        public void disableSlider() throws IOException {
+            openTestURL();
+            WebElement element = vaadinElement("/VVerticalLayout[0]/Slot[0]/VSlider[0]/domChild[2]/domChild[0]");
+            new Actions(driver).dragAndDropBy(element, 112, 0).perform();
+            compareScreen("enabled");
+            vaadinElementById("disableButton").click();
+            compareScreen("disabled");
+        }
+    }
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        VerticalLayout content = new VerticalLayout();
+        content.setMargin(true);
+        content.setSpacing(true);
+
+        final Slider slider = new Slider(0, 5);
+        slider.setWidth(200, Unit.PIXELS);
+        slider.setValue(1.0D);
+
+        Button disableButton = new Button("Disable slider");
+        disableButton.setId("disableButton");
+        disableButton.addClickListener(new ClickListener() {
+            @Override
+            public void buttonClick(ClickEvent event) {
+                slider.setEnabled(false);
+            }
+        });
+
+        content.addComponent(slider);
+        content.addComponent(disableButton);
+        setContent(content);
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "The apparent value of the slider should not change when the slider is disabled";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 12676;
+    }
+
+}
-- 
cgit v1.2.3


From b8828e7270122930d21d9b561cde73a652d62f7a Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 2 Oct 2013 09:39:34 +0300
Subject: Only publish files actually produced by this test/browser

Change-Id: If4f66157791d642801c0100bb4bc0f293efe76cc
---
 uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java b/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
index 565d04fdb9..7f19a76ed6 100644
--- a/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
@@ -73,8 +73,8 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
 
             // Notify Teamcity of failed test
             System.out.print("##teamcity[publishArtifacts '");
-            System.out.println(getScreenshotErrorDirectory() + "/"
-                    + getScreenshotBaseName() + "* => screenshot-errors']");
+            System.out.println(getScreenshotErrorBaseName()
+                    + "* => screenshot-errors']");
         }
     };
 
-- 
cgit v1.2.3


From d0e604f6b509767c46ffe0fd6765cf23535f593e Mon Sep 17 00:00:00 2001
From: John Ahlroos <john@vaadin.com>
Date: Mon, 30 Sep 2013 14:45:43 +0300
Subject: Only print testbench failure TeamCity messages when running in TC

Change-Id: Ifa04ce512743bc8ccddea0bdca7b82cceaff150e
---
 uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java |  8 +++++---
 uitest/tb3test.xml                                     |  9 +++++++++
 uitest/test.xml                                        | 12 +++++++++---
 3 files changed, 23 insertions(+), 6 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java b/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
index 7f19a76ed6..94bcebde84 100644
--- a/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
@@ -72,9 +72,11 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
         protected void failed(Throwable e, Description description) {
 
             // Notify Teamcity of failed test
-            System.out.print("##teamcity[publishArtifacts '");
-            System.out.println(getScreenshotErrorBaseName()
-                    + "* => screenshot-errors']");
+            if (!System.getProperty("teamcity.version", "").equals("")) {
+                System.out.print("##teamcity[publishArtifacts '");
+                System.out.println(getScreenshotErrorBaseName()
+                        + "* => screenshot-errors']");
+            }
         }
     };
 
diff --git a/uitest/tb3test.xml b/uitest/tb3test.xml
index 92008ff9f3..de69e0ebe6 100644
--- a/uitest/tb3test.xml
+++ b/uitest/tb3test.xml
@@ -19,12 +19,21 @@
     <target name="run-tb3-suite">
         <fail unless="junit.test.suite" message="Define suite to run using junit.test.suite" />
         <fail unless="com.vaadin.testbench.screenshot.directory" message="Define screenshot directory using -Dcom.vaadin.testbench.screenshot.directory" />
+
+        <!-- Ensure teamcity.version is set to something -->
+        <condition property="teamcity.version" value="">
+            <not>
+                 <isset property="teamcity.version" />
+            </not>
+        </condition>
+
         <junit printsummary="withOutAndErr" fork="yes">
             <formatter usefile="false" type="plain" />
             <classpath refid="classpath.tb3" />
 
             <jvmarg value="-Dcom.vaadin.testbench.screenshot.directory=${com.vaadin.testbench.screenshot.directory}" />
             <jvmarg value="-Djava.awt.headless=true" />
+            <jvmarg value="-Dteamcity.version=${teamcity.version}" />
             <test name="${junit.test.suite}" />
         </junit>
 
diff --git a/uitest/test.xml b/uitest/test.xml
index 88b5238c09..c534d676b9 100644
--- a/uitest/test.xml
+++ b/uitest/test.xml
@@ -134,12 +134,18 @@
             </batchtest>
         </junit>
 
-        <!-- Have teamcity publish each test error artifact immediatly if there are any -->
-        <basename property="basename" file="${target}" suffix="java" />
-        <echo>##teamcity[publishArtifacts '${com.vaadin.testbench.screenshot.directory}/errors/${basename}* => screenshot-errors']</echo>
+        <antcall target="notify-teamcity-of-build-artifact">
+            <param name="file" value="${target}" />
+        </antcall>
 
     </target>
 
+	<!-- Have teamcity publish each test error artifact immediatly if there are any -->
+	<target name="notify-teamcity-of-build-artifact" if="teamcity.version">
+           <basename property="basename" file="${file}" suffix="java" />
+           <echo>##teamcity[publishArtifacts '${com.vaadin.testbench.screenshot.directory}/errors/${basename}* => screenshot-errors']</echo>
+	</target>
+
     <!-- Remove temporary source and compiled java files -->
     <target name="remove-temp-testclasses">
         <delete failonerror="false">
-- 
cgit v1.2.3


From 267a4cae6de31d143c3d8d1d8dd79d4616896603 Mon Sep 17 00:00:00 2001
From: Artem Godin <artem@vaadin.com>
Date: Wed, 2 Oct 2013 17:07:14 +0300
Subject: Fix OptionGroup elements losing focus on value change (#10451)

The misbehavior was caused by VOptionGroup.buildOptions recreating
associated panel on every change by removing and adding new elements.
With this fix applied it tries to update existing elements,
distinguishing them by assigned keys. It will recreate panel though if
elements are reordered or new elements were added/removed.

Change-Id: I1245b2ff30ce1932614c1eac37bd0131cbd29dd7
---
 client/src/com/vaadin/client/ui/VOptionGroup.java  | 67 +++++++++++++++------
 .../OptionGroupRetainFocusKeyboardValueChange.html | 54 +++++++++++++++++
 .../OptionGroupRetainFocusKeyboardValueChange.java | 70 ++++++++++++++++++++++
 3 files changed, 174 insertions(+), 17 deletions(-)
 create mode 100644 uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.html
 create mode 100644 uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.java

(limited to 'uitest')

diff --git a/client/src/com/vaadin/client/ui/VOptionGroup.java b/client/src/com/vaadin/client/ui/VOptionGroup.java
index a4c8b6733c..455c7669f5 100644
--- a/client/src/com/vaadin/client/ui/VOptionGroup.java
+++ b/client/src/com/vaadin/client/ui/VOptionGroup.java
@@ -95,11 +95,29 @@ public class VOptionGroup extends VOptionGroupBase implements FocusHandler,
     }
 
     /*
-     * Return true if no elements were changed, false otherwise.
+     * Try to update content of existing elements, rebuild panel entirely
+     * otherwise
      */
     @Override
     public void buildOptions(UIDL uidl) {
-        panel.clear();
+        /*
+         * In order to retain focus, we need to update values rather than
+         * recreate panel from scratch (#10451). However, the panel will be
+         * rebuilt (losing focus) if number of elements or their order is
+         * changed.
+         */
+        HashMap<String, CheckBox> keysToOptions = new HashMap<String, CheckBox>();
+        for (Map.Entry<CheckBox, String> entry : optionsToKeys.entrySet()) {
+            keysToOptions.put(entry.getValue(), entry.getKey());
+        }
+        ArrayList<Widget> existingwidgets = new ArrayList<Widget>();
+        ArrayList<Widget> newwidgets = new ArrayList<Widget>();
+
+        // Get current order of elements
+        for (Widget wid : panel) {
+            existingwidgets.add(wid);
+        }
+
         optionsEnabled.clear();
 
         if (isMultiselect()) {
@@ -110,7 +128,6 @@ public class VOptionGroup extends VOptionGroupBase implements FocusHandler,
 
         for (final Iterator<?> it = uidl.getChildIterator(); it.hasNext();) {
             final UIDL opUidl = (UIDL) it.next();
-            CheckBox op;
 
             String itemHtml = opUidl.getStringAttribute("caption");
             if (!htmlContentAllowed) {
@@ -124,32 +141,48 @@ public class VOptionGroup extends VOptionGroupBase implements FocusHandler,
                         + Icon.CLASSNAME + "\" alt=\"\" />" + itemHtml;
             }
 
-            if (isMultiselect()) {
-                op = new VCheckBox();
-                op.setHTML(itemHtml);
-            } else {
-                op = new RadioButton(paintableId, itemHtml, true);
-                op.setStyleName("v-radiobutton");
-            }
+            String key = opUidl.getStringAttribute("key");
+            CheckBox op = keysToOptions.get(key);
+            if (op == null) {
+                // Create a new element
+                if (isMultiselect()) {
+                    op = new VCheckBox();
+                } else {
+                    op = new RadioButton(paintableId);
+                    op.setStyleName("v-radiobutton");
+                }
+                if (icon != null && icon.length() != 0) {
+                    Util.sinkOnloadForImages(op.getElement());
+                    op.addHandler(iconLoadHandler, LoadEvent.getType());
+                }
 
-            if (icon != null && icon.length() != 0) {
-                Util.sinkOnloadForImages(op.getElement());
-                op.addHandler(iconLoadHandler, LoadEvent.getType());
+                op.addStyleName(CLASSNAME_OPTION);
+                op.addClickHandler(this);
+
+                optionsToKeys.put(op, key);
             }
 
-            op.addStyleName(CLASSNAME_OPTION);
+            op.setHTML(itemHtml);
             op.setValue(opUidl.getBooleanAttribute("selected"));
             boolean optionEnabled = !opUidl
                     .getBooleanAttribute(OptionGroupConstants.ATTRIBUTE_OPTION_DISABLED);
             boolean enabled = optionEnabled && !isReadonly() && isEnabled();
             op.setEnabled(enabled);
             optionsEnabled.add(optionEnabled);
+
             setStyleName(op.getElement(),
                     ApplicationConnection.DISABLED_CLASSNAME,
                     !(optionEnabled && isEnabled()));
-            op.addClickHandler(this);
-            optionsToKeys.put(op, opUidl.getStringAttribute("key"));
-            panel.add(op);
+
+            newwidgets.add(op);
+        }
+
+        if (!newwidgets.equals(existingwidgets)) {
+            // Rebuild the panel, losing focus
+            panel.clear();
+            for (Widget wid : newwidgets) {
+                panel.add(wid);
+            }
         }
     }
 
diff --git a/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.html b/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.html
new file mode 100644
index 0000000000..046cac0e30
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.html
@@ -0,0 +1,54 @@
+<?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>OptionGroupRetainFocusKeyboardValueChange</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">OptionGroupRetainFocusKeyboardValueChange</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/run/OptionGroupRetainFocusKeyboardValueChange?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runOptionGroupRetainFocusKeyboardValueChange::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VOptionGroup[0]/domChild[0]/domChild[0]</td>
+	<td>space</td>
+</tr>
+<!-- The element 'A' should be selected and focused -->
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runOptionGroupRetainFocusKeyboardValueChange::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VOptionGroup[0]/domChild[0]/domChild[0]</td>
+	<td>down</td>
+</tr>
+<!-- The element 'B' should be selected and focused, the caption of first element is changed from 'A' to 'A+' -->
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runOptionGroupRetainFocusKeyboardValueChange::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VOptionGroup[0]/domChild[1]/domChild[0]</td>
+	<td>down</td>
+</tr>
+<!-- Elements 'B' and 'C' should be swapped; 'C' selected but not focused  -->
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td></td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.java b/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.java
new file mode 100644
index 0000000000..570a300cb3
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.java
@@ -0,0 +1,70 @@
+/*
+ * 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.optiongroup;
+
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.OptionGroup;
+
+/**
+ * Testcase for #10451
+ * 
+ * @author Vaadin Ltd
+ */
+public class OptionGroupRetainFocusKeyboardValueChange extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        final OptionGroup optiongroup = new OptionGroup();
+        optiongroup.addItem(1);
+        optiongroup.addItem(2);
+        optiongroup.addItem(3);
+        optiongroup.setItemCaption(1, "A");
+        optiongroup.setItemCaption(2, "B");
+        optiongroup.setItemCaption(3, "C");
+        optiongroup.setImmediate(true);
+
+        optiongroup.addValueChangeListener(new ValueChangeListener() {
+
+            @Override
+            public void valueChange(ValueChangeEvent event) {
+                if (optiongroup.isSelected(2)) {
+                    optiongroup.setItemCaption(1, "A+");
+                } else if (optiongroup.isSelected(3)) {
+                    optiongroup.removeItem(2);
+                    optiongroup.addItem(2);
+                    optiongroup.setItemCaption(2, "B");
+                }
+            }
+        });
+
+        addComponent(optiongroup);
+
+        optiongroup.focus();
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "OptionGroup should retain focus after it's value being changed with keyboard";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 10451;
+    }
+}
-- 
cgit v1.2.3


From 07ca622a6b2edcf7a253762cf222155bdf460a88 Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti@vaadin.com>
Date: Fri, 27 Sep 2013 19:00:53 +0300
Subject: Fixes #12564 (HorizontalLayout breaks w/ alignment & error indicator)

Removed some obsolete (hopefully!?) code doing some odd things with caption height calculation  and some refactoring to make that part of code slightly more readable.

Change-Id: I960e4a9eba0388281868f18a182c8788cedf08f9
---
 .../AbstractOrderedLayoutConnector.java            | 32 ++++----
 ...orizontalLayoutFullsizeContentWithErrorMsg.java | 96 ++++++++++++++++++++++
 2 files changed, 111 insertions(+), 17 deletions(-)
 create mode 100644 uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java

(limited to 'uitest')

diff --git a/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java b/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
index e0dc0d51df..ec4307e50b 100644
--- a/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
@@ -19,6 +19,7 @@ import java.util.List;
 
 import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.user.client.Element;
+import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.client.ApplicationConnection;
 import com.vaadin.client.ComponentConnector;
 import com.vaadin.client.ConnectorHierarchyChangeEvent;
@@ -611,13 +612,14 @@ public abstract class AbstractOrderedLayoutConnector extends
         LayoutManager layoutManager = getLayoutManager();
 
         for (ComponentConnector child : getChildComponents()) {
-            Slot slot = getWidget().getSlot(child.getWidget());
+            Widget childWidget = child.getWidget();
+            Slot slot = getWidget().getSlot(childWidget);
             Element captionElement = slot.getCaptionElement();
-            CaptionPosition pos = slot.getCaptionPosition();
+            CaptionPosition captionPosition = slot.getCaptionPosition();
 
-            Element childElement = child.getWidget().getElement();
-            int h = layoutManager.getOuterHeight(childElement);
-            if (h == -1) {
+            int pixelHeight = layoutManager.getOuterHeight(childWidget
+                    .getElement());
+            if (pixelHeight == -1) {
                 // Height has not yet been measured -> postpone actions that
                 // depend on the max height
                 return -1;
@@ -625,14 +627,10 @@ public abstract class AbstractOrderedLayoutConnector extends
 
             boolean hasRelativeHeight = slot.hasRelativeHeight();
 
+            boolean captionSizeShouldBeAddedtoComponentHeight = captionPosition == CaptionPosition.TOP
+                    || captionPosition == CaptionPosition.BOTTOM;
             boolean includeCaptionHeight = captionElement != null
-                    && (pos == CaptionPosition.TOP || pos == CaptionPosition.BOTTOM);
-            if (!hasRelativeHeight && !includeCaptionHeight
-                    && captionElement != null) {
-                String sHeight = childElement.getStyle().getHeight();
-                includeCaptionHeight = (sHeight == null || !sHeight
-                        .endsWith("%"));
-            }
+                    && captionSizeShouldBeAddedtoComponentHeight;
 
             if (includeCaptionHeight) {
                 int captionHeight = layoutManager
@@ -643,16 +641,16 @@ public abstract class AbstractOrderedLayoutConnector extends
                     // depend on the max height
                     return -1;
                 }
-                h += captionHeight;
+                pixelHeight += captionHeight;
             }
 
             if (!hasRelativeHeight) {
-                if (h > highestNonRelative) {
-                    highestNonRelative = h;
+                if (pixelHeight > highestNonRelative) {
+                    highestNonRelative = pixelHeight;
                 }
             } else {
-                if (h > highestRelative) {
-                    highestRelative = h;
+                if (pixelHeight > highestRelative) {
+                    highestRelative = pixelHeight;
                 }
             }
         }
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java b/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java
new file mode 100644
index 0000000000..25675e07c5
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java
@@ -0,0 +1,96 @@
+package com.vaadin.tests.components.orderedlayout;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.Point;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.server.UserError;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.TextField;
+
+public class HorizontalLayoutFullsizeContentWithErrorMsg extends AbstractTestUI {
+
+    private static final String FIELD_ID = "f";
+    private static final String BUTTON_ID = "b";
+    private TextField tf;
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 12564;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
+     * VaadinRequest)
+     */
+    @Override
+    protected void setup(VaadinRequest request) {
+        HorizontalLayout hl = new HorizontalLayout();
+        hl.setWidth("500px");
+
+        tf = new TextField();
+        tf.setId(FIELD_ID);
+        tf.setWidth("100%");
+        hl.addComponent(tf);
+        hl.setExpandRatio(tf, 1);
+        hl.setComponentAlignment(tf, Alignment.MIDDLE_CENTER);
+
+        Button toggleError = new Button("Toggle error");
+        toggleError.setId(BUTTON_ID);
+        toggleError.addClickListener(new ClickListener() {
+            @Override
+            public void buttonClick(ClickEvent event) {
+                tf.setComponentError(tf.getComponentError() == null ? new UserError(
+                        "foo") : null);
+            }
+        });
+        hl.addComponent(toggleError);
+
+        addComponent(hl);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
+     */
+    @Override
+    protected String getTestDescription() {
+        return "TextField should remain at same level vertically, horizontally width should adjust to fit error indicator.";
+    }
+
+    public static class TbTest extends MultiBrowserTest {
+
+        @Test
+        public void test() {
+            openTestURL();
+            WebElement element = getDriver().findElement(By.id(FIELD_ID));
+            Point location = element.getLocation();
+
+            WebElement errorToggleButton = getDriver().findElement(
+                    By.id(BUTTON_ID));
+
+            errorToggleButton.click();
+
+            Assert.assertEquals(location, element.getLocation());
+
+            errorToggleButton.click();
+
+            Assert.assertEquals(location, element.getLocation());
+
+        }
+
+    }
+
+}
-- 
cgit v1.2.3


From 64530550abb89aa59d05f824e949f58ba05f1202 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 7 Oct 2013 20:49:18 +0300
Subject: Run tests on Tomcat 8 (#12326)

Change-Id: I99d91f16c5ad2dce6fb93f2862913b23518410d7
---
 uitest/integration_tests.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'uitest')

diff --git a/uitest/integration_tests.xml b/uitest/integration_tests.xml
index f1b2070bc8..1c9c2b1f8f 100644
--- a/uitest/integration_tests.xml
+++ b/uitest/integration_tests.xml
@@ -124,6 +124,12 @@
             <param name="target-server" value="tomcat7" />
         </antcall>
     </target>
+    <target name="integration-test-tomcat8">
+        <antcall target="run-generic-integration-test">
+            <param name="startDelay" value="10" />
+            <param name="target-server" value="tomcat8" />
+        </antcall>
+    </target>
     <target name="integration-test-tomcat5">
         <antcall target="run-generic-integration-test">
             <param name="startDelay" value="10" />
@@ -397,6 +403,7 @@
             <antcall target="integration-test-tomcat5" />
             <antcall target="integration-test-tomcat6" />
             <antcall target="integration-test-tomcat7" />
+            <antcall target="integration-test-tomcat8" />
             <antcall target="integration-test-websphere8" />
         </parallel>
 
-- 
cgit v1.2.3


From 10bcbdc652c6a61a0adbb8a8b357402ab1b65e2f Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 7 Oct 2013 20:16:15 +0300
Subject: Actually open integration test.

Regression since the change in test behavior (no longer automatically
opens test URL)

Change-Id: I1c4efc9b5b5c8a28818afa6f91af1a8b159354b4
---
 uitest/src/com/vaadin/tests/integration/ServletIntegrationTestTB3.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationTestTB3.java b/uitest/src/com/vaadin/tests/integration/ServletIntegrationTestTB3.java
index ae83083d85..2a2f8ab3d1 100644
--- a/uitest/src/com/vaadin/tests/integration/ServletIntegrationTestTB3.java
+++ b/uitest/src/com/vaadin/tests/integration/ServletIntegrationTestTB3.java
@@ -31,6 +31,7 @@ public abstract class ServletIntegrationTestTB3 extends
 
     @Test
     public void runTest() throws IOException, AssertionError {
+        openTestURL();
         compareScreen("initial");
 
         WebElement cell = vaadinElement(getTableCell(getTable(), 0, 1));
-- 
cgit v1.2.3


From 4f3cc4cef8c75a6f3a6af26e95509247a84c08b8 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 27 Sep 2013 13:44:00 +0300
Subject: Converted push test to TB3 (#12226, #12522)

Change-Id: Ia12b35ef6beed0bf2f534f2c9505b22ce7b3c7c3
---
 .../com/vaadin/tests/push/EnableDisablePush.html   | 97 ----------------------
 .../com/vaadin/tests/push/EnableDisablePush.java   | 60 ++++++++++++-
 .../src/com/vaadin/tests/tb3/AbstractTB3Test.java  | 25 ++++++
 3 files changed, 84 insertions(+), 98 deletions(-)
 delete mode 100644 uitest/src/com/vaadin/tests/push/EnableDisablePush.html

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/push/EnableDisablePush.html b/uitest/src/com/vaadin/tests/push/EnableDisablePush.html
deleted file mode 100644
index 87dfa8428f..0000000000
--- a/uitest/src/com/vaadin/tests/push/EnableDisablePush.html
+++ /dev/null
@@ -1,97 +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>EnableDisablePush</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">EnableDisablePush</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/run/EnableDisablePush?restartApplication</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runEnableDisablePush::PID_SLog_row_0</td>
-	<td>1. Push enabled</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runEnableDisablePush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runEnableDisablePush::PID_SLog_row_0</td>
-	<td>3. Push disabled</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runEnableDisablePush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runEnableDisablePush::PID_SLog_row_0</td>
-	<td>5. Poll enabled</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runEnableDisablePush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runEnableDisablePush::PID_SLog_row_0</td>
-	<td>7. Push enabled</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runEnableDisablePush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runEnableDisablePush::PID_SLog_row_0</td>
-	<td>9. Poll disabled</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runEnableDisablePush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runEnableDisablePush::PID_SLog_row_0</td>
-	<td>11. Push disabled, polling enabled</td>
-</tr>
-<tr>
-	<td>pause</td>
-	<td>3500</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runEnableDisablePush::PID_SLog_row_0</td>
-	<td>16. Polling disabled, push enabled</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runEnableDisablePush::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>vaadin=runEnableDisablePush::PID_SLog_row_0</td>
-	<td>18. Push disabled</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/uitest/src/com/vaadin/tests/push/EnableDisablePush.java b/uitest/src/com/vaadin/tests/push/EnableDisablePush.java
index 1911c66c2d..50dab43667 100644
--- a/uitest/src/com/vaadin/tests/push/EnableDisablePush.java
+++ b/uitest/src/com/vaadin/tests/push/EnableDisablePush.java
@@ -1,19 +1,74 @@
 package com.vaadin.tests.push;
 
+import static org.junit.Assert.assertEquals;
+
 import java.util.Date;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.TimeUnit;
 
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.communication.PushMode;
 import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.UIDetachedException;
 
 public class EnableDisablePush extends AbstractTestUI {
 
+    public static class EnableDisablePushTest extends MultiBrowserTest {
+        @Test
+        public void testEnablePushWhenUsingPolling() throws Exception {
+            openTestURL();
+
+            assertEquals("1. Push enabled", getLogRow(0));
+
+            getDisablePushButton().click();
+            assertEquals("3. Push disabled", getLogRow(0));
+
+            getEnablePollButton().click();
+            assertEquals("5. Poll enabled", getLogRow(0));
+
+            getEnablePushButton().click();
+            assertEquals("7. Push enabled", getLogRow(0));
+
+            getDisablePollButton().click();
+            assertEquals("9. Poll disabled", getLogRow(0));
+
+            getDisablePushButtonAndReenableFromBackground().click();
+            Thread.sleep(2500);
+            assertEquals("16. Polling disabled, push enabled", getLogRow(0));
+
+            getDisablePushButton().click();
+            assertEquals("18. Push disabled", getLogRow(0));
+        }
+
+        private WebElement getDisablePushButton() {
+            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VButton[0]");
+        }
+
+        private WebElement getEnablePushButton() {
+            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VButton[0]");
+        }
+
+        private WebElement getDisablePollButton() {
+            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]");
+        }
+
+        private WebElement getEnablePollButton() {
+            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]");
+        }
+
+        private WebElement getDisablePushButtonAndReenableFromBackground() {
+            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VButton[0]");
+        }
+
+    }
+
     private int c = 0;
 
     private Log log = new Log(15);
@@ -27,7 +82,7 @@ public class EnableDisablePush extends AbstractTestUI {
 
             try {
                 while (true) {
-                    TimeUnit.MILLISECONDS.sleep(1000);
+                    TimeUnit.MILLISECONDS.sleep(500);
 
                     access(new Runnable() {
                         @Override
@@ -42,6 +97,9 @@ public class EnableDisablePush extends AbstractTestUI {
                             }
                         }
                     });
+                    if (c == 3) {
+                        return;
+                    }
                 }
             } catch (InterruptedException e) {
             } catch (UIDetachedException e) {
diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
index 054492444d..5d5f5fae31 100644
--- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -37,6 +37,7 @@ import org.openqa.selenium.support.ui.WebDriverWait;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.testbench.TestBench;
 import com.vaadin.testbench.TestBenchTestCase;
+import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.ui.UI;
 
 /**
@@ -297,6 +298,30 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
         new WebDriverWait(driver, 10).until(ExpectedConditions.not(condition));
     }
 
+    /**
+     * For tests extending {@link AbstractTestUIWithLog}, returns the element
+     * for the Nth log row
+     * 
+     * @param rowNr
+     *            The log row to retrieve
+     * @return the Nth log row
+     */
+    protected WebElement getLogRowElement(int rowNr) {
+        return vaadinElementById("Log_row_" + rowNr);
+    }
+
+    /**
+     * For tests extending {@link AbstractTestUIWithLog}, returns the text in
+     * the Nth log row
+     * 
+     * @param rowNr
+     *            The log row to retrieve text for
+     * @return the text in the log row
+     */
+    protected String getLogRow(int rowNr) {
+        return getLogRowElement(rowNr).getText();
+    }
+
     /**
      * Returns the path that should be used for the test. The path contains the
      * full path (appended to hostname+port) and must start with a slash.
-- 
cgit v1.2.3


From 63e16e6547b4a7c067a9a1fa53dcecb9d704016b Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 7 Oct 2013 17:56:31 +0300
Subject: Mark as deprecated to discourage usage for new tests

Change-Id: I87d417da5b6b8cf9753604944dff74f8f39c321a
---
 uitest/src/com/vaadin/tests/tb3/SimpleMultiBrowserTest.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/tb3/SimpleMultiBrowserTest.java b/uitest/src/com/vaadin/tests/tb3/SimpleMultiBrowserTest.java
index a7ade3f9f7..aeeed4198c 100644
--- a/uitest/src/com/vaadin/tests/tb3/SimpleMultiBrowserTest.java
+++ b/uitest/src/com/vaadin/tests/tb3/SimpleMultiBrowserTest.java
@@ -32,6 +32,7 @@ import org.junit.Test;
  * 
  * @author Vaadin Ltd
  */
+@Deprecated
 public abstract class SimpleMultiBrowserTest extends MultiBrowserTest {
 
     @Test
-- 
cgit v1.2.3


From f488825d46c984cea841534178b094be3a562eea Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 7 Oct 2013 18:12:06 +0300
Subject: Update TB3+ convention to use a separate *Test file

For any issue there should be a UI class, e.g. LabelSomething and a
Test class which has the name of the UI + Test, e.g. LabelSomethingTest.
The LabelSomethingTest contains ALL tests which depend on LabelSomething
and are named accordingly to what they test.

For special and legacy cases also LegacyApplication and UIProvider are
supported in addition to UI classes

Change-Id: Ifc0180b377284bbd029202494ad194d324f8213b
---
 .../src/com/vaadin/tests/VerifyBrowserVersion.java |  48 ----
 .../com/vaadin/tests/VerifyBrowserVersionTest.java |  66 ++++++
 .../vaadin/tests/components/label/LabelModes.java  |  10 -
 .../tests/components/label/LabelModesTest.java     |  30 +++
 ...orizontalLayoutFullsizeContentWithErrorMsg.java |  34 +--
 ...ontalLayoutFullsizeContentWithErrorMsgTest.java |  49 ++++
 .../components/panel/PanelChangeContentsTest.java  |  53 +++++
 .../tests/components/slider/SliderDisable.java     |  19 --
 .../tests/components/slider/SliderDisableTest.java |  36 +++
 .../com/vaadin/tests/components/ui/UIAccess.java   |  28 ---
 .../vaadin/tests/components/ui/UIAccessTest.java   |  45 ++++
 uitest/src/com/vaadin/tests/push/BarInUIDL.java    |  28 ---
 .../src/com/vaadin/tests/push/BarInUIDLTest.java   |  45 ++++
 uitest/src/com/vaadin/tests/push/BasicPush.java    |  75 -------
 .../com/vaadin/tests/push/BasicPushStreaming.java  |   3 -
 .../vaadin/tests/push/BasicPushStreamingTest.java  |  19 ++
 .../src/com/vaadin/tests/push/BasicPushTest.java   |  92 ++++++++
 .../com/vaadin/tests/push/BasicPushWebsocket.java  |  12 -
 .../vaadin/tests/push/BasicPushWebsocketTest.java  |  29 +++
 .../com/vaadin/tests/push/PushConfiguration.java   | 117 ++++++++++
 .../vaadin/tests/push/PushConfigurationTest.java   | 246 ++++++---------------
 uitest/src/com/vaadin/tests/push/PushFromInit.java |  33 ---
 .../com/vaadin/tests/push/PushFromInitTest.java    |  50 +++++
 .../vaadin/tests/push/PushReattachedComponent.java |  63 ------
 uitest/src/com/vaadin/tests/push/TogglePush.java   |  95 --------
 .../src/com/vaadin/tests/push/TogglePushTest.java  | 112 ++++++++++
 .../com/vaadin/tests/push/TrackMessageSizeUI.java  | 152 +++++++++++++
 .../vaadin/tests/push/TrackMessageSizeUITest.java  |  30 +++
 .../tests/push/TrackMessageSizeUnitTests.java      | 164 --------------
 .../src/com/vaadin/tests/tb3/AbstractTB3Test.java  |  43 +++-
 30 files changed, 1039 insertions(+), 787 deletions(-)
 create mode 100644 uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java
 create mode 100644 uitest/src/com/vaadin/tests/components/label/LabelModesTest.java
 create mode 100644 uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsgTest.java
 create mode 100644 uitest/src/com/vaadin/tests/components/panel/PanelChangeContentsTest.java
 create mode 100644 uitest/src/com/vaadin/tests/components/slider/SliderDisableTest.java
 create mode 100644 uitest/src/com/vaadin/tests/components/ui/UIAccessTest.java
 create mode 100644 uitest/src/com/vaadin/tests/push/BarInUIDLTest.java
 create mode 100644 uitest/src/com/vaadin/tests/push/BasicPushStreamingTest.java
 create mode 100644 uitest/src/com/vaadin/tests/push/BasicPushTest.java
 create mode 100644 uitest/src/com/vaadin/tests/push/BasicPushWebsocketTest.java
 create mode 100644 uitest/src/com/vaadin/tests/push/PushConfiguration.java
 create mode 100644 uitest/src/com/vaadin/tests/push/PushFromInitTest.java
 delete mode 100644 uitest/src/com/vaadin/tests/push/PushReattachedComponent.java
 create mode 100644 uitest/src/com/vaadin/tests/push/TogglePushTest.java
 create mode 100644 uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java
 create mode 100644 uitest/src/com/vaadin/tests/push/TrackMessageSizeUITest.java
 delete mode 100644 uitest/src/com/vaadin/tests/push/TrackMessageSizeUnitTests.java

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java b/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java
index 47c09bdfd7..1b21f08aa7 100644
--- a/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java
+++ b/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java
@@ -1,59 +1,11 @@
 package com.vaadin.tests;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.openqa.selenium.remote.DesiredCapabilities;
-
 import com.vaadin.server.WebBrowser;
 import com.vaadin.tests.components.TestBase;
-import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.ui.Label;
 
 public class VerifyBrowserVersion extends TestBase {
 
-    public static class BrowserVersionTest extends MultiBrowserTest {
-
-        private Map<DesiredCapabilities, String> expectedUserAgent = new HashMap<DesiredCapabilities, String>();
-
-        {
-            expectedUserAgent
-                    .put(BrowserUtil.firefox(24),
-                            "Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Firefox/24.0");
-            expectedUserAgent
-                    .put(BrowserUtil.ie(8),
-                            "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; .NET CLR 2.0.50727; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)");
-            expectedUserAgent
-                    .put(BrowserUtil.ie(9),
-                            "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)");
-            expectedUserAgent
-                    .put(BrowserUtil.ie(10),
-                            "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)");
-            expectedUserAgent
-                    .put(BrowserUtil.ie(11),
-                            "Mozilla/5.0 (Windows NT 6.1; Trident/7.0; rv:11.0) like Gecko");
-            expectedUserAgent
-                    .put(BrowserUtil.chrome(29),
-                            "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.76 Safari/537.36");
-            expectedUserAgent
-                    .put(BrowserUtil.opera(12),
-                            "Opera/9.80 (Windows NT 5.1) Presto/2.12.388 Version/12.15");
-
-        }
-
-        @Test
-        public void verifyUserAgent() {
-            openTestURL();
-            Assert.assertEquals(
-                    expectedUserAgent.get(getDesiredCapabilities()),
-                    vaadinElementById("userAgent").getText());
-            Assert.assertEquals("Touch device? No",
-                    vaadinElementById("touchDevice").getText());
-        }
-    }
-
     @Override
     protected void setup() {
         WebBrowser browser = getBrowser();
diff --git a/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java b/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java
new file mode 100644
index 0000000000..6704f55226
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java
@@ -0,0 +1,66 @@
+/*
+ * 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;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.remote.DesiredCapabilities;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.tests.tb3.AbstractTB3Test.BrowserUtil;
+
+public class VerifyBrowserVersionTest extends MultiBrowserTest {
+
+    private Map<DesiredCapabilities, String> expectedUserAgent = new HashMap<DesiredCapabilities, String>();
+
+    {
+        expectedUserAgent
+                .put(BrowserUtil.firefox(24),
+                        "Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Firefox/24.0");
+        expectedUserAgent
+                .put(BrowserUtil.ie(8),
+                        "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; .NET CLR 2.0.50727; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)");
+        expectedUserAgent
+                .put(BrowserUtil.ie(9),
+                        "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)");
+        expectedUserAgent
+                .put(BrowserUtil.ie(10),
+                        "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)");
+        expectedUserAgent
+                .put(BrowserUtil.ie(11),
+                        "Mozilla/5.0 (Windows NT 6.1; Trident/7.0; rv:11.0) like Gecko");
+        expectedUserAgent
+                .put(BrowserUtil.chrome(29),
+                        "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.76 Safari/537.36");
+        expectedUserAgent
+                .put(BrowserUtil.opera(12),
+                        "Opera/9.80 (Windows NT 5.1) Presto/2.12.388 Version/12.15");
+
+    }
+
+    @Test
+    public void verifyUserAgent() {
+        openTestURL();
+        Assert.assertEquals(
+                expectedUserAgent.get(getDesiredCapabilities()),
+                vaadinElementById("userAgent").getText());
+        Assert.assertEquals("Touch device? No",
+                vaadinElementById("touchDevice").getText());
+    }
+}
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/components/label/LabelModes.java b/uitest/src/com/vaadin/tests/components/label/LabelModes.java
index 9e51978743..e5bc539f36 100644
--- a/uitest/src/com/vaadin/tests/components/label/LabelModes.java
+++ b/uitest/src/com/vaadin/tests/components/label/LabelModes.java
@@ -2,20 +2,10 @@ package com.vaadin.tests.components.label;
 
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.ComponentTestCase;
-import com.vaadin.tests.tb3.SimpleMultiBrowserTest;
 import com.vaadin.ui.Label;
 
 public class LabelModes extends ComponentTestCase<Label> {
 
-    public static class LabelModesTest extends SimpleMultiBrowserTest {
-        @Override
-        public void test() throws Exception {
-            openTestURL();
-            compareScreen("labelmodes");
-        }
-
-    }
-
     @Override
     protected Class<Label> getTestClass() {
         return Label.class;
diff --git a/uitest/src/com/vaadin/tests/components/label/LabelModesTest.java b/uitest/src/com/vaadin/tests/components/label/LabelModesTest.java
new file mode 100644
index 0000000000..efad615510
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/label/LabelModesTest.java
@@ -0,0 +1,30 @@
+/*
+ * 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.label;
+
+import org.junit.Test;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class LabelModesTest extends MultiBrowserTest {
+
+    @Test
+    public void testLabelModes() throws Exception {
+        openTestURL();
+        compareScreen("labelmodes");
+    }
+
+}
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java b/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java
index 25675e07c5..030bfa693e 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java
@@ -1,15 +1,8 @@
 package com.vaadin.tests.components.orderedlayout;
 
-import org.junit.Assert;
-import org.junit.Test;
-import org.openqa.selenium.By;
-import org.openqa.selenium.Point;
-import org.openqa.selenium.WebElement;
-
 import com.vaadin.server.UserError;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -19,8 +12,8 @@ import com.vaadin.ui.TextField;
 
 public class HorizontalLayoutFullsizeContentWithErrorMsg extends AbstractTestUI {
 
-    private static final String FIELD_ID = "f";
-    private static final String BUTTON_ID = "b";
+    static final String FIELD_ID = "f";
+    static final String BUTTON_ID = "b";
     private TextField tf;
 
     @Override
@@ -70,27 +63,4 @@ public class HorizontalLayoutFullsizeContentWithErrorMsg extends AbstractTestUI
         return "TextField should remain at same level vertically, horizontally width should adjust to fit error indicator.";
     }
 
-    public static class TbTest extends MultiBrowserTest {
-
-        @Test
-        public void test() {
-            openTestURL();
-            WebElement element = getDriver().findElement(By.id(FIELD_ID));
-            Point location = element.getLocation();
-
-            WebElement errorToggleButton = getDriver().findElement(
-                    By.id(BUTTON_ID));
-
-            errorToggleButton.click();
-
-            Assert.assertEquals(location, element.getLocation());
-
-            errorToggleButton.click();
-
-            Assert.assertEquals(location, element.getLocation());
-
-        }
-
-    }
-
 }
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsgTest.java b/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsgTest.java
new file mode 100644
index 0000000000..24ebf24688
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsgTest.java
@@ -0,0 +1,49 @@
+/*
+ * 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.orderedlayout;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.Point;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class HorizontalLayoutFullsizeContentWithErrorMsgTest extends
+        MultiBrowserTest {
+
+    @Test
+    public void test() {
+        openTestURL();
+        WebElement element = getDriver().findElement(
+                By.id(HorizontalLayoutFullsizeContentWithErrorMsg.FIELD_ID));
+        Point location = element.getLocation();
+
+        WebElement errorToggleButton = getDriver().findElement(
+                By.id(HorizontalLayoutFullsizeContentWithErrorMsg.BUTTON_ID));
+
+        errorToggleButton.click();
+
+        Assert.assertEquals(location, element.getLocation());
+
+        errorToggleButton.click();
+
+        Assert.assertEquals(location, element.getLocation());
+
+    }
+
+}
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/components/panel/PanelChangeContentsTest.java b/uitest/src/com/vaadin/tests/components/panel/PanelChangeContentsTest.java
new file mode 100644
index 0000000000..5bc505dbc8
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/panel/PanelChangeContentsTest.java
@@ -0,0 +1,53 @@
+/*
+ * 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.panel;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class PanelChangeContentsTest extends MultiBrowserTest {
+
+    @Test
+    public void testReattachComponentUsingPush() {
+        setPush(true);
+        openTestURL();
+
+        Assert.assertEquals(
+                "stats",
+                vaadinElement(
+                        "/VVerticalLayout[0]/Slot[1]/VPanel[0]/VVerticalLayout[0]/Slot[0]/VLabel[0]")
+                        .getText());
+        vaadinElement(
+                "/VVerticalLayout[0]/Slot[0]/VHorizontalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]")
+                .click();
+        Assert.assertEquals(
+                "companies",
+                vaadinElement(
+                        "/VVerticalLayout[0]/Slot[1]/VPanel[0]/VVerticalLayout[0]/Slot[0]/VLabel[0]")
+                        .getText());
+        vaadinElement(
+                "/VVerticalLayout[0]/Slot[0]/VHorizontalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]")
+                .click();
+        Assert.assertEquals(
+                "stats",
+                vaadinElement(
+                        "/VVerticalLayout[0]/Slot[1]/VPanel[0]/VVerticalLayout[0]/Slot[0]/VLabel[0]")
+                        .getText());
+
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/components/slider/SliderDisable.java b/uitest/src/com/vaadin/tests/components/slider/SliderDisable.java
index ea29a1657c..bd1d175119 100644
--- a/uitest/src/com/vaadin/tests/components/slider/SliderDisable.java
+++ b/uitest/src/com/vaadin/tests/components/slider/SliderDisable.java
@@ -15,15 +15,8 @@
  */
 package com.vaadin.tests.components.slider;
 
-import java.io.IOException;
-
-import org.junit.Test;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.interactions.Actions;
-
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
@@ -32,18 +25,6 @@ import com.vaadin.ui.VerticalLayout;
 
 public class SliderDisable extends AbstractTestUI {
 
-    public static class SliderDisableTest extends MultiBrowserTest {
-        @Test
-        public void disableSlider() throws IOException {
-            openTestURL();
-            WebElement element = vaadinElement("/VVerticalLayout[0]/Slot[0]/VSlider[0]/domChild[2]/domChild[0]");
-            new Actions(driver).dragAndDropBy(element, 112, 0).perform();
-            compareScreen("enabled");
-            vaadinElementById("disableButton").click();
-            compareScreen("disabled");
-        }
-    }
-
     @Override
     protected void setup(VaadinRequest request) {
         VerticalLayout content = new VerticalLayout();
diff --git a/uitest/src/com/vaadin/tests/components/slider/SliderDisableTest.java b/uitest/src/com/vaadin/tests/components/slider/SliderDisableTest.java
new file mode 100644
index 0000000000..f6ec3dac3b
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/slider/SliderDisableTest.java
@@ -0,0 +1,36 @@
+/*
+ * 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.slider;
+
+import java.io.IOException;
+
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.interactions.Actions;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class SliderDisableTest extends MultiBrowserTest {
+    @Test
+    public void disableSlider() throws IOException {
+        openTestURL();
+        WebElement element = vaadinElement("/VVerticalLayout[0]/Slot[0]/VSlider[0]/domChild[2]/domChild[0]");
+        new Actions(driver).dragAndDropBy(element, 112, 0).perform();
+        compareScreen("enabled");
+        vaadinElementById("disableButton").click();
+        compareScreen("disabled");
+    }
+}
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIAccess.java b/uitest/src/com/vaadin/tests/components/ui/UIAccess.java
index 7515b3ede8..d036827159 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIAccess.java
+++ b/uitest/src/com/vaadin/tests/components/ui/UIAccess.java
@@ -21,17 +21,11 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.junit.Assert;
-import org.junit.Test;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.ui.ExpectedConditions;
-
 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.tests.tb3.MultiBrowserTest;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.UI;
@@ -39,28 +33,6 @@ import com.vaadin.util.CurrentInstance;
 
 public class UIAccess extends AbstractTestUIWithLog {
 
-    public static 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());
-
-        }
-
-        private WebElement getCurrentInstanceWhenPushingButton() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[7]/VButton[0]");
-        }
-    }
-
     private volatile boolean checkCurrentInstancesBeforeResponse = false;
 
     private Future<Void> checkFromBeforeClientResponse;
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..8d04ceae71
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/ui/UIAccessTest.java
@@ -0,0 +1,45 @@
+/*
+ * 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 org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+
+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());
+
+    }
+
+    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/push/BarInUIDL.java b/uitest/src/com/vaadin/tests/push/BarInUIDL.java
index ebf349683d..bc05f7c306 100644
--- a/uitest/src/com/vaadin/tests/push/BarInUIDL.java
+++ b/uitest/src/com/vaadin/tests/push/BarInUIDL.java
@@ -16,15 +16,10 @@
 
 package com.vaadin.tests.push;
 
-import org.junit.Assert;
-import org.junit.Test;
-import org.openqa.selenium.WebElement;
-
 import com.vaadin.annotations.Push;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.ui.Transport;
 import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;
@@ -32,29 +27,6 @@ import com.vaadin.ui.Label;
 @Push(transport = Transport.STREAMING)
 public class BarInUIDL extends AbstractTestUI {
 
-    public static class BarInUIDLTest extends MultiBrowserTest {
-        @Test
-        public void sendBarInUIDL() {
-            openTestURL();
-            getButton().click();
-            Assert.assertEquals(
-                    "Thank you for clicking | bar",
-                    vaadinElement(
-                            "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VLabel[0]")
-                            .getText());
-            getButton().click();
-            Assert.assertEquals(
-                    "Thank you for clicking | bar",
-                    vaadinElement(
-                            "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VLabel[0]")
-                            .getText());
-        }
-
-        private WebElement getButton() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VButton[0]");
-        }
-    }
-
     /*
      * (non-Javadoc)
      * 
diff --git a/uitest/src/com/vaadin/tests/push/BarInUIDLTest.java b/uitest/src/com/vaadin/tests/push/BarInUIDLTest.java
new file mode 100644
index 0000000000..840d653e1e
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/BarInUIDLTest.java
@@ -0,0 +1,45 @@
+/*
+ * 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.push;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class BarInUIDLTest extends MultiBrowserTest {
+    @Test
+    public void sendBarInUIDL() {
+        openTestURL();
+        getButton().click();
+        Assert.assertEquals(
+                "Thank you for clicking | bar",
+                vaadinElement(
+                        "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VLabel[0]")
+                        .getText());
+        getButton().click();
+        Assert.assertEquals(
+                "Thank you for clicking | bar",
+                vaadinElement(
+                        "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VLabel[0]")
+                        .getText());
+    }
+
+    private WebElement getButton() {
+        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VButton[0]");
+    }
+}
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/push/BasicPush.java b/uitest/src/com/vaadin/tests/push/BasicPush.java
index d1a9fb575f..d6c45a2ed0 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPush.java
+++ b/uitest/src/com/vaadin/tests/push/BasicPush.java
@@ -18,16 +18,11 @@ package com.vaadin.tests.push;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import org.junit.Assert;
-import org.junit.Test;
-import org.openqa.selenium.WebElement;
-
 import com.vaadin.annotations.Push;
 import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;
@@ -35,76 +30,6 @@ import com.vaadin.ui.Label;
 @Push
 public class BasicPush extends AbstractTestUI {
 
-    public static abstract class BasicPushTest extends MultiBrowserTest {
-
-        @Test
-        public void testPush() {
-            openTestURL();
-
-            // Test client initiated push
-            Assert.assertEquals(0, getClientCounter());
-            getIncrementButton().click();
-            Assert.assertEquals(
-                    "Client counter not incremented by button click", 1,
-                    getClientCounter());
-            getIncrementButton().click();
-            getIncrementButton().click();
-            getIncrementButton().click();
-            Assert.assertEquals(
-                    "Four clicks should have incremented counter to 4", 4,
-                    getClientCounter());
-
-            // Test server initiated push
-            getServerCounterStartButton().click();
-            try {
-                Assert.assertEquals(0, getServerCounter());
-                sleep(3000);
-                int serverCounter = getServerCounter();
-                if (serverCounter < 1) {
-                    // No push has happened
-                    Assert.fail("No push has occured within 3s");
-                }
-                sleep(3000);
-                if (getServerCounter() <= serverCounter) {
-                    // No push has happened
-                    Assert.fail("Only one push took place within 6s");
-
-                }
-            } finally {
-                // Avoid triggering push assertions
-                getServerCounterStopButton().click();
-            }
-        }
-
-        private int getServerCounter() {
-            return Integer.parseInt(getServerCounterElement().getText());
-        }
-
-        private int getClientCounter() {
-            return Integer.parseInt(getClientCounterElement().getText());
-        }
-
-        private WebElement getServerCounterElement() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VLabel[0]");
-        }
-
-        private WebElement getServerCounterStartButton() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[5]/VButton[0]/domChild[0]/domChild[0]");
-        }
-
-        private WebElement getServerCounterStopButton() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[6]/VButton[0]/domChild[0]/domChild[0]");
-        }
-
-        private WebElement getIncrementButton() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]");
-        }
-
-        private WebElement getClientCounterElement() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VLabel[0]");
-        }
-    }
-
     private ObjectProperty<Integer> counter = new ObjectProperty<Integer>(0);
 
     private ObjectProperty<Integer> counter2 = new ObjectProperty<Integer>(0);
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushStreaming.java b/uitest/src/com/vaadin/tests/push/BasicPushStreaming.java
index b63f782cc9..f9dc78dd43 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushStreaming.java
+++ b/uitest/src/com/vaadin/tests/push/BasicPushStreaming.java
@@ -28,7 +28,4 @@ public class BasicPushStreaming extends BasicPush {
         getPushConfiguration().setFallbackTransport(Transport.STREAMING);
 
     }
-
-    public static class BasicPushStreamingTest extends BasicPushTest {
-    }
 }
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushStreamingTest.java b/uitest/src/com/vaadin/tests/push/BasicPushStreamingTest.java
new file mode 100644
index 0000000000..67730f72c8
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/BasicPushStreamingTest.java
@@ -0,0 +1,19 @@
+/*
+ * 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.push;
+
+public class BasicPushStreamingTest extends BasicPushTest {
+}
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushTest.java b/uitest/src/com/vaadin/tests/push/BasicPushTest.java
new file mode 100644
index 0000000000..57af8524bc
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/BasicPushTest.java
@@ -0,0 +1,92 @@
+/*
+ * 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.push;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public abstract class BasicPushTest extends MultiBrowserTest {
+
+    @Test
+    public void testPush() {
+        openTestURL();
+
+        // Test client initiated push
+        Assert.assertEquals(0, getClientCounter());
+        getIncrementButton().click();
+        Assert.assertEquals(
+                "Client counter not incremented by button click", 1,
+                getClientCounter());
+        getIncrementButton().click();
+        getIncrementButton().click();
+        getIncrementButton().click();
+        Assert.assertEquals(
+                "Four clicks should have incremented counter to 4", 4,
+                getClientCounter());
+
+        // Test server initiated push
+        getServerCounterStartButton().click();
+        try {
+            Assert.assertEquals(0, getServerCounter());
+            sleep(3000);
+            int serverCounter = getServerCounter();
+            if (serverCounter < 1) {
+                // No push has happened
+                Assert.fail("No push has occured within 3s");
+            }
+            sleep(3000);
+            if (getServerCounter() <= serverCounter) {
+                // No push has happened
+                Assert.fail("Only one push took place within 6s");
+
+            }
+        } finally {
+            // Avoid triggering push assertions
+            getServerCounterStopButton().click();
+        }
+    }
+
+    private int getServerCounter() {
+        return Integer.parseInt(getServerCounterElement().getText());
+    }
+
+    private int getClientCounter() {
+        return Integer.parseInt(getClientCounterElement().getText());
+    }
+
+    private WebElement getServerCounterElement() {
+        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VLabel[0]");
+    }
+
+    private WebElement getServerCounterStartButton() {
+        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[5]/VButton[0]/domChild[0]/domChild[0]");
+    }
+
+    private WebElement getServerCounterStopButton() {
+        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[6]/VButton[0]/domChild[0]/domChild[0]");
+    }
+
+    private WebElement getIncrementButton() {
+        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]");
+    }
+
+    private WebElement getClientCounterElement() {
+        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VLabel[0]");
+    }
+}
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java b/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java
index 4765183fca..96793a90f8 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java
+++ b/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java
@@ -15,14 +15,9 @@
  */
 package com.vaadin.tests.push;
 
-import java.util.Collection;
-
-import org.openqa.selenium.remote.DesiredCapabilities;
-
 import com.vaadin.annotations.Push;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.ui.Transport;
-import com.vaadin.tests.tb3.WebsocketTest;
 
 @Push(transport = Transport.WEBSOCKET)
 public class BasicPushWebsocket extends BasicPush {
@@ -34,11 +29,4 @@ public class BasicPushWebsocket extends BasicPush {
         getPushConfiguration().setFallbackTransport(Transport.WEBSOCKET);
     }
 
-    public static class BasicPushWebsocketTest extends BasicPushTest {
-        @Override
-        public Collection<DesiredCapabilities> getBrowsersToTest() {
-            return WebsocketTest.getWebsocketBrowsers();
-        }
-    }
-
 }
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushWebsocketTest.java b/uitest/src/com/vaadin/tests/push/BasicPushWebsocketTest.java
new file mode 100644
index 0000000000..ae4e64ad6b
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/BasicPushWebsocketTest.java
@@ -0,0 +1,29 @@
+/*
+ * 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.push;
+
+import java.util.Collection;
+
+import org.openqa.selenium.remote.DesiredCapabilities;
+
+import com.vaadin.tests.tb3.WebsocketTest;
+
+public class BasicPushWebsocketTest extends BasicPushTest {
+    @Override
+    public Collection<DesiredCapabilities> getBrowsersToTest() {
+        return WebsocketTest.getWebsocketBrowsers();
+    }
+}
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/push/PushConfiguration.java b/uitest/src/com/vaadin/tests/push/PushConfiguration.java
new file mode 100644
index 0000000000..a7ba4e43ba
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/PushConfiguration.java
@@ -0,0 +1,117 @@
+/*
+ * 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.push;
+
+import java.util.Date;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.label.ContentMode;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Label;
+
+public class PushConfiguration extends AbstractTestUI {
+
+    private ObjectProperty<Integer> counter = new ObjectProperty<Integer>(0);
+
+    private ObjectProperty<Integer> counter2 = new ObjectProperty<Integer>(0);
+
+    private final Timer timer = new Timer(true);
+
+    private final TimerTask task = new TimerTask() {
+
+        @Override
+        public void run() {
+            access(new Runnable() {
+                @Override
+                public void run() {
+                    counter2.setValue(counter2.getValue() + 1);
+                }
+            });
+        }
+    };
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        addComponent(new PushConfigurator(this));
+        spacer();
+
+        /*
+         * Client initiated push.
+         */
+        Label lbl = new Label(counter);
+        lbl.setCaption("Client counter (click 'increment' to update):");
+        addComponent(lbl);
+
+        addComponent(new Button("Increment", new Button.ClickListener() {
+
+            @Override
+            public void buttonClick(ClickEvent event) {
+                counter.setValue(counter.getValue() + 1);
+            }
+        }));
+
+        spacer();
+
+        /*
+         * Server initiated push.
+         */
+        lbl = new Label(counter2);
+        lbl.setCaption("Server counter (updates each 1s by server thread) :");
+        addComponent(lbl);
+
+        addComponent(new Button("Reset", new Button.ClickListener() {
+
+            @Override
+            public void buttonClick(ClickEvent event) {
+                counter2.setValue(0);
+            }
+        }));
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "This test tests the very basic operations of push. "
+                + "It tests that client initiated changes are "
+                + "recieved back to the client as well as server "
+                + "initiated changes are correctly updated to the client.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 11494;
+    }
+
+    private void spacer() {
+        addComponent(new Label("<hr/>", ContentMode.HTML));
+    }
+
+    @Override
+    public void attach() {
+        super.attach();
+        timer.scheduleAtFixedRate(task, new Date(), 1000);
+    }
+
+    @Override
+    public void detach() {
+        super.detach();
+        timer.cancel();
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/push/PushConfigurationTest.java b/uitest/src/com/vaadin/tests/push/PushConfigurationTest.java
index 5100e8a4ea..d23c48e14a 100644
--- a/uitest/src/com/vaadin/tests/push/PushConfigurationTest.java
+++ b/uitest/src/com/vaadin/tests/push/PushConfigurationTest.java
@@ -15,198 +15,98 @@
  */
 package com.vaadin.tests.push;
 
-import java.util.Date;
-import java.util.Timer;
-import java.util.TimerTask;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.Select;
 
-import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.server.VaadinRequest;
-import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.tb3.WebsocketTest;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Label;
-
-public class PushConfigurationTest extends AbstractTestUI {
-
-    public static class PushConfigurationWebsocket extends WebsocketTest {
-
-        @Test
-        public void testWebsocketAndStreaming() {
-            setDebug(true);
-            openTestURL();
-            // Websocket
-            Assert.assertEquals(1, getServerCounter());
-            new Select(getTransportSelect()).selectByVisibleText("WEBSOCKET");
-            new Select(getPushModeSelect()).selectByVisibleText("AUTOMATIC");
-            Assert.assertTrue(vaadinElement(
-                    "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[5]/VLabel[0]/domChild[0]")
-                    .getText()
-                    .matches(
-                            "^[\\s\\S]*fallbackTransport: streaming[\\s\\S]*transport: websocket[\\s\\S]*$"));
-            int counter = getServerCounter();
-
-            for (int second = 0;; second++) {
-                if (second >= 5) {
-                    Assert.fail("timeout");
-                }
-                if (getServerCounter() >= (counter + 2)) {
-                    break;
-                }
-                try {
-                    Thread.sleep(1000);
-                } catch (InterruptedException e) {
-                }
-            }
 
-            // Use debug console to verify we used the correct transport type
-            Assert.assertTrue(driver.getPageSource().contains(
-                    "Push connection established using websocket"));
-            Assert.assertFalse(driver.getPageSource().contains(
-                    "Push connection established using streaming"));
-
-            new Select(getPushModeSelect()).selectByVisibleText("DISABLED");
-
-            // Streaming
-            driver.get(getTestUrl());
-            Assert.assertEquals(1, getServerCounter());
-
-            new Select(getTransportSelect()).selectByVisibleText("STREAMING");
-            new Select(getPushModeSelect()).selectByVisibleText("AUTOMATIC");
-            Assert.assertTrue(vaadinElement(
-                    "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[5]/VLabel[0]/domChild[0]")
-                    .getText()
-                    .matches(
-                            "^[\\s\\S]*fallbackTransport: streaming[\\s\\S]*transport: streaming[\\s\\S]*$"));
-
-            counter = getServerCounter();
-            for (int second = 0;; second++) {
-                if (second >= 5) {
-                    Assert.fail("timeout");
-                }
-                if (getServerCounter() >= (counter + 2)) {
-                    break;
-                }
-                try {
-                    Thread.sleep(1000);
-                } catch (InterruptedException e) {
-                }
+public class PushConfigurationTest extends WebsocketTest {
+
+    @Test
+    public void testWebsocketAndStreaming() {
+        setDebug(true);
+        openTestURL();
+        // Websocket
+        Assert.assertEquals(1, getServerCounter());
+        new Select(getTransportSelect()).selectByVisibleText("WEBSOCKET");
+        new Select(getPushModeSelect()).selectByVisibleText("AUTOMATIC");
+        Assert.assertTrue(vaadinElement(
+                "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[5]/VLabel[0]/domChild[0]")
+                .getText()
+                .matches(
+                        "^[\\s\\S]*fallbackTransport: streaming[\\s\\S]*transport: websocket[\\s\\S]*$"));
+        int counter = getServerCounter();
+
+        for (int second = 0;; second++) {
+            if (second >= 5) {
+                Assert.fail("timeout");
+            }
+            if (getServerCounter() >= (counter + 2)) {
+                break;
+            }
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
             }
-
-            // Use debug console to verify we used the correct transport type
-            Assert.assertFalse(driver.getPageSource().contains(
-                    "Push connection established using websocket"));
-            Assert.assertTrue(driver.getPageSource().contains(
-                    "Push connection established using streaming"));
-
-        }
-
-        private WebElement getPushModeSelect() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VNativeSelect[0]/domChild[0]");
-        }
-
-        private WebElement getTransportSelect() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[1]/VNativeSelect[0]/domChild[0]");
-        }
-
-        private int getServerCounter() {
-            return Integer.parseInt(getServerCounterElement().getText());
-        }
-
-        private WebElement getServerCounterElement() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[5]/VLabel[0]");
-        }
-    }
-
-    private ObjectProperty<Integer> counter = new ObjectProperty<Integer>(0);
-
-    private ObjectProperty<Integer> counter2 = new ObjectProperty<Integer>(0);
-
-    private final Timer timer = new Timer(true);
-
-    private final TimerTask task = new TimerTask() {
-
-        @Override
-        public void run() {
-            access(new Runnable() {
-                @Override
-                public void run() {
-                    counter2.setValue(counter2.getValue() + 1);
-                }
-            });
         }
-    };
-
-    @Override
-    protected void setup(VaadinRequest request) {
-        addComponent(new PushConfigurator(this));
-        spacer();
-
-        /*
-         * Client initiated push.
-         */
-        Label lbl = new Label(counter);
-        lbl.setCaption("Client counter (click 'increment' to update):");
-        addComponent(lbl);
-
-        addComponent(new Button("Increment", new Button.ClickListener() {
 
-            @Override
-            public void buttonClick(ClickEvent event) {
-                counter.setValue(counter.getValue() + 1);
+        // Use debug console to verify we used the correct transport type
+        Assert.assertTrue(driver.getPageSource().contains(
+                "Push connection established using websocket"));
+        Assert.assertFalse(driver.getPageSource().contains(
+                "Push connection established using streaming"));
+
+        new Select(getPushModeSelect()).selectByVisibleText("DISABLED");
+
+        // Streaming
+        driver.get(getTestUrl());
+        Assert.assertEquals(1, getServerCounter());
+
+        new Select(getTransportSelect()).selectByVisibleText("STREAMING");
+        new Select(getPushModeSelect()).selectByVisibleText("AUTOMATIC");
+        Assert.assertTrue(vaadinElement(
+                "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[5]/VLabel[0]/domChild[0]")
+                .getText()
+                .matches(
+                        "^[\\s\\S]*fallbackTransport: streaming[\\s\\S]*transport: streaming[\\s\\S]*$"));
+
+        counter = getServerCounter();
+        for (int second = 0;; second++) {
+            if (second >= 5) {
+                Assert.fail("timeout");
             }
-        }));
-
-        spacer();
-
-        /*
-         * Server initiated push.
-         */
-        lbl = new Label(counter2);
-        lbl.setCaption("Server counter (updates each 1s by server thread) :");
-        addComponent(lbl);
-
-        addComponent(new Button("Reset", new Button.ClickListener() {
-
-            @Override
-            public void buttonClick(ClickEvent event) {
-                counter2.setValue(0);
+            if (getServerCounter() >= (counter + 2)) {
+                break;
             }
-        }));
-    }
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+            }
+        }
+
+        // Use debug console to verify we used the correct transport type
+        Assert.assertFalse(driver.getPageSource().contains(
+                "Push connection established using websocket"));
+        Assert.assertTrue(driver.getPageSource().contains(
+                "Push connection established using streaming"));
 
-    @Override
-    protected String getTestDescription() {
-        return "This test tests the very basic operations of push. "
-                + "It tests that client initiated changes are "
-                + "recieved back to the client as well as server "
-                + "initiated changes are correctly updated to the client.";
     }
 
-    @Override
-    protected Integer getTicketNumber() {
-        return 11494;
+    private WebElement getPushModeSelect() {
+        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VNativeSelect[0]/domChild[0]");
     }
 
-    private void spacer() {
-        addComponent(new Label("<hr/>", ContentMode.HTML));
+    private WebElement getTransportSelect() {
+        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[0]/VVerticalLayout[0]/Slot[1]/VNativeSelect[0]/domChild[0]");
     }
 
-    @Override
-    public void attach() {
-        super.attach();
-        timer.scheduleAtFixedRate(task, new Date(), 1000);
+    private int getServerCounter() {
+        return Integer.parseInt(getServerCounterElement().getText());
     }
 
-    @Override
-    public void detach() {
-        super.detach();
-        timer.cancel();
+    private WebElement getServerCounterElement() {
+        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[5]/VLabel[0]");
     }
-}
+}
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/push/PushFromInit.java b/uitest/src/com/vaadin/tests/push/PushFromInit.java
index de3334f707..cb084f1232 100644
--- a/uitest/src/com/vaadin/tests/push/PushFromInit.java
+++ b/uitest/src/com/vaadin/tests/push/PushFromInit.java
@@ -15,45 +15,12 @@
  */
 package com.vaadin.tests.push;
 
-import org.junit.Assert;
-import org.junit.Test;
-
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
-import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.ui.Button;
 
 public class PushFromInit extends AbstractTestUIWithLog {
 
-    public static class PushFromInitTB3 extends MultiBrowserTest {
-        @Test
-        public void testPushFromInit() {
-            openTestURL();
-
-            for (int second = 0;; second++) {
-                if (second >= 30) {
-                    Assert.fail("timeout");
-                }
-                try {
-                    if ("1. Logged in init".equals(vaadinElementById(
-                            "Log_row_1").getText())) {
-                        break;
-                    }
-                } catch (Exception e) {
-                }
-                try {
-                    Thread.sleep(200);
-                } catch (InterruptedException e) {
-                }
-            }
-
-            Assert.assertEquals(
-                    "2. Logged from background thread started in init",
-                    vaadinElementById("Log_row_0").getText());
-
-        }
-    }
-
     @Override
     protected void setup(VaadinRequest request) {
         new Thread() {
diff --git a/uitest/src/com/vaadin/tests/push/PushFromInitTest.java b/uitest/src/com/vaadin/tests/push/PushFromInitTest.java
new file mode 100644
index 0000000000..3c1bc1b610
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/PushFromInitTest.java
@@ -0,0 +1,50 @@
+/*
+ * 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.push;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class PushFromInitTest extends MultiBrowserTest {
+    @Test
+    public void testPushFromInit() {
+        openTestURL();
+
+        for (int second = 0;; second++) {
+            if (second >= 30) {
+                Assert.fail("timeout");
+            }
+            try {
+                if ("1. Logged in init".equals(vaadinElementById(
+                        "Log_row_1").getText())) {
+                    break;
+                }
+            } catch (Exception e) {
+            }
+            try {
+                Thread.sleep(200);
+            } catch (InterruptedException e) {
+            }
+        }
+
+        Assert.assertEquals(
+                "2. Logged from background thread started in init",
+                vaadinElementById("Log_row_0").getText());
+
+    }
+}
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/push/PushReattachedComponent.java b/uitest/src/com/vaadin/tests/push/PushReattachedComponent.java
deleted file mode 100644
index 0bc796e0ee..0000000000
--- a/uitest/src/com/vaadin/tests/push/PushReattachedComponent.java
+++ /dev/null
@@ -1,63 +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.push;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.vaadin.tests.components.panel.PanelChangeContents;
-import com.vaadin.tests.tb3.MultiBrowserTest;
-
-public class PushReattachedComponent extends MultiBrowserTest {
-
-    @Override
-    protected Class<?> getUIClass() {
-        return PanelChangeContents.class;
-    }
-
-    @Test
-    public void testReattachComponentUsingPush() {
-        setPush(true);
-        openTestURL();
-
-        Assert.assertEquals(
-                "stats",
-                vaadinElement(
-                        "/VVerticalLayout[0]/Slot[1]/VPanel[0]/VVerticalLayout[0]/Slot[0]/VLabel[0]")
-                        .getText());
-        vaadinElement(
-                "/VVerticalLayout[0]/Slot[0]/VHorizontalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]")
-                .click();
-        Assert.assertEquals(
-                "companies",
-                vaadinElement(
-                        "/VVerticalLayout[0]/Slot[1]/VPanel[0]/VVerticalLayout[0]/Slot[0]/VLabel[0]")
-                        .getText());
-        vaadinElement(
-                "/VVerticalLayout[0]/Slot[0]/VHorizontalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]")
-                .click();
-        Assert.assertEquals(
-                "stats",
-                vaadinElement(
-                        "/VVerticalLayout[0]/Slot[1]/VPanel[0]/VVerticalLayout[0]/Slot[0]/VLabel[0]")
-                        .getText());
-
-    }
-}
diff --git a/uitest/src/com/vaadin/tests/push/TogglePush.java b/uitest/src/com/vaadin/tests/push/TogglePush.java
index 3ef369b408..6ec8903d65 100644
--- a/uitest/src/com/vaadin/tests/push/TogglePush.java
+++ b/uitest/src/com/vaadin/tests/push/TogglePush.java
@@ -18,112 +18,17 @@ package com.vaadin.tests.push;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import org.junit.Assert;
-import org.junit.Test;
-import org.openqa.selenium.WebElement;
-
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.communication.PushMode;
 import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Label;
 
 public class TogglePush extends AbstractTestUI {
-    public static class TogglePushTB3 extends MultiBrowserTest {
-
-        @Test
-        public void togglePushInInit() {
-            setPush(true);
-            String url = getTestUrl();
-
-            // Open with push disabled
-            driver.get(addParameter(url, "push=disabled"));
-
-            Assert.assertFalse(getPushToggle().isSelected());
-
-            getDelayedCounterUpdateButton().click();
-            sleep(2000);
-            Assert.assertEquals("Counter has been updated 0 times",
-                    getCounterText());
-
-            // Open with push enabled
-            driver.get(addParameter(url, "push=enabled"));
-            Assert.assertTrue(getPushToggle().isSelected());
-
-            getDelayedCounterUpdateButton().click();
-            sleep(2000);
-            Assert.assertEquals("Counter has been updated 1 times",
-                    getCounterText());
-
-        }
-
-        private String addParameter(String url, String queryParameter) {
-            if (url.contains("?")) {
-                return url + "&" + queryParameter;
-            } else {
-                return url + "?" + queryParameter;
-            }
-        }
-
-        @Test
-        public void togglePush() {
-            setPush(true);
-            openTestURL();
-            getDelayedCounterUpdateButton().click();
-            sleep(2000);
-
-            // Push is enabled, so text gets updated
-            Assert.assertEquals("Counter has been updated 1 times",
-                    getCounterText());
-
-            // Disable push
-            getPushToggle().click();
-            getDelayedCounterUpdateButton().click();
-            sleep(2000);
-            // Push is disabled, so text is not updated
-            Assert.assertEquals("Counter has been updated 1 times",
-                    getCounterText());
-
-            getDirectCounterUpdateButton().click();
-            // Direct update is visible, and includes previous update
-            Assert.assertEquals("Counter has been updated 3 times",
-                    getCounterText());
-
-            // Re-enable push
-            getPushToggle().click();
-            getDelayedCounterUpdateButton().click();
-            sleep(2000);
-
-            // Push is enabled again, so text gets updated
-            Assert.assertEquals("Counter has been updated 4 times",
-                    getCounterText());
-        }
-
-        private WebElement getDirectCounterUpdateButton() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]");
-        }
-
-        private WebElement getPushToggle() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VCheckBox[0]/domChild[0]");
-        }
-
-        private WebElement getDelayedCounterUpdateButton() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]");
-        }
-
-        private String getCounterText() {
-            return vaadinElement(
-                    "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VLabel[0]")
-                    .getText();
-        }
-
-    }
-
     private final Label counterLabel = new Label();
     private int counter = 0;
 
diff --git a/uitest/src/com/vaadin/tests/push/TogglePushTest.java b/uitest/src/com/vaadin/tests/push/TogglePushTest.java
new file mode 100644
index 0000000000..68d6f52b9f
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/TogglePushTest.java
@@ -0,0 +1,112 @@
+/*
+ * 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.push;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class TogglePushTest extends MultiBrowserTest {
+
+    @Test
+    public void togglePushInInit() {
+        setPush(true);
+        String url = getTestUrl();
+
+        // Open with push disabled
+        driver.get(addParameter(url, "push=disabled"));
+
+        Assert.assertFalse(getPushToggle().isSelected());
+
+        getDelayedCounterUpdateButton().click();
+        sleep(2000);
+        Assert.assertEquals("Counter has been updated 0 times",
+                getCounterText());
+
+        // Open with push enabled
+        driver.get(addParameter(url, "push=enabled"));
+        Assert.assertTrue(getPushToggle().isSelected());
+
+        getDelayedCounterUpdateButton().click();
+        sleep(2000);
+        Assert.assertEquals("Counter has been updated 1 times",
+                getCounterText());
+
+    }
+
+    private String addParameter(String url, String queryParameter) {
+        if (url.contains("?")) {
+            return url + "&" + queryParameter;
+        } else {
+            return url + "?" + queryParameter;
+        }
+    }
+
+    @Test
+    public void togglePush() {
+        setPush(true);
+        openTestURL();
+        getDelayedCounterUpdateButton().click();
+        sleep(2000);
+
+        // Push is enabled, so text gets updated
+        Assert.assertEquals("Counter has been updated 1 times",
+                getCounterText());
+
+        // Disable push
+        getPushToggle().click();
+        getDelayedCounterUpdateButton().click();
+        sleep(2000);
+        // Push is disabled, so text is not updated
+        Assert.assertEquals("Counter has been updated 1 times",
+                getCounterText());
+
+        getDirectCounterUpdateButton().click();
+        // Direct update is visible, and includes previous update
+        Assert.assertEquals("Counter has been updated 3 times",
+                getCounterText());
+
+        // Re-enable push
+        getPushToggle().click();
+        getDelayedCounterUpdateButton().click();
+        sleep(2000);
+
+        // Push is enabled again, so text gets updated
+        Assert.assertEquals("Counter has been updated 4 times",
+                getCounterText());
+    }
+
+    private WebElement getDirectCounterUpdateButton() {
+        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]");
+    }
+
+    private WebElement getPushToggle() {
+        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VCheckBox[0]/domChild[0]");
+    }
+
+    private WebElement getDelayedCounterUpdateButton() {
+        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]");
+    }
+
+    private String getCounterText() {
+        return vaadinElement(
+                "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VLabel[0]")
+                .getText();
+    }
+
+}
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java b/uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java
new file mode 100644
index 0000000000..67715339da
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java
@@ -0,0 +1,152 @@
+/*
+ * 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.push;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.io.IOUtils;
+import org.json.JSONArray;
+import org.json.JSONException;
+
+import com.vaadin.annotations.JavaScript;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.server.VaadinService;
+import com.vaadin.server.VaadinServletService;
+import com.vaadin.tests.components.AbstractTestUIWithLog;
+import com.vaadin.ui.JavaScriptFunction;
+
+// Load vaadinPush.js so that jQueryVaadin is defined 
+@JavaScript("vaadin://vaadinPush.js")
+public class TrackMessageSizeUI extends AbstractTestUIWithLog {
+
+    private String testMethod = "function testSequence(expected, data) {\n"
+            + "    var request = {trackMessageLength: true, messageDelimiter: '|'};\n"
+            + "    var response = {partialMessage: ''};\n"
+            + "    var messages = [];\n"
+            + "    for(var i = 0; i < data.length; i++) {\n"
+            + "        if (!_trackMessageSize(data[i], request, response))\n"
+            + "            messages = messages.concat(response.messages);\n"
+            + "    }\n"
+            + "    if (JSON.stringify(expected) != JSON.stringify(messages)) {\n"
+            + "        if (console && typeof console.error == 'function') console.error('Expected', expected, 'but got', messages, 'for', data);\n"
+            + "        logToServer('Test failed, see javascript console for details.');\n"
+            + "    }" + "}\n";
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        String methodImplementation = findMethodImplementation();
+        getPage().getJavaScript().addFunction("logToServer",
+                new JavaScriptFunction() {
+                    @Override
+                    public void call(JSONArray arguments) throws JSONException {
+                        String message = arguments.getString(0);
+                        log(message);
+                    }
+                });
+
+        getPage().getJavaScript().execute(
+                methodImplementation + testMethod + buildTestCase());
+    }
+
+    private String buildTestCase() {
+        // Could maybe express the cases in java and generate JS?
+        return "testSequence(['a', 'b'], ['1|a1|b', '']);\n"
+                + "testSequence(['a', 'b'], ['1|a1|', 'b']);\n"
+                + "testSequence(['a', 'b'], ['1|a1', '|b']);\n"
+                + "testSequence(['a', 'b'], ['1|a', '1|b']);\n"
+                + "testSequence(['a', 'b'], ['1|a', '', '1|b']);\n"
+                + "testSequence(['a|', '|b'], ['2|a|2||b']);\n"
+                + "testSequence(['a|', 'b'], ['2|a|', '', '1|b']);\n"
+                + "testSequence(['a|', 'b'], ['2|a|', '1|b']);\n"
+                + "testSequence(['a|', 'b'], ['2|a|1', '|b']);\n"
+                + "testSequence(['a|', 'b'], ['2|a|1|', 'b']);\n"
+                + "testSequence([' ', 'b'], ['1| 1|b']);\n"
+                + "testSequence([' ', 'b'], ['1| ','1|b']);\n"
+                + "testSequence([' ', 'b'], ['1|',' 1|b']);\n"
+                + "logToServer('All tests run')\n";
+    }
+
+    private String findMethodImplementation() {
+        String filename = "/VAADIN/jquery.atmosphere.js";
+        URL resourceURL = findResourceURL(filename,
+                (VaadinServletService) VaadinService.getCurrent());
+        if (resourceURL == null) {
+            log("Can't find " + filename);
+            return null;
+        }
+
+        try {
+            String string = IOUtils.toString(resourceURL);
+
+            // Find the function inside the script content
+            int startIndex = string.indexOf("function _trackMessageSize");
+            if (startIndex == -1) {
+                log("function not found");
+                return null;
+            }
+
+            // Assumes there's a /** comment before the next function
+            int endIndex = string.indexOf("/**", startIndex);
+            if (endIndex == -1) {
+                log("End of function not found");
+                return null;
+            }
+
+            string = string.substring(startIndex, endIndex);
+            string = string.replaceAll("jQuery", "jQueryVaadin");
+            return string;
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private URL findResourceURL(String filename, VaadinServletService service) {
+        ServletContext sc = service.getServlet().getServletContext();
+        URL resourceUrl;
+        try {
+            resourceUrl = sc.getResource(filename);
+        } catch (MalformedURLException e) {
+            throw new RuntimeException(e);
+        }
+        if (resourceUrl == null) {
+            // try if requested file is found from classloader
+
+            // strip leading "/" otherwise stream from JAR wont work
+            if (filename.startsWith("/")) {
+                filename = filename.substring(1);
+            }
+
+            resourceUrl = service.getClassLoader().getResource(filename);
+        }
+        return resourceUrl;
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Unit tests for _trackMessageSize in jquery.atmosphere.js. Implemented with testbench and a full Vaadin server side since the testing requires some file mangling.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return Integer.valueOf(12468);
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUITest.java b/uitest/src/com/vaadin/tests/push/TrackMessageSizeUITest.java
new file mode 100644
index 0000000000..f904675b5e
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/TrackMessageSizeUITest.java
@@ -0,0 +1,30 @@
+/*
+ * 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.push;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class TrackMessageSizeUITest extends MultiBrowserTest {
+    @Test
+    public void runTests() {
+        openTestURL();
+        Assert.assertEquals("1. All tests run",
+                vaadinElementById("Log_row_0").getText());
+    }
+}
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUnitTests.java b/uitest/src/com/vaadin/tests/push/TrackMessageSizeUnitTests.java
deleted file mode 100644
index cb3033aa58..0000000000
--- a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUnitTests.java
+++ /dev/null
@@ -1,164 +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.push;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import javax.servlet.ServletContext;
-
-import org.apache.commons.io.IOUtils;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.vaadin.annotations.JavaScript;
-import com.vaadin.server.VaadinRequest;
-import com.vaadin.server.VaadinService;
-import com.vaadin.server.VaadinServletService;
-import com.vaadin.tests.components.AbstractTestUIWithLog;
-import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.ui.JavaScriptFunction;
-
-// Load vaadinPush.js so that jQueryVaadin is defined 
-@JavaScript("vaadin://vaadinPush.js")
-public class TrackMessageSizeUnitTests extends AbstractTestUIWithLog {
-
-    public static class TrackMessageSizeUnitTestsTB3 extends MultiBrowserTest {
-        @Test
-        public void runTests() {
-            openTestURL();
-            Assert.assertEquals("1. All tests run",
-                    vaadinElementById("Log_row_0").getText());
-        }
-    }
-
-    private String testMethod = "function testSequence(expected, data) {\n"
-            + "    var request = {trackMessageLength: true, messageDelimiter: '|'};\n"
-            + "    var response = {partialMessage: ''};\n"
-            + "    var messages = [];\n"
-            + "    for(var i = 0; i < data.length; i++) {\n"
-            + "        if (!_trackMessageSize(data[i], request, response))\n"
-            + "            messages = messages.concat(response.messages);\n"
-            + "    }\n"
-            + "    if (JSON.stringify(expected) != JSON.stringify(messages)) {\n"
-            + "        if (console && typeof console.error == 'function') console.error('Expected', expected, 'but got', messages, 'for', data);\n"
-            + "        logToServer('Test failed, see javascript console for details.');\n"
-            + "    }" + "}\n";
-
-    @Override
-    protected void setup(VaadinRequest request) {
-        String methodImplementation = findMethodImplementation();
-        getPage().getJavaScript().addFunction("logToServer",
-                new JavaScriptFunction() {
-                    @Override
-                    public void call(JSONArray arguments) throws JSONException {
-                        String message = arguments.getString(0);
-                        log(message);
-                    }
-                });
-
-        getPage().getJavaScript().execute(
-                methodImplementation + testMethod + buildTestCase());
-    }
-
-    private String buildTestCase() {
-        // Could maybe express the cases in java and generate JS?
-        return "testSequence(['a', 'b'], ['1|a1|b', '']);\n"
-                + "testSequence(['a', 'b'], ['1|a1|', 'b']);\n"
-                + "testSequence(['a', 'b'], ['1|a1', '|b']);\n"
-                + "testSequence(['a', 'b'], ['1|a', '1|b']);\n"
-                + "testSequence(['a', 'b'], ['1|a', '', '1|b']);\n"
-                + "testSequence(['a|', '|b'], ['2|a|2||b']);\n"
-                + "testSequence(['a|', 'b'], ['2|a|', '', '1|b']);\n"
-                + "testSequence(['a|', 'b'], ['2|a|', '1|b']);\n"
-                + "testSequence(['a|', 'b'], ['2|a|1', '|b']);\n"
-                + "testSequence(['a|', 'b'], ['2|a|1|', 'b']);\n"
-                + "testSequence([' ', 'b'], ['1| 1|b']);\n"
-                + "testSequence([' ', 'b'], ['1| ','1|b']);\n"
-                + "testSequence([' ', 'b'], ['1|',' 1|b']);\n"
-                + "logToServer('All tests run')\n";
-    }
-
-    private String findMethodImplementation() {
-        String filename = "/VAADIN/jquery.atmosphere.js";
-        URL resourceURL = findResourceURL(filename,
-                (VaadinServletService) VaadinService.getCurrent());
-        if (resourceURL == null) {
-            log("Can't find " + filename);
-            return null;
-        }
-
-        try {
-            String string = IOUtils.toString(resourceURL);
-
-            // Find the function inside the script content
-            int startIndex = string.indexOf("function _trackMessageSize");
-            if (startIndex == -1) {
-                log("function not found");
-                return null;
-            }
-
-            // Assumes there's a /** comment before the next function
-            int endIndex = string.indexOf("/**", startIndex);
-            if (endIndex == -1) {
-                log("End of function not found");
-                return null;
-            }
-
-            string = string.substring(startIndex, endIndex);
-            string = string.replaceAll("jQuery", "jQueryVaadin");
-            return string;
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private URL findResourceURL(String filename, VaadinServletService service) {
-        ServletContext sc = service.getServlet().getServletContext();
-        URL resourceUrl;
-        try {
-            resourceUrl = sc.getResource(filename);
-        } catch (MalformedURLException e) {
-            throw new RuntimeException(e);
-        }
-        if (resourceUrl == null) {
-            // try if requested file is found from classloader
-
-            // strip leading "/" otherwise stream from JAR wont work
-            if (filename.startsWith("/")) {
-                filename = filename.substring(1);
-            }
-
-            resourceUrl = service.getClassLoader().getResource(filename);
-        }
-        return resourceUrl;
-    }
-
-    @Override
-    protected String getTestDescription() {
-        return "Unit tests for _trackMessageSize in jquery.atmosphere.js. Implemented with testbench and a full Vaadin server side since the testing requires some file mangling.";
-    }
-
-    @Override
-    protected Integer getTicketNumber() {
-        return Integer.valueOf(12468);
-    }
-
-}
diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
index 5d5f5fae31..5c4ee01d5f 100644
--- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -19,6 +19,7 @@ package com.vaadin.tests.tb3;
 import java.net.URL;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.logging.Logger;
 
 import org.junit.After;
 import org.junit.Before;
@@ -35,6 +36,7 @@ import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
 import com.vaadin.server.LegacyApplication;
+import com.vaadin.server.UIProvider;
 import com.vaadin.testbench.TestBench;
 import com.vaadin.testbench.TestBenchTestCase;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
@@ -344,8 +346,9 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
     }
 
     /**
-     * Returns the UI class the current test is connected to. Uses the enclosing
-     * class if the test class is a static inner class to a UI class.
+     * Returns the UI class the current test is connected to (or in special
+     * cases UIProvider or LegacyApplication). Uses the enclosing class if the
+     * test class is a static inner class to a UI class.
      * 
      * Test which are not enclosed by a UI class must implement this method and
      * return the UI class they want to test.
@@ -356,11 +359,43 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
      * @return the UI class the current test is connected to
      */
     protected Class<?> getUIClass() {
+        try {
+            // Convention: SomeUITest uses the SomeUI UI class
+            String uiClassName = getClass().getName().replaceFirst("Test$", "");
+            Class<?> cls = Class.forName(uiClassName);
+            if (isSupportedRunnerClass(cls)) {
+                return cls;
+            }
+        } catch (Exception e) {
+        }
         Class<?> enclosingClass = getClass().getEnclosingClass();
         if (enclosingClass != null) {
-            return enclosingClass;
+            if (UI.class.isAssignableFrom(enclosingClass)) {
+                Logger.getLogger(getClass().getName())
+                        .severe("Test is an static inner class to the UI. This will no longer be supported in the future. The test should be named UIClassTest and reside in the same package as the UI");
+                return enclosingClass;
+            }
+        }
+        throw new RuntimeException(
+                "Could not determine UI class. Ensure the test is named UIClassTest and is in the same package as the UIClass");
+    }
+
+    /**
+     * @return true if the given class is supported by ApplicationServletRunner
+     */
+    @SuppressWarnings("deprecation")
+    private boolean isSupportedRunnerClass(Class<?> cls) {
+        if (UI.class.isAssignableFrom(cls)) {
+            return true;
         }
-        return null;
+        if (UIProvider.class.isAssignableFrom(cls)) {
+            return true;
+        }
+        if (LegacyApplication.class.isAssignableFrom(cls)) {
+            return true;
+        }
+
+        return false;
     }
 
     /**
-- 
cgit v1.2.3


From 5fb877b093e4b2a9ddc98d558fe92f66d26af149 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 7 Oct 2013 19:56:43 +0300
Subject: Makes test stable and adds helper comparison methods

* Takes into account that the timer can be triggered multiple times before the initial request is done (especially if the server is slow)
* Adds assertLessThan, assertLessThanOrEqual, assertGreaterThan, assertGreaterThanOrEqual to ease test creation

Change-Id: I5ce1681e35d9c1de02a83b38528f17ee705331d7
---
 .../vaadin/tests/push/PushConfigurationTest.java   | 25 ++++---
 .../src/com/vaadin/tests/tb3/AbstractTB3Test.java  | 80 ++++++++++++++++++++++
 2 files changed, 92 insertions(+), 13 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/push/PushConfigurationTest.java b/uitest/src/com/vaadin/tests/push/PushConfigurationTest.java
index d23c48e14a..1f8c4c0e38 100644
--- a/uitest/src/com/vaadin/tests/push/PushConfigurationTest.java
+++ b/uitest/src/com/vaadin/tests/push/PushConfigurationTest.java
@@ -17,7 +17,9 @@ package com.vaadin.tests.push;
 
 import org.junit.Assert;
 import org.junit.Test;
+import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.ui.ExpectedCondition;
 import org.openqa.selenium.support.ui.Select;
 
 import com.vaadin.tests.tb3.WebsocketTest;
@@ -29,7 +31,9 @@ public class PushConfigurationTest extends WebsocketTest {
         setDebug(true);
         openTestURL();
         // Websocket
-        Assert.assertEquals(1, getServerCounter());
+        int counter = getServerCounter();
+        assertGreaterOrEqual("Counter should be >= 1. Was: " + counter,
+                counter, 1);
         new Select(getTransportSelect()).selectByVisibleText("WEBSOCKET");
         new Select(getPushModeSelect()).selectByVisibleText("AUTOMATIC");
         Assert.assertTrue(vaadinElement(
@@ -37,20 +41,15 @@ public class PushConfigurationTest extends WebsocketTest {
                 .getText()
                 .matches(
                         "^[\\s\\S]*fallbackTransport: streaming[\\s\\S]*transport: websocket[\\s\\S]*$"));
-        int counter = getServerCounter();
+        counter = getServerCounter();
+        final int waitCounter = counter + 2;
+        waitUntil(new ExpectedCondition<Boolean>() {
 
-        for (int second = 0;; second++) {
-            if (second >= 5) {
-                Assert.fail("timeout");
+            @Override
+            public Boolean apply(WebDriver input) {
+                return (getServerCounter() >= waitCounter);
             }
-            if (getServerCounter() >= (counter + 2)) {
-                break;
-            }
-            try {
-                Thread.sleep(1000);
-            } catch (InterruptedException e) {
-            }
-        }
+        });
 
         // Use debug console to verify we used the correct transport type
         Assert.assertTrue(driver.getPageSource().contains(
diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
index 5c4ee01d5f..38c5b29bf9 100644
--- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -324,6 +324,86 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
         return getLogRowElement(rowNr).getText();
     }
 
+    /**
+     * Asserts that {@literal a} is &gt;= {@literal b}
+     * 
+     * @param message
+     *            The message to include in the {@link AssertionError}
+     * @param a
+     * @param b
+     * @throws AssertionError
+     *             If comparison fails
+     */
+    public static final <T> void assertGreaterOrEqual(String message,
+            Comparable<T> a, T b) throws AssertionError {
+        if (a.compareTo(b) >= 0) {
+            return;
+        }
+
+        throw new AssertionError(decorate(message, a, b));
+    }
+
+    /**
+     * Asserts that {@literal a} is &gt; {@literal b}
+     * 
+     * @param message
+     *            The message to include in the {@link AssertionError}
+     * @param a
+     * @param b
+     * @throws AssertionError
+     *             If comparison fails
+     */
+    public static final <T> void assertGreater(String message, Comparable<T> a,
+            T b) throws AssertionError {
+        if (a.compareTo(b) > 0) {
+            return;
+        }
+        throw new AssertionError(decorate(message, a, b));
+    }
+
+    /**
+     * Asserts that {@literal a} is &lt;= {@literal b}
+     * 
+     * @param message
+     *            The message to include in the {@link AssertionError}
+     * @param a
+     * @param b
+     * @throws AssertionError
+     *             If comparison fails
+     */
+    public static final <T> void assertLessThanOrEqual(String message,
+            Comparable<T> a, T b) throws AssertionError {
+        if (a.compareTo(b) <= 0) {
+            return;
+        }
+
+        throw new AssertionError(decorate(message, a, b));
+    }
+
+    /**
+     * Asserts that {@literal a} is &lt; {@literal b}
+     * 
+     * @param message
+     *            The message to include in the {@link AssertionError}
+     * @param a
+     * @param b
+     * @throws AssertionError
+     *             If comparison fails
+     */
+    public static final <T> void assertLessThan(String message,
+            Comparable<T> a, T b) throws AssertionError {
+        if (a.compareTo(b) < 0) {
+            return;
+        }
+        throw new AssertionError(decorate(message, a, b));
+    }
+
+    private static <T> String decorate(String message, Comparable<T> a, T b) {
+        message = message.replace("{0}", a.toString());
+        message = message.replace("{1}", b.toString());
+        return message;
+    }
+
     /**
      * Returns the path that should be used for the test. The path contains the
      * full path (appended to hostname+port) and must start with a slash.
-- 
cgit v1.2.3


From daf06e935ab932e2b9194d35ad81cb36a4911338 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 7 Oct 2013 20:17:40 +0300
Subject: Use class name and not enclosing class for screenshot name

Change-Id: I8e9e0487f4354ee0523b5d3c0c016a002c395107
---
 uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java b/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
index 94bcebde84..cbdae1a6c1 100644
--- a/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
@@ -61,10 +61,6 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
             testMethod = testMethod.replaceAll("\\[.*\\]", "");
 
             String className = testClass.getSimpleName();
-            if (testClass.getEnclosingClass() != null) {
-                className = testClass.getEnclosingClass().getSimpleName();
-            }
-
             screenshotBaseName = className + "-" + testMethod;
         }
 
-- 
cgit v1.2.3


From 377d49ee174a6e2fb47152e5dbf0aac2db1276f5 Mon Sep 17 00:00:00 2001
From: John Ahlroos <john@vaadin.com>
Date: Tue, 8 Oct 2013 15:54:55 +0300
Subject: Allow configuring deployment port for TB3 tests

Change-Id: Iee0827d1e65dcbc1fc6c71701b80f355285b6902
---
 uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java         |  9 ++++++++-
 uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java | 12 ++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
index 38c5b29bf9..1967891a7a 100644
--- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -172,6 +172,13 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
      */
     protected abstract String getDeploymentHostname();
 
+    /**
+     * Used to determine what port the test is running on
+     * 
+     * @return The port teh test is running on, by default 8888
+     */
+    protected abstract String getDeploymentPort();
+
     /**
      * Produces a collection of browsers to run the test on. This method is
      * executed by the test runner when determining how many test methods to
@@ -562,7 +569,7 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
      * @return The base URL for the test. Does not include a trailing slash.
      */
     protected String getBaseURL() {
-        return "http://" + getDeploymentHostname() + ":8888";
+        return "http://" + getDeploymentHostname() + ":" + getDeploymentPort();
     }
 
     /**
diff --git a/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java b/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
index 3d7dead928..09615f0b2e 100644
--- a/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
+++ b/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
@@ -34,6 +34,7 @@ import java.util.Properties;
  */
 public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
     private static final String HOSTNAME_PROPERTY = "com.vaadin.testbench.deployment.hostname";
+    private static final String PORT_PROPERTY = "com.vaadin.testbench.deployment.port";
     private final Properties properties = new Properties();
 
     public PrivateTB3Configuration() {
@@ -82,6 +83,17 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
         return hostName;
     }
 
+    @Override
+    protected String getDeploymentPort() {
+        String port = getProperty(PORT_PROPERTY);
+
+        if (port == null || "".equals(port)) {
+            port = "8888";
+        }
+
+        return port;
+    }
+
     /**
      * Tries to automatically determine the IP address of the machine the test
      * is running on.
-- 
cgit v1.2.3


From 6779857911a4eeb2bbfe0720629b058facc40f4d Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 7 Oct 2013 20:34:23 +0300
Subject: Updatet servlet tests to follow the same *Test naming convention

Change-Id: I3c718232364f5ca7cce7131fa7685e4a2b833120
---
 WebContent/WEB-INF/web.xml                         |  2 +-
 WebContent/WEB-INF/web.xml.2.4                     |  2 +-
 .../tests/integration/AbstractIntegrationTest.java | 53 ++++++++++++++++++
 .../integration/AbstractIntegrationTestTB3.java    | 53 ------------------
 .../AbstractServletIntegrationTest.java            | 63 ++++++++++++++++++++++
 .../tests/integration/IntegrationTestRunner.java   |  2 +-
 .../integration/IntegrationTestStreaming.java      | 35 ------------
 .../tests/integration/IntegrationTestUI.java       | 52 ------------------
 .../integration/IntegrationTestWebsocket.java      | 49 -----------------
 .../integration/ServletIntegrationStreamingUI.java | 30 +++++++++++
 .../ServletIntegrationStreamingUITest.java         | 21 ++++++++
 .../integration/ServletIntegrationTestTB3.java     | 63 ----------------------
 .../tests/integration/ServletIntegrationUI.java    | 48 +++++++++++++++++
 .../integration/ServletIntegrationUITest.java      | 20 +++++++
 .../integration/ServletIntegrationWebsocketUI.java | 45 ++++++++++++++++
 .../ServletIntegrationWebsocketUITest.java         | 21 ++++++++
 .../vaadin/tests/tb3/ServletIntegrationTests.java  |  4 +-
 17 files changed, 306 insertions(+), 257 deletions(-)
 create mode 100644 uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java
 delete mode 100644 uitest/src/com/vaadin/tests/integration/AbstractIntegrationTestTB3.java
 create mode 100644 uitest/src/com/vaadin/tests/integration/AbstractServletIntegrationTest.java
 delete mode 100644 uitest/src/com/vaadin/tests/integration/IntegrationTestStreaming.java
 delete mode 100755 uitest/src/com/vaadin/tests/integration/IntegrationTestUI.java
 delete mode 100644 uitest/src/com/vaadin/tests/integration/IntegrationTestWebsocket.java
 create mode 100644 uitest/src/com/vaadin/tests/integration/ServletIntegrationStreamingUI.java
 create mode 100644 uitest/src/com/vaadin/tests/integration/ServletIntegrationStreamingUITest.java
 delete mode 100644 uitest/src/com/vaadin/tests/integration/ServletIntegrationTestTB3.java
 create mode 100755 uitest/src/com/vaadin/tests/integration/ServletIntegrationUI.java
 create mode 100644 uitest/src/com/vaadin/tests/integration/ServletIntegrationUITest.java
 create mode 100644 uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java
 create mode 100644 uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUITest.java

(limited to 'uitest')

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index b93e0670fc..8a917966a1 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -92,7 +92,7 @@
         <servlet-class>com.vaadin.server.VaadinServlet</servlet-class>
         <init-param>
             <param-name>UI</param-name>
-            <param-value>com.vaadin.tests.integration.IntegrationTestUI</param-value>
+            <param-value>com.vaadin.tests.integration.ServletIntegrationUI</param-value>
         </init-param>
         <async-supported>true</async-supported>
     </servlet>
diff --git a/WebContent/WEB-INF/web.xml.2.4 b/WebContent/WEB-INF/web.xml.2.4
index bcc5f3a651..96144b8036 100644
--- a/WebContent/WEB-INF/web.xml.2.4
+++ b/WebContent/WEB-INF/web.xml.2.4
@@ -86,7 +86,7 @@
 		<servlet-class>com.vaadin.server.VaadinServlet</servlet-class>
 		<init-param>
 			<param-name>UI</param-name>
-			<param-value>com.vaadin.tests.integration.IntegrationTestUI</param-value>
+			<param-value>com.vaadin.tests.integration.ServletIntegrationUI</param-value>
 		</init-param>
 	</servlet>
 	<servlet-mapping>
diff --git a/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java b/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java
new file mode 100644
index 0000000000..5f4ae41361
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java
@@ -0,0 +1,53 @@
+/*
+ * 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.integration;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized.Parameters;
+import org.openqa.selenium.remote.DesiredCapabilities;
+
+import com.vaadin.tests.tb3.PrivateTB3Configuration;
+
+/**
+ * Base class for integration tests. Integration tests use the
+ * {@literal deployment.url} parameter to determine the base deployment url
+ * (http://hostname:123)
+ * 
+ * @author Vaadin Ltd
+ */
+@RunWith(IntegrationTestRunner.class)
+public abstract class AbstractIntegrationTest extends
+        PrivateTB3Configuration {
+    @Override
+    protected String getBaseURL() {
+        String deploymentUrl = System.getProperty("deployment.url");
+        if (deploymentUrl == null || deploymentUrl.equals("")) {
+            throw new RuntimeException(
+                    "Deployment url must be given as deployment.url");
+        }
+
+        return deploymentUrl;
+    }
+
+    @Parameters
+    public static Collection<DesiredCapabilities> getBrowsersForTest() {
+        return Collections.singleton(BrowserUtil.firefox(17));
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTestTB3.java b/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTestTB3.java
deleted file mode 100644
index e170450619..0000000000
--- a/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTestTB3.java
+++ /dev/null
@@ -1,53 +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.integration;
-
-import java.util.Collection;
-import java.util.Collections;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
-import org.openqa.selenium.remote.DesiredCapabilities;
-
-import com.vaadin.tests.tb3.PrivateTB3Configuration;
-
-/**
- * Base class for integration tests. Integration tests use the
- * {@literal deployment.url} parameter to determine the base deployment url
- * (http://hostname:123)
- * 
- * @author Vaadin Ltd
- */
-@RunWith(IntegrationTestRunner.class)
-public abstract class AbstractIntegrationTestTB3 extends
-        PrivateTB3Configuration {
-    @Override
-    protected String getBaseURL() {
-        String deploymentUrl = System.getProperty("deployment.url");
-        if (deploymentUrl == null || deploymentUrl.equals("")) {
-            throw new RuntimeException(
-                    "Deployment url must be given as deployment.url");
-        }
-
-        return deploymentUrl;
-    }
-
-    @Parameters
-    public static Collection<DesiredCapabilities> getBrowsersForTest() {
-        return Collections.singleton(BrowserUtil.firefox(17));
-    }
-
-}
diff --git a/uitest/src/com/vaadin/tests/integration/AbstractServletIntegrationTest.java b/uitest/src/com/vaadin/tests/integration/AbstractServletIntegrationTest.java
new file mode 100644
index 0000000000..f736a126a5
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/integration/AbstractServletIntegrationTest.java
@@ -0,0 +1,63 @@
+/*
+ * 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.integration;
+
+import java.io.IOException;
+
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+
+/**
+ * Base class for servlet integration tests. Automatically prepends "/demo" to
+ * the deployment path
+ * 
+ * @author Vaadin Ltd
+ */
+public abstract class AbstractServletIntegrationTest extends
+        AbstractIntegrationTest {
+
+    @Test
+    public void runTest() throws IOException, AssertionError {
+        openTestURL();
+        compareScreen("initial");
+
+        WebElement cell = vaadinElement(getTableCell(getTable(), 0, 1));
+        testBenchElement(cell).click(51, 13);
+
+        compareScreen("finland");
+    }
+
+    private String getTableCell(String tableLocator, int row, int col) {
+        return tableLocator
+                + "/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild["
+                + row + "]/domChild[" + col + "]/domChild[0]";
+    }
+
+    protected String getTable() {
+        return "/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]";
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.tb3.AbstractTB3Test#getDeploymentPath()
+     */
+    @Override
+    protected String getDeploymentPath() {
+        return "/demo" + super.getDeploymentPath();
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/integration/IntegrationTestRunner.java b/uitest/src/com/vaadin/tests/integration/IntegrationTestRunner.java
index 29ee4e6023..f5042b54b6 100644
--- a/uitest/src/com/vaadin/tests/integration/IntegrationTestRunner.java
+++ b/uitest/src/com/vaadin/tests/integration/IntegrationTestRunner.java
@@ -45,7 +45,7 @@ public class IntegrationTestRunner extends TB3Runner {
      */
     @Override
     protected String testName(FrameworkMethod method) {
-        if (AbstractIntegrationTestTB3.class.isAssignableFrom(testClass)) {
+        if (AbstractIntegrationTest.class.isAssignableFrom(testClass)) {
             return System.getProperty("server-name");
         } else {
             return super.testName(method);
diff --git a/uitest/src/com/vaadin/tests/integration/IntegrationTestStreaming.java b/uitest/src/com/vaadin/tests/integration/IntegrationTestStreaming.java
deleted file mode 100644
index 20ddac9dd1..0000000000
--- a/uitest/src/com/vaadin/tests/integration/IntegrationTestStreaming.java
+++ /dev/null
@@ -1,35 +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.integration;
-
-import com.vaadin.annotations.Push;
-import com.vaadin.shared.ui.ui.Transport;
-
-/**
- * Server test which uses streaming
- * 
- * @since 7.1
- * @author Vaadin Ltd
- */
-@Push(transport = Transport.STREAMING)
-public class IntegrationTestStreaming extends IntegrationTestUI {
-
-    public static class IntegrationTestStreamingTB3 extends
-            ServletIntegrationTestTB3 {
-        // Uses the test method declared in the super class
-    }
-
-}
diff --git a/uitest/src/com/vaadin/tests/integration/IntegrationTestUI.java b/uitest/src/com/vaadin/tests/integration/IntegrationTestUI.java
deleted file mode 100755
index 3d0a338bba..0000000000
--- a/uitest/src/com/vaadin/tests/integration/IntegrationTestUI.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.vaadin.tests.integration;
-
-import com.vaadin.data.Item;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.server.ClassResource;
-import com.vaadin.server.Resource;
-import com.vaadin.server.VaadinRequest;
-import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.UI;
-import com.vaadin.ui.VerticalLayout;
-
-public class IntegrationTestUI extends UI {
-
-    public class IntegrationTestXhrTB3 extends ServletIntegrationTestTB3 {
-        // Uses the test method declared in the super class
-    }
-
-    @Override
-    protected void init(VaadinRequest request) {
-        VerticalLayout layout = new VerticalLayout();
-        layout.setMargin(true);
-        setContent(layout);
-
-        final Table table = new Table();
-        table.addContainerProperty("icon", Resource.class, null);
-        table.setItemIconPropertyId("icon");
-        table.addContainerProperty("country", String.class, null);
-        table.setRowHeaderMode(Table.RowHeaderMode.ICON_ONLY);
-        table.setImmediate(true);
-        table.setSelectable(true);
-        table.setVisibleColumns(new Object[] { "country" });
-        layout.addComponent(table);
-
-        Item item = table.addItem("FI");
-        item.getItemProperty("icon").setValue(new ClassResource("fi.gif"));
-        item.getItemProperty("country").setValue("Finland");
-        item = table.addItem("SE");
-        item.getItemProperty("icon").setValue(new FlagSeResource());
-        item.getItemProperty("country").setValue("Sweden");
-
-        final Label selectedLabel = new Label();
-        table.addValueChangeListener(new ValueChangeListener() {
-            @Override
-            public void valueChange(ValueChangeEvent event) {
-                selectedLabel.setValue(String.valueOf(table.getValue()));
-            }
-        });
-        layout.addComponent(selectedLabel);
-    }
-}
diff --git a/uitest/src/com/vaadin/tests/integration/IntegrationTestWebsocket.java b/uitest/src/com/vaadin/tests/integration/IntegrationTestWebsocket.java
deleted file mode 100644
index eaa23de3cf..0000000000
--- a/uitest/src/com/vaadin/tests/integration/IntegrationTestWebsocket.java
+++ /dev/null
@@ -1,49 +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.integration;
-
-import com.vaadin.annotations.Push;
-import com.vaadin.server.VaadinRequest;
-import com.vaadin.shared.ui.ui.Transport;
-
-/**
- * Server test which uses websockets
- * 
- * @since 7.1
- * @author Vaadin Ltd
- */
-@Push(transport = Transport.WEBSOCKET)
-public class IntegrationTestWebsocket extends IntegrationTestUI {
-
-    public class IntegrationTestWebsocketTB3 extends ServletIntegrationTestTB3 {
-        // Uses the test method declared in the super class
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.vaadin.tests.integration.IntegrationTestUI#init(com.vaadin.server
-     * .VaadinRequest)
-     */
-    @Override
-    protected void init(VaadinRequest request) {
-        super.init(request);
-        // Ensure no fallback is used
-        getPushConfiguration().setFallbackTransport(Transport.WEBSOCKET);
-    }
-
-}
diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationStreamingUI.java b/uitest/src/com/vaadin/tests/integration/ServletIntegrationStreamingUI.java
new file mode 100644
index 0000000000..0d92fb1bb8
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/integration/ServletIntegrationStreamingUI.java
@@ -0,0 +1,30 @@
+/*
+ * 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.integration;
+
+import com.vaadin.annotations.Push;
+import com.vaadin.shared.ui.ui.Transport;
+
+/**
+ * Server test which uses streaming
+ * 
+ * @since 7.1
+ * @author Vaadin Ltd
+ */
+@Push(transport = Transport.STREAMING)
+public class ServletIntegrationStreamingUI extends ServletIntegrationUI {
+
+}
diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationStreamingUITest.java b/uitest/src/com/vaadin/tests/integration/ServletIntegrationStreamingUITest.java
new file mode 100644
index 0000000000..36a946bfa3
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/integration/ServletIntegrationStreamingUITest.java
@@ -0,0 +1,21 @@
+/*
+ * 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.integration;
+
+public class ServletIntegrationStreamingUITest extends
+        AbstractServletIntegrationTest {
+    // Uses the test method declared in the super class
+}
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationTestTB3.java b/uitest/src/com/vaadin/tests/integration/ServletIntegrationTestTB3.java
deleted file mode 100644
index 2a2f8ab3d1..0000000000
--- a/uitest/src/com/vaadin/tests/integration/ServletIntegrationTestTB3.java
+++ /dev/null
@@ -1,63 +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.integration;
-
-import java.io.IOException;
-
-import org.junit.Test;
-import org.openqa.selenium.WebElement;
-
-/**
- * Base class for servlet integration tests. Automatically prepends "/demo" to
- * the deployment path
- * 
- * @author Vaadin Ltd
- */
-public abstract class ServletIntegrationTestTB3 extends
-        AbstractIntegrationTestTB3 {
-
-    @Test
-    public void runTest() throws IOException, AssertionError {
-        openTestURL();
-        compareScreen("initial");
-
-        WebElement cell = vaadinElement(getTableCell(getTable(), 0, 1));
-        testBenchElement(cell).click(51, 13);
-
-        compareScreen("finland");
-    }
-
-    private String getTableCell(String tableLocator, int row, int col) {
-        return tableLocator
-                + "/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild["
-                + row + "]/domChild[" + col + "]/domChild[0]";
-    }
-
-    protected String getTable() {
-        return "/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]";
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.vaadin.tests.tb3.AbstractTB3Test#getDeploymentPath()
-     */
-    @Override
-    protected String getDeploymentPath() {
-        return "/demo" + super.getDeploymentPath();
-    }
-
-}
diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationUI.java b/uitest/src/com/vaadin/tests/integration/ServletIntegrationUI.java
new file mode 100755
index 0000000000..6aec2c8e2a
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/integration/ServletIntegrationUI.java
@@ -0,0 +1,48 @@
+package com.vaadin.tests.integration;
+
+import com.vaadin.data.Item;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.server.ClassResource;
+import com.vaadin.server.Resource;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.UI;
+import com.vaadin.ui.VerticalLayout;
+
+public class ServletIntegrationUI extends UI {
+
+    @Override
+    protected void init(VaadinRequest request) {
+        VerticalLayout layout = new VerticalLayout();
+        layout.setMargin(true);
+        setContent(layout);
+
+        final Table table = new Table();
+        table.addContainerProperty("icon", Resource.class, null);
+        table.setItemIconPropertyId("icon");
+        table.addContainerProperty("country", String.class, null);
+        table.setRowHeaderMode(Table.RowHeaderMode.ICON_ONLY);
+        table.setImmediate(true);
+        table.setSelectable(true);
+        table.setVisibleColumns(new Object[] { "country" });
+        layout.addComponent(table);
+
+        Item item = table.addItem("FI");
+        item.getItemProperty("icon").setValue(new ClassResource("fi.gif"));
+        item.getItemProperty("country").setValue("Finland");
+        item = table.addItem("SE");
+        item.getItemProperty("icon").setValue(new FlagSeResource());
+        item.getItemProperty("country").setValue("Sweden");
+
+        final Label selectedLabel = new Label();
+        table.addValueChangeListener(new ValueChangeListener() {
+            @Override
+            public void valueChange(ValueChangeEvent event) {
+                selectedLabel.setValue(String.valueOf(table.getValue()));
+            }
+        });
+        layout.addComponent(selectedLabel);
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationUITest.java b/uitest/src/com/vaadin/tests/integration/ServletIntegrationUITest.java
new file mode 100644
index 0000000000..25ffdac4a2
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/integration/ServletIntegrationUITest.java
@@ -0,0 +1,20 @@
+/*
+ * 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.integration;
+
+public class ServletIntegrationUITest extends AbstractServletIntegrationTest {
+    // Uses the test method declared in the super class
+}
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java b/uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java
new file mode 100644
index 0000000000..905b80fd85
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java
@@ -0,0 +1,45 @@
+/*
+ * 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.integration;
+
+import com.vaadin.annotations.Push;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.ui.Transport;
+
+/**
+ * Server test which uses websockets
+ * 
+ * @since 7.1
+ * @author Vaadin Ltd
+ */
+@Push(transport = Transport.WEBSOCKET)
+public class ServletIntegrationWebsocketUI extends ServletIntegrationUI {
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * com.vaadin.tests.integration.IntegrationTestUI#init(com.vaadin.server
+     * .VaadinRequest)
+     */
+    @Override
+    protected void init(VaadinRequest request) {
+        super.init(request);
+        // Ensure no fallback is used
+        getPushConfiguration().setFallbackTransport(Transport.WEBSOCKET);
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUITest.java b/uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUITest.java
new file mode 100644
index 0000000000..f2e7a6f2d0
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUITest.java
@@ -0,0 +1,21 @@
+/*
+ * 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.integration;
+
+public class ServletIntegrationWebsocketUITest extends
+        AbstractServletIntegrationTest {
+    // Uses the test method declared in the super class
+}
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java b/uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java
index d2aa413749..c511b99e6e 100644
--- a/uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java
+++ b/uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java
@@ -19,7 +19,7 @@ package com.vaadin.tests.tb3;
 import org.junit.runner.RunWith;
 import org.junit.runners.model.InitializationError;
 
-import com.vaadin.tests.integration.ServletIntegrationTestTB3;
+import com.vaadin.tests.integration.AbstractServletIntegrationTest;
 import com.vaadin.tests.tb3.ServletIntegrationTests.ServletIntegrationTestSuite;
 
 @RunWith(ServletIntegrationTestSuite.class)
@@ -28,7 +28,7 @@ public class ServletIntegrationTests {
     public static class ServletIntegrationTestSuite extends TB3TestSuite {
         public ServletIntegrationTestSuite(Class<?> klass)
                 throws InitializationError {
-            super(klass, ServletIntegrationTestTB3.class,
+            super(klass, AbstractServletIntegrationTest.class,
                     "com.vaadin.tests.integration", new String[] {});
         }
     }
-- 
cgit v1.2.3


From e1c38bf70c9bb563dbe7771c8713a94fd9e99836 Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti@vaadin.com>
Date: Fri, 27 Sep 2013 15:07:48 +0300
Subject: Avoid obsolete calendar panel renderings to avoid various NPEs.
 (#12504,#12667)

Change-Id: Ie0a9a8d9913116520b766062ebabdb771a76d1b6
---
 .../src/com/vaadin/client/ui/VCalendarPanel.java   |  24 +++--
 .../ui/datefield/PopupDateFieldConnector.java      |   9 +-
 .../tests/components/datefield/DateFieldTest.java  | 103 +++++++++++++++++++++
 3 files changed, 121 insertions(+), 15 deletions(-)

(limited to 'uitest')

diff --git a/client/src/com/vaadin/client/ui/VCalendarPanel.java b/client/src/com/vaadin/client/ui/VCalendarPanel.java
index 1f40298760..58e0448b5f 100644
--- a/client/src/com/vaadin/client/ui/VCalendarPanel.java
+++ b/client/src/com/vaadin/client/ui/VCalendarPanel.java
@@ -2215,11 +2215,13 @@ public class VCalendarPanel extends FocusableFlexTable implements
      *            - the allowed range's start date
      */
     public void setRangeStart(Date rangeStart) {
-        this.rangeStart = rangeStart;
-        if (initialRenderDone) {
-            // Dynamic updates to the range needs to render the calendar to
-            // update the element stylenames
-            renderCalendar();
+        if (this.rangeStart != rangeStart) {
+            this.rangeStart = rangeStart;
+            if (initialRenderDone) {
+                // Dynamic updates to the range needs to render the calendar to
+                // update the element stylenames
+                renderCalendar();
+            }
         }
 
     }
@@ -2232,11 +2234,13 @@ public class VCalendarPanel extends FocusableFlexTable implements
      *            - the allowed range's end date
      */
     public void setRangeEnd(Date rangeEnd) {
-        this.rangeEnd = rangeEnd;
-        if (initialRenderDone) {
-            // Dynamic updates to the range needs to render the calendar to
-            // update the element stylenames
-            renderCalendar();
+        if (this.rangeEnd != rangeEnd) {
+            this.rangeEnd = rangeEnd;
+            if (initialRenderDone) {
+                // Dynamic updates to the range needs to render the calendar to
+                // update the element stylenames
+                renderCalendar();
+            }
         }
     }
 }
diff --git a/client/src/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java b/client/src/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java
index 627478ebe5..f018caefa5 100644
--- a/client/src/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java
+++ b/client/src/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java
@@ -77,9 +77,6 @@ public class PopupDateFieldConnector extends TextualDateConnector {
 
         String oldLocale = getWidget().getCurrentLocale();
 
-        boolean lastReadOnlyState = getWidget().isReadonly();
-        boolean lastEnabledState = getWidget().isEnabled();
-
         getWidget().parsable = uidl.getBooleanAttribute("parsable");
 
         super.updateFromUIDL(uidl, client);
@@ -92,7 +89,8 @@ public class PopupDateFieldConnector extends TextualDateConnector {
                 .getCurrentResolution()) {
             getWidget().calendar.setResolution(getWidget()
                     .getCurrentResolution());
-            if (getWidget().calendar.getDate() != null) {
+            if (getWidget().calendar.getDate() != null
+                    && getWidget().getCurrentDate() != null) {
                 getWidget().calendar.setDate((Date) getWidget()
                         .getCurrentDate().clone());
                 // force re-render when changing resolution only
@@ -101,7 +99,7 @@ public class PopupDateFieldConnector extends TextualDateConnector {
         }
 
         // Force re-render of calendar if locale has changed (#12153)
-        if (getWidget().getCurrentLocale() != oldLocale) {
+        if (!getWidget().getCurrentLocale().equals(oldLocale)) {
             getWidget().calendar.renderCalendar();
         }
 
@@ -113,6 +111,7 @@ public class PopupDateFieldConnector extends TextualDateConnector {
                     .setFocusChangeListener(new FocusChangeListener() {
                         @Override
                         public void focusChanged(Date date) {
+
                             getWidget().updateValue(date);
                             getWidget().buildDate();
                             Date date2 = getWidget().calendar.getDate();
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldTest.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldTest.java
index d92199a214..2a61e79f32 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldTest.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldTest.java
@@ -7,8 +7,17 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.Dimension;
+import org.openqa.selenium.NoSuchElementException;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.interactions.Actions;
+
 import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.abstractfield.AbstractFieldTest;
+import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.ui.DateField;
 
 public class DateFieldTest<T extends DateField> extends AbstractFieldTest<T> {
@@ -140,4 +149,98 @@ public class DateFieldTest<T extends DateField> extends AbstractFieldTest<T> {
         }
     };
 
+    public static class Tb3DateFieldTests extends MultiBrowserTest {
+
+        @Override
+        protected boolean isDebug() {
+            // run in debug to see js errors
+            return true;
+        }
+
+        @Test
+        public void testMakingRequired() throws InterruptedException {
+            Thread.sleep(1000);
+            menu("Component");
+            menuSub("State");
+            menu("Required");
+            assertNoErrorNotification();
+        }
+
+        private void assertNoErrorNotification() {
+            try {
+                getDriver().findElement(
+                        By.xpath("//div[contains(@class, 'v-Notification') ]"));
+                Assert.fail("Error notification shown!");
+            } catch (NoSuchElementException e) {
+                // As expected
+            }
+        }
+
+        @Test
+        public void testValueAfterOpeningPopupInRequiredField()
+                throws InterruptedException {
+            Thread.sleep(1000);
+            menu("Component");
+            menuSub("State");
+            menu("Required");
+
+            menu("Component");
+            menuSub("Features");
+            menuSub("Resolution");
+            menu("Month");
+
+            menu("Component");
+            menuSub("Listeners");
+            menu("Value change listener");
+
+            String inputtedValue = "2/12";
+            getInput().sendKeys(inputtedValue);
+
+            openPopup();
+            closePopup();
+            String actual = getInput().getAttribute("value");
+            Assert.assertEquals(inputtedValue, actual);
+            assertNoErrorNotification();
+
+        }
+
+        private void openPopup() throws InterruptedException {
+            Dimension size = getInput().getSize();
+            new Actions(getDriver()).moveToElement(getInput(), 0, 0)
+                    .moveByOffset(size.getWidth() + 5, size.getHeight() / 2)
+                    .click();
+            // This fails in Opera for some weird reason
+            // getDriver().findElement(By.className("v-datefield-button")).click();
+        }
+
+        private WebElement getInput() {
+            return getDriver().findElement(By.xpath("//input"));
+        }
+
+        private void closePopup() {
+            getDriver().findElement(By.tagName("body")).click();
+        }
+
+        /**
+         * @since
+         * @param string
+         */
+        private void menuSub(String string) {
+            getDriver().findElement(
+                    By.xpath("//span[text() = '" + string + "']")).click();
+            new Actions(getDriver()).moveByOffset(100, 0).build().perform();
+        }
+
+        /**
+         * @since
+         * @param string
+         */
+        private void menu(String string) {
+            getDriver().findElement(
+                    By.xpath("//span[text() = '" + string + "']")).click();
+
+        }
+
+    }
+
 }
-- 
cgit v1.2.3


From 63f10ec8bbeb6faa5ff685bfe375b1d0decd39cd Mon Sep 17 00:00:00 2001
From: John Ahlroos <john@vaadin.com>
Date: Wed, 9 Oct 2013 09:59:03 +0300
Subject: Fixed compilation error in TB3 test

Change-Id: I62e246995879733393af3275778e9201cd970adb
---
 .../tests/components/datefield/DateFieldTest.java  | 103 ------------------
 .../components/datefield/DateFieldTestTest.java    | 118 +++++++++++++++++++++
 2 files changed, 118 insertions(+), 103 deletions(-)
 create mode 100644 uitest/src/com/vaadin/tests/components/datefield/DateFieldTestTest.java

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldTest.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldTest.java
index 2a61e79f32..d92199a214 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldTest.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldTest.java
@@ -7,17 +7,8 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 
-import org.junit.Assert;
-import org.junit.Test;
-import org.openqa.selenium.By;
-import org.openqa.selenium.Dimension;
-import org.openqa.selenium.NoSuchElementException;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.interactions.Actions;
-
 import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.abstractfield.AbstractFieldTest;
-import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.ui.DateField;
 
 public class DateFieldTest<T extends DateField> extends AbstractFieldTest<T> {
@@ -149,98 +140,4 @@ public class DateFieldTest<T extends DateField> extends AbstractFieldTest<T> {
         }
     };
 
-    public static class Tb3DateFieldTests extends MultiBrowserTest {
-
-        @Override
-        protected boolean isDebug() {
-            // run in debug to see js errors
-            return true;
-        }
-
-        @Test
-        public void testMakingRequired() throws InterruptedException {
-            Thread.sleep(1000);
-            menu("Component");
-            menuSub("State");
-            menu("Required");
-            assertNoErrorNotification();
-        }
-
-        private void assertNoErrorNotification() {
-            try {
-                getDriver().findElement(
-                        By.xpath("//div[contains(@class, 'v-Notification') ]"));
-                Assert.fail("Error notification shown!");
-            } catch (NoSuchElementException e) {
-                // As expected
-            }
-        }
-
-        @Test
-        public void testValueAfterOpeningPopupInRequiredField()
-                throws InterruptedException {
-            Thread.sleep(1000);
-            menu("Component");
-            menuSub("State");
-            menu("Required");
-
-            menu("Component");
-            menuSub("Features");
-            menuSub("Resolution");
-            menu("Month");
-
-            menu("Component");
-            menuSub("Listeners");
-            menu("Value change listener");
-
-            String inputtedValue = "2/12";
-            getInput().sendKeys(inputtedValue);
-
-            openPopup();
-            closePopup();
-            String actual = getInput().getAttribute("value");
-            Assert.assertEquals(inputtedValue, actual);
-            assertNoErrorNotification();
-
-        }
-
-        private void openPopup() throws InterruptedException {
-            Dimension size = getInput().getSize();
-            new Actions(getDriver()).moveToElement(getInput(), 0, 0)
-                    .moveByOffset(size.getWidth() + 5, size.getHeight() / 2)
-                    .click();
-            // This fails in Opera for some weird reason
-            // getDriver().findElement(By.className("v-datefield-button")).click();
-        }
-
-        private WebElement getInput() {
-            return getDriver().findElement(By.xpath("//input"));
-        }
-
-        private void closePopup() {
-            getDriver().findElement(By.tagName("body")).click();
-        }
-
-        /**
-         * @since
-         * @param string
-         */
-        private void menuSub(String string) {
-            getDriver().findElement(
-                    By.xpath("//span[text() = '" + string + "']")).click();
-            new Actions(getDriver()).moveByOffset(100, 0).build().perform();
-        }
-
-        /**
-         * @since
-         * @param string
-         */
-        private void menu(String string) {
-            getDriver().findElement(
-                    By.xpath("//span[text() = '" + string + "']")).click();
-
-        }
-
-    }
-
 }
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldTestTest.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldTestTest.java
new file mode 100644
index 0000000000..557201e803
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldTestTest.java
@@ -0,0 +1,118 @@
+/*
+ * 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.datefield;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.Dimension;
+import org.openqa.selenium.NoSuchElementException;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.interactions.Actions;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class DateFieldTestTest extends MultiBrowserTest {
+
+    @Test
+    public void testMakingRequired() throws InterruptedException {
+        setDebug(true);
+        openTestURL();
+        Thread.sleep(1000);
+        menu("Component");
+        menuSub("State");
+        menu("Required");
+        assertNoErrorNotification();
+    }
+
+    private void assertNoErrorNotification() {
+        try {
+            getDriver().findElement(
+                    By.xpath("//div[contains(@class, 'v-Notification') ]"));
+            Assert.fail("Error notification shown!");
+        } catch (NoSuchElementException e) {
+            // As expected
+        }
+    }
+
+    @Test
+    public void testValueAfterOpeningPopupInRequiredField()
+            throws InterruptedException {
+        setDebug(true);
+        openTestURL();
+        Thread.sleep(1000);
+        menu("Component");
+        menuSub("State");
+        menu("Required");
+
+        menu("Component");
+        menuSub("Features");
+        menuSub("Resolution");
+        menu("Month");
+
+        menu("Component");
+        menuSub("Listeners");
+        menu("Value change listener");
+
+        String inputtedValue = "2/12";
+        getInput().sendKeys(inputtedValue);
+
+        openPopup();
+        closePopup();
+        String actual = getInput().getAttribute("value");
+        Assert.assertEquals(inputtedValue, actual);
+        assertNoErrorNotification();
+
+    }
+
+    private void openPopup() throws InterruptedException {
+        Dimension size = getInput().getSize();
+        new Actions(getDriver()).moveToElement(getInput(), 0, 0)
+                .moveByOffset(size.getWidth() + 5, size.getHeight() / 2)
+                .click();
+        // This fails in Opera for some weird reason
+        // getDriver().findElement(By.className("v-datefield-button")).click();
+    }
+
+    private WebElement getInput() {
+        return getDriver().findElement(By.xpath("//input"));
+    }
+
+    private void closePopup() {
+        getDriver().findElement(By.tagName("body")).click();
+    }
+
+    /**
+     * @since
+     * @param string
+     */
+    private void menuSub(String string) {
+        getDriver().findElement(
+                By.xpath("//span[text() = '" + string + "']")).click();
+        new Actions(getDriver()).moveByOffset(100, 0).build().perform();
+    }
+
+    /**
+     * @since
+     * @param string
+     */
+    private void menu(String string) {
+        getDriver().findElement(
+                By.xpath("//span[text() = '" + string + "']")).click();
+
+    }
+
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 3e593b0949b2b26fdc89b2aa5e8e93b006a513d0 Mon Sep 17 00:00:00 2001
From: John Ahlroos <john@vaadin.com>
Date: Tue, 1 Oct 2013 16:55:39 +0300
Subject: Focus selected row in Table #12540

Change-Id: Ic920f9cb11840a456a7c49746317eaccde1e1406
---
 client/src/com/vaadin/client/ui/VScrollTable.java  |  11 ++
 .../table/TableMoveFocusWithSelection.java         | 125 +++++++++++++++++++++
 .../table/TableMoveFocusWithSelectionTest.java     |  75 +++++++++++++
 3 files changed, 211 insertions(+)
 create mode 100644 uitest/src/com/vaadin/tests/components/table/TableMoveFocusWithSelection.java
 create mode 100644 uitest/src/com/vaadin/tests/components/table/TableMoveFocusWithSelectionTest.java

(limited to 'uitest')

diff --git a/client/src/com/vaadin/client/ui/VScrollTable.java b/client/src/com/vaadin/client/ui/VScrollTable.java
index 9cec59a5a2..104cbbd5b9 100644
--- a/client/src/com/vaadin/client/ui/VScrollTable.java
+++ b/client/src/com/vaadin/client/ui/VScrollTable.java
@@ -1072,6 +1072,17 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
                     }
                     if (selected != row.isSelected()) {
                         row.toggleSelection();
+
+                        if (selected) {
+                            if (focusedRow == null
+                                    || !selectedRowKeys.contains(focusedRow
+                                            .getKey())) {
+                                // The focus is no longer on a selected row,
+                                // move focus to first selected row
+                                setRowFocus(row);
+                            }
+                        }
+
                         if (!isSingleSelectMode() && !selected) {
                             // Update selection range in case a row is
                             // unselected from the middle of a range - #8076
diff --git a/uitest/src/com/vaadin/tests/components/table/TableMoveFocusWithSelection.java b/uitest/src/com/vaadin/tests/components/table/TableMoveFocusWithSelection.java
new file mode 100644
index 0000000000..20170efa13
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/table/TableMoveFocusWithSelection.java
@@ -0,0 +1,125 @@
+/*
+ * 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.table;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import com.vaadin.event.LayoutEvents.LayoutClickEvent;
+import com.vaadin.event.LayoutEvents.LayoutClickListener;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.VerticalLayout;
+
+public class TableMoveFocusWithSelection extends AbstractTestUI {
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
+     * VaadinRequest)
+     */
+    @Override
+    protected void setup(VaadinRequest request) {
+        final Table t = new Table();
+        t.setImmediate(true);
+        t.setId("test-table");
+        t.setSizeFull();
+        t.setSelectable(true);
+        t.addContainerProperty("layout", VerticalLayout.class, null);
+        t.addContainerProperty("string", String.class, null);
+
+        for (int i = 0; i < 100; i++) {
+            t.addItem(i);
+            final VerticalLayout l = new VerticalLayout();
+            l.setId("row-" + i);
+            l.setHeight(20, Unit.PIXELS);
+            l.setData(i);
+            l.addLayoutClickListener(new LayoutClickListener() {
+                @Override
+                public void layoutClick(LayoutClickEvent event) {
+                    if (t.isMultiSelect()) {
+                        Set<Object> values = new HashSet<Object>(
+                                (Set<Object>) t.getValue());
+                        values.add(l.getData());
+                        t.setValue(values);
+                    } else {
+                        t.setValue(l.getData());
+                    }
+                }
+            });
+            t.getContainerProperty(i, "layout").setValue(l);
+            t.getContainerProperty(i, "string").setValue("Item #" + i);
+        }
+        addComponent(t);
+
+        // Select mode
+        Button toggleSelectMode = new Button(
+                t.isMultiSelect() ? "Press to use single select"
+                        : "Press to use multi select");
+        toggleSelectMode.setId("toggle-mode");
+        toggleSelectMode.addClickListener(new ClickListener() {
+
+            @Override
+            public void buttonClick(ClickEvent event) {
+                t.setMultiSelect(!t.isMultiSelect());
+
+                event.getButton().setCaption(
+                        t.isMultiSelect() ? "Press to use single select"
+                                : "Press to use multi select");
+            }
+        });
+
+        addComponent(toggleSelectMode);
+
+        Button select5210 = new Button("Select row 5-10",
+                new Button.ClickListener() {
+
+                    @Override
+                    public void buttonClick(ClickEvent event) {
+                        t.setValue(Arrays.asList(5, 6, 7, 8, 9, 10));
+                    }
+                });
+        select5210.setId("select-510");
+        addComponent(select5210);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
+     */
+    @Override
+    protected String getTestDescription() {
+        return "Changing selection in single select mode should move focus";
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
+     */
+    @Override
+    protected Integer getTicketNumber() {
+        return 12540;
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/table/TableMoveFocusWithSelectionTest.java b/uitest/src/com/vaadin/tests/components/table/TableMoveFocusWithSelectionTest.java
new file mode 100644
index 0000000000..b38705eeb6
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/table/TableMoveFocusWithSelectionTest.java
@@ -0,0 +1,75 @@
+/*
+ * 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.table;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.testbench.By;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+/**
+ * Tests if table focus is moved correctly to the selected item
+ * 
+ * @since
+ * @author Vaadin Ltd
+ */
+public class TableMoveFocusWithSelectionTest extends MultiBrowserTest {
+
+    @Test
+    public void selectUnfocusedTableAndAssumeSelectionGetsFocus() {
+
+        openTestURL();
+
+        // Click on row 5
+        getDriver().findElement(By.id("row-5")).click();
+
+        // Ensure row 5 gets focused
+        WebElement row5TableRow = getDriver().findElement(
+                By.xpath("//div[@id='row-5']/../../.."));
+        String row5StyleName = row5TableRow.getAttribute("class");
+        assertTrue(row5StyleName.contains("v-table-focus"));
+    }
+
+    @Test
+    public void focusShouldStayOnUserSelectedRowIfSelectionChangesServerSide() {
+
+        openTestURL();
+
+        // Select multiselect
+        getDriver().findElement(By.id("toggle-mode")).click();
+
+        // Click on row 7
+        getDriver().findElement(By.id("row-7")).click();
+
+        // Select row 5-10 server side
+        getDriver().findElement(By.id("select-510")).click();
+
+        // Ensure row 7 is still focused
+        WebElement row7TableRow = getDriver().findElement(
+                By.xpath("//div[@id='row-7']/../../.."));
+        String row7StyleName = row7TableRow.getAttribute("class");
+        assertTrue(row7StyleName.contains("v-table-focus"));
+    }
+
+    @Override
+    protected Class<?> getUIClass() {
+        // FIXME Remove when this is done automatically
+        return TableMoveFocusWithSelection.class;
+    }
+}
-- 
cgit v1.2.3


From 3c842b76ed6ecbf3cf92cb9a7cca3b72e326a2ed Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti@vaadin.com>
Date: Wed, 9 Oct 2013 14:37:57 +0300
Subject: added small pause to make test pass

Change-Id: I2e58a7444e5a2740f81409e6f248e0acedcead54
---
 .../tests/components/datefield/DynamicallyChangeDateRange.html | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.html b/uitest/src/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.html
index 77c610f211..75c19945b0 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.html
@@ -51,6 +51,11 @@
 	<td>vaadin=runcomvaadintestscomponentsdatefieldDynamicallyChangeDateRange::/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>300</td>
+	<td></td>
+</tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsdatefieldDynamicallyChangeDateRange::/VVerticalLayout[0]/Slot[0]/VPopupCalendar[0]#popupButton</td>
@@ -86,6 +91,11 @@
 	<td>vaadin=runcomvaadintestscomponentsdatefieldDynamicallyChangeDateRange::/VVerticalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
+<tr>
+	<td>pause</td>
+	<td>300</td>
+	<td></td>
+</tr>
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsdatefieldDynamicallyChangeDateRange::/VVerticalLayout[0]/Slot[0]/VPopupCalendar[0]#popupButton</td>
-- 
cgit v1.2.3


From 8850d2c7a480ebbde8b1853b7fbf452bde95221f Mon Sep 17 00:00:00 2001
From: Pekka Hyvönen <pekka@vaadin.com>
Date: Wed, 9 Oct 2013 12:38:12 +0300
Subject: Table column header dnd ghost element location and styles (#12714)

Change-Id: I1c5c0fee61e2a47f0f9c8fdfbbd48f49171135b6
---
 client/src/com/vaadin/client/ui/VScrollTable.java  |  29 +++--
 .../TableDragColumnFloatingElementStyles.html      | 136 +++++++++++++++++++++
 2 files changed, 157 insertions(+), 8 deletions(-)
 create mode 100644 uitest/src/com/vaadin/tests/components/table/TableDragColumnFloatingElementStyles.html

(limited to 'uitest')

diff --git a/client/src/com/vaadin/client/ui/VScrollTable.java b/client/src/com/vaadin/client/ui/VScrollTable.java
index 318a4a5f8f..b5a3086add 100644
--- a/client/src/com/vaadin/client/ui/VScrollTable.java
+++ b/client/src/com/vaadin/client/ui/VScrollTable.java
@@ -71,7 +71,6 @@ import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.HasWidgets;
 import com.google.gwt.user.client.ui.Panel;
 import com.google.gwt.user.client.ui.PopupPanel;
-import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.UIObject;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.client.ApplicationConnection;
@@ -80,6 +79,7 @@ import com.vaadin.client.ComponentConnector;
 import com.vaadin.client.ConnectorMap;
 import com.vaadin.client.Focusable;
 import com.vaadin.client.MouseEventDetailsBuilder;
+import com.vaadin.client.StyleConstants;
 import com.vaadin.client.TooltipInfo;
 import com.vaadin.client.UIDL;
 import com.vaadin.client.Util;
@@ -2758,13 +2758,27 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
             DOM.setInnerHTML(floatingCopyOfHeaderCell, DOM.getInnerHTML(td));
             floatingCopyOfHeaderCell = DOM
                     .getChild(floatingCopyOfHeaderCell, 2);
-            DOM.setElementProperty(floatingCopyOfHeaderCell, "className",
-                    VScrollTable.this.getStylePrimaryName() + "-header-drag");
+            // #12714 the shown "ghost element" should be inside
+            // v-overlay-container, and it should contain the same styles as the
+            // table to enable theming (except v-table & v-widget).
+            String stylePrimaryName = VScrollTable.this.getStylePrimaryName();
+            StringBuilder sb = new StringBuilder();
+            for (String s : VScrollTable.this.getStyleName().split(" ")) {
+                if (!s.equals(StyleConstants.UI_WIDGET)) {
+                    sb.append(s);
+                    if (s.equals(stylePrimaryName)) {
+                        sb.append("-header-drag ");
+                    } else {
+                        sb.append(" ");
+                    }
+                }
+            }
+            floatingCopyOfHeaderCell.setClassName(sb.toString().trim());
             // otherwise might wrap or be cut if narrow column
             DOM.setStyleAttribute(floatingCopyOfHeaderCell, "width", "auto");
             updateFloatingCopysPosition(DOM.getAbsoluteLeft(td),
                     DOM.getAbsoluteTop(td));
-            DOM.appendChild(RootPanel.get().getElement(),
+            DOM.appendChild(VOverlay.getOverlayContainer(client),
                     floatingCopyOfHeaderCell);
         }
 
@@ -2779,8 +2793,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
         }
 
         private void hideFloatingCopy() {
-            DOM.removeChild(RootPanel.get().getElement(),
-                    floatingCopyOfHeaderCell);
+            floatingCopyOfHeaderCell.removeFromParent();
             floatingCopyOfHeaderCell = null;
         }
 
@@ -7069,7 +7082,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
 
         private void deEmphasis() {
             UIObject.setStyleName(getElement(),
-                    VScrollTable.this.getStylePrimaryName() + "-drag", false);
+                    getStylePrimaryName() + "-drag", false);
             if (lastEmphasized == null) {
                 return;
             }
@@ -7095,7 +7108,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
         private void emphasis(TableDDDetails details) {
             deEmphasis();
             UIObject.setStyleName(getElement(),
-                    VScrollTable.this.getStylePrimaryName() + "-drag", true);
+                    getStylePrimaryName() + "-drag", true);
             // iterate old and new emphasized row
             for (Widget w : scrollBody.renderedRows) {
                 VScrollTableRow row = (VScrollTableRow) w;
diff --git a/uitest/src/com/vaadin/tests/components/table/TableDragColumnFloatingElementStyles.html b/uitest/src/com/vaadin/tests/components/table/TableDragColumnFloatingElementStyles.html
new file mode 100644
index 0000000000..e4bd02d620
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/table/TableDragColumnFloatingElementStyles.html
@@ -0,0 +1,136 @@
+<?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>TableDragColumn</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">TableDragColumn</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.table.Tables?restartApplication</td>
+	<td></td>
+</tr>
+<!-- Drag and drop column 1 to the left of column 4 -->
+<tr>
+	<td>drag</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
+	<td>51,6</td>
+</tr>
+<tr>
+	<td>assertElementPresent</td>
+	<td>//div[@id='runcomvaadintestscomponentstableTables-1125197179-overlays']/div</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertCSSClass</td>
+	<td>//div[@id='runcomvaadintestscomponentstableTables-1125197179-overlays']/div</td>
+	<td>v-table-header-drag</td>
+</tr>
+<tr>
+	<td>drop</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[2]</td>
+	<td>70,10</td>
+</tr>
+<!--Add style name "red-border-1px" to table-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>
+	<td>24,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item1</td>
+	<td>18,10</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item4</td>
+	<td>19,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item2</td>
+	<td>75,7</td>
+</tr>
+<!-- Drag and drop column 1 to the left of column 4 -->
+<tr>
+	<td>drag</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
+	<td>51,6</td>
+</tr>
+<tr>
+	<td>assertElementPresent</td>
+	<td>//div[@id='runcomvaadintestscomponentstableTables-1125197179-overlays']/div</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertCSSClass</td>
+	<td>//div[@id='runcomvaadintestscomponentstableTables-1125197179-overlays']/div</td>
+	<td>v-table-header-drag</td>
+</tr>
+<tr>
+	<td>assertCSSClass</td>
+	<td>//div[@id='runcomvaadintestscomponentstableTables-1125197179-overlays']/div</td>
+	<td>border-red-1px</td>
+</tr>
+<tr>
+	<td>drop</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[2]</td>
+	<td>70,10</td>
+</tr>
+<!--Set as read only thus get v-readonly style-->
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>
+	<td>32,8</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item0</td>
+	<td>18,12</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item2</td>
+	<td>42,13</td>
+</tr>
+<!-- Drag and drop column 1 to the left of column 4 -->
+<tr>
+	<td>drag</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
+	<td>51,6</td>
+</tr>
+<tr>
+	<td>assertElementPresent</td>
+	<td>//div[@id='runcomvaadintestscomponentstableTables-1125197179-overlays']/div</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertCSSClass</td>
+	<td>//div[@id='runcomvaadintestscomponentstableTables-1125197179-overlays']/div</td>
+	<td>v-table-header-drag</td>
+</tr>
+<tr>
+	<td>assertCSSClass</td>
+	<td>//div[@id='runcomvaadintestscomponentstableTables-1125197179-overlays']/div</td>
+	<td>border-red-1px</td>
+</tr>
+<tr>
+	<td>assertCSSClass</td>
+	<td>//div[@id='runcomvaadintestscomponentstableTables-1125197179-overlays']/div</td>
+	<td>v-readonly</td>
+</tr>
+<tr>
+	<td>drop</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[2]</td>
+	<td>70,10</td>
+</tr>
+</tbody></table>
+</body>
+</html>
\ No newline at end of file
-- 
cgit v1.2.3


From 1b7e40de9435f2584fe6c7f1b7f69cc448c16cc8 Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti@vaadin.com>
Date: Fri, 4 Oct 2013 15:41:06 +0300
Subject: Only fetch rows if there are some (#11189)

IE hacks cause calls to onScroll in situations where the cache row fetch
logic is not working correctly (causes JS exception). This change has an
optimization to pass this logic if there are no rows available and this
way fixes the JS exception as well.

Change-Id: I3425f3d75cad8b65e605638343b167abf7b48067
---
 client/src/com/vaadin/client/ui/VScrollTable.java  |  5 ++
 .../vaadin/tests/components/table/EmptyTable.java  | 58 ++++++++++++++++++++++
 .../tests/components/table/EmptyTableTest.java     | 44 ++++++++++++++++
 3 files changed, 107 insertions(+)
 create mode 100644 uitest/src/com/vaadin/tests/components/table/EmptyTable.java
 create mode 100644 uitest/src/com/vaadin/tests/components/table/EmptyTableTest.java

(limited to 'uitest')

diff --git a/client/src/com/vaadin/client/ui/VScrollTable.java b/client/src/com/vaadin/client/ui/VScrollTable.java
index 104cbbd5b9..0304acd590 100644
--- a/client/src/com/vaadin/client/ui/VScrollTable.java
+++ b/client/src/com/vaadin/client/ui/VScrollTable.java
@@ -6913,6 +6913,11 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
         // fix footers horizontal scrolling
         tFoot.setHorizontalScrollPosition(scrollLeft);
 
+        if (totalRows == 0) {
+            // No rows, no need to fetch new rows
+            return;
+        }
+
         firstRowInViewPort = calcFirstRowInViewPort();
         if (firstRowInViewPort > totalRows - pageLength) {
             firstRowInViewPort = totalRows - pageLength;
diff --git a/uitest/src/com/vaadin/tests/components/table/EmptyTable.java b/uitest/src/com/vaadin/tests/components/table/EmptyTable.java
new file mode 100644
index 0000000000..d6c30efa5a
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/table/EmptyTable.java
@@ -0,0 +1,58 @@
+/*
+ * 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.table;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Table;
+
+public class EmptyTable extends AbstractTestUI {
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
+     * VaadinRequest)
+     */
+    @Override
+    protected void setup(VaadinRequest request) {
+        Table table = new Table("Table");
+        table.addContainerProperty("testColumn", String.class, null);
+        table.setPageLength(0); // disable paging
+        addComponent(table);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
+     */
+    @Override
+    protected String getTestDescription() {
+        return "Empty Table should not cause JS exception";
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
+     */
+    @Override
+    protected Integer getTicketNumber() {
+        return 11189;
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/table/EmptyTableTest.java b/uitest/src/com/vaadin/tests/components/table/EmptyTableTest.java
new file mode 100644
index 0000000000..229dc23b9a
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/table/EmptyTableTest.java
@@ -0,0 +1,44 @@
+/*
+ * 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.table;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.NoSuchElementException;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class EmptyTableTest extends MultiBrowserTest {
+
+    @Test
+    public void test() {
+        setDebug(true);
+        openTestURL();
+
+        ensureNoErrors();
+    }
+
+    private void ensureNoErrors() {
+        try {
+            getDriver().findElement(By.className("v-Notification"));
+        } catch (NoSuchElementException e) {
+            return;
+        }
+        Assert.fail("Error notification was shown!");
+    }
+
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 4cb304d8eb63ce0045a2742bd9c945af4f12aa66 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 27 Sep 2013 13:16:45 +0300
Subject: Converted broken test to TB3

Change-Id: Ic30db7584a65c944eb45c576e12b7671399d1965
---
 .../vaadin/tests/components/ui/UIAccessTest.java   | 163 +++++++++++++++++++-
 .../com/vaadin/tests/components/ui/UiAccess.html   | 166 ---------------------
 2 files changed, 161 insertions(+), 168 deletions(-)
 delete mode 100644 uitest/src/com/vaadin/tests/components/ui/UiAccess.html

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/components/ui/UIAccessTest.java b/uitest/src/com/vaadin/tests/components/ui/UIAccessTest.java
index 8d04ceae71..9db2c2f0d3 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIAccessTest.java
+++ b/uitest/src/com/vaadin/tests/components/ui/UIAccessTest.java
@@ -15,11 +15,16 @@
  */
 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 {
@@ -30,8 +35,7 @@ public class UIAccessTest extends MultiBrowserTest {
         getCurrentInstanceWhenPushingButton().click();
         waitUntil(ExpectedConditions.textToBePresentInElement(
                 vaadinLocatorById("Log_row_0"), "1."));
-        Assert.assertEquals(
-                "0. Current UI matches in beforeResponse? true",
+        Assert.assertEquals("0. Current UI matches in beforeResponse? true",
                 vaadinElementById("Log_row_1").getText());
         Assert.assertEquals(
                 "1. Current session matches in beforeResponse? true",
@@ -39,6 +43,161 @@ public class UIAccessTest extends MultiBrowserTest {
 
     }
 
+    @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]");
     }
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>
-- 
cgit v1.2.3


From 6a99730d898f8e0663d69dbeba6682113c29ca52 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 11 Oct 2013 20:31:48 +0300
Subject: Allow skipping TB2/TB3 tests using tests.tb2/tb3.skip

Change-Id: If9f16657731fa5ea06e61bf9702abe385e4fc7a1
---
 uitest/tb3test.xml | 2 +-
 uitest/test.xml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'uitest')

diff --git a/uitest/tb3test.xml b/uitest/tb3test.xml
index de69e0ebe6..5285280608 100644
--- a/uitest/tb3test.xml
+++ b/uitest/tb3test.xml
@@ -10,7 +10,7 @@
         <path location="${tb3test.dir}/result/classes" />
     </path>
 
-    <target name="run-all-tb3-tests" description="Run all the TB3 tests (except server tests) in the project">
+    <target name="run-all-tb3-tests" unless="tests.tb3.skip" description="Run all the TB3 tests (except server tests) in the project">
         <antcall target="run-tb3-suite">
             <param name="junit.test.suite" value="com.vaadin.tests.tb3.AllTB3Tests" />
         </antcall>
diff --git a/uitest/test.xml b/uitest/test.xml
index c534d676b9..326117fb8f 100644
--- a/uitest/test.xml
+++ b/uitest/test.xml
@@ -83,7 +83,7 @@
         <fail unless="com.vaadin.testbench.deployment.url" message="The 'com.vaadin.testbench.deployment.url' property must be defined." />
     </target>
 
-    <target name="run-tb2-tests" depends="check-parameters,compile-tests">
+    <target name="run-tb2-tests" depends="check-parameters,compile-tests" unless="tests.tb2.skip">
         <fileset dir="${test-output-dir}" id="tests-fileset">
             <include name="**/**.java" />
         </fileset>
-- 
cgit v1.2.3


From c978ad89cb27a4608c7adcda4ee606442b8c7773 Mon Sep 17 00:00:00 2001
From: Pekka Hyvönen <pekka@vaadin.com>
Date: Fri, 11 Oct 2013 15:55:50 +0300
Subject: Converted test to use screenshots due to IE8 issues with TB dnd
 commands (#12714)

Basically the screenshot for IE8 after the drag + drop commands shows
that the column header drag element is not removed from DOM for some
reason. In real life, column header drag and drop works for IE8.

Change-Id: Ia31054e496064695708ed2392e83aa53056d2b5b
---
 .../TableDragColumnFloatingElementStyles.html      | 84 ++++++++++------------
 1 file changed, 36 insertions(+), 48 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/components/table/TableDragColumnFloatingElementStyles.html b/uitest/src/com/vaadin/tests/components/table/TableDragColumnFloatingElementStyles.html
index e4bd02d620..e225091b5f 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableDragColumnFloatingElementStyles.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableDragColumnFloatingElementStyles.html
@@ -16,26 +16,25 @@
 	<td>/run/com.vaadin.tests.components.table.Tables?restartApplication</td>
 	<td></td>
 </tr>
-<!-- Drag and drop column 1 to the left of column 4 -->
 <tr>
 	<td>drag</td>
 	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
 	<td>51,6</td>
 </tr>
 <tr>
-	<td>assertElementPresent</td>
-	<td>//div[@id='runcomvaadintestscomponentstableTables-1125197179-overlays']/div</td>
-	<td></td>
+	<td>mouseMoveAt</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[3]</td>
+	<td>70,10</td>
 </tr>
 <tr>
-	<td>assertCSSClass</td>
-	<td>//div[@id='runcomvaadintestscomponentstableTables-1125197179-overlays']/div</td>
-	<td>v-table-header-drag</td>
+	<td>screenCapture</td>
+	<td></td>
+	<td>1 basic ghost element</td>
 </tr>
 <tr>
 	<td>drop</td>
-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[2]</td>
-	<td>70,10</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
+	<td>10,10</td>
 </tr>
 <!--Add style name "red-border-1px" to table-->
 <tr>
@@ -61,75 +60,64 @@
 <!-- Drag and drop column 1 to the left of column 4 -->
 <tr>
 	<td>drag</td>
-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td>51,6</td>
 </tr>
 <tr>
-	<td>assertElementPresent</td>
-	<td>//div[@id='runcomvaadintestscomponentstableTables-1125197179-overlays']/div</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertCSSClass</td>
-	<td>//div[@id='runcomvaadintestscomponentstableTables-1125197179-overlays']/div</td>
-	<td>v-table-header-drag</td>
+	<td>mouseMoveAt</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[3]</td>
+	<td>70,10</td>
 </tr>
 <tr>
-	<td>assertCSSClass</td>
-	<td>//div[@id='runcomvaadintestscomponentstableTables-1125197179-overlays']/div</td>
-	<td>border-red-1px</td>
+	<td>screenCapture</td>
+	<td></td>
+	<td>2 themed ghost element should have red borders</td>
 </tr>
 <tr>
 	<td>drop</td>
-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[2]</td>
-	<td>70,10</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
+	<td>10,10</td>
 </tr>
-<!--Set as read only thus get v-readonly style-->
+<!--Add style name "red-border-1px" to table-->
 <tr>
 	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td>
-	<td>32,8</td>
+	<td>24,7</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item1</td>
+	<td>18,10</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item0</td>
-	<td>18,12</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item4</td>
+	<td>19,8</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item2</td>
-	<td>42,13</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item3</td>
+	<td>164,10</td>
 </tr>
-<!-- Drag and drop column 1 to the left of column 4 -->
 <tr>
 	<td>drag</td>
 	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
 	<td>51,6</td>
 </tr>
 <tr>
-	<td>assertElementPresent</td>
-	<td>//div[@id='runcomvaadintestscomponentstableTables-1125197179-overlays']/div</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertCSSClass</td>
-	<td>//div[@id='runcomvaadintestscomponentstableTables-1125197179-overlays']/div</td>
-	<td>v-table-header-drag</td>
-</tr>
-<tr>
-	<td>assertCSSClass</td>
-	<td>//div[@id='runcomvaadintestscomponentstableTables-1125197179-overlays']/div</td>
-	<td>border-red-1px</td>
+	<td>mouseMoveAt</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[3]</td>
+	<td>70,10</td>
 </tr>
 <tr>
-	<td>assertCSSClass</td>
-	<td>//div[@id='runcomvaadintestscomponentstableTables-1125197179-overlays']/div</td>
-	<td>v-readonly</td>
+	<td>screenCapture</td>
+	<td></td>
+	<td>3 themed ghost element should have 2px blue borders</td>
 </tr>
 <tr>
 	<td>drop</td>
-	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[2]</td>
-	<td>70,10</td>
+	<td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td>
+	<td>10,10</td>
 </tr>
 </tbody></table>
 </body>
-- 
cgit v1.2.3


From d461fb438f62b38d2082b41b0a3c7a1189927c3d Mon Sep 17 00:00:00 2001
From: Felype Santiago Ferreira <felype@vaadin.com>
Date: Tue, 8 Oct 2013 16:04:32 +0300
Subject: Fixed swallower access. Now error handler logs exceptions. (#12703)

Change-Id: If8fe00e10c7ec56cbd8753ff88d4816613a340f2
---
 .../com/vaadin/server/ErrorHandlingRunnable.java   |  36 +++++
 server/src/com/vaadin/server/VaadinService.java    |   8 +-
 server/src/com/vaadin/server/VaadinSession.java    |  33 +++++
 server/src/com/vaadin/ui/UI.java                   |  31 +++-
 .../components/ui/UIAccessExceptionHandling.html   |  67 +++++++++
 .../components/ui/UIAccessExceptionHandling.java   | 157 +++++++++++++++++++++
 6 files changed, 330 insertions(+), 2 deletions(-)
 create mode 100644 server/src/com/vaadin/server/ErrorHandlingRunnable.java
 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')

diff --git a/server/src/com/vaadin/server/ErrorHandlingRunnable.java b/server/src/com/vaadin/server/ErrorHandlingRunnable.java
new file mode 100644
index 0000000000..8ae6ce3d5d
--- /dev/null
+++ b/server/src/com/vaadin/server/ErrorHandlingRunnable.java
@@ -0,0 +1,36 @@
+/*
+ * 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.server;
+
+/**
+ * Defines the interface to handle exceptions thrown during the execution of a
+ * FutureAccess.
+ * 
+ * @since 7.1.8
+ * @author Vaadin Ltd
+ */
+public interface ErrorHandlingRunnable extends Runnable {
+
+    /**
+     * Handles exceptions thrown during the execution of a FutureAccess.
+     * 
+     * @since 7.1.8
+     * @param exception
+     *            the thrown exception.
+     */
+    public void handleError(Exception exception);
+
+}
diff --git a/server/src/com/vaadin/server/VaadinService.java b/server/src/com/vaadin/server/VaadinService.java
index c9a5f0974a..44ceaaaf87 100644
--- a/server/src/com/vaadin/server/VaadinService.java
+++ b/server/src/com/vaadin/server/VaadinService.java
@@ -1745,6 +1745,13 @@ public abstract class VaadinService implements Serializable {
                             .getCurrentInstances());
                     CurrentInstance.setCurrent(session);
                     pendingAccess.run();
+
+                    try {
+                        pendingAccess.get();
+
+                    } catch (Exception exception) {
+                        pendingAccess.handleError(exception);
+                    }
                 }
             }
         } finally {
@@ -1752,5 +1759,4 @@ public abstract class VaadinService implements Serializable {
             CurrentInstance.restoreInstances(oldInstances);
         }
     }
-
 }
diff --git a/server/src/com/vaadin/server/VaadinSession.java b/server/src/com/vaadin/server/VaadinSession.java
index c73ac8b686..fd2ed79acd 100644
--- a/server/src/com/vaadin/server/VaadinSession.java
+++ b/server/src/com/vaadin/server/VaadinSession.java
@@ -35,6 +35,7 @@ import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.portlet.PortletSession;
@@ -86,6 +87,7 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
         private final Map<Class<?>, CurrentInstance> instances = CurrentInstance
                 .getInstances(true);
         private final VaadinSession session;
+        private Runnable runnable;
 
         /**
          * Creates an instance for the given runnable
@@ -100,6 +102,7 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
         public FutureAccess(VaadinSession session, Runnable runnable) {
             super(runnable, null);
             this.session = session;
+            this.runnable = runnable;
         }
 
         @Override
@@ -129,6 +132,36 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
         public Map<Class<?>, CurrentInstance> getCurrentInstances() {
             return instances;
         }
+
+        /**
+         * Handles exceptions thrown during the execution of this task.
+         * 
+         * @since 7.1.8
+         * @param exception
+         *            the thrown exception.
+         */
+        public void handleError(Exception exception) {
+            try {
+                if (runnable instanceof ErrorHandlingRunnable) {
+                    ErrorHandlingRunnable errorHandlingRunnable = (ErrorHandlingRunnable) runnable;
+
+                    errorHandlingRunnable.handleError(exception);
+                } else {
+                    ErrorEvent errorEvent = new ErrorEvent(exception);
+
+                    ErrorHandler errorHandler = ErrorEvent
+                            .findErrorHandler(session);
+
+                    if (errorHandler == null) {
+                        errorHandler = new DefaultErrorHandler();
+                    }
+
+                    errorHandler.error(errorEvent);
+                }
+            } catch (Exception e) {
+                getLogger().log(Level.SEVERE, e.getMessage(), e);
+            }
+        }
     }
 
     /**
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java
index 27f04c39e1..746fa194ac 100644
--- a/server/src/com/vaadin/ui/UI.java
+++ b/server/src/com/vaadin/ui/UI.java
@@ -24,6 +24,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Future;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import com.vaadin.event.Action;
@@ -35,6 +36,9 @@ import com.vaadin.navigator.Navigator;
 import com.vaadin.server.ClientConnector;
 import com.vaadin.server.ComponentSizeValidator;
 import com.vaadin.server.ComponentSizeValidator.InvalidLayout;
+import com.vaadin.server.DefaultErrorHandler;
+import com.vaadin.server.ErrorHandler;
+import com.vaadin.server.ErrorHandlingRunnable;
 import com.vaadin.server.LocaleService;
 import com.vaadin.server.Page;
 import com.vaadin.server.PaintException;
@@ -1287,11 +1291,36 @@ public abstract class UI extends AbstractSingleComponentContainer implements
             throw new UIDetachedException();
         }
 
-        return session.access(new Runnable() {
+        return session.access(new ErrorHandlingRunnable() {
             @Override
             public void run() {
                 accessSynchronously(runnable);
             }
+
+            @Override
+            public void handleError(Exception exception) {
+                try {
+                    if (runnable instanceof ErrorHandlingRunnable) {
+                        ErrorHandlingRunnable errorHandlingRunnable = (ErrorHandlingRunnable) runnable;
+
+                        errorHandlingRunnable.handleError(exception);
+                    } else {
+                        ConnectorErrorEvent errorEvent = new ConnectorErrorEvent(
+                                UI.this, exception);
+
+                        ErrorHandler errorHandler = com.vaadin.server.ErrorEvent
+                                .findErrorHandler(UI.this);
+
+                        if (errorHandler == null) {
+                            errorHandler = new DefaultErrorHandler();
+                        }
+
+                        errorHandler.error(errorEvent);
+                    }
+                } catch (Exception e) {
+                    getLogger().log(Level.SEVERE, e.getMessage(), e);
+                }
+            }
         });
     }
 
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 @@
+<?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.UIAccessExceptionHandling?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsuiUIAccessExceptionHandling::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyText</td>
+	<td>vaadin=runcomvaadintestscomponentsuiUIAccessExceptionHandling::PID_SLog_row_0</td>
+	<td>1. Exception catched on get: java.util.concurrent.ExecutionException</td>
+</tr>
+<tr>
+	<td>verifyText</td>
+	<td>vaadin=runcomvaadintestscomponentsuiUIAccessExceptionHandling::PID_SLog_row_1</td>
+	<td>0. Exception catched on execution with ConnectorErrorEvent : java.util.concurrent.ExecutionException</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsuiUIAccessExceptionHandling::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyText</td>
+	<td>vaadin=runcomvaadintestscomponentsuiUIAccessExceptionHandling::PID_SLog_row_0</td>
+	<td>1. Exception catched on get: java.util.concurrent.ExecutionException</td>
+</tr>
+<tr>
+	<td>verifyText</td>
+	<td>vaadin=runcomvaadintestscomponentsuiUIAccessExceptionHandling::PID_SLog_row_1</td>
+	<td>0. Exception catched on execution with ErrorEvent : java.util.concurrent.ExecutionException</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentsuiUIAccessExceptionHandling::/VVerticalLayout[0]/Slot[2]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyText</td>
+	<td>vaadin=runcomvaadintestscomponentsuiUIAccessExceptionHandling::PID_SLog_row_0</td>
+	<td>1. Exception catched on get: java.util.concurrent.ExecutionException</td>
+</tr>
+<tr>
+	<td>verifyText</td>
+	<td>vaadin=runcomvaadintestscomponentsuiUIAccessExceptionHandling::PID_SLog_row_1</td>
+	<td>0. Exception catched on execution with ConnectorErrorEvent : java.util.concurrent.ExecutionException</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
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<Void> 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<Class<?>, 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


From c7ae45cc2404c2eab557866f310a2bb2130ddffe Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Tue, 15 Oct 2013 09:33:43 +0300
Subject: Validate that the connector is enabled before triggering actions for
 it (#12743)

Automated test enabled only for IE9-IE11 because of #12785

Change-Id: I265e5d1ead3fa56469861c5a98dcc9d0106d1051
---
 .../com/vaadin/event/ConnectorActionManager.java   | 88 ++++++++++++++++++++++
 .../server/communication/ServerRpcHandler.java     | 33 +++++---
 server/src/com/vaadin/ui/AbstractComponent.java    |  5 +-
 server/src/com/vaadin/ui/Button.java               |  2 +-
 .../actions/ActionsOnInvisibleComponents.java      | 76 +++++++++++++++++++
 .../actions/ActionsOnInvisibleComponentsTest.java  | 46 +++++++++++
 6 files changed, 238 insertions(+), 12 deletions(-)
 create mode 100644 server/src/com/vaadin/event/ConnectorActionManager.java
 create mode 100644 uitest/src/com/vaadin/tests/actions/ActionsOnInvisibleComponents.java
 create mode 100644 uitest/src/com/vaadin/tests/actions/ActionsOnInvisibleComponentsTest.java

(limited to 'uitest')

diff --git a/server/src/com/vaadin/event/ConnectorActionManager.java b/server/src/com/vaadin/event/ConnectorActionManager.java
new file mode 100644
index 0000000000..297f78f179
--- /dev/null
+++ b/server/src/com/vaadin/event/ConnectorActionManager.java
@@ -0,0 +1,88 @@
+/*
+ * 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.event;
+
+import java.util.logging.Logger;
+
+import com.vaadin.event.Action.Container;
+import com.vaadin.server.ClientConnector;
+import com.vaadin.server.VariableOwner;
+import com.vaadin.server.communication.ServerRpcHandler;
+import com.vaadin.ui.Component;
+
+/**
+ * An ActionManager connected to a connector. Takes care of verifying that the
+ * connector can receive events before triggering an action.
+ * <p>
+ * This is mostly a workaround until shortcut actions are re-implemented in a
+ * more sensible way.
+ * 
+ * @since 7.1.8
+ * @author Vaadin Ltd
+ */
+public class ConnectorActionManager extends ActionManager {
+
+    private ClientConnector connector;
+
+    /**
+     * Initialize an action manager for the given connector.
+     * 
+     * @param connector
+     *            the owner of this action manager
+     */
+    public ConnectorActionManager(ClientConnector connector) {
+        super();
+        this.connector = connector;
+    }
+
+    /**
+     * Initialize an action manager for the given connector using the given
+     * viewer.
+     * 
+     * @param connector
+     *            the owner of this action manager
+     * @param viewer
+     *            the viewer connected
+     */
+    public <T extends Component & Container & VariableOwner> ConnectorActionManager(
+            ClientConnector connector, T viewer) {
+        super(viewer);
+        this.connector = connector;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.event.ActionManager#handleAction(com.vaadin.event.Action,
+     * java.lang.Object, java.lang.Object)
+     */
+    @Override
+    public void handleAction(Action action, Object sender, Object target) {
+        if (!connector.isConnectorEnabled()) {
+            getLogger().warning(
+                    ServerRpcHandler.getIgnoredDisabledError("action",
+                            connector));
+            return;
+        }
+
+        super.handleAction(action, sender, target);
+    }
+
+    private static final Logger getLogger() {
+        return Logger.getLogger(ConnectorActionManager.class.getName());
+    }
+
+}
diff --git a/server/src/com/vaadin/server/communication/ServerRpcHandler.java b/server/src/com/vaadin/server/communication/ServerRpcHandler.java
index 3cc85909ee..f14d703454 100644
--- a/server/src/com/vaadin/server/communication/ServerRpcHandler.java
+++ b/server/src/com/vaadin/server/communication/ServerRpcHandler.java
@@ -182,15 +182,8 @@ public class ServerRpcHandler implements Serializable {
                     }
 
                     // Connector is disabled, log a warning and move to the next
-                    String msg = "Ignoring RPC call for disabled connector "
-                            + connector.getClass().getName();
-                    if (connector instanceof Component) {
-                        String caption = ((Component) connector).getCaption();
-                        if (caption != null) {
-                            msg += ", caption=" + caption;
-                        }
-                    }
-                    getLogger().warning(msg);
+                    getLogger().warning(
+                            getIgnoredDisabledError("RPC call", connector));
                     continue;
                 }
                 // DragAndDropService has null UI
@@ -466,4 +459,26 @@ public class ServerRpcHandler implements Serializable {
     private static final Logger getLogger() {
         return Logger.getLogger(ServerRpcHandler.class.getName());
     }
+
+    /**
+     * Generates an error message when the client is trying to to something
+     * ('what') with a connector which is disabled or invisible.
+     * 
+     * @since 7.1.8
+     * @param connector
+     *            the connector which is disabled (or invisible)
+     * @return an error message
+     */
+    public static String getIgnoredDisabledError(String what,
+            ClientConnector connector) {
+        String msg = "Ignoring " + what + " for disabled connector "
+                + connector.getClass().getName();
+        if (connector instanceof Component) {
+            String caption = ((Component) connector).getCaption();
+            if (caption != null) {
+                msg += ", caption=" + caption;
+            }
+        }
+        return msg;
+    }
 }
diff --git a/server/src/com/vaadin/ui/AbstractComponent.java b/server/src/com/vaadin/ui/AbstractComponent.java
index 262d47af18..61bcf00ad8 100644
--- a/server/src/com/vaadin/ui/AbstractComponent.java
+++ b/server/src/com/vaadin/ui/AbstractComponent.java
@@ -27,6 +27,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import com.vaadin.event.ActionManager;
+import com.vaadin.event.ConnectorActionManager;
 import com.vaadin.event.ShortcutListener;
 import com.vaadin.server.AbstractClientConnector;
 import com.vaadin.server.ComponentSizeValidator;
@@ -90,7 +91,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
      * Keeps track of the Actions added to this component; the actual
      * handling/notifying is delegated, usually to the containing window.
      */
-    private ActionManager actionManager;
+    private ConnectorActionManager actionManager;
 
     private boolean visible = true;
 
@@ -929,7 +930,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
      */
     protected ActionManager getActionManager() {
         if (actionManager == null) {
-            actionManager = new ActionManager();
+            actionManager = new ConnectorActionManager(this);
             setActionManagerViewer();
         }
         return actionManager;
diff --git a/server/src/com/vaadin/ui/Button.java b/server/src/com/vaadin/ui/Button.java
index 1bcf802f12..589f30d631 100644
--- a/server/src/com/vaadin/ui/Button.java
+++ b/server/src/com/vaadin/ui/Button.java
@@ -340,7 +340,7 @@ public class Button extends AbstractComponent implements
      * No action is taken is the button is disabled.
      */
     public void click() {
-        if (isEnabled() && !isReadOnly()) {
+        if (isConnectorEnabled() && !isReadOnly()) {
             fireClick();
         }
     }
diff --git a/uitest/src/com/vaadin/tests/actions/ActionsOnInvisibleComponents.java b/uitest/src/com/vaadin/tests/actions/ActionsOnInvisibleComponents.java
new file mode 100644
index 0000000000..0f4c179cee
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/actions/ActionsOnInvisibleComponents.java
@@ -0,0 +1,76 @@
+package com.vaadin.tests.actions;
+
+import com.vaadin.event.ShortcutAction.KeyCode;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUIWithLog;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+
+public class ActionsOnInvisibleComponents extends AbstractTestUIWithLog {
+
+    private static final long serialVersionUID = -5993467736906948993L;
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        getContent().setId("test-root");
+        log("'A' triggers a click on an invisible button");
+        log("'B' triggers a click on a disabled button");
+        log("'C' triggers a click on a visible and enabled button");
+
+        Button invisibleButton = new Button("Invisible button with shortcut");
+        invisibleButton.setClickShortcut(KeyCode.A);
+        invisibleButton.addClickListener(new Button.ClickListener() {
+            @Override
+            public void buttonClick(ClickEvent event) {
+                log("Click event for invisible button");
+            }
+        });
+
+        invisibleButton.setVisible(false);
+        addComponent(invisibleButton);
+
+        Button disabledButton = new Button("Disabled button with shortcut");
+        disabledButton.setClickShortcut(KeyCode.B);
+        disabledButton.addClickListener(new Button.ClickListener() {
+            @Override
+            public void buttonClick(ClickEvent event) {
+                log("Click event for disabled button");
+            }
+        });
+
+        disabledButton.setEnabled(false);
+        addComponent(disabledButton);
+
+        Button enabledButton = new Button("Enabled button with shortcut");
+        enabledButton.setClickShortcut(KeyCode.C);
+        enabledButton.addClickListener(new Button.ClickListener() {
+            @Override
+            public void buttonClick(ClickEvent event) {
+                log("Click event for enabled button");
+            }
+        });
+
+        addComponent(enabledButton);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
+     */
+    @Override
+    protected String getTestDescription() {
+        return "Test to ensure actions are not performed on disabled/invisible components";
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
+     */
+    @Override
+    protected Integer getTicketNumber() {
+        return 12743;
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/actions/ActionsOnInvisibleComponentsTest.java b/uitest/src/com/vaadin/tests/actions/ActionsOnInvisibleComponentsTest.java
new file mode 100644
index 0000000000..bb2a7d0995
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/actions/ActionsOnInvisibleComponentsTest.java
@@ -0,0 +1,46 @@
+package com.vaadin.tests.actions;
+
+import java.util.Collection;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.remote.DesiredCapabilities;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class ActionsOnInvisibleComponentsTest extends MultiBrowserTest {
+
+    private static final String LAST_INIT_LOG = "3. 'C' triggers a click on a visible and enabled button";
+
+    // This method should be removed once #12785 is fixed
+    @Override
+    public Collection<DesiredCapabilities> getBrowsersToTest() {
+        Collection<DesiredCapabilities> browsers = super.getBrowsersToTest();
+        // sendKeys does nothing on these browsers
+        browsers.remove(BrowserUtil.firefox(24));
+        browsers.remove(BrowserUtil.ie(8));
+        browsers.remove(BrowserUtil.opera(12));
+
+        // Causes 'cannot focus element'
+        browsers.remove(BrowserUtil.chrome(29));
+        return browsers;
+    }
+
+    @Test
+    public void testShortcutsOnInvisibleDisabledButtons() {
+        openTestURL();
+        Assert.assertEquals(LAST_INIT_LOG, getLogRow(0));
+        invokeShortcut("A");
+        Assert.assertEquals(LAST_INIT_LOG, getLogRow(0));
+        invokeShortcut("B");
+        Assert.assertEquals(LAST_INIT_LOG, getLogRow(0));
+        invokeShortcut("C");
+        Assert.assertEquals("4. Click event for enabled button", getLogRow(0));
+    }
+
+    private void invokeShortcut(CharSequence key) {
+        WebElement shortcutTarget = vaadinElementById("test-root");
+        shortcutTarget.sendKeys(key);
+    }
+}
-- 
cgit v1.2.3


From ce89a75620078677d118769a74d5b2cf778c9792 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Tue, 15 Oct 2013 17:01:32 +0300
Subject: Created constants for tested browser versions (#12786)

Change-Id: I8f349bb3c338bb7e9073944891436edac5ee1bb1
---
 uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java | 15 +++++++--------
 .../vaadin/tests/integration/AbstractIntegrationTest.java |  7 ++++---
 uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java      |  6 ++++--
 uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java     | 13 +++++++++----
 4 files changed, 24 insertions(+), 17 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java b/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java
index 6704f55226..83af6d07d5 100644
--- a/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java
+++ b/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java
@@ -23,7 +23,6 @@ import org.junit.Test;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.tests.tb3.AbstractTB3Test.BrowserUtil;
 
 public class VerifyBrowserVersionTest extends MultiBrowserTest {
 
@@ -31,7 +30,8 @@ public class VerifyBrowserVersionTest extends MultiBrowserTest {
 
     {
         expectedUserAgent
-                .put(BrowserUtil.firefox(24),
+                .put(BrowserUtil
+                        .firefox(MultiBrowserTest.TESTED_FIREFOX_VERSION),
                         "Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Firefox/24.0");
         expectedUserAgent
                 .put(BrowserUtil.ie(8),
@@ -46,19 +46,18 @@ public class VerifyBrowserVersionTest extends MultiBrowserTest {
                 .put(BrowserUtil.ie(11),
                         "Mozilla/5.0 (Windows NT 6.1; Trident/7.0; rv:11.0) like Gecko");
         expectedUserAgent
-                .put(BrowserUtil.chrome(29),
+                .put(BrowserUtil.chrome(MultiBrowserTest.TESTED_CHROME_VERSION),
                         "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.76 Safari/537.36");
-        expectedUserAgent
-                .put(BrowserUtil.opera(12),
-                        "Opera/9.80 (Windows NT 5.1) Presto/2.12.388 Version/12.15");
+        expectedUserAgent.put(
+                BrowserUtil.opera(MultiBrowserTest.TESTED_OPERA_VERSION),
+                "Opera/9.80 (Windows NT 5.1) Presto/2.12.388 Version/12.15");
 
     }
 
     @Test
     public void verifyUserAgent() {
         openTestURL();
-        Assert.assertEquals(
-                expectedUserAgent.get(getDesiredCapabilities()),
+        Assert.assertEquals(expectedUserAgent.get(getDesiredCapabilities()),
                 vaadinElementById("userAgent").getText());
         Assert.assertEquals("Touch device? No",
                 vaadinElementById("touchDevice").getText());
diff --git a/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java b/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java
index 5f4ae41361..ddaf84b3e1 100644
--- a/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java
+++ b/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java
@@ -22,6 +22,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized.Parameters;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
+import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.tests.tb3.PrivateTB3Configuration;
 
 /**
@@ -32,8 +33,7 @@ import com.vaadin.tests.tb3.PrivateTB3Configuration;
  * @author Vaadin Ltd
  */
 @RunWith(IntegrationTestRunner.class)
-public abstract class AbstractIntegrationTest extends
-        PrivateTB3Configuration {
+public abstract class AbstractIntegrationTest extends PrivateTB3Configuration {
     @Override
     protected String getBaseURL() {
         String deploymentUrl = System.getProperty("deployment.url");
@@ -47,7 +47,8 @@ public abstract class AbstractIntegrationTest extends
 
     @Parameters
     public static Collection<DesiredCapabilities> getBrowsersForTest() {
-        return Collections.singleton(BrowserUtil.firefox(17));
+        return Collections.singleton(BrowserUtil
+                .firefox(MultiBrowserTest.TESTED_FIREFOX_VERSION));
     }
 
 }
diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
index 1967891a7a..e831a4f15f 100644
--- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -77,7 +77,8 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
     private boolean push = false;
     {
         // Default browser to run on unless setDesiredCapabilities is called
-        desiredCapabilities = BrowserUtil.firefox(24);
+        desiredCapabilities = BrowserUtil
+                .firefox(MultiBrowserTest.TESTED_FIREFOX_VERSION);
     }
 
     /**
@@ -193,7 +194,8 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
      * @return The browsers to run the test on
      */
     public Collection<DesiredCapabilities> getBrowsersToTest() {
-        return Collections.singleton(BrowserUtil.firefox(17));
+        return Collections.singleton(BrowserUtil
+                .firefox(MultiBrowserTest.TESTED_FIREFOX_VERSION));
 
     }
 
diff --git a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
index 3553954ec0..587e2db623 100644
--- a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
+++ b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
@@ -40,17 +40,22 @@ import org.openqa.selenium.remote.DesiredCapabilities;
  */
 public abstract class MultiBrowserTest extends PrivateTB3Configuration {
 
+    public static final int TESTED_SAFARI_VERSION = 6;
+    public static final int TESTED_CHROME_VERSION = 29;
+    public static final int TESTED_FIREFOX_VERSION = 24;
+    public static final int TESTED_OPERA_VERSION = 12;
+
     static List<DesiredCapabilities> allBrowsers = new ArrayList<DesiredCapabilities>();
     static {
         allBrowsers.add(BrowserUtil.ie(8));
         allBrowsers.add(BrowserUtil.ie(9));
         allBrowsers.add(BrowserUtil.ie(10));
         allBrowsers.add(BrowserUtil.ie(11));
-        allBrowsers.add(BrowserUtil.firefox(24));
+        allBrowsers.add(BrowserUtil.firefox(TESTED_FIREFOX_VERSION));
         // Uncomment once we have the capability to run on Safari 6
-        // allBrowsers.add(safari(6));
-        allBrowsers.add(BrowserUtil.chrome(29));
-        allBrowsers.add(BrowserUtil.opera(12));
+        // allBrowsers.add(safari(TESTED_SAFARI_VERSION));
+        allBrowsers.add(BrowserUtil.chrome(TESTED_CHROME_VERSION));
+        allBrowsers.add(BrowserUtil.opera(TESTED_OPERA_VERSION));
 
     }
 
-- 
cgit v1.2.3


From f9ea9b31d4b97714fefeb7970600c1058f794e5e Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 14 Oct 2013 22:05:40 +0300
Subject: Allow running tests locally by overriding runLocally() (#12786)

Uses Firefox either from path or from the location given using firefox.path in /work/run-eclipse-run-selected-test.properties

Change-Id: I29faa94cac4c978792a8fab9db338048553d166a
---
 .../src/com/vaadin/tests/tb3/AbstractTB3Test.java  | 22 +++++++++++++++++++
 .../vaadin/tests/tb3/PrivateTB3Configuration.java  | 25 ++++++++++++++++++++++
 uitest/src/com/vaadin/tests/tb3/TB3Runner.java     | 12 +++++++++--
 3 files changed, 57 insertions(+), 2 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
index e831a4f15f..7584f36e28 100644
--- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -104,6 +104,10 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
      *             If something goes wrong
      */
     protected void setupDriver() throws Exception {
+        if (runLocally()) {
+            setupLocalDriver();
+            return;
+        }
         DesiredCapabilities capabilities = getDesiredCapabilities();
 
         WebDriver dr = TestBench.createDriver(new RemoteWebDriver(new URL(
@@ -126,6 +130,23 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
 
     }
 
+    /**
+     * Override and return true to run the test locally. This method is only to
+     * be used for developing tests.
+     * 
+     * @return true to run the test on a local browser, false to use the hub
+     */
+    public boolean runLocally() {
+        return false;
+    }
+
+    /**
+     * Creates a {@link WebDriver} instance used for running the test locally
+     * for debug purposes. Used only when {@link #runLocally()} is overridden to
+     * return true;
+     */
+    protected abstract void setupLocalDriver();
+
     /**
      * Opens the given test (defined by {@link #getTestUrl(boolean, boolean)},
      * optionally with debug window and/or push
@@ -792,4 +813,5 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
         // Do nothing by default
 
     }
+
 }
diff --git a/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java b/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
index 09615f0b2e..a2922af28f 100644
--- a/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
+++ b/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
@@ -25,6 +25,12 @@ import java.net.SocketException;
 import java.util.Enumeration;
 import java.util.Properties;
 
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.firefox.FirefoxBinary;
+import org.openqa.selenium.firefox.FirefoxDriver;
+
+import com.vaadin.testbench.TestBench;
+
 /**
  * Provides values for parameters which depend on where the test is run.
  * Parameters should be configured in work/eclipse-run-selected-test.properties.
@@ -132,4 +138,23 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
                 "No compatible (192.168.*) ip address found.");
     }
 
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.tb3.AbstractTB3Test#setupLocalDriver()
+     */
+    @Override
+    protected void setupLocalDriver() {
+        String firefoxPath = getProperty("firefox.path");
+        WebDriver driver;
+        if (firefoxPath != null) {
+            driver = new FirefoxDriver(
+                    new FirefoxBinary(new File(firefoxPath)), null);
+        } else {
+            driver = new FirefoxDriver();
+        }
+        setDriver(TestBench.createDriver(driver));
+        setDesiredCapabilities(BrowserUtil
+                .firefox(MultiBrowserTest.TESTED_FIREFOX_VERSION));
+    }
 }
diff --git a/uitest/src/com/vaadin/tests/tb3/TB3Runner.java b/uitest/src/com/vaadin/tests/tb3/TB3Runner.java
index b612b17caa..4e084ab0ed 100644
--- a/uitest/src/com/vaadin/tests/tb3/TB3Runner.java
+++ b/uitest/src/com/vaadin/tests/tb3/TB3Runner.java
@@ -17,6 +17,8 @@
 package com.vaadin.tests.tb3;
 
 import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -72,8 +74,14 @@ public class TB3Runner extends BlockJUnit4ClassRunner {
         try {
             AbstractTB3Test testClassInstance = (AbstractTB3Test) getTestClass()
                     .getOnlyConstructor().newInstance();
-            for (DesiredCapabilities capabilities : testClassInstance
-                    .getBrowsersToTest()) {
+            Collection<DesiredCapabilities> desiredCapabilites = testClassInstance
+                    .getBrowsersToTest();
+            if (testClassInstance.runLocally()) {
+                desiredCapabilites = new ArrayList<DesiredCapabilities>();
+                desiredCapabilites.add(BrowserUtil
+                        .firefox(MultiBrowserTest.TESTED_FIREFOX_VERSION));
+            }
+            for (DesiredCapabilities capabilities : desiredCapabilites) {
 
                 // Find any methods marked with @Test.
                 for (FrameworkMethod m : getTestClass().getAnnotatedMethods(
-- 
cgit v1.2.3


From 6155d61cda45c1b0370ead08a0d3c97539590059 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 16 Oct 2013 14:09:45 +0300
Subject: Disable fallback in a way compatible with Atmosphere JS 2.0.3
 (#12241)

Change-Id: I4023b50038288e39559cb8542ed59be807274d40
---
 .../com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java  | 5 ++++-
 uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java             | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java b/uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java
index 905b80fd85..d7c525f202 100644
--- a/uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java
+++ b/uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java
@@ -18,6 +18,7 @@ package com.vaadin.tests.integration;
 import com.vaadin.annotations.Push;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.ui.Transport;
+import com.vaadin.shared.ui.ui.UIState.PushConfigurationState;
 
 /**
  * Server test which uses websockets
@@ -39,7 +40,9 @@ public class ServletIntegrationWebsocketUI extends ServletIntegrationUI {
     protected void init(VaadinRequest request) {
         super.init(request);
         // Ensure no fallback is used
-        getPushConfiguration().setFallbackTransport(Transport.WEBSOCKET);
+        getPushConfiguration().setParameter(
+                PushConfigurationState.FALLBACK_TRANSPORT_PARAM, "none");
+
     }
 
 }
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java b/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java
index 96793a90f8..465caf0165 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java
+++ b/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java
@@ -18,6 +18,7 @@ package com.vaadin.tests.push;
 import com.vaadin.annotations.Push;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.ui.Transport;
+import com.vaadin.shared.ui.ui.UIState.PushConfigurationState;
 
 @Push(transport = Transport.WEBSOCKET)
 public class BasicPushWebsocket extends BasicPush {
@@ -26,7 +27,8 @@ public class BasicPushWebsocket extends BasicPush {
     public void init(VaadinRequest request) {
         super.init(request);
         // Don't use fallback so we can easier detect if websocket fails
-        getPushConfiguration().setFallbackTransport(Transport.WEBSOCKET);
+        getPushConfiguration().setParameter(
+                PushConfigurationState.FALLBACK_TRANSPORT_PARAM, "none");
     }
 
 }
-- 
cgit v1.2.3


From f40159533028f28a1fe967daad4089fb3a35c53b Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 13 Sep 2013 09:18:47 +0300
Subject: Test for pushing large chunks of data (#12567)

Change-Id: I846b8417f69a0dca7cda2c3851148896d22cabcc
---
 .../vaadin/tests/components/AbstractTestUI.java    |  16 +++
 .../src/com/vaadin/tests/push/PushLargeData.java   | 138 +++++++++++++++++++++
 .../vaadin/tests/push/PushLargeDataStreaming.java  |  29 +++++
 .../tests/push/PushLargeDataStreamingTest.java     |  55 ++++++++
 .../vaadin/tests/push/PushLargeDataWebsocket.java  |  32 +++++
 .../tests/push/PushLargeDataWebsocketTest.java     |  56 +++++++++
 uitest/src/com/vaadin/tests/util/LoremIpsum.java   |   9 ++
 7 files changed, 335 insertions(+)
 create mode 100644 uitest/src/com/vaadin/tests/push/PushLargeData.java
 create mode 100644 uitest/src/com/vaadin/tests/push/PushLargeDataStreaming.java
 create mode 100644 uitest/src/com/vaadin/tests/push/PushLargeDataStreamingTest.java
 create mode 100644 uitest/src/com/vaadin/tests/push/PushLargeDataWebsocket.java
 create mode 100644 uitest/src/com/vaadin/tests/push/PushLargeDataWebsocketTest.java

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/components/AbstractTestUI.java b/uitest/src/com/vaadin/tests/components/AbstractTestUI.java
index f567106d60..8f92ff3118 100644
--- a/uitest/src/com/vaadin/tests/components/AbstractTestUI.java
+++ b/uitest/src/com/vaadin/tests/components/AbstractTestUI.java
@@ -9,6 +9,7 @@ import com.vaadin.server.WebBrowser;
 import com.vaadin.shared.communication.PushMode;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.shared.ui.ui.Transport;
+import com.vaadin.shared.ui.ui.UIState.PushConfigurationState;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Notification;
@@ -100,6 +101,15 @@ public abstract class AbstractTestUI extends UI {
         }
     }
 
+    /**
+     * Sets the push transport according to the transport= URL parameter if such
+     * is given. Supports transport=xhr (disables push), transport=websocket
+     * (forces websocket into use), transport=streaming (forces streaming into
+     * use). Using ?transport=xyz disables the fallback transport.
+     * 
+     * @param request
+     *            The UI init request
+     */
     protected void setTransport(VaadinRequest request) {
         String transport = request.getParameter("transport");
         PushConfiguration config = getPushConfiguration();
@@ -112,11 +122,17 @@ public abstract class AbstractTestUI extends UI {
                 config.setPushMode(PushMode.AUTOMATIC);
             }
             config.setTransport(Transport.WEBSOCKET);
+            // Ensure no fallback is used
+            getPushConfiguration().setParameter(
+                    PushConfigurationState.FALLBACK_TRANSPORT_PARAM, "none");
         } else if ("streaming".equals(transport)) {
             if (!mode.isEnabled()) {
                 config.setPushMode(PushMode.AUTOMATIC);
             }
             config.setTransport(Transport.STREAMING);
+            // Ensure no fallback is used
+            getPushConfiguration().setParameter(
+                    PushConfigurationState.FALLBACK_TRANSPORT_PARAM, "none");
         }
     }
 
diff --git a/uitest/src/com/vaadin/tests/push/PushLargeData.java b/uitest/src/com/vaadin/tests/push/PushLargeData.java
new file mode 100644
index 0000000000..8ad005df81
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/PushLargeData.java
@@ -0,0 +1,138 @@
+/*
+ * 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.push;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUIWithLog;
+import com.vaadin.tests.util.LoremIpsum;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.UI;
+
+public abstract class PushLargeData extends AbstractTestUIWithLog {
+
+    private Label dataLabel = new Label();
+
+    private final ExecutorService executor = Executors
+            .newSingleThreadExecutor();
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        dataLabel.setSizeUndefined();
+        final TextField dataSize = new TextField("Data size");
+        dataSize.setConverter(Integer.class);
+        final TextField interval = new TextField("Interval (ms)");
+        interval.setConverter(Integer.class);
+        final TextField duration = new TextField("Duration (ms)");
+        duration.setConverter(Integer.class);
+
+        dataSize.setValue((1000 * 1000) + "");
+        interval.setValue(2000 + "");
+        duration.setValue(40 * 1000 + "");
+
+        addComponent(dataSize);
+        addComponent(interval);
+        addComponent(duration);
+
+        Button b = new Button("Start pushing");
+        b.setId("startButton");
+        b.addClickListener(new ClickListener() {
+
+            @Override
+            public void buttonClick(ClickEvent event) {
+                Integer pushSize = (Integer) dataSize.getConvertedValue();
+                Integer pushInterval = (Integer) interval.getConvertedValue();
+                Integer pushDuration = (Integer) duration.getConvertedValue();
+                PushRunnable r = new PushRunnable(pushSize, pushInterval,
+                        pushDuration);
+                executor.execute(r);
+                log.log("Starting push, size: " + pushSize + ", interval: "
+                        + pushInterval + "ms, duration: " + pushDuration + "ms");
+            }
+        });
+        addComponent(b);
+        addComponent(dataLabel);
+    }
+
+    public Label getDataLabel() {
+        return dataLabel;
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Tests that pushing large amounts of data do not cause problems";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 12567;
+    }
+
+    public static class PushRunnable implements Runnable {
+
+        private Integer size;
+        private Integer interval;
+        private Integer duration;
+
+        public PushRunnable(Integer size, Integer interval, Integer duration) {
+            this.size = size;
+            this.interval = interval;
+            this.duration = duration;
+        }
+
+        @Override
+        public void run() {
+            final long endTime = System.currentTimeMillis() + duration;
+            final String data = LoremIpsum.get(size);
+            int packageIndex = 1;
+            while (System.currentTimeMillis() < endTime) {
+                final int idx = packageIndex++;
+                UI.getCurrent().access(new Runnable() {
+                    @Override
+                    public void run() {
+                        PushLargeData ui = (PushLargeData) UI.getCurrent();
+                        ui.getDataLabel().setValue(
+                                System.currentTimeMillis() + ": " + data);
+                        ui.log("Package " + idx + " pushed");
+                    }
+                });
+                try {
+                    Thread.sleep(interval);
+                } catch (InterruptedException e) {
+                    return;
+                }
+            }
+            UI.getCurrent().access(new Runnable() {
+                @Override
+                public void run() {
+                    PushLargeData ui = (PushLargeData) UI.getCurrent();
+                    ui.log("Push complete");
+                }
+            });
+
+        }
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/push/PushLargeDataStreaming.java b/uitest/src/com/vaadin/tests/push/PushLargeDataStreaming.java
new file mode 100644
index 0000000000..464cbcc757
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/PushLargeDataStreaming.java
@@ -0,0 +1,29 @@
+/*
+ * 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.push;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.ui.Transport;
+
+public class PushLargeDataStreaming extends PushLargeData {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        super.setup(request);
+        getPushConfiguration().setTransport(Transport.STREAMING);
+        getPushConfiguration().setFallbackTransport(Transport.STREAMING);
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/push/PushLargeDataStreamingTest.java b/uitest/src/com/vaadin/tests/push/PushLargeDataStreamingTest.java
new file mode 100644
index 0000000000..c716a6fc7e
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/PushLargeDataStreamingTest.java
@@ -0,0 +1,55 @@
+/*
+ * 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.push;
+
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+
+import com.vaadin.tests.tb3.WebsocketTest;
+
+public class PushLargeDataStreamingTest extends WebsocketTest {
+
+    @Test
+    public void testWebsocketLargeData() {
+        openTestURL();
+
+        // Without this there is a large chance that we will wait for all pushes
+        // to complete before moving on
+        testBench(driver).disableWaitForVaadin();
+
+        push();
+        // Push complete. Browser will reconnect now as > 10MB has been sent
+        // Push again to ensure push still works
+        push();
+
+    }
+
+    private void push() {
+        String logRow0Id = "Log_row_0";
+        By logRow0 = vaadinLocatorById(logRow0Id);
+
+        vaadinElementById("startButton").click();
+        waitUntil(ExpectedConditions.not(ExpectedConditions
+                .textToBePresentInElement(logRow0, "Push complete")));
+
+        // Pushes each 2000ms for 40s
+        sleep(40000);
+
+        waitUntil(ExpectedConditions.textToBePresentInElement(logRow0,
+                "Push complete"));
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocket.java b/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocket.java
new file mode 100644
index 0000000000..974dc880f9
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocket.java
@@ -0,0 +1,32 @@
+/*
+ * 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.push;
+
+import com.vaadin.annotations.Push;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.ui.Transport;
+
+@Push
+public class PushLargeDataWebsocket extends PushLargeData {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        super.setup(request);
+        getPushConfiguration().setTransport(Transport.WEBSOCKET);
+        getPushConfiguration().setFallbackTransport(Transport.WEBSOCKET);
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocketTest.java b/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocketTest.java
new file mode 100644
index 0000000000..83f9efc8dd
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocketTest.java
@@ -0,0 +1,56 @@
+/*
+ * 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.push;
+
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+
+import com.vaadin.tests.tb3.WebsocketTest;
+
+public class PushLargeDataWebsocketTest extends WebsocketTest {
+
+    @Test
+    public void testWebsocketLargeData() {
+        openTestURL();
+
+        // Without this timing will be completly off as pushing "start" can
+        // remain waiting for all pushes to complete
+        testBench(driver).disableWaitForVaadin();
+
+        push();
+        // Push complete. Browser will reconnect now as > 10MB has been sent
+        // Push again to ensure push still works
+        push();
+
+    }
+
+    private void push() {
+        String logRow0Id = "Log_row_0";
+        By logRow0 = vaadinLocatorById(logRow0Id);
+
+        testBench(driver).waitForVaadin();
+        vaadinElementById("startButton").click();
+        waitUntil(ExpectedConditions.not(ExpectedConditions
+                .textToBePresentInElement(logRow0, "Push complete")));
+
+        // Pushes each 2000ms for 40s
+        sleep(40000);
+
+        waitUntil(ExpectedConditions.textToBePresentInElement(logRow0,
+                "Push complete"));
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/util/LoremIpsum.java b/uitest/src/com/vaadin/tests/util/LoremIpsum.java
index 3dc775badf..c3eec32fd5 100644
--- a/uitest/src/com/vaadin/tests/util/LoremIpsum.java
+++ b/uitest/src/com/vaadin/tests/util/LoremIpsum.java
@@ -4,6 +4,15 @@ public class LoremIpsum {
     private static final String LOREM = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi lacinia sollicitudin neque, vitae cursus eros scelerisque sit amet. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Proin sollicitudin tempus lorem, sed consectetur nibh ultrices nec. Ut tempus laoreet dolor non molestie. Quisque consectetur tellus ut tortor imperdiet semper. In tempor odio eu metus hendrerit pharetra. Aliquam erat volutpat. Aliquam erat volutpat. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec sit amet turpis facilisis ipsum cursus viverra ut vitae turpis. Integer tincidunt sem id sem tristique a laoreet eros euismod. Ut quis leo vel neque pellentesque ullamcorper. Aliquam at fermentum justo. Sed eget laoreet elit. Pellentesque commodo dui quis metus ornare bibendum. Ut tempus, ipsum in euismod scelerisque, augue ante lacinia sem, scelerisque imperdiet felis lectus rhoncus felis.Fusce vitae nisl lorem, id ultricies massa. Phasellus augue eros, dapibus vel fermentum non, sodales id mi. Nulla tincidunt diam a justo ultricies vestibulum nec sed tellus. Morbi faucibus leo et odio condimentum at porttitor diam auctor. Aenean volutpat lacinia mauris. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Aenean malesuada ullamcorper elit ut eleifend. Etiam tempor, mauris id aliquet tempor, erat felis rutrum eros, a aliquam dolor nunc nec enim. Sed enim dolor, tristique ut tempus vitae, elementum at velit. Duis vulputate ultricies risus, ac gravida erat tincidunt posuere. Pellentesque dapibus tincidunt rhoncus. Phasellus eleifend molestie eros. Praesent id imperdiet urna. Etiam fermentum interdum quam, in tempus quam condimentum at.Curabitur eget ultrices augue. Suspendisse potenti. Nam hendrerit, dolor eget adipiscing lobortis, enim risus dignissim orci, a imperdiet tellus nulla id nibh. Praesent eu dui sit amet nulla interdum dignissim vel quis ante. Sed a lectus metus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Vivamus eget ultrices neque. Cras adipiscing condimentum justo adipiscing consequat. In accumsan mollis sapien ut euismod. Nulla sodales pulvinar leo, nec condimentum leo vestibulum ut. Phasellus risus metus, aliquet quis porta at, imperdiet vitae metus. Proin nec odio odio. Quisque nec elit id lacus iaculis ullamcorper sit amet vel ipsum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. In non lacus sed libero euismod rhoncus. Suspendisse augue massa, ullamcorper at accumsan at, porttitor ac odio.Morbi imperdiet, lectus vehicula eleifend ornare, lectus arcu ullamcorper augue, a imperdiet eros augue id justo. Integer eget pretium lorem. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Cras vehicula leo eget metus consectetur viverra. Nullam a mi nisl, in lacinia metus. Curabitur mollis eleifend augue, consectetur imperdiet velit sagittis aliquet. In tempor tempor orci eu faucibus. Mauris nisi neque, vulputate eu dignissim eget, aliquet sed nibh. Mauris rhoncus elit eget lectus dignissim bibendum. Phasellus sed nunc lacus, nec aliquet elit. Fusce blandit, sem vitae gravida elementum, sem orci porttitor eros, id porta tortor massa ut velit. Nulla pretium mi at tortor porttitor sollicitudin.Ut gravida est at lectus eleifend non ultrices ligula blandit. Sed purus lectus, adipiscing ut mollis vel, interdum quis diam. Phasellus eget nibh augue. Fusce justo felis, facilisis in auctor ut, cursus et enim. Praesent hendrerit venenatis elit, iaculis cursus ligula auctor in. Proin mollis malesuada dolor at elementum. Maecenas sit amet leo odio. Integer ac enim in justo eleifend dapibus. Pellentesque consequat, libero congue sagittis pulvinar, odio eros porta quam, et aliquet dolor turpis non lacus. Sed eu risus nunc. Aliquam tempus nulla a purus auctor mattis. Nullam adipiscing nisl nec purus porttitor rutrum. Sed pellentesque tincidunt posuere. Nulla varius cursus eros. Phasellus vel neque at metus tempus placerat laoreet ac dolor. Nulla faucibus leo nisi, vel placerat lectus.Donec non leo lacinia metus euismod dignissim suscipit ut neque. Donec iaculis, lacus ut luctus bibendum, mi libero tristique sem, vel consectetur risus ligula in turpis. Nulla lorem justo, porttitor non sollicitudin at, pharetra non ante. Phasellus tristique, purus at luctus auctor, nisl neque congue lacus, eget convallis mauris libero sit amet arcu. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tellus quam, lobortis vitae commodo id, ultrices a augue. Nam tellus erat, varius vel iaculis et, fermentum ut tellus. Donec id urna orci. Curabitur eleifend hendrerit libero, id tempor dolor faucibus eu. Quisque aliquam sapien a tortor mollis sollicitudin. Duis augue erat, sagittis eget consequat vel, volutpat et augue. Sed vehicula mattis nisi, non porta elit imperdiet vitae. Curabitur scelerisque mollis lectus, consequat suscipit est ultricies sit amet. Aenean in sem libero, id adipiscing urna. Aenean eleifend posuere lorem in aliquet. Praesent arcu est, tristique quis adipiscing ac, tincidunt nec dui. Nunc sed leo quis justo posuere suscipit. Fusce vitae lectus vitae urna sodales aliquam.Sed velit purus, ullamcorper non interdum quis, facilisis eget tortor. Etiam vestibulum venenatis aliquet. Fusce felis felis, venenatis id tincidunt at, vehicula et erat. Curabitur eu sagittis nisl. Curabitur nisi sapien, venenatis nec pulvinar ut, tempor id diam. Suspendisse metus libero, placerat in fermentum a, aliquam id arcu. Nulla quis accumsan massa. Curabitur consectetur pulvinar sapien non consequat. Etiam sem dolor, posuere id laoreet a, tempor vel nisl. Fusce eu lacus orci. Pellentesque tellus dui, pulvinar nec egestas vitae, adipiscing euismod nunc. Mauris consequat felis sit amet justo pellentesque venenatis. Donec dignissim porta dolor, eget pellentesque lorem porta eu. Donec eget enim eu leo mattis ornare in ut libero. Maecenas sit amet ante mauris.Praesent ultrices diam id lectus viverra sed lobortis risus adipiscing. Nulla in risus est. Proin vitae dolor ligula, a placerat enim. Integer hendrerit erat tincidunt leo malesuada sit amet tincidunt justo mattis. Morbi ut neque urna, ut blandit erat. Donec eleifend justo ac augue ultrices consectetur. In rutrum, leo ac porttitor volutpat, neque mi lacinia diam, id fermentum risus neque vitae risus. Suspendisse in justo libero, eget ultrices nisl. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In sollicitudin, arcu et convallis fermentum, est tellus pellentesque neque, ac faucibus tellus orci non purus. Ut aliquet facilisis ullamcorper. Cras justo ipsum, mollis vel ultricies non, consectetur a libero.Aliquam erat volutpat. Nunc ut mauris eu lorem consequat placerat. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse sapien nisi, pellentesque ut porttitor eget, auctor vitae massa. Fusce et euismod massa. In dolor enim, commodo vitae scelerisque sit amet, vulputate quis nibh. Donec ut mollis elit. Nullam placerat sem at urna euismod tempus vitae a mi. Curabitur ac sem non tortor dapibus euismod in et augue. Phasellus elit nisi, ornare eget aliquam et, convallis vitae eros. Vivamus vitae facilisis quam. Nullam a dolor sit amet ante sodales vulputate. Sed vel elit libero. Vestibulum vestibulum porttitor orci, a elementum risus congue in. Mauris ut justo sed dolor rhoncus viverra nec non eros. Phasellus dignissim, mi id laoreet venenatis, enim lacus pharetra arcu, sit amet consectetur velit elit hendrerit arcu. Integer hendrerit suscipit pretium. Proin orci quam, vehicula vel accumsan tempor, facilisis tempus tortor.Etiam et nunc id odio lobortis ornare ac eget lorem. Proin tristique iaculis felis, ut gravida lacus congue ut. Etiam nibh turpis, congue vel ornare ut, feugiat ut mi. Etiam id ante eget turpis laoreet dapibus. Vivamus accumsan sem at est lacinia sagittis vitae a erat. Etiam mollis justo et felis faucibus sodales. Etiam placerat felis sed ante sollicitudin dignissim. Nunc fringilla nunc in lacus ultricies rutrum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed venenatis porta turpis dignissim tempor. Etiam consequat vulputate elementum. Sed augue lacus, aliquam eu ornare vel, aliquam at turpis.Ut lacinia velit odio. Nulla sapien tellus, fringilla dignissim porta sed, elementum eget diam. Quisque pulvinar commodo massa, vitae lobortis velit iaculis id. Vestibulum id dolor vel mauris auctor commodo id at odio. Suspendisse consectetur consequat erat. Aliquam in purus at sem pretium ultricies. In urna elit, porttitor vel gravida at, varius non nisi. Nullam id eros at lorem posuere ullamcorper eget in dui. Sed sit amet mi vel quam vestibulum imperdiet. Ut ullamcorper purus nibh, a commodo tortor. Phasellus pretium, nulla ut venenatis euismod, augue arcu volutpat nulla, id semper est purus eget urna. Vivamus pharetra diam ac ante cursus tempus.Cras in rhoncus felis. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In semper leo sit amet nisi rutrum et interdum odio fringilla. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Cras sollicitudin dui non risus iaculis a lobortis odio consequat. Sed consectetur nisl eu nisi pulvinar fermentum. Etiam placerat tincidunt pellentesque. Etiam luctus auctor nulla ac pulvinar. Pellentesque sit amet eros est. Sed hendrerit sem rhoncus purus rhoncus ullamcorper. Integer vitae commodo sem. Donec orci lectus, gravida sit amet viverra ut, suscipit eu odio. Vivamus ac dolor sit amet augue porttitor imperdiet nec quis mauris. Etiam luctus pharetra lectus sed mattis. Proin tincidunt ultricies dolor, at sagittis ante tincidunt ac.Morbi sit amet sem ut leo ornare luctus at sed odio. Donec vestibulum consequat consectetur. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Integer sit amet leo eget ipsum eleifend commodo et vel sapien. Donec vulputate facilisis nisi in bibendum. Vestibulum justo magna, mollis in varius a, malesuada id nisl. Vestibulum fermentum leo at ipsum euismod scelerisque. Donec id diam eget sapien varius ultricies. Quisque mollis vehicula lorem, vitae suscipit lorem gravida vel. Cras ipsum odio, pellentesque vitae molestie at, facilisis eget felis. Morbi gravida velit eget ante posuere id pharetra dolor vehicula. Praesent lectus sem, pretium sit amet eleifend non, ultricies vitae eros.Etiam consequat felis quis elit semper sed lobortis risus faucibus. Quisque diam ante, gravida ut mollis tristique, auctor ac mauris. Phasellus vestibulum sapien et justo sagittis sed dignissim dui sollicitudin. Maecenas egestas quam et odio mattis eu posuere est sagittis. Nulla nec posuere turpis. In mauris sapien, pharetra et placerat eu, dictum quis justo. Curabitur sit amet varius nulla. Cras feugiat erat quis ante aliquam blandit. In ac libero id massa dapibus ultrices. Donec non massa orci.In gravida justo vitae eros ultrices fringilla. Sed mi quam, lobortis eu pharetra nec, pulvinar eu justo. Sed ornare diam sed nulla pellentesque at tincidunt lacus cursus. Donec vel neque et urna euismod suscipit. Proin in tortor eget felis euismod ultrices. Nunc ut orci elit, vitae pellentesque ligula. Vivamus in mi felis, at congue nulla. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi mattis, ligula id sollicitudin posuere, eros odio pellentesque felis, in auctor libero mi nec massa. Praesent fringilla pretium tempus. Sed quis leo nulla, a pretium mi. Sed malesuada quam eget lorem tristique eget accumsan libero auctor. Vestibulum metus nisl, rutrum vel ullamcorper scelerisque, ultrices cursus purus. Aliquam convallis sollicitudin elit at mattis. Phasellus vitae magna id quam laoreet gravida quis ac metus.Duis lobortis arcu a elit porta laoreet. Pellentesque at condimentum sapien. Maecenas rutrum eleifend quam, eu pellentesque quam tincidunt ac. Vivamus fermentum justo ac dui dapibus ut tempus massa congue. Phasellus fermentum placerat enim, et dignissim mi feugiat in. Etiam odio diam, mollis vitae viverra a, egestas eget arcu. Curabitur purus lectus, accumsan quis lobortis ut, faucibus ac magna. Vivamus consectetur, ligula sit amet convallis rhoncus, risus lorem scelerisque arcu, eu fermentum felis leo sit amet eros. In hac habitasse platea dictumst. Sed congue pretium erat, vel hendrerit velit dapibus ut. Aliquam porta porttitor nunc facilisis pretium. Aliquam tincidunt porttitor tincidunt. Sed at erat a arcu elementum dignissim nec et ipsum. In et magna erat. In hac habitasse platea dictumst. Nulla sit amet enim vitae magna ullamcorper auctor ac id lectus. Fusce id sapien massa.Fusce porta nisl non leo iaculis sed elementum purus viverra. Aenean vitae erat elit. Proin id tincidunt nibh. Fusce faucibus dignissim laoreet. Etiam volutpat ultricies magna in euismod. Quisque luctus malesuada massa, ac ullamcorper dui luctus quis. Mauris a felis ut urna blandit semper egestas vel dui. Nulla facilisi. Ut dapibus bibendum bibendum. Curabitur id facilisis tellus. Vestibulum arcu orci, pretium vestibulum accumsan ut, feugiat eget eros. Mauris dapibus sem a massa ornare id posuere purus ornare. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Phasellus mollis, orci ac eleifend pharetra, risus turpis euismod urna, ut congue neque nunc ut felis. Aliquam a nisi leo. Nulla consequat faucibus ligula consectetur tristique. Duis at lacus orci, eget pulvinar tortor.Aenean nisi justo, dictum ac sagittis a, mollis ut orci. Donec faucibus congue neque ut gravida. Nam interdum nunc vel ipsum molestie elementum. Aliquam a eros non mi accumsan lacinia ut eu justo. Donec id ipsum purus, sed congue nunc. Donec euismod ante quis metus interdum feugiat. Sed nec dictum neque. Vivamus sed felis non lorem placerat facilisis eu sit amet nisi. Morbi dolor dolor, malesuada eu congue at, sollicitudin ut metus. In sit amet ipsum purus, ut dignissim dolor. Pellentesque quis velit velit. Aenean dapibus ipsum eu felis placerat volutpat. Donec auctor dictum ligula ut facilisis. Aliquam vulputate nunc nec diam ultricies auctor dictum dui fringilla. Cras urna metus, porttitor et sodales eu, tempus non mauris. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.Etiam tempor, mi ut tempor adipiscing, nunc lorem gravida odio, scelerisque aliquet ante massa id nibh. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Phasellus eu nisl urna. Quisque vel leo in lorem bibendum bibendum ut eget massa. Morbi dictum, metus eu pellentesque lobortis, augue nisi facilisis velit, sit amet feugiat risus nunc vitae elit. Fusce blandit mi a augue gravida eu tristique sem consequat. Suspendisse non malesuada nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Quisque commodo lorem id ipsum cursus posuere. Proin euismod facilisis est, vel imperdiet lectus commodo blandit. Proin luctus dapibus purus, id vulputate mauris tincidunt vel. Vestibulum volutpat molestie nulla faucibus malesuada. Aenean ut ornare lectus.Maecenas vel mauris in dolor imperdiet gravida eu nec mi. Vestibulum varius sem et nibh aliquet eu posuere tellus luctus. Fusce blandit, odio ut gravida semper, tellus lorem porta felis, vitae posuere mi lorem eget magna. Sed tristique nisi ut ipsum adipiscing molestie. Donec volutpat nunc eget neque posuere aliquam. Vivamus vel sem lectus. In volutpat dictum eros. Curabitur mollis pretium arcu ut rhoncus. Vivamus eros risus, sagittis posuere suscipit sit amet, consectetur eget elit. Mauris porttitor feugiat magna, sed lobortis ante porttitor at. Etiam non enim quam, nec tempus erat. Ut porta pharetra nibh vel laoreet. Sed euismod elit eget sem tempus non sodales massa cursus. Aliquam erat volutpat. Nulla a tortor ornare nibh feugiat venenatis. Mauris interdum mattis odio eget porta. Maecenas ac ullamcorper velit. Nulla id sagittis ligula. Aliquam pharetra, diam ut euismod pellentesque, sapien ligula sagittis nisi, sed dictum dolor purus sit amet elit.Aenean quis metus velit. In at fermentum nunc. Cras in magna sapien, sed vestibulum lacus. Sed pellentesque, massa sed malesuada tincidunt, erat tortor consectetur lacus, vel congue arcu enim id libero. Donec elit neque, egestas a faucibus ut, tempor nec diam. Donec turpis est, vulputate id venenatis vitae, vulputate sit amet elit. Ut semper nibh orci. Fusce nibh nisi, tristique eu dapibus id, faucibus nec augue. Sed sagittis malesuada leo, pretium porttitor ante lacinia in. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.Sed quis libero ante, ac consequat nisl. Cras nisl urna, ultrices eu dapibus sed, pretium quis diam. Curabitur aliquam, dolor et convallis viverra, purus orci commodo neque, a sagittis felis tellus quis mi. In mi orci, tempus ut sodales imperdiet, condimentum ac tortor. Phasellus ornare, tortor eget egestas ultricies, est risus ultricies lorem, ac tempus nibh ligula ac ante. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec fermentum nibh vitae tortor laoreet sed rutrum arcu suscipit. Fusce iaculis nisl in justo pretium a interdum ipsum dignissim. Sed sed semper metus. Aenean ante turpis, fermentum vestibulum dapibus eget, dictum id leo. Nam nec lorem erat.Cras dolor nulla, suscipit nec viverra ac, egestas vitae enim. Quisque vel laoreet sem. Sed non felis at nisl ultricies pharetra vitae a lorem. Suspendisse tempor arcu id massa laoreet congue. Nam eu turpis justo, nec adipiscing tortor. Etiam mattis lorem tincidunt diam molestie semper. Vivamus rutrum est in tortor egestas consequat. Sed vitae ultrices leo. Aenean pulvinar malesuada enim, eget elementum purus bibendum a. Vivamus sit amet mauris mauris, placerat varius lorem. Sed diam tortor, posuere non convallis molestie, dictum quis libero. Nulla quis tellus a nunc semper elementum vel sed odio. Cras ac mattis lectus. Proin placerat imperdiet sodales. Fusce quis magna dolor, eget porttitor lectus. Mauris elementum lorem vitae lectus porta scelerisque nec a sapien. Vivamus dapibus volutpat leo nec vehicula. Praesent ac diam ipsum.Pellentesque nec ullamcorper nulla. Nam lectus dolor, porttitor vitae varius sed, egestas a arcu. Suspendisse malesuada venenatis erat nec consequat. Morbi consequat magna a neque ultrices eget aliquet sapien ultrices. Aenean vel diam ipsum, ac scelerisque dui. Morbi quis arcu neque, eget auctor enim. Etiam pretium est sit amet nunc porta ornare vel quis sapien. Aliquam pulvinar pharetra risus, vel mollis mauris cursus sed. In sagittis nisl ac nunc placerat bibendum. Proin in risus lorem, sed fringilla eros.Proin luctus aliquam metus vitae euismod. Maecenas hendrerit sollicitudin hendrerit. Etiam magna elit, fringilla ut suscipit at, viverra eget ante. Morbi consequat, dui non tristique varius, eros ipsum vulputate sem, eu tristique nibh lacus vel felis. Maecenas eget eros a urna consectetur interdum. Integer est nibh, semper sed feugiat quis, lacinia eget diam. In ultricies mollis lectus sed imperdiet. Proin sed magna nec tortor blandit lacinia in sit amet nibh. Nullam ultrices tempor lacus, vel tincidunt eros vulputate euismod. Praesent justo nibh, convallis ut vehicula consequat, molestie posuere nulla. Mauris sollicitudin egestas vestibulum. Suspendisse auctor imperdiet eros, sit amet dignissim magna dapibus in. Praesent ultrices sem et risus interdum vel pharetra dolor tristique. Proin eleifend nunc eget risus venenatis posuere. Sed est nisi, interdum porta dapibus a, laoreet ac mi. Praesent sit amet varius lectus. Phasellus suscipit lacinia velit, sed tempus odio varius at. Fusce eleifend elementum aliquet. Proin ultricies libero at ipsum condimentum rhoncus.Quisque convallis, arcu at vehicula imperdiet, velit eros posuere sem, sit amet pulvinar purus massa a tellus. Maecenas cursus neque in dolor facilisis ac aliquam ligula eleifend. Fusce quis faucibus nisl. Fusce pulvinar magna vel enim scelerisque id cursus tortor faucibus. Nunc est turpis, iaculis ac sodales non, euismod vitae nunc. Fusce felis purus, iaculis dapibus mollis quis, condimentum consequat eros. Ut a lectus nec mi lacinia fringilla. Donec eget metus lectus, et rhoncus enim. Donec pharetra malesuada enim at rutrum. Vestibulum tincidunt gravida viverra. Vestibulum commodo sem nisl.Vivamus iaculis mollis arcu, quis dapibus risus semper quis. Quisque consectetur ullamcorper arcu id lacinia. Proin non tellus tellus. Nunc vehicula, arcu in pharetra feugiat, ante ante viverra urna, at convallis ligula odio id purus. Morbi quis orci non ante imperdiet luctus. Maecenas et ipsum est, at viverra sem. Morbi placerat ultrices imperdiet. Nullam id arcu at quam mollis hendrerit eu ac lectus. Etiam a neque sed turpis vestibulum posuere. Ut elementum tincidunt nulla at pellentesque. Integer nisl nunc, faucibus non sollicitudin eu, vestibulum ut nulla. In auctor est blandit purus rhoncus et sagittis eros convallis. Mauris sodales ultricies varius. Nulla facilisi. Donec ut nisl nunc, id accumsan erat. Praesent gravida molestie lobortis. In suscipit nisi sed elit sagittis tristique. Pellentesque vitae ante elit. Nullam diam est, ultrices vitae molestie at, tempus et magna. In hac habitasse platea dictumst.Vestibulum id tristique quam. Vivamus dui nulla, pretium eget elementum et, pulvinar a diam. Sed sed arcu sapien, et pharetra nisl. Nunc dignissim, lectus ac fringilla cursus, risus ante pretium justo, nec molestie sem urna id velit. Aenean tincidunt felis sed risus vestibulum ultricies. Aliquam lacinia scelerisque hendrerit. Morbi tincidunt molestie sapien sed faucibus. Vivamus et nisl velit, in semper libero. Duis elementum, dolor eget euismod porttitor, tortor eros tristique risus, eget posuere purus leo venenatis leo. Quisque in elit hendrerit felis accumsan gravida id sed sem.Sed massa turpis, interdum eget adipiscing a, tempor non enim. Vivamus sit amet purus tortor, quis tincidunt nunc. Nam vehicula dolor vitae est bibendum sed condimentum nisl pretium. Aenean pellentesque egestas lacinia. Vestibulum id felis sapien, vestibulum pharetra mauris. Donec quis ligula quis risus ultrices pharetra ac et quam. Nunc aliquam adipiscing mauris id euismod. Suspendisse potenti. Ut pharetra tristique pellentesque. Fusce tristique nisl vitae eros adipiscing lobortis. Ut porttitor porttitor est, vel euismod mi feugiat quis. Sed bibendum lacus vel sem hendrerit a ultricies sapien mattis.Vestibulum a tempus urna. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aenean tincidunt interdum dui, in accumsan ante placerat non. Aliquam suscipit eros eget quam ullamcorper consequat. Nulla facilisi. Phasellus porttitor interdum quam nec mattis. Etiam vitae diam vel est tempus aliquam eu et tellus. Phasellus lobortis porttitor mi, eu mollis augue tempus eu. Morbi a urna id nibh faucibus dictum. Sed hendrerit fringilla nunc vel elementum. Donec vel massa vitae nibh imperdiet vestibulum. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Vestibulum in velit lorem, eu posuere felis. Maecenas ornare posuere faucibus. Donec dignissim ante eu neque suscipit interdum. Pellentesque ultrices dictum quam, tempor tempus leo posuere eget. Vestibulum dictum interdum urna, at feugiat neque venenatis ac. Donec tempus dictum enim, nec tempor neque rhoncus vel.Sed mollis luctus leo sed mattis. Vestibulum tempor mattis vehicula. Duis id elementum libero. Integer condimentum tincidunt molestie. Aenean quam tortor, rutrum sit amet placerat sed, sollicitudin eget turpis. In hac habitasse platea dictumst. Mauris lacinia mollis rhoncus. Fusce nec tellus elementum magna congue ultricies. Nulla consequat, dui nec facilisis hendrerit, ligula sapien viverra velit, at tempor risus leo vestibulum risus. Cras volutpat molestie orci ullamcorper gravida. Nullam est nisi, tempus et tincidunt ut, dapibus vitae nibh. Nam scelerisque purus sit amet odio imperdiet mattis. Integer ut ultrices odio.Cras placerat turpis nisl. Quisque consectetur urna vel nunc faucibus dictum. Nunc ac varius mauris. In ut egestas purus. Sed arcu nibh, mollis vitae dapibus eget, consectetur sit amet eros. Curabitur tincidunt purus sagittis neque adipiscing pretium. Aliquam tempor ullamcorper lectus. Cras quis elit et sapien euismod dapibus vitae in urna. Aliquam adipiscing urna non elit suscipit hendrerit. Mauris euismod tincidunt tortor eu vestibulum. Praesent ac quam massa. Fusce vitae viverra justo. Phasellus vel posuere augue. Praesent sagittis auctor odio in cursus. Sed vel lacus velit, vitae eleifend leo. Donec dapibus ornare mauris ut imperdiet. Nullam a sem felis, in commodo ligula. Nunc sed justo id metus bibendum pretium. Fusce lacinia lorem at leo ultricies porta.Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Morbi non ipsum nisi, at porta ipsum. Nulla dolor lacus, auctor eget tincidunt et, tempor in velit. Cras vel diam facilisis dolor sagittis sodales. In hac habitasse platea dictumst. Donec dignissim vulputate tempor. Fusce tristique vestibulum vehicula. Integer nec erat a risus semper ultrices nec ac eros. Phasellus egestas, risus eget suscipit iaculis, mi magna posuere urna, in sollicitudin odio leo nec lorem. Ut at enim nunc, eget pellentesque ipsum. Nam at ipsum et magna tempor gravida vestibulum ut diam. Aenean aliquam scelerisque blandit. Cras sapien sem, consectetur a laoreet at, mattis vel lorem. Maecenas enim mauris, hendrerit ac imperdiet in, hendrerit a justo. Vestibulum justo metus, adipiscing at pulvinar at, scelerisque at velit. Aliquam sodales feugiat tortor ullamcorper cursus. Quisque tortor felis, sodales eu bibendum in, pellentesque eget urna.Nullam ultricies congue nisi nec blandit. Nulla nisl mi, aliquet vel dictum in, pellentesque fringilla arcu. Nam vulputate iaculis pellentesque. Morbi faucibus, augue vitae aliquam fringilla, ipsum tellus lacinia ligula, a luctus mauris orci id nulla. Vestibulum commodo, diam eget tincidunt iaculis, leo ante suscipit ligula, convallis scelerisque quam augue quis libero. Pellentesque vulputate ultricies eros a porta. In hac habitasse platea dictumst. Quisque at sem vel nisl pellentesque pellentesque at imperdiet turpis. Sed quis sem non nulla pellentesque placerat. Etiam sed ultricies nisl. Nunc vel leo augue, vitae fringilla urna. Suspendisse eget dolor enim, sed interdum lorem. Etiam imperdiet, nunc a tempor elementum, ipsum ante sodales tortor, id dignissim arcu diam vitae metus.Sed tincidunt fringilla mauris a lobortis. Morbi mollis elementum purus ac auctor. Etiam malesuada sapien vehicula magna fringilla sit amet porta sem scelerisque. Vestibulum malesuada ante nunc. Curabitur laoreet commodo mauris eu tempor. Sed hendrerit, lorem vel scelerisque aliquam, metus ligula ultricies ante, at luctus neque risus ut nisi. Suspendisse lectus sapien, tempor eget volutpat non, tempor at orci. Aenean eu est metus, vel convallis augue. Integer aliquam turpis id neque posuere tincidunt. Morbi at ante felis, ac semper diam. Etiam iaculis sapien a mauris tempus semper. Nunc ut leo nec massa tincidunt sodales id sed justo. Fusce sed blandit turpis. Pellentesque scelerisque laoreet luctus.Integer lobortis sollicitudin sapien, vel consequat augue hendrerit ut. Quisque pretium, enim condimentum ornare viverra, est nisl convallis lacus, vel varius turpis mi a eros. Curabitur eget enim non quam condimentum lobortis id sit amet dolor. Aliquam in ligula ut nisi accumsan consectetur. Pellentesque blandit ultrices magna, eget posuere dui eleifend ut. Quisque ornare, ante eget iaculis rutrum, nisi dolor tincidunt diam, eget volutpat nibh sapien vel massa. Sed viverra pulvinar lectus et commodo. Sed lacus mauris, aliquet ut tristique at, feugiat sit amet lectus. Duis lacinia purus a lacus accumsan tristique. Donec felis nunc, egestas ut porttitor ac, vulputate at purus. Quisque euismod nibh sit amet metus ullamcorper a consequat ipsum luctus. Mauris vitae sapien tristique lorem mollis porta auctor vitae leo.Donec mauris nibh, elementum a tincidunt nec, volutpat vitae enim. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Pellentesque at purus quis massa vulputate mollis ut eu risus. Cras libero diam, pharetra quis ultrices facilisis, tincidunt id arcu. Praesent at volutpat quam. Phasellus quis malesuada sapien. Nullam eu leo quam, bibendum sagittis turpis. Vestibulum sagittis accumsan enim ut tristique. Donec eu enim nisi. Curabitur mauris orci, fringilla et suscipit placerat, ullamcorper vel turpis. Mauris est arcu, gravida ac accumsan ac, tincidunt vel nibh. Mauris pulvinar massa tempor dui hendrerit vel elementum diam pulvinar. Sed felis leo, laoreet at laoreet nec, venenatis eu risus. Nunc a massa lacus. Vestibulum ut pellentesque sem. Donec consectetur, turpis consequat aliquam consectetur, leo nunc lobortis elit, at sagittis ipsum risus sed turpis. Vivamus at sollicitudin purus. Nulla facilisi.Morbi congue dignissim nibh ut commodo. Integer sed urna fermentum neque hendrerit aliquam ac et tortor. Phasellus massa sem, egestas sed tincidunt id, malesuada vel odio. Nulla arcu nisl, elementum at pretium interdum, pharetra at nulla. Vestibulum lectus ante, ultricies ac lacinia euismod, adipiscing at metus. Aliquam velit orci, posuere a dapibus dapibus, consectetur vitae est. Pellentesque suscipit pulvinar varius. Morbi sagittis blandit nulla, eu posuere arcu blandit eu. Nulla cursus nunc volutpat orci commodo aliquet. Quisque condimentum dui a mi facilisis tincidunt.Quisque ac nisi vitae ipsum condimentum luctus non quis erat. Pellentesque eget nunc sit amet ipsum pharetra vulputate ac in mi. Etiam consectetur nulla vitae risus pharetra a ornare ligula sagittis. Proin euismod mauris id lectus tincidunt luctus at sed ligula. Aenean porttitor hendrerit quam quis interdum. Suspendisse eu metus turpis, ut venenatis ipsum. Nulla ipsum orci, lacinia ac vestibulum ut, mattis quis eros. Pellentesque a velit et erat sodales ornare. Pellentesque pellentesque tortor eget magna facilisis accumsan. Praesent tincidunt posuere lacus sed sollicitudin. Praesent consectetur diam vel turpis elementum vehicula. Integer rutrum dignissim justo, ac dapibus quam fringilla non. Suspendisse porta elementum bibendum. Praesent at lorem at quam dignissim commodo. Etiam placerat euismod ipsum eu interdum. Aliquam in mi molestie justo varius venenatis eu aliquam quam. Integer feugiat, neque hendrerit egestas hendrerit, lectus ligula placerat enim, a faucibus ante ligula vitae mi. Praesent urna nunc, volutpat vitae scelerisque non, porta vel dolor. Aenean quam sem, dignissim at faucibus non, auctor sodales libero.Morbi justo elit, tempus ac cursus porta, eleifend nec odio. Ut nec quam velit. Duis elit nulla, placerat et rutrum quis, tempor non nisi. Quisque massa erat, pretium ut elementum sit amet, sodales vel metus. Phasellus sollicitudin sapien vel nisl faucibus ornare. Duis ut dolor arcu, vel semper felis. In quis orci mauris, id porttitor diam. Fusce ornare, dolor in posuere blandit, neque est mollis lacus, eu venenatis nisi orci vel diam. Etiam ornare sapien eu sapien tristique vitae consequat arcu consequat. Fusce a felis at dui sollicitudin pellentesque sit amet vel mi. Curabitur congue porttitor orci, eu auctor nibh mollis at. Nulla facilisi. Nam aliquet ullamcorper metus ac vulputate. Aenean feugiat purus vitae dui congue egestas. Curabitur sollicitudin leo eget nibh facilisis fermentum fermentum non nisi. Ut at libero eget est bibendum laoreet non eu ante. Proin pellentesque quam ut augue condimentum id suscipit risus tristique. Nunc laoreet risus elit.Suspendisse vel ante elit, eu feugiat diam. Etiam ultrices condimentum tempor. Donec eget porta lacus. Nunc in velit lacus, ut ultricies felis. Nulla id cursus metus. Praesent suscipit, orci a facilisis imperdiet, eros lectus eleifend nibh, sit amet auctor magna arcu ac enim. In malesuada volutpat felis a posuere. Aliquam mattis ipsum ut quam semper aliquet. Maecenas convallis consequat magna, blandit viverra nulla consectetur sit amet. Pellentesque id velit nec risus iaculis imperdiet ac accumsan metus. Suspendisse et sem massa. Vestibulum ac enim hendrerit est tincidunt ullamcorper.Curabitur placerat, libero id molestie vehicula, neque tortor vulputate sapien, ut blandit orci metus et nibh. Cras convallis justo a nibh iaculis ut convallis neque vestibulum. Duis gravida purus metus, nec viverra leo. In tincidunt elit sit amet orci lacinia non eleifend orci tincidunt. Praesent est metus, molestie a ullamcorper ultricies, cursus imperdiet augue. Sed vitae quam eu dui pellentesque dignissim. Curabitur convallis volutpat accumsan. Donec egestas malesuada est, vitae faucibus sem fermentum id. Donec porttitor rutrum vehicula. Nulla placerat risus in est egestas nec ultrices ligula auctor. Quisque erat lorem, ullamcorper vitae interdum sit amet, laoreet vel elit. Proin eu porta neque. Pellentesque eleifend, ipsum a sollicitudin ultrices, ligula nisl aliquet dui, eget fermentum quam mi vel.";
 
     public static String get(int len) {
+        if (len > LOREM.length()) {
+            StringBuilder builder = new StringBuilder();
+            while (len > LOREM.length()) {
+                builder.append(LOREM);
+                len -= LOREM.length();
+            }
+            builder.append(LOREM.substring(0, len));
+            return builder.toString();
+        }
         return LOREM.substring(0, len);
     }
 
-- 
cgit v1.2.3


From d41967dffa3a2fda8df98d7973de4a55dbfde31e Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 16 Oct 2013 14:48:57 +0300
Subject: Skip compilation of TB2 tests if tests.tb2.skip is set

Change-Id: I647fb48059372b497c77580d252c9622d259d3eb
---
 uitest/test.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'uitest')

diff --git a/uitest/test.xml b/uitest/test.xml
index 326117fb8f..3bfeb66c05 100644
--- a/uitest/test.xml
+++ b/uitest/test.xml
@@ -83,7 +83,7 @@
         <fail unless="com.vaadin.testbench.deployment.url" message="The 'com.vaadin.testbench.deployment.url' property must be defined." />
     </target>
 
-    <target name="run-tb2-tests" depends="check-parameters,compile-tests" unless="tests.tb2.skip">
+    <target name="run-tb2-tests" depends="check-parameters,compile-tests">
         <fileset dir="${test-output-dir}" id="tests-fileset">
             <include name="**/**.java" />
         </fileset>
@@ -174,7 +174,7 @@
     <target name="run-and-clean-up" depends="check-parameters,remove-error-screens,run-tb2-tests" />
 
     <!-- Runs all TestBench 2 tests -->
-    <target name="tb2-tests">
+    <target name="tb2-tests" unless="tests.tb2.skip">
         <property name="test-output-dir" location="${test.xml.dir}/result/testbench-junit-classes" />
         <property name="retries" value="2" />
 
-- 
cgit v1.2.3


From 779c8a0dc336418a7bb2dfed08ec4d727a48159f Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 16 Oct 2013 16:33:54 +0300
Subject: Disable automated testing on Opera until issues are resolved (#12487,
 #12367, #12800)

Change-Id: Id90abf6b2241aeb4f4e83551647169512a93401b
---
 uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
index 587e2db623..4003539782 100644
--- a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
+++ b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
@@ -43,7 +43,6 @@ public abstract class MultiBrowserTest extends PrivateTB3Configuration {
     public static final int TESTED_SAFARI_VERSION = 6;
     public static final int TESTED_CHROME_VERSION = 29;
     public static final int TESTED_FIREFOX_VERSION = 24;
-    public static final int TESTED_OPERA_VERSION = 12;
 
     static List<DesiredCapabilities> allBrowsers = new ArrayList<DesiredCapabilities>();
     static {
@@ -55,7 +54,9 @@ public abstract class MultiBrowserTest extends PrivateTB3Configuration {
         // Uncomment once we have the capability to run on Safari 6
         // allBrowsers.add(safari(TESTED_SAFARI_VERSION));
         allBrowsers.add(BrowserUtil.chrome(TESTED_CHROME_VERSION));
-        allBrowsers.add(BrowserUtil.opera(TESTED_OPERA_VERSION));
+        // Re-enable this when it is possible to run on a modern Opera version
+        // (15+)
+        // allBrowsers.add(BrowserUtil.opera(15));
 
     }
 
-- 
cgit v1.2.3


From 962c1c3b5a9f7eed8e53332c5477621b8b5ee1a4 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 16 Oct 2013 17:02:42 +0300
Subject: Fix compilation error

Change-Id: I0068b68ef29c2b3f669869cb4bf427567f71c8b2
---
 uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java b/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java
index 83af6d07d5..ae5806af56 100644
--- a/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java
+++ b/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java
@@ -48,9 +48,6 @@ public class VerifyBrowserVersionTest extends MultiBrowserTest {
         expectedUserAgent
                 .put(BrowserUtil.chrome(MultiBrowserTest.TESTED_CHROME_VERSION),
                         "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.76 Safari/537.36");
-        expectedUserAgent.put(
-                BrowserUtil.opera(MultiBrowserTest.TESTED_OPERA_VERSION),
-                "Opera/9.80 (Windows NT 5.1) Presto/2.12.388 Version/12.15");
 
     }
 
-- 
cgit v1.2.3


From 7ee11a71262e748246bae800fbccd306937669c0 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Thu, 17 Oct 2013 11:19:06 +0300
Subject: Remove unused test super class (#12786)

Change-Id: I7a56c9da10557485d5562eaf8d9197bfff4bc849
---
 .../vaadin/tests/tb3/SimpleMultiBrowserTest.java   | 50 ----------------------
 1 file changed, 50 deletions(-)
 delete mode 100644 uitest/src/com/vaadin/tests/tb3/SimpleMultiBrowserTest.java

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/tb3/SimpleMultiBrowserTest.java b/uitest/src/com/vaadin/tests/tb3/SimpleMultiBrowserTest.java
deleted file mode 100644
index aeeed4198c..0000000000
--- a/uitest/src/com/vaadin/tests/tb3/SimpleMultiBrowserTest.java
+++ /dev/null
@@ -1,50 +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.tb3;
-
-import org.junit.Test;
-
-/**
- * A simple version of {@link MultiBrowserTest} which allows only one test
- * method ({@link #test()}). Uses only the enclosing class name as test
- * identifier (i.e. excludes "-test").
- * 
- * This class is only provided as a helper for converting existing TB2 tests
- * without renaming all screenshots. All new TB3+ tests should extend
- * {@link MultiBrowserTest} directly instead of this.
- * 
- * @author Vaadin Ltd
- */
-@Deprecated
-public abstract class SimpleMultiBrowserTest extends MultiBrowserTest {
-
-    @Test
-    public abstract void test() throws Exception;
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.vaadin.tests.tb3.ScreenshotTB3Test#getScreenshotBaseName()
-     */
-    @Override
-    public String getScreenshotBaseName() {
-        return super.getScreenshotBaseName().replaceFirst("-test$", "");
-    }
-}
-- 
cgit v1.2.3


From a4211dc5e92cc48ff06bac46615bf486c59f64ed Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Thu, 17 Oct 2013 15:21:09 +0300
Subject: Resolve concurrency issue in running TB3 tests

Ensure nobody can update the static collections of browsers to run on
but that sub classes can restrict which browsers to run on using
super.getBrowersToTest().remove(something)

Change-Id: Iad520840801fbeb719bae51050714c0e47148804
---
 .../tests/actions/ActionsOnInvisibleComponentsTest.java       |  6 +++---
 uitest/src/com/vaadin/tests/push/BasicPushWebsocketTest.java  |  4 ++--
 uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java          |  6 +++---
 uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java         | 11 ++++++-----
 uitest/src/com/vaadin/tests/tb3/WebsocketTest.java            |  9 ++++-----
 5 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/actions/ActionsOnInvisibleComponentsTest.java b/uitest/src/com/vaadin/tests/actions/ActionsOnInvisibleComponentsTest.java
index bb2a7d0995..ca00c998a6 100644
--- a/uitest/src/com/vaadin/tests/actions/ActionsOnInvisibleComponentsTest.java
+++ b/uitest/src/com/vaadin/tests/actions/ActionsOnInvisibleComponentsTest.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.actions;
 
-import java.util.Collection;
+import java.util.List;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -15,8 +15,8 @@ public class ActionsOnInvisibleComponentsTest extends MultiBrowserTest {
 
     // This method should be removed once #12785 is fixed
     @Override
-    public Collection<DesiredCapabilities> getBrowsersToTest() {
-        Collection<DesiredCapabilities> browsers = super.getBrowsersToTest();
+    public List<DesiredCapabilities> getBrowsersToTest() {
+        List<DesiredCapabilities> browsers = super.getBrowsersToTest();
         // sendKeys does nothing on these browsers
         browsers.remove(BrowserUtil.firefox(24));
         browsers.remove(BrowserUtil.ie(8));
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushWebsocketTest.java b/uitest/src/com/vaadin/tests/push/BasicPushWebsocketTest.java
index ae4e64ad6b..dd0a147d99 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushWebsocketTest.java
+++ b/uitest/src/com/vaadin/tests/push/BasicPushWebsocketTest.java
@@ -15,7 +15,7 @@
  */
 package com.vaadin.tests.push;
 
-import java.util.Collection;
+import java.util.List;
 
 import org.openqa.selenium.remote.DesiredCapabilities;
 
@@ -23,7 +23,7 @@ import com.vaadin.tests.tb3.WebsocketTest;
 
 public class BasicPushWebsocketTest extends BasicPushTest {
     @Override
-    public Collection<DesiredCapabilities> getBrowsersToTest() {
+    public List<DesiredCapabilities> getBrowsersToTest() {
         return WebsocketTest.getWebsocketBrowsers();
     }
 }
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
index 7584f36e28..fbb04c2022 100644
--- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -17,8 +17,8 @@
 package com.vaadin.tests.tb3;
 
 import java.net.URL;
-import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import java.util.logging.Logger;
 
 import org.junit.After;
@@ -214,8 +214,8 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
      * 
      * @return The browsers to run the test on
      */
-    public Collection<DesiredCapabilities> getBrowsersToTest() {
-        return Collections.singleton(BrowserUtil
+    public List<DesiredCapabilities> getBrowsersToTest() {
+        return Collections.singletonList(BrowserUtil
                 .firefox(MultiBrowserTest.TESTED_FIREFOX_VERSION));
 
     }
diff --git a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
index 4003539782..040d0156a3 100644
--- a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
+++ b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
@@ -17,7 +17,7 @@
 package com.vaadin.tests.tb3;
 
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 import org.openqa.selenium.remote.DesiredCapabilities;
@@ -57,19 +57,20 @@ public abstract class MultiBrowserTest extends PrivateTB3Configuration {
         // Re-enable this when it is possible to run on a modern Opera version
         // (15+)
         // allBrowsers.add(BrowserUtil.opera(15));
-
     }
 
     /**
      * @return all supported browsers which are actively tested
      */
     public static List<DesiredCapabilities> getAllBrowsers() {
-        return allBrowsers;
+        return Collections.unmodifiableList(allBrowsers);
     }
 
     @Override
-    public Collection<DesiredCapabilities> getBrowsersToTest() {
-        return allBrowsers;
+    public List<DesiredCapabilities> getBrowsersToTest() {
+        // Return a copy so sub classes can do
+        // super.getBrowseresToTest().remove(something)
+        return new ArrayList<DesiredCapabilities>(getAllBrowsers());
     }
 
 }
diff --git a/uitest/src/com/vaadin/tests/tb3/WebsocketTest.java b/uitest/src/com/vaadin/tests/tb3/WebsocketTest.java
index 5c6ea329f5..26fef667cd 100644
--- a/uitest/src/com/vaadin/tests/tb3/WebsocketTest.java
+++ b/uitest/src/com/vaadin/tests/tb3/WebsocketTest.java
@@ -20,7 +20,6 @@
 package com.vaadin.tests.tb3;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -44,8 +43,8 @@ public abstract class WebsocketTest extends PrivateTB3Configuration {
      * @return All supported browsers which are actively tested and support
      *         websockets
      */
-    public static Collection<DesiredCapabilities> getWebsocketBrowsers() {
-        return Collections.unmodifiableCollection(websocketBrowsers);
+    public static List<DesiredCapabilities> getWebsocketBrowsers() {
+        return Collections.unmodifiableList(websocketBrowsers);
     }
 
     /*
@@ -54,7 +53,7 @@ public abstract class WebsocketTest extends PrivateTB3Configuration {
      * @see com.vaadin.tests.tb3.AbstractTB3Test#getBrowserToRunOn()
      */
     @Override
-    public Collection<DesiredCapabilities> getBrowsersToTest() {
-        return getWebsocketBrowsers();
+    public List<DesiredCapabilities> getBrowsersToTest() {
+        return new ArrayList<DesiredCapabilities>(getWebsocketBrowsers());
     }
 }
-- 
cgit v1.2.3


From 20c28aa2f0cfc7b49a2a7861f0b9427522f34417 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Thu, 17 Oct 2013 11:25:50 +0300
Subject: Fixed javadoc

Change-Id: I0c54a5d033d53efd2c82a1dc03f9b6fda423e8ce
---
 uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
index fbb04c2022..712ef94397 100644
--- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -148,11 +148,9 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
     protected abstract void setupLocalDriver();
 
     /**
-     * Opens the given test (defined by {@link #getTestUrl(boolean, boolean)},
-     * optionally with debug window and/or push
-     * 
-     * @param debug
-     * @param push
+     * Opens the given test (defined by {@link #getTestUrl()}, optionally with
+     * debug window and/or push (depending on {@link #isDebug()} and
+     * {@link #isPush()}.
      */
     protected void openTestURL() {
         driver.get(getTestUrl());
-- 
cgit v1.2.3


From 0d368961252af5f7dceef7f28a5e83bb2845ff56 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Thu, 17 Oct 2013 15:46:40 +0300
Subject: Add more hax to make test work with new Atmosphere JS (#12241)

Change-Id: Id75cabd402e243ed4bec7da61771554f2df4fbf6
---
 uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java b/uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java
index 67715339da..23702564f9 100644
--- a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java
+++ b/uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java
@@ -34,11 +34,13 @@ import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.ui.JavaScriptFunction;
 
 // Load vaadinPush.js so that jQueryVaadin is defined 
-@JavaScript("vaadin://vaadinPush.js")
+@JavaScript("vaadin://vaadinPush.debug.js")
 public class TrackMessageSizeUI extends AbstractTestUIWithLog {
 
     private String testMethod = "function testSequence(expected, data) {\n"
             + "    var request = {trackMessageLength: true, messageDelimiter: '|'};\n"
+            + "    _request = {trackMessageLength: true, messageDelimiter: '|'};\n"
+            + "    _handleProtocol = function(a,b) {return true;};"
             + "    var response = {partialMessage: ''};\n"
             + "    var messages = [];\n"
             + "    for(var i = 0; i < data.length; i++) {\n"
@@ -85,7 +87,7 @@ public class TrackMessageSizeUI extends AbstractTestUIWithLog {
     }
 
     private String findMethodImplementation() {
-        String filename = "/VAADIN/jquery.atmosphere.js";
+        String filename = "/VAADIN/vaadinPush.debug.js";
         URL resourceURL = findResourceURL(filename,
                 (VaadinServletService) VaadinService.getCurrent());
         if (resourceURL == null) {
@@ -141,7 +143,7 @@ public class TrackMessageSizeUI extends AbstractTestUIWithLog {
 
     @Override
     protected String getTestDescription() {
-        return "Unit tests for _trackMessageSize in jquery.atmosphere.js. Implemented with testbench and a full Vaadin server side since the testing requires some file mangling.";
+        return "Unit tests for _trackMessageSize in vaadinPush.debug.js. Implemented with testbench and a full Vaadin server side since the testing requires some file mangling.";
     }
 
     @Override
-- 
cgit v1.2.3


From c90c0f280c37f80bcd4b4d7891ac9455436a7097 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 14 Oct 2013 22:02:28 +0300
Subject: Use alternate icon text for NativeButton (#12780)

Change-Id: I1390a3f5914977895c4111d44844c7be8ed46a61
---
 .../ui/nativebutton/NativeButtonConnector.java     |   2 +-
 .../nativebutton/NativeButtonIconAndText.java      | 124 +++++++++++++++++++++
 .../nativebutton/NativeButtonIconAndTextTest.java  |  94 ++++++++++++++++
 3 files changed, 219 insertions(+), 1 deletion(-)
 create mode 100644 uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonIconAndText.java
 create mode 100644 uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonIconAndTextTest.java

(limited to 'uitest')

diff --git a/client/src/com/vaadin/client/ui/nativebutton/NativeButtonConnector.java b/client/src/com/vaadin/client/ui/nativebutton/NativeButtonConnector.java
index 11a76b483b..2253397b16 100644
--- a/client/src/com/vaadin/client/ui/nativebutton/NativeButtonConnector.java
+++ b/client/src/com/vaadin/client/ui/nativebutton/NativeButtonConnector.java
@@ -94,7 +94,7 @@ public class NativeButtonConnector extends AbstractComponentConnector implements
                         getWidget().icon.getElement(),
                         getWidget().captionElement);
             }
-            getWidget().icon.setUri(getIcon());
+            getWidget().icon.setUri(getIcon(), getState().iconAltText);
         } else {
             if (getWidget().icon != null) {
                 getWidget().getElement().removeChild(
diff --git a/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonIconAndText.java b/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonIconAndText.java
new file mode 100644
index 0000000000..fdeed316ba
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonIconAndText.java
@@ -0,0 +1,124 @@
+/*
+ * 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.nativebutton;
+
+import com.vaadin.server.ThemeResource;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.NativeButton;
+
+public class NativeButtonIconAndText extends AbstractTestUI implements
+        ClickListener {
+
+    static final String UPDATED_ALTERNATE_TEXT = "Now has alternate text";
+    static final String INITIAL_ALTERNATE_TEXT = "Initial alternate text";
+    static final String BUTTON_TEXT = "buttonText";
+    static final String BUTTON_TEXT_ICON = "buttonTextIcon";
+    static final String BUTTON_TEXT_ICON_ALT = "buttonTextIconAlt";
+    static final String NATIVE_BUTTON_TEXT = "nativeButtonText";
+    static final String NATIVE_BUTTON_TEXT_ICON = "nativeButtonTextIcon";
+    static final String NATIVE_BUTTON_TEXT_ICON_ALT = "nativeButtonTextIconAlt";
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        Button buttonText = new Button("Only text");
+
+        Button buttonTextIcon = new Button("Text icon");
+        buttonTextIcon.setIcon(new ThemeResource("../runo/icons/64/ok.png"));
+
+        Button buttonTextIconAlt = new Button("Text icon alt");
+        buttonTextIconAlt.setIcon(new ThemeResource(
+                "../runo/icons/64/cancel.png"));
+        buttonTextIconAlt.setIconAlternateText(INITIAL_ALTERNATE_TEXT);
+
+        buttonText.addClickListener(this);
+        buttonTextIcon.addClickListener(this);
+        buttonTextIconAlt.addClickListener(this);
+
+        buttonText.setId(BUTTON_TEXT);
+        buttonTextIcon.setId(BUTTON_TEXT_ICON);
+        buttonTextIconAlt.setId(BUTTON_TEXT_ICON_ALT);
+
+        addComponent(buttonText);
+        addComponent(buttonTextIcon);
+        addComponent(buttonTextIconAlt);
+
+        NativeButton nativeButtonText = new NativeButton("Only text");
+
+        NativeButton nativeButtonTextIcon = new NativeButton("Text icon");
+        nativeButtonTextIcon.setIcon(new ThemeResource(
+                "../runo/icons/64/ok.png"));
+
+        NativeButton nativeButtonTextIconAlt = new NativeButton("Text icon alt");
+        nativeButtonTextIconAlt.setIcon(new ThemeResource(
+                "../runo/icons/64/cancel.png"));
+        nativeButtonTextIconAlt.setIconAlternateText(INITIAL_ALTERNATE_TEXT);
+
+        nativeButtonText.addClickListener(this);
+        nativeButtonTextIcon.addClickListener(this);
+        nativeButtonTextIconAlt.addClickListener(this);
+
+        nativeButtonText.setId(NATIVE_BUTTON_TEXT);
+        nativeButtonTextIcon.setId(NATIVE_BUTTON_TEXT_ICON);
+        nativeButtonTextIconAlt.setId(NATIVE_BUTTON_TEXT_ICON_ALT);
+
+        addComponent(nativeButtonText);
+        addComponent(nativeButtonTextIcon);
+        addComponent(nativeButtonTextIconAlt);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
+     */
+    @Override
+    protected String getTestDescription() {
+        return "Click the buttons to toggle icon alternate text";
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
+     */
+    @Override
+    protected Integer getTicketNumber() {
+        return 12780;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.ui.Button.ClickListener#buttonClick(com.vaadin.ui.Button.
+     * ClickEvent)
+     */
+    @Override
+    public void buttonClick(ClickEvent event) {
+        Button b = event.getButton();
+        String was = b.getIconAlternateText();
+        if (was == null || was.isEmpty()) {
+            b.setIconAlternateText(UPDATED_ALTERNATE_TEXT);
+        } else {
+            b.setIconAlternateText(null);
+        }
+
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonIconAndTextTest.java b/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonIconAndTextTest.java
new file mode 100644
index 0000000000..2cb294de77
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonIconAndTextTest.java
@@ -0,0 +1,94 @@
+/*
+ * 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.nativebutton;
+
+import static com.vaadin.tests.components.nativebutton.NativeButtonIconAndText.BUTTON_TEXT;
+import static com.vaadin.tests.components.nativebutton.NativeButtonIconAndText.BUTTON_TEXT_ICON;
+import static com.vaadin.tests.components.nativebutton.NativeButtonIconAndText.BUTTON_TEXT_ICON_ALT;
+import static com.vaadin.tests.components.nativebutton.NativeButtonIconAndText.INITIAL_ALTERNATE_TEXT;
+import static com.vaadin.tests.components.nativebutton.NativeButtonIconAndText.NATIVE_BUTTON_TEXT;
+import static com.vaadin.tests.components.nativebutton.NativeButtonIconAndText.NATIVE_BUTTON_TEXT_ICON;
+import static com.vaadin.tests.components.nativebutton.NativeButtonIconAndText.NATIVE_BUTTON_TEXT_ICON_ALT;
+import static com.vaadin.tests.components.nativebutton.NativeButtonIconAndText.UPDATED_ALTERNATE_TEXT;
+
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class NativeButtonIconAndTextTest extends MultiBrowserTest {
+
+    @Test
+    public void testNativeButtonIconAltText() {
+        openTestURL();
+        assertAltText(BUTTON_TEXT, "");
+        assertAltText(BUTTON_TEXT_ICON, "");
+        assertAltText(BUTTON_TEXT_ICON_ALT, INITIAL_ALTERNATE_TEXT);
+        assertAltText(NATIVE_BUTTON_TEXT, "");
+        assertAltText(NATIVE_BUTTON_TEXT_ICON, "");
+        assertAltText(NATIVE_BUTTON_TEXT_ICON_ALT, INITIAL_ALTERNATE_TEXT);
+
+        clickElements(BUTTON_TEXT, BUTTON_TEXT_ICON, BUTTON_TEXT_ICON_ALT,
+                NATIVE_BUTTON_TEXT, NATIVE_BUTTON_TEXT_ICON,
+                NATIVE_BUTTON_TEXT_ICON_ALT);
+
+        // Button without icon - should not get alt text
+        assertAltText(BUTTON_TEXT, "");
+        assertAltText(BUTTON_TEXT_ICON, UPDATED_ALTERNATE_TEXT);
+        assertAltText(BUTTON_TEXT_ICON_ALT, "");
+        // Button without icon - should not get alt text
+        assertAltText(NATIVE_BUTTON_TEXT, "");
+        assertAltText(NATIVE_BUTTON_TEXT_ICON, UPDATED_ALTERNATE_TEXT);
+        assertAltText(NATIVE_BUTTON_TEXT_ICON_ALT, "");
+
+    }
+
+    private void clickElements(String... ids) {
+        for (String id : ids) {
+            vaadinElementById(id).click();
+        }
+    }
+
+    /**
+     * If the button identified by 'buttonId' has an icon, asserts that the
+     * alternate text of the icon matches 'expected'. "" and null are considered
+     * equivalent.
+     * 
+     * @param buttonId
+     *            the id of the button who possibly contains an icon
+     * @param expected
+     *            the expected alternate text, cannot be null
+     */
+    private void assertAltText(String buttonId, String expected) {
+        WebElement button = vaadinElementById(buttonId);
+        List<WebElement> imgList = button.findElements(By.xpath(".//img"));
+        if (imgList.isEmpty()) {
+            return;
+        }
+        WebElement img = imgList.get(0);
+        String alt = img.getAttribute("alt");
+        if (alt == null) {
+            alt = "";
+        }
+
+        Assert.assertEquals(expected, alt);
+
+    }
+}
-- 
cgit v1.2.3


From dd51b7f73062650cb3d5bb8550a0b088a0ea6595 Mon Sep 17 00:00:00 2001
From: Marc Englund <marc@vaadin.com>
Date: Wed, 9 Oct 2013 15:31:06 +0300
Subject: Added more exception handling to PushHandler (#12578, #11882)

PushHandler now catches Exception and calls ErrorHandler more.

Change-Id: I7032c00f717b1dae34f4352abc035b1b398c7cfc
---
 .../vaadin/server/communication/PushHandler.java   | 50 ++++++++++--
 .../com/vaadin/tests/push/PushErrorHandling.html   | 41 ++++++++++
 .../com/vaadin/tests/push/PushErrorHandling.java   | 93 ++++++++++++++++++++++
 3 files changed, 179 insertions(+), 5 deletions(-)
 create mode 100644 uitest/src/com/vaadin/tests/push/PushErrorHandling.html
 create mode 100644 uitest/src/com/vaadin/tests/push/PushErrorHandling.java

(limited to 'uitest')

diff --git a/server/src/com/vaadin/server/communication/PushHandler.java b/server/src/com/vaadin/server/communication/PushHandler.java
index 81dd00084d..b7cc628856 100644
--- a/server/src/com/vaadin/server/communication/PushHandler.java
+++ b/server/src/com/vaadin/server/communication/PushHandler.java
@@ -31,6 +31,8 @@ import org.atmosphere.cpr.AtmosphereResourceEvent;
 import org.atmosphere.cpr.AtmosphereResourceEventListenerAdapter;
 import org.json.JSONException;
 
+import com.vaadin.server.ErrorEvent;
+import com.vaadin.server.ErrorHandler;
 import com.vaadin.server.LegacyCommunicationManager.InvalidUIDLSecurityKeyException;
 import com.vaadin.server.ServiceException;
 import com.vaadin.server.ServletPortletHelper;
@@ -274,14 +276,52 @@ public class PushHandler extends AtmosphereResourceEventListenerAdapter
                 } else {
                     callback.run(resource, ui);
                 }
-            } catch (IOException e) {
-                getLogger().log(Level.WARNING, "Error writing a push response",
-                        e);
+            } catch (final IOException e) {
+                callErrorHandler(session, e);
+            } catch (final Exception e) {
+                SystemMessages msg = service.getSystemMessages(
+                        ServletPortletHelper.findLocale(null, null,
+                                vaadinRequest), vaadinRequest);
+                sendNotificationAndDisconnect(
+                        resource,
+                        VaadinService.createCriticalNotificationJSON(
+                                msg.getInternalErrorCaption(),
+                                msg.getInternalErrorMessage(), null,
+                                msg.getInternalErrorURL()));
+                callErrorHandler(session, e);
             } finally {
-                session.unlock();
+                try {
+                    session.unlock();
+                } catch (Exception e) {
+                    getLogger().log(Level.WARNING,
+                            "Error while unlocking session", e);
+                    // can't call ErrorHandler, we (hopefully) don't have a lock
+                }
             }
         } finally {
-            service.requestEnd(vaadinRequest, null, session);
+            try {
+                service.requestEnd(vaadinRequest, null, session);
+            } catch (Exception e) {
+                getLogger().log(Level.WARNING, "Error while ending request", e);
+
+                // can't call ErrorHandler, we don't have a lock
+            }
+        }
+    }
+
+    /**
+     * Call the session's {@link ErrorHandler}, if it has one, with the given
+     * exception wrapped in an {@link ErrorEvent}.
+     */
+    private void callErrorHandler(VaadinSession session, Exception e) {
+        try {
+            ErrorHandler errorHandler = ErrorEvent.findErrorHandler(session);
+            if (errorHandler != null) {
+                errorHandler.error(new ErrorEvent(e));
+            }
+        } catch (Exception ex) {
+            // Let's not allow error handling to cause trouble; log fails
+            getLogger().log(Level.WARNING, "ErrorHandler call failed", ex);
         }
     }
 
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;
+    }
+}
-- 
cgit v1.2.3


From ab5b20cf502f99944c82f619ffef387f0525e8ba Mon Sep 17 00:00:00 2001
From: Felype Santiago Ferreira <felype@vaadin.com>
Date: Fri, 18 Oct 2013 10:44:35 +0300
Subject: Ticket #12727 - Panels get unnecessary scroll bars in WebKit when
 content is 100% wide.

Change-Id: Ia34e7c3ce755556460d237fb3489501274ced39f
---
 client/src/com/vaadin/client/ui/VPanel.java        | 35 ++++++++++++
 .../components/panel/WebkitScrollbarTest.html      | 27 ++++++++++
 .../components/panel/WebkitScrollbarTest.java      | 63 ++++++++++++++++++++++
 .../src/com/vaadin/tests/tickets/Ticket12727.java  | 51 ++++++++++++++++++
 4 files changed, 176 insertions(+)
 create mode 100644 uitest/src/com/vaadin/tests/components/panel/WebkitScrollbarTest.html
 create mode 100644 uitest/src/com/vaadin/tests/components/panel/WebkitScrollbarTest.java
 create mode 100644 uitest/src/com/vaadin/tests/tickets/Ticket12727.java

(limited to 'uitest')

diff --git a/client/src/com/vaadin/client/ui/VPanel.java b/client/src/com/vaadin/client/ui/VPanel.java
index 6b02f079d1..1a87362fea 100644
--- a/client/src/com/vaadin/client/ui/VPanel.java
+++ b/client/src/com/vaadin/client/ui/VPanel.java
@@ -16,13 +16,17 @@
 
 package com.vaadin.client.ui;
 
+import com.google.gwt.core.client.Scheduler;
+import com.google.gwt.core.client.Scheduler.ScheduledCommand;
 import com.google.gwt.dom.client.DivElement;
 import com.google.gwt.dom.client.Document;
+import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.BrowserInfo;
 import com.vaadin.client.Focusable;
 import com.vaadin.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner;
 import com.vaadin.client.ui.TouchScrollDelegate.TouchScrollHandler;
@@ -206,5 +210,36 @@ public class VPanel extends SimplePanel implements ShortcutActionHandlerOwner,
             touchScrollHandler = TouchScrollDelegate.enableTouchScrolling(this);
         }
         touchScrollHandler.addElement(contentNode);
+
+        /*
+         * Shake up the DOM a bit to make the window shed unnecessary scroll
+         * bars and resize correctly afterwards. This resulting code took over a
+         * week to summon forth, and involved some pretty hairy black magic.
+         * Don't touch it unless you know what you're doing! Fixes ticket
+         * #12727.
+         * 
+         * This solution comes from ticket #11994: Windows get unnecessary
+         * scroll bars in WebKit when content is 100% wide.
+         */
+        if (BrowserInfo.get().isWebkit()) {
+            Scheduler.get().scheduleFinally(new ScheduledCommand() {
+                @Override
+                public void execute() {
+                    final com.google.gwt.dom.client.Element scrollable = contentNode
+                            .getFirstChildElement();
+                    final String oldWidth = scrollable.getStyle().getWidth();
+                    final String oldHeight = scrollable.getStyle().getHeight();
+
+                    scrollable.getStyle().setWidth(110, Unit.PCT);
+                    scrollable.getOffsetWidth();
+                    scrollable.getStyle().setProperty("width", oldWidth);
+
+                    scrollable.getStyle().setHeight(110, Unit.PCT);
+                    scrollable.getOffsetHeight();
+                    scrollable.getStyle().setProperty("height", oldHeight);
+                }
+            });
+        }
+
     }
 }
diff --git a/uitest/src/com/vaadin/tests/components/panel/WebkitScrollbarTest.html b/uitest/src/com/vaadin/tests/components/panel/WebkitScrollbarTest.html
new file mode 100644
index 0000000000..ee33ee2bf0
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/panel/WebkitScrollbarTest.html
@@ -0,0 +1,27 @@
+<?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.panel.WebkitScrollbarTest?restartApplication</td>
+    <td></td>
+</tr>
+<tr>
+    <td>screenCapture</td>
+    <td></td>
+    <td>panelShouldNotHaveScrollbars</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/uitest/src/com/vaadin/tests/components/panel/WebkitScrollbarTest.java b/uitest/src/com/vaadin/tests/components/panel/WebkitScrollbarTest.java
new file mode 100644
index 0000000000..8981f52f12
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/panel/WebkitScrollbarTest.java
@@ -0,0 +1,63 @@
+/*
+ * 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.panel;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.ListSelect;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.VerticalLayout;
+
+@SuppressWarnings("serial")
+public class WebkitScrollbarTest extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        Panel panel = new Panel();
+
+        VerticalLayout content = new VerticalLayout();
+        panel.setContent(content);
+
+        GridLayout gridLayout = new GridLayout();
+        gridLayout.setHeight(null);
+        gridLayout.setWidth(100, Unit.PERCENTAGE);
+        content.addComponent(gridLayout);
+
+        ListSelect listSelect = new ListSelect();
+
+        listSelect.setWidth(100, Unit.PERCENTAGE);
+        listSelect.setHeight(300, Unit.PIXELS);
+
+        gridLayout.addComponent(listSelect);
+
+        gridLayout.setMargin(true);
+
+        setContent(panel);
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "When opening the window, it should NOT contain a horizontal";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 12727;
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket12727.java b/uitest/src/com/vaadin/tests/tickets/Ticket12727.java
new file mode 100644
index 0000000000..40711c6b7f
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket12727.java
@@ -0,0 +1,51 @@
+package com.vaadin.tests.tickets;
+
+import java.util.ArrayList;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.ListSelect;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.UI;
+import com.vaadin.ui.VerticalLayout;
+
+/**
+ * Test for #12727: Panels get unnecessary scroll bars in WebKit when content is
+ * 100% wide.
+ */
+@SuppressWarnings("serial")
+public class Ticket12727 extends UI {
+
+    @Override
+    protected void init(VaadinRequest request) {
+        Panel panel = new Panel();
+
+        VerticalLayout content = new VerticalLayout();
+        panel.setContent(content);
+
+        GridLayout gridLayout = new GridLayout();
+        gridLayout.setHeight(null);
+        gridLayout.setWidth(100, Unit.PERCENTAGE);
+        content.addComponent(gridLayout);
+
+        ListSelect listSelect = new ListSelect();
+
+        listSelect.setWidth(100, Unit.PERCENTAGE);
+        listSelect.setHeight(500, Unit.PIXELS);
+
+        gridLayout.addComponent(listSelect);
+
+        ArrayList<String> values = new ArrayList<String>();
+        values.add("Value 1");
+        values.add("Value 2");
+        values.add("Value 3");
+
+        ComboBox comboBox = new ComboBox(null, values);
+        gridLayout.addComponent(comboBox);
+
+        gridLayout.setMargin(true);
+
+        setContent(panel);
+    }
+}
-- 
cgit v1.2.3


From 361ad179ebbe5f25e157497394d3d1fb5aaee506 Mon Sep 17 00:00:00 2001
From: John Ahlroos <john@vaadin.com>
Date: Mon, 21 Oct 2013 16:12:09 +0300
Subject: Fixed focus issue in TableMoveFocusWithSelectionTest (#12540)

Change-Id: I40dbc81b6aa4eaf0a235ae2cc7f04025011445c9
---
 .../table/TableMoveFocusWithSelectionTest.java     | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/components/table/TableMoveFocusWithSelectionTest.java b/uitest/src/com/vaadin/tests/components/table/TableMoveFocusWithSelectionTest.java
index b38705eeb6..5075e22f1b 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableMoveFocusWithSelectionTest.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableMoveFocusWithSelectionTest.java
@@ -57,19 +57,25 @@ public class TableMoveFocusWithSelectionTest extends MultiBrowserTest {
         // Click on row 7
         getDriver().findElement(By.id("row-7")).click();
 
+        // Clicking a row should get the row focus
+        WebElement row7TableRow = getDriver().findElement(
+                By.xpath("//div[@id='row-7']/../../.."));
+        String row7StyleName = row7TableRow.getAttribute("class");
+        assertTrue(row7StyleName.contains("v-table-focus"));
+
         // Select row 5-10 server side
         getDriver().findElement(By.id("select-510")).click();
 
+        /*
+         * Focus the table again (some browsers steal focus when performing
+         * button click, other don't)
+         */
+        getDriver().findElement(By.id("test-table")).click();
+
         // Ensure row 7 is still focused
-        WebElement row7TableRow = getDriver().findElement(
+        row7TableRow = getDriver().findElement(
                 By.xpath("//div[@id='row-7']/../../.."));
-        String row7StyleName = row7TableRow.getAttribute("class");
+        row7StyleName = row7TableRow.getAttribute("class");
         assertTrue(row7StyleName.contains("v-table-focus"));
     }
-
-    @Override
-    protected Class<?> getUIClass() {
-        // FIXME Remove when this is done automatically
-        return TableMoveFocusWithSelection.class;
-    }
 }
-- 
cgit v1.2.3


From c464dcf9217ac6763e4bf7aec18fbf13dff29308 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 23 Oct 2013 00:51:44 +0300
Subject: Convert push test to TB3 so it has a chance to pass

Change-Id: I6381ea4bd61b3df19599f2f9d3a303a50c810460
---
 .../com/vaadin/tests/push/PushErrorHandling.html   | 41 -------------------
 .../com/vaadin/tests/push/PushErrorHandling.java   |  2 +
 .../vaadin/tests/push/PushErrorHandlingTest.java   | 47 ++++++++++++++++++++++
 3 files changed, 49 insertions(+), 41 deletions(-)
 delete mode 100644 uitest/src/com/vaadin/tests/push/PushErrorHandling.html
 create mode 100644 uitest/src/com/vaadin/tests/push/PushErrorHandlingTest.java

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/push/PushErrorHandling.html b/uitest/src/com/vaadin/tests/push/PushErrorHandling.html
deleted file mode 100644
index afd3e70771..0000000000
--- a/uitest/src/com/vaadin/tests/push/PushErrorHandling.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="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
index 3074bd3851..a1182c0daf 100644
--- a/uitest/src/com/vaadin/tests/push/PushErrorHandling.java
+++ b/uitest/src/com/vaadin/tests/push/PushErrorHandling.java
@@ -42,9 +42,11 @@ public class PushErrorHandling extends AbstractTestUI {
                         ((String) null).length(); // Null-pointer exception
                     }
                 });
+        button.setId("npeButton");
         addComponent(button);
 
         final Table view = new Table("testtable");
+        view.setId("testtable");
         view.setSelectable(true);
         view.setMultiSelect(false);
         view.setImmediate(true);
diff --git a/uitest/src/com/vaadin/tests/push/PushErrorHandlingTest.java b/uitest/src/com/vaadin/tests/push/PushErrorHandlingTest.java
new file mode 100644
index 0000000000..a4b94b0573
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/PushErrorHandlingTest.java
@@ -0,0 +1,47 @@
+/*
+ * 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.push;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class PushErrorHandlingTest extends MultiBrowserTest {
+
+    @Test
+    public void testErrorHandling() {
+        setPush(true);
+        openTestURL();
+        vaadinElementById("npeButton").click();
+        Assert.assertEquals(
+                "An error! Unable to invoke method click in com.vaadin.shared.ui.button.ButtonServerRpc",
+                vaadinElement(
+                        "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VLabel[0]")
+                        .getText());
+
+        WebElement table = vaadinElementById("testtable");
+        WebElement row = table.findElement(By
+                .xpath("//div[text()='Click for NPE']"));
+        row.click();
+
+        Assert.assertEquals("Internal error",
+                vaadinElement("Root/VNotification[0]/HTML[0]/domChild[0]")
+                        .getText());
+    }
+}
-- 
cgit v1.2.3


From 2c6d010d90b96b0a087af589af27d9dd11ceca33 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Tue, 22 Oct 2013 23:24:44 +0300
Subject: Fixes test issues preventing it from passing

Ensure push is enabled correctly without a fallback and made test more stable

Change-Id: I6c653a96375e05c6ad18e1f5b697c6a584c6c53f
---
 uitest/src/com/vaadin/tests/push/PushLargeData.java  | 18 +++++++++++++++---
 .../vaadin/tests/push/PushLargeDataStreaming.java    |  6 +++++-
 .../tests/push/PushLargeDataStreamingTest.java       | 20 +++++++++++++-------
 .../vaadin/tests/push/PushLargeDataWebsocket.java    |  7 ++++---
 .../tests/push/PushLargeDataWebsocketTest.java       | 14 +++++++++-----
 uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java |  5 +++++
 6 files changed, 51 insertions(+), 19 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/push/PushLargeData.java b/uitest/src/com/vaadin/tests/push/PushLargeData.java
index 8ad005df81..1a9bf16de6 100644
--- a/uitest/src/com/vaadin/tests/push/PushLargeData.java
+++ b/uitest/src/com/vaadin/tests/push/PushLargeData.java
@@ -34,6 +34,18 @@ import com.vaadin.ui.UI;
 
 public abstract class PushLargeData extends AbstractTestUIWithLog {
 
+    // 1MB
+    static final int DEFAULT_SIZE_BYTES = 1000 * 1000;
+
+    // Every other second
+    static final int DEFAULT_DELAY_MS = 2000;
+
+    // 20 MB is enough for streaming to reconnect
+    static final int DEFAULT_DATA_TO_PUSH = 20 * 1000 * 1000;
+
+    static final int DEFAULT_DURATION_MS = DEFAULT_DATA_TO_PUSH
+            / DEFAULT_SIZE_BYTES * DEFAULT_DELAY_MS;
+
     private Label dataLabel = new Label();
 
     private final ExecutorService executor = Executors
@@ -49,9 +61,9 @@ public abstract class PushLargeData extends AbstractTestUIWithLog {
         final TextField duration = new TextField("Duration (ms)");
         duration.setConverter(Integer.class);
 
-        dataSize.setValue((1000 * 1000) + "");
-        interval.setValue(2000 + "");
-        duration.setValue(40 * 1000 + "");
+        dataSize.setValue(DEFAULT_SIZE_BYTES + "");
+        interval.setValue(DEFAULT_DELAY_MS + "");
+        duration.setValue(DEFAULT_DURATION_MS + "");
 
         addComponent(dataSize);
         addComponent(interval);
diff --git a/uitest/src/com/vaadin/tests/push/PushLargeDataStreaming.java b/uitest/src/com/vaadin/tests/push/PushLargeDataStreaming.java
index 464cbcc757..7706aa90c6 100644
--- a/uitest/src/com/vaadin/tests/push/PushLargeDataStreaming.java
+++ b/uitest/src/com/vaadin/tests/push/PushLargeDataStreaming.java
@@ -15,15 +15,19 @@
  */
 package com.vaadin.tests.push;
 
+import com.vaadin.annotations.Push;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.ui.Transport;
+import com.vaadin.shared.ui.ui.UIState.PushConfigurationState;
 
+@Push(transport = Transport.STREAMING)
 public class PushLargeDataStreaming extends PushLargeData {
 
     @Override
     protected void setup(VaadinRequest request) {
         super.setup(request);
         getPushConfiguration().setTransport(Transport.STREAMING);
-        getPushConfiguration().setFallbackTransport(Transport.STREAMING);
+        getPushConfiguration().setParameter(
+                PushConfigurationState.FALLBACK_TRANSPORT_PARAM, "none");
     }
 }
diff --git a/uitest/src/com/vaadin/tests/push/PushLargeDataStreamingTest.java b/uitest/src/com/vaadin/tests/push/PushLargeDataStreamingTest.java
index c716a6fc7e..8f10f0fbba 100644
--- a/uitest/src/com/vaadin/tests/push/PushLargeDataStreamingTest.java
+++ b/uitest/src/com/vaadin/tests/push/PushLargeDataStreamingTest.java
@@ -19,12 +19,12 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 
-import com.vaadin.tests.tb3.WebsocketTest;
+import com.vaadin.tests.tb3.MultiBrowserTest;
 
-public class PushLargeDataStreamingTest extends WebsocketTest {
+public class PushLargeDataStreamingTest extends MultiBrowserTest {
 
     @Test
-    public void testWebsocketLargeData() {
+    public void testStreamingLargeData() {
         openTestURL();
 
         // Without this there is a large chance that we will wait for all pushes
@@ -39,17 +39,23 @@ public class PushLargeDataStreamingTest extends WebsocketTest {
     }
 
     private void push() {
+        // Wait for startButton to be present
+        waitForElementToBePresent(vaadinLocatorById("startButton"));
+
         String logRow0Id = "Log_row_0";
         By logRow0 = vaadinLocatorById(logRow0Id);
 
         vaadinElementById("startButton").click();
-        waitUntil(ExpectedConditions.not(ExpectedConditions
-                .textToBePresentInElement(logRow0, "Push complete")));
+        // Wait for push to start
+        waitUntil(ExpectedConditions.textToBePresentInElement(logRow0,
+                "Package "));
 
-        // Pushes each 2000ms for 40s
-        sleep(40000);
+        // Wait for until push should be done
+        sleep(PushLargeData.DEFAULT_DURATION_MS);
 
+        // Wait until push is actually done
         waitUntil(ExpectedConditions.textToBePresentInElement(logRow0,
                 "Push complete"));
     }
+
 }
diff --git a/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocket.java b/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocket.java
index 974dc880f9..4115a825d1 100644
--- a/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocket.java
+++ b/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocket.java
@@ -19,14 +19,15 @@ package com.vaadin.tests.push;
 import com.vaadin.annotations.Push;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.ui.Transport;
+import com.vaadin.shared.ui.ui.UIState.PushConfigurationState;
 
-@Push
+@Push(transport = Transport.WEBSOCKET)
 public class PushLargeDataWebsocket extends PushLargeData {
 
     @Override
     protected void setup(VaadinRequest request) {
         super.setup(request);
-        getPushConfiguration().setTransport(Transport.WEBSOCKET);
-        getPushConfiguration().setFallbackTransport(Transport.WEBSOCKET);
+        getPushConfiguration().setParameter(
+                PushConfigurationState.FALLBACK_TRANSPORT_PARAM, "none");
     }
 }
diff --git a/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocketTest.java b/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocketTest.java
index 83f9efc8dd..70a94f743e 100644
--- a/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocketTest.java
+++ b/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocketTest.java
@@ -39,17 +39,21 @@ public class PushLargeDataWebsocketTest extends WebsocketTest {
     }
 
     private void push() {
+        // Wait for startButton to be present
+        waitForElementToBePresent(vaadinLocatorById("startButton"));
+
         String logRow0Id = "Log_row_0";
         By logRow0 = vaadinLocatorById(logRow0Id);
 
-        testBench(driver).waitForVaadin();
         vaadinElementById("startButton").click();
-        waitUntil(ExpectedConditions.not(ExpectedConditions
-                .textToBePresentInElement(logRow0, "Push complete")));
+        // Wait for push to start
+        waitUntil(ExpectedConditions.textToBePresentInElement(logRow0,
+                "Package"));
 
-        // Pushes each 2000ms for 40s
-        sleep(40000);
+        // Wait for until push should be done
+        sleep(PushLargeData.DEFAULT_DURATION_MS);
 
+        // Wait until push is actually done
         waitUntil(ExpectedConditions.textToBePresentInElement(logRow0,
                 "Push complete"));
     }
diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
index 712ef94397..218c532beb 100644
--- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -328,6 +328,11 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
         new WebDriverWait(driver, 10).until(ExpectedConditions.not(condition));
     }
 
+    protected void waitForElementToBePresent(By by) {
+        waitUntil(ExpectedConditions.not(ExpectedConditions
+                .invisibilityOfElementLocated(by)));
+    }
+
     /**
      * For tests extending {@link AbstractTestUIWithLog}, returns the element
      * for the Nth log row
-- 
cgit v1.2.3


From 3bbf30054f865990f6c9089bd8f73e2e7a41b3f5 Mon Sep 17 00:00:00 2001
From: Henrik Paul <henrik@vaadin.com>
Date: Mon, 9 Sep 2013 16:31:20 +0300
Subject: Let UI fire PollEvents (#12466)

Change-Id: I7eb5e407b6822f5b3ac8e103ba7c9f676c51648f
---
 server/src/com/vaadin/event/UIEvents.java          | 116 +++++++++++++++++++++
 server/src/com/vaadin/ui/UI.java                   |  22 +++-
 shared/src/com/vaadin/shared/EventId.java          |   2 +-
 .../tests/components/ui/PollListenerTest.html      |  32 ++++++
 .../tests/components/ui/PollListenerTest.java      |  54 ++++++++++
 5 files changed, 220 insertions(+), 6 deletions(-)
 create mode 100644 server/src/com/vaadin/event/UIEvents.java
 create mode 100644 uitest/src/com/vaadin/tests/components/ui/PollListenerTest.html
 create mode 100644 uitest/src/com/vaadin/tests/components/ui/PollListenerTest.java

(limited to 'uitest')

diff --git a/server/src/com/vaadin/event/UIEvents.java b/server/src/com/vaadin/event/UIEvents.java
new file mode 100644
index 0000000000..321bfc9251
--- /dev/null
+++ b/server/src/com/vaadin/event/UIEvents.java
@@ -0,0 +1,116 @@
+/*
+ * 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.event;
+
+import java.io.Serializable;
+import java.lang.reflect.Method;
+
+import com.vaadin.ui.Component;
+import com.vaadin.ui.UI;
+import com.vaadin.util.ReflectTools;
+
+/**
+ * A class that contains events, listeners and handlers specific to the
+ * {@link UI} class.
+ * 
+ * @since 7.2
+ * @author Vaadin Ltd
+ */
+public interface UIEvents {
+
+    /**
+     * A {@link PollListener} receives and handles {@link PollEvent PollEvents}
+     * fired by {@link PollNotifier PollNotifiers}.
+     * 
+     * @since 7.2
+     * @author Vaadin Ltd
+     */
+    public interface PollListener extends Serializable {
+        public static final Method POLL_METHOD = ReflectTools.findMethod(
+                PollListener.class, "poll", PollEvent.class);
+
+        /**
+         * A poll request has been received by the server.
+         * 
+         * @param event
+         *            poll event
+         */
+        public void poll(PollEvent event);
+    }
+
+    /**
+     * An event that is fired whenever a client polls the server for
+     * asynchronous UI updates.
+     * 
+     * @since 7.2
+     * @author Vaadin Ltd
+     */
+    public static class PollEvent extends Component.Event {
+        public PollEvent(UI ui) {
+            super(ui);
+        }
+
+        /**
+         * Get the {@link UI} instance that received the poll request.
+         * 
+         * @return the {@link UI} that received the poll request. Never
+         *         <code>null</code>.
+         */
+        public UI getUI() {
+            /*
+             * This cast is safe to make, since this class' constructor
+             * constrains the source to be a UI instance.
+             */
+            return (UI) getComponent();
+        }
+    }
+
+    /**
+     * The interface for adding and removing {@link PollEvent} listeners.
+     * <p>
+     * By implementing this interface, a class publicly announces that it is
+     * able to send {@link PollEvent PollEvents} whenever the client sends a
+     * periodic poll message to the client, to check for asynchronous
+     * server-side modifications.
+     * 
+     * @since 7.2
+     * @see UI#setPollInterval(int)
+     */
+    public interface PollNotifier extends Serializable {
+        /**
+         * Add a poll listener.
+         * <p>
+         * The listener is called whenever the client polls the server for
+         * asynchronous UI updates.
+         * 
+         * @see UI#setPollInterval(int)
+         * @see #removePollListener(PollListener)
+         * @param listener
+         *            the {@link PollListener} to add
+         */
+        public void addPollListener(PollListener listener);
+
+        /**
+         * Remove a poll listener.
+         * 
+         * @see #addPollListener(PollListener)
+         * @param listener
+         *            the listener to be removed
+         */
+        public void removePollListener(PollListener listener);
+    }
+
+}
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java
index 0d2ef4d569..a292e6b829 100644
--- a/server/src/com/vaadin/ui/UI.java
+++ b/server/src/com/vaadin/ui/UI.java
@@ -32,6 +32,9 @@ import com.vaadin.event.Action.Handler;
 import com.vaadin.event.ActionManager;
 import com.vaadin.event.MouseEvents.ClickEvent;
 import com.vaadin.event.MouseEvents.ClickListener;
+import com.vaadin.event.UIEvents.PollEvent;
+import com.vaadin.event.UIEvents.PollListener;
+import com.vaadin.event.UIEvents.PollNotifier;
 import com.vaadin.navigator.Navigator;
 import com.vaadin.server.ClientConnector;
 import com.vaadin.server.ComponentSizeValidator;
@@ -95,7 +98,8 @@ import com.vaadin.util.CurrentInstance;
  * @since 7.0
  */
 public abstract class UI extends AbstractSingleComponentContainer implements
-        Action.Container, Action.Notifier, LegacyComponent, Focusable {
+        Action.Container, Action.Notifier, PollNotifier, LegacyComponent,
+        Focusable {
 
     /**
      * The application to which this UI belongs
@@ -167,10 +171,7 @@ public abstract class UI extends AbstractSingleComponentContainer implements
 
         @Override
         public void poll() {
-            /*
-             * No-op. This is only called to cause a server visit to check for
-             * changes.
-             */
+            fireEvent(new PollEvent(UI.this));
         }
     };
     private DebugWindowServerRpc debugRpc = new DebugWindowServerRpc() {
@@ -1490,6 +1491,17 @@ public abstract class UI extends AbstractSingleComponentContainer implements
         return getState(false).pollInterval;
     }
 
+    @Override
+    public void addPollListener(PollListener listener) {
+        addListener(EventId.POLL, PollEvent.class, listener,
+                PollListener.POLL_METHOD);
+    }
+
+    @Override
+    public void removePollListener(PollListener listener) {
+        removeListener(EventId.POLL, PollEvent.class, listener);
+    }
+
     /**
      * Retrieves the object used for configuring the push channel.
      * 
diff --git a/shared/src/com/vaadin/shared/EventId.java b/shared/src/com/vaadin/shared/EventId.java
index dd30379d41..d669f8fa83 100644
--- a/shared/src/com/vaadin/shared/EventId.java
+++ b/shared/src/com/vaadin/shared/EventId.java
@@ -22,5 +22,5 @@ public interface EventId extends Serializable {
     public static final String FOCUS = "focus";
     public static final String CLICK_EVENT_IDENTIFIER = "click";
     public static final String LAYOUT_CLICK_EVENT_IDENTIFIER = "lClick";
-
+    public static final String POLL = "poll";
 }
diff --git a/uitest/src/com/vaadin/tests/components/ui/PollListenerTest.html b/uitest/src/com/vaadin/tests/components/ui/PollListenerTest.html
new file mode 100644
index 0000000000..ac39d1f03c
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/ui/PollListenerTest.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>PollListenerTest</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">PollListenerTest</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.ui.PollListenerTest?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>5000</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>PollEvent received</td>
+	<td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/uitest/src/com/vaadin/tests/components/ui/PollListenerTest.java b/uitest/src/com/vaadin/tests/components/ui/PollListenerTest.java
new file mode 100644
index 0000000000..0e5ddaab87
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/ui/PollListenerTest.java
@@ -0,0 +1,54 @@
+/*
+ * 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 com.vaadin.event.UIEvents.PollEvent;
+import com.vaadin.event.UIEvents.PollListener;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Label;
+
+public class PollListenerTest extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        final Label statusLabel = new Label("Default Label");
+        addComponent(statusLabel);
+
+        setPollInterval(2000);
+        addPollListener(new PollListener() {
+            @Override
+            public void poll(PollEvent event) {
+                setPollInterval(-1);
+                statusLabel.setValue(event.getClass().getSimpleName()
+                        + " received");
+                removePollListener(this);
+            }
+        });
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Polling should fire a PollEvent on the server-side";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 12466;
+    }
+
+}
-- 
cgit v1.2.3


From f5feaa2e3a8aebace6d9978131b192ed8b046557 Mon Sep 17 00:00:00 2001
From: Jarno Rantala <jarno.rantala@vaadin.com>
Date: Mon, 28 Oct 2013 14:53:54 +0200
Subject: Forces small delay before showing accessible tooltip on focus 
 (#12849)

Screen reader (JAWS 14) seems to get confused about the focused item if
the tooltip is shown on focus. This commit forces small delay before
showing the tooltip. More info, see
http://www.w3.org/TR/2011/CR-wai-aria-20110118/roles#tooltip

Change-Id: I2973a1a3844936e09fef28afe37a0ecbdda69122
---
 client/src/com/vaadin/client/VTooltip.java                        | 2 +-
 uitest/src/com/vaadin/tests/components/button/ButtonsWaiAria.java | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'uitest')

diff --git a/client/src/com/vaadin/client/VTooltip.java b/client/src/com/vaadin/client/VTooltip.java
index e687712b9c..e5c2ba117a 100644
--- a/client/src/com/vaadin/client/VTooltip.java
+++ b/client/src/com/vaadin/client/VTooltip.java
@@ -428,7 +428,7 @@ public class VTooltip extends VWindowOverlay {
             } else {
                 updatePosition(event, isFocused);
 
-                if (isShowing()) {
+                if (isShowing() && !isFocused) {
                     replaceCurrentTooltip();
                 } else {
                     showTooltip();
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonsWaiAria.java b/uitest/src/com/vaadin/tests/components/button/ButtonsWaiAria.java
index cc75f87a71..24dc942171 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonsWaiAria.java
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonsWaiAria.java
@@ -32,6 +32,10 @@ public class ButtonsWaiAria extends ComponentTestCase<Button> {
         l = createButton("Tooltip Button", nat);
         l.setDescription("Tooltip");
         addTestComponent(l);
+
+        l = createButton("Another tooltip", nat);
+        l.setDescription("Another");
+        addTestComponent(l);
     }
 
     private Button createButton(String text, boolean nativeButton) {
-- 
cgit v1.2.3


From e413646588fe45fe930116210da882b82151f3f3 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Tue, 29 Oct 2013 14:18:24 +0200
Subject: Ensure error screenshots are named according to the browser and not
 reference

Change-Id: I3fe0a3f5e2906bde79d6d9fc3e84dab8102ffd60
---
 .../com/vaadin/tests/tb3/ScreenshotTB3Test.java    | 42 ++++++++++++++++++----
 1 file changed, 35 insertions(+), 7 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java b/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
index cbdae1a6c1..367229eaaa 100644
--- a/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
@@ -129,9 +129,28 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
             // Matched one comparison but not all, remove all error images +
             // HTML files
         } else {
-            // All comparisons failed, keep the main error image + HTML
-            screenshotFailures.add(mainReference.getName());
-            referenceToKeep = mainReference;
+            // Ensure we use the correct browser version (e.g. if running IE11
+            // and only an IE 10 reference was available, then mainReference
+            // will be for IE 10, not 11)
+            String originalName = getScreenshotReferenceName(identifier);
+            File exactVersionFile = new File(originalName);
+
+            if (!exactVersionFile.equals(mainReference)) {
+                // Rename png+html to have the correct version
+                File correctPng = getErrorFileFromReference(exactVersionFile);
+                File producedPng = getErrorFileFromReference(mainReference);
+                File correctHtml = htmlFromPng(correctPng);
+                File producedHtml = htmlFromPng(producedPng);
+
+                producedPng.renameTo(correctPng);
+                producedHtml.renameTo(correctHtml);
+                referenceToKeep = exactVersionFile;
+                screenshotFailures.add(exactVersionFile.getName());
+            } else {
+                // All comparisons failed, keep the main error image + HTML
+                screenshotFailures.add(mainReference.getName());
+                referenceToKeep = mainReference;
+            }
         }
 
         // Remove all PNG/HTML files we no longer need (failed alternative
@@ -140,10 +159,7 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
             File failurePng = getErrorFileFromReference(failedAlternative);
             if (failedAlternative != referenceToKeep) {
                 // Delete png + HTML
-                String htmlFileName = failurePng.getName().replace(".png",
-                        ".html");
-                File failureHtml = new File(failurePng.getParentFile(),
-                        htmlFileName);
+                File failureHtml = htmlFromPng(failurePng);
 
                 failurePng.delete();
                 failureHtml.delete();
@@ -151,6 +167,18 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
         }
     }
 
+    /**
+     * Returns a new File which points to a .html file instead of the given .png
+     * file
+     * 
+     * @param png
+     * @return
+     */
+    private static File htmlFromPng(File png) {
+        return new File(png.getParentFile(), png.getName().replaceAll(
+                "\\.png$", ".png.html"));
+    }
+
     /**
      * 
      * @param referenceFile
-- 
cgit v1.2.3


From 2a3890cf71e18decf19a6d5e99ee12eb2dd139a9 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 30 Oct 2013 07:03:51 +0000
Subject: Revert "Only print testbench failure TeamCity messages when running
 in TC"

This reverts commit d0e604f6b509767c46ffe0fd6765cf23535f593e.

Change-Id: I14509a9cb1365761d02a3a8a18d3febc4a7ba918
---
 uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java |  8 +++-----
 uitest/tb3test.xml                                     |  9 ---------
 uitest/test.xml                                        | 12 +++---------
 3 files changed, 6 insertions(+), 23 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java b/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
index 367229eaaa..565cd4ce34 100644
--- a/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
@@ -68,11 +68,9 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
         protected void failed(Throwable e, Description description) {
 
             // Notify Teamcity of failed test
-            if (!System.getProperty("teamcity.version", "").equals("")) {
-                System.out.print("##teamcity[publishArtifacts '");
-                System.out.println(getScreenshotErrorBaseName()
-                        + "* => screenshot-errors']");
-            }
+            System.out.print("##teamcity[publishArtifacts '");
+            System.out.println(getScreenshotErrorBaseName()
+                    + "* => screenshot-errors']");
         }
     };
 
diff --git a/uitest/tb3test.xml b/uitest/tb3test.xml
index 5285280608..dd0c12db91 100644
--- a/uitest/tb3test.xml
+++ b/uitest/tb3test.xml
@@ -19,21 +19,12 @@
     <target name="run-tb3-suite">
         <fail unless="junit.test.suite" message="Define suite to run using junit.test.suite" />
         <fail unless="com.vaadin.testbench.screenshot.directory" message="Define screenshot directory using -Dcom.vaadin.testbench.screenshot.directory" />
-
-        <!-- Ensure teamcity.version is set to something -->
-        <condition property="teamcity.version" value="">
-            <not>
-                 <isset property="teamcity.version" />
-            </not>
-        </condition>
-
         <junit printsummary="withOutAndErr" fork="yes">
             <formatter usefile="false" type="plain" />
             <classpath refid="classpath.tb3" />
 
             <jvmarg value="-Dcom.vaadin.testbench.screenshot.directory=${com.vaadin.testbench.screenshot.directory}" />
             <jvmarg value="-Djava.awt.headless=true" />
-            <jvmarg value="-Dteamcity.version=${teamcity.version}" />
             <test name="${junit.test.suite}" />
         </junit>
 
diff --git a/uitest/test.xml b/uitest/test.xml
index 3bfeb66c05..bcb0bf540a 100644
--- a/uitest/test.xml
+++ b/uitest/test.xml
@@ -134,18 +134,12 @@
             </batchtest>
         </junit>
 
-        <antcall target="notify-teamcity-of-build-artifact">
-            <param name="file" value="${target}" />
-        </antcall>
+        <!-- Have teamcity publish each test error artifact immediatly if there are any -->
+        <basename property="basename" file="${target}" suffix="java" />
+        <echo>##teamcity[publishArtifacts '${com.vaadin.testbench.screenshot.directory}/errors/${basename}* => screenshot-errors']</echo>
 
     </target>
 
-	<!-- Have teamcity publish each test error artifact immediatly if there are any -->
-	<target name="notify-teamcity-of-build-artifact" if="teamcity.version">
-           <basename property="basename" file="${file}" suffix="java" />
-           <echo>##teamcity[publishArtifacts '${com.vaadin.testbench.screenshot.directory}/errors/${basename}* => screenshot-errors']</echo>
-	</target>
-
     <!-- Remove temporary source and compiled java files -->
     <target name="remove-temp-testclasses">
         <delete failonerror="false">
-- 
cgit v1.2.3


From 8971651a93920c7b75316f0c3794682afebcddac Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 30 Oct 2013 07:04:17 +0000
Subject: Revert "Publish error artifacts immediatly in TeamCity"

This reverts commit 5fb1da2da04ccca2305af31a9105b848e42b1ed6.

Change-Id: I9d84b75e5e189378eacd2559bb42399b77957010
---
 uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java | 12 +-----------
 uitest/test.xml                                        |  4 ----
 2 files changed, 1 insertion(+), 15 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java b/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
index 565cd4ce34..a51421d3d5 100644
--- a/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
@@ -31,7 +31,6 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.rules.TestRule;
 import org.junit.rules.TestWatcher;
-import org.junit.runner.Description;
 import org.openqa.selenium.OutputType;
 import org.openqa.selenium.TakesScreenshot;
 import org.openqa.selenium.remote.DesiredCapabilities;
@@ -62,16 +61,7 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
 
             String className = testClass.getSimpleName();
             screenshotBaseName = className + "-" + testMethod;
-        }
-
-        @Override
-        protected void failed(Throwable e, Description description) {
-
-            // Notify Teamcity of failed test
-            System.out.print("##teamcity[publishArtifacts '");
-            System.out.println(getScreenshotErrorBaseName()
-                    + "* => screenshot-errors']");
-        }
+        };
     };
 
     /**
diff --git a/uitest/test.xml b/uitest/test.xml
index bcb0bf540a..b0db8d47f4 100644
--- a/uitest/test.xml
+++ b/uitest/test.xml
@@ -134,10 +134,6 @@
             </batchtest>
         </junit>
 
-        <!-- Have teamcity publish each test error artifact immediatly if there are any -->
-        <basename property="basename" file="${target}" suffix="java" />
-        <echo>##teamcity[publishArtifacts '${com.vaadin.testbench.screenshot.directory}/errors/${basename}* => screenshot-errors']</echo>
-
     </target>
 
     <!-- Remove temporary source and compiled java files -->
-- 
cgit v1.2.3


From 017bd0684c7d6c8475c8b43514e6f3998095c8d6 Mon Sep 17 00:00:00 2001
From: Mika Murtojarvi <mika@vaadin.com>
Date: Tue, 29 Oct 2013 15:22:45 +0200
Subject: Fixes the handling of the scroll position of a Window (#12736)

After the first commit the same fix has been applied also for panels, in
addition to other suggested changes.

The scroll position of a Window is now memorized before applying
the fix for bug #11994. The position is restored after the fix.

Because the scrolling issue is known to appear also in other components,
the fix for the scrolling has been moved to the Util class.

Change-Id: I5251011b5bede77a7fb18972e1d90016c0eccc23
---
 client/src/com/vaadin/client/Util.java             | 55 ++++++++++++++++++
 client/src/com/vaadin/client/ui/VPanel.java        | 44 +--------------
 client/src/com/vaadin/client/ui/VWindow.java       | 32 +----------
 .../window/ComboboxScrollableWindow.java           | 66 ++++++++++++++++++++++
 .../window/ComboboxScrollableWindowTest.java       | 57 +++++++++++++++++++
 5 files changed, 183 insertions(+), 71 deletions(-)
 create mode 100644 uitest/src/com/vaadin/tests/components/window/ComboboxScrollableWindow.java
 create mode 100644 uitest/src/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java

(limited to 'uitest')

diff --git a/client/src/com/vaadin/client/Util.java b/client/src/com/vaadin/client/Util.java
index 8972670232..8a5712215d 100644
--- a/client/src/com/vaadin/client/Util.java
+++ b/client/src/com/vaadin/client/Util.java
@@ -32,6 +32,7 @@ import com.google.gwt.dom.client.Node;
 import com.google.gwt.dom.client.NodeList;
 import com.google.gwt.dom.client.Style;
 import com.google.gwt.dom.client.Style.Display;
+import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.dom.client.Touch;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.DOM;
@@ -517,6 +518,60 @@ public class Util {
 
     }
 
+    /**
+     * Prevents some browsers from adding scroll bars to a component (such as a
+     * Window) whose contents fit in the component.
+     * <p>
+     * See: bugs #11994 and #12736.
+     * 
+     * @param contentNode
+     *            an element that contains a scrollable element as its first
+     *            child
+     * 
+     * @since 7.1.8
+     */
+    public static void removeUnneededScrollbars(final Element contentNode) {
+        if (BrowserInfo.get().isWebkit()) {
+
+            /*
+             * Shake up the DOM a bit to make the window shed unnecessary
+             * scrollbars and resize correctly afterwards. This resulting code
+             * took over a week to summon forth, and involved some pretty hairy
+             * black magic. Don't touch it unless you know what you're doing!
+             * Fixes ticket #11994. Later modified to fix ticket #12736.
+             */
+            Scheduler.get().scheduleFinally(new ScheduledCommand() {
+
+                @Override
+                public void execute() {
+                    final com.google.gwt.dom.client.Element scrollable = contentNode
+                            .getFirstChildElement();
+
+                    // Adjusting the width or height may change the scroll
+                    // position, so store the current position
+                    int horizontalScrollPosition = scrollable.getScrollLeft();
+                    int verticalScrollPosition = scrollable.getScrollTop();
+
+                    final String oldWidth = scrollable.getStyle().getWidth();
+                    final String oldHeight = scrollable.getStyle().getHeight();
+
+                    scrollable.getStyle().setWidth(110, Unit.PCT);
+                    scrollable.getStyle().setHeight(110, Unit.PCT);
+                    scrollable.getOffsetWidth();
+                    scrollable.getOffsetHeight();
+                    scrollable.getStyle().setProperty("width", oldWidth);
+                    scrollable.getStyle().setProperty("height", oldHeight);
+
+                    // Restore the scroll position
+                    scrollable.setScrollLeft(horizontalScrollPosition);
+                    scrollable.setScrollTop(verticalScrollPosition);
+
+                }
+            });
+
+        }
+    }
+
     /**
      * Parses shared state and fetches the relative size of the component. If a
      * dimension is not specified as relative it will return -1. If the shared
diff --git a/client/src/com/vaadin/client/ui/VPanel.java b/client/src/com/vaadin/client/ui/VPanel.java
index 15c3883b11..307a2e4a91 100644
--- a/client/src/com/vaadin/client/ui/VPanel.java
+++ b/client/src/com/vaadin/client/ui/VPanel.java
@@ -16,18 +16,15 @@
 
 package com.vaadin.client.ui;
 
-import com.google.gwt.core.client.Scheduler;
-import com.google.gwt.core.client.Scheduler.ScheduledCommand;
 import com.google.gwt.dom.client.DivElement;
 import com.google.gwt.dom.client.Document;
-import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.vaadin.client.ApplicationConnection;
-import com.vaadin.client.BrowserInfo;
 import com.vaadin.client.Focusable;
+import com.vaadin.client.Util;
 import com.vaadin.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner;
 import com.vaadin.client.ui.TouchScrollDelegate.TouchScrollHandler;
 
@@ -210,43 +207,6 @@ public class VPanel extends SimplePanel implements ShortcutActionHandlerOwner,
             touchScrollHandler = TouchScrollDelegate.enableTouchScrolling(this);
         }
         touchScrollHandler.addElement(contentNode);
-
-        /*
-         * Shake up the DOM a bit to make the window shed unnecessary scroll
-         * bars and resize correctly afterwards. This resulting code took over a
-         * week to summon forth, and involved some pretty hairy black magic.
-         * Don't touch it unless you know what you're doing! Fixes ticket
-         * #12727.
-         * 
-         * This solution comes from the ticket #11994: Windows get unnecessary
-         * scroll bars in WebKit when content is 100% wide.
-         */
-        if (BrowserInfo.get().isWebkit()) {
-            Scheduler.get().scheduleFinally(new ScheduledCommand() {
-                @Override
-                public void execute() {
-                    final com.google.gwt.dom.client.Element scrollable = contentNode
-                            .getFirstChildElement();
-
-                    int contentNodeScrollTop = contentNode.getScrollTop();
-                    int contentNodeScrollLeft = contentNode.getScrollLeft();
-
-                    final String oldWidth = scrollable.getStyle().getWidth();
-                    final String oldHeight = scrollable.getStyle().getHeight();
-
-                    scrollable.getStyle().setWidth(110, Unit.PCT);
-                    scrollable.getOffsetWidth();
-                    scrollable.getStyle().setProperty("width", oldWidth);
-
-                    scrollable.getStyle().setHeight(110, Unit.PCT);
-                    scrollable.getOffsetHeight();
-                    scrollable.getStyle().setProperty("height", oldHeight);
-
-                    // Recovering scroll position:
-                    contentNode.setScrollTop(contentNodeScrollTop);
-                    contentNode.setScrollLeft(contentNodeScrollLeft);
-                }
-            });
-        }
+        Util.removeUnneededScrollbars(contentNode);
     }
 }
diff --git a/client/src/com/vaadin/client/ui/VWindow.java b/client/src/com/vaadin/client/ui/VWindow.java
index ff6a15e597..3e71c0af50 100644
--- a/client/src/com/vaadin/client/ui/VWindow.java
+++ b/client/src/com/vaadin/client/ui/VWindow.java
@@ -342,36 +342,10 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner,
         if (!visibilityChangesDisabled) {
             super.setVisible(visible);
         }
-
         if (visible && BrowserInfo.get().isWebkit()) {
-
-            /*
-             * Shake up the DOM a bit to make the window shed unnecessary
-             * scrollbars and resize correctly afterwards. This resulting code
-             * took over a week to summon forth, and involved some pretty hairy
-             * black magic. Don't touch it unless you know what you're doing!
-             * Fixes ticket #11994
-             */
-            Scheduler.get().scheduleFinally(new ScheduledCommand() {
-                @Override
-                public void execute() {
-                    final com.google.gwt.dom.client.Element scrollable = contents
-                            .getFirstChildElement();
-                    final String oldWidth = scrollable.getStyle().getWidth();
-                    final String oldHeight = scrollable.getStyle().getHeight();
-
-                    scrollable.getStyle().setWidth(110, Unit.PCT);
-                    scrollable.getOffsetWidth();
-                    scrollable.getStyle().setProperty("width", oldWidth);
-
-                    scrollable.getStyle().setHeight(110, Unit.PCT);
-                    scrollable.getOffsetHeight();
-                    scrollable.getStyle().setProperty("height", oldHeight);
-
-                    updateContentsSize();
-                    positionOrSizeUpdated();
-                }
-            });
+            Util.removeUnneededScrollbars(contents);
+            updateContentsSize();
+            positionOrSizeUpdated();
         }
     }
 
diff --git a/uitest/src/com/vaadin/tests/components/window/ComboboxScrollableWindow.java b/uitest/src/com/vaadin/tests/components/window/ComboboxScrollableWindow.java
new file mode 100644
index 0000000000..6347ff9a76
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/window/ComboboxScrollableWindow.java
@@ -0,0 +1,66 @@
+/*
+ * 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.window;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+
+/**
+ * 
+ * @since
+ * @author Vaadin Ltd
+ */
+public class ComboboxScrollableWindow extends AbstractTestUI {
+
+    static final String WINDOW_ID = "window";
+    static final String COMBOBOX_ID = "combobox";
+
+    @Override
+    protected void setup(VaadinRequest request) {
+
+        Window w = new Window();
+        w.setId(WINDOW_ID);
+        w.setWidth("300px");
+        w.setHeight("300px");
+        w.center();
+
+        VerticalLayout content = new VerticalLayout();
+        w.setContent(content);
+        content.setHeight("1000px");
+        ComboBox cb = new ComboBox();
+        cb.setId(COMBOBOX_ID);
+        content.addComponent(cb);
+        content.setComponentAlignment(cb, Alignment.BOTTOM_CENTER);
+
+        addWindow(w);
+
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "The combo box in the bottom of the scrollable window should remain visible when it is clicked.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 12736;
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java b/uitest/src/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java
new file mode 100644
index 0000000000..665e175f2c
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java
@@ -0,0 +1,57 @@
+/*
+ * 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.window;
+
+import static com.vaadin.tests.components.window.ComboboxScrollableWindow.COMBOBOX_ID;
+import static com.vaadin.tests.components.window.ComboboxScrollableWindow.WINDOW_ID;
+
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.testbench.By;
+import com.vaadin.testbench.commands.TestBenchElementCommands;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+/**
+ * 
+ * @since
+ * @author Vaadin Ltd
+ */
+public class ComboboxScrollableWindowTest extends MultiBrowserTest {
+
+    @Test
+    public void testWindowScrollbars() throws Exception {
+        openTestURL();
+        com.vaadin.testbench.Parameters
+                .setScreenshotComparisonCursorDetection(true);
+
+        WebElement window = driver.findElement(By.id(WINDOW_ID));
+        WebElement scrollableElement = window.findElement(By
+                .className("v-scrollable"));
+        TestBenchElementCommands scrollable = testBenchElement(scrollableElement);
+        scrollable.scroll(1000);
+        WebElement comboBox = driver.findElement(By.id(COMBOBOX_ID));
+        WebElement selectButton = driver.findElement(By
+                .className("v-filterselect-button"));
+        selectButton.click();
+
+        // Wait for the browser before taking a screenshot
+        Thread.sleep(1000);
+        compareScreen(getScreenshotBaseName());
+
+    }
+
+}
-- 
cgit v1.2.3


From e2157f47967e1470704cb0b2ab023941f26171f9 Mon Sep 17 00:00:00 2001
From: Juho Nurminen <juho@vaadin.com>
Date: Wed, 30 Oct 2013 14:25:30 +0200
Subject: Fixed Tab error tooltips (#12802)

Change-Id: I5ad33f38be5fac64805950d143ad2712e671ff83
---
 client/src/com/vaadin/client/ui/VTabsheet.java     |  3 +-
 .../components/tabsheet/TabSheetErrorTooltip.java  | 60 ++++++++++++++++
 .../tabsheet/TabSheetErrorTooltipTest.java         | 81 ++++++++++++++++++++++
 3 files changed, 143 insertions(+), 1 deletion(-)
 create mode 100644 uitest/src/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltip.java
 create mode 100644 uitest/src/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltipTest.java

(limited to 'uitest')

diff --git a/client/src/com/vaadin/client/ui/VTabsheet.java b/client/src/com/vaadin/client/ui/VTabsheet.java
index 7dec62bde0..c64216d49f 100644
--- a/client/src/com/vaadin/client/ui/VTabsheet.java
+++ b/client/src/com/vaadin/client/ui/VTabsheet.java
@@ -265,7 +265,8 @@ public class VTabsheet extends VTabsheetBase implements Focusable,
         }
 
         public boolean updateCaption(UIDL uidl) {
-            if (uidl.hasAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_DESCRIPTION)) {
+            if (uidl.hasAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_DESCRIPTION)
+                    || uidl.hasAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_ERROR_MESSAGE)) {
                 setTooltipInfo(new TooltipInfo(
                         uidl.getStringAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_DESCRIPTION),
                         uidl.getStringAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_ERROR_MESSAGE)));
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltip.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltip.java
new file mode 100644
index 0000000000..02482b7049
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltip.java
@@ -0,0 +1,60 @@
+/*
+ * 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.tabsheet;
+
+import com.vaadin.server.UserError;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.TabSheet.Tab;
+
+public class TabSheetErrorTooltip extends AbstractTestUI {
+
+    private TabSheet tabSheet = new TabSheet();
+    private int tabCount = 0;
+
+    @Override
+    protected void setup(VaadinRequest request) {
+
+        addTab();
+        addTab().setComponentError(new UserError("Error!"));
+        addTab().setDescription("This is a tab");
+
+        Tab t = addTab();
+        t.setComponentError(new UserError("Error!"));
+        t.setDescription("This tab has both an error and a description");
+
+        setContent(tabSheet);
+    }
+
+    private Tab addTab() {
+        tabCount++;
+        Label contents = new Label("Contents for tab " + tabCount);
+        return tabSheet.addTab(contents, "Tab " + tabCount);
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "TabSheet Tabs should display component error tooltips when expected";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 12802;
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltipTest.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltipTest.java
new file mode 100644
index 0000000000..88bc23d12b
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltipTest.java
@@ -0,0 +1,81 @@
+/*
+ * 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.tabsheet;
+
+import java.io.IOException;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.NoSuchElementException;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class TabSheetErrorTooltipTest extends MultiBrowserTest {
+
+    @Test
+    public void checkTooltips() throws IOException {
+        openTestURL();
+
+        testBenchElement(getTab(0)).showTooltip();
+        assertNoTooltip();
+
+        testBenchElement(getTab(1)).showTooltip();
+        assertErrorMessage("Error!");
+        assertTooltip("");
+
+        testBenchElement(getTab(2)).showTooltip();
+        assertErrorMessage("");
+        assertTooltip("This is a tab");
+
+        testBenchElement(getTab(3)).showTooltip();
+        assertErrorMessage("Error!");
+        assertTooltip("This tab has both an error and a description");
+    }
+
+    private WebElement getTab(int index) {
+        return vaadinElement("/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild["
+                + index + "]/domChild[0]");
+    }
+
+    private WebElement getTooltip() {
+        return getDriver().findElement(
+                By.xpath("//div[@class='v-tooltip-text']"));
+    }
+
+    private WebElement getErrorMessage() {
+        return getDriver().findElement(
+                By.xpath("//div[@class='v-errormessage']"));
+    }
+
+    private void assertTooltip(String tooltip) {
+        Assert.assertEquals(tooltip, getTooltip().getText());
+    }
+
+    private void assertErrorMessage(String message) {
+        Assert.assertEquals(message, getErrorMessage().getText());
+    }
+
+    private void assertNoTooltip() {
+        try {
+            getTooltip();
+        } catch (NoSuchElementException e) {
+            return;
+        }
+        Assert.fail("Tooltip exists");
+    }
+}
-- 
cgit v1.2.3


From a5a91311e9941cc4db775d6edb58781ca435b022 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 28 Oct 2013 16:55:45 +0200
Subject: Converted LayoutTesterApplication test to TB3

Change-Id: I2cee37ae8297c74b4a37fc59e3cf835c9291ed43
---
 .../layouts/layouttester/GridLayoutTests.java      |  26 +
 .../layouttester/HorizontalLayoutTests.java        |  21 +-
 .../layouttester/LayoutTesterApplication.html      | 896 ---------------------
 .../layouttester/LayoutTesterApplication.java      |  15 +-
 .../layouttester/LayoutTesterApplicationTest.java  | 137 ++++
 .../layouts/layouttester/VerticalLayoutTests.java  |  20 +-
 6 files changed, 211 insertions(+), 904 deletions(-)
 delete mode 100644 uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.html
 create mode 100644 uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplicationTest.java

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
index 221680be11..f55867c464 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
@@ -124,6 +124,13 @@ public class GridLayoutTests extends AbstractLayoutTests {
         final Button button5 = new Button("Test remove row 0");
         final Button button6 = new Button("Test remove comp row3");
 
+        button1.setId("testButton1");
+        button2.setId("testButton2");
+        button3.setId("testButton3");
+        button4.setId("testButton4");
+        button5.setId("testButton5");
+        button6.setId("testButton6");
+
         baseLayout.addComponent(button1);
         baseLayout.addComponent(button2);
         baseLayout.addComponent(button3);
@@ -223,6 +230,10 @@ public class GridLayoutTests extends AbstractLayoutTests {
         final Button button4 = new Button("undefined size+add, table");
 
         glo.replaceComponent(x22, x22 = getTestTable());
+        button1.setId("testButton1");
+        button2.setId("testButton2");
+        button3.setId("testButton3");
+        button4.setId("testButton4");
 
         baseLayout.addComponent(button1);
         baseLayout.addComponent(button2);
@@ -287,6 +298,11 @@ public class GridLayoutTests extends AbstractLayoutTests {
         final Button button2 = new Button("set all cols expand 0.25");
         final Button button3 = new Button("set row 0 expand 0.5");
         final Button button4 = new Button("set row 3 expand 0.2");
+        button1.setId("testButton1");
+        button2.setId("testButton2");
+        button3.setId("testButton3");
+        button4.setId("testButton4");
+
         glo.setHeight("400px");
         glo.replaceComponent(x22, x22 = getTestTable());
 
@@ -396,6 +412,11 @@ public class GridLayoutTests extends AbstractLayoutTests {
         final Button button3 = new Button("Set fixed width and height 75%");
         final Button button4 = new Button("Set size full");
 
+        button1.setId("testButton1");
+        button2.setId("testButton2");
+        button3.setId("testButton3");
+        button4.setId("testButton4");
+
         glo.replaceComponent(x22, x22 = getTestTable());
 
         baseLayout.addComponent(button1);
@@ -467,6 +488,11 @@ public class GridLayoutTests extends AbstractLayoutTests {
         final Button button3 = new Button("Set margin off");
         final Button button4 = new Button("Set spacing off");
 
+        button1.setId("testButton1");
+        button2.setId("testButton2");
+        button3.setId("testButton3");
+        button4.setId("testButton4");
+
         baseLayout.addComponent(button1);
         baseLayout.addComponent(button2);
         baseLayout.addComponent(button3);
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java b/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
index 7a53a6583e..971205ccbb 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
@@ -123,7 +123,10 @@ public class HorizontalLayoutTests extends AbstractLayoutTests {
         final Button replaceButton = new Button("Test replace");
         final Button moveButton = new Button("Test move");
         final Button removeButton = new Button("Test remove");
-
+        addButton.setId("testButton1");
+        replaceButton.setId("testButton2");
+        moveButton.setId("testButton3");
+        removeButton.setId("testButton4");
         replaceButton.setEnabled(false);
         moveButton.setEnabled(false);
         removeButton.setEnabled(false);
@@ -193,6 +196,10 @@ public class HorizontalLayoutTests extends AbstractLayoutTests {
         final Button smallerButton = new Button("200 px width");
         final Button originalButton = new Button("undefined size+add");
 
+        biggerButton.setId("testButton1");
+        smallerButton.setId("testButton2");
+        originalButton.setId("testButton3");
+
         baseLayout.addComponent(biggerButton);
         baseLayout.addComponent(smallerButton);
         baseLayout.addComponent(originalButton);
@@ -257,6 +264,11 @@ public class HorizontalLayoutTests extends AbstractLayoutTests {
         final Button button3 = new Button("Set fixed width and height 75%");
         final Button button4 = new Button("Set size full");
 
+        button1.setId("testButton1");
+        button2.setId("testButton2");
+        button3.setId("testButton3");
+        button4.setId("testButton4");
+
         baseLayout.addComponent(button1);
         baseLayout.addComponent(button2);
         baseLayout.addComponent(button3);
@@ -332,6 +344,9 @@ public class HorizontalLayoutTests extends AbstractLayoutTests {
         final Button button1 = new Button("Expand to 1/undefined");
         final Button button2 = new Button("Expand to 0.5/0.5");
         final Button button3 = new Button("Expand to 0.75/0.25");
+        button1.setId("testButton1");
+        button2.setId("testButton2");
+        button3.setId("testButton3");
 
         baseLayout.addComponent(button1);
         baseLayout.addComponent(button2);
@@ -438,6 +453,10 @@ public class HorizontalLayoutTests extends AbstractLayoutTests {
         final Button button2 = new Button("Set spacing on");
         final Button button3 = new Button("Set margin off");
         final Button button4 = new Button("Set spacing off");
+        button1.setId("testButton1");
+        button2.setId("testButton2");
+        button3.setId("testButton3");
+        button4.setId("testButton4");
 
         baseLayout.addComponent(button1);
         baseLayout.addComponent(button2);
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.html b/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.html
deleted file mode 100644
index 8408aba9fd..0000000000
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.html
+++ /dev/null
@@ -1,896 +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>LayoutTesterApplication</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">LayoutTesterApplication</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/run/com.vaadin.tests.layouts.layouttester.LayoutTesterApplication?restartApplication</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>1</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>2</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>3</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>4</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>5</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>6</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>7</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>8</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>9</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>10</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>11</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>12</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>13</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>14</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>15</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>16</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>17</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>18</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>19</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>20</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>21</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>22</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>23</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>24</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>25</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>26</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>27</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>28</td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>
-	<td>label=class com.vaadin.ui.HorizontalLayout</td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>29</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>30</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>31</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>32</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>33</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>34</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>35</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>36</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>37</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>38</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>39</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>40</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>41</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>42</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>43</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>44</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>45</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>46</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>47</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>48</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>49</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>50</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>51</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>52</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>53</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>54</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>55</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>56</td>
-</tr>
-<tr>
-	<td>select</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeSelect[0]/domChild[0]</td>
-	<td>label=class com.vaadin.ui.GridLayout</td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>57</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>58</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>59</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>60</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>61</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>62</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>63</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>64</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>65</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>66</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>67</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>68</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>69</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>70</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>71</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>72</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>73</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>74</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>75</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>76</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[5]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>77</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>78</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>79</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>80</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>81</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>82</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>83</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>84</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>85</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>86</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>87</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>88</td>
-</tr>
-</tbody></table>
-</body>
-</html>
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java b/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java
index 72863895a1..ef092d2539 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java
@@ -20,18 +20,20 @@ public class LayoutTesterApplication extends AbstractTestCase {
     Button nextButton = new Button("Next");
     private int layoutIndex = -1;
 
-    private static final String[] layoutGetters = new String[] {
-            "getCaptionsTests", "getIconsTests",
-            "getRequiredErrorIndicatorsTests", "getAlignmentTests",
-            "getExpandRatiosTests", "getMarginSpacingTests",
-            "getComponentAddReplaceMoveTests", "getComponentSizingTests",
-            "getLayoutSizingTests" };
+    static final String[] layoutGetters = new String[] { "getCaptionsTests",
+            "getIconsTests", "getRequiredErrorIndicatorsTests",
+            "getAlignmentTests", "getExpandRatiosTests",
+            "getMarginSpacingTests", "getComponentAddReplaceMoveTests",
+            "getComponentSizingTests", "getLayoutSizingTests" };
+    public static final String NEXT_BUTTON_ID = "nextButton";
+    private static final String LAYOUT_SELECT_ID = "layoutSelect";
 
     private LegacyWindow mainWindow;
     private NativeSelect layoutSelector;
 
     @Override
     public void init() {
+        nextButton.setId(NEXT_BUTTON_ID);
         mainWindow = new LegacyWindow("LayoutTesterApplication");
         setMainWindow(mainWindow);
         nextLayout();
@@ -112,6 +114,7 @@ public class LayoutTesterApplication extends AbstractTestCase {
     private NativeSelect getLayoutTypeSelect() {
         if (layoutSelector == null) {
             layoutSelector = new NativeSelect();
+            layoutSelector.setId(LAYOUT_SELECT);
             layoutSelector.addItem(VerticalLayout.class);
             layoutSelector.addItem(HorizontalLayout.class);
             layoutSelector.addItem(GridLayout.class);
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplicationTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplicationTest.java
new file mode 100644
index 0000000000..33197613dc
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplicationTest.java
@@ -0,0 +1,137 @@
+/*
+ * 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.layouts.layouttester;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.JavascriptExecutor;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.ui.Select;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.VerticalLayout;
+
+public class LayoutTesterApplicationTest extends MultiBrowserTest {
+    Map<String, Integer> numberOfSubTests = new HashMap<String, Integer>();
+    private Set<String> tableOrIconsTests = new HashSet<String>();
+
+    {
+        numberOfSubTests.put("getExpandRatiosTests", 3);
+        numberOfSubTests.put("getLayoutSizingTests", 4);
+        numberOfSubTests.put("getComponentAddReplaceMoveTests", 4);
+        numberOfSubTests.put("getMarginSpacingTests", 4);
+        numberOfSubTests.put("getComponentSizingTests", 3);
+
+        tableOrIconsTests.add("getComponentSizingTests");
+        tableOrIconsTests.add("getExpandRatiosTests");
+        tableOrIconsTests.add("getLayoutSizingTests");
+        tableOrIconsTests.add("getMarginSpacingTests");
+        tableOrIconsTests.add("getIconsTests");
+
+    }
+
+    @Test
+    public void verticalLayout() throws Exception {
+        openTestURL();
+        runTest(VerticalLayout.class);
+    }
+
+    @Test
+    public void horizontalLayout() throws Exception {
+        openTestURL();
+        runTest(HorizontalLayout.class);
+    }
+
+    @Test
+    public void gridLayout() throws Exception {
+        numberOfSubTests.put("getComponentAddReplaceMoveTests", 6);
+        numberOfSubTests.put("getComponentSizingTests", 4);
+        numberOfSubTests.put("getExpandRatiosTests", 4);
+
+        openTestURL();
+        runTest(GridLayout.class);
+    }
+
+    private void runTest(Class<?> layoutClass) throws Exception {
+        new Select(vaadinElementById("layoutSelect").findElement(
+                By.xpath("select")))
+                .selectByVisibleText(layoutClass.toString());
+        focusElementWithId("nextButton");
+
+        for (String subTest : LayoutTesterApplication.layoutGetters) {
+            compareScreen(subTest);
+            Integer subTests = numberOfSubTests.get(subTest);
+            if (subTests != null) {
+                for (int i = 1; i <= subTests; i++) {
+                    clickAndCompareScreen(subTest, "testButton" + i);
+                }
+            }
+            getNextButton().click();
+        }
+
+    }
+
+    /**
+     * @param elementId
+     *            the id of the element to focus
+     */
+    private void focusElementWithId(String elementId) {
+        // This should really be in TestBench
+        ((JavascriptExecutor) getDriver())
+                .executeScript("document.getElementById('" + elementId
+                        + "').focus()");
+    }
+
+    /**
+     * Clicks the button with the given id and compares the result to a
+     * screenshot named 'screenshotPrefix'-buttonCaption.
+     * 
+     * @param screenshotPrefix
+     * @param buttonId
+     * @throws Exception
+     */
+    private void clickAndCompareScreen(String screenshotPrefix, String buttonId)
+            throws Exception {
+        WebElement button = vaadinElementById(buttonId);
+        button.click();
+        if (needsDelayToStabilize(screenshotPrefix)) {
+            // Table does some extra layout phase and TestBench does not always
+            // take this into account, grabbing screenshots before the layout
+            // phase is done (see #12866).
+            sleep(200);
+        }
+        compareScreen(screenshotPrefix + "-" + sanitize(button.getText()));
+    }
+
+    private boolean needsDelayToStabilize(String screenshotPrefix) {
+        return tableOrIconsTests.contains(screenshotPrefix);
+    }
+
+    private String sanitize(String text) {
+        return text.replace("%", "pct").replaceAll("[^a-zA-Z0-9]", "-");
+    }
+
+    private WebElement getNextButton() {
+        return vaadinElementById(LayoutTesterApplication.NEXT_BUTTON_ID);
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
index 7764589ff7..04cee2d68d 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
@@ -127,6 +127,10 @@ public class VerticalLayoutTests extends AbstractLayoutTests {
         final Button replaceButton = new Button("Test replace");
         final Button moveButton = new Button("Test move");
         final Button removeButton = new Button("Test remove");
+        addButton.setId("testButton1");
+        replaceButton.setId("testButton2");
+        moveButton.setId("testButton3");
+        removeButton.setId("testButton4");
 
         replaceButton.setEnabled(false);
         moveButton.setEnabled(false);
@@ -196,7 +200,9 @@ public class VerticalLayoutTests extends AbstractLayoutTests {
         final Button biggerButton = new Button("full size");
         final Button smallerButton = new Button("200 px width");
         final Button originalButton = new Button("undefined size and add");
-
+        biggerButton.setId("testButton1");
+        smallerButton.setId("testButton2");
+        originalButton.setId("testButton3");
         vlo.addComponent(biggerButton);
         vlo.addComponent(smallerButton);
         vlo.addComponent(originalButton);
@@ -265,6 +271,11 @@ public class VerticalLayoutTests extends AbstractLayoutTests {
         final Button button3 = new Button("Set fixed width and height 75%");
         final Button button4 = new Button("Set size full");
 
+        button1.setId("testButton1");
+        button2.setId("testButton2");
+        button3.setId("testButton3");
+        button4.setId("testButton4");
+
         vlo.addComponent(button1);
         vlo.addComponent(button2);
         vlo.addComponent(button3);
@@ -344,8 +355,11 @@ public class VerticalLayoutTests extends AbstractLayoutTests {
         c2.setSizeFull();
 
         final Button button1 = new Button("Expand to 1/undefined");
+        button1.setId("testButton1");
         final Button button2 = new Button("Expand to 0.5/0.5");
+        button2.setId("testButton2");
         final Button button3 = new Button("Expand to 0.75/0.25");
+        button3.setId("testButton3");
 
         vlo.addComponent(button1);
         vlo.addComponent(button2);
@@ -460,6 +474,10 @@ public class VerticalLayoutTests extends AbstractLayoutTests {
         final Button button2 = new Button("Set spacing on");
         final Button button3 = new Button("Set margin off");
         final Button button4 = new Button("Set spacing off");
+        button1.setId("testButton1");
+        button2.setId("testButton2");
+        button3.setId("testButton3");
+        button4.setId("testButton4");
 
         vlo.addComponent(button1);
         vlo.addComponent(button2);
-- 
cgit v1.2.3


From 137642958a62dfc081e2b7242318f8ce4ef59304 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Thu, 31 Oct 2013 14:30:16 +0200
Subject: Fix compilation error in test

Change-Id: I1ad693fdc55becd4b4e620b8549d824b4496b908
---
 .../com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java b/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java
index ef092d2539..5b68e04144 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java
@@ -114,7 +114,7 @@ public class LayoutTesterApplication extends AbstractTestCase {
     private NativeSelect getLayoutTypeSelect() {
         if (layoutSelector == null) {
             layoutSelector = new NativeSelect();
-            layoutSelector.setId(LAYOUT_SELECT);
+            layoutSelector.setId(LAYOUT_SELECT_ID);
             layoutSelector.addItem(VerticalLayout.class);
             layoutSelector.addItem(HorizontalLayout.class);
             layoutSelector.addItem(GridLayout.class);
-- 
cgit v1.2.3


From 7b120fc196a0517c95a5d8f93c4b72c5b9a72a0b Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Thu, 31 Oct 2013 12:39:12 +0200
Subject: Tests for validating reconnect works for streaming and websockets
 (#12868,#12853,#12852)

Change-Id: I0e1e51291e9275a78737ad0e70e63b75ef993a63
---
 uitest/ivy.xml                                     |   3 +-
 uitest/src/com/vaadin/tests/push/BasicPush.java    |  70 +++++++-----
 .../src/com/vaadin/tests/push/BasicPushTest.java   |  50 ++++++---
 .../com/vaadin/tests/push/PushReconnectTest.java   | 123 +++++++++++++++++++++
 .../vaadin/tests/push/StreamingReconnectTest.java  |  25 +++++
 .../vaadin/tests/push/WebsocketReconnectTest.java  |  36 ++++++
 .../src/com/vaadin/tests/tb3/AbstractTB3Test.java  |   2 +-
 .../tests/tb3/MultiBrowserTestWithProxy.java       |  92 +++++++++++++++
 .../vaadin/tests/tb3/PrivateTB3Configuration.java  |   9 +-
 9 files changed, 362 insertions(+), 48 deletions(-)
 create mode 100644 uitest/src/com/vaadin/tests/push/PushReconnectTest.java
 create mode 100755 uitest/src/com/vaadin/tests/push/StreamingReconnectTest.java
 create mode 100644 uitest/src/com/vaadin/tests/push/WebsocketReconnectTest.java
 create mode 100755 uitest/src/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java

(limited to 'uitest')

diff --git a/uitest/ivy.xml b/uitest/ivy.xml
index d75a591f94..9c86b2b68c 100644
--- a/uitest/ivy.xml
+++ b/uitest/ivy.xml
@@ -73,7 +73,8 @@
 
         <dependency org="junit" name="junit" rev="4.11"
             conf="build,ide -> default" />
-
+        <dependency org="com.jcraft" name="jsch" rev="0.1.50"
+            conf="ide, build->default" />
         <dependency org="commons-codec" name="commons-codec"
             rev="1.5" conf="build,ide->default" />
         <dependency org="commons-io" name="commons-io" rev="2.2"
diff --git a/uitest/src/com/vaadin/tests/push/BasicPush.java b/uitest/src/com/vaadin/tests/push/BasicPush.java
index d6c45a2ed0..f9e29492dd 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPush.java
+++ b/uitest/src/com/vaadin/tests/push/BasicPush.java
@@ -30,6 +30,16 @@ import com.vaadin.ui.Label;
 @Push
 public class BasicPush extends AbstractTestUI {
 
+    public static final String CLIENT_COUNTER_ID = "clientCounter";
+
+    public static final String STOP_TIMER_ID = "stopTimer";
+
+    public static final String START_TIMER_ID = "startTimer";
+
+    public static final String SERVER_COUNTER_ID = "serverCounter";
+
+    public static final String INCREMENT_BUTTON_ID = "clientCounter";
+
     private ObjectProperty<Integer> counter = new ObjectProperty<Integer>(0);
 
     private ObjectProperty<Integer> counter2 = new ObjectProperty<Integer>(0);
@@ -48,15 +58,19 @@ public class BasicPush extends AbstractTestUI {
          */
         Label lbl = new Label(counter);
         lbl.setCaption("Client counter (click 'increment' to update):");
+        lbl.setId(CLIENT_COUNTER_ID);
         addComponent(lbl);
 
-        addComponent(new Button("Increment", new Button.ClickListener() {
+        Button incrementButton = new Button("Increment",
+                new Button.ClickListener() {
 
-            @Override
-            public void buttonClick(ClickEvent event) {
-                counter.setValue(counter.getValue() + 1);
-            }
-        }));
+                    @Override
+                    public void buttonClick(ClickEvent event) {
+                        counter.setValue(counter.getValue() + 1);
+                    }
+                });
+        incrementButton.setId(INCREMENT_BUTTON_ID);
+        addComponent(incrementButton);
 
         spacer();
 
@@ -65,33 +79,37 @@ public class BasicPush extends AbstractTestUI {
          */
         lbl = new Label(counter2);
         lbl.setCaption("Server counter (updates each 3s by server thread) :");
+        lbl.setId(SERVER_COUNTER_ID);
         addComponent(lbl);
 
-        addComponent(new Button("Start timer", new Button.ClickListener() {
-
-            @Override
-            public void buttonClick(ClickEvent event) {
-                counter2.setValue(0);
-                if (task != null) {
-                    task.cancel();
-                }
-                task = new TimerTask() {
+        Button startTimer = new Button("Start timer",
+                new Button.ClickListener() {
 
                     @Override
-                    public void run() {
-                        access(new Runnable() {
+                    public void buttonClick(ClickEvent event) {
+                        counter2.setValue(0);
+                        if (task != null) {
+                            task.cancel();
+                        }
+                        task = new TimerTask() {
+
                             @Override
                             public void run() {
-                                counter2.setValue(counter2.getValue() + 1);
+                                access(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        counter2.setValue(counter2.getValue() + 1);
+                                    }
+                                });
                             }
-                        });
+                        };
+                        timer.scheduleAtFixedRate(task, 3000, 3000);
                     }
-                };
-                timer.scheduleAtFixedRate(task, 3000, 3000);
-            }
-        }));
+                });
+        startTimer.setId(START_TIMER_ID);
+        addComponent(startTimer);
 
-        addComponent(new Button("Stop timer", new Button.ClickListener() {
+        Button stopTimer = new Button("Stop timer", new Button.ClickListener() {
             @Override
             public void buttonClick(ClickEvent event) {
                 if (task != null) {
@@ -99,7 +117,9 @@ public class BasicPush extends AbstractTestUI {
                     task = null;
                 }
             }
-        }));
+        });
+        stopTimer.setId(STOP_TIMER_ID);
+        addComponent(stopTimer);
     }
 
     @Override
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushTest.java b/uitest/src/com/vaadin/tests/push/BasicPushTest.java
index 57af8524bc..ef40ae09dc 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushTest.java
+++ b/uitest/src/com/vaadin/tests/push/BasicPushTest.java
@@ -19,6 +19,7 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.tests.tb3.AbstractTB3Test;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 public abstract class BasicPushTest extends MultiBrowserTest {
@@ -30,15 +31,13 @@ public abstract class BasicPushTest extends MultiBrowserTest {
         // Test client initiated push
         Assert.assertEquals(0, getClientCounter());
         getIncrementButton().click();
-        Assert.assertEquals(
-                "Client counter not incremented by button click", 1,
-                getClientCounter());
+        Assert.assertEquals("Client counter not incremented by button click",
+                1, getClientCounter());
         getIncrementButton().click();
         getIncrementButton().click();
         getIncrementButton().click();
-        Assert.assertEquals(
-                "Four clicks should have incremented counter to 4", 4,
-                getClientCounter());
+        Assert.assertEquals("Four clicks should have incremented counter to 4",
+                4, getClientCounter());
 
         // Test server initiated push
         getServerCounterStartButton().click();
@@ -63,30 +62,47 @@ public abstract class BasicPushTest extends MultiBrowserTest {
     }
 
     private int getServerCounter() {
-        return Integer.parseInt(getServerCounterElement().getText());
+        return getServerCounter(this);
     }
 
     private int getClientCounter() {
-        return Integer.parseInt(getClientCounterElement().getText());
+        return getClientCounter(this);
     }
 
-    private WebElement getServerCounterElement() {
-        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VLabel[0]");
+    public static int getClientCounter(AbstractTB3Test t) {
+        WebElement clientCounterElem = t
+                .vaadinElementById(BasicPush.CLIENT_COUNTER_ID);
+        return Integer.parseInt(clientCounterElem.getText());
     }
 
-    private WebElement getServerCounterStartButton() {
-        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[5]/VButton[0]/domChild[0]/domChild[0]");
+    private WebElement getIncrementButton() {
+        return getIncrementButton(this);
     }
 
     private WebElement getServerCounterStopButton() {
-        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[6]/VButton[0]/domChild[0]/domChild[0]");
+        return getServerCounterStopButton(this);
     }
 
-    private WebElement getIncrementButton() {
-        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]/domChild[0]");
+    private WebElement getServerCounterStartButton() {
+        return getServerCounterStartButton(this);
+    }
+
+    public static int getServerCounter(AbstractTB3Test t) {
+        WebElement serverCounterElem = t
+                .vaadinElementById(BasicPush.SERVER_COUNTER_ID);
+        return Integer.parseInt(serverCounterElem.getText());
     }
 
-    private WebElement getClientCounterElement() {
-        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VLabel[0]");
+    public static WebElement getServerCounterStartButton(AbstractTB3Test t) {
+        return t.vaadinElementById(BasicPush.START_TIMER_ID);
     }
+
+    public static WebElement getServerCounterStopButton(AbstractTB3Test t) {
+        return t.vaadinElementById(BasicPush.STOP_TIMER_ID);
+    }
+
+    public static WebElement getIncrementButton(AbstractTB3Test t) {
+        return t.vaadinElementById(BasicPush.INCREMENT_BUTTON_ID);
+    }
+
 }
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/push/PushReconnectTest.java b/uitest/src/com/vaadin/tests/push/PushReconnectTest.java
new file mode 100644
index 0000000000..951e1eb576
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/PushReconnectTest.java
@@ -0,0 +1,123 @@
+/*
+ * 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.push;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.ui.ExpectedCondition;
+
+import com.vaadin.tests.tb3.MultiBrowserTestWithProxy;
+
+public abstract class PushReconnectTest extends MultiBrowserTestWithProxy {
+
+    @Test
+    public void testShortDisconnect() throws Exception {
+        setDebug(true);
+        openTestURL();
+        startTimer();
+        waitUntilServerCounterChanges();
+        disconnectProxy();
+        Thread.sleep(1000);
+        connectProxy();
+        waitUntilServerCounterChanges();
+    }
+
+    @Test
+    public void testUserActionWhileDisconnected() throws Exception {
+        setDebug(true);
+        openTestURL();
+        startTimer();
+        waitUntilServerCounterChanges();
+        disconnectProxy();
+        Assert.assertEquals(0, getClientCounter());
+        getIncrementClientCounterButton().click();
+        // No change while disconnected
+        Assert.assertEquals(0, getClientCounter());
+        Thread.sleep(1000);
+        connectProxy();
+        waitUntilServerCounterChanges();
+        // The change should have appeared when reconnected
+        Assert.assertEquals(1, getClientCounter());
+    }
+
+    @Test
+    public void testLongDisconnect() throws Exception {
+        setDebug(true);
+        openTestURL();
+        startTimer();
+        waitUntilServerCounterChanges();
+        disconnectProxy();
+        Thread.sleep(12000);
+        connectProxy();
+        waitUntilServerCounterChanges();
+    }
+
+    @Test
+    public void testMultipleDisconnects() throws Exception {
+        setDebug(true);
+        openTestURL();
+        startTimer();
+        waitUntilServerCounterChanges();
+        for (int i = 0; i < 5; i++) {
+            disconnectProxy();
+            Thread.sleep(1000);
+            connectProxy();
+            waitUntilServerCounterChanges();
+        }
+    }
+
+    @Test
+    public void testMultipleQuickReconnects() throws Exception {
+        setDebug(true);
+        openTestURL();
+        startTimer();
+        waitUntilServerCounterChanges();
+        for (int i = 0; i < 50; i++) {
+            disconnectProxy();
+            Thread.sleep(50);
+            connectProxy();
+            Thread.sleep(50);
+        }
+        waitUntilServerCounterChanges();
+        waitUntilServerCounterChanges();
+    }
+
+    private int getClientCounter() {
+        return BasicPushTest.getClientCounter(this);
+    }
+
+    private WebElement getIncrementClientCounterButton() {
+        return BasicPushTest.getIncrementButton(this);
+    }
+
+    private void waitUntilServerCounterChanges() {
+        final int counter = BasicPushTest.getServerCounter(this);
+        waitUntil(new ExpectedCondition<Boolean>() {
+
+            @Override
+            public Boolean apply(WebDriver input) {
+                return BasicPushTest.getServerCounter(PushReconnectTest.this) > counter;
+            }
+        });
+    }
+
+    private void startTimer() {
+        BasicPushTest.getServerCounterStartButton(this).click();
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/push/StreamingReconnectTest.java b/uitest/src/com/vaadin/tests/push/StreamingReconnectTest.java
new file mode 100755
index 0000000000..24dfdd8ba1
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/StreamingReconnectTest.java
@@ -0,0 +1,25 @@
+/*
+ * 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.push;
+
+public class StreamingReconnectTest extends PushReconnectTest {
+
+    @Override
+    protected Class<?> getUIClass() {
+        return BasicPushStreaming.class;
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/push/WebsocketReconnectTest.java b/uitest/src/com/vaadin/tests/push/WebsocketReconnectTest.java
new file mode 100644
index 0000000000..075a18c0e7
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/WebsocketReconnectTest.java
@@ -0,0 +1,36 @@
+/*
+ * 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.push;
+
+import java.util.List;
+
+import org.openqa.selenium.remote.DesiredCapabilities;
+
+import com.vaadin.tests.tb3.WebsocketTest;
+
+public class WebsocketReconnectTest extends PushReconnectTest {
+
+    @Override
+    public List<DesiredCapabilities> getBrowsersToTest() {
+        return WebsocketTest.getWebsocketBrowsers();
+    }
+
+    @Override
+    protected Class<?> getUIClass() {
+        return BasicPushWebsocket.class;
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
index 218c532beb..f9df2f0a71 100644
--- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -197,7 +197,7 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
      * 
      * @return The port teh test is running on, by default 8888
      */
-    protected abstract String getDeploymentPort();
+    protected abstract int getDeploymentPort();
 
     /**
      * Produces a collection of browsers to run the test on. This method is
diff --git a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java
new file mode 100755
index 0000000000..d3488a98c4
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java
@@ -0,0 +1,92 @@
+/*
+ * 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.tb3;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.After;
+import org.junit.Before;
+
+import com.jcraft.jsch.JSch;
+import com.jcraft.jsch.JSchException;
+import com.jcraft.jsch.Session;
+
+public abstract class MultiBrowserTestWithProxy extends MultiBrowserTest {
+
+    private static AtomicInteger availablePort = new AtomicInteger(2000);
+    private Session proxySession;
+    private Integer proxyPort = null;
+
+    @Before
+    public void setupInitialProxy() throws JSchException {
+        connectProxy();
+    }
+
+    @After
+    public void teardownProxy() {
+        disconnectProxy();
+    }
+
+    protected Integer getProxyPort() {
+        if (proxyPort == null) {
+            // Assumes we can use any port >= 2000
+            proxyPort = availablePort.addAndGet(1);
+        }
+        return proxyPort;
+    }
+
+    /**
+     * Disconnects the proxy if active
+     */
+    protected void disconnectProxy() {
+        if (proxySession == null) {
+            return;
+        }
+        proxySession.disconnect();
+        proxySession = null;
+    }
+
+    /**
+     * Ensure the proxy is active. Does nothing if the proxy is already active.
+     */
+    protected void connectProxy() throws JSchException {
+        if (proxySession != null) {
+            return;
+        }
+
+        createProxy(getProxyPort());
+    }
+
+    private void createProxy(int proxyPort) throws JSchException {
+        JSch j = new JSch();
+        String keyFile = System.getProperty("sshkey.file");
+        if (keyFile == null) {
+            keyFile = "~/.ssh/id_rsa";
+        }
+        j.addIdentity(keyFile);
+        proxySession = j.getSession("localhost");
+        proxySession.setConfig("StrictHostKeyChecking", "no");
+        proxySession.setPortForwardingL("0.0.0.0", proxyPort,
+                super.getDeploymentHostname(), super.getDeploymentPort());
+        proxySession.connect();
+    }
+
+    @Override
+    protected String getBaseURL() {
+        return "http://" + getDeploymentHostname() + ":" + getProxyPort();
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java b/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
index a2922af28f..caa35732d6 100644
--- a/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
+++ b/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
@@ -90,11 +90,12 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
     }
 
     @Override
-    protected String getDeploymentPort() {
-        String port = getProperty(PORT_PROPERTY);
+    protected int getDeploymentPort() {
+        String portString = getProperty(PORT_PROPERTY);
 
-        if (port == null || "".equals(port)) {
-            port = "8888";
+        int port = 8888;
+        if (portString != null && !"".equals(portString)) {
+            port = Integer.parseInt(portString);
         }
 
         return port;
-- 
cgit v1.2.3


From 1cc4dc18fab893ab584d4ac3bf8219933369a915 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Thu, 31 Oct 2013 19:22:44 +0200
Subject: Fix duplicate id issue in test and test more corner cases

Change-Id: I4bacfe7353968df7b0f1a8786ae4e488dffa3565
---
 uitest/src/com/vaadin/tests/push/BasicPush.java     |  2 +-
 .../com/vaadin/tests/push/PushReconnectTest.java    | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/push/BasicPush.java b/uitest/src/com/vaadin/tests/push/BasicPush.java
index f9e29492dd..8e8f418c5f 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPush.java
+++ b/uitest/src/com/vaadin/tests/push/BasicPush.java
@@ -38,7 +38,7 @@ public class BasicPush extends AbstractTestUI {
 
     public static final String SERVER_COUNTER_ID = "serverCounter";
 
-    public static final String INCREMENT_BUTTON_ID = "clientCounter";
+    public static final String INCREMENT_BUTTON_ID = "incrementCounter";
 
     private ObjectProperty<Integer> counter = new ObjectProperty<Integer>(0);
 
diff --git a/uitest/src/com/vaadin/tests/push/PushReconnectTest.java b/uitest/src/com/vaadin/tests/push/PushReconnectTest.java
index 951e1eb576..8f131a5051 100644
--- a/uitest/src/com/vaadin/tests/push/PushReconnectTest.java
+++ b/uitest/src/com/vaadin/tests/push/PushReconnectTest.java
@@ -53,6 +53,15 @@ public abstract class PushReconnectTest extends MultiBrowserTestWithProxy {
         waitUntilServerCounterChanges();
         // The change should have appeared when reconnected
         Assert.assertEquals(1, getClientCounter());
+
+        // IE has problems with another reconnect
+        disconnectProxy();
+        getIncrementClientCounterButton().click();
+        Assert.assertEquals(1, getClientCounter());
+        Thread.sleep(1000);
+        connectProxy();
+        waitUntilServerCounterChanges();
+        Assert.assertEquals(2, getClientCounter());
     }
 
     @Test
@@ -67,6 +76,18 @@ public abstract class PushReconnectTest extends MultiBrowserTestWithProxy {
         waitUntilServerCounterChanges();
     }
 
+    @Test
+    public void testReallyLongDisconnect() throws Exception {
+        setDebug(true);
+        openTestURL();
+        startTimer();
+        waitUntilServerCounterChanges();
+        disconnectProxy();
+        Thread.sleep(120000);
+        connectProxy();
+        waitUntilServerCounterChanges();
+    }
+
     @Test
     public void testMultipleDisconnects() throws Exception {
         setDebug(true);
-- 
cgit v1.2.3


From c21a6848a2b7327eb0377b44b2479f03fecaf23e Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Thu, 31 Oct 2013 19:27:40 +0200
Subject: Prepare for Safari 7 testing (#5288)

Change-Id: I8868d9bd5e6dcc2b6ece404460700f00e6f2004e
---
 uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java  | 1 +
 uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
index f9df2f0a71..44cf069402 100644
--- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -650,6 +650,7 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
          */
         public static DesiredCapabilities safari(int version) {
             DesiredCapabilities c = DesiredCapabilities.safari();
+            c.setPlatform(Platform.MAC);
             c.setVersion("" + version);
             return c;
         }
diff --git a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
index 040d0156a3..e8a974343b 100644
--- a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
+++ b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
@@ -40,7 +40,7 @@ import org.openqa.selenium.remote.DesiredCapabilities;
  */
 public abstract class MultiBrowserTest extends PrivateTB3Configuration {
 
-    public static final int TESTED_SAFARI_VERSION = 6;
+    public static final int TESTED_SAFARI_VERSION = 7;
     public static final int TESTED_CHROME_VERSION = 29;
     public static final int TESTED_FIREFOX_VERSION = 24;
 
@@ -52,7 +52,7 @@ public abstract class MultiBrowserTest extends PrivateTB3Configuration {
         allBrowsers.add(BrowserUtil.ie(11));
         allBrowsers.add(BrowserUtil.firefox(TESTED_FIREFOX_VERSION));
         // Uncomment once we have the capability to run on Safari 6
-        // allBrowsers.add(safari(TESTED_SAFARI_VERSION));
+        // allBrowsers.add(BrowserUtil.safari(TESTED_SAFARI_VERSION));
         allBrowsers.add(BrowserUtil.chrome(TESTED_CHROME_VERSION));
         // Re-enable this when it is possible to run on a modern Opera version
         // (15+)
-- 
cgit v1.2.3


From 7615fd1d1b248a612aa796f7621321040a795a55 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Thu, 31 Oct 2013 21:35:25 +0200
Subject: Made test more stable and added Firefox reconnect test (#12492)

Waits longer for push message as at least Firefox has some kind of built in back off for websocket reconnects

Change-Id: Iaab2e09e8364f0b6247b3b39c19be439a4995800
---
 .../com/vaadin/tests/push/PushReconnectTest.java   | 26 +++++++++++++++--
 .../src/com/vaadin/tests/tb3/AbstractTB3Test.java  | 34 +++++++++++++++++++---
 .../tests/tb3/MultiBrowserTestWithProxy.java       | 26 +++++++++++++----
 3 files changed, 73 insertions(+), 13 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/push/PushReconnectTest.java b/uitest/src/com/vaadin/tests/push/PushReconnectTest.java
index 8f131a5051..76a0b547da 100644
--- a/uitest/src/com/vaadin/tests/push/PushReconnectTest.java
+++ b/uitest/src/com/vaadin/tests/push/PushReconnectTest.java
@@ -37,6 +37,26 @@ public abstract class PushReconnectTest extends MultiBrowserTestWithProxy {
         waitUntilServerCounterChanges();
     }
 
+    @Test
+    public void testUserActionWhileDisconnectedWithDelay() throws Exception {
+        setDebug(true);
+        openTestURL();
+        startTimer();
+        waitUntilServerCounterChanges();
+        disconnectProxy();
+        Assert.assertEquals(0, getClientCounter());
+        getIncrementClientCounterButton().click();
+        // No change while disconnected
+        Assert.assertEquals(0, getClientCounter());
+        // Firefox sends extra onopen calls after a while, which breaks
+        // everything
+        Thread.sleep(10000);
+        connectProxy();
+        waitUntilServerCounterChanges();
+        // The change should have appeared when reconnected
+        Assert.assertEquals(1, getClientCounter());
+    }
+
     @Test
     public void testUserActionWhileDisconnected() throws Exception {
         setDebug(true);
@@ -110,9 +130,9 @@ public abstract class PushReconnectTest extends MultiBrowserTestWithProxy {
         waitUntilServerCounterChanges();
         for (int i = 0; i < 50; i++) {
             disconnectProxy();
-            Thread.sleep(50);
+            Thread.sleep(100);
             connectProxy();
-            Thread.sleep(50);
+            Thread.sleep(100);
         }
         waitUntilServerCounterChanges();
         waitUntilServerCounterChanges();
@@ -134,7 +154,7 @@ public abstract class PushReconnectTest extends MultiBrowserTestWithProxy {
             public Boolean apply(WebDriver input) {
                 return BasicPushTest.getServerCounter(PushReconnectTest.this) > counter;
             }
-        });
+        }, 30);
     }
 
     private void startTimer() {
diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
index 44cf069402..e6acad780f 100644
--- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -306,18 +306,31 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
     }
 
     /**
-     * Waits a short while for the given condition to become true. Use e.g. as
+     * Waits up to 10s for the given condition to become true. Use e.g. as
      * {@link #waitUntil(ExpectedConditions.textToBePresentInElement(by, text))}
      * 
      * @param condition
      *            the condition to wait for to become true
      */
     protected void waitUntil(ExpectedCondition<Boolean> condition) {
-        new WebDriverWait(driver, 10).until(condition);
+        waitUntil(condition, 10);
     }
 
     /**
-     * Waits a short while for the given condition to become false. Use e.g. as
+     * Waits the given number of seconds for the given condition to become true.
+     * Use e.g. as {@link
+     * #waitUntil(ExpectedConditions.textToBePresentInElement(by, text))}
+     * 
+     * @param condition
+     *            the condition to wait for to become true
+     */
+    protected void waitUntil(ExpectedCondition<Boolean> condition,
+            long timeoutInSeconds) {
+        new WebDriverWait(driver, timeoutInSeconds).until(condition);
+    }
+
+    /**
+     * Waits up to 10s for the given condition to become false. Use e.g. as
      * {@link #waitUntilNot(ExpectedConditions.textToBePresentInElement(by,
      * text))}
      * 
@@ -325,7 +338,20 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
      *            the condition to wait for to become false
      */
     protected void waitUntilNot(ExpectedCondition<Boolean> condition) {
-        new WebDriverWait(driver, 10).until(ExpectedConditions.not(condition));
+        waitUntilNot(condition, 10);
+    }
+
+    /**
+     * Waits the given number of seconds for the given condition to become
+     * false. Use e.g. as {@link
+     * #waitUntilNot(ExpectedConditions.textToBePresentInElement(by, text))}
+     * 
+     * @param condition
+     *            the condition to wait for to become false
+     */
+    protected void waitUntilNot(ExpectedCondition<Boolean> condition,
+            long timeoutInSeconds) {
+        waitUntil(ExpectedConditions.not(condition), timeoutInSeconds);
     }
 
     protected void waitForElementToBePresent(By by) {
diff --git a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java
index d3488a98c4..0bb76889a0 100755
--- a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java
+++ b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java
@@ -15,6 +15,7 @@
  */
 package com.vaadin.tests.tb3;
 
+import java.io.File;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.After;
@@ -29,6 +30,11 @@ public abstract class MultiBrowserTestWithProxy extends MultiBrowserTest {
     private static AtomicInteger availablePort = new AtomicInteger(2000);
     private Session proxySession;
     private Integer proxyPort = null;
+    private JSch jsch;
+    private static String sshDir = System.getProperty("user.home") + "/.ssh/";
+    private String[] publicKeys = new String[] {
+            System.getProperty("sshkey.file"), sshDir + "id_rsa",
+            sshDir + "id_dsa", sshDir + "id_rsa2" };
 
     @Before
     public void setupInitialProxy() throws JSchException {
@@ -71,13 +77,21 @@ public abstract class MultiBrowserTestWithProxy extends MultiBrowserTest {
     }
 
     private void createProxy(int proxyPort) throws JSchException {
-        JSch j = new JSch();
-        String keyFile = System.getProperty("sshkey.file");
-        if (keyFile == null) {
-            keyFile = "~/.ssh/id_rsa";
+        if (jsch == null) {
+            jsch = new JSch();
+
+            String keyFile = null;
+            for (String publicKey : publicKeys) {
+                if (publicKey != null) {
+                    if (new File(publicKey).exists()) {
+                        keyFile = publicKey;
+                        break;
+                    }
+                }
+            }
+            jsch.addIdentity(keyFile);
         }
-        j.addIdentity(keyFile);
-        proxySession = j.getSession("localhost");
+        proxySession = jsch.getSession("localhost");
         proxySession.setConfig("StrictHostKeyChecking", "no");
         proxySession.setPortForwardingL("0.0.0.0", proxyPort,
                 super.getDeploymentHostname(), super.getDeploymentPort());
-- 
cgit v1.2.3


From b47915f8d5eb955302c9ce44c1f576c39d888cef Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 1 Nov 2013 12:54:05 +0200
Subject: Extracted test to separate class

Change-Id: Ibfad0180e93e7f74b91427761b40c86938044c50
---
 .../com/vaadin/tests/push/EnableDisablePush.java   | 55 -----------------
 .../vaadin/tests/push/EnableDisablePushTest.java   | 72 ++++++++++++++++++++++
 2 files changed, 72 insertions(+), 55 deletions(-)
 create mode 100644 uitest/src/com/vaadin/tests/push/EnableDisablePushTest.java

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/push/EnableDisablePush.java b/uitest/src/com/vaadin/tests/push/EnableDisablePush.java
index 50dab43667..ac37e75fea 100644
--- a/uitest/src/com/vaadin/tests/push/EnableDisablePush.java
+++ b/uitest/src/com/vaadin/tests/push/EnableDisablePush.java
@@ -1,74 +1,19 @@
 package com.vaadin.tests.push;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.Date;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
-import org.openqa.selenium.WebElement;
-
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.communication.PushMode;
 import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.UIDetachedException;
 
 public class EnableDisablePush extends AbstractTestUI {
 
-    public static class EnableDisablePushTest extends MultiBrowserTest {
-        @Test
-        public void testEnablePushWhenUsingPolling() throws Exception {
-            openTestURL();
-
-            assertEquals("1. Push enabled", getLogRow(0));
-
-            getDisablePushButton().click();
-            assertEquals("3. Push disabled", getLogRow(0));
-
-            getEnablePollButton().click();
-            assertEquals("5. Poll enabled", getLogRow(0));
-
-            getEnablePushButton().click();
-            assertEquals("7. Push enabled", getLogRow(0));
-
-            getDisablePollButton().click();
-            assertEquals("9. Poll disabled", getLogRow(0));
-
-            getDisablePushButtonAndReenableFromBackground().click();
-            Thread.sleep(2500);
-            assertEquals("16. Polling disabled, push enabled", getLogRow(0));
-
-            getDisablePushButton().click();
-            assertEquals("18. Push disabled", getLogRow(0));
-        }
-
-        private WebElement getDisablePushButton() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VButton[0]");
-        }
-
-        private WebElement getEnablePushButton() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VButton[0]");
-        }
-
-        private WebElement getDisablePollButton() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]");
-        }
-
-        private WebElement getEnablePollButton() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]");
-        }
-
-        private WebElement getDisablePushButtonAndReenableFromBackground() {
-            return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VButton[0]");
-        }
-
-    }
-
     private int c = 0;
 
     private Log log = new Log(15);
diff --git a/uitest/src/com/vaadin/tests/push/EnableDisablePushTest.java b/uitest/src/com/vaadin/tests/push/EnableDisablePushTest.java
new file mode 100644
index 0000000000..275b6d5b53
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/push/EnableDisablePushTest.java
@@ -0,0 +1,72 @@
+/*
+ * 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.push;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class EnableDisablePushTest extends MultiBrowserTest {
+    @Test
+    public void testEnablePushWhenUsingPolling() throws Exception {
+        openTestURL();
+
+        assertEquals("1. Push enabled", getLogRow(0));
+
+        getDisablePushButton().click();
+        assertEquals("3. Push disabled", getLogRow(0));
+
+        getEnablePollButton().click();
+        assertEquals("5. Poll enabled", getLogRow(0));
+
+        getEnablePushButton().click();
+        assertEquals("7. Push enabled", getLogRow(0));
+
+        getDisablePollButton().click();
+        assertEquals("9. Poll disabled", getLogRow(0));
+
+        getDisablePushButtonAndReenableFromBackground().click();
+        Thread.sleep(2500);
+        assertEquals("16. Polling disabled, push enabled", getLogRow(0));
+
+        getDisablePushButton().click();
+        assertEquals("18. Push disabled", getLogRow(0));
+    }
+
+    private WebElement getDisablePushButton() {
+        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VButton[0]");
+    }
+
+    private WebElement getEnablePushButton() {
+        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VButton[0]");
+    }
+
+    private WebElement getDisablePollButton() {
+        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VButton[0]");
+    }
+
+    private WebElement getEnablePollButton() {
+        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VButton[0]");
+    }
+
+    private WebElement getDisablePushButtonAndReenableFromBackground() {
+        return vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VButton[0]");
+    }
+
+}
\ No newline at end of file
-- 
cgit v1.2.3


From e07e674527bd7f0d787169ef024c38847316b76f Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 1 Nov 2013 12:58:33 +0200
Subject: Remove possibility to use static inner classes for tests

Change-Id: I461568918bc09bd7a09abbf9c4a34f1a5f3b997f
---
 uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
index e6acad780f..d4eed99f19 100644
--- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -19,7 +19,6 @@ package com.vaadin.tests.tb3;
 import java.net.URL;
 import java.util.Collections;
 import java.util.List;
-import java.util.logging.Logger;
 
 import org.junit.After;
 import org.junit.Before;
@@ -507,14 +506,6 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
             }
         } catch (Exception e) {
         }
-        Class<?> enclosingClass = getClass().getEnclosingClass();
-        if (enclosingClass != null) {
-            if (UI.class.isAssignableFrom(enclosingClass)) {
-                Logger.getLogger(getClass().getName())
-                        .severe("Test is an static inner class to the UI. This will no longer be supported in the future. The test should be named UIClassTest and reside in the same package as the UI");
-                return enclosingClass;
-            }
-        }
         throw new RuntimeException(
                 "Could not determine UI class. Ensure the test is named UIClassTest and is in the same package as the UIClass");
     }
-- 
cgit v1.2.3


From a3e176c5607e43cf72c557c52287d6b68e4b5a5c Mon Sep 17 00:00:00 2001
From: Juho Nurminen <juho@vaadin.com>
Date: Tue, 29 Oct 2013 17:26:22 +0200
Subject: Changed v-customcomponent overflow to visible (#12482)

Change-Id: I1e82337e719d16abce2c7f2060162af81f9192ea
---
 .../base/customcomponent/customcomponent.scss      |  1 -
 .../components/customfield/CustomFieldSize.java    | 65 ++++++++++++++++++++++
 .../customfield/CustomFieldSizeTest.java           | 36 ++++++++++++
 3 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 uitest/src/com/vaadin/tests/components/customfield/CustomFieldSize.java
 create mode 100644 uitest/src/com/vaadin/tests/components/customfield/CustomFieldSizeTest.java

(limited to 'uitest')

diff --git a/WebContent/VAADIN/themes/base/customcomponent/customcomponent.scss b/WebContent/VAADIN/themes/base/customcomponent/customcomponent.scss
index 461e1b1246..d672254a86 100644
--- a/WebContent/VAADIN/themes/base/customcomponent/customcomponent.scss
+++ b/WebContent/VAADIN/themes/base/customcomponent/customcomponent.scss
@@ -1,7 +1,6 @@
 @mixin base-customcomponent($primaryStyleName : v-customcomponent) {
 
 .#{$primaryStyleName} {
-	overflow: hidden;
 }
 
 }
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/components/customfield/CustomFieldSize.java b/uitest/src/com/vaadin/tests/components/customfield/CustomFieldSize.java
new file mode 100644
index 0000000000..a3e19513b0
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/customfield/CustomFieldSize.java
@@ -0,0 +1,65 @@
+/*
+ * 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.customfield;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomField;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+
+/**
+ * 
+ * @since
+ * @author Vaadin Ltd
+ */
+public class CustomFieldSize extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        VerticalLayout layout = new VerticalLayout();
+        setContent(layout);
+        layout.setWidth("50px");
+
+        layout.addComponent(new TextField());
+
+        layout.addComponent(new CustomField<String>() {
+
+            @Override
+            protected Component initContent() {
+                return new TextField();
+            }
+
+            @Override
+            public Class<? extends String> getType() {
+                return String.class;
+            }
+
+        });
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Any part of a TextField wrapped in a CustomField should not be cut off even when the dimensions of the TextField exceed those of the CustomField";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 12482;
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/customfield/CustomFieldSizeTest.java b/uitest/src/com/vaadin/tests/components/customfield/CustomFieldSizeTest.java
new file mode 100644
index 0000000000..c47ec0b792
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/customfield/CustomFieldSizeTest.java
@@ -0,0 +1,36 @@
+/*
+ * 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.customfield;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+/**
+ * 
+ * @since
+ * @author Vaadin Ltd
+ */
+public class CustomFieldSizeTest extends MultiBrowserTest {
+
+    @Test
+    public void checkScreenshot() throws IOException {
+        openTestURL();
+        compareScreen("size");
+    }
+}
-- 
cgit v1.2.3


From 15dce287e52134dbd3cced24a4ef0eb807ffc49d Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 4 Nov 2013 22:24:49 +0200
Subject: Make test more reliable by updating description which does not update
 the DOM

Many browsers (IE) choke quite easily when there is a 1MB string inside a div

Change-Id: Ied9b27c17c5374b7cac36820be9cbe38e84448ee
---
 uitest/src/com/vaadin/tests/push/PushLargeData.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'uitest')

diff --git a/uitest/src/com/vaadin/tests/push/PushLargeData.java b/uitest/src/com/vaadin/tests/push/PushLargeData.java
index 1a9bf16de6..3b72424b32 100644
--- a/uitest/src/com/vaadin/tests/push/PushLargeData.java
+++ b/uitest/src/com/vaadin/tests/push/PushLargeData.java
@@ -126,7 +126,9 @@ public abstract class PushLargeData extends AbstractTestUIWithLog {
                     @Override
                     public void run() {
                         PushLargeData ui = (PushLargeData) UI.getCurrent();
-                        ui.getDataLabel().setValue(
+                        // Using description as it is not rendered to the DOM
+                        // immediately
+                        ui.getDataLabel().setDescription(
                                 System.currentTimeMillis() + ": " + data);
                         ui.log("Package " + idx + " pushed");
                     }
-- 
cgit v1.2.3


From cc796b0ebe8f31b33bba06d9096560d1aa87eb19 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 4 Nov 2013 21:50:49 +0200
Subject: Ensure testing Jetty does not run out of heap space

Change-Id: If4549c7bcb0a6518756aa42827340415c44a030c
---
 uitest/vaadin-server.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'uitest')

diff --git a/uitest/vaadin-server.xml b/uitest/vaadin-server.xml
index 4e84a6f238..5e9090a536 100644
--- a/uitest/vaadin-server.xml
+++ b/uitest/vaadin-server.xml
@@ -8,7 +8,7 @@
 
         <ivy:resolve log="download-only" file="${dir}/ivy.xml" />
         <ivy:cachepath pathid="classpath.jetty" conf="jetty-run" />
-        <java classname="org.mortbay.jetty.runner.Runner" fork="yes" output="${vaadin.basedir}/result/jetty.java.out" resultproperty="resultCode">
+        <java classname="org.mortbay.jetty.runner.Runner" fork="yes" output="${vaadin.basedir}/result/jetty.java.out" resultproperty="resultCode" maxmemory="1024m">
             <arg value="--port" />
             <arg value="8888" />
             <arg value="--out" />
-- 
cgit v1.2.3


From fefedeab68461ebc04fd45f91a35835fc9026a56 Mon Sep 17 00:00:00 2001
From: Thomas <thomas@vaadin.com>
Date: Tue, 5 Nov 2013 15:21:06 +0200
Subject: Send window position data back to server after drag (#12885)

Change-Id: I9ca766b0e06390c7ab90f9cbd4996b83032789db
---
 client/src/com/vaadin/client/ui/VWindow.java       | 16 +++++
 .../vaadin/client/ui/window/WindowConnector.java   | 13 +++-
 .../vaadin/client/ui/window/WindowMoveEvent.java   | 82 ++++++++++++++++++++++
 .../vaadin/client/ui/window/WindowMoveHandler.java | 35 +++++++++
 server/src/com/vaadin/ui/Window.java               | 10 +++
 .../vaadin/shared/ui/window/WindowServerRpc.java   |  2 +
 .../components/window/WindowMoveListener.java      | 67 ++++++++++++++++++
 .../components/window/WindowMoveListenerTest.java  | 50 +++++++++++++
 8 files changed, 274 insertions(+), 1 deletion(-)
 create mode 100644 client/src/com/vaadin/client/ui/window/WindowMoveEvent.java
 create mode 100644 client/src/com/vaadin/client/ui/window/WindowMoveHandler.java
 create mode 100644 uitest/src/com/vaadin/tests/components/window/WindowMoveListener.java
 create mode 100644 uitest/src/com/vaadin/tests/components/window/WindowMoveListenerTest.java

(limited to 'uitest')

diff --git a/client/src/com/vaadin/client/ui/VWindow.java b/client/src/com/vaadin/client/ui/VWindow.java
index 9f19a3e0ab..62937b6a67 100644
--- a/client/src/com/vaadin/client/ui/VWindow.java
+++ b/client/src/com/vaadin/client/ui/VWindow.java
@@ -33,6 +33,7 @@ import com.google.gwt.event.dom.client.KeyDownEvent;
 import com.google.gwt.event.dom.client.KeyDownHandler;
 import com.google.gwt.event.dom.client.ScrollEvent;
 import com.google.gwt.event.dom.client.ScrollHandler;
+import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
@@ -47,6 +48,8 @@ import com.vaadin.client.LayoutManager;
 import com.vaadin.client.Util;
 import com.vaadin.client.debug.internal.VDebugWindow;
 import com.vaadin.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner;
+import com.vaadin.client.ui.window.WindowMoveEvent;
+import com.vaadin.client.ui.window.WindowMoveHandler;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.ui.window.WindowMode;
 
@@ -921,6 +924,9 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner,
         dragging = false;
         hideDraggingCurtain();
         DOM.releaseCapture(getElement());
+
+        // fire move event
+        fireEvent(new WindowMoveEvent(uidlPositionX, uidlPositionY));
     }
 
     @Override
@@ -1036,4 +1042,14 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner,
                 - contentPanel.getElement().getOffsetWidth();
     }
 
+    /**
+     * Adds a Handler for when user moves the window.
+     * 
+     * @since 7.1.9
+     * @return {@link HandlerRegistration} used to remove the handler
+     */
+    public HandlerRegistration addMoveHandler(WindowMoveHandler handler) {
+        return addHandler(handler, WindowMoveEvent.getType());
+    }
+
 }
diff --git a/client/src/com/vaadin/client/ui/window/WindowConnector.java b/client/src/com/vaadin/client/ui/window/WindowConnector.java
index ff2e93a3b2..54ea384f5a 100644
--- a/client/src/com/vaadin/client/ui/window/WindowConnector.java
+++ b/client/src/com/vaadin/client/ui/window/WindowConnector.java
@@ -34,6 +34,7 @@ import com.vaadin.client.LayoutManager;
 import com.vaadin.client.Paintable;
 import com.vaadin.client.UIDL;
 import com.vaadin.client.Util;
+import com.vaadin.client.communication.RpcProxy;
 import com.vaadin.client.communication.StateChangeEvent;
 import com.vaadin.client.ui.AbstractSingleComponentContainerConnector;
 import com.vaadin.client.ui.ClickEventHandler;
@@ -52,7 +53,8 @@ import com.vaadin.shared.ui.window.WindowState;
 @Connect(value = com.vaadin.ui.Window.class)
 public class WindowConnector extends AbstractSingleComponentContainerConnector
         implements Paintable, BeforeShortcutActionListener,
-        SimpleManagedLayout, PostLayoutListener, MayScrollChildren {
+        SimpleManagedLayout, PostLayoutListener, MayScrollChildren,
+        WindowMoveHandler {
 
     private ClickEventHandler clickEventHandler = new ClickEventHandler(this) {
         @Override
@@ -112,6 +114,8 @@ public class WindowConnector extends AbstractSingleComponentContainerConnector
                 DoubleClickEvent.getType());
 
         window.setOwner(getConnection().getUIConnector().getWidget());
+
+        window.addMoveHandler(this);
     }
 
     @Override
@@ -400,4 +404,11 @@ public class WindowConnector extends AbstractSingleComponentContainerConnector
          */
         return true;
     }
+
+    @Override
+    public void onWindowMove(WindowMoveEvent event) {
+        RpcProxy.create(WindowServerRpc.class, this).windowMoved(
+                event.getNewX(), event.getNewY());
+
+    }
 }
diff --git a/client/src/com/vaadin/client/ui/window/WindowMoveEvent.java b/client/src/com/vaadin/client/ui/window/WindowMoveEvent.java
new file mode 100644
index 0000000000..439a90e3a1
--- /dev/null
+++ b/client/src/com/vaadin/client/ui/window/WindowMoveEvent.java
@@ -0,0 +1,82 @@
+/*
+ * 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.client.ui.window;
+
+import com.google.gwt.event.shared.GwtEvent;
+
+/**
+ * Event for window position updates
+ * 
+ * @since 7.1.9
+ * @author Vaadin Ltd
+ */
+public class WindowMoveEvent extends GwtEvent<WindowMoveHandler> {
+
+    private static final Type<WindowMoveHandler> TYPE = new Type<WindowMoveHandler>();
+
+    private final int newX;
+    private final int newY;
+
+    /**
+     * Creates a new event with the given parameters
+     * 
+     * @param x
+     *            The new x-position for the VWindow
+     * @param y
+     *            The new y-position for the VWindow
+     */
+    public WindowMoveEvent(int x, int y) {
+        newX = x;
+        newY = y;
+    }
+
+    /**
+     * Gets the new x position of the window
+     * 
+     * @return the new X position of the VWindow
+     */
+    public int getNewX() {
+        return newX;
+    }
+
+    /**
+     * Gets the new y position of the window
+     * 
+     * @return the new Y position of the VWindow
+     */
+    public int getNewY() {
+        return newY;
+    }
+
+    /**
+     * Gets the type of the event
+     * 
+     * @return the type of the event
+     */
+    public static Type<WindowMoveHandler> getType() {
+        return TYPE;
+    }
+
+    @Override
+    public Type<WindowMoveHandler> getAssociatedType() {
+        return TYPE;
+    }
+
+    @Override
+    protected void dispatch(WindowMoveHandler handler) {
+        handler.onWindowMove(this);
+    }
+}
diff --git a/client/src/com/vaadin/client/ui/window/WindowMoveHandler.java b/client/src/com/vaadin/client/ui/window/WindowMoveHandler.java
new file mode 100644
index 0000000000..e30e1853fe
--- /dev/null
+++ b/client/src/com/vaadin/client/ui/window/WindowMoveHandler.java
@@ -0,0 +1,35 @@
+/*
+ * 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.client.ui.window;
+
+import com.google.gwt.event.shared.EventHandler;
+
+/**
+ * Handler for {@link WindowMoveEvent}s
+ * 
+ * @since 7.1.9
+ * @author Vaadin Ltd
+ */
+public interface WindowMoveHandler extends EventHandler {
+
+    /**
+     * Called when the VWindow was moved by the user.
+     * 
+     * @param event
+     *            Contains new coordinates for the VWindow
+     */
+    public void onWindowMove(WindowMoveEvent event);
+}
diff --git a/server/src/com/vaadin/ui/Window.java b/server/src/com/vaadin/ui/Window.java
index 5820161c1c..c173b401b9 100644
--- a/server/src/com/vaadin/ui/Window.java
+++ b/server/src/com/vaadin/ui/Window.java
@@ -77,6 +77,16 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier,
         public void windowModeChanged(WindowMode newState) {
             setWindowMode(newState);
         }
+
+        @Override
+        public void windowMoved(int x, int y) {
+            if (x != getState(false).positionX) {
+                setPositionX(x);
+            }
+            if (y != getState(false).positionY) {
+                setPositionY(y);
+            }
+        }
     };
 
     /**
diff --git a/shared/src/com/vaadin/shared/ui/window/WindowServerRpc.java b/shared/src/com/vaadin/shared/ui/window/WindowServerRpc.java
index b43765274e..1307b1e765 100644
--- a/shared/src/com/vaadin/shared/ui/window/WindowServerRpc.java
+++ b/shared/src/com/vaadin/shared/ui/window/WindowServerRpc.java
@@ -22,4 +22,6 @@ public interface WindowServerRpc extends ClickRpc, ServerRpc {
 
     public void windowModeChanged(WindowMode newState);
 
+    public void windowMoved(int x, int y);
+
 }
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowMoveListener.java b/uitest/src/com/vaadin/tests/components/window/WindowMoveListener.java
new file mode 100644
index 0000000000..e0bc0d9471
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/window/WindowMoveListener.java
@@ -0,0 +1,67 @@
+package com.vaadin.tests.components.window;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.Window;
+
+@SuppressWarnings("serial")
+public class WindowMoveListener extends AbstractTestUI {
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
+     * VaadinRequest)
+     */
+    @Override
+    protected void setup(VaadinRequest request) {
+
+        Window w = new Window("Caption");
+        w.setId("testwindow");
+        w.setHeight("100px");
+        w.setWidth("100px");
+        w.setPositionX(100);
+        w.setPositionY(100);
+        addWindow(w);
+
+        Button b = new Button();
+        b.setId("testbutton");
+        addComponent(b);
+        b.addClickListener(new ClickListener() {
+
+            @Override
+            public void buttonClick(ClickEvent event) {
+                for (Window window : getWindows()) {
+                    window.setPositionX(100);
+                    window.setPositionY(100);
+                }
+            }
+        });
+
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
+     */
+    @Override
+    protected String getTestDescription() {
+        return "Tests that windows send their updated position "
+                + "to server-side after being moved by user";
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
+     */
+    @Override
+    protected Integer getTicketNumber() {
+        return 12885;
+    }
+
+}
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowMoveListenerTest.java b/uitest/src/com/vaadin/tests/components/window/WindowMoveListenerTest.java
new file mode 100644
index 0000000000..3ea3b719c0
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/window/WindowMoveListenerTest.java
@@ -0,0 +1,50 @@
+package com.vaadin.tests.components.window;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.Point;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.interactions.Action;
+import org.openqa.selenium.interactions.Actions;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class WindowMoveListenerTest extends MultiBrowserTest {
+
+    @Test
+    public void testWindowRepositioning() throws Exception {
+        openTestURL();
+
+        WebElement window = getDriver().findElement(By.id("testwindow"));
+        WebElement button = getDriver().findElement(By.id("testbutton"));
+
+        // I'd loved to use the header, but that doesn't work. Footer works
+        // fine, though :)
+        WebElement windowHeader = getDriver().findElement(
+                By.className("v-window-footer"));
+
+        Point winPos = window.getLocation();
+
+        // move window
+        Action a = new Actions(driver).clickAndHold(windowHeader)
+                .moveByOffset(100, 100).release().build();
+        a.perform();
+
+        assertNotEquals("Window was not dragged correctly.", winPos.x,
+                window.getLocation().x);
+        assertNotEquals("Window was not dragged correctly.", winPos.y,
+                window.getLocation().y);
+
+        // re-set window
+        button.click();
+
+        assertEquals("Window was not re-positioned correctly.", winPos.x,
+                window.getLocation().x);
+        assertEquals("Window was not re-positioned correctly.", winPos.y,
+                window.getLocation().y);
+
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 0d3c35b4f17814a3c146134621374a8a915f10a0 Mon Sep 17 00:00:00 2001
From: Jarno Rantala <jarno.rantala@vaadin.com>
Date: Mon, 4 Nov 2013 15:21:22 +0200
Subject: Forces redraw in IE 8 when table does post layout. (#12687)

Without forcing the redraw, IE8 measures component sizes incorrectly in some cases.

Change-Id: I38e8a70e18753714b00f5ca4492749d6c84f10dc
---
 .../com/vaadin/client/ui/table/TableConnector.java |  3 +
 .../components/table/TableSizeInTabsheet.java      | 69 ++++++++++++++++++++++
 .../components/table/TableSizeInTabsheetTest.java  | 50 ++++++++++++++++
 3 files changed, 122 insertions(+)
 create mode 100644 uitest/src/com/vaadin/tests/components/table/TableSizeInTabsheet.java
 create mode 100644 uitest/src/com/vaadin/tests/components/table/TableSizeInTabsheetTest.java

(limited to 'uitest')

diff --git a/client/src/com/vaadin/client/ui/table/TableConnector.java b/client/src/com/vaadin/client/ui/table/TableConnector.java
index 47229dc9c7..07689a640f 100644
--- a/client/src/com/vaadin/client/ui/table/TableConnector.java
+++ b/client/src/com/vaadin/client/ui/table/TableConnector.java
@@ -343,6 +343,9 @@ public class TableConnector extends AbstractHasComponentsConnector implements
             Scheduler.get().scheduleFinally(new ScheduledCommand() {
                 @Override
                 public void execute() {
+                    // IE8 needs some hacks to measure sizes correctly
+                    Util.forceIE8Redraw(getWidget().getElement());
+
                     getLayoutManager().setNeedsMeasure(TableConnector.this);
                     ServerConnector parent = getParent();
                     if (parent instanceof ComponentConnector) {
diff --git a/uitest/src/com/vaadin/tests/components/table/TableSizeInTabsheet.java b/uitest/src/com/vaadin/tests/components/table/TableSizeInTabsheet.java
new file mode 100644
index 0000000000..f84f83718d
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/table/TableSizeInTabsheet.java
@@ -0,0 +1,69 @@
+/*
+ * 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.table;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.VerticalLayout;
+
+@SuppressWarnings("serial")
+public class TableSizeInTabsheet extends AbstractTestUI {
+
+    static final String TABLE = "table";
+    static final String TABSHEET = "tabsheet";
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        VerticalLayout layout = new VerticalLayout();
+        layout.setMargin(true);
+        setContent(layout);
+
+        TabSheet tabSheet = new TabSheet();
+        tabSheet.setId(TABSHEET);
+        layout.addComponent(tabSheet);
+        tabSheet.addTab(new TabComposite(), "Tab");
+    }
+
+    public class TabComposite extends CustomComponent {
+
+        public TabComposite() {
+            Layout mainLayout = new VerticalLayout();
+            addComponent(mainLayout);
+            setCompositionRoot(mainLayout);
+
+            Component table = new Table();
+            table.setWidth("100%");
+            table.setId(TABLE);
+            mainLayout.addComponent(table);
+        }
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "The size calculations fails in IE8 when undefined size table is inside a tabsheet";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 12687;
+    }
+
+}
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/components/table/TableSizeInTabsheetTest.java b/uitest/src/com/vaadin/tests/components/table/TableSizeInTabsheetTest.java
new file mode 100644
index 0000000000..29fc5a2e52
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/table/TableSizeInTabsheetTest.java
@@ -0,0 +1,50 @@
+/*
+ * 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.table;
+
+import static com.vaadin.tests.components.table.TableSizeInTabsheet.TABLE;
+import static com.vaadin.tests.components.table.TableSizeInTabsheet.TABSHEET;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class TableSizeInTabsheetTest extends MultiBrowserTest {
+
+    private static final String TABSHEET_CONTENT_STYLENAME = "v-tabsheet-content";
+
+    @Test
+    public void testTabsheetContentHasTheSameHeightAsTable() {
+        openTestURL();
+        int tableHeight = getTableHeigth();
+        int tabSheetContentHeight = getTableSheetContentHeight();
+
+        Assert.assertEquals(tableHeight, tabSheetContentHeight);
+    }
+
+    private int getTableHeigth() {
+        return vaadinElementById(TABLE).getSize().getHeight();
+    }
+
+    private int getTableSheetContentHeight() {
+        WebElement tabsheetContent = vaadinElementById(TABSHEET).findElement(
+                By.className(TABSHEET_CONTENT_STYLENAME));
+        return tabsheetContent.getSize().getHeight();
+    }
+}
-- 
cgit v1.2.3


From 533ddcda271b7226b38c035adf3073062c562653 Mon Sep 17 00:00:00 2001
From: Tapio Aali <tapio@vaadin.com>
Date: Tue, 5 Nov 2013 12:17:06 +0200
Subject: Fixed lost scrollLeft when row count changed in Table (#12652).

Change-Id: I868f56c1e7003c6619859ba46619f4c53ef9744e
---
 client/src/com/vaadin/client/Util.java             |  37 +++++++
 client/src/com/vaadin/client/ui/VScrollTable.java  |  47 ++++++++-
 ...bleHorizontalScrollPositionOnItemSetChange.html | 110 +++++++++++++++++++++
 ...bleHorizontalScrollPositionOnItemSetChange.java | 101 +++++++++++++++++++
 4 files changed, 294 insertions(+), 1 deletion(-)
 create mode 100644 uitest/src/com/vaadin/tests/components/table/TableHorizontalScrollPositionOnItemSetChange.html
 create mode 100644 uitest/src/com/vaadin/tests/components/table/TableHorizontalScrollPositionOnItemSetChange.java

(limited to 'uitest')

diff --git a/client/src/com/vaadin/client/Util.java b/client/src/com/vaadin/client/Util.java
index 9cdfa954c6..fd7a354569 100644
--- a/client/src/com/vaadin/client/Util.java
+++ b/client/src/com/vaadin/client/Util.java
@@ -448,6 +448,35 @@ public class Util {
         return detectedScrollbarSize;
     }
 
+    /**
+     * Calculates maximum horizontal scrolling value for the given element.
+     * 
+     * @since 7.1.9
+     * @param element
+     *            which scrollLeft should be calculated
+     * @return maximum value for scrollLeft of the given element
+     */
+    public static int getMaxScrollLeft(final Element element) {
+        int scrollWidth = element.getScrollWidth();
+        int clientWidth = element.getClientWidth();
+        return scrollWidth - clientWidth;
+    }
+
+    /**
+     * Checks if scrollLeft of the element is at its maximum value. Returns
+     * false if the element can't be scrolled horizontally.
+     * 
+     * @since 7.1.9
+     * @param element
+     *            which scrollLeft should be checked
+     * @return true, if scrollLeft is at maximum (false if element can't be
+     *         scrolled horizontally)
+     */
+    public static boolean isScrollLeftAtMax(final Element element) {
+        int scrollLeft = element.getScrollLeft();
+        return scrollLeft != 0 && scrollLeft == getMaxScrollLeft(element);
+    }
+
     /**
      * Run workaround for webkits overflow auto issue.
      * 
@@ -469,6 +498,8 @@ public class Util {
             // check the scrolltop value before hiding the element
             final int scrolltop = elem.getScrollTop();
             final int scrollleft = elem.getScrollLeft();
+            final boolean scrollLeftAtMax = isScrollLeftAtMax(elem);
+
             elem.getStyle().setProperty("overflow", "hidden");
 
             Scheduler.get().scheduleDeferred(new Command() {
@@ -492,6 +523,12 @@ public class Util {
                         elem.setScrollTop(scrollvalue);
                     }
 
+                    // keep horizontal scroll at max if it was before vertical
+                    // scroll bar was added/removed
+                    if (scrollLeftAtMax) {
+                        elem.setScrollLeft(getMaxScrollLeft(elem));
+                    }
+
                     // fix for #6940 : Table horizontal scroll sometimes not
                     // updated when collapsing/expanding columns
                     // Also appeared in Safari 5.1 with webkit 534 (#7667)
diff --git a/client/src/com/vaadin/client/ui/VScrollTable.java b/client/src/com/vaadin/client/ui/VScrollTable.java
index 0304acd590..48fd85144f 100644
--- a/client/src/com/vaadin/client/ui/VScrollTable.java
+++ b/client/src/com/vaadin/client/ui/VScrollTable.java
@@ -276,6 +276,10 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
      */
     private int detachedScrollPosition = 0;
 
+    // fields used in fixing erroneously lost scrollLeft
+    int lastScrollBodyHeight = 0;
+    boolean lastScrollLeftWasAtMax = false;
+
     /**
      * Represents a select range of rows
      */
@@ -1005,6 +1009,15 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
         initialContentReceived = true;
         sizeNeedsInit = true;
         scrollBody.restoreRowVisibility();
+
+        // At least FireFox requires that scrollLeft is restored deferred after
+        // scrollBody is recreated
+        Scheduler.get().scheduleFinally(new ScheduledCommand() {
+            @Override
+            public void execute() {
+                restoreScrollLeft();
+            }
+        });
     }
 
     /** For internal use only. May be removed or replaced in the future. */
@@ -6864,13 +6877,45 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
         return s;
     }
 
+    /**
+     * Tries to restore horizontal scroll position if it was lost due to change
+     * in the height of scrollBody (#12652).
+     */
+    private void restoreScrollLeft() {
+        int upcomingScrollLeft = scrollLeft;
+
+        if (lastScrollLeftWasAtMax) {
+            upcomingScrollLeft = Util.getMaxScrollLeft(scrollBodyPanel
+                    .getElement());
+        }
+        scrollBodyPanel.getElement().setScrollLeft(upcomingScrollLeft);
+    }
+
+    /**
+     * Checks if restore of scrollLeft is needed by checking if height of the
+     * scrollBody has changed.
+     * 
+     * @return true, if restore is required
+     */
+    private boolean isScrollLeftRestoreRequired() {
+        return (scrollBody.getElement().getClientHeight() != lastScrollBodyHeight);
+    }
+
     /**
      * This method has logic which rows needs to be requested from server when
      * user scrolls
      */
-
     @Override
     public void onScroll(ScrollEvent event) {
+        // restore in initializeRows() doesn't work right with Chrome
+        if (isScrollLeftRestoreRequired()) {
+            restoreScrollLeft();
+        }
+
+        lastScrollBodyHeight = scrollBody.getElement().getClientHeight();
+        lastScrollLeftWasAtMax = Util.isScrollLeftAtMax(scrollBodyPanel
+                .getElement());
+
         scrollLeft = scrollBodyPanel.getElement().getScrollLeft();
         scrollTop = scrollBodyPanel.getScrollPosition();
         /*
diff --git a/uitest/src/com/vaadin/tests/components/table/TableHorizontalScrollPositionOnItemSetChange.html b/uitest/src/com/vaadin/tests/components/table/TableHorizontalScrollPositionOnItemSetChange.html
new file mode 100644
index 0000000000..6fd54ba0ca
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/table/TableHorizontalScrollPositionOnItemSetChange.html
@@ -0,0 +1,110 @@
+<?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>TableHorizontalScrollPositionOnItemSetChange</title>
+</head>
+<body>
+	<table cellpadding="1" cellspacing="1" border="1">
+		<thead>
+			<tr>
+				<td rowspan="1" colspan="3">TableHorizontalScrollPositionOnItemSetChange</td>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<td>open</td>
+				<td>/run/com.vaadin.tests.components.table.TableHorizontalScrollPositionOnItemSetChange?restartApplication</td>
+				<td></td>
+			</tr>
+			<tr>
+				<td>scrollLeft</td>
+				<td>vaadin=runcomvaadintestscomponentstableTableHorizontalScrollPositionOnItemSetChange::PID_Shorscrolltable/domChild[1]</td>
+				<td>326</td>
+			</tr>
+			<tr>
+				<td>pause</td>
+				<td>500</td>
+				<td></td>
+			</tr>
+			<tr>
+				<td>click</td>
+				<td>vaadin=runcomvaadintestscomponentstableTableHorizontalScrollPositionOnItemSetChange::PID_Slessitems/domChild[0]/domChild[0]</td>
+				<td></td>
+			</tr>
+			<tr>
+				<td>pause</td>
+				<td>500</td>
+				<td></td>
+			</tr>
+			<tr>
+				<td>screenCapture</td>
+				<td></td>
+				<td>left-scroll-position-stays-in-middle-with-fewer-items</td>
+			</tr>
+			<tr>
+				<td>click</td>
+				<td>vaadin=runcomvaadintestscomponentstableTableHorizontalScrollPositionOnItemSetChange::PID_Smoreitems/domChild[0]/domChild[0]</td>
+				<td></td>
+			</tr>
+			<tr>
+				<td>pause</td>
+				<td>500</td>
+				<td></td>
+			</tr>
+			<tr>
+				<td>screenCapture</td>
+				<td></td>
+				<td>left-scroll-position-stays-in-middle-with-more-items</td>
+			</tr>
+			<tr>
+				<td>scrollLeft</td>
+				<td>vaadin=runcomvaadintestscomponentstableTableHorizontalScrollPositionOnItemSetChange::PID_Shorscrolltable/domChild[1]</td>
+				<td>653</td>
+			</tr>
+			<tr>
+				<td>pause</td>
+				<td>500</td>
+				<td></td>
+			</tr>
+			<tr>
+				<td>click</td>
+				<td>vaadin=runcomvaadintestscomponentstableTableHorizontalScrollPositionOnItemSetChange::PID_Slessitems/domChild[0]/domChild[0]</td>
+				<td></td>
+			</tr>
+			<tr>
+				<td>pause</td>
+				<td>500</td>
+				<td></td>
+			</tr>
+			<tr>
+				<td>screenCapture</td>
+				<td></td>
+				<td>left-scroll-position-stays-max-with-fewer-items</td>
+			</tr>
+			<tr>
+				<td>click</td>
+				<td>vaadin=runcomvaadintestscomponentstableTableHorizontalScrollPositionOnItemSetChange::PID_Smoreitems/domChild[0]/domChild[0]</td>
+				<td></td>
+			</tr>
+			<tr>
+				<td>pause</td>
+				<td>500</td>
+				<td></td>
+			</tr>
+			<tr>
+				<td>screenCapture</td>
+				<td></td>
+				<td>left-scroll-position-stays-max-with-more-items</td>
+			</tr>
+			<tr>
+				<td>scrollLeft</td>
+				<td>vaadin=runcomvaadintestscomponentstableTableHorizontalScrollPositionOnItemSetChange::PID_Shorscrolltable/domChild[1]</td>
+				<td>0</td>
+			</tr>
+		</tbody>
+	</table>
+</body>
+</html>
diff --git a/uitest/src/com/vaadin/tests/components/table/TableHorizontalScrollPositionOnItemSetChange.java b/uitest/src/com/vaadin/tests/components/table/TableHorizontalScrollPositionOnItemSetChange.java
new file mode 100644
index 0000000000..1f59a84428
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/table/TableHorizontalScrollPositionOnItemSetChange.java
@@ -0,0 +1,101 @@
+/*
+ * 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.table;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.VerticalLayout;
+
+public class TableHorizontalScrollPositionOnItemSetChange extends
+        AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        VerticalLayout layout = new VerticalLayout();
+        layout.setMargin(true);
+        layout.setSpacing(true);
+        setContent(layout);
+
+        final Table table = new Table();
+        table.setWidth("640px");
+        table.setHeight("243px");
+        table.setId("horscrolltable");
+        layout.addComponent(table);
+
+        for (int i = 0; i < 15; i++) {
+            table.addContainerProperty("Column " + i, String.class, null);
+        }
+
+        for (int i = 0; i < 60; i++) {
+            table.addItem();
+        }
+
+        Button lessItems = new Button("Less items", new Button.ClickListener() {
+
+            @Override
+            public void buttonClick(Button.ClickEvent event) {
+                table.removeAllItems();
+                for (int i = 0; i < 5; i++) {
+                    table.addItem();
+                }
+            }
+        });
+        lessItems.setId("lessitems");
+
+        Button moreItems = new Button("More items", new Button.ClickListener() {
+
+            @Override
+            public void buttonClick(Button.ClickEvent event) {
+                table.removeAllItems();
+                for (int i = 0; i < 50; i++) {
+                    table.addItem();
+                }
+            }
+        });
+        moreItems.setId("moreitems");
+
+        Button clearItems = new Button("Clear all", new Button.ClickListener() {
+            @Override
+            public void buttonClick(ClickEvent event) {
+                table.removeAllItems();
+            }
+        });
+
+        HorizontalLayout buttonLayout = new HorizontalLayout();
+        buttonLayout.setSpacing(true);
+        layout.addComponent(buttonLayout);
+
+        buttonLayout.addComponent(lessItems);
+        buttonLayout.addComponent(moreItems);
+        buttonLayout.addComponent(clearItems);
+        clearItems.setId("clearitems");
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Horizontal scrolling position should not be lost if amount of items changes in Table.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 12652;
+    }
+
+}
-- 
cgit v1.2.3


From 6b381737e84b5f35814994f9cc311f09f578413a Mon Sep 17 00:00:00 2001
From: Thomas <thomas@vaadin.com>
Date: Wed, 6 Nov 2013 13:34:18 +0200
Subject: Adds JBoss EAP 6 server to integration test suit (#12908)

Change-Id: I2d31a0b446e40f0c221403dfb66a990e346e53c0
---
 uitest/integration_tests.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'uitest')

diff --git a/uitest/integration_tests.xml b/uitest/integration_tests.xml
index 1c9c2b1f8f..73aac2405c 100644
--- a/uitest/integration_tests.xml
+++ b/uitest/integration_tests.xml
@@ -204,6 +204,13 @@
         </antcall>
     </target>
 
+    <target name="integration-test-jboss-eap6">
+        <antcall target="run-generic-integration-test">
+            <param name="startDelay" value="10" />
+            <param name="target-server" value="jbosseap6" />
+        </antcall>
+    </target>
+
     <target name="integration-test-glassfish2">
         <antcall target="run-generic-integration-test">
             <param name="startDelay" value="10" />
@@ -395,6 +402,7 @@
             <antcall target="integration-test-jboss5" />
             <antcall target="integration-test-jboss6" />
             <antcall target="integration-test-jboss7" />
+            <antcall target="integration-test-jboss-eap6" />
             <antcall target="integration-test-jetty5" />
             <antcall target="integration-test-jetty6" />
             <antcall target="integration-test-jetty7" />
-- 
cgit v1.2.3


From c308d8a949095ec49a6933d2d4424d078fb4e210 Mon Sep 17 00:00:00 2001
From: Thomas <thomas@vaadin.com>
Date: Thu, 7 Nov 2013 13:03:52 +0200
Subject: Fixes double scrollbar issue in browserframes (#11780) Fixed by
 adding font-size 0 to the base theme.

Change-Id: I8d0224cb65f8ab36c50d2fd68157de4803c823e2
---
 WebContent/VAADIN/themes/base/base.scss            |   2 +
 .../themes/base/browserframe/browserframe.scss     |   7 ++
 WebContent/statictestfiles/long-html.htm           | 128 +++++++++++++++++++++
 .../browserframe/BrowserFrameDoubleScrollbars.java |  40 +++++++
 .../BrowserFrameDoubleScrollbarsTest.java          |  15 +++
 5 files changed, 192 insertions(+)
 create mode 100644 WebContent/VAADIN/themes/base/browserframe/browserframe.scss
 create mode 100644 WebContent/statictestfiles/long-html.htm
 create mode 100644 uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbars.java
 create mode 100644 uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbarsTest.java

(limited to 'uitest')

diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss
index f22af7670e..c6760e1907 100644
--- a/WebContent/VAADIN/themes/base/base.scss
+++ b/WebContent/VAADIN/themes/base/base.scss
@@ -39,6 +39,7 @@
 @import "widget/widget.scss";
 @import "window/window.scss";
 @import "debug/debug.scss";
+@import "browserframe/browserframe.scss";
 
 .v-vaadin-version:after {
 	content: "@version@";
@@ -64,6 +65,7 @@ $line-height: normal;
 	
 	@include base-absolutelayout;
 	@include base-accordion;
+	@include base-browserframe;
 	@include base-button;
 	@include base-nativebutton;
 	@include base-checkbox;
diff --git a/WebContent/VAADIN/themes/base/browserframe/browserframe.scss b/WebContent/VAADIN/themes/base/browserframe/browserframe.scss
new file mode 100644
index 0000000000..aa4225cf00
--- /dev/null
+++ b/WebContent/VAADIN/themes/base/browserframe/browserframe.scss
@@ -0,0 +1,7 @@
+@mixin base-browserframe {
+
+ 	/* Removes duplicate scrollbars in some cases  */
+	.v-browserframe {
+		font-size: 0;
+	}
+}
\ No newline at end of file
diff --git a/WebContent/statictestfiles/long-html.htm b/WebContent/statictestfiles/long-html.htm
new file mode 100644
index 0000000000..daeb744778
--- /dev/null
+++ b/WebContent/statictestfiles/long-html.htm
@@ -0,0 +1,128 @@
+<!DOCTYPE html>
+<html lang="en">
+<body>
+<p>
+Bacon ipsum dolor sit amet leberkas tri-tip bacon, shank frankfurter kevin tongue. Minim voluptate drumstick ham ullamco. Dolore t-bone capicola tongue shankle eu adipisicing enim tri-tip. Doner shank in cillum enim qui ham hock in anim cow ham laborum prosciutto minim. Brisket ad jowl, ground round id irure in tenderloin pariatur tongue strip steak exercitation magna aliquip. Exercitation labore dolore kevin anim frankfurter.
+</p><p>
+Ea veniam beef ribs jerky andouille. Beef short ribs reprehenderit bacon eiusmod sunt. Aliqua bacon proident brisket. Proident irure flank pork loin excepteur pork cillum incididunt pig ad laborum velit do dolor. Incididunt non filet mignon duis, eiusmod bacon beef esse tenderloin biltong fatback adipisicing sausage ham hock. Labore dolor occaecat nulla ea pariatur quis qui. Ad ut short ribs, doner incididunt bresaola aliqua mollit veniam jowl et biltong frankfurter sed nostrud.
+</p><p>
+Quis nulla tri-tip veniam, sint mollit fugiat shank frankfurter pariatur minim. Aute est ut enim pig, chicken in cillum prosciutto. Meatloaf pork chop aute, hamburger adipisicing pig exercitation qui eu irure jowl shankle flank ad sirloin. Culpa pancetta ball tip duis meatball swine turkey ullamco tongue in ut excepteur veniam sausage boudin. Laborum eiusmod mollit sed tempor velit ex in tenderloin meatloaf bresaola elit ut shank consequat. Sirloin pancetta in aliqua kielbasa.
+</p><p>
+Officia short ribs doner elit id t-bone shank venison reprehenderit jowl deserunt ut. Ham hock dolore venison, pork chop boudin dolore strip steak eiusmod sunt mollit beef ribs hamburger sint irure. Brisket laboris strip steak boudin velit cillum jowl occaecat veniam ullamco swine eiusmod duis mollit ut. Exercitation chicken tongue minim cupidatat in, ut in drumstick boudin meatball. Chuck pancetta spare ribs meatball velit filet mignon. Eiusmod jowl reprehenderit jerky, est turducken kevin pork belly anim drumstick ut aliqua rump.
+</p><p>
+Esse meatloaf sint elit exercitation, sunt ex turkey andouille capicola sausage beef. Exercitation pancetta corned beef enim officia andouille, laboris ea tempor filet mignon. Pork excepteur incididunt, mollit do exercitation t-bone. Tempor in irure laborum. Anim in laborum, brisket enim beef short ribs. Ut corned beef deserunt dolore occaecat andouille swine shankle short loin meatloaf pig beef ribs sint.
+</p><p>
+Reprehenderit exercitation meatball sausage laborum. Kevin rump bacon, labore turkey ad elit officia dolore ex ut. Pork loin brisket spare ribs deserunt consectetur sint pancetta ribeye ham hock sausage anim laborum meatloaf. Quis id salami frankfurter. Aliquip ground round tenderloin jerky.
+</p><p>
+Enim aute leberkas nulla, dolor prosciutto meatball. Shankle turkey irure ut pork loin, pork chop fugiat minim. Turkey shank leberkas incididunt ut, venison dolor in swine rump. Ground round nostrud incididunt, shank filet mignon shankle tail sunt proident rump. In duis quis tongue nulla tempor cillum capicola sausage. Short ribs leberkas prosciutto sirloin enim anim veniam tri-tip.
+</p><p>
+Occaecat pork loin ad in, commodo chicken chuck dolor ex kielbasa. Pariatur rump consequat short loin turducken cow. Pancetta turkey shank eiusmod consectetur aute. Consectetur shoulder short ribs, velit frankfurter officia swine. Flank leberkas sausage drumstick. Aute do non short ribs sirloin meatloaf, et consequat. Mollit aute meatloaf ut shoulder consectetur.
+</p><p>
+Sausage hamburger aliquip kevin turducken. Nostrud irure id est. Capicola beef ribs prosciutto, shank exercitation t-bone ex andouille. Enim short loin shoulder, pork loin ut tongue tempor doner. Boudin tongue beef venison dolor, nostrud sausage corned beef dolore ut spare ribs. Magna kielbasa beef ham ut shoulder fugiat frankfurter esse doner aliquip voluptate in non. Pork belly adipisicing culpa, quis short loin drumstick ut sed sirloin minim pancetta fatback id jerky ham.
+</p><p>
+Cupidatat spare ribs officia turkey. Kielbasa pork chop fugiat flank. Id boudin ground round aute pancetta sausage quis frankfurter fatback andouille salami sunt magna voluptate short ribs. Shankle pastrami pancetta laborum ex kielbasa short ribs venison est consequat in. Andouille sausage quis velit. In culpa turkey hamburger incididunt occaecat est esse meatball nostrud kielbasa in jowl. Capicola dolore labore pork loin cow nisi, reprehenderit tempor.
+</p><p>
+Kielbasa spare ribs tail, esse aliqua elit tri-tip pork belly tenderloin duis consequat. Voluptate laborum cupidatat boudin shoulder pig. Pariatur fatback doner drumstick in dolor. Laborum tail chuck veniam, dolore short ribs eiusmod. Incididunt eu quis, pastrami ea excepteur enim pork belly.
+</p><p>
+Exercitation proident ullamco chuck shank ut dolore fugiat. Jowl ut reprehenderit ham hock short loin boudin. Capicola fugiat commodo laboris tail voluptate dolore chicken sirloin pastrami biltong andouille. Spare ribs consectetur sausage chuck frankfurter aute proident magna tenderloin minim.
+</p><p>
+Andouille dolor ad, hamburger anim do shank adipisicing corned beef leberkas dolore pancetta bresaola. In meatloaf sint beef. Pork chop eiusmod cupidatat, t-bone culpa chuck fatback brisket. Dolore rump eiusmod quis, labore ribeye doner strip steak boudin ex pariatur brisket.
+</p><p>
+Pastrami reprehenderit elit sirloin. Adipisicing cillum labore enim chuck, jowl consequat ex beef laborum esse ullamco anim. Elit tenderloin reprehenderit nostrud tail. Shank meatloaf irure, tempor enim pork belly beef pork chop proident.
+</p><p>
+Sint aliqua doner biltong aliquip short loin ad id ut short ribs. Jerky officia esse ribeye venison t-bone. Bresaola dolor ham, boudin meatloaf rump culpa in sed ut do exercitation short ribs minim irure. Filet mignon frankfurter chuck turducken ut chicken ea. Sirloin labore pastrami ham hock pork belly dolore pork chop proident eu ea flank turducken cupidatat rump salami. Tongue commodo et, doner mollit ea duis pork chop turducken culpa.
+</p><p>
+Pariatur ex spare ribs jerky pork loin short ribs. Do meatloaf in qui sed adipisicing pig chicken tempor commodo ex boudin laborum tongue. Jerky laboris dolor tongue ribeye, salami aute commodo deserunt. Nulla tri-tip tempor, in turkey sint labore occaecat. Ex sed chicken qui, in pork loin beef ribs eiusmod sunt. Prosciutto corned beef short ribs consequat mollit, sed sunt strip steak nulla esse fatback sausage. Chicken culpa incididunt duis do cow frankfurter.
+</p><p>
+Prosciutto duis irure rump sunt. Kielbasa jerky dolore non biltong nisi esse dolor turkey elit nostrud aliqua tempor. Dolor in chicken, pork cupidatat kielbasa enim veniam. Sausage ut jowl fatback. Andouille t-bone non corned beef pork chop enim. Minim sirloin voluptate pastrami pork loin shankle.
+</p><p>
+Sirloin labore consectetur drumstick qui ut turducken pariatur boudin leberkas. Aliqua andouille ball tip jerky leberkas qui, doner nostrud cow adipisicing ham hock voluptate irure. Ham sirloin ham hock boudin ut sint. Exercitation ball tip velit fugiat leberkas.
+</p><p>
+Do pork cow, elit aliquip in beef ribs. Boudin bacon minim laborum, eiusmod drumstick frankfurter aute exercitation rump adipisicing andouille. Meatloaf esse ribeye dolore ad, cow beef flank frankfurter et sed deserunt ground round. Prosciutto ex pariatur short ribs non. Tongue shank sirloin qui incididunt commodo laborum venison corned beef pariatur. Dolore culpa turducken leberkas, eu sunt kevin.
+</p><p>
+Capicola dolor rump, non consectetur reprehenderit qui laborum pariatur aute cow swine. Ball tip pork belly elit jowl t-bone. Nisi ex in ullamco ad nostrud frankfurter proident et eu sausage. T-bone beef ribs pancetta voluptate rump ut irure minim pork chop consequat short ribs dolor occaecat id cow.
+</p>
+<p>
+Bacon ipsum dolor sit amet leberkas tri-tip bacon, shank frankfurter kevin tongue. Minim voluptate drumstick ham ullamco. Dolore t-bone capicola tongue shankle eu adipisicing enim tri-tip. Doner shank in cillum enim qui ham hock in anim cow ham laborum prosciutto minim. Brisket ad jowl, ground round id irure in tenderloin pariatur tongue strip steak exercitation magna aliquip. Exercitation labore dolore kevin anim frankfurter.
+</p><p>
+Ea veniam beef ribs jerky andouille. Beef short ribs reprehenderit bacon eiusmod sunt. Aliqua bacon proident brisket. Proident irure flank pork loin excepteur pork cillum incididunt pig ad laborum velit do dolor. Incididunt non filet mignon duis, eiusmod bacon beef esse tenderloin biltong fatback adipisicing sausage ham hock. Labore dolor occaecat nulla ea pariatur quis qui. Ad ut short ribs, doner incididunt bresaola aliqua mollit veniam jowl et biltong frankfurter sed nostrud.
+</p><p>
+Quis nulla tri-tip veniam, sint mollit fugiat shank frankfurter pariatur minim. Aute est ut enim pig, chicken in cillum prosciutto. Meatloaf pork chop aute, hamburger adipisicing pig exercitation qui eu irure jowl shankle flank ad sirloin. Culpa pancetta ball tip duis meatball swine turkey ullamco tongue in ut excepteur veniam sausage boudin. Laborum eiusmod mollit sed tempor velit ex in tenderloin meatloaf bresaola elit ut shank consequat. Sirloin pancetta in aliqua kielbasa.
+</p><p>
+Officia short ribs doner elit id t-bone shank venison reprehenderit jowl deserunt ut. Ham hock dolore venison, pork chop boudin dolore strip steak eiusmod sunt mollit beef ribs hamburger sint irure. Brisket laboris strip steak boudin velit cillum jowl occaecat veniam ullamco swine eiusmod duis mollit ut. Exercitation chicken tongue minim cupidatat in, ut in drumstick boudin meatball. Chuck pancetta spare ribs meatball velit filet mignon. Eiusmod jowl reprehenderit jerky, est turducken kevin pork belly anim drumstick ut aliqua rump.
+</p><p>
+Esse meatloaf sint elit exercitation, sunt ex turkey andouille capicola sausage beef. Exercitation pancetta corned beef enim officia andouille, laboris ea tempor filet mignon. Pork excepteur incididunt, mollit do exercitation t-bone. Tempor in irure laborum. Anim in laborum, brisket enim beef short ribs. Ut corned beef deserunt dolore occaecat andouille swine shankle short loin meatloaf pig beef ribs sint.
+</p><p>
+Reprehenderit exercitation meatball sausage laborum. Kevin rump bacon, labore turkey ad elit officia dolore ex ut. Pork loin brisket spare ribs deserunt consectetur sint pancetta ribeye ham hock sausage anim laborum meatloaf. Quis id salami frankfurter. Aliquip ground round tenderloin jerky.
+</p><p>
+Enim aute leberkas nulla, dolor prosciutto meatball. Shankle turkey irure ut pork loin, pork chop fugiat minim. Turkey shank leberkas incididunt ut, venison dolor in swine rump. Ground round nostrud incididunt, shank filet mignon shankle tail sunt proident rump. In duis quis tongue nulla tempor cillum capicola sausage. Short ribs leberkas prosciutto sirloin enim anim veniam tri-tip.
+</p><p>
+Occaecat pork loin ad in, commodo chicken chuck dolor ex kielbasa. Pariatur rump consequat short loin turducken cow. Pancetta turkey shank eiusmod consectetur aute. Consectetur shoulder short ribs, velit frankfurter officia swine. Flank leberkas sausage drumstick. Aute do non short ribs sirloin meatloaf, et consequat. Mollit aute meatloaf ut shoulder consectetur.
+</p><p>
+Sausage hamburger aliquip kevin turducken. Nostrud irure id est. Capicola beef ribs prosciutto, shank exercitation t-bone ex andouille. Enim short loin shoulder, pork loin ut tongue tempor doner. Boudin tongue beef venison dolor, nostrud sausage corned beef dolore ut spare ribs. Magna kielbasa beef ham ut shoulder fugiat frankfurter esse doner aliquip voluptate in non. Pork belly adipisicing culpa, quis short loin drumstick ut sed sirloin minim pancetta fatback id jerky ham.
+</p><p>
+Cupidatat spare ribs officia turkey. Kielbasa pork chop fugiat flank. Id boudin ground round aute pancetta sausage quis frankfurter fatback andouille salami sunt magna voluptate short ribs. Shankle pastrami pancetta laborum ex kielbasa short ribs venison est consequat in. Andouille sausage quis velit. In culpa turkey hamburger incididunt occaecat est esse meatball nostrud kielbasa in jowl. Capicola dolore labore pork loin cow nisi, reprehenderit tempor.
+</p><p>
+Kielbasa spare ribs tail, esse aliqua elit tri-tip pork belly tenderloin duis consequat. Voluptate laborum cupidatat boudin shoulder pig. Pariatur fatback doner drumstick in dolor. Laborum tail chuck veniam, dolore short ribs eiusmod. Incididunt eu quis, pastrami ea excepteur enim pork belly.
+</p><p>
+Exercitation proident ullamco chuck shank ut dolore fugiat. Jowl ut reprehenderit ham hock short loin boudin. Capicola fugiat commodo laboris tail voluptate dolore chicken sirloin pastrami biltong andouille. Spare ribs consectetur sausage chuck frankfurter aute proident magna tenderloin minim.
+</p><p>
+Andouille dolor ad, hamburger anim do shank adipisicing corned beef leberkas dolore pancetta bresaola. In meatloaf sint beef. Pork chop eiusmod cupidatat, t-bone culpa chuck fatback brisket. Dolore rump eiusmod quis, labore ribeye doner strip steak boudin ex pariatur brisket.
+</p><p>
+Pastrami reprehenderit elit sirloin. Adipisicing cillum labore enim chuck, jowl consequat ex beef laborum esse ullamco anim. Elit tenderloin reprehenderit nostrud tail. Shank meatloaf irure, tempor enim pork belly beef pork chop proident.
+</p><p>
+Sint aliqua doner biltong aliquip short loin ad id ut short ribs. Jerky officia esse ribeye venison t-bone. Bresaola dolor ham, boudin meatloaf rump culpa in sed ut do exercitation short ribs minim irure. Filet mignon frankfurter chuck turducken ut chicken ea. Sirloin labore pastrami ham hock pork belly dolore pork chop proident eu ea flank turducken cupidatat rump salami. Tongue commodo et, doner mollit ea duis pork chop turducken culpa.
+</p><p>
+Pariatur ex spare ribs jerky pork loin short ribs. Do meatloaf in qui sed adipisicing pig chicken tempor commodo ex boudin laborum tongue. Jerky laboris dolor tongue ribeye, salami aute commodo deserunt. Nulla tri-tip tempor, in turkey sint labore occaecat. Ex sed chicken qui, in pork loin beef ribs eiusmod sunt. Prosciutto corned beef short ribs consequat mollit, sed sunt strip steak nulla esse fatback sausage. Chicken culpa incididunt duis do cow frankfurter.
+</p><p>
+Prosciutto duis irure rump sunt. Kielbasa jerky dolore non biltong nisi esse dolor turkey elit nostrud aliqua tempor. Dolor in chicken, pork cupidatat kielbasa enim veniam. Sausage ut jowl fatback. Andouille t-bone non corned beef pork chop enim. Minim sirloin voluptate pastrami pork loin shankle.
+</p><p>
+Sirloin labore consectetur drumstick qui ut turducken pariatur boudin leberkas. Aliqua andouille ball tip jerky leberkas qui, doner nostrud cow adipisicing ham hock voluptate irure. Ham sirloin ham hock boudin ut sint. Exercitation ball tip velit fugiat leberkas.
+</p><p>
+Do pork cow, elit aliquip in beef ribs. Boudin bacon minim laborum, eiusmod drumstick frankfurter aute exercitation rump adipisicing andouille. Meatloaf esse ribeye dolore ad, cow beef flank frankfurter et sed deserunt ground round. Prosciutto ex pariatur short ribs non. Tongue shank sirloin qui incididunt commodo laborum venison corned beef pariatur. Dolore culpa turducken leberkas, eu sunt kevin.
+</p><p>
+Capicola dolor rump, non consectetur reprehenderit qui laborum pariatur aute cow swine. Ball tip pork belly elit jowl t-bone. Nisi ex in ullamco ad nostrud frankfurter proident et eu sausage. T-bone beef ribs pancetta voluptate rump ut irure minim pork chop consequat short ribs dolor occaecat id cow.
+</p>
+<p>
+Bacon ipsum dolor sit amet leberkas tri-tip bacon, shank frankfurter kevin tongue. Minim voluptate drumstick ham ullamco. Dolore t-bone capicola tongue shankle eu adipisicing enim tri-tip. Doner shank in cillum enim qui ham hock in anim cow ham laborum prosciutto minim. Brisket ad jowl, ground round id irure in tenderloin pariatur tongue strip steak exercitation magna aliquip. Exercitation labore dolore kevin anim frankfurter.
+</p><p>
+Ea veniam beef ribs jerky andouille. Beef short ribs reprehenderit bacon eiusmod sunt. Aliqua bacon proident brisket. Proident irure flank pork loin excepteur pork cillum incididunt pig ad laborum velit do dolor. Incididunt non filet mignon duis, eiusmod bacon beef esse tenderloin biltong fatback adipisicing sausage ham hock. Labore dolor occaecat nulla ea pariatur quis qui. Ad ut short ribs, doner incididunt bresaola aliqua mollit veniam jowl et biltong frankfurter sed nostrud.
+</p><p>
+Quis nulla tri-tip veniam, sint mollit fugiat shank frankfurter pariatur minim. Aute est ut enim pig, chicken in cillum prosciutto. Meatloaf pork chop aute, hamburger adipisicing pig exercitation qui eu irure jowl shankle flank ad sirloin. Culpa pancetta ball tip duis meatball swine turkey ullamco tongue in ut excepteur veniam sausage boudin. Laborum eiusmod mollit sed tempor velit ex in tenderloin meatloaf bresaola elit ut shank consequat. Sirloin pancetta in aliqua kielbasa.
+</p><p>
+Officia short ribs doner elit id t-bone shank venison reprehenderit jowl deserunt ut. Ham hock dolore venison, pork chop boudin dolore strip steak eiusmod sunt mollit beef ribs hamburger sint irure. Brisket laboris strip steak boudin velit cillum jowl occaecat veniam ullamco swine eiusmod duis mollit ut. Exercitation chicken tongue minim cupidatat in, ut in drumstick boudin meatball. Chuck pancetta spare ribs meatball velit filet mignon. Eiusmod jowl reprehenderit jerky, est turducken kevin pork belly anim drumstick ut aliqua rump.
+</p><p>
+Esse meatloaf sint elit exercitation, sunt ex turkey andouille capicola sausage beef. Exercitation pancetta corned beef enim officia andouille, laboris ea tempor filet mignon. Pork excepteur incididunt, mollit do exercitation t-bone. Tempor in irure laborum. Anim in laborum, brisket enim beef short ribs. Ut corned beef deserunt dolore occaecat andouille swine shankle short loin meatloaf pig beef ribs sint.
+</p><p>
+Reprehenderit exercitation meatball sausage laborum. Kevin rump bacon, labore turkey ad elit officia dolore ex ut. Pork loin brisket spare ribs deserunt consectetur sint pancetta ribeye ham hock sausage anim laborum meatloaf. Quis id salami frankfurter. Aliquip ground round tenderloin jerky.
+</p><p>
+Enim aute leberkas nulla, dolor prosciutto meatball. Shankle turkey irure ut pork loin, pork chop fugiat minim. Turkey shank leberkas incididunt ut, venison dolor in swine rump. Ground round nostrud incididunt, shank filet mignon shankle tail sunt proident rump. In duis quis tongue nulla tempor cillum capicola sausage. Short ribs leberkas prosciutto sirloin enim anim veniam tri-tip.
+</p><p>
+Occaecat pork loin ad in, commodo chicken chuck dolor ex kielbasa. Pariatur rump consequat short loin turducken cow. Pancetta turkey shank eiusmod consectetur aute. Consectetur shoulder short ribs, velit frankfurter officia swine. Flank leberkas sausage drumstick. Aute do non short ribs sirloin meatloaf, et consequat. Mollit aute meatloaf ut shoulder consectetur.
+</p><p>
+Sausage hamburger aliquip kevin turducken. Nostrud irure id est. Capicola beef ribs prosciutto, shank exercitation t-bone ex andouille. Enim short loin shoulder, pork loin ut tongue tempor doner. Boudin tongue beef venison dolor, nostrud sausage corned beef dolore ut spare ribs. Magna kielbasa beef ham ut shoulder fugiat frankfurter esse doner aliquip voluptate in non. Pork belly adipisicing culpa, quis short loin drumstick ut sed sirloin minim pancetta fatback id jerky ham.
+</p><p>
+Cupidatat spare ribs officia turkey. Kielbasa pork chop fugiat flank. Id boudin ground round aute pancetta sausage quis frankfurter fatback andouille salami sunt magna voluptate short ribs. Shankle pastrami pancetta laborum ex kielbasa short ribs venison est consequat in. Andouille sausage quis velit. In culpa turkey hamburger incididunt occaecat est esse meatball nostrud kielbasa in jowl. Capicola dolore labore pork loin cow nisi, reprehenderit tempor.
+</p><p>
+Kielbasa spare ribs tail, esse aliqua elit tri-tip pork belly tenderloin duis consequat. Voluptate laborum cupidatat boudin shoulder pig. Pariatur fatback doner drumstick in dolor. Laborum tail chuck veniam, dolore short ribs eiusmod. Incididunt eu quis, pastrami ea excepteur enim pork belly.
+</p><p>
+Exercitation proident ullamco chuck shank ut dolore fugiat. Jowl ut reprehenderit ham hock short loin boudin. Capicola fugiat commodo laboris tail voluptate dolore chicken sirloin pastrami biltong andouille. Spare ribs consectetur sausage chuck frankfurter aute proident magna tenderloin minim.
+</p><p>
+Andouille dolor ad, hamburger anim do shank adipisicing corned beef leberkas dolore pancetta bresaola. In meatloaf sint beef. Pork chop eiusmod cupidatat, t-bone culpa chuck fatback brisket. Dolore rump eiusmod quis, labore ribeye doner strip steak boudin ex pariatur brisket.
+</p><p>
+Pastrami reprehenderit elit sirloin. Adipisicing cillum labore enim chuck, jowl consequat ex beef laborum esse ullamco anim. Elit tenderloin reprehenderit nostrud tail. Shank meatloaf irure, tempor enim pork belly beef pork chop proident.
+</p><p>
+Sint aliqua doner biltong aliquip short loin ad id ut short ribs. Jerky officia esse ribeye venison t-bone. Bresaola dolor ham, boudin meatloaf rump culpa in sed ut do exercitation short ribs minim irure. Filet mignon frankfurter chuck turducken ut chicken ea. Sirloin labore pastrami ham hock pork belly dolore pork chop proident eu ea flank turducken cupidatat rump salami. Tongue commodo et, doner mollit ea duis pork chop turducken culpa.
+</p><p>
+Pariatur ex spare ribs jerky pork loin short ribs. Do meatloaf in qui sed adipisicing pig chicken tempor commodo ex boudin laborum tongue. Jerky laboris dolor tongue ribeye, salami aute commodo deserunt. Nulla tri-tip tempor, in turkey sint labore occaecat. Ex sed chicken qui, in pork loin beef ribs eiusmod sunt. Prosciutto corned beef short ribs consequat mollit, sed sunt strip steak nulla esse fatback sausage. Chicken culpa incididunt duis do cow frankfurter.
+</p><p>
+Prosciutto duis irure rump sunt. Kielbasa jerky dolore non biltong nisi esse dolor turkey elit nostrud aliqua tempor. Dolor in chicken, pork cupidatat kielbasa enim veniam. Sausage ut jowl fatback. Andouille t-bone non corned beef pork chop enim. Minim sirloin voluptate pastrami pork loin shankle.
+</p><p>
+Sirloin labore consectetur drumstick qui ut turducken pariatur boudin leberkas. Aliqua andouille ball tip jerky leberkas qui, doner nostrud cow adipisicing ham hock voluptate irure. Ham sirloin ham hock boudin ut sint. Exercitation ball tip velit fugiat leberkas.
+</p><p>
+Do pork cow, elit aliquip in beef ribs. Boudin bacon minim laborum, eiusmod drumstick frankfurter aute exercitation rump adipisicing andouille. Meatloaf esse ribeye dolore ad, cow beef flank frankfurter et sed deserunt ground round. Prosciutto ex pariatur short ribs non. Tongue shank sirloin qui incididunt commodo laborum venison corned beef pariatur. Dolore culpa turducken leberkas, eu sunt kevin.
+</p><p>
+Capicola dolor rump, non consectetur reprehenderit qui laborum pariatur aute cow swine. Ball tip pork belly elit jowl t-bone. Nisi ex in ullamco ad nostrud frankfurter proident et eu sausage. T-bone beef ribs pancetta voluptate rump ut irure minim pork chop consequat short ribs dolor occaecat id cow.
+</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbars.java b/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbars.java
new file mode 100644
index 0000000000..5151ad5dd3
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbars.java
@@ -0,0 +1,40 @@
+package com.vaadin.tests.components.browserframe;
+
+import com.vaadin.server.ExternalResource;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.BrowserFrame;
+import com.vaadin.ui.TabSheet;
+
+public class BrowserFrameDoubleScrollbars extends AbstractTestUI {
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 11780;
+    }
+
+    @Override
+    protected void setup(VaadinRequest request) {
+
+        getLayout().setHeight("100%");
+        getLayout().setSizeFull();
+        getLayout().getParent().setSizeFull();
+
+        TabSheet tabs = new TabSheet();
+        tabs.setSizeFull();
+        getLayout().addComponent(tabs);
+
+        BrowserFrame help = new BrowserFrame();
+        help.setSizeFull();
+        help.setSource(new ExternalResource("/statictestfiles/long-html.htm"));
+
+        tabs.addComponent(help);
+
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Embedded browser causes second scrollbar";
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbarsTest.java b/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbarsTest.java
new file mode 100644
index 0000000000..ade43735a7
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbarsTest.java
@@ -0,0 +1,15 @@
+package com.vaadin.tests.components.browserframe;
+
+import org.junit.Test;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class BrowserFrameDoubleScrollbarsTest extends MultiBrowserTest {
+
+    @Test
+    public void testWindowRepositioning() throws Exception {
+        openTestURL();
+
+        compareScreen("BrowserFrameDoubleScrollbars");
+    }
+}
-- 
cgit v1.2.3